<% if @down_count -%><%= @down_count %><% end -%> <%=
- l(Date.today, :format => current_user.prefs.title_date_format) -%>
+
-<%= (link_to(t('layouts.mobile_navigation.new_action'), new_todo_path(new_todo_params))+" | ") unless @new_mobile -%>
-<%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))+" | ") unless @home -%>
-<%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'))+" | ") -%>
-<%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'))+" | ") -%>
+<%= (link_to(t('layouts.mobile_navigation.new_action'), new_todo_path(new_todo_params))) unless @new_mobile -%>
+<%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'))) unless @home -%>
+<%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'))) -%>
+<%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'))) -%>
<%= (link_to(t('layouts.mobile_navigation.starred'), {:action => "tag", :controller => "todos", :id => "starred.m"})) -%>
<% end -%>
<%= render_flash -%><%= yield -%>
<% if current_user && !current_user.prefs.nil? -%>
-<%= (link_to(t('layouts.mobile_navigation.logout'), logout_path(:format => 'm')) +" | ") -%>
-<%= (link_to(t('layouts.mobile_navigation.new_action'), new_todo_path(new_todo_params), {:accesskey => "0"})+" | ") unless @new_mobile -%>
-<%= (link_to(t('layouts.mobile_navigation.home'), todos_path(:format => 'm'), {:accesskey => "1"})+" | ") unless @home -%>
-<%= (link_to(t('layouts.mobile_navigation.contexts'), contexts_path(:format => 'm'), {:accesskey => "2"})+" | ") -%>
-<%= (link_to(t('layouts.mobile_navigation.projects'), projects_path(:format => 'm'), {:accesskey => "3"})+" | ") -%>
-<%= (link_to(t('layouts.mobile_navigation.starred'), {:action => "tag", :controller => "todos", :id => "starred.m"}, {:accesskey => "4"})+" | ") -%>
-<%= (link_to(t('layouts.mobile_navigation.tickler'), {:action => "index", :controller => "tickler.m"})+" | ") -%>
+<%= (link_to(t('layouts.mobile_navigation.logout'), logout_path(:format => 'm'))) -%>
+<%= (link_to(t('layouts.mobile_navigation.tickler'), {:action => "index", :controller => "tickler.m"})) -%>
<%= (link_to(t('layouts.mobile_navigation.feeds'), {:action => "index", :controller => "feeds.m"})) -%>
<% end -%>
diff --git a/public/stylesheets/mobile.css b/public/stylesheets/mobile.css
index f4795a55..03271345 100644
--- a/public/stylesheets/mobile.css
+++ b/public/stylesheets/mobile.css
@@ -4,7 +4,7 @@ body {
}
#content {
- margin-top: 50px;
+ margin-top: 4em;
}
div.footer {
@@ -178,9 +178,7 @@ span.r {
background-color: #000000;
clear: both;
color: #EEEEEE;
- height: 45px;
left: 0;
- margin-bottom: 5px;
position: fixed;
top: 0;
width: 100%;
@@ -190,19 +188,15 @@ span.r {
.nav {
color: #fff;
background: #000;
- padding-top: 0.2em;
- padding-bottom: 0.2em;
-}
-
-#topbar .nav {
- padding-left:8px;
- margin-bottom:0.3em;
+ padding-top: 0.75em;
+ padding-bottom: 0.75em;
}
.nav a, .nav a:link, .nav a:active, .nav a:visited {
+ background: #666;
color: #fff;
- padding-top: 1.0em;
- padding-bottom: 0.5em;
+ padding: 0.5em;
+ margin-left:0.5em;
}
.nav a:focus, .nav a:hover, .nav a:active {
@@ -221,6 +215,7 @@ span.r {
table.c {
margin-left: 5px;
}
+
.mobile-done {
display:inline;
}