[Mpuls-commits] r5865 - in base/trunk/mpulsweb/templates/documents: . dialogs
scm-commit at wald.intevation.org
scm-commit at wald.intevation.org
Wed Mar 7 14:15:34 CET 2012
Author: ludwig
Date: 2012-03-07 14:15:34 +0100 (Wed, 07 Mar 2012)
New Revision: 5865
Modified:
base/trunk/mpulsweb/templates/documents/case_new.mako
base/trunk/mpulsweb/templates/documents/case_overview.mako
base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako
base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
base/trunk/mpulsweb/templates/documents/global_overview.mako
base/trunk/mpulsweb/templates/documents/global_rename.mako
base/trunk/mpulsweb/templates/documents/global_upload.mako
Log:
Issue 2738: replace url_for with url (templates/documents)
Modified: base/trunk/mpulsweb/templates/documents/case_new.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_new.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/case_new.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -3,17 +3,17 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">
+ <a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">
${_('Selected case documents')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">
${_('Documents overview')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='new')}">
+ <a href="${h.url(controller='casedocument', action='new')}">
${_('Add attachment')}
</a>
</li>
@@ -27,7 +27,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">
${_('Back to: Attachment overview')}
</a>
</li>
@@ -37,7 +37,7 @@
</div>
<p class="import_p">
Die Größe eines Dokuments darf nicht 10MB überschreiten.</p>
-${h.form(h.url_for(controller="casedocument", action='newAction'),
+${h.form(h.url(controller="casedocument", action='newAction'),
multipart=True)}
<div class="widget container">
<table class="form">
Modified: base/trunk/mpulsweb/templates/documents/case_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/case_overview.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/case_overview.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -3,12 +3,12 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
<li>
- <a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">
+ <a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">
${_('Selected case documents')}
</a>
</li>
<li>
- <a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">
+ <a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">
${_('Documents overview')}
</a>
</li>
@@ -22,7 +22,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/casedocument', action='new')}">${_('Add attachment')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='new')}">${_('Add attachment')}</a></li>
</ul>
</div>
</div>
@@ -52,7 +52,7 @@
% for num, f in enumerate(c.files):
<tr class="${num%2 and 'hl' or ''}">
<td>
- <a href="${h.url_for(controller='/casedocument', action='show', id=f.id, url=f.getName())}"
+ <a href="${h.url(controller='casedocument', action='show', id=f.id, url=f.getName())}"
target="_blank"
>${ F.shorten(f.getName(),60) }
</a>
@@ -67,22 +67,22 @@
${kb(f.size)} KB
</td>
<td class="actions">
- <a href="${h.url_for(controller='/casedocument', action='show', id=f.id, url=f.getName())}"
+ <a href="${h.url(controller='casedocument', action='show', id=f.id, url=f.getName())}"
target="_blank"
- ><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
+ ><img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
title="${_('Show')}" title="${_('Show')}">
</a>
% if h.hasRole(['cm']):
- <a href="${h.url_for(controller='/casedocument', action='rename', id=f.id)}"
- ><img src="${h.url_for('/images/icons/edit_22.png')}" border="0"
+ <a href="${h.url(controller='casedocument', action='rename', id=f.id)}"
+ ><img src="${h.url('/images/icons/edit_22.png')}" border="0"
alt="${_('Rename')}" title="${_('Rename')}">
</a>
% endif
% if h.hasRole(['cm']) and session.get('case').getState().getState() == 1:
- <a href="${h.url_for(controller='/casedocument', action='delete', id=f.id, confirmed=0)}">
- <img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
+ <a href="${h.url(controller='casedocument', action='delete', id=f.id, confirmed=0)}">
+ <img src="${h.url('/images/icons/delete_active_22.png')}" border="0"
alt="${_('Delete')}"
title="${_('Delete')}">
</a>
Modified: base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/confirm.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,7 +1,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='overview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='overview')}">${_('Document overview')}</a></li>
<li><a href="#">${_('Delete document?')}</a></li>
</%def>
<%include file="../../dialogs/confirm.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_attachment_success.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
<li><a href="#">${_('Deleted attachment!')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/delete_document_success.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,7 +1,7 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
<li><a href="#">${_('Deleted document!')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_attachment.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,8 +1,8 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
+ <li><a href="${h.url(controller='case', action='select', id=session.get('case').id, confirmed=1)}">${_('Selected case documents')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Documents overview')}</a></li>
<li><a href="#">${_('Error while adding attachment')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/failed_document.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalUpload')}">${_('Add document')}</a></li>
<li><a href="#">${_('Error while adding attachment')}</a></li>
</%def>
<%include file="../../dialogs/failed.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_attachment.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,7 +1,7 @@
<%inherit file="../../casemanagement/main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/casedocument', action='index', id=session.get('case').id)}">${_('Attachment overview')}</a></li>
+ <li><a href="${h.url(controller='casedocument', action='index', id=session.get('case').id)}">${_('Attachment overview')}</a></li>
<li><a href="#">${_('Add attachment')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/dialogs/success_documents.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -1,8 +1,8 @@
<%inherit file="../../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalUpload')}">${_('Add document')}</a></li>
<li><a href="#">${_('Attachment added')}</a></li>
</%def>
<%include file="../../dialogs/success.mako" />
Modified: base/trunk/mpulsweb/templates/documents/global_overview.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_overview.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/global_overview.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -4,7 +4,7 @@
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
</%def>
<div id="content_header_small">
<div id="content_ueberschrift">
@@ -14,7 +14,7 @@
<div id="modusfield">
<div class="actions">
<ul>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}"> ${_('Add new document')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalUpload')}"> ${_('Add new document')}</a></li>
</ul>
</div>
@@ -43,7 +43,7 @@
% for num, f in enumerate(c.files):
<tr class="${num%2 and 'hl' or ''}">
<td>
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}"
+ <a href="${h.url(controller='document', action='globalShow', id=f.id, url=f.getName())}"
target="_blank"
>${ F.shorten(f.getName(),60) }
</a>
@@ -58,18 +58,18 @@
${kb(f.size)} KB
</td>
<td class="actions">
- <a href="${h.url_for(controller='/document', action='globalShow', id=f.id, url=f.getName())}"
+ <a href="${h.url(controller='document', action='globalShow', id=f.id, url=f.getName())}"
target="_blank"
- ><img src="${h.url_for('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
+ ><img src="${h.url('/images/icons/open_active_22.png')}" border="0" alt="${_('Show')}"
title="${_('Show')}" title="${_('Show')}">
</a>
% if h.hasRole(['admin']):
- <a href="${h.url_for(controller='/document', action='globalRename', id=f.id)}"
- ><img src="${h.url_for('/images/icons/edit_22.png')}" border="0"
+ <a href="${h.url(controller='document', action='globalRename', id=f.id)}"
+ ><img src="${h.url('/images/icons/edit_22.png')}" border="0"
alt="${_('Rename')}" title="${_('Rename')}">
</a>
- <a href="${h.url_for(controller='/document', action='globalDelete', id=f.id)}"
- ><img src="${h.url_for('/images/icons/delete_active_22.png')}" border="0"
+ <a href="${h.url(controller='document', action='globalDelete', id=f.id)}"
+ ><img src="${h.url('/images/icons/delete_active_22.png')}" border="0"
alt="${_('Delete')}" title="${_('Delete')}">
</a>
% endif
Modified: base/trunk/mpulsweb/templates/documents/global_rename.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_rename.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/global_rename.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalUpload')}">${_('Add document')}</a></li>
</%def>
<div id="content_header_small">
@@ -14,7 +14,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='document', action='globalOverview')}">
+ <a href="${h.url(controller='document', action='globalOverview')}">
${_('Back to: Attachment overview')}
</a>
</li>
@@ -24,7 +24,7 @@
</div>
<p class="import_p">
-${h.form(h.url_for(controller="document", action='globalRenameAction', id= c.id),
+${h.form(h.url(controller="document", action='globalRenameAction', id= c.id),
multipart=True)}
<div class="widget container">
<table class="form">
Modified: base/trunk/mpulsweb/templates/documents/global_upload.mako
===================================================================
--- base/trunk/mpulsweb/templates/documents/global_upload.mako 2012-03-07 13:05:08 UTC (rev 5864)
+++ base/trunk/mpulsweb/templates/documents/global_upload.mako 2012-03-07 13:15:34 UTC (rev 5865)
@@ -2,8 +2,8 @@
<%inherit file="../main.mako" />
<%def name="buildNavipath()">
${parent.buildNavipath()}
- <li><a href="${h.url_for(controller='/document', action='globalOverview')}">${_('Document overview')}</a></li>
- <li><a href="${h.url_for(controller='/document', action='globalUpload')}">${_('Add document')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalOverview')}">${_('Document overview')}</a></li>
+ <li><a href="${h.url(controller='document', action='globalUpload')}">${_('Add document')}</a></li>
</%def>
<div id="content_header_small">
@@ -14,7 +14,7 @@
<div class="actions">
<ul>
<li>
- <a href="${h.url_for(controller='document', action='globalOverview')}">
+ <a href="${h.url(controller='document', action='globalOverview')}">
${_('Back to: Attachment overview')}
</a>
</li>
@@ -25,7 +25,7 @@
<p class="import_p">
${_('The size of the documents isnt allowed to exceed 10MB.')}</p>
-${h.form(h.url_for(controller="document", action='globalUploadAction'),
+${h.form(h.url(controller="document", action='globalUploadAction'),
multipart=True)}
<div class="widget container">
<table class="form">
More information about the Mpuls-commits
mailing list