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

test for js

Browse Source
This commit is contained in:
Yan
2017-10-27 16:53:32 +06:30
parent 445d63e286
commit 61c9fd0c81
15 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -61,9 +61,9 @@ gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production # Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 3.0' # gem 'redis', '~> 3.0'
# Use ActiveModel has_secure_password # Use ActiveModel has_secure_password
gem 'bcrypt', '~> 3.1.7'
# Crypto # Crypto
gem 'bcrypt', '~> 3.1.7'
gem 'aescrypt' gem 'aescrypt'
gem 'sidekiq' gem 'sidekiq'

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

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

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

@@ -12,12 +12,12 @@
// //
//= require jquery //= require jquery
//= require tether //= require tether
//= require turbolinks
//= require cable
//= require bootstrap/js/popper.min //= require bootstrap/js/popper.min
//= require bootstrap/js/bootstrap-material-design.min //= require bootstrap/js/bootstrap-material-design.min
//= require jquery_nested_form //= require jquery_nested_form
//= require jquery_ujs //= require jquery_ujs
//= require turbolinks
//= require cable
//= require settings/processing_items //= require settings/processing_items
//= require momentjs/moment //= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker

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

@@ -1,5 +1,5 @@
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
// $("body").boostrapMaterialDesign(); $('body').bootstrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));

2
app/assets/plugins/bootstrap/css/bootstrap-material-design.min.css vendored Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

2
app/assets/plugins/bootstrap/js/bootstrap-material-design.min.js vendored Executable file → Normal file
View File

File diff suppressed because one or more lines are too long

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

@@ -14,7 +14,7 @@
<%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'CRM', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-red"> <body class="theme-indigo">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

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

@@ -18,7 +18,7 @@
<%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'OQS', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-red"> <body class="theme-indigo">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

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

@@ -14,7 +14,7 @@
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-red"> <body class="theme-indigo">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

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

@@ -14,7 +14,7 @@
<%= javascript_include_tag 'inventory', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'inventory', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-red"> <body class="theme-indigo">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

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

@@ -14,7 +14,7 @@
<%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %> <%= javascript_include_tag 'origami', 'data-turbolinks-track': 'reload' %>
</head> </head>
<body class="theme-red"> <body class="theme-indigo">
<!-- Page Loader --> <!-- Page Loader -->
<div class="page-loader-wrapper"> <div class="page-loader-wrapper">
<div class="loader"> <div class="loader">

4
app/views/settings/employees/_form.html.erb
View File

@@ -42,6 +42,6 @@
<script type="text/javascript"> <script type="text/javascript">
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();
}); });
</script> </script>

1
app/views/settings/zones/_form.html.erb
View File

@@ -35,7 +35,6 @@
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
$('body').bootstrapMaterialDesign(); $('body').bootstrapMaterialDesign();

1
app/views/settings/zones/new.html.erb
View File

@@ -10,4 +10,3 @@
</div> </div>
<br> <br>
<%= render 'form', settings_zone: @settings_zone %> <%= render 'form', settings_zone: @settings_zone %>

1
config/initializers/assets.rb
View File

@@ -43,7 +43,6 @@ Rails.application.config.assets.precompile += %w( addorder.js )
# --- Custom SX Themem ---- # --- Custom SX Themem ----
Rails.application.config.assets.precompile += %w( sx-sidebar.css ) Rails.application.config.assets.precompile += %w( sx-sidebar.css )
Rails.application.config.assets.precompile += %w( popper.min.js )
# --- Inventory Definition ---- # --- Inventory Definition ----
Rails.application.config.assets.precompile += %w( inventory_definitions.css ) Rails.application.config.assets.precompile += %w( inventory_definitions.css )