From e02d32156f21b72ae9816ff2671860f23e686003 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 3 Mar 2015 19:04:41 +0100 Subject: [PATCH] ban unsupported browsers --- .../app/templates/global/_side_menu.emblem | 2 +- .../app/views/application_view.js.coffee | 16 +--------------- .../supplier/foundation1/application.js.erb | 4 ++++ .../foundation1/components/_menu_side.css.sass | 4 ++-- app/views/layouts/supplier/app.html.slim | 4 ---- config/locales/supplier.nl.yml | 3 +++ wip.md | 10 ++++------ 7 files changed, 15 insertions(+), 28 deletions(-) diff --git a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem index 7bd82820..c216ec58 100644 --- a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem @@ -1,4 +1,4 @@ -aside.side-menu +.side-menu ul li.title: h3 Menu li.supplier-name= supplier.name diff --git a/app/assets/javascripts/supplier/app/views/application_view.js.coffee b/app/assets/javascripts/supplier/app/views/application_view.js.coffee index 3a34c4eb..37fe88de 100644 --- a/app/assets/javascripts/supplier/app/views/application_view.js.coffee +++ b/app/assets/javascripts/supplier/app/views/application_view.js.coffee @@ -2,7 +2,7 @@ App.ApplicationView = Ember.View.extend classNames: ['application-view'] didInsertElement: -> $('.toggle-side-menu,.side-menu').click -> - menu = $('aside.side-menu') + menu = $('.side-menu') toggle = $('.toggle-side-menu') if menu.is(':visible') menu.animate left: -255, -> $(@).hide() @@ -19,17 +19,3 @@ App.ApplicationView = Ember.View.extend ] path: "/sounds/" preload: true - #selector_mappings = - #'.top-menu-root': '/' - #'.top-menu-lists': 'lists' - #'.top-menu-sections': 'sections' - #'.top-menu-tables': 'tables' - #'.top-menu-lists': 'lists' - #'.top-menu-menu': 'menu' - #'.supplier-settings-link': 'settings' - - #for selector, route of selector_mappings - #do (selector, route)=> - #$(selector).click (e)=> - #e.preventDefault() - #@get('controller').transitionToRoute route diff --git a/app/assets/javascripts/supplier/foundation1/application.js.erb b/app/assets/javascripts/supplier/foundation1/application.js.erb index b3121e8b..237914de 100644 --- a/app/assets/javascripts/supplier/foundation1/application.js.erb +++ b/app/assets/javascripts/supplier/foundation1/application.js.erb @@ -17,6 +17,10 @@ //= require_directory . //= require_self +if(!Modernizr.cssanimations){ + window.location = "/unsupported-browser"; +} + var Qstorage = localStorage; $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>); $.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>); diff --git a/app/assets/stylesheets/supplier/foundation1/components/_menu_side.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_menu_side.css.sass index 43ce7f31..f4edfb42 100644 --- a/app/assets/stylesheets/supplier/foundation1/components/_menu_side.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/components/_menu_side.css.sass @@ -1,4 +1,4 @@ -aside.side-menu +.side-menu background-color: #444 position: fixed display: none @@ -13,7 +13,7 @@ aside.side-menu h3 color: white margin-bottom: 3px - > ul + ul list-style: none a color: white diff --git a/app/views/layouts/supplier/app.html.slim b/app/views/layouts/supplier/app.html.slim index 924356a7..9fd55d4a 100644 --- a/app/views/layouts/supplier/app.html.slim +++ b/app/views/layouts/supplier/app.html.slim @@ -5,10 +5,6 @@ html lang="en" meta name="viewport" content="width=device-width, initial-scale=1.0" title= content_for?(:title) ? yield(:title) : application_title = csrf_meta_tags - - /! Le HTML5 shim, for IE6-8 support of HTML elements - /[if lt IE 9] - = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = stylesheet_link_tag "supplier/foundation1/application", media: "all" link href="/favicon.ico" rel="shortcut icon" = render 'suppliers/application/head' diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml index e7487e7f..0fb58481 100644 --- a/config/locales/supplier.nl.yml +++ b/config/locales/supplier.nl.yml @@ -222,3 +222,6 @@ nl: add_button: ${models.section_area} toevoegen modal: title: ${models.section_area} toevoegen + save_button: Save + close_button: Close + destroy_button: Verwijderen diff --git a/wip.md b/wip.md index fd44202f..7d2d05a9 100644 --- a/wip.md +++ b/wip.md @@ -4,8 +4,10 @@ Release Supplier -------- -- Fix section element positioning -- Add active toggle to svg elements +- Show menu next to table in section view at the right side for tables + next to the right wall +- Add section-area colors +- Add snap_code toggle to svg elements - Link employee to orders - Employee personal schedule - english emails @@ -19,8 +21,6 @@ Supplier User ---- -- ~~Product category visibility, order and product~~ - order!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1 - test met veel producten - product variants - remove active orders on list close @@ -37,8 +37,6 @@ Bugs General ------- -- split off faye server (really low) -- split off counter server (really low) - Loading pages Post release