From 14a4da8a71bb62e5303329b13baaef9a11c77509 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Sun, 31 Jan 2016 12:51:14 -0500 Subject: [PATCH 1/6] Add Font Awesome icon support --- Gemfile | 1 + Gemfile.lock | 3 +++ app/assets/stylesheets/application.css.scss | 2 ++ app/assets/stylesheets/icons.scss | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 app/assets/stylesheets/icons.scss diff --git a/Gemfile b/Gemfile index e445969d..19c858b4 100644 --- a/Gemfile +++ b/Gemfile @@ -45,6 +45,7 @@ gem 'bcrypt', '~> 3.1.7' # gem 'jbuilder', '~> 1.2' gem "bootstrap-sass", "3.3.3" +gem "font-awesome-sass", "~> 4.5.0" group :development do gem "spring" diff --git a/Gemfile.lock b/Gemfile.lock index bc840560..05283aaa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -98,6 +98,8 @@ GEM factory_girl (~> 4.5.0) railties (>= 3.0.0) ffi (1.9.6) + font-awesome-sass (4.5.0) + sass (>= 3.2) gherkin (2.12.2) multi_json (~> 1.3) hike (1.2.3) @@ -251,6 +253,7 @@ DEPENDENCIES cucumber-rails database_cleaner factory_girl_rails + font-awesome-sass (~> 4.5.0) htmlentities jquery-rails jquery-ui-rails diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index a8233655..222ff520 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -18,6 +18,8 @@ @import "jquery-ui/dialog"; @import "jquery-ui/sortable"; +@import "icons"; + .legacy-ui { @import "../../../vendor/assets/stylesheets/superfish-navbar"; @import "../../../vendor/assets/stylesheets/superfish-vertical"; diff --git a/app/assets/stylesheets/icons.scss b/app/assets/stylesheets/icons.scss new file mode 100644 index 00000000..001bc336 --- /dev/null +++ b/app/assets/stylesheets/icons.scss @@ -0,0 +1,2 @@ +@import "font-awesome-sprockets"; +@import "font-awesome"; From 836d790f9f50383a861b0127761df7cbe406f4b0 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Sun, 14 Feb 2016 21:16:42 -0500 Subject: [PATCH 2/6] Replace search icon with glyph --- app/assets/images/system-search.png | Bin 935 -> 0 bytes app/assets/stylesheets/tracks.css.scss | 4 ++++ app/views/shared/_navbar.html.erb | 7 ++++++- 3 files changed, 10 insertions(+), 1 deletion(-) delete mode 100644 app/assets/images/system-search.png diff --git a/app/assets/images/system-search.png b/app/assets/images/system-search.png deleted file mode 100644 index fd7f0b07a558cb6d59af96bebb672bf1abe96c88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 935 zcmV;Y16cftP)&ujZZ2vcpl1 zMZ@GK2apA{PG?ddXEM`!?RHyZ=kcza{{|ocz_G78)~3_xTfzOGVc*@!;z&{~D4M34 z#HCy|oAJK^O5@u;x%xm;z_nWd04$M+pY+%HrNI}599Zr)1O{&1Fr9gQ zRx^nN(=^?Ylb_Xc3crTMTm|}8W6tGCdm-gHU zoivEbfP*V-h@Y#f29hN4c>od3S|m}D80SwWrl%O%n5zs-y=aEVV!4n`6c;!WFs{rR zhNug$8$G1gD4`4AaS<H7=eg9>uBL$90I_nW$UopHtf^aCQMJwQhI406Q(#?y zO-@ZpM5e?TYiVd$*M}u5U8hd09vd6~!{hc8oX&FDU*~sLS6AD5dV3x{dHP7z^Tsz$ zm;I-vElqH5_&#iSZzKKk>qUmIhNJ7$iG2Xj914Xt0)Xc8`7QxKZ+qL(^TA-S6B++< zPs?7gTFc=3v)=)}CSYu?u#}a#&H(^gTU%RH&GN(C?nC&$dI>wJW|L@7q6Gi|002ov JPDHLkV1n1##MS@+ diff --git a/app/assets/stylesheets/tracks.css.scss b/app/assets/stylesheets/tracks.css.scss index 71dbcaa6..26730968 100644 --- a/app/assets/stylesheets/tracks.css.scss +++ b/app/assets/stylesheets/tracks.css.scss @@ -9,6 +9,10 @@ height:26px; border-radius: 2px; } + + .fa { + line-height: inherit; + } } .footer { diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 4f814a9d..1958dfc3 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -68,7 +68,12 @@
  • <%= link_to t('layouts.navigation.api_docs'), rest_api_docs_path %>
    • -
  • <%= navigation_link(image_tag("system-search.png", :size => "16X16", :border => 0), search_path, :title => t('layouts.navigation.search')) %>
    • +
  • + <%= link_to search_path, title: t('layouts.navigation.search') do %> + <%= icon('search', class: 'hidden-xs') %> + <%= content_tag :span, t('layouts.navigation.search'), class: 'visible-xs-inline' %> + <% end %> +
    • From 73a69250549215a5b4ea5fafa13a904082cd9953 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Sun, 14 Feb 2016 21:29:43 -0500 Subject: [PATCH 3/6] Remove the navigation_link helper --- app/helpers/application_helper.rb | 4 ---- app/views/shared/_navbar.html.erb | 32 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index f7b6aeaf..f0c30f64 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -22,10 +22,6 @@ module ApplicationHelper {:class => "container_toggle", :id => id} ) end - def navigation_link(name, options = {}, html_options = nil, *parameters_for_method_reference) - link_to name, options, html_options - end - # Check due date in comparison to today's date Flag up date appropriately with # a 'traffic light' colour code # diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 1958dfc3..f823c095 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -16,19 +16,19 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index f6907f02..98f7969f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -428,6 +428,7 @@ en: show_empty_containers_project: "Show empty projects" show_empty_containers_context: "Show empty contexts" show_empty_containers_title: "Show or hide the empty projects or contexts" + options: Options footer: send_feedback: Send feedback on %{version} sidebar: diff --git a/features/logging_in.feature b/features/logging_in.feature index 1962bf0e..ef74a8f7 100644 --- a/features/logging_in.feature +++ b/features/logging_in.feature @@ -31,24 +31,24 @@ Feature: Existing user logging in Examples: | page | next page | logout | - | home page | home page | Logout (Test User) | - | contexts page | contexts page | Logout (Test User) | - | projects page | projects page | Logout (Test User) | - | notes page | notes page | Logout (Test User) | - | recurring todos page | recurring todos page | Logout (Test User) | - | statistics page | statistics page | Logout (Test User) | - | manage users page | manage users page | 401 Unauthorized | - | integrations page | integrations page | Logout (Test User) | - | starred page | starred page | Logout (Test User) | - | tickler page | tickler page | Logout (Test User) | - | calendar page | calendar page | Logout (Test User) | - | feeds page | feeds page | Logout (Test User) | - | preference page | preference page | Logout (Test User) | - | export page | export page | Logout (Test User) | - | rest api docs page | rest api docs page | Logout (Test User) | - | search page | search page | Logout (Test User) | - | "top secret" project for user "testuser" | "top secret" project for user "testuser" | Logout (Test User) | - | context page for "@secret location" for user "testuser" | context page for "@secret location" for user "testuser" | Logout (Test User) | + | home page | home page | Logout | + | contexts page | contexts page | Logout | + | projects page | projects page | Logout | + | notes page | notes page | Logout | + | recurring todos page | recurring todos page | Logout | + | statistics page | statistics page | Logout | + | manage users page | manage users page | 401 Unauthorized | + | integrations page | integrations page | Logout | + | starred page | starred page | Logout | + | tickler page | tickler page | Logout | + | calendar page | calendar page | Logout | + | feeds page | feeds page | Logout | + | preference page | preference page | Logout | + | export page | export page | Logout | + | rest api docs page | rest api docs page | Logout | + | search page | search page | Logout | + | "top secret" project for user "testuser" | "top secret" project for user "testuser" | Logout | + | context page for "@secret location" for user "testuser" | context page for "@secret location" for user "testuser" | Logout | @javascript Scenario: When session expires, you should be logged out @@ -56,4 +56,4 @@ Feature: Existing user logging in And I submit the login form as user "testuser" with password "secret" Then I should be on the home page When my session expires - Then I should be on the login page \ No newline at end of file + Then I should be on the login page diff --git a/features/preferences.feature b/features/preferences.feature index 801b9b47..dddc2c0b 100644 --- a/features/preferences.feature +++ b/features/preferences.feature @@ -36,6 +36,6 @@ Feature: Manage preferences Scenario: I can edit preferences When I go to the preferences page - Then I should see "Logout (testuser)" + Then I should see "testuser Preferences" When I edit my last name to "Tester" - Then I should see "Logout (Tester)" \ No newline at end of file + Then I should see "Tester Preferences" From 4ad65ea0791a15fee6a4a85c69595938def3fed7 Mon Sep 17 00:00:00 2001 From: Dan Rice Date: Sun, 14 Feb 2016 22:08:51 -0500 Subject: [PATCH 6/6] Only show the date on large displays --- app/views/shared/_navbar.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb index 8fbb8823..8099c124 100644 --- a/app/views/shared/_navbar.html.erb +++ b/app/views/shared/_navbar.html.erb @@ -11,7 +11,7 @@ <% if @count -%> <%= @count %> <% end -%> - <%= l(Time.zone.today, :format => current_user.prefs.title_date_format) %> + <%= content_tag :span, l(Time.zone.today, format: current_user.prefs.title_date_format), class: 'visible-lg-inline' %>