merge with origin

app/assets/javascripts/CRM.js

@@ -19,6 +19,7 @@
 //= 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 BSBMaterial/admin.js

app/assets/javascripts/application.js

@@ -23,6 +23,7 @@
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
 //= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require autosize/autosize.js
@@ -35,6 +36,7 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+
 $(document).on('turbolinks:load', function() {
   $('.datetimepicker').bootstrapMaterialDatePicker({
       format: 'DD-MM-YYYY - HH:mm',
@@ -73,7 +75,7 @@ $(document).on('turbolinks:load', function() {
         image: '<div class="file-preview-frame" id="{previewId}" data-fileindex="{fileindex}">\n' +
                 '   <img src="{data}" class="file-preview-image" title="{caption}" alt="{caption}" style="width: 200px;height: 200px;">\n' +
                 '</div>\n',
-    }
+      }
   });
 
   $("#product_image_path").fileinput({
@@ -96,16 +98,11 @@ $(document).on('turbolinks:load', function() {
     }
   });
 
-});
-
-$(document).ready(function() {
-    $('body').bootstrapMaterialDesign();
-});
-
 // $(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)
 {
@@ -114,3 +111,4 @@ function export_to(path)
 }
 
 
+

app/assets/javascripts/custom.js

@@ -25,10 +25,7 @@ $(document).on('turbolinks:load', function() {
   $('.delete').click(function(){
     var method    = $(this).attr('data-method');
     var url       = $(this).attr('data-ref');
-    var html_text = $( this ).siblings( "#delete_text" ).html();
-    console.log(method);
-    console.log(url);
-    console.log(html_text);
+    var html_text = $(this).siblings( "#delete_text" ).html();
     swal({
         title: "Confirmation",
         text: html_text,
@@ -50,4 +47,50 @@ $(document).on('turbolinks:load', function() {
     });
   });
 
+  // for Notificaiotn message
+  var placementFrom  = $("#notify_message").attr('data-placement-from');
+  var placementAlign = $("#notify_message").attr('data-placement-align');
+  var animateEnter   = $("#notify_message").attr('data-animate-enter');
+  var animateExit    = $("#notify_message").attr('data-animate-exit');
+  var colorName      = $("#notify_message").attr('data-color-name');
+  var text           = $("#notify_message").attr('data-message');
+  console.log(text);
+  if (text != null || colorName != null){
+     showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
+  }
+
+  function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
+    if (colorName === null || colorName === '') { colorName = 'bg-black'; }
+    if (animateEnter === null || animateEnter === '') { animateEnter = 'animated fadeInDown'; }
+    if (animateExit === null || animateExit === '') { animateExit = 'animated fadeOutUp'; }
+    var allowDismiss = true;
+    $.notify({
+        message: text
+    },
+        {
+            type: colorName,
+            allow_dismiss: allowDismiss,
+            newest_on_top: true,
+            timer: 1000,
+            placement: {
+                from: placementFrom,
+                align: placementAlign
+            },
+            animate: {
+                enter: animateEnter,
+                exit: animateExit
+            },
+            template: '<div data-notify="container" class="bootstrap-notify-container alert alert-dismissible {0} ' + (allowDismiss ? "p-r-30" : "") + '" role="alert">' +
+            '<button type="button" aria-hidden="true" class="close float-right m-l-20 m-t--5" data-notify="dismiss">×</button>' +
+            '<span data-notify="icon"></span> ' +
+            '<span data-notify="title">{1}</span> ' +
+            '<span data-notify="message">{2}</span>' +
+            '<div class="progress" data-notify="progressbar">' +
+            '<div class="progress-bar progress-bar-{0}" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%;"></div>' +
+            '</div>' +
+            '<a href="{3}" target="{4}" data-notify="url"></a>' +
+            '</div>'
+        });
+   }
+  //end Notificaiotn message
 });

app/assets/javascripts/origami.js

@@ -6,6 +6,7 @@
 //= require turbolinks
 //= require cable
 //= require jquery-slimscroll/jquery.slimscroll.js
+//= require bootstrap-notify/bootstrap-notify.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
 //= require BSBMaterial/admin.js

app/assets/stylesheets/reset.css

@@ -251,5 +251,13 @@ section.content {
 }
 /* END FORM */
 
+.form-group span.help-block {
+    font-size: 12px;
+    display: block;
+    margin-top: 5px;
+    font-weight: normal;
+    color: #F44336;
+}
+
 /* End Reset Theme */
 /* *************************************************** */