From 0897068e5ba956e4ae45996024310a20a72a19d0 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Sun, 1 Jul 2018 11:45:54 +0630 Subject: [PATCH] update move loading --- app/assets/stylesheets/origami.scss | 23 +++++++++++++++++++ .../origami/moveroom/move_dining.html.erb | 3 +++ .../origami/movetable/move_dining.html.erb | 5 ++++ 3 files changed, 31 insertions(+) diff --git a/app/assets/stylesheets/origami.scss b/app/assets/stylesheets/origami.scss index 3f46cb67..ada129dc 100755 --- a/app/assets/stylesheets/origami.scss +++ b/app/assets/stylesheets/origami.scss @@ -496,4 +496,27 @@ nav.pagination .page a:hover, background-color: #ccc; text-decoration: none; +} + +#oqs_loading_wrapper{ + position: fixed; + background-color: #C8C8C8 ; + height: 100%; + width: 100%; + left: 0; + opacity: 0.6; + top: 0; + z-index: 100; +} +#oqs_loading{ + position: relative; + height: 100%; + width: 100%; + background-image: url('../../../image/loading-ajax.gif'); + background-position: center center; + background-repeat: no-repeat; + opacity: 1; + z-index: 101; + filter: alpha(opacity=100); /* ie */ + -moz-opacity: 1; /* mozilla */ } \ No newline at end of file diff --git a/app/views/origami/moveroom/move_dining.html.erb b/app/views/origami/moveroom/move_dining.html.erb index 20080feb..be736919 100755 --- a/app/views/origami/moveroom/move_dining.html.erb +++ b/app/views/origami/moveroom/move_dining.html.erb @@ -1,4 +1,7 @@
+
diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb index 06dc386b..36dfe25a 100755 --- a/app/views/origami/movetable/move_dining.html.erb +++ b/app/views/origami/movetable/move_dining.html.erb @@ -1,4 +1,7 @@
+
@@ -384,6 +387,7 @@ end $('#move_table').on('click',function(){ change_to = $('#change_table_value').val(); change_from = "<%= @dining.id %>"; + $("#oqs_loading_wrapper").show(); if (change_to == ""){ swal({ title: "Alert!!", @@ -391,6 +395,7 @@ end type: 'warning', }); }else{ + $.ajax({type: "POST", url: "<%= origami_moving_path %>", data: "change_from="+ change_from + "&change_to=" + change_to,