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,119 +1,105 @@ ## -*- coding: utf-8 -*- - - - - ${next.title()} - - - - - ${self.css()} - - ${self.js()} - %if c.ga_code: - - %endif - - - -

- -

-
- -
-
- %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'))}
${h.link_to(u'Log Out',h.url('logout_home'))}

+ +

+
+ +
+
+ %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'))}
${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): @@ -314,89 +300,4 @@ %endif %endif - - - -<%def name="css()"> - - - - - -<%def name="js()"> -## -## -## -## -## - - - - - - - - - -<%def name="breadcrumbs()"> -

- ${self.breadcrumbs_links()} -

\ No newline at end of file