[Mpuls-commits] r796 - in wasko/branches/2.0: . waskaweb/templates

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-20 17:34:08 +0100 (Wed, 20 Jan 2010)
New Revision: 796

Modified:
   wasko/branches/2.0/ChangeLog.txt
   wasko/branches/2.0/waskaweb/templates/main.mako
Log:
* waskaweb/templates/main.mako: remove evaluation specific parts.


Modified: wasko/branches/2.0/ChangeLog.txt
===================================================================
--- wasko/branches/2.0/ChangeLog.txt	2010-01-20 16:31:32 UTC (rev 795)
+++ wasko/branches/2.0/ChangeLog.txt	2010-01-20 16:34:08 UTC (rev 796)
@@ -1,5 +1,9 @@
 2010-01-20  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/templates/main.mako: remove evaluation specific parts.
+
+2010-01-20  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/templates/main.mako: Fix formatting.
 
 2010-01-20  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/templates/main.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/main.mako	2010-01-20 16:31:32 UTC (rev 795)
+++ wasko/branches/2.0/waskaweb/templates/main.mako	2010-01-20 16:34:08 UTC (rev 796)
@@ -91,53 +91,31 @@
         </div>
       </div>
     % endif
-    % if c.isEvaluationServer and h.hasRole(['pb_ka']):
-      <div class="menu">
-        <div class="actions">
-          <h1>${_('menu_header_cm')}</h1>
-          <ul>
+    <div class="menu">
+      <div class="actions">
+        <h1>${_('menu_header_cm')}</h1>
+        <ul>
+          <li>
+            <a href="${h.url_for(controller='/case_overview',
+                                 action='overview', reset=1)}">
+              ${_('menu_cm_link_overview')}
+            </a>
+          </li>
+          % if h.hasRole(['cm_ka']):
             <li>
-              <a href="${h.url_for(controller='/agency_overview',
-                                   action='overview', reset=1)}">
-                ${_('menu_cm_link_overview')}
-              </a>
+              <a href="${h.url_for(controller='/case', action='new')}">
+                ${_('menu_cm_link_new')}
+              </a> 
             </li>
             <li>
-              <a href="${h.url_for(controller='/evaluate', action='evaluate',
-                                   id=1, reset=1)}">
-                ${_('cm_actions_link_evaluate')}
+              <a href="${h.url_for(controller='/case', action='importCase')}">
+                ${_('menu_cm_link_import')}
               </a>
             </li>
-          </ul>
-        </div>
+          % endif
+        </ul>
       </div>
-    % elif not c.isEvaluationServer:
-      <div class="menu">
-        <div class="actions">
-          <h1>${_('menu_header_cm')}</h1>
-          <ul>
-            <li>
-              <a href="${h.url_for(controller='/case_overview',
-                                   action='overview', reset=1)}">
-                ${_('menu_cm_link_overview')}
-              </a>
-            </li>
-            % if h.hasRole(['cm_ka']):
-              <li>
-                <a href="${h.url_for(controller='/case', action='new')}">
-                  ${_('menu_cm_link_new')}
-                </a> 
-              </li>
-              <li>
-                <a href="${h.url_for(controller='/case', action='importCase')}">
-                  ${_('menu_cm_link_import')}
-                </a>
-              </li>
-            % endif
-          </ul>
-        </div>
-      </div>
-    % endif
+    </div>
     <div class="menu">
       <div class="actions">
         <h1>${_('Evaluations')}</h1>