From 28bfa89cb512d69ebb3e3a4fa0bd8f2a10f97e58 Mon Sep 17 00:00:00 2001
From: Matthias Jahn <jahn.matthias@freenet.de>
Date: Tue, 1 Jan 2013 22:37:01 +0100
Subject: [PATCH 3/4] - fix template files. image src-urls now follow project
 rules

---
 swat/templates/default/base/base.mako              |    4 ++--
 .../default/component/account-group-form.mako      |    2 +-
 swat/templates/default/component/form-fields.mako  |    4 ++--
 swat/templates/default/component/pagination.mako   |    4 ++--
 swat/templates/default/component/popups.mako       |    2 +-
 swat/templates/default/component/toolbar.mako      |    2 +-
 swat/templates/default/derived/account.mako        |    8 ++++----
 swat/templates/default/derived/dashboard.mako      |    4 ++--
 swat/templates/default/derived/share.mako          |    8 ++++----
 9 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/swat/templates/default/base/base.mako b/swat/templates/default/base/base.mako
index 1204d82..35a0a69 100644
--- a/swat/templates/default/base/base.mako
+++ b/swat/templates/default/base/base.mako
@@ -57,7 +57,7 @@ Base Page Title
 Head Tags
 </%doc>
 <%def name="head_tags()">
-    <link rel="shortcut icon" href="/default/images/favicon.ico" />
+    <link rel="shortcut icon" href="${h.url_for('/default/images/favicon.ico')}" />
     
     ${h.javascript_link(h.url_for('/default/js/mootools-core-nc.js'))}
     ${h.javascript_link(h.url_for('/default/js/mootools-more-nc.js'))}
@@ -98,7 +98,7 @@ Header Part. Contains items that will be in all pages except login
 	<a href="${h.url_for(controller = 'dashboard', action='index')}">
     % endif
     
-    <img class="samba-logo samba-logo-interior" src="/default/images/samba-logo.png" alt="${_('Samba Logo')}" title="${_('Samba - Opening Windows to a Wider World')}" />
+    <img class="samba-logo samba-logo-interior" src="${h.url_for('/default/images/samba-logo.png')}" alt="${_('Samba Logo')}" title="${_('Samba - Opening Windows to a Wider World')}" />
     
     % if with_link:
 	</a>
diff --git a/swat/templates/default/component/account-group-form.mako b/swat/templates/default/component/account-group-form.mako
index 204cd50..45b85a0 100644
--- a/swat/templates/default/component/account-group-form.mako
+++ b/swat/templates/default/component/account-group-form.mako
@@ -65,7 +65,7 @@
                                             % endif
                                         </td>
                                         <td>
-                                            <a target="_blank" href="${h.url_for('account_action', action='user', subaction='edit', id=user.rid)}" title="${_('Edit this User')}"><img src="/default/images/icons/user-pencil.png" alt="${_('Edit User Icon')}"/></a>
+                                            <a target="_blank" href="${h.url_for('account_action', action='user', subaction='edit', id=user.rid)}" title="${_('Edit this User')}"><img src="${h.url_for('/default/images/icons/user-pencil.png')}" alt="${_('Edit User Icon')}"/></a>
                                         </td>
                                     </tr>
                                 % endfor
diff --git a/swat/templates/default/component/form-fields.mako b/swat/templates/default/component/form-fields.mako
index ebcbc5d..03e1716 100644
--- a/swat/templates/default/component/form-fields.mako
+++ b/swat/templates/default/component/form-fields.mako
@@ -104,13 +104,13 @@
     
 <%def name="popup(id, op)">
     <% copy_to = c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/copy-to') or c.p.get_value(id, 'id') %>
-    <a href="${h.url_for(controller=c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/controller'), action=c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/action'))}?copyto=${copy_to}" class="popup-selector ${op}" title="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/title')}"><img src="/default/images/icons/${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/name')}" alt="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/alt')}" /></a>
+    <a href="${h.url_for(controller=c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/controller'), action=c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/action'))}?copyto=${copy_to}" class="popup-selector ${op}" title="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/title')}"><img src="${h.url_for('/default/images/icons/'+ c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/name'))}" alt="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/alt')}" /></a>
 </%def>
     
 <%def name="manual_add(id, op)">
     <% copy_to = c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/copy-to') or c.p.get_value(id, 'id') %>
     <% copy_from = c.p.get_value(id, 'field-ops-descriptor/' + op + '/link/copy-from') or c.p.get_value(id, 'id') %>
-    <a class="${op}" href="?copyto=${copy_to}&amp;copyfrom=${copy_from}" title="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/title')}"><img src="/default/images/icons/${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/name')}" alt="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/alt')}" /></a>
+    <a class="${op}" href="?copyto=${copy_to}&amp;copyfrom=${copy_from}" title="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/title')}"><img src="${h.url_for('/default/images/icons/' + c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/name'))}" alt="${c.p.get_value(id, 'field-ops-descriptor/' + op + '/image/alt')}" /></a>
 </%def>
     
 <%def name="modifiers(id, op)">
