From 2f13da8bff027c235b8b44f7ee89ca2c1db8b2e4 Mon Sep 17 00:00:00 2001 From: Reinier Balt Date: Thu, 26 Jun 2014 13:59:06 +0200 Subject: [PATCH] fix layout and modal issues These were "regressions" after the bootstrap 3 migration --- app/assets/javascripts/tracks.js.coffee.erb | 21 ++++---- app/assets/stylesheets/tracks.css.scss | 10 +++- app/helpers/application_helper.rb | 8 ++-- app/helpers/todos_helper.rb | 12 ++--- app/views/projects/_goto_item.html.erb | 34 +++++++------ app/views/shared/_goto.html.erb | 4 +- app/views/shared/_keyboard_shortcuts.html.erb | 48 ++++++++++--------- app/views/shared/_navbar.html.erb | 11 +++-- app/views/todos/_todo.html.erb | 6 +-- 9 files changed, 89 insertions(+), 65 deletions(-) diff --git a/app/assets/javascripts/tracks.js.coffee.erb b/app/assets/javascripts/tracks.js.coffee.erb index 6b69ba81..9d42381f 100644 --- a/app/assets/javascripts/tracks.js.coffee.erb +++ b/app/assets/javascripts/tracks.js.coffee.erb @@ -48,13 +48,16 @@ TracksApp = dialog.find("form").attr("data-link", settings.target_link) dialog.find("form").attr("data-id", settings.target_id) # set title of dialog - dialog.find("h3#myModalLabel").html(settings.title) + dialog.find("h4#myModalLabel").html(settings.title) # set focus to input field when dialog is shown - dialog.on 'shown', -> + dialog.on 'show.bs.modal', -> # twitter-typeahead adds span around search field with display:inline-block. This causes # the search field to ignore the width set in tracks.css $("span.twitter-typeahead").css("display", "block") + + dialog.on 'shown.bs.modal', -> $("input#tracks-goto-item").focus() + # show the dialog dialog.modal() @@ -120,7 +123,7 @@ TracksApp = TracksApp.selectTodo($("div.todo-item").first()) noteOfTodo: (todo) -> - notes_id = todo.find("i.icon-book").attr("data-note-id") + notes_id = todo.find("i.fa-book").attr("data-note-id") $("div#" + notes_id ) toggleNoteOfTodo: (todo) -> @@ -154,12 +157,12 @@ root = exports ? this root.TracksApp = TracksApp $ -> - $("a#menu-keyboard-shotcuts").click -> $('div#tracks-shortcuts-dialog').modal() - $("a.button-add-todo").click -> TracksApp.add_todo() - $("a.button-home").click -> TracksApp.go_home() - $("a.button-goto").click -> TracksApp.go_menu() - $("span.todo-description-icons i.icon-book").click -> TracksApp.toggleNoteOfTodo( $(this).parent().parent().parent().parent().parent() ) - $("span.todo-item-description-container").click -> TracksApp.selectTodo( $(this).parent().parent().parent() ) + $("a#menu-keyboard-shotcuts").click -> $('div#tracks-shortcuts-dialog').modal() + $("button.button-add-todo").click -> TracksApp.add_todo() + $("button.button-home").click -> TracksApp.go_home() + $("button.button-goto").click -> TracksApp.go_menu() + $("span.todo-description-icons i.fa-book").click -> TracksApp.toggleNoteOfTodo( $(this).parent().parent().parent().parent().parent() ) + $("span.todo-item-description-container").click -> TracksApp.selectTodo( $(this).parent().parent().parent() ) autocompleteDataset = new Dataset limit: 7 diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index d7992541..057ff192 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -9,6 +9,7 @@ body { div.tracks-main { background-color: #FFF; border-radius: 10px; + padding-top: 10px; } /* Header */ @@ -43,7 +44,7 @@ div.todo-item { margin-top: 7px; border: 3px solid #EEE; border-width: 0px 0px 1px 0px; - padding: 0px 3px 0px 3px; + padding: 0px 3px 0px 3px; min-height: none; line-height: none; @@ -82,7 +83,7 @@ div.todo-item { background-color: #EEE; border-radius: 3px; padding: 10px; - margin: 0px -3px 0px -3px; + margin: 0px 12px 0px -3px; } div.todo-sub-menu { margin-top: 5px; @@ -117,6 +118,11 @@ span.tags { .label { margin-right: 1px; background-color: #BBB; + } +} + +span.tags, div.tracks-todo-badges{ + span.label { a:hover, a:focus { text-decoration: none; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c5830555..75f1a741 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -36,8 +36,8 @@ module ApplicationHelper days_limited = 2 if days > 2 colors = [:warning, :warning, :warning, :info, :info, :info] - color = :important if days < 0 - color = :default if days > 7 + color = :danger if days < 0 + color = :default if days > 7 color = colors[days] if color.nil? if prefs.due_style == Preference.due_styles[:due_on] @@ -54,8 +54,8 @@ module ApplicationHelper "1" => t('todos.next_actions_due_date.due_tomorrow') }) - return content_tag(:a, {:title => format_date(due)}) { - content_tag(:span, {:class => "badge badge-#{color}"}) { due_text[days_limited.to_s] } + return content_tag(:span, {:class => "label label-#{color}"}) { + content_tag(:a, {:title => format_date(due)}) { due_text[days_limited.to_s] } } end diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb index 63f376d3..5054dd9b 100644 --- a/app/helpers/todos_helper.rb +++ b/app/helpers/todos_helper.rb @@ -239,7 +239,7 @@ module TodosHelper def date_span(todo=@todo) if todo.completed? - content_tag(:span, {class: "label"}) { format_date( todo.completed_at ) } + content_tag(:span, {class: "label label-default"}) { format_date( todo.completed_at ) } elsif todo.pending? title = t('todos.depends_on')+ ": " + todo.uncompleted_predecessors.to_a.map(&:description).join(', ') content_tag(:a, {:title => title}) { content_tag(:span, {:class => :orange}) { t('todos.pending') } } @@ -340,8 +340,8 @@ module TodosHelper end def show_date_tag(date, the_class, text) - content_tag(:a, :title => format_date(date)) do - content_tag(:span, :class => "label label-#{the_class.to_s}") { text } + content_tag(:span, :class => "label label-#{the_class.to_s}") do + content_tag(:a, :title => format_date(date)) { text } end end @@ -356,7 +356,7 @@ module TodosHelper case days # overdue or due very soon! sound the alarm! when -1000..-1 - show_date_tag(d, :important, t('todos.scheduled_overdue', :days => (days * -1).to_s)) + show_date_tag(d, :danger, t('todos.scheduled_overdue', :days => (days * -1).to_s)) when 0 show_date_tag(d, :warning, t('todos.show_today')) when 1 @@ -364,9 +364,9 @@ module TodosHelper # due 2-7 days away when 2..7 if prefs.due_style == Preference.due_styles[:due_on] - show_date_tag(d, :important, t('todos.show_on_date', :date => d.strftime("%A")) ) + show_date_tag(d, :danger, t('todos.show_on_date', :date => d.strftime("%A")) ) else - show_date_tag(d, :important, t('todos.show_in_days', :days => days.to_s) ) + show_date_tag(d, :danger, t('todos.show_in_days', :days => days.to_s) ) end # more than a week away - relax else diff --git a/app/views/projects/_goto_item.html.erb b/app/views/projects/_goto_item.html.erb index 530628a9..272c62ed 100644 --- a/app/views/projects/_goto_item.html.erb +++ b/app/views/projects/_goto_item.html.erb @@ -1,16 +1,22 @@ -