[Mpuls-commits] r2745 - in base/trunk: . mpulsweb/templates/dialogs

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Tue May 25 20:13:34 CEST 2010


Author: bh
Date: 2010-05-25 20:13:32 +0200 (Tue, 25 May 2010)
New Revision: 2745

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/templates/dialogs/confirm.mako
   base/trunk/mpulsweb/templates/dialogs/failed.mako
   base/trunk/mpulsweb/templates/dialogs/notification.mako
   base/trunk/mpulsweb/templates/dialogs/success.mako
Log:
* mpulsweb/templates/dialogs/confirm.mako,
mpulsweb/templates/dialogs/failed.mako,
mpulsweb/templates/dialogs/notification.mako,
mpulsweb/templates/dialogs/success.mako: Use h.url_for
consistently for all-intra application URLs.


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-05-25 18:11:41 UTC (rev 2744)
+++ base/trunk/ChangeLog	2010-05-25 18:13:32 UTC (rev 2745)
@@ -1,5 +1,13 @@
 2010-05-25  Bernhard Herzog  <bh at intevation.de>
 
+	* mpulsweb/templates/dialogs/confirm.mako,
+	mpulsweb/templates/dialogs/failed.mako,
+	mpulsweb/templates/dialogs/notification.mako,
+	mpulsweb/templates/dialogs/success.mako: Use h.url_for
+	consistently for all-intra application URLs.
+
+2010-05-25  Bernhard Herzog  <bh at intevation.de>
+
 	* mpulsweb/templates/casemanagement/appointmentlist.mako,
 	mpulsweb/templates/casemanagement/appointments.mako,
 	mpulsweb/templates/casemanagement/caselist.mako,

Modified: base/trunk/mpulsweb/templates/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/confirm.mako	2010-05-25 18:11:41 UTC (rev 2744)
+++ base/trunk/mpulsweb/templates/dialogs/confirm.mako	2010-05-25 18:13:32 UTC (rev 2745)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%!  import mpulsweb.lib.helper.filters as F %>
 <div class="dialog" />
-<h1><img src="/images/icons/info/question.png" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
+<h1><img src="${h.url_for('/images/icons/info/question.png')}" alt="achtung"/>${c.dialog_title or c.confirm_for}</h1>
 <p>${h.literal(c.dialog_text or c.question)}</p>
 <a class="button" href="${c.url_yes}">${_('dialog_header_confirm_option_yes')}</a>
 <a class="button" href="${c.url_no}">${_('dialog_header_confirm_option_no')}</a>

Modified: base/trunk/mpulsweb/templates/dialogs/failed.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/failed.mako	2010-05-25 18:11:41 UTC (rev 2744)
+++ base/trunk/mpulsweb/templates/dialogs/failed.mako	2010-05-25 18:13:32 UTC (rev 2745)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%!  import mpulsweb.lib.helper.filters as F %>
 <div class="dialog" />
-<h1><img src="/images/icons/info/failure.png" alt="Fehler" width="48" height="48"/>${c.dialog_title | F.NA}</h1>
+<h1><img src="${h.url_for('/images/icons/info/failure.png')}" alt="Fehler" width="48" height="48"/>${c.dialog_title | F.NA}</h1>
 <p>${h.literal(c.dialog_text) | F.NA}</p>
 <a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/dialogs/notification.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/notification.mako	2010-05-25 18:11:41 UTC (rev 2744)
+++ base/trunk/mpulsweb/templates/dialogs/notification.mako	2010-05-25 18:13:32 UTC (rev 2745)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%!  import mpulsweb.lib.helper.filters as F %>
 <div class="dialog" />
-<h1><img src="/images/icons/info/alert.png" alt="Achtung"/>${c.dialog_title}</h1>
+<h1><img src="${h.url_for('/images/icons/info/alert.png')}" alt="Achtung"/>${c.dialog_title}</h1>
 <p>${c.dialog_text}</p>
 <a class="button" href="${c.url_ok}">${_('dialog_header_notification_option_ok')}</a>
 </div>

Modified: base/trunk/mpulsweb/templates/dialogs/success.mako
===================================================================
--- base/trunk/mpulsweb/templates/dialogs/success.mako	2010-05-25 18:11:41 UTC (rev 2744)
+++ base/trunk/mpulsweb/templates/dialogs/success.mako	2010-05-25 18:13:32 UTC (rev 2745)
@@ -1,7 +1,7 @@
 ## -*- coding: utf-8 -*-
 <%!  import mpulsweb.lib.helper.filters as F %>
 <div class="dialog" />
-<h1><img src="/images/icons/info/confirmation.png" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA}</h1>
+<h1><img src="${h.url_for('/images/icons/info/confirmation.png')}" alt="Erledigt"/>${c.dialog_title or c.success_for | F.NA}</h1>
 <p>${c.dialog_text or c.success_text | F.NA}</p>
 <a class="button" href="${c.url_ok}">${_('dialog_header_confirm_option_ok')}</a>
 </div>



More information about the Mpuls-commits mailing list