diff --git a/swat/templates/default/component/pagination.mako b/swat/templates/default/component/pagination.mako
index 71bb4fa..b952772 100644
--- a/swat/templates/default/component/pagination.mako
+++ b/swat/templates/default/component/pagination.mako
@@ -37,7 +37,7 @@
             % if total_pages > 1 and current_page > 1:
                 <li class="previous">
                     <a title="${_('Previous Page')}" href="?page=${current_page - 1}&amp;per_page=${per_page}">
-                        <img src="/default/images/icons/arrow-180-small.png" alt="${_('Arrow Previous Page Icon')}" />
+                        <img src="${h.url_for('/default/images/icons/arrow-180-small.png')}" alt="${_('Arrow Previous Page Icon')}" />
                     </a>
                 </li>
             % endif
@@ -62,7 +62,7 @@
             % if total_pages > 1 and current_page < total_pages:
                 <li class="next">
                     <a title="${_('Next Page')}" href="?page=${current_page + 1}&amp;per_page=${per_page}">
-                        <img src="/default/images/icons/arrow-000-small.png" alt="${_('Arrow Next Page Icon')}" />
+                        <img src="${h.url_for('/default/images/icons/arrow-000-small.png')}" alt="${_('Arrow Next Page Icon')}" />
                     </a>
                 </li>
             % endif                            
diff --git a/swat/templates/default/component/popups.mako b/swat/templates/default/component/popups.mako
index ca55590..cdbf970 100644
--- a/swat/templates/default/component/popups.mako
+++ b/swat/templates/default/component/popups.mako
@@ -36,7 +36,7 @@
                             <input type="hidden" name="path" value="${path}" />
                             
                             <a class="add" title="${_('Copy this Path to the Textbox')}" href="#">
-                                <img alt="Add Icon" class="add" src="/default/images/icons/plus-small.png" />
+                                <img alt="Add Icon" class="add" src="${h.url_for('/default/images/icons/plus-small.png')}" />
                             </a>
                         </li>
                         
diff --git a/swat/templates/default/component/toolbar.mako b/swat/templates/default/component/toolbar.mako
index f4c33bb..af3fab9 100644
--- a/swat/templates/default/component/toolbar.mako
+++ b/swat/templates/default/component/toolbar.mako
@@ -62,7 +62,7 @@
 	% endif
 	
 	<a id="action-${action}" class="item-icon-link ${submit} ${mass_submit} ${confirmation} ${skip_validation}" title="${c.config.get_action_info('link/title', action)}" href="${link}">
-	    <img alt="${c.config.get_action_info('image/alt', action)}" src="/default/images/icons/${c.config.get_action_info('image/name', action)}"/>
+	    <img alt="${c.config.get_action_info('image/alt', action)}" src="${h.url_for('/default/images/icons/' + c.config.get_action_info('image/name', action))}"/>
 	    <span>${c.config.get_action_info('link/name', action)}</span>
 	</a>
     </li>
diff --git a/swat/templates/default/derived/account.mako b/swat/templates/default/derived/account.mako
index 54bc7dd..b42b599 100644
--- a/swat/templates/default/derived/account.mako
+++ b/swat/templates/default/derived/account.mako
@@ -198,15 +198,15 @@ ${h.end_form()}
     
 <%def name="quick_tasks(id, type, is_disabled=False)">
     <ul class="quick-tasks">
-        <li><a href="${h.url_for('account_action', action=type.lower(), subaction='edit', id=id)}" title="${_('Edit %s' % (type))}"><img src="/default/images/icons/user-pencil.png" alt="${_('Edit %s Icon' % (type))}"/></a></li>
-	<li><a href="${h.url_for('account_action', action=type.lower(), subaction='remove', id=id)}" title="${_('Remove %s' % (type))}"><img src="/default/images/icons/user-minus.png" alt="${_('Remove %s Icon' % (type))}"/></a></li>
+        <li><a href="${h.url_for('account_action', action=type.lower(), subaction='edit', id=id)}" title="${_('Edit %s' % (type))}"><img src="${h.url_for('/default/images/icons/user-pencil.png')}" alt="${_('Edit %s Icon' % (type))}"/></a></li>
+	<li><a href="${h.url_for('account_action', action=type.lower(), subaction='remove', id=id)}" title="${_('Remove %s' % (type))}"><img src="${h.url_for('/default/images/icons/user-minus.png')}" alt="${_('Remove %s Icon' % (type))}"/></a></li>
         
         % if type.lower() == "user":
             <li><a href="${h.url_for('account_action', action=type.lower(), subaction='toggle', id=id)}" title="${_('Toggle this %s' % (type))}">
                 % if is_disabled == True:
