From 990e32a33243d67f37fb52ef3b369dfdf9528a32 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Oct 2017 11:18:47 +0630 Subject: [PATCH 1/3] update logout an d remove botstrap select --- app/assets/javascripts/application.js | 30 +++++++-------------- app/assets/stylesheets/application.scss | 6 ++--- app/views/crm/customers/index.html.erb | 2 +- app/views/layouts/_header.html.erb | 15 +++-------- app/views/settings/employees/_form.html.erb | 4 +-- app/views/settings/employees/edit.html.erb | 1 - app/views/settings/employees/new.html.erb | 1 - 7 files changed, 18 insertions(+), 41 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index f9661398..b5511d6e 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -21,7 +21,7 @@ //= require settings/processing_items //= require momentjs/moment //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker -//= require bootstrap-select/js/bootstrap-select +//= require multi-select/js/jquery.multi-select.js //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js //= require sweetalert/sweetalert.min.js @@ -36,7 +36,7 @@ $(document).on('turbolinks:load', function() { - + $('.datetimepicker').bootstrapMaterialDatePicker({ format: 'DD-MM YYYY - HH:mm', clearButton: true, @@ -58,19 +58,10 @@ $(document).on('turbolinks:load', function() { }); -function showConfirmMessage() { - swal({ - title: "Information", - text: "You will not be able to recover this imaginary file!", - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: "OK", - closeOnConfirm: true - }, function () { - swal("Deleted!", "Your imaginary file has been deleted.", "success"); - }); -} + // Material Select Initialization + $(document).ready(function() { + $('.mdb-select').material_select(); + }); $(function(){ @@ -137,13 +128,12 @@ $(function(){ }); $('.delete').click(function(){ - var method = $(this).attr('data-method'); - var url = $(this).attr('data-ref'); - var html = $( this ).siblings( "#delete_text" ).html(); - console.log(html); + var method = $(this).attr('data-method'); + var url = $(this).attr('data-ref'); + var html_text = $( this ).siblings( "#delete_text" ).html(); swal({ title: "Confirmation", - text: html, + text: html_text, type: "warning", showCancelButton: true, confirmButtonColor: "#DD6B55", diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index f29a211a..d40e3c86 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -3,9 +3,9 @@ @import "node-waves/waves"; @import "animate-css/animate"; @import "sweetalert/sweetalert.css"; -@import "multi-select/css/multi-select"; +@import "multi-select/css/multi-select.css"; @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker"; -@import "bootstrap-select/css/bootstrap-select"; + @import "morrisjs/morris"; @import "fileinput.min"; @import "BSBMaterial/style"; @@ -62,7 +62,7 @@ } section.content { - margin: 70px 15px 0 225px; + margin: 40px 15px 0 225px; } .sidebar { diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index c9479d2d..a1b797a5 100644 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -9,7 +9,7 @@ -
+
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 027f96b8..d14cc505 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -32,15 +32,12 @@ Search Bar -->
  • <%if current_login_employee.role !="waiter" %> - <%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %> - <%end%> - -

    Logout

    +

    Logout

    - + <%end%>
@@ -48,10 +45,4 @@ Search Bar -->
- - - - -
-
+
From 9dac7198e9b8858c44a83ccfd642568f7ebb955c Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Fri, 20 Oct 2017 12:23:27 +0630 Subject: [PATCH 3/3] update tab and select --- app/views/origami/home/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb index b9af6e49..5e565f6b 100644 --- a/app/views/origami/home/index.html.erb +++ b/app/views/origami/home/index.html.erb @@ -20,7 +20,7 @@ -
+