sinatra-hexacta 0.3.13 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e5dcb9cef01c9a77b03a009a9b1a5451fb27889692879645801474efa41fd40
-  data.tar.gz: 8e1e59f37a699d6c4e91e36feec49ec8422e6619662e00815b61a9276e4389ad
+  metadata.gz: ca5a4df9634f94ceab5602a5b00d4e68e335d5da664c31700c189b53e64ccb69
+  data.tar.gz: 44cdfef7065cf7d9f3e576bf799fbaad3cb3df386e8a5bc06bf566d6b1d03246
 SHA512:
-  metadata.gz: bb94d132e2bc6baa03bc1b9321abc8de50df247ea04767a47cc1d530719a4fc13e4445648b3dc46e1d46b1cf1165d6df26fc247c985a264a05dbfcb92ca5a7c5
-  data.tar.gz: 5f7ad7194685207a41c3ae66327e212dfe199dc898ebb062937274250bfb7c6fe6cd99a96045de14e0805160762eb0eb3a2f6a3d323d055eca674ba3b51fa3df
+  metadata.gz: d3a50875a57cd0be59b9e7cf019d5565f9dc6a52f924338a28451845ff662d84a131c61f021fd3f7cc381c511db708cedb187efd17fe6535a302fb053e892c39
+  data.tar.gz: 325a7785ad00eedad92e6a5466cfc1af10ef636265dd02a822f7d0d62138cc87d7aca0e6de1d8d0c30b58dbf5b21cee950773e111120764dfd602637d057a7db

data/lib/sinatra/handlers/errors.rb

@@ -10,17 +10,24 @@ module Sinatra
       error_template(404)
       error_template(403)
       error_template(500)
+      error_template(Sequel::DatabaseDisconnectError)
+      error_template(Sequel::DatabaseConnectionError)
     end
 
     def error_template(code)
-      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{code}.slim")
+      if code.is_a? Numeric
+        template_code = code
+      else
+        template_code = code.to_s.split('::').last
+      end
+      ErrorHandler.copy_file("/lib/sinatra/views/errors/#{template_code}.slim","/app/views/#{Hexacta::GEM_FILE_DIR}/errors/#{template_code}.slim")
       error code do
         if code == 500
           title = env['sinatra.error'].message.split(':')[0].gsub('#<','');
           message = (["in #{request.url}"] + env['sinatra.error'].backtrace).join(',');
           NotificationSender.instance.send_error(authenticated(User),title,message)
         end
-        slim "#{Hexacta::GEM_FILE_DIR}/errors/#{code}".to_sym, locals: { :params => params }
+        slim "#{Hexacta::GEM_FILE_DIR}/errors/#{template_code}".to_sym, locals: { :params => params }
       end
     end
 

data/lib/sinatra/public/css/app.min.1.css

@@ -14195,12 +14195,17 @@ html:not(.ie9) .select.fg-line:before {
   position: relative;
 }
 
