You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/05/14 20:03:38 UTC

[09/13] git commit: Combines the various project info macros into a single subsection.

Combines the various project info macros into a single subsection.


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/76763615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/76763615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/76763615

Branch: refs/heads/cj/5571
Commit: 76763615db3b42ed7b58fd736cef99ff6c8e93ea
Parents: 2c7aa41
Author: Rich Bowen <rb...@geek.net>
Authored: Fri Apr 26 14:30:04 2013 -0400
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Tue May 14 14:32:32 2013 +0000

----------------------------------------------------------------------
 Allura/allura/templates/jinja_master/lib.html |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/76763615/Allura/allura/templates/jinja_master/lib.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index c511352..3897e5f 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -152,9 +152,7 @@
     <li><a href="#md_ex_code{{id}}">Code Highlighting</a></li>
     <li><a href="#md_ex_includes{{id}}">Includes</a></li>
     <li><a href="#md_ex_neighborhood_notes{{id}}">Neighborhood Notifications</a></li>
-    <li><a href="#md_ex_download_button{{id}}">Download Button</a></li>
-    <li><a href="#md_ex_members{{id}}">Project Member List</a></li>
-    <li><a href="#md_ex_project_screenshots{{id}}">Project Screenshots</a></li>
+    <li><a href="#md_ex_project_macros{{id}}">Project Info Macros</a></li>
     <li><a href="#md_ex_thanks{{id}}">Thanks</a></li>
 </ul>
 </div>
@@ -680,28 +678,26 @@ allowed, permitting basic styling and layout: &lt;div markdown style="float:left
 </pre></div>
 </div>
 
-<div class="markdown_syntax_section hidden_in_modal md_ex_download_button{{id}}">
+<div class="markdown_syntax_section hidden_in_modal md_ex_project_macros{{id}}">
+
 <h2 id="md_ex_download_button{{id}}">Download Button</h2>
 <p>You can display a download button that links to the best download available for the active project. Please note that if you use this macro and there is no download associated with your project, the button will not appear.</p>
 <div class="codehilite"><pre>
 [[download_button]]
 </pre></div>
-</div>
 
-<div class="markdown_syntax_section hidden_in_modal md_ex_member{{id}}">
 <h2 id="md_ex_member{{id}}">Project Member List</h2>
 <p>You can display a list of project members. By default the list is limited to 20 members, and a link is provided to a page with the full list.</p>
 <div class="codehilite"><pre>
 [[members]]
 </pre></div>
-</div>
 
-<div class="markdown_syntax_section hidden_in_modal md_ex_project_screenshots{{id}}">
 <h2 id="md_ex_project_screenshots{{id}}">Project Screenshots</h2>
 <p>You can show all the screenshots for the current project as thumbnails that are linked to the full-size image.</p>
 <div class="codehilite"><pre>
 [[project_screenshots]]
 </pre></div>
+
 </div>
 
 <div class="markdown_syntax_section hidden_in_modal md_ex_thanks{{id}}">