kallithea Changeset - b3c93efd1c97

Changeset - b3c93efd1c97

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Marcin Kuzminski - 16 years ago 2010-05-12 10:29:41
marcin@python-works.com

Updated template for summary (archives links)
added nex prev revision to file browser.
updated logic in files to implement next and prev revison switch

4 files changed with 38 insertions and 18 deletions:

pylons_app/config/routing.py

pylons_app/controllers/files.py

pylons_app/templates/files/files_browser.html

pylons_app/templates/summary.html

0 comments (0 inline, 0 general)

pylons_app/config/routing.py

➞

Show inline comments

@@ @@ -26,13 +26,14 @@ def make_map(config): @@
     map.resource('repo', 'repos', path_prefix='/_admin')
     map.resource('user', 'users', path_prefix='/_admin')
     #ADMIN
     with map.submapper(path_prefix='/_admin', controller='admin') as m:
         m.connect('admin_home', '/', action='index')#main page
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}', action='add_repo')
         m.connect('admin_add_repo', '/add_repo/{new_repo:[a-z0-9\. _-]*}',
                   action='add_repo')
     map.connect('changeset_home', '/{repo_name}/changeset/{revision}',
                 controller='changeset', revision='tip')
     map.connect('summary_home', '/{repo_name}/summary',
                 controller='summary')
@@ @@ -47,7 +48,9 @@ def make_map(config): @@
     map.connect('files_home', '/{repo_name}/files/{revision}/{f_path:.*}',
                 controller='files', revision='tip', f_path='')
     map.connect('files_diff_home', '/{repo_name}/diff/{f_path:.*}',
                 controller='files', action='diff', revision='tip', f_path='')
     map.connect('files_raw_home', '/{repo_name}/rawfile/{revision}/{f_path:.*}',
                 controller='files', action='rawfile', revision='tip', f_path='')
     map.connect('files_archive_home', '/{repo_name}/archive/{revision}/{fileformat}',
                 controller='files', action='archivefile', revision='tip')
     return map

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -17,27 +17,39 @@ class FilesController(BaseController): @@
         c.repos_prefix = config['repos_name']
         c.repo_name = get_repo_slug(request)
     def index(self, repo_name, revision, f_path):
         hg_model = HgModel()
         c.repo = repo = hg_model.get_repo(c.repo_name)
         revision = request.POST.get('at_rev', None) or revision
         revision = request.POST.get('at_rev', None) or revision
         if request.POST.get('view_low'):
             revision = int(revision) - 1
         if request.POST.get('view_high'):
             revision = int(revision) + 1
         def get_next_rev(cur):
             max_rev = len(c.repo.revisions) - 1
             if revision > max_rev:
                 revision = max_rev
             r = cur + 1
             if r > max_rev:
                 r = max_rev
             return r
         def get_prev_rev(cur):
             r = cur - 1
             return r
         c.f_path = f_path
         try:
             c.changeset = repo.get_changeset(repo._get_revision(revision))
             cur_rev = repo.get_changeset(revision).revision
             prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).raw_id
             next_rev = repo.get_changeset(get_next_rev(cur_rev)).raw_id
             c.url_prev = url('files_home', repo_name=c.repo_name,
                              revision=prev_rev, f_path=f_path)
             c.url_next = url('files_home', repo_name=c.repo_name,
                              revision=next_rev, f_path=f_path)
             c.changeset = repo.get_changeset(revision)
             try:
                 c.file_msg = c.changeset.get_file_message(f_path)
             except:
                 c.file_msg = None
             c.cur_rev = c.changeset.raw_id
@@ @@ -56,12 +68,15 @@ class FilesController(BaseController): @@
         file_node = c.repo.get_changeset(revision).get_node(f_path)
         response.headers['Content-type'] = file_node.mimetype
         response.headers['Content-disposition'] = 'attachment; filename=%s' \
                                                     % f_path.split('/')[-1]
         return file_node.content
     def archivefile(self, repo_name, revision, fileformat):
         return '%s %s %s' % (repo_name, revision, fileformat)
     def diff(self, repo_name, f_path):
         hg_model = HgModel()
         diff1 = request.GET.get('diff1')
         diff2 = request.GET.get('diff2')
         c.no_changes = diff1 == diff2
         c.f_path = f_path

pylons_app/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -5,17 +5,17 @@ @@
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
 	<div class="browser-header">
 		${h.form(h.url.current())}
-		<span>${_('view')}@rev ${h.submit('view_low','-')}${h.text('at_rev',value=c.rev_nr,size='5')}${h.submit('view_high','+')}</span>
+		<span>${_('view')}@rev <a style="font-size: 1.3em"  href="${c.url_prev}">&laquo;</a>${h.text('at_rev',value=c.rev_nr,size='5')}<a style="font-size: 1.3em" href="${c.url_next}">&raquo;</a></span>
 		${h.submit('view','view')}
 		${h.end_form()}
 	</div>
-	<div class="browser-body">
 	<div class="browser-body">
 		<table class="code-browser">
 		         <thead>
 		             <tr>
 		                 <th>${_('Name')}</th>
 		                 <th>${_('Size')}</th>
 		                 <th>${_('Revision')}</th>

pylons_app/templates/summary.html

➞

Show inline comments

@@ @@ -35,18 +35,20 @@ from pylons_app.lib import filters @@
         <dt>${_('last change')}</dt>
         <dd>${c.repo_info.last_change|n,filters.rfc822date} - ${c.repo_info.last_change|n,filters.age}</dd>
         <dt>${_('url')}</dt>
         <dd><pre>hg clone <a href="${c.clone_repo_url}">${c.clone_repo_url}</a></pre></dd>
         <dt>${_('Download')}</dt>
         <dd>
        	%for archive in c.repo_info._get_archives():
 				| <a href="/${c.repo_info.name}/archive/${archive['node']}${archive['extension']}">
 				${c.repo_info.name}.${archive['type']}
 				</a>
        	%for cnt,archive in enumerate(c.repo_info._get_archives()):
        		 %if cnt >=1:
+       		 |
        		 %endif
        		 ${h.link_to(c.repo_info.name+'.'+archive['type'],
        			h.url('files_archive_home',repo_name=c.repo_info.name,
        			revision='tip',fileformat=archive['extension']))}
 		%endfor
+		|
         </dd>
     </dl>
     <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
     <table>
 	<%def name="message_slug(msg)">

0 comments (0 inline, 0 general)