-.fg-float .form-control {
+.fg-float .form-control::read-write {
   position: relative;
   background: transparent;
   z-index: 1;
 }
 
+.fg-float .form-control::read-only {
+  position: relative;
+  z-index: 1;
+}
+
 .fg-float .form-control::-moz-placeholder {
   color: #ffffff;
   opacity: 1;

data/lib/sinatra/views/alerts/empty.slim

@@ -1,4 +1,4 @@
-.lv-item.p-20.bgm-lightgray.m-b-5
+.lv-item.p-20.bgm-lightgray
   .media
     .pull-left
       i.zmdi.zmdi-hc-3x.zmdi-alert-circle-o.c-gray

data/lib/sinatra/views/alerts/error.slim

@@ -1,4 +1,4 @@
-.lv-item.p-20.bgm-red.m-b-5
+.lv-item.p-20.bgm-red
   .media
     .pull-left
       i.zmdi.zmdi-hc-3x.zmdi-alert-octagon.c-white

data/lib/sinatra/views/alerts/info.slim

@@ -1,4 +1,4 @@
-.lv-item.p-20.bgm-blue.m-b-5
+.lv-item.p-20.bgm-blue
   .media
     .pull-left
       i.zmdi.zmdi-hc-3x.zmdi-info.c-white

data/lib/sinatra/views/alerts/warning.slim

@@ -1,4 +1,4 @@
-.lv-item.p-20.bgm-orange.m-b-5
+.lv-item.p-20.bgm-orange
   .media
     .pull-left
       i.zmdi.zmdi-hc-3x.zmdi-alert-triangle.c-white

data/lib/sinatra/views/errors/DatabaseConnectionError.slim

@@ -0,0 +1,27 @@
+.row
+  .col-xs-12
+    .progress.progress-striped.active.bgm-red style="height:80px;"
+      .progress-bar.progress-bar-danger aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" style="width: 0%;text-align:left;"
+        .lv-item.p-20.p-fixed
+          .media
+            .pull-left
+              i.zmdi.zmdi-hc-3x.zmdi-cloud-off.c-white
+            .media-body
+              .lv-title.c-white Error de conexión con la base de datos
+              small.lv-small.c-white Espera unos segundos mientras se reestablece la conexión.
+
+
+javascript:
+  $(document).ready(function() {
+    setTimeout(function(){
+       window.location.reload(1);
+    }, 5000);
+
+    update_progress();
+
+    function update_progress() {
+        var current = $(".progress-bar").width() / $('.progress-bar').parent().width() * 100;
+        $(".progress-bar").width( current + 10 + "%");
+        setTimeout(update_progress, 100);
+    }
+  });

data/lib/sinatra/views/errors/DatabaseDisconnectError.slim

@@ -0,0 +1,29 @@
+.row
+  .col-xs-12
+    .progress.progress-striped.active.bgm-orange style="height:80px;"
+      .progress-bar.progress-bar-warning aria-valuemax="100" aria-valuemin="0" aria-valuenow="0" role="progressbar" style="width: 0%;text-align:left;"
+        .lv-item.p-20.p-fixed
+          .media
+            .pull-left
+              i.zmdi.zmdi-hc-3x.zmdi-cloud-off.c-white
+            .media-body
+              .lv-title.c-white Conexión con la base de datos
+              small.lv-small.c-white Espera unos segundos mientras se reestablece la conexión.
+
+
+
+javascript:
+  $(document).ready(function() {
+    setTimeout(function(){
+       window.location.reload(1);
+    }, 5000);
+
+    update_progress();
+
+    function update_progress() {
+        var current = $(".progress-bar").width() / $('.progress-bar').parent().width() * 100;
+        $(".progress-bar").width( current + 10 + "%");
+        setTimeout(update_progress, 100);
+    }
+  });
+

data/lib/sinatra/views/inputs/date.slim

@@ -4,11 +4,19 @@
   - id = "#{name}_#{rand(1000)}"
 - unless defined? clazz
   - clazz = nil
+-unless defined? readonly
+  -readonly = false
 
 .form-group.fg-float
   label #{title}
   .fg-line
     -if required
-      input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" required="" class="#{clazz}" value="#{value}"
+      -if readonly
+        input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" required="" class="#{clazz}" value="#{value}" readonly=''
+      -else
+        input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" required="" class="#{clazz}" value="#{value}"
     -else
-      input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" class="#{clazz}" value="#{value}"
+      -if readonly
+        input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" class="#{clazz}" value="#{value}" readonly=''
+      -else
+        input.form-control.date-picker.fg-input id="#{id}" type="text" name="#{name}" class="#{clazz}" value="#{value}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.18
 platform: ruby
 authors:
 - Marco Zanger
@@ -157,6 +157,8 @@ files:
 - lib/sinatra/views/errors/403.slim
 - lib/sinatra/views/errors/404.slim
 - lib/sinatra/views/errors/500.slim
+- lib/sinatra/views/errors/DatabaseConnectionError.slim
+- lib/sinatra/views/errors/DatabaseDisconnectError.slim
 - lib/sinatra/views/inputs/date.slim
 - lib/sinatra/views/inputs/input.slim
 - lib/sinatra/views/inputs/month.slim