diff --git a/app/views/contexts/mobile_show_context.rhtml b/app/views/contexts/mobile_show_context.rhtml index d960a66e..3bf1fc3b 100644 --- a/app/views/contexts/mobile_show_context.rhtml +++ b/app/views/contexts/mobile_show_context.rhtml @@ -7,10 +7,8 @@ if not @not_done.empty? %>

<%=@context.name%>

<% end -%> diff --git a/app/views/layouts/mobile.m.erb b/app/views/layouts/mobile.m.erb index ab8ff179..e11432da 100644 --- a/app/views/layouts/mobile.m.erb +++ b/app/views/layouts/mobile.m.erb @@ -7,13 +7,12 @@ - + <%= stylesheet_link_tag "mobile", :media => 'handheld,all' %> <%= @page_title %> -<% if !(@new_mobile || @edit_mobile) - if current_user && !current_user.prefs.nil? -%> -

<%= @down_count %> <%= +<% if current_user && !current_user.prefs.nil? -%> +

<% 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 -%> @@ -21,10 +20,9 @@ <%= (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 - end -%><%= render_flash -%> -
-<%= yield -%> +<% end -%> +
+
<%= render_flash -%><%= yield -%>
<% if current_user && !current_user.prefs.nil? -%>
<%= (link_to(t('layouts.mobile_navigation.logout'), logout_path(:format => 'm')) +" | ") -%> diff --git a/app/views/projects/project_mobile.rhtml b/app/views/projects/project_mobile.rhtml index 414cb297..06180119 100644 --- a/app/views/projects/project_mobile.rhtml +++ b/app/views/projects/project_mobile.rhtml @@ -5,20 +5,29 @@
<%= sanitize(@project.description) %>
<% end -%>

<%= t('projects.deferred_actions')%>

<% if @deferred.empty? -%> <%= t('projects.deferred_actions_empty') %> <% else -%> -<%= render :partial => "todos/mobile_todo", :collection => @deferred, :locals => { :parent_container_type => "project" }%> -<% end +<% end -%>

<%= t('projects.completed_actions')%>

<% if @done.empty? -%> <%= t('projects.completed_actions_empty') %> <% else -%> -<%= render :partial => "todos/mobile_todo", :collection => @done, :locals => { :parent_container_type => "project" }%> -<% end %> +<% end %>

<%= t('projects.notes') %>

<% if @project.notes.empty? -%> <%= t('projects.notes_empty') %> diff --git a/app/views/todos/_mobile_actions.rhtml b/app/views/todos/_mobile_actions.rhtml index 097b0e9f..794b055e 100644 --- a/app/views/todos/_mobile_actions.rhtml +++ b/app/views/todos/_mobile_actions.rhtml @@ -5,5 +5,7 @@ <% end -%> <% unless @done.nil? -%>

<%= t('todos.completed_actions') %>

+ <% end %> diff --git a/app/views/todos/_mobile_todo.rhtml b/app/views/todos/_mobile_todo.rhtml index db337e7e..4fb61407 100644 --- a/app/views/todos/_mobile_todo.rhtml +++ b/app/views/todos/_mobile_todo.rhtml @@ -1,10 +1,5 @@ <% @todo = mobile_todo -%> -
  • <% - if mobile_todo.completed? --%> -<% else --%> -<% end -%> +
  • <% remote_mobile_checkbox(mobile_todo) %> <%= date_span -%> <%= link_to mobile_todo.description, todo_path(mobile_todo, :format => 'm') -%> <% unless mobile_todo.notes.blank? %> diff --git a/app/views/todos/mobile_tag.rhtml b/app/views/todos/mobile_tag.rhtml index 4dde5250..044fdce4 100644 --- a/app/views/todos/mobile_tag.rhtml +++ b/app/views/todos/mobile_tag.rhtml @@ -8,18 +8,18 @@ <%= render :partial => "contexts/mobile_context", :collection => @contexts_to_show -%>

    <%= t('todos.deferred_actions_with', :tag_name=> @tag_title) %>

    <% unless (@deferred.nil? or @deferred.size == 0) -%> - +
      <%= render :partial => "todos/mobile_todo", :collection => @deferred, :locals => { :parent_container_type => "tag" } -%> -
    + <% else -%> <%= t('todos.no_deferred_actions_with', :tag_name => @tag_title) %> <% end -%>

    <%= t('todos.completed_actions_with', :tag_name => @tag_title) %>

    <% unless (@done.nil? or @done.size == 0) -%> - +
      <%= render :partial => "todos/mobile_todo", :collection => @done, :locals => { :parent_container_type => "tag" } %> -
    + <% else -%> <%= t('todos.no_completed_actions_with', :tag_name => @tag_title) %> <% end -%> -
    • \ No newline at end of file + diff --git a/public/stylesheets/mobile.css b/public/stylesheets/mobile.css index 9ee9973f..f4795a55 100644 --- a/public/stylesheets/mobile.css +++ b/public/stylesheets/mobile.css @@ -3,36 +3,41 @@ body { font-size: smaller; } +#content { + margin-top: 50px; +} + div.footer { font-size: XX-small; color: #999999; text-align: center; } +a, a:link, a:active, a:visited { + color: #CC3334; + padding-left: 1px; + padding-right: 1px; + text-decoration: none; +} + +a:hover { + background-color: #CC3334; + color: #FFFFFF; +} + div.footer a { text-decoration: underline; color: #999999; } -.m_t_d a { - text-decoration: none; - color: #000000; -} - -.m_t_d a:hover { - text-decoration: underline; - color: #0000FF; -} - -.m_t_d .red, .m_t_d .amber, .m_t_d .orange, .m_t_d .green{ - background-color: #999999; -} - h1 { - color: #f00; + color: #fff; font-size: small; - margin-top:.3em; - margin-bottom:.3em; + padding-top: 0.2em; + padding-bottom: 0.2em; + padding-left:8px; + margin-top:0; + margin-bottom:0; } h2 { @@ -43,6 +48,17 @@ h2 { border-top: 1px solid #777777; } +h2 a, h2 a:link, h2 a:active, h2 a:visited { + color: #666666; + text-decoration: none; +} + +h2 a:hover { + background-color: transparent; + color: #CC3334; + text-decoration: none; +} + h4.alert { border: 1px solid #666666; text-align: center; @@ -79,6 +95,15 @@ span.r { span.prj, span.ctx{ font-size: X-small; } + +#ctx, #pjr { + margin: 0.5em 0; +} + +#ctx a, #pjr a { + padding: 0.1em 0; +} + /* Draw attention to some text Same format as traffic lights */ .red { @@ -118,8 +143,8 @@ span.prj, span.ctx{ .count { color: #fff; - background: #000; - font-size: medium; + background: #f00; + padding: 0.2em; } .errors { @@ -149,7 +174,44 @@ span.r { display:none; } +#topbar { + background-color: #000000; + clear: both; + color: #EEEEEE; + height: 45px; + left: 0; + margin-bottom: 5px; + position: fixed; + top: 0; + width: 100%; + z-index: 501; +} + .nav { + color: #fff; + background: #000; + padding-top: 0.2em; + padding-bottom: 0.2em; +} + +#topbar .nav { + padding-left:8px; + margin-bottom:0.3em; +} + +.nav a, .nav a:link, .nav a:active, .nav a:visited { + color: #fff; + padding-top: 1.0em; + padding-bottom: 0.5em; +} + +.nav a:focus, .nav a:hover, .nav a:active { + background: transparent; + text-decoration: underline; +} + +.nav li:hover, .nav a:focus, .nav a:hover, .nav a:active { + color: #CCCCCC; } #database_auth_form table td { @@ -162,3 +224,7 @@ table.c { .mobile-done { display:inline; } + +input#todo_description, input#tag_list, textarea#todo_notes, select#todo_project_id, select#todo_context_id { + width: 95%; +}