提交: de6f0e882177195fde29900bae7658913d08143d - allura (git)

allura

Commit MetaInfo

• 修订版: de6f0e882177195fde29900bae7658913d08143d (tree)
• 时间: 2012-03-26 17:18:06
• 作者: bolkimen <bolkimen@yaho...>
• Commiter: bolkimen

Log Message

ticket:13 add download button and test case

更改概述

• 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
• modified: Allura/allura/tests/functional/test_wiki_macro.py

差异

--- a/Allura/allura/lib/macro.py
+++ b/Allura/allura/lib/macro.py
@@ -135,7 +135,7 @@ 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,
-        columns=3, skip_proj_icon='off'):
+        columns=2, show_proj_icon='on', show_download_button='on'):
     from allura.lib.widgets.project_list import ProjectList
     from allura.lib import utils
     from allura import model as M
@@ -208,7 +208,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,
-                          columns=columns, skip_proj_icon=skip_proj_icon)
+                          columns=columns, show_proj_icon=show_proj_icon,
+                          show_download_button=show_download_button)
     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
@@ -2272,6 +2272,7 @@ div.attachment_thumb .file_type span {
   *zoom: 1;
   margin: 0 10px;
   height: 250px;
+  width: 220px;
   overflow: hidden;
   -moz-box-shadow: #666666 0 2px 4px 0;
   -webkit-box-shadow: #666666 0 2px 4px 0;
@@ -2282,8 +2283,6 @@ 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;

--- a/Allura/allura/templates/widgets/project_list_widget.html
+++ b/Allura/allura/templates/widgets/project_list_widget.html
@@ -14,7 +14,8 @@
             sitemap=sitemaps[project._id],
             display_mode=display_mode,
             columns=columns,
-            skip_proj_icon=skip_proj_icon)}}
+            show_proj_icon=show_proj_icon,
+            show_download_button=show_download_button)}}
       {% 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,6 +1,6 @@
 {% if display_mode == 'list' %}
-<div class="list card {% if columns == '2' %}twocol{% else %}threecol{% endif %}">
-  {% if skip_proj_icon == 'off' %}
+<div class="list card"{% if columns == '2' %} style="width: 330px"{% endif %}>
+  {% if show_proj_icon == 'on' %}
    {% if accolades %}
     <div class="box notch sponsor">
       <div class="feature">{{accolades[0].award.short}}</div>
@@ -12,13 +12,13 @@
     </div>
    {% endif %}
   {% endif %}
-  <h2><a href="{{value.url()}}">{{value.name}}{{ skip_proj_icon }}</a></h2>
+  <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>
-  {{g.markdown_wiki.convert('[[download_button]]')}}
+  {% if show_download_button == 'on' %}{{g.markdown_wiki.convert('[[download_button]]')}}{% endif %}
 </div>
 {% else %}
   <div class="border card">
-    {% if skip_proj_icon == 'off' %}
+    {% if show_proj_icon == 'on' %}
      {% if accolades %}
       <div class="box notch sponsor">
         <div class="feature">{{accolades[0].award.short}}</div>

--- a/Allura/allura/tests/functional/test_wiki_macro.py
+++ b/Allura/allura/tests/functional/test_wiki_macro.py
@@ -58,3 +58,56 @@ class TestNeighborhood(TestController):
         project_names = self.get_project_names(r)
         updated_at = self.get_projects_property_in_the_same_order(project_names, 'last_updated') 
         assert updated_at == sorted(updated_at, reverse=True)
+
+    @td.with_wiki
+    def test_projects_makro(self):
+        # test columns
+        two_column_style = 'width: 330px;'
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list columns=2]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert two_column_style in r
+
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list columns=3]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert two_column_style not in r
+
+        # test project icon
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list show_proj_icon=on]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert 'test Logo' in r
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list show_proj_icon=off]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert 'test Logo' not in r
+
+        # test project download button
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list show_download_button=on]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert 'download-button' in r
+
+        r = self.app.post('/p/wiki/Home/update',
+                          params={
+                                  'title': 'Home',
+                                  'text': '[[projects display_mode=list show_download_button=off]]'
+                                  },
+                          extra_environ=dict(username='root'), upload_files=[]).follow()
+        assert 'download-button' not in r