diff --git a/pylons_app/templates/base/base.html b/pylons_app/templates/base/base.html --- a/pylons_app/templates/base/base.html +++ b/pylons_app/templates/base/base.html @@ -2,97 +2,120 @@ + ${next.title()} + - ${next.title()} - ##For future use yui reset for cross browser compatability. - ## + ${self.css()} + ${self.js()} + + +

+ +

+ ${h.link_to('%s %s (%s)'%(c.hg_app_user.name,c.hg_app_user.lastname,c.hg_app_user.username),h.url('edit_user', id=c.hg_app_user.user_id))} +
${h.link_to(u'Logout',h.url('logout_home'))}

+ +

${c.hg_app_name}

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

+ + + +

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

${message}

+ % endif +

+ ${next.main()} +

+ - -

${next.breadcrumbs()}

- ${self.page_nav()} -

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

${message}

- % endif -

- ${next.main()} - -

- + + + + -

- - -

- -

- ### MAKO DEFS ### - <%def name="page_nav()"> ${self.menu()} - ${self.submenu()} -<%def name="menu(current)"> -<% -def is_current(selected): - if selected == current: - return "class='current'" -%> +<%def name="menu(current=None)"> + <% + def is_current(selected): + if selected == current: + return "class='current'" + %> %if current not in ['home','admin']: - ##regular menu - -

- ↓ -
+ + + $${_('Products')}$ + + ↓ + +
${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}
${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}
${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}
${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}
${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}
+ + + $${_('Summary')}$ + + ${_('Summary')} + +
+ + + $${_('Shortlog')}$ + + ${_('Shortlog')} + +
+ + + $${_('Changelog')}$ + + ${_('Changelog')} + +
+ + + $${_('Branches')}$ + + ${_('Branches')} + +
+ + + $${_('Tags')}$ + + ${_('Tags')} + +
+ + + $${_('Files')}$ + + ${_('Files')} + +
${h.link_to(_('settings'),h.url('repo_settings_home',repo_name=c.repo_name))}
+ + + $${_('Settings')}$ + + ${_('Settings')} + +

${h.link_to(_('Home'),h.url('/'))}

+ + + $${_('Home')}$ + + ${_('Home')} + +
${h.link_to(_('Admin'),h.url('admin_home'))}
+ + + $${_('Admin')}$ + + ${_('Admin')} + +
- ${h.link_to(_('repositories'),h.url('repos'),class_='repos')}
- ${h.link_to(_('users'),h.url('users'),class_='users')}
- ${h.link_to(_('permissions'),h.url('permissions'),class_='permissions')}
- ${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}
+
${h.link_to(u'Logout',h.url('logout_home'))}

- -<%def name="submenu(current=None)"> - <% - def is_current(selected): - if selected == current: - return "class='current_submenu'" - %> - %if current != None: -

${h.link_to(_('repositories'),h.url('repos'),class_='repos')}
${h.link_to(_('users'),h.url('users'),class_='users')}
${h.link_to(_('permissions'),h.url('permissions'),class_='permissions')}
${h.link_to(_('settings'),h.url('admin_settings'),class_='settings')}

- %endif <%def name="css()"> - + + + + + + <%def name="js()"> + + - -<%def name="get_form_error(element)"> - %if hasattr(c,'form_errors') and type(c.form_errors) == dict: - %if c.form_errors.get(element,False): - - ${c.form_errors.get(element,'')} - - %endif - %endif +<%def name="breadcrumbs()"> +

+ ${self.breadcrumbs_links()} +

\ No newline at end of file