kallithea Changeset - 3e55d9981c0e

Changeset - 3e55d9981c0e

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 15 years ago 2010-07-28 23:38:06
marcin@python-works.com

templating fixes

5 files changed with 13 insertions and 8 deletions:

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

0 comments (0 inline, 0 general)

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -95,24 +95,25 @@ class FilesController(BaseController): @@
         response.content_type = file_node.mimetype
         response.content_disposition = 'attachment; filename=%s' \
                                                     % f_path.split('/')[-1]
         return file_node.content
     def annotate(self, repo_name, revision, f_path):
         hg_model = HgModel()
         c.repo = hg_model.get_repo(c.repo_name)
         cs = c.repo.get_changeset(revision)
         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')
     def archivefile(self, repo_name, revision, fileformat):
         archive_specs = {
           '.tar.bz2': ('application/x-tar', 'tbz2'),
           '.tar.gz': ('application/x-tar', 'tgz'),
           '.zip': ('application/zip', 'zip'),
+        }
         if not archive_specs.has_key(fileformat):
             return 'Unknown archive type %s' % fileformat

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -3010,28 +3010,32 @@ table.code-browser .browser-dir { @@
 	border-width:1px;
 	color:#4A4A4A;
 	display:block;
 	font-weight:bold;
 	height:1%;
 	padding:4px 6px;
 	display: inline;
+}
 .info_box span{
     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
 ----------------------------------------------------------- */
 .yui-overlay,.yui-panel-container {
     visibility: hidden;
     position: absolute;
     z-index: 2;
+}
 .yui-tt {
     visibility: hidden;
     position: absolute;

pylons_app/templates/admin/repos/repos.html

➞

Show inline comments

@@ @@ -10,25 +10,25 @@ @@
     ${h.link_to(_('Admin'),h.url('admin_home'))} &raquo; ${_('Repositories')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('admin')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${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>
     <!-- end box / title -->
     <div class="table">
         <table class="table_disp">
         <tr class="header">
             <th class="left">${_('name')}</th>
             <th class="left">${_('owner')}</th>
             <th class="left">${_('last revision')}</th>
             <th class="left">${_('action')}</th>
         </tr>

pylons_app/templates/files/files_annotate.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('File annotate')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &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()">
 		${self.menu('files')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<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>
 				<dt>${_('Options')}</dt>
 				<dd>${h.link_to(_('show source'),
 						h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}
 					/ ${h.link_to(_('download as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.f_path))}
 				</dd>
 			</dl>
 			<div id="body" class="codeblock">
 				<div class="code-header">

pylons_app/templates/index.html

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
 		<a href="?sort=-${name_slug}">&uarr;</a>
 	</%def>
     <div class="box">
 	    <!-- box / title -->
 	    <div class="title">
 	        <h5>${_('Dashboard')}</h5>
 	        ##%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
 	    </div>
 	    <!-- end box / title -->
         <div class="table">
                     <table>
             <thead>
 	            <tr>
 			        <th class="left">${get_sort(_('Name'))}</th>
 			        <th class="left">${get_sort(_('Description'))}</th>
 			        <th class="left">${get_sort(_('Last change'))}</th>

0 comments (0 inline, 0 general)