Commits

jota81  committed 15e9220

fixed issue: "Wiki: clean up breadcrump and page info"
The border line of breadcrump was removed. and the page's modification info is
showed at top of the content.

Modified some css rules

  • Participants
  • Parent commits 8d89c62

Comments (0)

Files changed (4)

File zurbtheme/htdocs/zurb.css

 }
 
 .trac-modifiedby{
-    margin-bottom: 20px;
+    /* margin-bottom: 20px;*/
+    margin-top: -20px;
     font-size: 12px;
 }
 
     margin-top: 0;
 }
 
+.breadcrumbs{
+    border-style: none !important;
+}
 
 .container:after {
     clear: both;
     padding-bottom: 0.4em;
     padding-left: 0;
     padding-right: 0;
-    padding-top: 0.4em;
+    /*padding-top: 0.4em;*/
     margin-left: -10px;
 }
 

File zurbtheme/templates/zurb_theme.html

 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xi="http://www.w3.org/2001/XInclude"
       xmlns:py="http://genshi.edgewall.org/"
+      xmlns:i18n="http://genshi.edgewall.org/i18n"
       py:strip="">
 
 <div py:def="navigation(category)" id="${category}" class="nav">
       <div class="row large-3 columns collapse">
         <xi:include py:if="value_of('resourcepath_template')" href="zurb_wiki_page_path.html" />
       </div>
-      <div class="row large-2 columns" style="margin-top: -7px;">
+      <div class="row large-2 columns right" style="margin-top: -7px;">
         <div id="ctxtnav" class="nav">
           <ul class="breadcrumbs" py:if="chrome.ctxtnav">
             <li py:for="i, elm in enumerate(chrome.ctxtnav)"
                    class="${classes(first_last(i, chrome.ctxtnav))}">$elm</li>
           </ul>
         </div>
+          <div py:if="not version" class="trac-modifiedby">
+           <py:if test="page.time">
+            <span i18n:msg="reldate" class="round secondary label">
+              <a href="${href.wiki(page.name, action='diff', version=page.version)}"
+                 title="$last_modification">Last modified</a> ${pretty_dateinfo(page.time)}
+            </span>
+              <span class="trac-print" i18n:msg="date">Last modified on ${format_datetime(page.time)}</span>
+           </py:if>
+          </div>
       </div>
         <div id="warning" py:if="chrome.warnings" class="system-message columns"> <a class="trac-close-msg" href="#" title="Hide this warning"><span class="round label">close</span></a>
           <py:choose test="len(chrome.warnings)"> <strong>Warning:</strong>

File zurbtheme/templates/zurb_wiki_view.html

                 </tbody>
             </table>
         </py:if>
-
         <div class="wikipage searchable" py:choose="" xml:space="preserve">
         <py:when test="page.exists">
           <div id="wikipage" class="trac-content" py:content="wiki_to_html(context, text)" />
                  _('Version %(version)s by %(author)s',
                    version=page.version, author=format_author(page.author)))
           ?>
-          <div py:if="not version" class="trac-modifiedby">
+      <!--    <div py:if="not version" class="trac-modifiedby">
             <span i18n:msg="reldate" class="round secondary label">
               <a href="${href.wiki(page.name, action='diff', version=page.version)}"
                  title="$last_modification">Last modified</a> ${pretty_dateinfo(page.time)}
             </span>
             <span class="trac-print" i18n:msg="date">Last modified on ${format_datetime(page.time)}</span>
-          </div>
+          </div> -->
         </py:when>
         <py:otherwise>
           <p i18n:msg="name">The page ${name_of(page.resource)} does not exist. You can create it here.</p>

File zurbtheme/theme.py

             #add_script(req, 'theme/js/zepto.js')
             #add_script(req, 'theme/js/jquery.js')
 
+        # if data no has the key page means that am not on a wiki page, initialize value o page in ""
+        if not data.has_key('page'): data['page'] = "";
+
         #if template is using user manager plugin...
         if template=="admin_um.html":
             if data['user_manager'].has_key('panel'):