compatible test

This commit is contained in:
Yan
2017-09-28 18:25:31 +06:30
parent 15a2df5922
commit 8d48a73cfc
13 changed files with 114 additions and 167 deletions

View File

@@ -34,7 +34,7 @@ $.AdminBSB.options = {
scrollBorderRadius: '0',
scrollRailBorderRadius: '0',
scrollActiveItemWhenPageLoad: true,
breakpointWidth: 1170
breakpointWidth: 2230 //1170
},
dropdownMenu: {
effectIn: 'fadeIn',

View File

@@ -13,6 +13,7 @@
//= require jquery
//= require jquery_nested_form
//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs
//= require turbolinks
@@ -36,19 +37,19 @@
//= require BSBMaterial/demo.js
// $(document).on('turbolinks:load', function() {
// $('.datepicker').datepicker({
// format : 'dd-mm-yyyy',
// autoclose: true
// });
// $('.datepicker').attr('ReadOnly','true');
// $('.datepicker').css('cursor','pointer');
// });
$(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});
// $('.dropdown-toggle').dropdown();
// });
$(document).on("focus", "[data-behaviour~='datepicker']", function(e){
$(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
$('.dropdown-toggle').dropdown();
});
function export_to(path)
{

View File

@@ -10,5 +10,11 @@
// Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
// about supported directives.
//
//= require jquery
//= require jquery_nested_form
//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require node-waves/waves.js
//= require turbolinks
//= require node-waves/waves.js
//= require BSBMaterial/admin.js

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -6,70 +6,72 @@
@import "BSBMaterial/style";
@import "BSBMaterial/themes/all-themes";
@media (min-width: 768px) {
.navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand {
margin-left: 0px;
}
.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;
}
@media (max-width: 1169px) and (min-width: 992px) {
.navbar > .container .navbar-brand, .navbar > .container-fluid .navbar-brand {
margin-left: 20px;
}
.navbar-header {
padding: 0px;
}
.navbar-brand {
height: 40px;
padding: 5px 0px;
padding-top: 0rem;
padding-bottom: 0rem;
}
.ls-closed .bars:after, .ls-closed .bars:before {
position: absolute;
top: 13px;
left: 13px;
.navbar-brand-txt {
position: relative;
top: 5px;
}
.navbar-brand > img {
display: inline;
.navbar-right a {
color: #fff;
}
.navbar-nav > li > a {
margin-top: 12px;
}
.navbar-nav .dropdown-menu {
margin-top: 0px !important;
}
.navbar-nav .dropdown a > i.material-icons {
margin-top: 0px;
}
.navbar-nav > li > a {
display: inline-flex;
.navbar-right a.dropdown-toggle {
position: relative;
top: -5px;
}
.dropdown-menu {
margin-top: 0px !important;
}
.sidebar {
top: 60px;
height: calc(100vh - 60px);
}
.right-sidebar {
top: 60px;
height: calc(100vh - 60px);
.ls-closed .bars:after, .ls-closed .bars:before {
position: absolute;
top: 8px;
}
section.content {
margin: 60px 15px 0 315px;
margin: 70px 15px 0 225px;
}
.sidebar {
width: 210px;
height: calc(100vh - 55px);
position: fixed;
top: 55px;
right: 250px;
}
.right-sidebar {
width: 240px;
height: calc(100vh - 55px);
position: fixed;
right: -260px;
top: 55px;
}
.nav-tabs li a.active {
color: #222 !important;
}
.info-box {
margin-bottom: 20px;
}
.card {
margin-bottom: 20px;
}
.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 {
position: relative;
min-height: 1px;
padding-right: 10px;
padding-left: 10px;
}

View File

@@ -3,11 +3,13 @@
@import "animate-css/animate";
@import "BSBMaterial/style";
/* Show it is fixed to the top */
// body {
// min-height: 75rem;
// padding-top: 4.5rem;
// }
.login-page {
margin: 1% auto;
}
.form-group {
margin-bottom: 15px;
}
.padding-10 {
padding: 10px;

View File

@@ -5,13 +5,13 @@ class HomeController < ApplicationController
def index
@employees = Employee.all_emp_except_waiter.order("name asc")
@login_form = LoginForm.new()
render "layouts/initial", layout: false
render "layouts/login", layout: false
end
def show
@login_form = LoginForm.new()
@login_form.emp_id = params[:emp_id]
render "layouts/initial", layout: false
render "layouts/login", layout: false
end
def update

View File

@@ -1,4 +1,4 @@
Search Bar -->
<!-- Search Bar -->
<!-- <div class="search-bar">
<div class="search-icon">
<i class="material-icons">search</i>
@@ -13,96 +13,26 @@ Search Bar -->
<nav class="navbar">
<div class="container-fluid">
<div class="navbar-header">
<a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a>
<!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
<a href="javascript:void(0);" class="bars"></a>
<a class="navbar-brand" href="index.html">
<img src="<%= asset_path('logo.png') %>" width="32" height="32" alt="Logo" />
SX Restaurant
</a>
<span class="navbar-brand-txt">SX Restaurant</span>
</a>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<!-- User Info -->
<li class="dropdown">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span>Admin</span>
<i class="material-icons">keyboard_arrow_down</i>
</a>
<ul class="dropdown-menu">
<li>
<%= link_to 'Logout',logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->
</li>
</ul>
</li>
<!-- #User Info -->
<!-- Call Search -->
<!-- <li><a href="javascript:void(0);" class="js-search" data-close="true"><i class="material-icons">search</i></a></li> -->
<!-- #END# Call Search -->
<!-- Notifications -->
<!-- <li class="dropdown">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
<i class="material-icons">notifications</i>
<span class="label-count">7</span>
</a>
<ul class="dropdown-menu">
<li class="header">NOTIFICATIONS</li>
<li class="body">
<ul class="menu">
<li>
<a href="javascript:void(0);">
<div class="icon-circle bg-light-green">
<i class="material-icons">person_add</i>
</div>
<div class="menu-info">
<h4>12 new members joined</h4>
<p>
<i class="material-icons">access_time</i> 14 mins ago
</p>
</div>
</a>
</li>
</ul>
</li>
<li class="footer">
<a href="javascript:void(0);">View All Notifications</a>
</li>
</ul>
</li> -->
<!-- #END# Notifications -->
<!-- Tasks -->
<!-- <li class="dropdown">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button">
<i class="material-icons">flag</i>
<span class="label-count">9</span>
</a>
<ul class="dropdown-menu">
<li class="header">TASKS</li>
<li class="body">
<ul class="menu tasks">
<li>
<a href="javascript:void(0);">
<h4>
Footer display issue
<small>32%</small>
</h4>
<div class="progress">
<div class="progress-bar bg-pink" role="progressbar" aria-valuenow="85" aria-valuemin="0" aria-valuemax="100" style="width: 32%">
</div>
</div>
</a>
</li>
</ul>
</li>
<li class="footer">
<a href="javascript:void(0);">View All Tasks</a>
</li>
</ul>
</li> -->
<!-- #END# Tasks -->
<li class="pull-right"><a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a></li>
<div class="navbar-right">
<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<span>Admin</span>
<!-- <i class="material-icons">keyboard_arrow_down</i> -->
</a>
<ul class="dropdown-menu">
<li>
<%= link_to 'Logout',logout_path, method: :delete, data: {confirm: 'Are you sure?'} %>
<!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->
</li>
</ul>
<a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a>
</div>
</div>
</nav>
<!-- #Top Bar
<!-- #Top Bar

View File

@@ -1,11 +1,15 @@
<!-- Right Sidebar -->
<aside id="rightsidebar" class="right-sidebar">
<ul class="nav nav-tabs tab-nav-right" role="tablist">
<li role="presentation" class="active"><a href="#skins" data-toggle="tab">SKINS</a></li>
<li role="presentation"><a href="#settings" data-toggle="tab">SETTINGS</a></li>
<li class="nav-item">
<a href="#skins" class="nav-link active" data-toggle="tab" role="tab">SKINS</a>
</li>
<li class="nav-item">
<a href="#settings" class="nav-link" data-toggle="tab" role="tab">SETTINGS</a>
</li>
</ul>
<div class="tab-content">
<div role="tabpanel" class="tab-pane fade in active in active" id="skins">
<div role="tabpanel" class="tab-pane fade show active" id="skins">
<ul class="demo-choose-skin">
<li data-theme="red" class="active">
<div class="red"></div>

View File

@@ -33,6 +33,7 @@
<!-- <link href="css/themes/all-themes.css" rel="stylesheet" /> -->
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head>

View File

@@ -31,16 +31,16 @@
<!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
<!-- <link href="css/themes/all-themes.css" rel="stylesheet" /> -->
<%= stylesheet_link_tag 'initial', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track': 'reload' %>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.11.0/umd/popper.min.js" integrity="sha384-b/U6ypiBEHpOf/4+1nzFpr53nxSS+GLCkfwBdFNTxtclqqenISfwAzpKaMNFNmj4" crossorigin="anonymous"></script>
<%= javascript_include_tag 'initial', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
</head>
<body class="login-page">
<!-- Page Loader -->
<!-- <div class="page-loader-wrapper">
<div class="page-loader-wrapper">
<div class="loader">
<div class="preloader">
<div class="spinner-layer pl-red">
@@ -54,21 +54,21 @@
</div>
<p>Please wait...</p>
</div>
</div> -->
</div>
<!-- #END# Page Loader -->
<div class="login-box">
<div class="logo">
<a href="javascript:void(0);">Admin<b>BSB</b></a>
<small>Admin BootStrap Based - Material Design</small>
<a href="javascript:void(0);"><b>SX</b> Smartsale</a>
<small>Version - 1.0.1</small>
</div>
<%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
<div class="card padding-10">
<div class="card-header">
<div class="form-group">
<%= f.input :emp_id, label: "Emp ID", required: false, class: "form-control" %>
<%= f.input :emp_id, label: "Access PIN", required: false, class: "form-control" %>
<%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
<%= f.input :password, label: "Password", required: false, class: "form-control" %>
</div>
</div>
<div class="card-content">
@@ -92,8 +92,7 @@
<div class="pin_pad orange" data-value="CLR">CLR</div>
<div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad left purple" data-value="ENT">ENT</div>
</div>
<%= f.button :submit %>
</div>
</div>
</div>
<% end %>

View File

@@ -11,8 +11,8 @@ Rails.application.config.assets.version = '1.0'
# Rails.application.config.assets.precompile += %w( search.js )
# -- Initial Layout -----
Rails.application.config.assets.precompile += %w( initial.css )
Rails.application.config.assets.precompile += %w( initial.js )
Rails.application.config.assets.precompile += %w( login.css )
Rails.application.config.assets.precompile += %w( login.js )
# --- Waiter/ Cashier - Orgiami ----
Rails.application.config.assets.precompile += %w( origami.css )