sinatra-hexacta 0.3.12 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b05ab9d7ae4bf96f2f47c7ebde837a7d113e2c1469d1facfc73251668c8e9804
-  data.tar.gz: '0728b357d1e61f664b1ca0ab0b2d5deca30f3281a142e72a02efdfda8c499960'
+  metadata.gz: 7ce9729468b924495d760e891e5011f6ec91a7a1d5867445043fb36cd8c7cced
+  data.tar.gz: 84206d7c18208e55794e01e00904c1c58f0781f7f7116045d560ae44ec6bb659
 SHA512:
-  metadata.gz: b246a36b3d31a267253134b4adfa1bd9f4a9ab0774424eb0888877b2838dabfcb4e041a9b9352f1776a4f2fb875f96dc1624e2ca644162e21cfa030a2c536716
-  data.tar.gz: ae78d283fd4d59b8577e734e818eb48f3182082a52509fb950f9566fb1771f60d8a183e7c1171bd614adcb227541a674eb79482bf2a2515f68ac5ca1f63494a0
+  metadata.gz: 407744e4cf104e64dd731aaca8b3c302b888b6045065cba2f35789c99700c9459d8806879fc76cb6adb7216285805472849cd9e832f0ae13c31ffb35ee2e6372
+  data.tar.gz: 2523b68e3033e60b18f4dd0b6efeafd16f68b8a5ba1f1b2baaf38e5622fe26f3bb72deea41338bc250a1fa1da9c709f339c939b44d0b8cb2623cd1955d4a123e

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

@@ -13860,7 +13860,7 @@ fieldset[disabled] .btn-inverse:active {
  */
 
 .m-btn {
-  z-index: 10;
+  z-index: 9;
   right: 40px;
   bottom: 40px;
   position: fixed !important;
@@ -13905,7 +13905,7 @@ fieldset[disabled] .btn-inverse:active {
   border-radius: 20px;
   opacity: 0.6;
   font-size: 8pt;
-  z-index: 10;
+  z-index: 9;
 }
 
 .left-footer .text {
@@ -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,18 @@
+.row
+  .col-xs-12
+    .lv-item.p-20.bgm-orange.m-b-5
+      .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);
+  });

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

@@ -0,0 +1,18 @@
+.row
+  .col-xs-12
+    .lv-item.p-20.bgm-orange.m-b-5
+      .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);
+  });

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.12
+  version: 0.3.17
 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