git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change login dashboard

Browse Source
This commit is contained in:
NyanLinHtut
2019-05-30 12:00:29 +06:30
parent a7d7a15c8e
commit dfa58377eb
4 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/application.scss
View File

@@ -129,6 +129,7 @@ i.logout_icon{
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {
#setting{ display: none;} #setting{ display: none;}
.menu-up{ display: none;} .menu-up{ display: none;}
.card-btn{padding: 0px 35px;}
} }
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {

4
app/assets/stylesheets/login.scss
View File

@@ -122,5 +122,9 @@
@media screen and (max-width: 785px) { @media screen and (max-width: 785px) {
.login_pwd{width: 90%;} .login_pwd{width: 90%;}
.login_ent{width: 10%;} .login_ent{width: 10%;}
// .card-btn{padding: 0px 35px;}
// .nav-tabs{padding: 0px 44px;}
.box{margin: unset;}
.mbl-btn-usrgp{width: 48%;}
} }

2
app/views/layouts/login.html.erb
View File

@@ -135,8 +135,6 @@
<div class="pin_pad left" data-value="0">0</div> <div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div> <div class="pin_pad bg-blue-grey" data-value="CLR">CLR</div>
<% end %> <% end %>
</div> </div>
</div> </div>
</div> </div>

77
app/views/layouts/login_dashboard.html.erb
View File

@@ -15,10 +15,10 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> --> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css"> -->
<%= stylesheet_link_tag 'login', 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://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> --> <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 'login', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'login', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="login_dashboard"> <body class="login_dashboard">
@@ -39,8 +39,8 @@
</div> </div>
</div> </div>
<% flash.each do |type, message| %> <% flash.each do |type, message| %>
<% <%
if type == "notice" if type == "notice"
color = "alert-success" color = "alert-success"
elsif type == "error" elsif type == "error"
color = "alert-danger" color = "alert-danger"
@@ -49,11 +49,11 @@
else else
color = "bg-black" color = "bg-black"
end %> end %>
<p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center" <p id="noti" class="hidden noti" data-placement-from="top" data-message="<%=message%>" data-placement-align="center"
data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" > data-animate-enter="" data-animate-exit="" data-color-name="<%=color%>" >
</p> </p>
<% end %> <% end %>
<!-- #END# Page Loader --> <!-- #END# Page Loader -->
<div class="container"> <div class="container">
@@ -62,25 +62,25 @@
<img src="/image/SX-logo.png" width="150px" height="150px"> <img src="/image/SX-logo.png" width="150px" height="150px">
<p> <p>
<small>Version - 1.0.1</small> <small>Version - 1.0.1</small>
</p> </p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center"> <div class="col-lg-12_ col-md-12 col-sm-12 col-xs-12 text-center">
<div class="current-shop-name"> <div class="current-shop-name">
<span><%= shop_detail.name %></span> <span><%= shop_detail.name %></span>
</div> </div>
</div> </div>
</div> </div>
<div class="row bg-white box"> <div class="row bg-white box">
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">
<div class="row justify-content-center form-group"> <div class="row justify-content-center form-group">
<input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID"> <input type="text" class="form-control col-4" id="emp_id" placeholder="Employee ID">
</div> </div>
<br> <br>
<div class="card padding-10"> <div class="card padding-10">
<div class="card-content"> <div class="card-content card-btn">
<div class='col-md-12'> <div class='col-md-12'>
<div class='row bottom'> <div class='row bottom'>
<div class="pin_pad " data-value="1">1</div> <div class="pin_pad " data-value="1">1</div>
@@ -103,14 +103,14 @@
<div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> --> <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div> -->
<div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div> <div class="pin_pad bg-blue-grey" data-value="BAC">BACK</div>
<div class="pin_pad left" data-value="0">0</div> <div class="pin_pad left" data-value="0">0</div>
<div class="pin_pad bg-grey left" data-value="CLR">CLR</div> <div class="pin_pad bg-grey left" data-value="CLR">CLR</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white"> <div class="col-xs-6 col-sm-6 col-md-6 col-lg-6 p-t-20 p-l-10 p-r-10 p-b-50 bg-white">
<ul class="nav nav-tabs" role="tablist"> <ul class="nav nav-tabs" role="tablist">
<% @roles.each do |role| %> <% @roles.each do |role| %>
<%if role != "administrator" %> <%if role != "administrator" %>
@@ -119,8 +119,8 @@
</li> </li>
<% end %> <% end %>
<% end %> <% end %>
</ul> </ul>
<div class="tab-content" style="max-height:650px; overflow:auto"> <div class="tab-content" style="max-height:650px; overflow:auto">
@@ -129,7 +129,7 @@
<div class="tab-pane" id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto"> <div class="tab-pane" id="<%=role%>" role="tabpanel" style="max-height:; overflow:auto">
<% @employees.each do |employee| %> <% @employees.each do |employee| %>
<%if employee.role == role %> <%if employee.role == role %>
<div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn" data-formid="#form_<%= employee.emp_id %>" style="float: left;"> <div class="col-xs-3 col-sm-3 col-md-3 col-lg-3 empBtn mbl-btn-usrgp" data-formid="#form_<%= employee.emp_id %>" style="float: left;">
<form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH"> <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
</form> </form>
<%if employee.image_path.present? %> <%if employee.image_path.present? %>
@@ -138,20 +138,20 @@
<div class="p-name"><b><%= employee.name%></b> <div class="p-name"><b><%= employee.name%></b>
</div> </div>
</div> </div>
<% else %> <% else %>
<div class="login_dashboard p-card"> <div class="login_dashboard p-card">
<i class="material-icons style_icon">person</i> <i class="material-icons style_icon">person</i>
<div class="p-name"><b><%= employee.name%></b> <div class="p-name"><b><%= employee.name%></b>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>
</div> </div>
<!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> --> <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
</div> </div>
@@ -159,7 +159,7 @@
</body> </body>
</html> </html>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
@@ -172,7 +172,7 @@
var text = $("#noti").attr('data-message'); var text = $("#noti").attr('data-message');
if (text != null || colorName != null){ if (text != null || colorName != null){
showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
} }
$(".empBtn").click(function (event) { $(".empBtn").click(function (event) {
@@ -181,15 +181,15 @@
$(item).submit(); $(item).submit();
}); });
$('ul.nav.nav-tabs li a').click(function() { $('ul.nav.nav-tabs li a').click(function() {
var bb = $('.nav-item').children()[0]; var bb = $('.nav-item').children()[0];
$(bb).removeClass('active_tab'); $(bb).removeClass('active_tab');
$(this).parent().addClass('active_tab').siblings().removeClass('active_tab'); $(this).parent().addClass('active_tab').siblings().removeClass('active_tab');
}); });
$("#emp_id").focus(); $("#emp_id").focus();
$(".pin_pad").click(function (event) { $(".pin_pad").click(function (event) {
event.preventDefault(); event.preventDefault();
var value = $(this).data("value"); var value = $(this).data("value");
if (value == "CLR") { if (value == "CLR") {
@@ -213,11 +213,11 @@
$('#emp_id').keyup(function(e) { $('#emp_id').keyup(function(e) {
e.preventDefault(); e.preventDefault();
var txtVal = this.value; var txtVal = this.value;
if(txtVal!=''){ if(txtVal!=''){
if ($.isNumeric(txtVal)) { if ($.isNumeric(txtVal)) {
if( txtVal.length === 3 ) { if( txtVal.length === 3 ) {
window.location.href = '/auth/'+txtVal; window.location.href = '/auth/'+txtVal;
} }
}else{ }else{
@@ -228,10 +228,10 @@
var aa = $('.nav-item').children().attr('href').replace('#',''); var aa = $('.nav-item').children().attr('href').replace('#','');
$('#'+aa).addClass('active'); $('#'+aa).addClass('active');
var bb = $('.nav-item').children()[0]; var bb = $('.nav-item').children()[0];
$(bb).parent().addClass('active_tab').siblings().removeClass('active_tab'); $(bb).parent().addClass('active_tab').siblings().removeClass('active_tab');
}); });
function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) { function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
if (colorName === null || colorName === '') { colorName = 'bg-black'; } if (colorName === null || colorName === '') { colorName = 'bg-black'; }
@@ -268,6 +268,3 @@
} }
//end Notificaiotn message //end Notificaiotn message
</script> </script>