From 614f83799e7b606c5a381dd428fae358e48deba4 Mon Sep 17 00:00:00 2001 From: Nicolas Blanc Date: Sat, 20 Feb 2016 19:23:22 +0000 Subject: [PATCH] new test 2016/02/20 --- .../line_items_controller.js.coffee | 6 ++--- app/views/admin/order_cycles/edit.html.haml | 2 +- app/views/admin/order_cycles/index.html.haml | 21 +++++---------- .../admin/orders/bulk_management.html.haml | 2 +- .../single_enterprise_dashboard.html.haml | 26 +++++++++---------- 5 files changed, 25 insertions(+), 32 deletions(-) diff --git a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee index 203f7a435a..ce4ef7aa7b 100644 --- a/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee +++ b/app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee @@ -70,12 +70,12 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, if $scope.bulk_order_form.$valid StatusMessage.display 'progress', "Saving..." $q.all(LineItems.saveAll()).then(-> - StatusMessage.display 'success', "All changes saved" + StatusMessage.display 'success', "All changes saved"v $scope.bulk_order_form.$setPristine() ).catch -> - StatusMessage.display 'failure', #{t("unsaved_changes_warning")} + StatusMessage.display 'failure', {t("unsaved_changes_warning")} else - StatusMessage.display 'failure', #{t("unsaved_changes_warning")} + StatusMessage.display 'failure', {t("unsaved_changes_warning")} $scope.deleteLineItem = (lineItem) -> if ($scope.confirmDelete && confirm(t("are_you_sure"))) || !$scope.confirmDelete diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml index 81496bcdb8..fe0892c300 100644 --- a/app/views/admin/order_cycles/edit.html.haml +++ b/app/views/admin/order_cycles/edit.html.haml @@ -5,7 +5,7 @@ %h1 - =t'edit_order_cycle' + = t:edit_order_cycle - ng_controller = order_cycles_simple_form ? 'AdminSimpleEditOrderCycleCtrl' : 'AdminEditOrderCycleCtrl' diff --git a/app/views/admin/order_cycles/index.html.haml b/app/views/admin/order_cycles/index.html.haml index 91f267a7d7..de166aa4fc 100644 --- a/app/views/admin/order_cycles/index.html.haml +++ b/app/views/admin/order_cycles/index.html.haml @@ -28,21 +28,14 @@ %thead %tr - %th - =t'name' - %th - =t'open' - %th - =t'close' + %th =t :name + %th =t :open + %th =t :close - unless order_cycles_simple_index - %th - =t'supplier' - %th - =t'coordinator' - %th - =t'distributors' - %th - =t'products' + %th =t :supplier + %th =t :coordinator + %th =t :distributors + %th =t :products %th.actions %th.actions %th.actions diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml index 8dda00cf1c..d11f8dffc9 100644 --- a/app/views/spree/admin/orders/bulk_management.html.haml +++ b/app/views/spree/admin/orders/bulk_management.html.haml @@ -151,7 +151,7 @@ = t "products_price" %th.actions %th.actions - = t "ask" + = t "ask"  %input{ :type => 'checkbox', 'ng-model' => "confirmDelete" } %tr.line_item{ 'ng-repeat' => "line_item in filteredLineItems = ( lineItems | filter:quickSearch | selectFilter:supplierFilter:distributorFilter:orderCycleFilter | variantFilter:selectedUnitsProduct:selectedUnitsVariant:sharedResource | orderBy:predicate:reverse )", 'ng-class-even' => "'even'", 'ng-class-odd' => "'odd'", :id => "li_{{line_item.id}}" } diff --git a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml index 14bc30e23b..437d28b63c 100644 --- a/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml +++ b/app/views/spree/admin/overview/single_enterprise_dashboard.html.haml @@ -19,7 +19,7 @@ } #package_button %button#toggle_type{ onClick: 'toggleType()' } - = t "change_package" + = t:change_package %i.icon-chevron-down @@ -39,7 +39,7 @@ .alert-box %strong = t "spree_admin_single_enterprise_hint" - %strong= "#{t('manage')} #{@enterprise.name}." + %strong= "#{t:manage} #{@enterprise.name}." %a.close{ href: "#" } × .row @@ -47,15 +47,15 @@ .header %h3 %span.icon-map-marker - = t "your_profil_live" + = t:your_profil_live %p - = t "on_ofn_map" + = t:on_ofn_map .list /-# Can we pass an anchor here to zoom to our enterprise? %a.button.bottom{href: main_app.map_path, target: '_blank'} - = t "see" + = t:see = @enterprise.name - = t "live" + = t:live %span.icon-arrow-right .two.columns   @@ -64,12 +64,12 @@ .header %h3 %span.icon-edit - = t "edit_profile_details" + = t:edit_profile_details %p - = t "edit_profile_details_etc" + = t:edit_profile_details_etc .list %a.button.bottom{href: main_app.edit_admin_enterprise_path(@enterprise)} - = t "manage" + = t:manage = @enterprise.name %span.icon-arrow-right @@ -79,10 +79,10 @@ .header %h3 %span.icon-th-large - = t 'add_and_manage_products' + = t:add_and_manage_products .list %a.button.bottom{href: bulk_edit_admin_products_path} - = t 'manage_products' + = t:manage_products %span.icon-arrow-right .two.columns @@ -93,8 +93,8 @@ .header %h3 %span.icon-shopping-cart - = t 'add_and_manage_order_cycles' + = t:add_and_manage_order_cycles .list %a.button.bottom{href: main_app.admin_order_cycles_path} - = t 'manage_order_cycles' + = t:manage_order_cycles %span.icon-arrow-right