diff --git a/app/assets/stylesheets/print.css.scss b/app/assets/stylesheets/print.css.scss index 1cb344ab..82043e8b 100644 --- a/app/assets/stylesheets/print.css.scss +++ b/app/assets/stylesheets/print.css.scss @@ -19,7 +19,7 @@ img { #navcontainer, #input_box, #footer, .big-box, .refresh, .badge, h1, .icon, #minilinks, .defer-container, .menu_sort, .position, .buttons, .sf-item-menu, .container_toggle, .grip, .show_notes, .recurring_icon, #project-next-prev, -.project_settings, .add_note_link { +.project_settings, .link_in_container_header { display:none; } diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index 6cbd2653..420f838c 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -602,7 +602,7 @@ div.note_footer a, div.note_footer a:hover { padding: 5px; } -div.add_note_link { +div.link_in_container_header { margin-top:12px; float: right; } diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 6efca328..04687a14 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -113,7 +113,7 @@ module TodosHelper settings.reverse_merge!({ :title => t("todos.actions.#{settings[:parent_container_type]}_#{settings[:container_name]}", :param => settings[:title_param]) }) - header = settings[:link_in_header].nil? ? "" : content_tag(:div, :class=>"add_note_link"){settings[:link_in_header]} + header = settings[:link_in_header].nil? ? "" : content_tag(:div, :class=>"link_in_container_header"){settings[:link_in_header]} header += content_tag(:h2) do toggle = settings[:collapsible] ? container_toggle("toggle_#{settings[:id]}") : "" "#{toggle} #{settings[:title]} #{settings[:append_descriptor]}".html_safe diff --git a/app/views/projects/done.html.erb b/app/views/projects/done.html.erb index 4fd0ad77..d536728b 100644 --- a/app/views/projects/done.html.erb +++ b/app/views/projects/done.html.erb @@ -1,6 +1,6 @@ <% paginate_options = { - :class => :add_note_link, + :class => :link_in_container_header, :previous_label => '« '+ t('common.previous'), :next_label => t('common.next')+' »', :inner_window => 2 diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index daa0dc38..0696e175 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -25,7 +25,7 @@
- +

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

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

diff --git a/app/views/recurring_todos/done.html.erb b/app/views/recurring_todos/done.html.erb index 0f3adf9d..276e3e0d 100644 --- a/app/views/recurring_todos/done.html.erb +++ b/app/views/recurring_todos/done.html.erb @@ -1,6 +1,6 @@ <% paginate_options = { - :class => :add_note_link, + :class => :link_in_container_header, :previous_label => '« '+ t('common.previous'), :next_label => t('common.next')+' »', :inner_window => 2 diff --git a/app/views/recurring_todos/index.html.erb b/app/views/recurring_todos/index.html.erb index 6ae1fd5d..ce6b3634 100644 --- a/app/views/recurring_todos/index.html.erb +++ b/app/views/recurring_todos/index.html.erb @@ -10,7 +10,7 @@
- +

<%= t('common.last') %> <%= t('todos.completed_recurring') %>

diff --git a/app/views/stats/done.html.erb b/app/views/stats/done.html.erb index f81b04c4..63b64b0c 100644 --- a/app/views/stats/done.html.erb +++ b/app/views/stats/done.html.erb @@ -1,6 +1,6 @@
- +

<%= t('common.last') %> <%= t('states.completed_plural' )%> <%= t('common.actions') %>

@@ -12,7 +12,7 @@
- +

<%= t('common.last') %> <%= t('states.completed_plural' )%> <%= t('common.projects') %>

@@ -29,7 +29,7 @@
- +

<%= t('common.last') %> <%= t('states.completed_plural' )%> <%= t('common.recurring_todos') %>

diff --git a/app/views/todos/all_done.html.erb b/app/views/todos/all_done.html.erb index e03300eb..3a8e5723 100644 --- a/app/views/todos/all_done.html.erb +++ b/app/views/todos/all_done.html.erb @@ -1,6 +1,6 @@ <% paginate_options = { - :class => :add_note_link, + :class => 'link_in_container_header', :previous_label => '« '+ t('common.previous'), :next_label => t('common.next')+' »', :inner_window => 2