[Mpuls-commits] r2760 - in jmd/trunk: . jmdweb/templates jmdweb/templates/casemanagement jmdweb/templates/privacy jmdweb/templates/privacy/default

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-05-26 12:52:06 +0200 (Wed, 26 May 2010)
New Revision: 2760

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/templates/casemanagement/new.mako
   jmd/trunk/jmdweb/templates/main.mako
   jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html
   jmd/trunk/jmdweb/templates/privacy/list_statements.mako
Log:
* jmdweb/templates/casemanagement/new.mako,
jmdweb/templates/main.mako,
jmdweb/templates/privacy/default/privacy_statement.html,
jmdweb/templates/privacy/list_statements.mako: Use h.url_for
consistently for all-intra application URLs.


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-05-26 10:37:49 UTC (rev 2759)
+++ jmd/trunk/ChangeLog	2010-05-26 10:52:06 UTC (rev 2760)
@@ -1,3 +1,11 @@
+2010-05-26  Bernhard Herzog  <bh at intevation.de>
+
+	* jmdweb/templates/casemanagement/new.mako,
+	jmdweb/templates/main.mako,
+	jmdweb/templates/privacy/default/privacy_statement.html,
+	jmdweb/templates/privacy/list_statements.mako: Use h.url_for
+	consistently for all-intra application URLs.
+
 2010-05-21  Bernhard Herzog  <bh at intevation.de>
 
 	* jmdweb/templates/main.mako: Fix default value of the

Modified: jmd/trunk/jmdweb/templates/casemanagement/new.mako
===================================================================
--- jmd/trunk/jmdweb/templates/casemanagement/new.mako	2010-05-26 10:37:49 UTC (rev 2759)
+++ jmd/trunk/jmdweb/templates/casemanagement/new.mako	2010-05-26 10:52:06 UTC (rev 2760)
@@ -3,12 +3,14 @@
 
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/">${_('cm_np_root')}</a></li>
-  <li><a href="/case/new2">${_('cm_np_new')}</a></li>
+  <li><a href="${h.url_for(controller='/case')}">${_('cm_np_root')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='new2')}">${_('cm_np_new')}</a></li>
 </%def>
 
 <div class="waska_form">
-  <form id="waska_form" action="/case/newAction" accept-charset="UTF-8"
+  <form id="waska_form" 
+        action="${h.url_for(controller='/case', action='newAction')}" 
+        accept-charset="UTF-8"
         name="waska_form" method="POST">
     <h1>Neue Fallakte anlegen</h1>
     <fieldset>
@@ -84,24 +86,24 @@
     ##  <table>
     ##    <tr>
     ##      <td class="table_row_h">
-    ##        Arabisch <a href="/documents/ee_ar.pdf">download</a>
+    ##        Arabisch <a href="${h.url_for('/documents/ee_ar.pdf')}">download</a>
     ##      </td>
     ##      <td class="table_row_h">
-    ##        Englisch <a href="/documents/ee_en.pdf">download</a>
+    ##        Englisch <a href="${h.url_for('/documents/ee_en.pdf')}">download</a>
     ##      </td>
     ##    </tr>
     ##    <tr>
-    ##      <td>Polnisch <a href="/documents/ee_pl.pdf">download</a></td>
-    ##      <td>Russisch <a href="/documents/ee_ru.pdf">download</a></td>
+    ##      <td>Polnisch <a href="${h.url_for('/documents/ee_pl.pdf')}">download</a></td>
+    ##      <td>Russisch <a href="${h.url_for('/documents/ee_ru.pdf')}">download</a></td>
     ##    </tr>
     ##    <tr>
     ##      <td class="table_row_h">
-    ##        Türkisch <a href="/documents/ee_tr.pdf">download</a>
+    ##        Türkisch <a href="${h.url_for('/documents/ee_tr.pdf')}">download</a>
     ##      </td>
     ##      <td class="table_row_h">
     ##        Deutsch
     ##        (Einwilligungserklärung ohne Hinweise zu Teilnehmernachweisen)
-    ##        <a href="/documents/ee_de_ohnetn.pdf">download</a>
+    ##        <a href="${h.url_for('/documents/ee_de_ohnetn.pdf')}">download</a>
     ##      </td>
     ##    </tr>
     ##  </table>

Modified: jmd/trunk/jmdweb/templates/main.mako
===================================================================
--- jmd/trunk/jmdweb/templates/main.mako	2010-05-26 10:37:49 UTC (rev 2759)
+++ jmd/trunk/jmdweb/templates/main.mako	2010-05-26 10:52:06 UTC (rev 2760)
@@ -209,7 +209,8 @@
   <ul>
     % for eval in g.mpuls_config.get('evaluations', 'enabled'): 
       <li>
-        <a href="/evaluate/evaluate/${eval.get('id')}">${eval.get('name')}</a>
+        <a href="${h.url_for(controller='/evaluate', action='evaluate',
+                             id=eval.get('id'))}">${eval.get('name')}</a>
       </li>
     % endfor
   </ul>

Modified: jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html
===================================================================
--- jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html	2010-05-26 10:37:49 UTC (rev 2759)
+++ jmd/trunk/jmdweb/templates/privacy/default/privacy_statement.html	2010-05-26 10:52:06 UTC (rev 2760)
@@ -12,9 +12,12 @@
 <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8">
 <meta http-equiv="content-style-type" content="text/css">
 <meta http-equiv="expires" content="0">
-<link href="/styles/all.css" media="all" rel="stylesheet" type="text/css">
-<link href="/styles/print.css" media="screen" rel="stylesheet" type="text/css">
-<link href="/styles/print.css" media="print" rel="stylesheet" type="text/css">
+<link href="${h.url_for('/styles/all.css')}" media="all" rel="stylesheet" 
+      type="text/css">
+<link href="${h.url_for('/styles/print.css')}" media="screen" rel="stylesheet" 
+      type="text/css">
+<link href="${h.url_for('/styles/print.css')}" media="print" rel="stylesheet" 
+      type="text/css">
 <style type="text/css">
 .statement_content {
         width: 90%;

Modified: jmd/trunk/jmdweb/templates/privacy/list_statements.mako
===================================================================
--- jmd/trunk/jmdweb/templates/privacy/list_statements.mako	2010-05-26 10:37:49 UTC (rev 2759)
+++ jmd/trunk/jmdweb/templates/privacy/list_statements.mako	2010-05-26 10:52:06 UTC (rev 2760)
@@ -3,8 +3,8 @@
 <%!  import mpulsweb.lib.helper.filters as F %>
 <%def name="buildNavipath()">
   ${parent.buildNavipath()}
-  <li><a href="/case/select/${session.get('case').id}/1">${_('cm_np_select')}</a></li>
-  <li><a href="/privacy/listStatements">${_('statement_np_list_statements')}</a></li>
+  <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('cm_np_select')}</a></li>
+  <li><a href="${h.url_for(controller='/privacy', action='listStatements')}">${_('statement_np_list_statements')}</a></li>
 </%def>
 <h1>${_('Avaliable statements')}</h1>
 <div class="widget container">
@@ -19,7 +19,7 @@
 <table>
   <tr>
     <td class="table_row_h">Deutsch 
-		<a href="/documents/ee_de.pdf">herunterladen</a></td>
+      <a href="${h.url_for('/documents/ee_de.pdf')}">herunterladen</a></td>
   </tr>
 </table>
 </p>