提交: 6650c1def7fb7b4d731a0bee3da76db3907f076c - allura (git)

allura

Commit MetaInfo

• 修訂: 6650c1def7fb7b4d731a0bee3da76db3907f076c (tree)
• 時間: 2012-04-17 01:23:24
• 作者: bolkimen <bolkimen@yaho...>
• Commiter: Dave Brondsema

Log Message

ticket:13 add column option and hide icon option

Change Summary

• modified: Allura/allura/lib/macro.py
• modified: Allura/allura/nf/allura/css/site_style.css
• modified: Allura/allura/templates/widgets/project_list_widget.html
• modified: Allura/allura/templates/widgets/project_summary.html

差異

--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -134,7 +134,8 @@ def project_blog_posts(max_number=5, sort='timestamp', summary=False, mount_poin
 
 @macro('neighborhood-wiki')
 def projects(category=None, display_mode='grid', sort='last_updated',
-        show_total=False, limit=100, labels='', award='', private=False):
+        show_total=False, limit=100, labels='', award='', private=False,
+        columns=3, skip_proj_icon='off'):
     from allura.lib.widgets.project_list import ProjectList
     from allura.lib import utils
     from allura import model as M
@@ -208,7 +209,8 @@ def projects(category=None, display_mode='grid', sort='last_updated',
 
     pl = ProjectList()
     g.resource_manager.register(pl)
-    response = pl.display(projects=projects, display_mode=display_mode)
+    response = pl.display(projects=projects, display_mode=display_mode,
+                          columns=columns, skip_proj_icon=skip_proj_icon)
     if show_total:
         if total is None:
             total = 0

--- a/Allura/allura/nf/allura/css/site_style.css
+++ b/Allura/allura/nf/allura/css/site_style.css
@@ -2266,7 +2266,6 @@ div.attachment_thumb .file_type span {
   box-shadow: rgba(0, 0, 0, 0.4) 0 1px 5px 0;
   background-color: #f5f5f5;
   border: 1px solid #cccccc;
-  width: 220px;
   display: inline;
   float: left;
   overflow: hidden;
@@ -2283,6 +2282,9 @@ div.attachment_thumb .file_type span {
   background-image: -moz-linear-gradient(100% 100% 90deg, #e5e5e5, white, white 25%);
   margin: 0 0 10px 10px;
 }
+.twocol { width: 330px; }
+.threecol { width: 220px; }
+
 .card .box {
   border: none;
   -moz-border-radius: 8px;

--- a/Allura/allura/templates/widgets/project_list_widget.html
+++ b/Allura/allura/templates/widgets/project_list_widget.html
@@ -12,7 +12,9 @@
             icon_url=icon_urls[project._id], 
             accolades=accolades_index[project._id],
             sitemap=sitemaps[project._id],
-            display_mode=display_mode)}}
+            display_mode=display_mode,
+            columns=columns,
+            skip_proj_icon=skip_proj_icon)}}
       {% endif %}
     {% endfor %}
     {% do g.set_project(old_project) %}

--- a/Allura/allura/templates/widgets/project_summary.html
+++ b/Allura/allura/templates/widgets/project_summary.html
@@ -1,30 +1,34 @@
 {% if display_mode == 'list' %}
-<div class="list card">
-  {% if accolades %}
+<div class="list card {% if columns == '2' %}twocol{% else %}threecol{% endif %}">
+  {% if skip_proj_icon == 'off' %}
+   {% if accolades %}
     <div class="box notch sponsor">
       <div class="feature">{{accolades[0].award.short}}</div>
       <img src="{{icon_url}}" alt="{{value.name}} Logo"/>
     </div>
-  {% else %}
+   {% else %}
     <div class="box">
       <img src="{{icon_url}}" alt="{{value.name}} Logo"/>
     </div>
+   {% endif %}
   {% endif %}
-  <h2><a href="{{value.url()}}">{{value.name}}</a></h2>
+  <h2><a href="{{value.url()}}">{{value.name}}{{ skip_proj_icon }}</a></h2>
   <p class="desc">{% if value.summary %}{{value.summary}}{% else %}{{h.text.truncate(value.short_description, 50)}}{% endif %}</p>
   {{g.markdown_wiki.convert('[[download_button]]')}}
 </div>
 {% else %}
   <div class="border card">
-    {% if accolades %}
+    {% if skip_proj_icon == 'off' %}
+     {% if accolades %}
       <div class="box notch sponsor">
         <div class="feature">{{accolades[0].award.short}}</div>
         <img src="{{icon_url}}" alt="{{value.name}} Logo"/>
       </div>
-    {% else %}
+     {% else %}
       <div class="box">
         <img src="{{icon_url}}" alt="{{value.name}} Logo"/>
       </div>
+     {% endif %}
     {% endif %}
     <h2><a href="{{value.url()}}">{{value.name}}</a></h2>
     <p class="desc">{% if value.summary %}{{value.summary}}{% else %}{{h.text.truncate(value.short_description, 50)}}{% endif %}</p>
@@ -34,4 +38,4 @@
       {% endfor %}
     </div>
   </div>
-{% endif %}
\ No newline at end of file
+{% endif %}