From f6d251d3a0cf935d4076eb1aabc33c50b50c5dd7 Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Fri, 30 Nov 2012 17:23:03 -0500
Subject: [PATCH 1/2] Fix stray HTML tags in mobile layout

Fixes #1369
---
 app/views/layouts/mobile.m.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb
index 7ee541ad..35c88f5d 100644
--- a/app/views/layouts/mobile.m.erb
+++ b/app/views/layouts/mobile.m.erb
@@ -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.projects'), projects_path(:format => 'm'))) -%></li>
   <li class="link"><%=     (link_to(t('layouts.mobile_navigation.starred'), tag_path("starred", :format => 'm'))) -%></li>
-<% end -%>
 </ul></div>
+<% end -%>
 <div id="content"><%= render_flash -%><%=  yield -%></div>
 <hr/><% if current_user && !current_user.prefs.nil? -%>
 <ul class="nav">

From 41d8fe55502968194e0566225a2f349784fcc6d9 Mon Sep 17 00:00:00 2001
From: Dan Rice <drice@diego>
Date: Fri, 30 Nov 2012 17:27:59 -0500
Subject: [PATCH 2/2] Remove duplicate render_flash from mobile login

The flash is already rendered in the layout.

Fixes #1370
---
 app/views/login/login.m.erb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/login/login.m.erb b/app/views/login/login.m.erb
index 502d5edb..d9add542 100644
--- a/app/views/login/login.m.erb
+++ b/app/views/login/login.m.erb
@@ -3,7 +3,6 @@
   show_database_form = auth_schemes.include?('database')
 -%>
 <div title="<%= t('login.account_login') %>" id="loginform" class="form">
-  <%= render_flash -%>
   <h3><%= t('login.please_login') %>:</h3>
 <% if show_database_form %>
   <div id="database_auth_form">