-                    <img src="/default/images/icons/lock-unlock.png" alt="${_('Toggle (Enable) %s Icon' % (type))}"/>
+                    <img src="${h.url_for('/default/images/icons/lock-unlock.png')}" alt="${_('Toggle (Enable) %s Icon' % (type))}"/>
                 % else:
-                    <img src="/default/images/icons/lock.png" alt="${_('Toggle (Disable) %s Icon' % (type))}"/>
+                    <img src="${h.url_for('/default/images/icons/lock.png')}" alt="${_('Toggle (Disable) %s Icon' % (type))}"/>
                 % endif
             </a></li>
         % endif
diff --git a/swat/templates/default/derived/dashboard.mako b/swat/templates/default/derived/dashboard.mako
index 3b7217f..b62c2ac 100644
--- a/swat/templates/default/derived/dashboard.mako
+++ b/swat/templates/default/derived/dashboard.mako
@@ -54,7 +54,7 @@ and the title bar.</%doc>
 	    <h2 class="title-icon" style="background-image:url('/default/images/icons/${item.get_dashboard_info('image/name')}')"><a href="${link}" title="${item.get_dashboard_info('link/title')}">${item.get_dashboard_info('link/name')}</a></h2>
 
 	    <ul>                                
-		<li><a href="${link}" title="${item.get_dashboard_info('link/title')}"><img src="/default/images/icons/arrow-000-small.png" alt="Right Arrow Icon" /></a></li>                                
+		<li><a href="${link}" title="${item.get_dashboard_info('link/title')}"><img src="${h.url_for('/default/images/icons/arrow-000-small.png')}" alt="Right Arrow Icon" /></a></li>                                
 	    </ul>
 	</div>
         
@@ -71,7 +71,7 @@ and the title bar.</%doc>
                                         
                     <li>
                         <a href="${link}" title="${item.get_action_info('link/title', action)}" class="item-icon-link">
-                            <img src="/default/images/icons/${item.get_action_info('image/name', action)}" alt="${item.get_action_info('image/alt', action)}" />
+                            <img src="${h.url_for('/default/images/icons/' + item.get_action_info('image/name', action))}" alt="${item.get_action_info('image/alt', action)}" />
                             <span>${item.get_action_info('link/name', action)}</span>
                         </a>
                     </li>
diff --git a/swat/templates/default/derived/share.mako b/swat/templates/default/derived/share.mako
index 13069e1..0559347 100644
--- a/swat/templates/default/derived/share.mako
+++ b/swat/templates/default/derived/share.mako
@@ -140,10 +140,10 @@ ${h.end_form()}
     
 <%def name="quick_tasks(share_name, is_disabled=False)">
     <ul class="quick-tasks">
-	<li><a href="${h.url_for('share_action', action = 'edit', name = share_name)}" title="${_('Edit Share')}"><img src="/default/images/icons/folder-pencil.png" alt="${_('Edit Share Icon')}"/></a></li>
-	<li><a href="${h.url_for('share_action', action = 'remove', name = share_name)}" title="${_('Remove Share')}"><img src="/default/images/icons/folder-minus.png" alt="${_('Remove Share Icon')}"/></a></li>
-	<li><a href="${h.url_for('share_action', action = 'copy', name = share_name)}" title="${_('Copy this Share')}"><img src="/default/images/icons/folders-plus.png" alt="${_('Copy Share Icon')}"/></a></li>
-	<!--<li><a href="${h.url_for('share_action', action = 'toggle', name = share_name)}" title="${_('Enable this Share')}"><img src="/default/images/icons/switch-plus.png" alt="${_('Enable Share Icon')}"/></a></li>-->
+	<li><a href="${h.url_for('share_action', action = 'edit', name = share_name)}" title="${_('Edit Share')}"><img src="${h.url_for('/default/images/icons/folder-pencil.png')}" alt="${_('Edit Share Icon')}"/></a></li>
+	<li><a href="${h.url_for('share_action', action = 'remove', name = share_name)}" title="${_('Remove Share')}"><img src="${h.url_for('/default/images/icons/folder-minus.png')}" alt="${_('Remove Share Icon')}"/></a></li>
+	<li><a href="${h.url_for('share_action', action = 'copy', name = share_name)}" title="${_('Copy this Share')}"><img src="${h.url_for('/default/images/icons/folders-plus.png')}" alt="${_('Copy Share Icon')}"/></a></li>
+	<!--<li><a href="${h.url_for('share_action', action = 'toggle', name = share_name)}" title="${_('Enable this Share')}"><img src="${h.url_for('/default/images/icons/switch-plus.png')}" alt="${_('Enable Share Icon')}"/></a></li>-->
     </ul>
 </%def>
 
-- 
1.7.9.5