From a4d12c4515c2b6186cd529b6fac739a5cb7ceb58 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 19 Jun 2014 15:18:14 +1000 Subject: [PATCH] Patching up IE warning --- app/assets/javascripts/iehack.js | 5 +++++ app/views/layouts/darkswarm.html.haml | 28 ++------------------------ app/views/shared/_ie_warning.html.haml | 25 +++++++++++++++++++++++ 3 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 app/assets/javascripts/iehack.js create mode 100644 app/views/shared/_ie_warning.html.haml diff --git a/app/assets/javascripts/iehack.js b/app/assets/javascripts/iehack.js new file mode 100644 index 0000000000..ff211c6107 --- /dev/null +++ b/app/assets/javascripts/iehack.js @@ -0,0 +1,5 @@ +$( document ).ready(function() { + $("#closeie").click(function() { + $("#ie-warning").hide(); + }); +}) diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 35b58a9e39..0bc90f9234 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -18,32 +18,8 @@ %body.off-canvas{"ng-app" => "Darkswarm"} / [if lte IE 8] - .alert-box.alert#ie-warning{"data-alert" => ""} - .row.ie-msg - .small-4.large-2.columns - %i.ofn-i_012-warning - .small-8.large-10.columns - %h3 Your browser is out of date :-( - %p For the best Open Food Network experience, we strongly recommend upgrading your browser: - .row - .small-4.columns.browserbtn - %a.browserlogo{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} - %img{src: "assets/browser-logos/chrome.png"} - %a{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} Download Chrome - .small-4.columns.browserbtn - %a.browserlogo{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} - %img{src: "assets/browser-logos/firefox.png"} - %a{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} Download Firefox - .small-4.columns.browserbtn - %a.browserlogo{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} - %img{src: "assets/browser-logos/internet-explorer.png"} - %a{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} Upgrade Internet Explorer - .row.ie-msg - .small-12.large-12.columns - .text-center - %em Can't upgrade your browser? Try Open Food Network on your smartphone :-) - %a.close{href: "#"} × - + = render partial: "shared/ie_warning" + = javascript_include_tag "iehack" = inject_json "currentHub", "current_hub" = inject_json "currentOrder", "current_order" diff --git a/app/views/shared/_ie_warning.html.haml b/app/views/shared/_ie_warning.html.haml new file mode 100644 index 0000000000..b5cd980ad6 --- /dev/null +++ b/app/views/shared/_ie_warning.html.haml @@ -0,0 +1,25 @@ +.alert-box.alert#ie-warning{"data-alert" => ""} + .row.ie-msg + .small-4.large-2.columns + %i.ofn-i_012-warning + .small-8.large-10.columns + %h3 Your browser is out of date :-( + %p For the best Open Food Network experience, we strongly recommend upgrading your browser: + .row + .small-4.columns.browserbtn + %a.browserlogo{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} + %img{src: "assets/browser-logos/chrome.png"} + %a{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} Download Chrome + .small-4.columns.browserbtn + %a.browserlogo{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} + %img{src: "assets/browser-logos/firefox.png"} + %a{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} Download Firefox + .small-4.columns.browserbtn + %a.browserlogo{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} + %img{src: "assets/browser-logos/internet-explorer.png"} + %a{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} Upgrade Internet Explorer + .row.ie-msg + .small-12.large-12.columns + .text-center + %em Can't upgrade your browser? Try Open Food Network on your smartphone :-) + %a#closeie.close{href: "#"} ×