Changeset 1864

Timestamp:

11/05/08 14:42:04 (2 months ago)

Author:

egj

Message:

re #367, make pluralizations consistent. also, fix layout bug on comment form when username is too long

Location:

siteapp/trunk/opengeo/almanac/templates

Files:

• appindex.pt (modified) (2 diffs)
• storyindex.pt (modified) (1 diff)

siteapp/trunk/opengeo/almanac/templates/appindex.pt

@@ -97 +97 @@
     </div><!-- /.crossbar -->
     <div class="container">
-      <div class="almanac-list span-15">
+      <div class="almanac-list span-15" tal:define="num_almanacs view/number_of_almanacs">
         <div class="box">
-          <h3>Almanacs <span class="result-count">(showing <span tal:replace="view/number_of_almanacs" /> communities)</span></h3>
-          <div tal:condition="view/number_of_almanacs" id="spinner" class="spinner"></div>
+          <h3>Almanacs
+            <span class="result-count" tal:condition="python:num_almanacs > 1">
+              (showing <span tal:replace="num_almanacs" /> communities)
+            </span>
+          </h3>
+          <div tal:condition="num_almanacs" id="spinner" class="spinner"></div>
           <div id="app-almanacs-container"></div>
           <div class="undisplayed">
@@ -146 +150 @@
                                 title item/dc:title;
                                 alt item/dc:title" />
-              <div class="summary">
+              <div class="summary" tal:define="num_comments python:len(item.keys())">
                 <a tal:content="item/dc:title_or_name" tal:attributes="href item/@@absolute_url" /><br />
-                <span tal:replace="item/__parent__/dc:title_or_name"></span> - <span tal:replace="python:len(item.keys())" /> comments
+                <span tal:replace="item/__parent__/dc:title_or_name"></span> - <span tal:replace="num_comments" /> comment<tal:omit condition="python:num_comments!=1">s</tal:omit>
               </div>
             </li>

siteapp/trunk/opengeo/almanac/templates/storyindex.pt

@@ -111 +111 @@
 
   <!-- comments -->
-  <div class="story-comments" tal:define="comments view/sorted_comments">
+  <div class="story-comments" tal:define="comments view/sorted_comments; num_comments python:len(comments)">
 
-    <div id="comment-list-header" class="selfclear" tal:condition="python:len(comments) > 0">
-      <h3><tal:count replace="python:len(comments)"/> Comment(s)</h3>
+    <div id="comment-list-header" class="selfclear" tal:condition="python:num_comments > 0">
+      <h3><tal:count replace="num_comments"/> Comment<tal:omit condition="python:num_comments>1">s</tal:omit></h3>
       <a class="add-comment" tal:attributes="href string:${view/url}#commentform">Leave a Comment <span>&#8853;</span></a>
     </div><!-- end .comment-list-header -->
 
-    <div class="story-comment" tal:repeat="comment comments">
+    <div class="story-comment selfclear" tal:repeat="comment comments">
       <div class="comment-meta">
         <a class="comment-author" tal:condition="comment/website | nothing" tal:attributes="href comment/website"