diff --git a/app/assets/images/SX-Logo-small.png b/app/assets/images/SX-Logo-small.png new file mode 100644 index 00000000..be14a5c9 Binary files /dev/null and b/app/assets/images/SX-Logo-small.png differ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 4f3219b5..551199f4 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -123,6 +123,14 @@ section.content { opacity: 1; } + +.sidebar .menu .list .header { + background: #eee; + font-size: 12px; + font-weight: bold; + padding: 8px 16px; +} + .breadcrumb { font-size:0.87rem; } diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index 4fdf37bc..29ef2e6e 100644 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -8,10 +8,18 @@ } .login-page { - margin: 1% auto; + margin: 0% auto; background-color: #2790a5; } +.login-page .login-box .logo small { + display: block; + width: 100%; + text-align: center; + color: #000; + margin-top: -5px; +} + .form-group { margin-bottom: 15px; } diff --git a/app/assets/stylesheets/sx-sidebar.css b/app/assets/stylesheets/sx-sidebar.css deleted file mode 100644 index 3f07bdad..00000000 --- a/app/assets/stylesheets/sx-sidebar.css +++ /dev/null @@ -1,225 +0,0 @@ -/*! - * Start Bootstrap - Simple Sidebar (http://startbootstrap.com/template-overviews/simple-sidebar) - * Copyright 2013-2017 Start Bootstrap - * Licensed under MIT (https://github.com/BlackrockDigital/startbootstrap-simple-sidebar/blob/master/LICENSE) - */ - -/**/ -#wrapper { - padding-left: 0; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; -} - -#wrapper.toggled { - padding-left: 210px; -} - -#sidebar-wrapper { - /* z-index: 1000;*/ - /*position: fixed;*/ - z-index: 1; - position: ; - left: 200px; - width: 0; - height: 100%; - margin-left: -224px; - margin-top:-20px; - overflow-x: ; - -webkit-transition: all 0.5s ease; - -moz-transition: all 0.5s ease; - -o-transition: all 0.5s ease; - transition: all 0.5s ease; -} - -#wrapper.toggled #sidebar-wrapper { - width: 216px; -} - -#page-content-wrapper { - width: 100%; - position: absolute; - padding-top: 20px; - -} - -#wrapper.toggled #page-content-wrapper { - position: absolute; - margin-right: -200px; - padding-top: 20px; -} - - -/* Sidebar Styles */ - -.sidebar-nav { - position: absolute; - background: #222d32; - top: 0; - width: 200px; - margin: 0; - padding: 0; - list-style: none; -} - -.sidebar-nav li { - text-indent: 20px; - line-height: 40px; -} -.sidebar-nav>li.header { - color: #4b646f; - background-color: #1a2226; - line-height: 35px !important; -} -.main-nav { - - /* background-color: #161926 !important;*/ -} -/*.main-nav a { - color: #fff !important; -} -*/ -.sidebar-nav li a { - display: block; - text-decoration: none; - color: #999999; -} - -.sidebar-nav li a:hover { - text-decoration: none; - color: #fff; - background: rgba(255, 255, 255, 0.2); -} - -.sidebar-nav li a:active, -.sidebar-nav li a:focus { - text-decoration: none; -} - -.sidebar-nav > .sidebar-brand { - height: 65px; - font-size: 18px; - line-height: 60px; -} - -.sidebar-nav > .sidebar-brand a { - color: #999999; -} - -.sidebar-nav > .sidebar-brand a:hover { - color: #fff; - background: none; -} - -@media(min-width:768px) { - #wrapper { - padding-left: 0; - } - #wrapper.toggled { - padding-left: 209px; - } - #sidebar-wrapper { - width: 0; - } - #wrapper.toggled #sidebar-wrapper { - width: 216px; - } - #page-content-wrapper { - padding-top: 20px; - position: relative; - } - #wrapper.toggled #page-content-wrapper { - position: relative; - margin-right: 0; - padding-top: 20px; - } -} -.accordion { - width: 200px; - list-style: none; - font-size: 14px; - color: #999999 ; - padding: 0px !important; - margin: 0px !important; -} - -.accordion .link { - cursor: pointer; - display: block; - /* padding: 15px 15px 15px 42px; - color: #4D4D4D;*/ - /* font-size: 14px; - font-weight: 700;*/ - /*border-bottom: 1px solid #CCC;*/ - position: relative; - -webkit-transition: all 0.4s ease; - -o-transition: all 0.4s ease; - transition: all 0.4s ease; -} - -/*.accordion li:last-child .link { border-bottom: 0; }*/ - -.accordion li i { - position: absolute; - top: 13px; - left: 12px; - font-size: 16px; - color: #999999; - -webkit-transition: all 0.4s ease; - -o-transition: all 0.4s ease; - transition: all 0.4s ease; -} - -.accordion li i.fa-chevron-down { - right: 12px; - left: auto; - font-size: 16px; -} -.accordion li .link:hover { - background: rgba(255, 255, 255, 0.2); - color: #FFF; -} -.accordion li.open .link { color: #fff; } - -.accordion li.open .link > .submenu { display: block;overflow: hidden;} - -.accordion li.open i { color: #fff; } - -.accordion li.open i.fa-chevron-down { - -webkit-transform: rotateX(180deg); - -ms-transform: rotateX(180deg); - -o-transform: rotateX(180deg); - transform: rotateX(180deg); -} - -.submenu { - display: none; - list-style: none; - margin-left: ; - background: #161926; - font-size: 14px; -} - -.submenu li { - margin-left: -38px; - } - -.submenu a { - display: block; - text-decoration: none; - color: #d9d9d9; - padding-left:20px; - -webkit-transition: all 0.25s ease; - -o-transition: all 0.25s ease; - transition: all 0.25s ease; -} - -.submenu a:hover { - background: #b63b4d; - color: #FFF; -} - - - diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index da72a194..33ee425c 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,11 +12,6 @@ class ApplicationController < ActionController::Base #all token authentication must be done here #response format must be set to JSON - rescue_from CanCan::AccessDenied do |exception| - flash[:warning] = exception.message - redirect_to root_path - end - def set_locale I18n.locale = params[:locale] || I18n.default_locale end @@ -72,6 +67,11 @@ class ApplicationController < ActionController::Base @default_config ||= ActiveRecord::Base.connection.instance_variable_get("@config").dup end + rescue_from CanCan::AccessDenied do |exception| + flash[:warning] = exception.message + redirect_to root_path + end + def current_user @current_user ||= Employee.find_by_token_session(session[:session_token]) if session[:session_token] end diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index b04993ff..0bffc868 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -1,6 +1,6 @@
-

DASHBOARD

+

<%= t :dashboard %>

@@ -57,7 +57,7 @@
-

Top Products

+

<%= (t :top) + " " + (t :products) %>

@@ -65,7 +65,7 @@
-

Inventory

+

<%= t :inventory %>

@@ -76,7 +76,7 @@
-

Hourly Sales

+

<%= (t :hourly) + " " + (t :sale) %>

@@ -84,7 +84,7 @@
-

Employee Sales

+

<%= (t :staff) + " " + (t :sale) %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 91d0a7bb..8d86f8d5 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -16,7 +16,7 @@ - Logo + Logo SX Restaurant
@@ -27,7 +27,7 @@
  • - <%= link_to 'Logout',logout_path, method: :delete, data: {confirm: 'Are you sure?'} %> + <%= link_to (t :logout),logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb index 9af8fcac..5cd62153 100644 --- a/app/views/layouts/_left_sidebar.html.erb +++ b/app/views/layouts/_left_sidebar.html.erb @@ -28,58 +28,58 @@
diff --git a/app/views/layouts/_sidebar.html.erb b/app/views/layouts/_sidebar.html.erb deleted file mode 100644 index 571e7632..00000000 --- a/app/views/layouts/_sidebar.html.erb +++ /dev/null @@ -1,36 +0,0 @@ - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 6e8dd5f9..8fec7974 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -47,7 +47,7 @@ -
+
<%= yield %>
diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index 5644ef74..e5836701 100644 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -58,9 +58,11 @@ diff --git a/config/locales/en.yml b/config/locales/en.yml index ba4f31fa..e8cdce94 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1,5 +1,31 @@ en: welcome: "Welcome" + main_navigation: "Main Navigation" + dashboard: "Dashboard" + oqs: "Order Queue Station" + origami: "Cashier" + crm: "CRM" + inventory: "Inventory" + settings: "Settings" + transactions: "Transactions" + reports: "Reports" + zones: "Zones" + dinings: "Dinings" + menu: "Menu" + cashier: "Cashier" + terminal: "Terminal" + print: "Print" + staff: "Staff" + products: "Products" + promotions: "Promotions" + printer: "Printer" + logout: "Logout" + sale: "Sale" + hourly: "Hourly" + top: "Top" + orders: "Orders" + credit: "Credit" + views: pagination: first: "« First" diff --git a/config/locales/mm.yml b/config/locales/mm.yml index 69a9131e..827edf46 100644 --- a/config/locales/mm.yml +++ b/config/locales/mm.yml @@ -1,5 +1,31 @@ mm: - welcome: "လာပါ" + welcome: "မဂ်လာပါ" + main_navigation: "မာတိကာ" + dashboard: "မျက်နှာစာ" + oqs: "အမှာစာနေရာများ" + origami: "အရောင်းကောင်တာ" + crm: "စားသုံးသူကြီးကြပ်ရေး" + inventory: "ကုန်လှောင်ရုံ" + settings: "သတ်မှတ်ချက်များ" + transactions: "အလုပ်ပြီးမြောက်မှု့များ" + reports: "အစီရင်ခံစာ" + zones: "ဇုန်" + dinings: "စားပွဲရုံ" + menu: "စားဖွယ်စုံ" + cashier: "ငွေရှင်း" + terminal: "ကောင်တာ" + print: "စာထုတ်ပါ" + staff: "၀န်ထမ်းများ" + products: "ကုန်စည်များ" + promotions: "အရောင်းမြှင့်တင်ရေး" + printer: "ပရင့်တာ" + logout: "ထွက်ရန်" + sale: "အရောင်း" + hourly: "နာရီအလိုက်" + top: "အရောင်းရဆုံး" + orders: "အော်ဒါများ" + credit: "အကြွေး" + views: pagination: first: "« ပထမ"