Changeset 191

Timestamp:

02/28/07 15:19:38 (3 years ago)

Author:

lazaridis_com

Message:

re #110, merged the revisions 4868 into the customized templates

Location:

infra/tracx/tracx/templates

Files:

• layout.html (modified) (4 diffs)
• wiki_view.html (modified) (5 diffs)

infra/tracx/tracx/templates/layout.html

@@ -25 +25 @@
     <script py:for="script in chrome.scripts"
             type="${script.type}" src="${script.href}"></script>
+    ${Markup('&lt;!--[if IE lt 7]&gt;')}
+    <script type="text/javascript" src="${href.chrome('common/js/ie_pre7_hacks.js')}"></script>
+    ${Markup('&lt;![endif]--&gt;')}
     ${select("*[local-name() != 'title']")}
   </head>
@@ -33 +36 @@
     <ul py:if="chrome.nav[category]">
       <li py:for="idx, item in  enumerate(chrome.nav[category])"
-          class="${item.active and 'active ' or ''}${first_last(idx, chrome.nav[category])}">${item.label}</li>
+          class="${classes(first_last(idx, chrome.nav[category]), active=item.active)}">${item.label}</li>
     </ul>
   </div>
@@ -82 +85 @@
           <li py:for="idx, link in enumerate(chrome.links.alternate)"
             class="${first_last(idx, chrome.links.alternate)}">
-            <a href="${link.href}" class="${link['class']}" py:content="link.title" />
+            <a rel="nofollow" href="${link.href}" class="${link['class']}" py:content="link.title" />
           </li>
         </ul>
@@ -88 +91 @@
     </div>
 
-
     <div id="footer"><hr/>
       ${navigationl('footnav')}
       <p class="right">${chrome.footer}</p>      
     </div>
-    
-
   </body>
 

infra/tracx/tracx/templates/wiki_view.html

@@ -22 +22 @@
     <div id="ctxtnav" class="nav">
       <h2>Wiki Navigation</h2>
-      <ul>
-        <li><a href="${href.wiki('WikiStart')}">Start Page</a></li>
-        <li><a href="${href.wiki('TitleIndex')}">Index by Title</a></li>
-        <li><a href="${href.wiki('RecentChanges')}">Index by Date</a></li>
-        <li class="last">
-          <a href="${req.href.wiki(page.name, action='diff', version=page.version)}">Last Change</a>
-        </li>
-      </ul>
+      <py:choose>
+        <py:when test="version">
+          ${prevnext_nav('Version', 'View Latest Version')}
+        </py:when>
+        <ul py:otherwise="">
+          <li><a href="${href.wiki('WikiStart')}">Start Page</a></li>
+          <li><a href="${href.wiki('TitleIndex')}">Index by Title</a></li>
+          <li><a href="${href.wiki('RecentChanges')}">Index by Date</a></li>
+          <li class="last">
+            <a href="${req.href.wiki(page.name, action='diff', version=page.version)}">Last Change</a>
+          </li>
+        </ul>
+        </py:choose>
       <hr />
     </div>
@@ -45 +50 @@
   
   <div py:if="chrome.nav['tracnav']">  
-    ${wiki_to_html('[[TracNav]]')}
+    ${wiki_to_html(context, '[[TracNav]]')}
   </div>
     
@@ -52 +57 @@
           <tbody>
             <tr><th scope="row">
-              Version $page.version (modified by $page.author, ${dateinfo(page.time)} ago)
+                Version $page.version (modified by ${authorinfo(page.author)}, ${dateinfo(page.time)} ago)
             </th></tr>
             <tr><td class="message">
-              ${wiki_to_oneliner(comment or '--')}
+              ${wiki_to_html(context, page.comment or '--')}
             </td></tr>
           </tbody>
@@ -63 +68 @@
       <div class="wikipage searchable" py:choose="">
         <py:when test="page.exists">
-          ${wiki_to_html(page.text)}
+          ${wiki_to_html(context, page.text)}
         </py:when>
         <py:otherwise>
@@ -70 +75 @@
       </div>
 
-      ${list_of_attachments(attachments, attach_href, compact=True)}
+      ${list_of_attachments(context, attachments, attach_href, compact=True)}
 
       <py:with vars="modify_perm = 'WIKI_MODIFY' in perm;