From 79c7b46ab779746d123ee2f0f8455215fcd377c9 Mon Sep 17 00:00:00 2001 From: Aung Myo Date: Mon, 9 Oct 2017 18:17:45 +0630 Subject: [PATCH] update adminbsb design --- app/assets/javascripts/application.js | 8 +- app/assets/stylesheets/application.scss | 276 +++++++- .../origami/customers_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 2 +- app/controllers/origami/orders_controller.rb | 2 +- app/controllers/origami/rooms_controller.rb | 2 +- .../origami/sale_edit_controller.rb | 2 +- app/views/home/dashboard.html.erb | 254 +------ app/views/oqs/home/index.html.erb | 51 +- app/views/origami/customers/index.html.erb | 64 +- app/views/origami/home/index.html.erb | 13 +- app/views/origami/home/index_bk.html.erb | 2 +- app/views/origami/home/show.html.erb | 624 +++++++++--------- .../origami/moveroom/move_dining.html.erb | 4 +- .../origami/movetable/move_dining.html.erb | 8 +- app/views/origami/orders/show.html.erb | 10 +- .../origami/room_invoices/index.html.erb | 6 +- app/views/origami/room_invoices/show.html.erb | 6 +- app/views/origami/rooms/show.html.erb | 52 +- app/views/origami/sale_edit/edit.html.erb | 24 +- app/views/origami/sales/show.html.erb | 10 +- .../origami/table_invoices/index.html.erb | 6 +- .../origami/table_invoices/show.html.erb | 8 +- 23 files changed, 711 insertions(+), 725 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b9339fa0..f7c698e8 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -24,9 +24,6 @@ //= require jquery-slimscroll/jquery.slimscroll.js //= require node-waves/waves.js //= require autosize/autosize.js -//= requier momentjs/moment.js -//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker.js -//= require BSBMaterial/pages/forms/basic-form-elements.js //= require jquery-countto/jquery.countTo.js //= require raphael/raphael.min //= require morrisjs/morris @@ -42,14 +39,15 @@ //= require BSBMaterial/demo.js -$(document).on('turbolinks:load', function() { + +/*$(document).on('turbolinks:load', function() { $('.datepicker').datepicker({ format : 'dd-mm-yyyy', autoclose: true }); $('.datepicker').attr('ReadOnly','true'); $('.datepicker').css('cursor','pointer'); -}); +});*/ $(document).on("focus", "[data-behaviour~='datepicker']", function(e){ $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true}); diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 1e385413..ba52bb08 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -8,6 +8,7 @@ @import "BSBMaterial/style"; @import "BSBMaterial/themes/all-themes"; +/* 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; padding-right: 10px; @@ -93,32 +94,261 @@ section.content { opacity: 1; } -#sxModal { +/* End Reset Theme */ +/* *************************************************** */ + +.hidden{ + display: none !important; +} + +/***************** Start Origami CSS *************************/ +/* Reset */ +.table { + margin-bottom: 0px; +} + +select.form-control { + height: inherit !important; +} + +.form-horizontal .form-group { + margin-right: 0px !important; +} + +.card-columns { + font-size: 18px !important; +} + +/* End Reset */ + +.dining { + min-height:470px; + max-height:570px; + overflow:auto +} + +.order-info { + min-height:300px; + max-height:500px; + overflow:auto +} + +.others-payment{ + line-height:100px; + text-align:center; + color:white; + width:300px; + height:100px; + font-size:18px; +} + +.orders-table { + cursor: pointer; +} + +.cashier_number{ + width: 33%; + height:70px; + line-height:70px; + text-align:center; + background:#54A5AF; + // float:left; + // margin:2px; + font-size:20px; + color:white; + // cursor:pointer; +} + +.del_cashier_number{ + opacity:0.6, +} + +.pay{ + width: 98%; + height:211px; + line-height:211px; + text-align:center; + font-size:20px; + color:white; +} + +.payment{ + height:70px;line-height:70px; + align:center; + color:white; + font-size:16px; + margin-top:5px; +} + +.font-12 { + font-size: 12px; +} + +.cash-color{ + background-color:#80CBC4; +} + +.credit-color{ + background-color:#FFCCBC; +} + +.other-payment-color{ + background-color:#E1BEE7; +} + +.cashier_number:hover{ + background:#A9F5F2; +} + +.action-btn { + white-space: normal !important; + height: 60px; + margin-bottom: 5px; +} + +.radius-btn { + border-radius:5px; + color:#fff; + background-color:red; +} + +.bottom-5 { + margin-bottom: 5px; +} + +.fluid { + width: 100%; +} + +.style2 { + border-top: 3px double #8c8b8b; +} + +.long{ + width:49%; +} + +.sold { + background-color: red; +} + +.paid { + background-color: green; +} + +.selected-item { + color: #fff !important; + background-color: blue !important; +} + +.selected-account { + color: #fff !important; + background-color: blue !important; +} + +/* Reciept Style */ +#order-charges-table td { + border-top: none !important; +} + +.charges-name { + width: 80%; + text-align: left; +} + +.item-name { + width: 60%; + text-align: left; +} + +.item-attr { + width: 20%; + text-align: right; +} + +.item-attr-edit{ + width: 10%; + text-align: left; +} + +.display-none{ display: none; - overflow: auto; - width: 100%; - height: 100%; - background-color: #000; - background-color: rgba(0,0,0,0.4); - position: fixed; - top: 0; - right: 0; - bottom: 0; - left: 0; - z-index: 1100; } -#sxModal-Content { - position: relative; - left: 42%; - top: 30%; - background-color: #32ad1a; +.text-white{ color: #fff; - text-align: center; - width: 200px; - height: 200px; - padding-top: 5%; - border-radius: 100px; - z-index: 1101; } +/* Colors */ +.purple { + background-color:#7a62d3; +} + +.orange{ + background-color:#FF7F50; +} + +.red { + background-color:#ff0000; +} + +.green{ + background-color: #009900; +} + +.orange{ + background-color: #FF8C00; +} + +.blue{ + background-color: blue; +} + +/* End Colors */ + +.left{ + margin-left:1px; +} + +.bottom{ + margin-bottom: 1px; +} + +/* Discount */ + +.discount-item-row { + cursor: pointer; +} + +tr.discount-item-row:hover { + background-color: #e3e3e3 !important; +} +.required abbr{ + color: red !important; +} +/*Loading gif for payment*/ + +#loading_wrapper{ + position: fixed; + background-color: #C8C8C8 ; + height: 100%; + width: 100%; + left: 0; + opacity: 0.6; + top: 0; + z-index: 9999999; +} + +#loading{ + position: relative; + height: 100%; + width: 100%; + background-image: url('../../../image/loading-ajax.gif'); + background-position: center center; + background-repeat: no-repeat; + opacity: 1; + filter: alpha(opacity=100); /* ie */ + -moz-opacity: 1; /* mozilla */ + +} +/***********************End Origami CSS ************************/ \ No newline at end of file diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb index 72597613..6d404b96 100644 --- a/app/controllers/origami/customers_controller.rb +++ b/app/controllers/origami/customers_controller.rb @@ -1,4 +1,4 @@ -class Origami::CustomersController < BaseOrigamiController +class Origami::CustomersController < ApplicationController#BaseOrigamiController load_and_authorize_resource def index end diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 27b9cc52..b7c25773 100644 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -1,4 +1,4 @@ -class Origami::HomeController < BaseOrigamiController +class Origami::HomeController < ApplicationController#BaseOrigamiController before_action :set_dining, only: [:show] def index diff --git a/app/controllers/origami/orders_controller.rb b/app/controllers/origami/orders_controller.rb index 800c460b..10daeb71 100644 --- a/app/controllers/origami/orders_controller.rb +++ b/app/controllers/origami/orders_controller.rb @@ -1,4 +1,4 @@ -class Origami::OrdersController < BaseOrigamiController +class Origami::OrdersController < ApplicationController#BaseOrigamiController def show @tables = Table.all.active.order('status desc') diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 0eed53bc..8d461435 100644 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -1,4 +1,4 @@ -class Origami::RoomsController < BaseOrigamiController +class Origami::RoomsController < ApplicationController#BaseOrigamiController def index @tables = Table.all.active.order('status desc') diff --git a/app/controllers/origami/sale_edit_controller.rb b/app/controllers/origami/sale_edit_controller.rb index 61c8b00f..7e427cc8 100644 --- a/app/controllers/origami/sale_edit_controller.rb +++ b/app/controllers/origami/sale_edit_controller.rb @@ -1,4 +1,4 @@ -class Origami::SaleEditController < BaseOrigamiController +class Origami::SaleEditController < ApplicationController#BaseOrigamiController authorize_resource class: false # Index for sale item void OR edit def edit diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index b87624ff..38fed566 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -52,257 +52,5 @@ -
-
-
-
-
-
-

