diff options
| -rw-r--r-- | pylons_app/__init__.py | 2 | ||||
| -rw-r--r-- | pylons_app/public/css/monoblue_custom.css | 28 | ||||
| -rw-r--r-- | pylons_app/templates/base/base.html | 3 | ||||
| -rw-r--r-- | pylons_app/templates/changeset/changeset.html | 30 | ||||
| -rw-r--r-- | pylons_app/templates/index.html | 18 | ||||
| -rw-r--r-- | pylons_app/templates/summary/summary.html | 7 |
6 files changed, 46 insertions, 42 deletions
diff --git a/pylons_app/__init__.py b/pylons_app/__init__.py index 8e547f26..61249f92 100644 --- a/pylons_app/__init__.py +++ b/pylons_app/__init__.py @@ -2,7 +2,7 @@ Hg app, a web based mercurial repository managment based on pylons """ -VERSION = (0, 7, 4, 'beta') +VERSION = (0, 7, 5, 'beta') __version__ = '.'.join((str(each) for each in VERSION[:4])) diff --git a/pylons_app/public/css/monoblue_custom.css b/pylons_app/public/css/monoblue_custom.css index 1e771251..ff230d59 100644 --- a/pylons_app/public/css/monoblue_custom.css +++ b/pylons_app/public/css/monoblue_custom.css @@ -173,13 +173,13 @@ ul.page-nav { } ul.page-nav li { - margin: 0 2px 0 0; + margin: 0 4px 0 0; float: left; height: 24px; font-size: 1.1em; line-height: 24px; text-align: center; - background: #DDD; + background: #556CB5; } ul.page-nav li.current { @@ -187,21 +187,24 @@ ul.page-nav li.current { padding-right: 5px; padding-left: 5px; } - +ul.page-nav li.current a { + color: #556CB5; +} ul.page-nav li a { height: 24px; - color: #666; + color: #FFF; padding-right: 5px; padding-left: 5px; display: block; text-decoration: none; + font-weight: bold; } ul.page-nav li.logout a { - color: red; + color: #FDAC9D; } ul.page-nav li a:hover { - color: #333; background: #FFF; + color: #556CB5; } ul.submenu { @@ -523,21 +526,12 @@ p.files { } #changeset_content .container .left .message{ - + font-style: italic; + color: #556CB5; } - - - - - - - - .cs_files{ - border: 1px solid #CCCCCC; width: 60%; - } .cs_files .cs_added{ diff --git a/pylons_app/templates/base/base.html b/pylons_app/templates/base/base.html index d99ebbca..f3256dbe 100644 --- a/pylons_app/templates/base/base.html +++ b/pylons_app/templates/base/base.html @@ -65,6 +65,7 @@ def is_current(selected): else{ YAHOO.util.Dom.setStyle('switch_repos','display',''); YAHOO.util.Dom.setStyle('repo_switcher','background','#FFFFFF'); + YAHOO.util.Dom.setStyle('repo_switcher','color','#556CB5'); YAHOO.util.Dom.addClass('repo_switcher','selected'); } }); @@ -75,7 +76,7 @@ def is_current(selected): window.location = url; }) }); - </script> + </script> <ul class="page-nav"> <li> <a id="repo_switcher" title="${_('Switch repository')}" href="#">↓</a> diff --git a/pylons_app/templates/changeset/changeset.html b/pylons_app/templates/changeset/changeset.html index cd9bb4ab..567290b5 100644 --- a/pylons_app/templates/changeset/changeset.html +++ b/pylons_app/templates/changeset/changeset.html @@ -54,7 +54,7 @@ from pylons_app.lib import filters </div> </div> - <div style="clear: both"></div> + <div style="clear:both;height:10px"></div> <div class="cs_files"> %for change,filenode,diff in c.changes: <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div> @@ -67,21 +67,25 @@ from pylons_app.lib import filters <div id="body" class="diffblock"> <div id="${'CHANGE-%s'%filenode.path}" class="code-header"> <div> - <span> - ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name, - revision=filenode.changeset.raw_id,f_path=filenode.path))} - </span> - - ##» <span style="font-size:77%">${h.link_to(_('diff'), - ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='diff'))}</span> - ##» <span style="font-size:77%">${h.link_to(_('raw diff'), - ##h.url.current(diff2=c.diff2,diff1=c.diff1.split(':')[-1],diff='raw'))}</span> - ##» <span style="font-size:77%">${h.link_to(_('download diff'), - ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='download'))}</span> + <span> + ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name, + revision=filenode.changeset.raw_id,f_path=filenode.path))} + </span> + + ##» <span style="font-size:77%">${h.link_to(_('diff'), + ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='diff'))}</span> + ##» <span style="font-size:77%">${h.link_to(_('raw diff'), + ##h.url.current(diff2=c.diff2,diff1=c.diff1.split(':')[-1],diff='raw'))}</span> + ##» <span style="font-size:77%">${h.link_to(_('download diff'), + ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='download'))}</span> </div> </div> <div class="code-body"> - ${diff|n} + %if diff: + ${diff|n} + %else: + ${_('No changes in this file')} + %endif </div> </div> %endif diff --git a/pylons_app/templates/index.html b/pylons_app/templates/index.html index 1fa1d135..dbdf723a 100644 --- a/pylons_app/templates/index.html +++ b/pylons_app/templates/index.html @@ -39,16 +39,16 @@ from pylons_app.lib import filters <td>${h.link(repo['name'],h.url('summary_home',repo_name=repo['name']))}</td> <td>${repo['description']}</td> <td>${repo['last_change']|n,filters.age}</td> - <td>r${repo['rev']}:<a href="/${repo['name']}/rev/${repo['tip']}/">${repo['tip']}</a></td> - <td>${repo['contact']}</td> + <td>${h.link_to('r%s:%s' % (repo['rev'],repo['tip']),h.url('changeset_home',repo_name=repo['name'],revision=repo['tip']))}</td> + <td title="${repo['contact']}">${repo['contact']|n,filters.person}</td> - %for archive in repo['repo_archives']: - <td class="indexlinks"> - ${h.link_to(archive['type'], - h.url('files_archive_home',repo_name=repo['name'], - revision='tip',fileformat=archive['extension']),class_="archive_logo" )} - </td> - %endfor + ##%for archive in repo['repo_archives']: + ##<td class="indexlinks"> + ## ${h.link_to(archive['type'], + ## h.url('files_archive_home',repo_name=repo['name'], + ## revision='tip',fileformat=archive['extension']),class_="archive_logo" )} + ##</td> + ##%endfor <td> ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=repo['name']),class_='rss_logo')} diff --git a/pylons_app/templates/summary/summary.html b/pylons_app/templates/summary/summary.html index 7c0137be..558e84db 100644 --- a/pylons_app/templates/summary/summary.html +++ b/pylons_app/templates/summary/summary.html @@ -41,7 +41,7 @@ E.onDOMReady(function(e){ <dt>${_('contact')}</dt> <dd>${c.repo_info.contact}</dd> <dt>${_('last change')}</dt> - <dd>${c.repo_info.last_change|n,filters.rfc822date} - ${c.repo_info.last_change|n,filters.age}</dd> + <dd>${c.repo_info.last_change|n,filters.age} - ${c.repo_info.last_change|n,filters.rfc822date}</dd> <dt>${_('clone url')}</dt> <dd><input type="text" id="clone_url" readonly="readonly" value="hg clone ${c.clone_repo_url}" size="40"/></dd> <dt>${_('download')}</dt> @@ -55,6 +55,11 @@ E.onDOMReady(function(e){ revision='tip',fileformat=archive['extension']),class_="archive_logo")} %endfor </dd> + <dt>${_('feeds')}</dt> + <dd> + ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_logo')} + ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_logo')} + </dd> </dl> <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2> |