diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -1,113 +1,132 @@ ## -*- coding: utf-8 -*- - - - - ${next.title()} - - - - - ${self.css()} - - ${self.js()} - - - -

- -

-
- -
-
- %if c.rhodecode_user.username == 'default': - %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): - ${h.link_to('anonymous',h.url('register'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))} - %else: - ${h.link_to('anonymous',h.url('#'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))} - %endif - - %else: - ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))} - %endif -
-
- ${_('Home')} -
- ${_('Journal')} - ##(${c.unread_journal}) -
${h.link_to(u'Login',h.url('login_home'))}
${h.link_to(u'Log Out',h.url('logout_home'))}

+ +

+
+ ${h.form(h.url('login_home',came_from=h.url.current()))} +
+
+
+
+ ${_('Username')}: +
+
+ ${h.text('username',class_='focus',size=40)} +
+ +
+
+
+ ${_('Password')}: +
+
+ ${h.password('password',class_='focus',size=40)} +
+ +
+
+
${h.link_to(_('Forgot password ?'),h.url('reset_password'))}
+
+ %if h.HasPermissionAny('hg.admin', 'hg.register.auto_activate', 'hg.register.manual_activate')(): + ${h.link_to(_("Don't have an account ?"),h.url('register'))} + %endif +
+ ${h.submit('sign_in',_('Sign In'),class_="ui-button")} +
+
+
+ ${h.end_form()} +
+ +
+ +
+
+ %if c.rhodecode_user.username == 'default': + ${_('Public journal')} + %else: + ${h.link_to(c.rhodecode_user.username,h.url('admin_settings_my_account'),title='%s %s'%(c.rhodecode_user.name,c.rhodecode_user.lastname))} + %endif +
+
+ ${_('Home')} +
+ ${_('Journal')} + ##(${c.unread_journal} +
${h.link_to(_(u'Login'),h.url('login_home'),id='quick_login_link')}
${h.link_to(_(u'Log Out'),h.url('logout_home'))}

+ +

${c.rhodecode_name}

+ + ${self.page_nav()} + + ${self.body()} +

+ <% messages = h.flash.pop_messages() %> + % if messages: +

${message}

- -

${c.rhodecode_name}

- - - ${self.page_nav()} - -

- - - -

- <% messages = h.flash.pop_messages() %> - % if messages: -

${message}

- % endif -

- ${next.main()} -

- + % endif +

+ ${next.main()} +

+ - - - - + + + - +### MAKO DEFS ### +<%def name="page_nav()"> + ${self.menu()} + -### MAKO DEFS ### -<%def name="page_nav()"> - ${self.menu()} +<%def name="breadcrumbs()"> +

+ ${self.breadcrumbs_links()} +

+ <%def name="menu(current=None)"> <% def is_current(selected): @@ -121,26 +140,75 @@

- $${_('Products')}$ + $${_('Products')}$ ↓ -

$${_('Private repository')}$ ${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}
$${_('Public repository')}$ ${h.link_to(repo['repo'].name,h.url('summary_home',repo_name=repo['repo'].name),class_="%s" % repo['repo'].dbrepo.repo_type)}

+ ${_('loading...')} +

- $${_('Summary')}$ + $${_('Summary')}$ ${_('Summary')} @@ -148,7 +216,7 @@ ##

## ## - ## $${_('Shortlog')}$ + ## $${_('Shortlog')}$ ## ## ${_('Shortlog')} ## @@ -156,7 +224,7 @@

- $${_('Changelog')}$ + $${_('Changelog')}$ ${_('Changelog')} @@ -165,16 +233,16 @@

- $${_('Switch to')}$ + $${_('Switch to')}$ ${_('Switch to')}

- ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')} + ${h.link_to('%s (%s)' % (_('branches'),len(c.rhodecode_repo.branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
- ${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}
- ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')} + ${h.link_to('%s (%s)' % (_('tags'),len(c.rhodecode_repo.tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
- ${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}
- - $${_('Files')}$ + $${_('Files')}$ ${_('Files')} @@ -208,7 +276,7 @@
- - $${_('Admin')}$ + $${_('Admin')}$ ${_('Options')} @@ -223,14 +291,16 @@
- ${h.link_to(_('fork'),h.url('repo_fork_home',repo_name=c.repo_name),class_='fork')}
- ${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}
- + % if h.HasPermissionAll('hg.admin')('access admin main page'): +
- ${h.link_to(_('admin'),h.url('admin_home'),class_='admin')} <%def name="admin_menu()">
  - ${h.link_to(_('journal'),h.url('admin_home'),class_='journal')}
  - ${h.link_to(_('repositories'),h.url('repos'),class_='repos')}
  - ${h.link_to(_('repositories groups'),h.url('repos_groups'),class_='repos_groups')}
  - ${h.link_to(_('users'),h.url('users'),class_='users')}
  - ${h.link_to(_('users groups'),h.url('users_groups'),class_='groups')}
  - ${h.link_to(_('permissions'),h.url('edit_permission',id='default'),class_='permissions')}
  - ${h.link_to(_('ldap'),h.url('ldap_home'),class_='ldap')}
  - ${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}
- - + - $${_('Followers')}$ + $${_('Followers')}$ - ${c.repository_followers} + ${c.repository_followers}
- - + - $${_('Forks')}$ + $${_('Forks')}$ ${c.repository_forks}
%else: ##ROOT MENU @@ -270,25 +337,25 @@
- $${_('Home')}$ + $${_('Home')}$ ${_('Home')}
+ % if c.rhodecode_user.username != 'default': +
- $${_('Journal')}$ + $${_('Journal')}$ ${_('Journal')} -
- $${_('Search')}$ + $${_('Search')}$ ${_('Search')} @@ -298,7 +365,7 @@
- $${_('Admin')}$ + $${_('Admin')}$ ${_('Admin')} @@ -308,70 +375,3 @@

%endif - - -<%def name="css()"> - - - - - -<%def name="js()"> -## -## -## -## -## - - - - - - - - - -<%def name="breadcrumbs()"> -

- ${self.breadcrumbs_links()} -

- \ No newline at end of file