[Mpuls-commits] r2604 - in wasko/branches/2.0: jmdweb/lib mpulsweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-04 11:43:05 +0200 (Tue, 04 May 2010)
New Revision: 2604

Modified:
   wasko/branches/2.0/jmdweb/lib/search.py
   wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
Log:
change the order of options

Modified: wasko/branches/2.0/jmdweb/lib/search.py
===================================================================
--- wasko/branches/2.0/jmdweb/lib/search.py	2010-05-04 09:36:40 UTC (rev 2603)
+++ wasko/branches/2.0/jmdweb/lib/search.py	2010-05-04 09:43:05 UTC (rev 2604)
@@ -73,7 +73,7 @@
         phases = 'FALSE' #default
         if phaseslist:
             phases = ('m.id in'
-                      ' (SELECT id from master_tbl_view WHERE phase in (%s))'
+                      ' (SELECT id from master_tbl_view WHERE phase IN (%s))'
                       % ','.join([str(p) for p in phaseslist]))
 
         fields = {'needle': ""}

Modified: wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako
===================================================================
--- wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako	2010-05-04 09:36:40 UTC (rev 2603)
+++ wasko/branches/2.0/mpulsweb/templates/casemanagement/main.mako	2010-05-04 09:43:05 UTC (rev 2604)
@@ -27,44 +27,9 @@
 
 <%def name="buildPrivacyfield()">
   % if g.mpuls_config.is_enabled('case-module', 'privacy'):
-    <!--<div class="menu">
-      <h1>${_('cm_main_header_data_protection')}</h1>
-      <div class="actions">
-        <div id="marked">
-          <ul>
-          % if not session.get('case').hasPrivacyStatement():
-            <li>
-              <a href="/privacy/set/${session.get('case').id}" 
-                 onclick="return checkModification();">${_('cm_main_set_statement')}
-              </a>
-            </li>
-          % elif session.get('case').hasPrivacyStatement():
-            <li>
-              <a href="/privacy/decline/${session.get('case').id}/0" 
-                 onclick="return checkModification();">${_('cm_main_revoke_statement')}
-              </a>
-            </li>
-          % endif
-          % if session.get('case').getState().getState() not in (4,5):
-            <li>
-              <a href="/case/markForAnonymize/${session.get('case').id}/0" 
-                 onclick="return checkModification();">${_('cm_main_anonymize_case')}
-              </a>
-            </li>
-            <li>
-              <a href="/privacy/listStatements" 
-                 onclick="return checkModification();"> ${_('statement_list_statement')}
-              </a>
-            </li>
-          % endif
-          </ul>
-        </div>
-      </div>-->
-    
-    
     <div class="menu">
     <h1>${_('cm_main_header_data_protection')}</h1>
-    <ul class="mainMenu">
+    <ul class="mainMenu" id="mainMenuPrivacy"> <!--ID only because of IE6 -->
         <li>Optionen
             <ul>
                 % if not session.get('case').hasPrivacyStatement():
@@ -95,9 +60,6 @@
             </ul>
         </li>
     </ul>
-      </div>
-      
-      
     </div>
   % endif
 </%def>
@@ -109,27 +71,29 @@
     % if h.hasRole(['cm_ka', 'admin_ka']):
       ${self.buildInfofield()}
       <ul>
-        <li><a href="${h.url_for(controller='/case_overview')}" onclick="return checkModification();"> ${_('cm_menu_link_backtooverview')}</a></li>
         <li>
+            <a href="${h.url_for(controller='/case_overview')}"
+            onclick="return checkModification();">${_('cm_menu_link_backtooverview')}</a>
+        </li>
+        <li>
             <a href="/phase/overview/${session.get('case').id}"
             onclick="return checkModification();">${_('case_cm_phase')}</a>
         </li>
-        <li><a href="/case/printAll/${session.get('case').id}/0" onclick="return checkModification();" target="_blank"> ${_('cm_menu_link_print')}</a></li>
+        <li>
+            <a href="/case/digest/${session.get('case').id}" 
+                onclick="return checkModification();">
+                ${_('cm_menu_link_digest')}
+            </a>
+        </li>
         % if h.hasRole(['cm_ka']) and g.mpuls_config.is_enabled('case-module', 'reminders'):
-          <li><a href="/caseappointment/newReminder/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a></li>
+        <li><a href="/caseappointment/newReminder/${session.get('case').id}" onclick="return checkModification();"> ${_('cm_menu_link_create_reminder')}</a></li>
         % endif
       </ul>
     % endif
      </div>
-    <ul class="mainMenu">
+    <ul class="mainMenu" id="mainMenuCase"> <!--ID only because of IE6 -->
         <li>Weitere Optionen
             <ul>
-            <li>
-            <a href="/case/digest/${session.get('case').id}" 
-                onclick="return checkModification();">
-                ${_('cm_menu_link_digest')}
-            </a>
-            </li>
             % if h.hasRole(['cm_ka', 'admin_ka']):
                 <!--<li>
                     <a href="/phase/overview/${session.get('case').id}"
@@ -138,6 +102,11 @@
                     </a>
                 </li>-->
                 <li>
+                    <a href="/case/printAll/${session.get('case').id}/0"
+                    onclick="return checkModification();"
+                    target="_blank">${_('cm_menu_link_print')}</a>
+                </li>
+                <li>
                     <a href="/case/organisation/${session.get('case').id}" 
                     onclick="return checkModification();">
                         ${_('cm_menu_link_organisation')}