ui updated

This commit is contained in:
Yan
2017-10-27 11:37:47 +06:30
parent 59d50856ad
commit 18aa3d1e0f
4 changed files with 6 additions and 8 deletions

View File

@@ -29,6 +29,7 @@
//= require autosize/autosize.js //= require autosize/autosize.js
//= require jquery-countto/jquery.countTo.js //= require jquery-countto/jquery.countTo.js
//= require raphael/raphael.min //= require raphael/raphael.min
//= require morrisjs/morris.js
//= require chartjs/Chart.bundle.js //= require chartjs/Chart.bundle.js
//= require fileinput.min //= require fileinput.min
//= require BSBMaterial/admin.js //= require BSBMaterial/admin.js
@@ -36,7 +37,6 @@
//= require BSBMaterial/demo.js //= require BSBMaterial/demo.js
//= require custom.js //= require custom.js
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
$('.datetimepicker').bootstrapMaterialDatePicker({ $('.datetimepicker').bootstrapMaterialDatePicker({
format: 'DD-MM-YYYY - HH:mm', format: 'DD-MM-YYYY - HH:mm',

View File

@@ -1,7 +1,6 @@
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {
// $("body").boostrapMaterialDesign();
var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight())); var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
$('#custom-slimscroll').slimScroll({ $('#custom-slimscroll').slimScroll({
@@ -54,7 +53,7 @@ $(document).on('turbolinks:load', function() {
var animateExit = $("#notify_message").attr('data-animate-exit'); var animateExit = $("#notify_message").attr('data-animate-exit');
var colorName = $("#notify_message").attr('data-color-name'); var colorName = $("#notify_message").attr('data-color-name');
var text = $("#notify_message").attr('data-message'); var text = $("#notify_message").attr('data-message');
console.log(text);
if (text != null || colorName != null){ if (text != null || colorName != null){
showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit);
} }

View File

@@ -57,7 +57,6 @@
</p> </p>
<% end %> <% end %>
<%= yield %> <%= yield %>
</section> </section>
</body> </body>
</html> </html>

View File

@@ -6,7 +6,7 @@
<div class="form-inputs p-l-15"> <div class="form-inputs p-l-15">
<%= f.input :payment_method %> <%= f.input :payment_method %>
<%= f.input :is_active,:class=> "checkbox" %> <%= f.input :is_active %>
<%= f.input :gateway_communication_type %> <%= f.input :gateway_communication_type %>
<%= f.input :gateway_url %> <%= f.input :gateway_url %>
<%= f.input :auth_token %> <%= f.input :auth_token %>
@@ -44,4 +44,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>