[Mpuls-commits] r1848 - in wasko/branches/2.0: jmdweb/controllers jmdweb/templates mpulsweb/controllers mpulsweb/templates/privacy mpulsweb/templates/privacy/dialogs

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-26 15:31:44 +0100 (Fri, 26 Feb 2010)
New Revision: 1848

Added:
   wasko/branches/2.0/mpulsweb/templates/privacy/default_statement.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/confirm.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/decline_success.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
   wasko/branches/2.0/mpulsweb/templates/privacy/edit_statement.mako
Removed:
   wasko/branches/2.0/jmdweb/templates/statement/
Modified:
   wasko/branches/2.0/jmdweb/controllers/case.py
   wasko/branches/2.0/mpulsweb/controllers/privacy.py
Log:
Moved privacy related templates to mpulsbase


Modified: wasko/branches/2.0/jmdweb/controllers/case.py
===================================================================
--- wasko/branches/2.0/jmdweb/controllers/case.py	2010-02-26 14:14:45 UTC (rev 1847)
+++ wasko/branches/2.0/jmdweb/controllers/case.py	2010-02-26 14:31:44 UTC (rev 1848)
@@ -158,7 +158,7 @@
             return func(self, *args, **kwargs)
         else:
             c.ds_id = case_id
-            return render('/statement/dialogs/missing_statement.mako')
+            return render('/privacy/dialogs/missing_statement.mako')
     return decorator(validate)
 
 class CaseController(MpulsCaseController):

Modified: wasko/branches/2.0/mpulsweb/controllers/privacy.py
===================================================================
--- wasko/branches/2.0/mpulsweb/controllers/privacy.py	2010-02-26 14:14:45 UTC (rev 1847)
+++ wasko/branches/2.0/mpulsweb/controllers/privacy.py	2010-02-26 14:31:44 UTC (rev 1848)
@@ -44,13 +44,13 @@
         case = self._loadCase(id)
         statement = case.getPrivacyStatement()
         c.content = statement.fillout()
-        return render('statement/default_statement.mako')
+        return render('privacy/default_statement.mako')
 
     @checkRole('cm')
     def set(self,id):
         c.targeturl = h.url_for(controller="/case", action="digest", id=id)
         c.ds_id = id
-        return render('statement/edit.mako')
+        return render('privacy/edit.mako')
 
     @checkRole('cm')
     def accept(self, id, confirmed):
@@ -69,7 +69,7 @@
             c.dialog_text = SET_EE_ACCEPT_SUCCESS_TEXT
             c.url_ok = h.url_for(controller="/case", action="digest",
                                  id=case.id)
-            return render('statement/dialogs/ee_accept_success.mako')
+            return render('privacy/dialogs/accept_success.mako')
         else:
             c.dialog_title = HEADER
             c.dialog_text = ACCEPT_QUESTION
@@ -78,7 +78,7 @@
                                   id=id, confirmed="1")
             c.url_no = h.url_for(controller="/case", action="select",
                                  id=id, confirmed=0)
-            return render('statement/dialogs/confirm.mako')
+            return render('privacy/dialogs/confirm.mako')
 
     @checkRole('cm')
     def decline(self, id, confirmed=False):
@@ -99,7 +99,7 @@
             c.dialog_title = MARKANONYMIZE_SUCCESS
             c.dialog_text  = MARKANONYMIZE_SUCCESS_TEXT
             c.url_ok = h.url_for ('/case_overview')
-            return render('/statement/dialogs/ee_decline_success.mako')
+            return render('/privacy/dialogs/decline_success.mako')
         else:
             # Get description of the phase which will be set after anonymisation
             pdescriptions = g.mpuls_config.get('phases', 'description')[0]
@@ -111,6 +111,6 @@
                                   id=id, confirmed="1")
             c.url_no = h.url_for(controller="/case", action="select", \
                                  id=id, confirmed=0)
-            return render('statement/dialogs/confirm.mako')
+            return render('privacy/dialogs/confirm.mako')
 
-# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8MARKANONYMIZE_SUCCESS, MARKANONYMIZE_SUCCESS_TEXT:
+# vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8:

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/default_statement.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/default_statement.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/default_statement.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/dialogs/ee_accept_success.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/accecpt_success.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/confirm.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/dialogs/confirm.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/confirm.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/decline_success.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/dialogs/ee_decline_success.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/decline_success.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/dialogs/missing_statement.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako (from rev 1847, wasko/branches/2.0/jmdweb/templates/statement/dialogs/missing_statement_body.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/dialogs/missing_statement_body.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/privacy/edit_statement.mako (from rev 1840, wasko/branches/2.0/jmdweb/templates/statement/edit.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/privacy/edit_statement.mako
___________________________________________________________________
Name: svn:mergeinfo
   +