CPU USAGE (%)

-
-
-
- REAL TIME - -
-
-
- -
-
-
-
-
-
-
- -
- -
-
-
-
- 12,10,9,6,5,6,10,5,7,5,12,13,7,12,11 -
-
    -
  • - TODAY - 1 200 USERS -
    • -
  • - YESTERDAY - 3 872 USERS -
    • -
  • - LAST WEEK - 26 582 USERS -
    • -
-
-
-
- - -
-
-
-
LATEST SOCIAL TRENDS
-
    -
  • - #socialtrends - - trending_up - -
    • -
  • - #materialdesign - - trending_up - -
    • -
  • #adminbsb
    • -
  • #freeadmintemplate
    • -
  • #bootstraptemplate
    • -
  • - #freehtmltemplate - - trending_up - -
    • -
-
-
-
- - -
-
-
-
ANSWERED TICKETS
-
    -
  • - TODAY - 12 TICKETS -
    • -
  • - YESTERDAY - 15 TICKETS -
    • -
  • - LAST WEEK - 90 TICKETS -
    • -
  • - LAST MONTH - 342 TICKETS -
    • -
  • - LAST YEAR - 4 225 TICKETS -
    • -
  • - ALL - 8 752 TICKETS -
    • -
-
-
-
- - -
- -
-
-
-

TASK INFOS

- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#TaskStatusManagerProgress
1Task ADoingJohn Doe -
-
-
-
2Task BTo DoJohn Doe -
-
-
-
3Task COn HoldJohn Doe -
-
-
-
4Task DWait ApprovelJohn Doe -
-
-
-
5Task E - Suspended - John Doe -
-
-
-
-
-
-
-
- - -
-
-
-

BROWSER USAGE

- -
-
-
-
-
-
- -
+
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb index 826fe9f9..61c9f3bc 100644 --- a/app/views/oqs/home/index.html.erb +++ b/app/views/oqs/home/index.html.erb @@ -9,7 +9,7 @@ -
+
@@ -30,27 +30,14 @@
<% end %>
- +