From 0da1aeaeb95e952edc4ac1653950eeac182e8eff Mon Sep 17 00:00:00 2001 From: Yan Date: Thu, 26 Oct 2017 17:54:22 +0630 Subject: [PATCH] ui review and edited --- Gemfile | 11 +++-- Gemfile.lock | 9 ++-- app/assets/javascripts/application.js | 46 +++++++++---------- app/assets/javascripts/custom.js | 2 +- app/assets/javascripts/inventory.js | 1 - app/assets/stylesheets/BSBMaterial/style.css | 2 +- app/assets/stylesheets/CRM.scss | 7 +-- app/assets/stylesheets/OQS.scss | 1 + app/assets/stylesheets/application.scss | 1 + .../stylesheets/inventory_definitions.scss | 3 +- app/assets/stylesheets/origami.scss | 10 +--- app/assets/stylesheets/reset.css | 27 ++++++++++- app/assets/stylesheets/settings.scss | 4 -- app/pdf/queue_no_pdf.rb | 2 +- app/views/crm/dining_queues/_form.html.erb | 2 +- app/views/crm/dining_queues/edit.html.erb | 6 +-- app/views/crm/dining_queues/index.html.erb | 4 +- app/views/crm/dining_queues/new.html.erb | 6 +-- app/views/layouts/CRM.html.erb | 4 -- app/views/layouts/OQS.html.erb | 4 +- app/views/layouts/_header.html.erb | 5 +- app/views/layouts/application.html.erb | 5 -- app/views/layouts/inventory.html.erb | 4 -- app/views/layouts/origami.html.erb | 4 -- .../settings/dining_charges/_form.html.erb | 43 +++++++++-------- .../payment_method_settings/_form.html.erb | 2 +- app/views/settings/promotions/_form.html.erb | 4 +- app/views/settings/zones/index.html.erb | 4 +- config/initializers/assets.rb | 1 - 29 files changed, 110 insertions(+), 114 deletions(-) diff --git a/Gemfile b/Gemfile index b579dfdc..3eaa9cd3 100755 --- a/Gemfile +++ b/Gemfile @@ -32,8 +32,9 @@ gem 'coffee-rails', '~> 4.2' # gem 'therubyracer', platforms: :ruby gem 'simple_form' gem 'nested_form' -gem 'bootstrap', '~> 4.0.0.alpha3' +# gem 'bootstrap', '~> 4.0.0.alpha3' gem 'tether-rails' +gem 'material_icons' gem 'font-awesome-rails', '~> 4.7', '>= 4.7.0.2' gem 'rack-cors' @@ -115,7 +116,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] gem 'httparty', '~> 0.15.5' gem 'momentjs-rails' # for date-range selector -gem 'bootstrap-daterangepicker-rails' # date-range picker -gem 'bootstrap-datepicker-rails' # date picker -gem 'jquery-datetimepicker-rails' -gem 'select2-rails' # for multi-select and auto-complete select box +# gem 'bootstrap-daterangepicker-rails' # date-range picker +# gem 'bootstrap-datepicker-rails' # date picker +# gem 'jquery-datetimepicker-rails' +# gem 'select2-rails' # for multi-select and auto-complete select box diff --git a/Gemfile.lock b/Gemfile.lock index 85bd8aa5..07df75a5 100755 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,13 +40,8 @@ GEM tzinfo (~> 1.1) aescrypt (1.0.0) arel (8.0.0) - autoprefixer-rails (7.1.1.2) - execjs bcrypt (3.1.11) bindex (0.5.0) - bootstrap (4.0.0.alpha6) - autoprefixer-rails (>= 6.0.3) - sass (>= 3.4.19) bootstrap-datepicker-rails (1.6.4.1) railties (>= 3.0) bootstrap-daterangepicker-rails (0.0.8) @@ -118,6 +113,8 @@ GEM nokogiri (>= 1.5.9) mail (2.6.6) mime-types (>= 1.16, < 4) + material_icons (2.2.1) + railties (>= 3.2) method_source (0.8.2) mime-types (3.1) mime-types-data (~> 3.2015) @@ -260,7 +257,6 @@ PLATFORMS DEPENDENCIES aescrypt bcrypt (~> 3.1.7) - bootstrap (~> 4.0.0.alpha3) bootstrap-datepicker-rails bootstrap-daterangepicker-rails byebug @@ -280,6 +276,7 @@ DEPENDENCIES jquery-ui-rails kaminari (~> 1.0.1) listen (~> 3.0.5) + material_icons momentjs-rails mysql2 (>= 0.3.18, < 0.5) nested_form diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 0023c41f..f92e51e9 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -11,17 +11,16 @@ // about supported directives. // //= require jquery -//= require jquery_nested_form //= require tether //= require bootstrap/js/popper.min //= require bootstrap/js/bootstrap-material-design.min +//= require jquery_nested_form //= require jquery_ujs //= require turbolinks //= require cable //= require settings/processing_items //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker -//= require bootstrap/js/bootstrap.js //= require multi-select/js/jquery.multi-select.js //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js @@ -34,33 +33,28 @@ //= require BSBMaterial/admin.js //= require BSBMaterial/pages/index.js //= require BSBMaterial/demo.js -//= require select2 //= require custom.js $(document).on('turbolinks:load', function() { - - $('.datetimepicker').bootstrapMaterialDatePicker({ - format: 'DD-MM-YYYY - HH:mm', - clearButton: true, - weekStart: 1 - }); + $('.datetimepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY - HH:mm', + clearButton: true, + weekStart: 1 + }); - $('.datepicker').bootstrapMaterialDatePicker({ - format: 'DD-MM-YYYY', - clearButton: true, - weekStart: 1, - time: false - }); - - $('.timepicker').bootstrapMaterialDatePicker({ - format: 'HH:mm', - clearButton: true, - date: false - }); - -}); -$(document).on('turbolinks:load', function() { + $('.datepicker').bootstrapMaterialDatePicker({ + format: 'DD-MM-YYYY', + clearButton: true, + weekStart: 1, + time: false + }); + $('.timepicker').bootstrapMaterialDatePicker({ + format: 'HH:mm', + clearButton: true, + date: false + }); + // Image Upload $("#simple_menu_item_image_path").fileinput({ previewFileType: "image", @@ -104,6 +98,10 @@ $(document).on('turbolinks:load', function() { }); +$(document).ready(function() { + $('body').bootstrapMaterialDesign(); +}); + // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ // $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); // $('.dropdown-toggle').dropdown(); diff --git a/app/assets/javascripts/custom.js b/app/assets/javascripts/custom.js index 46543c6b..3e737351 100644 --- a/app/assets/javascripts/custom.js +++ b/app/assets/javascripts/custom.js @@ -1,7 +1,7 @@ $(document).on('turbolinks:load', function() { - $('body').bootstrapMaterialDesign(); + var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); $('#custom-slimscroll').slimScroll({ diff --git a/app/assets/javascripts/inventory.js b/app/assets/javascripts/inventory.js index 1e789598..3200da8a 100644 --- a/app/assets/javascripts/inventory.js +++ b/app/assets/javascripts/inventory.js @@ -10,4 +10,3 @@ //= require BSBMaterial/admin.js //= require BSBMaterial/demo.js //= require custom.js -//= require select2 diff --git a/app/assets/stylesheets/BSBMaterial/style.css b/app/assets/stylesheets/BSBMaterial/style.css index 016707ab..c504e4e0 100755 --- a/app/assets/stylesheets/BSBMaterial/style.css +++ b/app/assets/stylesheets/BSBMaterial/style.css @@ -3428,7 +3428,7 @@ section.content { /* Checkbox & Radio ============================ */ [type="checkbox"] + label { - padding-left: 26px; + padding-left: 5px; height: 25px; line-height: 21px; font-size: 13px; diff --git a/app/assets/stylesheets/CRM.scss b/app/assets/stylesheets/CRM.scss index 6d70c162..1a0496f9 100755 --- a/app/assets/stylesheets/CRM.scss +++ b/app/assets/stylesheets/CRM.scss @@ -1,9 +1,4 @@ -//@import "bootstrap"; -//@import "font-awesome"; -//@import "theme"; -//@import "jquery-ui"; -//@import "bootstrap-datepicker3"; -//@import "bootstrap/modal"; +@import "material_icons"; @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; diff --git a/app/assets/stylesheets/OQS.scss b/app/assets/stylesheets/OQS.scss index 93b922bc..f6211dec 100755 --- a/app/assets/stylesheets/OQS.scss +++ b/app/assets/stylesheets/OQS.scss @@ -1,3 +1,4 @@ +@import "material_icons"; @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index cbe882dd..70824f58 100755 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -1,3 +1,4 @@ +@import "material_icons"; @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; diff --git a/app/assets/stylesheets/inventory_definitions.scss b/app/assets/stylesheets/inventory_definitions.scss index 0a113e90..9d2c2775 100755 --- a/app/assets/stylesheets/inventory_definitions.scss +++ b/app/assets/stylesheets/inventory_definitions.scss @@ -1,3 +1,4 @@ +@import "material_icons"; @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; @@ -9,8 +10,6 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; @import "reset"; -@import "select2"; - /* Show it is fixed to the top */ // body { diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 6e06b1e5..d52d07f2 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -1,12 +1,4 @@ -/* -@import "bootstrap"; -@import "font-awesome"; -@import "theme"; -@import "jquery-ui"; -@import "bootstrap-datepicker3"; -@import "jquery.datetimepicker"; -*/ - +@import "material_icons"; @import "tether"; @import "bootstrap/css/bootstrap-material-design.min"; @import "node-waves/waves"; diff --git a/app/assets/stylesheets/reset.css b/app/assets/stylesheets/reset.css index eae4b190..eb466045 100644 --- a/app/assets/stylesheets/reset.css +++ b/app/assets/stylesheets/reset.css @@ -1,3 +1,28 @@ +.material-icons { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; /* Preferred icon size */ + display: inline-block; + line-height: 1; + text-transform: none; + letter-spacing: normal; + word-wrap: normal; + white-space: nowrap; + direction: ltr; + + /* Support for all WebKit browsers. */ + -webkit-font-smoothing: antialiased; + /* Support for Safari and Chrome. */ + text-rendering: optimizeLegibility; + + /* Support for Firefox. */ + -moz-osx-font-smoothing: grayscale; + + /* Support for IE. */ + font-feature-settings: 'liga'; +} + /* Start Reset Theme */ .col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto { padding-left: 10px; @@ -32,7 +57,7 @@ .navbar-right a.dropdown-toggle { position: relative; - top: -5px; + top: 0px; } .dropdown-menu { diff --git a/app/assets/stylesheets/settings.scss b/app/assets/stylesheets/settings.scss index cd7a48af..e4d15f06 100755 --- a/app/assets/stylesheets/settings.scss +++ b/app/assets/stylesheets/settings.scss @@ -1,7 +1,3 @@ -@import "bootstrap"; -@import "font-awesome"; -@import "theme"; - /* Show it is fixed to the top */ // body { // min-height: 75rem; diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb index 504f4b5e..cce7eb94 100755 --- a/app/pdf/queue_no_pdf.rb +++ b/app/pdf/queue_no_pdf.rb @@ -15,7 +15,7 @@ class QueueNoPdf < Prawn::Document super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) # db font setup - if printer_settings.font != nil + if printer_settings.font != "" font_families.update("#{printer_settings.font}" => { :normal => "public/fonts/#{printer_settings.font}.ttf", :italic => "public/fonts/#{printer_settings.font}.ttf", diff --git a/app/views/crm/dining_queues/_form.html.erb b/app/views/crm/dining_queues/_form.html.erb index 7ae38f5b..3e05428a 100755 --- a/app/views/crm/dining_queues/_form.html.erb +++ b/app/views/crm/dining_queues/_form.html.erb @@ -14,7 +14,7 @@
- <%= f.button :submit,"Create Queue" ,:class=>"btn btn-primary bg-blue"%> + <%= f.submit "Create Queue",:class=>"btn btn-primary btn-lg waves-effect"%>
<% end %> diff --git a/app/views/crm/dining_queues/edit.html.erb b/app/views/crm/dining_queues/edit.html.erb index e5ca3b9f..7e8081cb 100755 --- a/app/views/crm/dining_queues/edit.html.erb +++ b/app/views/crm/dining_queues/edit.html.erb @@ -2,9 +2,9 @@
<%= render 'form', dining_queue: @dining_queue %> diff --git a/app/views/crm/dining_queues/index.html.erb b/app/views/crm/dining_queues/index.html.erb index da7dac6b..db7c7d81 100755 --- a/app/views/crm/dining_queues/index.html.erb +++ b/app/views/crm/dining_queues/index.html.erb @@ -2,7 +2,7 @@
  • Home
    • -
  • CRM
    • +
  • Queue
    • <%= link_to 'Back', dashboard_path %> @@ -54,7 +54,7 @@ - +
