Merge pull request #126 from zoombody/fixes

Clean up HTML in mobile login
This commit is contained in:
Reinier Balt 2012-12-01 01:08:21 -08:00
commit f1006eff51
2 changed files with 1 additions and 2 deletions

View file

@ -22,8 +22,8 @@
<li class="link"><%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'))) -%></li> <li class="link"><%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'))) -%></li> <li class="link"><%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'))) -%></li>
<li class="link"><%= (link_to(t('layouts.mobile_navigation.starred'), tag_path("starred", :format => 'm'))) -%></li> <li class="link"><%= (link_to(t('layouts.mobile_navigation.starred'), tag_path("starred", :format => 'm'))) -%></li>
<% end -%>
</ul></div> </ul></div>
<% end -%>
<div id="content"><%= render_flash -%><%= yield -%></div> <div id="content"><%= render_flash -%><%= yield -%></div>
<hr/><% if current_user && !current_user.prefs.nil? -%> <hr/><% if current_user && !current_user.prefs.nil? -%>
<ul class="nav"> <ul class="nav">

View file

@ -3,7 +3,6 @@
show_database_form = auth_schemes.include?('database') show_database_form = auth_schemes.include?('database')
-%> -%>
<div title="<%= t('login.account_login') %>" id="loginform" class="form"> <div title="<%= t('login.account_login') %>" id="loginform" class="form">
<%= render_flash -%>
<h3><%= t('login.please_login') %>:</h3> <h3><%= t('login.please_login') %>:</h3>
<% if show_database_form %> <% if show_database_form %>
<div id="database_auth_form"> <div id="database_auth_form">