[Mpuls-commits] r4439 - in jmd/trunk: . jmdstrukturweb/lib jmdweb/lib jmdweb/templates

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-12-28 12:03:33 +0100 (Tue, 28 Dec 2010)
New Revision: 4439

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/lib/search.py
   jmd/trunk/jmdweb/lib/search.py
   jmd/trunk/jmdweb/templates/main.mako
Log:
* jmdweb/lib/search.py,
jmdweb/templates/main.mako,
jmdstrukturweb/lib/search.py: Add evaluation search.



Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-12-28 10:59:44 UTC (rev 4438)
+++ jmd/trunk/ChangeLog	2010-12-28 11:03:33 UTC (rev 4439)
@@ -1,4 +1,9 @@
+2010-12-28  Torsten Irlaender <torsten at intevation.de>
 
+	* jmdweb/lib/search.py,
+	jmdweb/templates/main.mako,
+	jmdstrukturweb/lib/search.py: Add evaluation search.
+
 2010-12-27  Torsten Irlaender <torsten at intevation.de>
 
 	* jmdweb/public/formed/formedtree.xml: Issue1460: Moved

Modified: jmd/trunk/jmdstrukturweb/lib/search.py
===================================================================
--- jmd/trunk/jmdstrukturweb/lib/search.py	2010-12-28 10:59:44 UTC (rev 4438)
+++ jmd/trunk/jmdstrukturweb/lib/search.py	2010-12-28 11:03:33 UTC (rev 4439)
@@ -30,13 +30,22 @@
 import logging
 
 from mpulsweb.lib.search import CaseSearch as CaseBaseSearch
+from mpulsweb.lib.search import EvaluationSearch as EvaluationBaseSearch
+from mpulsweb.lib.search import AppMixin as AppBaseMixin
 
 
 log = logging.getLogger(__name__)
 
+class AppMixin(AppBaseMixin):
 
-class CaseSearch(CaseBaseSearch):
+    pass
 
+class CaseSearch(CaseBaseSearch, AppMixin):
+
     pass
 
+class EvaluationSearch(EvaluationBaseSearch, AppMixin):
+
+    pass
+
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:

Modified: jmd/trunk/jmdweb/lib/search.py
===================================================================
--- jmd/trunk/jmdweb/lib/search.py	2010-12-28 10:59:44 UTC (rev 4438)
+++ jmd/trunk/jmdweb/lib/search.py	2010-12-28 11:03:33 UTC (rev 4439)
@@ -33,13 +33,14 @@
 from formencode.validators import Int
 
 from mpulsweb.lib.search import CaseSearch as CaseBaseSearch
+from mpulsweb.lib.search import EvaluationSearch as EvaluationBaseSearch
+from mpulsweb.lib.search import AppMixin as AppBaseMixin
 
 
 log = logging.getLogger(__name__)
 
+class AppMixin(AppBaseMixin):
 
-class CaseSearch(CaseBaseSearch):
-
     VALID_OPTIONS = (CaseBaseSearch.VALID_OPTIONS
                      + ("gender", "type_ending"))
     MULTI_OPTIONS = (CaseBaseSearch.MULTI_OPTIONS
@@ -91,4 +92,12 @@
             ]
 
 
+class CaseSearch(CaseBaseSearch, AppMixin):
+
+    pass
+
+class EvaluationSearch(EvaluationBaseSearch, AppMixin):
+
+    pass
+
 # vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8:

Modified: jmd/trunk/jmdweb/templates/main.mako
===================================================================
--- jmd/trunk/jmdweb/templates/main.mako	2010-12-28 10:59:44 UTC (rev 4438)
+++ jmd/trunk/jmdweb/templates/main.mako	2010-12-28 11:03:33 UTC (rev 4439)
@@ -159,6 +159,18 @@
     % if g.mpuls_config.is_enabled('module', 'evaluation'):
       <div class="menu">
         <div class="actions">
+          <h1>${_('Overview')}</h1>
+            <ul>
+              <li>
+                <a href="${h.url_for(controller='/evaluation_overview', action='overview')}">
+                  ${_('Agency')}
+                </a>
+              </li>
+            </ul>
+        </div>
+      </div>
+      <div class="menu">
+        <div class="actions">
           <h1>${_('Evaluations')}</h1>
           ${self.buildEvaluations()}
         </div>