# HG changeset patch # User Marcin Kuzminski # Date 1274807892 -7200 # Node ID 64e1125fc479c6720a6185aea3209778cb6248ef # Parent 58b46f9194c347641bfc9a26697ef413a4761971 html + css changes, added icons and etc. diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/public/css/diff.css --- a/pylons_app/public/css/diff.css Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/public/css/diff.css Tue May 25 19:18:12 2010 +0200 @@ -19,7 +19,7 @@ font-weight: bold; } div.diffblock .code-body{ - background: #EEEEEE; + background: #FFFFFF; } div.diffblock pre.raw{ background: #FFFFFF; diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/public/css/monoblue_custom.css --- a/pylons_app/public/css/monoblue_custom.css Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/public/css/monoblue_custom.css Tue May 25 19:18:12 2010 +0200 @@ -6,15 +6,99 @@ } a { - color: #0000cc; + color: #556CB5; text-decoration: none; } a:HOVER{ text-decoration: underline; } + /*** end of Initial Settings ***/ +/*** ***/ +.table_disp { + border-left: 0px solid #666666; + border-bottom: 1px solid #666666; + border-right: 1px solid #666666; + padding: 0px; + margin: 0px; + border-spacing: 0px; +} + +.table_disp .header { + border-top: 1px solid #666666; + background-color: #556CB5; + font-weight: bold; + color: white; + vertical-align: middle; + padding: 3px 5px; + text-align: left; + font-size: 0.9em; +} + +.table_disp .header td { + padding: 4px; + vertical-align: middle; + border-top: 1px solid #AAAAAA; + border-bottom: 2px solid #666666; +} +.table_disp td { + border-left: 1px solid #AAAAAA; + padding-left: 2px; + padding-right: 0px; +} + +table tr.parity0:hover,table tr.parity1:hover { + background: #D5E1E6; +} + +table tr.parity0 { + background: #EAEAE9; +} + +table tr.parity1 { + background: #FFFFFF; +} + + +/*** ***/ + /** common settings **/ +.add_icon{ + background: url("/images/icons/add.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; + +} +.edit_icon{ + background: url("/images/icons/folder_edit.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; +} + +.delete_icon{ + background: url("/images/icons/delete.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; + +} + +.action_button{ + border:0px; + display: block; +} +.action_button:hover{ + border:0px; + font-style:italic; + cursor: pointer; +} + div#main { padding: 5px; } @@ -121,15 +205,42 @@ } ul.submenu { - margin: 10px 0 -10px 20px; + margin: 5px 0px -20px 0px; list-style-type: none; } ul.submenu li { margin: 0 10px 0 0; - font-size: 1.2em; + font-size: 0.9em; + font-weight:bold; display: inline; } +ul.submenu .repos { + background: url("/images/icons/folder_edit.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; + +} +ul.submenu .users { + background: url("/images/icons/user_edit.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; +} +ul.submenu .permissions { + background: url("/images/icons/folder_key.png") no-repeat scroll 3px; + height: 16px; + padding-left: 20px; + padding-top: 0px; + text-align: left; +} + +ul.submenu .current_submenu { + border-bottom: 2px solid #556CB5; +} h2 { margin: 20px 0 10px; @@ -140,6 +251,7 @@ font-size: 1.2em; border-top: dotted 1px #D5E1E6; font-weight: bold; + color:#556CB5; } h2.no-link { @@ -215,18 +327,6 @@ font-size: 1.2em; } -table tr.parity0:hover,table tr.parity1:hover { - background: #D5E1E6; -} - -table tr.parity0 { - background: #EAEAE9; -} - -table tr.parity1 { - background: #FFFFFF; -} - span.logtags span { background-repeat: no-repeat; height: 16px; @@ -336,6 +436,9 @@ width: 150px; } +#clone_url{ + border: 0px; +} /** end of summary **/ /** chagelog **/ @@ -651,10 +754,6 @@ text-align: left; } -.current_submenu { - border-bottom: 2px solid; -} - #repos_list { border: 1px solid #556CB5; background: #FFFFFF; diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/admin/admin.html --- a/pylons_app/templates/admin/admin.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/admin/admin.html Tue May 25 19:18:12 2010 +0200 @@ -16,7 +16,6 @@ %if c.admin_user:

