From 711f525d98856fbaa51657121e2a6cf9c6bd6b4e Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Fri, 11 Mar 2016 14:45:43 +1100 Subject: [PATCH] Remove   from locale en.yml --- .../admin/dropdown/directives/links_dropdown.js.coffee | 5 ----- .../templates/admin/links_dropdown.html.haml | 10 ---------- app/assets/stylesheets/admin/orders.css.scss | 4 ++++ config/locales/en.yml | 3 +-- 4 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee delete mode 100644 app/assets/javascripts/templates/admin/links_dropdown.html.haml diff --git a/app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee b/app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee deleted file mode 100644 index a58688a542..0000000000 --- a/app/assets/javascripts/admin/dropdown/directives/links_dropdown.js.coffee +++ /dev/null @@ -1,5 +0,0 @@ - angular.module("admin.dropdown").directive "linksDropdown", ($window)-> - restrict: "C" - scope: - links: "=" - templateUrl: "admin/links_dropdown.html" diff --git a/app/assets/javascripts/templates/admin/links_dropdown.html.haml b/app/assets/javascripts/templates/admin/links_dropdown.html.haml deleted file mode 100644 index 1f44f2418c..0000000000 --- a/app/assets/javascripts/templates/admin/links_dropdown.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -.ofn-drop-down - %span - %i.icon-check - Actions - %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" } - %div.menu{ 'ng-show' => "expanded", style: 'width: 200px' } - %a.menu_item{ 'ng-repeat' => "link in links", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method || 'get' }}", confirm: "{{link.confirm}}" }, style: 'display: inline-block; width: 100%' } - %span{ :style => 'text-align: center; display: inline-block; width: 20%'} - %i{ ng: { class: "link.icon" } } - %span{ style: "display: inline-block; width: auto"} {{ link.name }} diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss index 544abfa899..9a2dd4385c 100644 --- a/app/assets/stylesheets/admin/orders.css.scss +++ b/app/assets/stylesheets/admin/orders.css.scss @@ -70,3 +70,7 @@ div#group_buy_calculation { } } } + +th.actions { + white-space: nowrap; +} diff --git a/config/locales/en.yml b/config/locales/en.yml index 87dff559bc..9e056e2c25 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -841,8 +841,7 @@ Please follow the instructions there to make your enterprise visible on the Open current_fulfilled_units: "Current Fulfilled Units" max_fulfilled_units: "Max Fulfilled Units" bulk_management_warning: "WARNING: Some variants do not have a unit value" - action: "   Actions" - ask: "Ask? " + ask: "Ask?" no_orders_found: "No orders found." order_no: "Order No." weight_volume: "Weight/Volume"