# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 2011-02-16 10:16:27
# Node ID 4fa80e0484ef5c33feaa9c39fc66916f410ba353
# Parent  af6ca51fb80fa75b62982a04a81b7c9df8dc7783

rhodecode release 1.1.3 changes part2

diff --git a/docs/changelog.rst b/docs/changelog.rst
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,13 +3,13 @@
 Changelog
 =========
 
-1.1.3 (**2011-02-15**)
+1.1.3 (**2011-02-16**)
 ======================
 
 news
 ----
 
-- implemented #102 allowing '.' in username
+- implemented #102 allowing the '.' character in username
 - added option to access repository just by entering http://server/<repo_name>
 - celery task ignores result for better performance
 
@@ -27,11 +27,9 @@ fixes
 - removed issue with space inside renamed repository after deletion
 - db transaction fixes when filesystem repository creation failed
 - fixed #106 relation issues on databases different than sqlite
-
 - fixed static files paths links to use of url() method
 
 
-
 1.1.2 (**2011-01-12**)
 ======================
 
diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py
--- a/rhodecode/lib/helpers.py
+++ b/rhodecode/lib/helpers.py
@@ -399,10 +399,10 @@ def bool2icon(value):
     """
 
     if value is True:
-        return HTML.tag('img', src="/images/icons/accept.png", alt=_('True'))
+        return HTML.tag('img', src=url("/images/icons/accept.png"), alt=_('True'))
 
     if value is False:
-        return HTML.tag('img', src="/images/icons/cancel.png", alt=_('False'))
+        return HTML.tag('img', src=url("/images/icons/cancel.png"), alt=_('False'))
 
     return value
 
@@ -452,7 +452,7 @@ def action_parser(user_log):
         repo_name = action_params
         return str(link_to(action_params, url('summary_home',
                                           repo_name=repo_name,)))
-        
+
     map = {'user_deleted_repo':(_('[deleted] repository'), None),
            'user_created_repo':(_('[created] repository'), None),
            'user_forked_repo':(_('[forked] repository'), get_fork_name),
@@ -475,7 +475,7 @@ def action_parser(user_log):
     if action_str[1] is not None:
         action_params_func = action_str[1]
 
-    return literal(action +" "+ action_params_func())
+    return literal(action + " " + action_params_func())
 
 def action_parser_icon(user_log):
     action = user_log.action
diff --git a/rhodecode/templates/admin/repos/repos.html b/rhodecode/templates/admin/repos/repos.html
--- a/rhodecode/templates/admin/repos/repos.html
+++ b/rhodecode/templates/admin/repos/repos.html
@@ -39,18 +39,18 @@
                  <td>
                  ## TYPE OF REPO
                  %if repo['repo'].dbrepo.repo_type =='hg':
-                   <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+                   <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url("/images/icons/hgicon.png")}"/>
                  %elif repo['repo'].dbrepo.repo_type =='git':
-                   <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+                   <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url("/images/icons/giticon.png")}"/>
                  %else:
                    
                  %endif
                  
                  ## PRIVATE/PUBLIC REPO                  
                  %if repo['repo'].dbrepo.private:
-                    <img alt="${_('private')}" src="/images/icons/lock.png"/>
+                    <img alt="${_('private')}" src="${h.url("/images/icons/lock.png")}"/>
                  %else:
-                    <img alt="${_('public')}" src="/images/icons/lock_open.png"/>
+                    <img alt="${_('public')}" src="${h.url("/images/icons/lock_open.png")}"/>
                  %endif         
                 ${h.link_to(repo['name'],h.url('edit_repo',repo_name=repo['name']))}
                 
@@ -58,7 +58,7 @@
 	            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 	            	<img class="icon" alt="${_('public')}"
 	            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}" 
-	            	src="/images/icons/arrow_divide.png"/></a>
+	            	src="${h.url("/images/icons/arrow_divide.png")}"/></a>
 	            %endif                
                 </td>
 				<td title="${repo['description']}">${h.truncate(repo['description'],60)}</td>
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html
--- a/rhodecode/templates/admin/users/user_edit_my_account.html
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html
@@ -123,16 +123,16 @@
 		        <tr>
 		            <td>
                      %if repo['repo'].dbrepo.repo_type =='hg':
-                       <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+                       <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url("/images/icons/hgicon.png")}"/>
                      %elif repo['repo'].dbrepo.repo_type =='git':
-                       <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+                       <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url("/images/icons/giticon.png")}"/>
                      %else:
                        
                      %endif 		            
 		             %if repo['repo'].dbrepo.private:
-		                <img class="icon" alt="${_('private')}" src="/images/icons/lock.png"/>
+		                <img class="icon" alt="${_('private')}" src="${h.url("/images/icons/lock.png")}"/>
 		             %else:
-		                <img class="icon" alt="${_('public')}" src="/images/icons/lock_open.png"/>
+		                <img class="icon" alt="${_('public')}" src="${h.url("/images/icons/lock_open.png")}"/>
 		             %endif
 		                                             
 		            ${h.link_to(repo['repo'].name, h.url('summary_home',repo_name=repo['repo'].name),class_="repo_name")}
@@ -140,11 +140,11 @@
 		            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 		            	<img class="icon" alt="${_('public')}"
 		            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}" 
-		            	src="/images/icons/arrow_divide.png"/></a>
+		            	src="${h.url("/images/icons/arrow_divide.png")}"/></a>
 		            %endif		            
 		            </td> 
 		            <td><span class="tooltip" tooltip_title="${repo['repo'].last_change}">${("r%s:%s") % (h.get_changeset_safe(repo['repo'],'tip').revision,h.short_id(h.get_changeset_safe(repo['repo'],'tip').raw_id))}</span></td>
-		            <td><a href="${h.url('repo_settings_home',repo_name=repo['repo'].name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="/images/icons/application_form_edit.png"/></a></td>
+		            <td><a href="${h.url('repo_settings_home',repo_name=repo['repo'].name)}" title="${_('edit')}"><img class="icon" alt="${_('private')}" src="${h.url("/images/icons/application_form_edit.png")}"/></a></td>
 		            <td>
 	                  ${h.form(url('repo_settings_delete', repo_name=repo['repo'].name),method='delete')}
 	                    ${h.submit('remove_%s' % repo['repo'].name,'',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")}
diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -127,7 +127,7 @@
                         %for repo in c.cached_repo_list:
                         
                           %if repo['repo'].dbrepo.private:
-                             <li><img src="/images/icons/lock.png" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}</li>
+                             <li><img src="${h.url("/images/icons/lock.png")}" alt="${_('Private repository')}" class="repo_switcher_type"/>${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}</li>
                           %else:
                              <li><img src="${h.url("/images/icons/lock_open.png")}" alt="${_('Public repository')}" class="repo_switcher_type" />${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}</li>
                           %endif  
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -77,7 +77,7 @@
 									</div>					
 										%if len(cs.parents)>1:
 										<div class="merge">
-											${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
+											${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>
 										</div>
 										%endif
 								   %if cs.parents:							
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -55,7 +55,7 @@
 		             </div>                  
 		                 %if len(c.changeset.parents)>1:
 		                 <div class="merge">
-		                     ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
+		                     ${_('merge')}<img alt="merge" src="${h.url("/images/icons/arrow_join.png")}"/>
 		                 </div>
 		                 %endif
 		                 
diff --git a/rhodecode/templates/index.html b/rhodecode/templates/index.html
--- a/rhodecode/templates/index.html
+++ b/rhodecode/templates/index.html
@@ -61,18 +61,18 @@
 		            <div style="white-space: nowrap">
 		             ## TYPE OF REPO
 		             %if repo['repo'].dbrepo.repo_type =='hg':
-		               <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+		               <img class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url("/images/icons/hgicon.png")}"/>
 		             %elif repo['repo'].dbrepo.repo_type =='git':
-		               <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+		               <img class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url("/images/icons/giticon.png")}"/>
 		             %else:
 		               
 		             %endif 
 		            
 		             ##PRIVATE/PUBLIC
 		             %if repo['repo'].dbrepo.private:
-		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
+		                <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url("/images/icons/lock.png")}"/>
 		             %else:
-		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
+		                <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url("/images/icons/lock_open.png")}"/>
 		             %endif
 		            
 		            ##NAME   
@@ -82,7 +82,7 @@
 		            	<a href="${h.url('summary_home',repo_name=repo['repo'].dbrepo.fork.repo_name)}">
 		            	<img class="icon" alt="${_('fork')}"
 		            	title="${_('Fork of')} ${repo['repo'].dbrepo.fork.repo_name}" 
-		            	src="/images/icons/arrow_divide.png"/></a>
+		            	src="${h.url("/images/icons/arrow_divide.png")}"/></a>
 		            %endif
 		            </div>
 		            </td>
diff --git a/rhodecode/templates/journal.html b/rhodecode/templates/journal.html
--- a/rhodecode/templates/journal.html
+++ b/rhodecode/templates/journal.html
@@ -57,16 +57,16 @@
             %for entry in c.following:
                 <div class="currently_following">
                     %if entry.follows_user_id:
-                      <img title="${_('following user')}" alt="${_('user')}" src="/images/icons/user.png"/>
+                      <img title="${_('following user')}" alt="${_('user')}" src="${h.url("/images/icons/user.png")}"/>
                       ${entry.follows_user.full_contact}
                     %endif
                     
                     %if entry.follows_repo_id:
                     
                       %if entry.follows_repository.private:
-                        <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
+                        <img class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url("/images/icons/lock.png")}"/>
                       %else:
-                        <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
+                        <img class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url("/images/icons/lock_open.png")}"/>
                       %endif
                       
                       ${h.link_to(entry.follows_repository.repo_name,h.url('summary_home',
diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html
--- a/rhodecode/templates/summary/summary.html
+++ b/rhodecode/templates/summary/summary.html
@@ -32,16 +32,16 @@
 			  </div>
 			  <div class="input-short">
 		         %if c.repo_info.dbrepo.repo_type =='hg':
-		           <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
+		           <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url("/images/icons/hgicon.png")}"/>
 		         %endif
 		         %if c.repo_info.dbrepo.repo_type =='git':
-		           <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
+		           <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url("/images/icons/giticon.png")}"/>
 		         %endif 
                                  			  
 	             %if c.repo_info.dbrepo.private:
-	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
+	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url("/images/icons/lock.png")}"/>
 	             %else:
-	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
+	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url("/images/icons/lock_open.png")}"/>
 	             %endif
 			      <span style="font-size: 1.6em;font-weight: bold;vertical-align: baseline;">${c.repo_info.name}</span>
 			      %if c.rhodecode_user.username != 'default':