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

fixed conflic

Browse Source
This commit is contained in:
Aung Myo
2017-10-31 12:13:19 +06:30
parent 56940d7f00 e3b536d58c
commit cfa819f985
69 changed files with 618 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/BSBMaterial/admin.js
View File

@@ -444,7 +444,7 @@ $.AdminBSB.browser = {
}
//==========================================================================================================================
$(document).on('turbolinks:load', function () {
$(document).ready(function() {
$.AdminBSB.browser.activate();
$.AdminBSB.leftSideBar.activate();
$.AdminBSB.rightSideBar.activate();

2
app/assets/javascripts/BSBMaterial/demo.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function () {
$(document).ready(function() {
skinChanger();
activateNotificationAndTasksScroll();

2
app/assets/javascripts/BSBMaterial/pages/index.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function () {
$(document).ready(function(){
//Widgets count
$('.count-to').countTo();

2
app/assets/javascripts/OQS.js
View File

@@ -24,7 +24,7 @@
//= require BSBMaterial/demo.js
//= require custom.js
$(document).ready(function(){
$(document).on('turbolinks:load', function() {
$(".nav-completed").on("click", function(){
$("#completed").removeClass('hide')

20
app/assets/javascripts/application.js
View File

@@ -11,15 +11,15 @@
// about supported directives.
//
//= require jquery
//= require jquery.turbolinks
//= require jquery_ujs
//= require turbolinks
//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require jquery_nested_form
//= require cable
//= require settings/processing_items
//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require multi-select/js/jquery.multi-select.js
@@ -30,16 +30,24 @@
//= require autosize/autosize.js
//= require jquery-countto/jquery.countTo.js
//= require raphael/raphael.min
//= require morrisjs/morris.js
//= require chartjs/Chart.bundle.js
//= require fileinput.min
//= require settings/processing_items
//= require BSBMaterial/admin.js
//= require BSBMaterial/pages/index.js
//= require BSBMaterial/demo.js
//= require custom.js
$(document).on('turbolinks:load', function() {
$(document).ready(function() {
$('.count-to').countTo();
//Sales count to
$('.sales-count-to').countTo({
formatter: function (value, options) {
return '$' + value.toFixed(2).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, ' ').replace('.', ',');
}
});
$('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY - HH:mm',
clearButton: true,

8
app/assets/javascripts/custom.js
View File

@@ -1,6 +1,6 @@
$(document).on('turbolinks:load', function() {
$(document).ready(function() {
$('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#custom-slimscroll').slimScroll({
@@ -40,8 +40,10 @@ $(document).on('turbolinks:load', function() {
type: method,
url: url ,
success: function(data) {
// console.log(data.url);
location.href = data.url;
}
});
});
} else {
swal("Cancelled", "Your imaginary file is safe :)", "error");
}

1
app/assets/javascripts/login.js
View File

@@ -15,7 +15,6 @@
//= require tether
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require turbolinks
//= require node-waves/waves.js
//= require BSBMaterial/admin.js
//= require bootstrap-notify/bootstrap-notify.js

42
app/assets/javascripts/origami.js
View File

@@ -1,42 +1,40 @@
//= require jquery
//= require tether
//= require jquery_ujs
//= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min
//= require jquery_ujs
//= require turbolinks
//= require cable
//= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require jquery-slimscroll/jquery.slimscroll.js
//= require bootstrap-notify/bootstrap-notify.js
//= require node-waves/waves.js
//= require sweetalert/sweetalert.min.js
//= require cable
//= require turbolinks
//= require BSBMaterial/admin.js
//= require BSBMaterial/demo.js
//= require custom.js
$(document).on('turbolinks:load', function() {
$('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY - HH:mm',
clearButton: true,
weekStart: 1
});
$('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY - HH:mm',
clearButton: true,
weekStart: 1
});
$('.datepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY',
clearButton: true,
weekStart: 1,
time: false
});
$('.datepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY',
clearButton: true,
weekStart: 1,
time: false
});
$('.timepicker').bootstrapMaterialDatePicker({
format: 'HH:mm',
clearButton: true,
date: false
});
$('.timepicker').bootstrapMaterialDatePicker({
format: 'HH:mm',
clearButton: true,
date: false
});
});
$(document).ready(function(){
// For selected order return
var order_status = "";
order_status = $(".selected-item").children().find(".orders-order-status").text().substr(0,6).trim();

2
app/assets/javascripts/settings/processing_items.js
View File

@@ -1,4 +1,4 @@
$(document).on('turbolinks:load', function() {
$(document).ready(function() {
$(".processitems").click(function(event){
event.preventDefault();
console.log($(this).data("id"));

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

@@ -12,6 +12,8 @@
@import "BSBMaterial/themes/all-themes";
@import "reset";
/*@import "bootstrap-select/css/bootstrap-select.min";*/
/*----- Order Processing Items -----*/
.opi_ul {
display:block;

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

@@ -1,3 +1,4 @@
@import "material_icons";
@import "bootstrap/css/bootstrap-material-design.min";
@import "node-waves/waves";
@import "animate-css/animate";