Welcome ${c.admin_username}

- ${_('Last actions')}
${c.log_data}
diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/admin/admin_log.html --- a/pylons_app/templates/admin/admin_log.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/admin/admin_log.html Tue May 25 19:18:12 2010 +0200 @@ -1,7 +1,7 @@ ## -*- coding: utf-8 -*- %if c.users_log: - - +
+ @@ -20,8 +20,8 @@
${_('Username')} ${_('Repository')} ${_('Action')}
diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/admin/repos/repos.html --- a/pylons_app/templates/admin/repos/repos.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/admin/repos/repos.html Tue May 25 19:18:12 2010 +0200 @@ -15,18 +15,24 @@ <%def name="main()">

${_('Repositories administration')}

- +
+ + + + + %for cnt,repo in enumerate(c.repos_list): %endfor
${_('name')}${_('last revision')}${_('action')}
${h.link_to(repo['name'],h.url('summary_home',repo_name=repo['name']))} r${repo['rev']}:${repo['tip']} ${h.form(url('repo', id=repo['name']),method='delete')} - ${h.submit('remove','remove',class_="submit",onclick="return confirm('Confirm to delete this repository');")} + ${h.submit('remove','delete',class_="delete_icon action_button",onclick="return confirm('Confirm to delete this repository');")} ${h.end_form()}
+ ${h.link_to(u'add repo',h.url('new_repo'))}
diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/admin/users/users.html --- a/pylons_app/templates/admin/users/users.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/admin/users/users.html Tue May 25 19:18:12 2010 +0200 @@ -15,13 +15,13 @@ <%def name="main()">

${_('Mercurial users')}

- - - - - - - +
IdUsernameActiveAdminAction
+ + + + + + %for user in c.users_list: @@ -31,12 +31,12 @@ %endfor
IDUsernameActiveAdminAction
${user.admin} ${h.form(url('user', id=user.user_id),method='delete')} - ${h.submit('remove','remove',class_="submit")} + ${h.submit('remove','delete',class_="delete_icon action_button")} ${h.end_form()}
-

${h.link_to(u'Add user',h.url('new_user'))}

+ ${h.link_to(u'add user',h.url('new_user'))}
diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/base/base.html --- a/pylons_app/templates/base/base.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/base/base.html Tue May 25 19:18:12 2010 +0200 @@ -113,10 +113,10 @@ %if current != None:
    -
  • ${h.link_to(u'repos',h.url('repos'))}
    • -
  • ${h.link_to(u'users',h.url('users'))}
    • +
  • ${h.link_to(u'repos',h.url('repos'),class_='repos')}
    • +
  • ${h.link_to(u'users',h.url('users'),class_='users')}
    • +
  • ${h.link_to(u'permissions',h.url('permissions'),class_='permissions')}
-
%endif diff -r 58b46f9194c3 -r 64e1125fc479 pylons_app/templates/summary/summary.html --- a/pylons_app/templates/summary/summary.html Tue May 25 00:32:18 2010 +0200 +++ b/pylons_app/templates/summary/summary.html Tue May 25 19:18:12 2010 +0200 @@ -15,6 +15,22 @@ <%def name="page_nav()"> ${self.menu('summary')} + +<%def name="js()"> + + + + <%def name="main()">

${_('Mercurial Repository Overview')}

@@ -26,8 +42,8 @@
${c.repo_info.contact}
${_('last change')}
${c.repo_info.last_change|n,filters.rfc822date} - ${c.repo_info.last_change|n,filters.age}
-
${_('url')}
- 
hg clone ${c.clone_repo_url}
+
${_('clone url')}
+
${_('download')}
%for cnt,archive in enumerate(c.repo_info._get_archives()):