sinatra-hexacta 1.5.2 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9022f7049e4774dce30d68e3a8340231e18ed4cbd9ae6d38da5ad30e6818d0a1
-  data.tar.gz: d1346db432f17de20e624c3462f0d71a3e640df3e493cf3d82fdc21c970648a1
+  metadata.gz: 426f83f4059ea172556ab6f353a970b55ce582fcdc7ed193aaf53f0beb3c91c4
+  data.tar.gz: 425d0637eb8ca6038df97f4cd5bf72e02c2308f21789429d18572d9f8006d34b
 SHA512:
-  metadata.gz: 3520c88236dc263cbd8fe20bc4c48a0243496979218f7b719a216869cbb90d624f9aeb3419b2af517a9dda712e072d6a190e29eeea34ff58fdf803b3924dfcbd
-  data.tar.gz: 8de7a7397d298e1142cc5fdd639c0604cdae926dd2dae4acb1880d38ec44954c3022d5bc7b4cde76b8b8149f280bb20d23a3dae2cf56e9fe422954825c956153
+  metadata.gz: 3e9518882b42c117cfd46163a91b7e45a74ff88590d776f00a7e09df7890c56810798b5c1a5216d5ae4d7c5d66a0ea4f3e560e511ecae6d17136fa104cc5193f
+  data.tar.gz: 8c55127e4507fee024d7c0ce178d91021d1087e00e5826aaab74aa065b99599f67bd3dbcac0bb1e818c5adcc9a14ff8597811bd9afe14bfcd4bd9c59a07832b9

data/lib/sinatra/helpers/cas.rb

@@ -82,7 +82,7 @@ module Sinatra
       if logged_in?(request, session)
         url = CAS_CLIENT.logout_url()
         session.clear
-        str = request.referer
+        str = request.referer || ''
         comeback = "=" + (str.include?("?")? str.slice(0..(str.index('?')-1)) : str) #Hack mal!
         redirect url + (url.include?("?service")? "" : "?service") + comeback
       end

data/lib/sinatra/public/js/app.js

@@ -25,6 +25,36 @@ $(document).ready(function(){
 
 function update_html_elements() {
 
+    $("form.async").unbind("submit").submit(function(e){
+      e.preventDefault();
+      var datastring = $(this).serialize();
+      var url = $(this).attr('action');
+      $(this).closest('.modal').modal('hide');
+      $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
+      $('#loading-modal').modal('show');
+      $.ajax({
+
+        type: "POST",
+        url: url,
+        data: datastring,
+        success: function(data) {
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
+          $('#ok-modal').modal('show');
+          setTimeout(function () {
+            location.reload();
+          }, 1000)
+        },
+        error: function(data) {
+          $('#loading-modal').modal('hide');
+          $('#loading-modal').remove();
+          $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Oops...</div></div></div></div></div>');
+          $('#error-modal').modal('show');
+        }
+      });
+    });
+
     // Fix modal inside other components
     $('.modal').appendTo("body");
 
@@ -538,76 +568,32 @@ $( document ).ajaxStop(function() {
   stop_load();
 });
 
-function rm(url) {
-  disableButtons();
-  if (confirm('¿Estás seguro que deseas realizar esta operación?')) {
-    $.ajax({
-        url: url,
-        type: 'DELETE',
-        done: function(result) {
-          location.reload();
-        },
-        success: function(result) {
-          location.reload();
-        },
-        error: function(error) {
-          alert("Ha ocurrido un error, intentalo nuevamente!");
-          enableButtons();
-        }
-    });
-  } else {
-    enableButtons();
-  }
-}
-
 
 function rm_object(object,id) {
-  disableButtons();
+  $(".modal").modal('hide');
+  $('body').append('<div aria-labelledby="loading" class="modal bounceIn animated" id="loading-modal" role="dialog" tabindex="-1" data-backdrop="static" data-keyboard="false"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><div class="preloader pl-lg"><svg class="pl-circular" viewBox="25 25 50 50"><circle class="plc-path" cx="50" cy="50" r="20"></circle></svg></div></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Espere...</div></div></div></div></div>');
+  $('#loading-modal').modal('show');
   $.ajax({
     url: '/' + object + '/' + id,
     type: 'DELETE',
-    data: {},
-    success: function(result) {
-      location.reload();
+    success: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-modal').remove();
+      $('body').append('<div aria-labelledby="ok" class="modal bounceIn animated" id="ok-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-check-circle c-green"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">¡Listo!</div></div></div></div></div>');
+      $('#ok-modal').modal('show');
+      setTimeout(function () {
+        location.reload();
+      }, 1000)
+    },
+    error: function(data) {
+      $('#loading-modal').modal('hide');
+      $('#loading-modal').remove();
+      $('body').append('<div aria-labelledby="error" class="modal bounceIn animated" id="error-modal" role="dialog" tabindex="-1"><div class="modal-dialog modal-sm" style="width:150px !Important;"><div class="modal-content"><div class="modal-body p-20 text-center"><i class="zmdi zmdi-hc-3x zmdi-alert-polygon c-red"></i></div><div class="modal-footer" style="text-align: center !Important;"><div class="btn btn-link waves-effect c-gray">Oops...</div></div></div></div></div>');
+      $('#error-modal').modal('show');
     }
   });
 }
 
-function post(url) {
-  disableButtons();
-  if (confirm('¿Estás seguro que deseas realizar esta operación?')) {
-    $.ajax({
-        url: url,
-        type: 'POST',
-        done: function(result) {
-          location.reload();
-        },
-        success: function(result) {
-          location.reload();
-        },
-        error: function(error) {
-          alert("Ha ocurrido un error, intentalo nuevamente!");
-          enableButtons();
-        }
-    });
-  } else {
-    enableButtons();
-  }
-}
-
-function disableButtons() {
-  $(".btn").each(function() {
-    $(this).data("temp",$(this).val());
-    $(this).attr("disabled",true);
-  });
-  return true
-}
-function enableButtons() {
-  $(".btn").each(function() {
-    $(this).attr("disabled",false);
-  });
-  return true
-}
 (function( $ ){
    $.fn.disableSelect = function() {
       $(this).prop("disabled", true);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.2
 platform: ruby
 authors:
 - Marco Zanger