changeset 375:3e55d9981c0e

templating fixes
author Marcin Kuzminski <marcin@python-works.com>
date Wed, 28 Jul 2010 23:38:06 +0200
parents 6725742f029a
children 7fbf81447c6c
files pylons_app/controllers/files.py pylons_app/public/css/style.css pylons_app/templates/admin/repos/repos.html pylons_app/templates/files/files_annotate.html pylons_app/templates/index.html
diffstat 5 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/pylons_app/controllers/files.py	Wed Jul 28 20:10:39 2010 +0200
+++ b/pylons_app/controllers/files.py	Wed Jul 28 23:38:06 2010 +0200
@@ -104,6 +104,7 @@
         c.file = cs.get_node(f_path)
         c.file_msg = cs.get_file_message(f_path)
         c.cur_rev = cs.raw_id
+        c.rev_nr = cs.revision        
         c.f_path = f_path
 
         return render('files/files_annotate.html')
--- a/pylons_app/public/css/style.css	Wed Jul 28 20:10:39 2010 +0200
+++ b/pylons_app/public/css/style.css	Wed Jul 28 23:38:06 2010 +0200
@@ -3019,10 +3019,14 @@
     margin-left:3px;
     margin-righ:3px;
 }
-.info_box input {
-    padding:3px 6px;
-}
-
+.info_box input#at_rev {
+	padding:1px 3px 3px 2px;
+	text-align:center;
+}
+.info_box input#view {
+	padding:0px 3px 2px 2px;
+	text-align:center;
+}
 /* -----------------------------------------------------------
     TOOLTIP
 ----------------------------------------------------------- */
--- a/pylons_app/templates/admin/repos/repos.html	Wed Jul 28 20:10:39 2010 +0200
+++ b/pylons_app/templates/admin/repos/repos.html	Wed Jul 28 23:38:06 2010 +0200
@@ -19,7 +19,7 @@
         ${self.breadcrumbs()}
         <ul class="links">
           <li>
-            <span>${h.link_to(u'ADD NEW REPO',h.url('new_repo'),class_="add_icon")}</span>
+            <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('new_repo'),class_="add_icon")}</span>
           </li>          
         </ul>        
     </div>
--- a/pylons_app/templates/files/files_annotate.html	Wed Jul 28 20:10:39 2010 +0200
+++ b/pylons_app/templates/files/files_annotate.html	Wed Jul 28 23:38:06 2010 +0200
@@ -9,7 +9,7 @@
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
-    ${_('annotate')}  
+    ${_('annotate')} @ R${c.rev_nr}:${c.cur_rev}
 </%def>
 
 <%def name="page_nav()">
@@ -25,7 +25,7 @@
 		<div id="files_data">
 			<h2>${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.file.path)}</h2>
 			<dl class="overview">
-				<dt>${_('Revision')}</dt>
+				<dt>${_('Last revision')}</dt>
 				<dd>r${c.file.last_changeset.revision}:${c.file.last_changeset._short}</dd>
 				<dt>${_('Size')}</dt>
 				<dd>${h.format_byte_size(c.file.size,binary=True)}</dd>
--- a/pylons_app/templates/index.html	Wed Jul 28 20:10:39 2010 +0200
+++ b/pylons_app/templates/index.html	Wed Jul 28 23:38:06 2010 +0200
@@ -30,7 +30,7 @@
 	        ##%if h.HasPermissionAll('repository.create')():
 	        <ul class="links">
 	          <li>
-	            <span>${h.link_to(u'ADD NEW REPO',h.url('new_repo'),class_="add_icon")}</span>
+	            <span>${h.link_to(u'ADD NEW REPOSITORY',h.url('new_repo'),class_="add_icon")}</span>
 	          </li>          
 	        </ul>  	        
 	        ##%endif