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 - - - - + - - - - + + + - +### 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 diff --git a/rhodecode/templates/base/root.html b/rhodecode/templates/base/root.html new file mode 100644 --- /dev/null +++ b/rhodecode/templates/base/root.html @@ -0,0 +1,126 @@ +## -*- coding: utf-8 -*- + + + + ${self.title()} + + + + + + ${self.css()} + + %if c.ga_code: + + + %endif + + + ${self.js()} + + + + + ${next.body()} + + + + +<%def name="css()"> + + + + + +<%def name="js()"> + + + % if False: + + + + + + % else: + + + + % endif + + + + + + \ No newline at end of file diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html --- a/rhodecode/templates/login.html +++ b/rhodecode/templates/login.html @@ -1,82 +1,72 @@ ## -*- coding: utf-8 -*- - - - - ${_('Sign In')} - ${c.rhodecode_name} - - - - - - +<%inherit file="base/root.html"/> + +<%def name="title()"> + ${_('Sign In')} - ${c.rhodecode_name} + - - -
-
- <% messages = h.flash.pop_messages() %> - % if messages: - - % endif -
- -
-
${_('Sign In to')} ${c.rhodecode_name}
-
-
- ${h.form(h.url.current(came_from=c.came_from))} -
- +
+
+ <% messages = h.flash.pop_messages() %> + % if messages: +
    + % for message in messages: +
  • ${message}
    • + % endfor +
+ % endif +
+ +
+
${_('Sign In to')} ${c.rhodecode_name}
+
+
+ ${h.form(h.url.current(came_from=c.came_from))} +
+ -
-
-
- -
-
- ${h.text('username',class_='focus',size=40)} -
- -
-
-
- -
-
- ${h.password('password',class_='focus',size=40)} -
- -
- ##
- ##
- ## - ## - ##
- ##
-
- ${h.submit('sign_in','Sign In',class_="ui-button")} -
+
+
+
+ +
+
+ ${h.text('username',class_='focus',size=40)} +
+ +
+
+
+ +
+
+ ${h.password('password',class_='focus',size=40)}
- - -
- ${h.link_to(_('Forgot your 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.link_to(_('Forgot your 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.end_form()} -
- +
- - - + ${h.end_form()} +
+ +
\ No newline at end of file diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html --- a/rhodecode/templates/password_reset.html +++ b/rhodecode/templates/password_reset.html @@ -1,48 +1,39 @@ ## -*- coding: utf-8 -*- - - - - ${_('Reset You password')} - ${c.rhodecode_name} - - - - - - +<%inherit file="base/root.html"/> + +<%def name="title()"> + ${_('Reset You password')} - ${c.rhodecode_name} + - - -
- -
-
${_('Reset You password to')} ${c.rhodecode_name}
-
-
- ${h.form(url('password_reset'))} -
- -
- -
-
- -
-
- ${h.text('email')} -
-
- -
-
- ${h.submit('send','Reset my password',class_="ui-button")} -
${_('Your new password will be send to matching email address')}
-
-
-
-
- ${h.end_form()} -
+
+ +
+
${_('Reset You password to')} ${c.rhodecode_name}
+
+
+ ${h.form(url('password_reset'))} +
+ +
+ +
+
+ +
+
+ ${h.text('email')} +
+
+ +
+
+ ${h.submit('send','Reset my password',class_="ui-button")} +
${_('Your new password will be send to matching email address')}
+
+
+
- - + ${h.end_form()} +
+
diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html --- a/rhodecode/templates/register.html +++ b/rhodecode/templates/register.html @@ -1,96 +1,87 @@ ## -*- coding: utf-8 -*- - - - - ${_('Sign Up')} - ${c.rhodecode_name} - - - - - - +<%inherit file="base/root.html"/> - - -
- -
-
${_('Sign Up to')} ${c.rhodecode_name}
-
-
- ${h.form(url('register'))} -
- -
-
-
- -
-
- ${h.text('username',class_="medium")} -
-
- -
-
- -
-
- ${h.password('password',class_="medium")} -
-
- -
-
- -
-
- ${h.password('password_confirmation',class_="medium")} -
-
- -
-
- -
-
- ${h.text('name',class_="medium")} -
-
- -
-
- -
-
- ${h.text('lastname',class_="medium")} -
-
- -
-
- -
-
- ${h.text('email',class_="medium")} -
-
- -
-
- ${h.submit('sign_up','Sign Up',class_="ui-button")} - %if c.auto_active: -
${_('Your account will be activated right after registration')}
- %else: -
${_('Your account must wait for activation by administrator')}
- %endif -
-
-
-
- ${h.end_form()} -
+<%def name="title()"> + ${_('Sign Up')} - ${c.rhodecode_name} + + +
+ +
+
${_('Sign Up to')} ${c.rhodecode_name}
+
+
+ ${h.form(url('register'))} +
+ +
+
+
+ +
+
+ ${h.text('username',class_="medium")} +
+
+ +
+
+ +
+
+ ${h.password('password',class_="medium")} +
+
+ +
+
+ +
+
+ ${h.password('password_confirmation',class_="medium")} +
+
+ +
+
+ +
+
+ ${h.text('name',class_="medium")} +
+
+ +
+
+ +
+
+ ${h.text('lastname',class_="medium")} +
+
+ +
+
+ +
+
+ ${h.text('email',class_="medium")} +
+
+ +
+
+ ${h.submit('sign_up','Sign Up',class_="ui-button")} + %if c.auto_active: +
${_('Your account will be activated right after registration')}
+ %else: +
${_('Your account must wait for activation by administrator')}
+ %endif +
+
+
- - + ${h.end_form()} +
+