allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jetm...@apache.org
Subject [26/35] allura git commit: [#4802] UX improvments when editing wiki pages
Date Wed, 17 Jun 2015 15:17:34 GMT
[#4802] UX improvments when editing wiki pages


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

Branch: refs/heads/ib/7884
Commit: 9d26281ff4b37fdc718f9b40987511629851619d
Parents: 069de21
Author: Heith Seewald <hseewald@slashdotmedia.com>
Authored: Mon Jun 15 14:52:16 2015 -0400
Committer: Igor Bondarenko <jetmind2@gmail.com>
Committed: Tue Jun 16 13:19:14 2015 +0300

----------------------------------------------------------------------
 ForgeWiki/forgewiki/templates/wiki/page_view.html | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/9d26281f/ForgeWiki/forgewiki/templates/wiki/page_view.html
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/templates/wiki/page_view.html b/ForgeWiki/forgewiki/templates/wiki/page_view.html
index 2f4d95f..0420ecf 100644
--- a/ForgeWiki/forgewiki/templates/wiki/page_view.html
+++ b/ForgeWiki/forgewiki/templates/wiki/page_view.html
@@ -42,7 +42,7 @@
 {% block actions %}
   {% if not page['deleted'] %}
     {% if c.user and c.user != c.user.anonymous() %}
-      <a href="edit" title="Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico
{{g.icons['pencil'].css}}" title="Edit"></b></a>
+      <a href="edit" title="Edit"><b data-icon="{{g.icons['pencil'].char}}" class="ico
{{g.icons['pencil'].css}}" title="Edit"></b>&nbsp;Edit</a>
     {% endif %}
     <a href="history" title="History"><b data-icon="{{g.icons['history'].char}}"
class="ico {{g.icons['history'].css}}" title="History"></b></a>
   {% elif h.has_access(page, 'delete')() %}
@@ -108,8 +108,12 @@
   <hr style="margin-top: 1em; margin-bottom: 2em; clear:both;">
   {{lib.related_artifacts(page)}}
   {% if page.discussion_thread and c.app.show_discussion %}
-    {% set thread = page.discussion_thread %}
-    <div>{{c.thread.display(value=thread,page=pagenum,limit=limit,count=count)}}</div>
+      {% if h.has_access(page, 'edit')() or page.discussion_thread.num_replies > 0 %}
+          <div id="discussion_holder"><h2>Discussion</h2>
+          {% set thread = page.discussion_thread %}
+          <div>{{ c.thread.display(value=thread,page=pagenum,limit=limit,count=count)
}}</div>
+          </div>
+      {% endif %}
   {% endif %}
   {{c.confirmation.display(content='')}}
 


Mime
View raw message