[Mpuls-commits] r5679 - base/trunk/mpulsweb/templates/documents

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-12-01 13:16:30 +0100 (Thu, 01 Dec 2011)
New Revision: 5679

Modified:
   base/trunk/mpulsweb/templates/documents/case_overview.mako
   base/trunk/mpulsweb/templates/documents/global_overview.mako
Log:
Issue 2731: Display of a document and its description in one row.


Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako	2011-12-01 11:01:24 UTC (rev 5678)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako	2011-12-01 12:16:30 UTC (rev 5679)
@@ -53,6 +53,9 @@
              target="_blank"
              >${ F.shorten(f.getName(),60) }
           </a>
+          % if g.mpuls_config.is_enabled("module", "documents-description"):
+            <div id="description">${f.description}</div>
+          % endif
       </td>
       <td class="number_field">
           ${kb(f.size)} KB
@@ -72,11 +75,6 @@
           % endif
       </td>
     </tr>
-    % if g.mpuls_config.is_enabled("module", "documents-description"):
-    <tr>
-      <td colspan="3">${f.description}</td>
-    </tr>
-    % endif
     % endfor
   % else:
     <tr>

Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako	2011-12-01 11:01:24 UTC (rev 5678)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako	2011-12-01 12:16:30 UTC (rev 5679)
@@ -43,6 +43,9 @@
            target="_blank"
            >${ F.shorten(f.getName(),60) }
         </a>
+        % if g.mpuls_config.is_enabled("module", "documents-description"):
+          <div id="description">${f.description}</div>
+        % endif
     </td>
     <td class="number_field">
         ${kb(f.size)} KB
@@ -61,11 +64,6 @@
         % endif
     </td>
   </tr>
-  % if g.mpuls_config.is_enabled("module", "documents-description"):
-  <tr>
-    <td colspan="3">${f.description}</td>
-  </tr>
-  % endif
   % endfor
 % else:
   <tr>