diff --git a/app/views/crm/dining_queues/new.html.erb b/app/views/crm/dining_queues/new.html.erb index b838dabd..a33db5ac 100755 --- a/app/views/crm/dining_queues/new.html.erb +++ b/app/views/crm/dining_queues/new.html.erb @@ -2,10 +2,10 @@
diff --git a/app/views/layouts/CRM.html.erb b/app/views/layouts/CRM.html.erb index bdd0b265..3def7d2a 100755 --- a/app/views/layouts/CRM.html.erb +++ b/app/views/layouts/CRM.html.erb @@ -10,10 +10,6 @@ - - - - <%= stylesheet_link_tag 'CRM', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/layouts/OQS.html.erb b/app/views/layouts/OQS.html.erb index 441e5d6e..30db232d 100755 --- a/app/views/layouts/OQS.html.erb +++ b/app/views/layouts/OQS.html.erb @@ -11,9 +11,9 @@ - + <%= stylesheet_link_tag 'OQS', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 136f0578..ce748760 100755 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -15,7 +15,7 @@
- + Logo SX Restaurant @@ -40,9 +40,10 @@ <%end%> +
\ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 9a16a42c..55669ed1 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -10,12 +10,7 @@ - - - - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> - <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/layouts/inventory.html.erb b/app/views/layouts/inventory.html.erb index b320a0da..650e7e7e 100755 --- a/app/views/layouts/inventory.html.erb +++ b/app/views/layouts/inventory.html.erb @@ -10,10 +10,6 @@ - - - - <%= stylesheet_link_tag 'inventory_definitions', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'inventory', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/layouts/origami.html.erb b/app/views/layouts/origami.html.erb index 1374cc8b..b53b61c9 100755 --- a/app/views/layouts/origami.html.erb +++ b/app/views/layouts/origami.html.erb @@ -10,10 +10,6 @@ - - - - <%= stylesheet_link_tag 'origami', media: 'all', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %> diff --git a/app/views/settings/dining_charges/_form.html.erb b/app/views/settings/dining_charges/_form.html.erb index be994aa1..a4901215 100755 --- a/app/views/settings/dining_charges/_form.html.erb +++ b/app/views/settings/dining_charges/_form.html.erb @@ -15,22 +15,22 @@ access_time <% if !@dining_charge.minimum_free_time.nil?%> - + <% else %> - + <% end %>
- +
access_time <% if !@dining_charge.charge_block.nil?%> - + <% else %> - + <% end %>
@@ -43,9 +43,9 @@ access_time <% if !@dining_charge.time_rounding_block.nil?%> - + <% else %> - + <% end %> @@ -91,33 +91,40 @@ function price(){ var unit_price = $("#unit_price").val(); - var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val(); - var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val(); - var time1=(parseInt(hour1)*60)+parseInt(min1); + var time_rounding_block = $("input[name='dining_charge[time_rounding_block]']").val(); + var charge_block = $("input[name='dining_charge[charge_block]']").val(); + var rounding = time_rounding_block.split(':'); + var charge_block_time = charge_block.split(':'); + var time1=(parseInt(rounding[0])*60)+parseInt(rounding[1]); + var time2=(parseInt(charge_block_time[0])*60)+parseInt(charge_block_time[1]); - var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val(); - var min2 = $("select[name='dining_charge[charge_block(5i)]']").val(); - var time2=(parseInt(hour2)*60)+parseInt(min2); + // var hour1 = $("select[name='dining_charge[time_rounding_block(4i)]']").val(); + // var min1 = $("select[name='dining_charge[time_rounding_block(5i)]']").val(); + // var time1=(parseInt(hour1)*60)+parseInt(min1); + + // var hour2 = $("select[name='dining_charge[charge_block(4i)]']").val(); + // var min2 = $("select[name='dining_charge[charge_block(5i)]']").val(); + // var time2=(parseInt(hour2)*60)+parseInt(min2); var result=(unit_price*time1)/time2; $("#time_rounding_block_price").val(result); - // return result; + return result; } $( "#unit_price" ).change(function() { price(); }); -$( "select[name='dining_charge[time_rounding_block(4i)]']" ).change(function() { +$("input[name='dining_charge[time_rounding_block]']").change(function() { price(); }); -$( "select[name='dining_charge[time_rounding_block(5i)]']" ).change(function() { +$("input[name='dining_charge[time_rounding_block]']").change(function() { price(); }); -$( "select[name='dining_charge[charge_block(4i)]']" ).change(function() { +$("input[name='dining_charge[charge_block]']").change(function() { price(); }); -$( "select[name='dining_charge[charge_block(5i)]']" ).change(function() { +$("input[name='dining_charge[charge_block]']").change(function() { price(); }); diff --git a/app/views/settings/payment_method_settings/_form.html.erb b/app/views/settings/payment_method_settings/_form.html.erb index 7977f524..22dd1dfa 100755 --- a/app/views/settings/payment_method_settings/_form.html.erb +++ b/app/views/settings/payment_method_settings/_form.html.erb @@ -6,7 +6,7 @@
<%= f.input :payment_method %> - <%= f.input :is_active %> + <%= f.input :is_active,:class=> "checkbox" %> <%= f.input :gateway_communication_type %> <%= f.input :gateway_url %> <%= f.input :auth_token %> diff --git a/app/views/settings/promotions/_form.html.erb b/app/views/settings/promotions/_form.html.erb index c0c05145..44f8ff9d 100755 --- a/app/views/settings/promotions/_form.html.erb +++ b/app/views/settings/promotions/_form.html.erb @@ -1,5 +1,5 @@
-
+
<%= simple_nested_form_for([:settings,@promotion]) do |f| %> <%= f.error_notification %> @@ -197,7 +197,7 @@
<% end %>
-
+
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod diff --git a/app/views/settings/zones/index.html.erb b/app/views/settings/zones/index.html.erb index 63b2deeb..f1ed84eb 100755 --- a/app/views/settings/zones/index.html.erb +++ b/app/views/settings/zones/index.html.erb @@ -48,7 +48,9 @@
-
view_headline <%= t("views.right_panel.header.page_detail") %>
+
+ view_headline <%= t("views.right_panel.header.page_detail") %> +

1) <%= t("views.right_panel.detail.name") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.name_txt") %> <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.data_txt") %>
2) <%= t("views.right_panel.detail.is_active") %> - <%= t("views.right_panel.detail.zone_txt") %> <%= t("views.right_panel.detail.is_active_txt") %>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 18e06316..eada42cc 100755 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -11,7 +11,6 @@ Rails.application.config.assets.version = '1.0' # Rails.application.config.assets.precompile += %w( search.js ) # -- Initial Layout ----- -Rails.application.config.assets.precompile += %w( sx_font.css ) Rails.application.config.assets.precompile += %w( login.css ) Rails.application.config.assets.precompile += %w( login.js )