Mercurial > kallithea
changeset 105:3ac4350b7848
Html updates and fixes
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 25 Apr 2010 22:45:54 +0200 |
parents | 4cea52709743 |
children | a86c8de926b4 |
files | pylons_app/public/css/monoblue_custom.css pylons_app/templates/admin_log.html pylons_app/templates/base/base.html pylons_app/templates/repos.html pylons_app/templates/shortlog_data.html pylons_app/templates/summary.html pylons_app/templates/users.html |
diffstat | 7 files changed, 51 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/public/css/monoblue_custom.css Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/public/css/monoblue_custom.css Sun Apr 25 22:45:54 2010 +0200 @@ -25,6 +25,9 @@ /** common settings **/ +div#main{ +padding:5px; +} div#container { background: #FFFFFF; position: relative; @@ -526,4 +529,9 @@ padding-left:20px; padding-top:5px; text-align:left; +} + +.current_submenu{ + border-bottom: 2px solid; + } \ No newline at end of file
--- a/pylons_app/templates/admin_log.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/admin_log.html Sun Apr 25 22:45:54 2010 +0200 @@ -17,22 +17,22 @@ </tr> %endfor - <tr> - <script type="text/javascript"> - var data_div = 'user_log'; - YAHOO.util.Event.onDOMReady(function(){ - YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ - YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});}); - </script> - <td>${c.users_log.pager('$link_previous ~2~ $link_next', +</table> +<div> + <script type="text/javascript"> + var data_div = 'user_log'; + YAHOO.util.Event.onDOMReady(function(){ + YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ + YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});}); + </script> + <h2>${c.users_log.pager('$link_previous ~2~ $link_next', onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); - YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}</td> - </tr> -</table> - + YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} + </h2> +</div> %else: ${_('No actions yet')} %endif
--- a/pylons_app/templates/base/base.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/base/base.html Sun Apr 25 22:45:54 2010 +0200 @@ -19,7 +19,9 @@ ${self.page_nav()} </ul> </div> - ${next.main()} + <div id="main"> + ${next.main()} + </div> <div class="page-footer"> Mercurial App © 2010 </div>
--- a/pylons_app/templates/repos.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/repos.html Sun Apr 25 22:45:54 2010 +0200 @@ -15,8 +15,8 @@ </%def> <%def name="main()"> <ul class="submenu"> - <li class="current_submenu"> - ${h.link_to(u'Repos',h.url('repos'))} + <li> + ${h.link_to(u'Repos',h.url('repos'), class_="current_submenu")} </li> <li> ${h.link_to(u'Users',h.url('users'))}
--- a/pylons_app/templates/shortlog_data.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/shortlog_data.html Sun Apr 25 22:45:54 2010 +0200 @@ -7,26 +7,29 @@ <tr class="parity${cnt%2}"> <td>${cs._ctx.date()|n,filters.age}</td> <td title="${cs.author}">${cs.author|n,filters.person}</td> - <td>${h.link_to(cs.message,h.url('rev/'+str(cs._ctx)))}</td> + <td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td> <td class="nowrap"> - ${h.link_to(_('changeset'),h.url('file/'+str(cs._ctx)))} + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} | - ${h.link_to(_('files'),h.url('file/'+str(cs._ctx)))} + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))} </td> - </tr> + </tr> %endfor - <tr> - <script type="text/javascript"> - var data_div = 'shortlog_data'; - YAHOO.util.Event.onDOMReady(function(){ - YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ - YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});}); - </script> - <td colspan=3>${c.repo_changesets.pager('$link_previous ~2~ $link_next', + +</table> + <div> + <script type="text/javascript"> + var data_div = 'shortlog_data'; + YAHOO.util.Event.onDOMReady(function(){ + YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ + YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});}); + </script> + <h2> + ${c.repo_changesets.pager('$link_previous ~2~ $link_next', onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{ success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText; YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){ YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');}); - YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}</td> - </tr> -</table> \ No newline at end of file + YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")} + </h2> + </div> \ No newline at end of file
--- a/pylons_app/templates/summary.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/summary.html Sun Apr 25 22:45:54 2010 +0200 @@ -47,43 +47,34 @@ </dd> </dl> - <h2><a href="{url}shortlog">Changes</a></h2> + <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2> <table> %for cnt,cs in enumerate(c.repo_changesets): <tr class="parity${cnt%2}"> <td>${cs._ctx.date()|n,filters.age}</td> <td>${cs.author}</td> - <td>${h.link_to(cs.message,h.url('rev/'+str(cs._ctx)))}</td> + <td>${h.link_to(cs.message,h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}</td> <td class="nowrap"> - ${h.link_to(_('changeset'),h.url('file/'+str(cs._ctx)))} + ${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))} | - ${h.link_to(_('files'),h.url('file/'+str(cs._ctx)))} + ${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))} </td> </tr> %endfor - <tr class="light"> - <td colspan="4"><a class="list" href="shortlog">...</a></td> - </tr> </table> - <h2><a href="{url}tags">${_('Tags')}</a></h2> + <h2>${h.link_to(_('Tags'),h.url('tags_home',repo_name=c.repo_name))}</h2> <table> %for tag in c.repo_tags: ${tag} %endfor - <tr class="light"> - <td colspan="3"><a class="list" href="tags">...</a></td> - </tr> </table> - <h2 class="no-link">Branches</h2> + <h2>${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</h2> <table> %for branch in c.repo_branches: ${branch} %endfor - <tr class="light"> - <td colspan="4"><a class="list" href="branches">...</a></td> - </tr> </table> </%def> \ No newline at end of file
--- a/pylons_app/templates/users.html Sun Apr 25 22:29:43 2010 +0200 +++ b/pylons_app/templates/users.html Sun Apr 25 22:45:54 2010 +0200 @@ -18,8 +18,8 @@ <li> ${h.link_to(u'Repos',h.url('repos'))} </li> - <li class="current_submenu"> - ${h.link_to(u'Users',h.url('users'))} + <li> + ${h.link_to(u'Users',h.url('users'), class_="current_submenu")} </li> </ul> <div>