sinatra-hexacta 1.7.3 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc107478ca07acf14ac42fe83c84514cc09d2e86a1526005f6d22db7d1d3ac51
-  data.tar.gz: 67fd0bb1d758f908c3379c4f29788213597b9d0f9ab6cf6ab839afe9961b6b58
+  metadata.gz: aedcbf3c2bb769f1f78b351b42f5f65e0171624401e1fb136cc1d198635344e4
+  data.tar.gz: 9fe730e6c6acd693bebab4559366dcf7992ff1f6cd3ec935632fdfee27b0a1fd
 SHA512:
-  metadata.gz: 866c5ad0b4a8e13dc2a2cb65f97589813ea885a021704fd6c80e8d76ad58f93b235e7e1fc6ac5e92d38d217e5571e0678520023b13f4418982633fbf6f9a737f
-  data.tar.gz: 85ac915c63faa7f36a4d5e117fbc440370ffd1772c9cf002628d123de0e0fd9ba65868681a955d32195347b196bdcd108ff6625153d7aefd815b32f2a1a1040d
+  metadata.gz: e5ad947c31a166651792b67ef220958d3c7384c576a8c010db018877102d14fd6dc5736788e0545cca6c6613c73730cd5c4691fc065421f7a77f2e514512ee01
+  data.tar.gz: 0f785d4d9da08111214c39f34d066729aaf329815163a3b17e2d60bc1f73e7081dd0eefead30d786ded60caabd98271a04bbff8dcab3293ecf701ed20a44d3dd

data/lib/sinatra/extensions/date.rb

@@ -30,7 +30,7 @@ class Date
   end
 
   def short_display
-    self.strftime('%-d/%-m/%y')
+    self.strftime('%-d/%-m/%Y')
   end
 
   def next_working_date

data/lib/sinatra/extensions/date_time.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+class DateTime
+
+  def display
+    "#{Configuration::DAYS[self.wday]} #{self.day} de #{Configuration::MONTHS[self.month-1]} #{self.year == Date.today.year ? '' : self.year}"
+  end
+
+  def short_display
+    self.strftime('%-d/%-m/%Y')
+  end
+
+end

data/lib/sinatra/extensions/init.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 require_relative 'antiquity'
 require_relative 'date'
+require_relative 'date_time'
 require_relative 'mailbuilder'
 require_relative 'mailsender'
 require_relative 'mail'

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

@@ -27,6 +27,31 @@ function update_html_elements() {
 
     $("form.async").unbind("submit").submit(function(e){
       e.preventDefault();
+
+
+      $(this).find(':input[required]').each(function() {
+        if ($(this).val() == "" || $(this).val() == null) {
+          $(this).parent().removeClass("success");
+          $(this).parent().addClass("error");
+        } else {
+          $(this).parent().removeClass("error");
+          $(this).parent().addClass("success");
+        }
+      });
+
+      $(this).find('.chosen[required]').each(function() {
+        if ($(this).val() == "" || $(this).val() == null) {
+          $(this).parent().removeClass("success");
+          $(this).parent().addClass("error");
+        } else {
+          $(this).parent().removeClass("error");
+          $(this).parent().addClass("success");
+        }
+      });
+      if ($(this).find('.error').length > 0 ) {
+        return;
+      }
+
       var datastring = $(this).serialize();
       var url = $(this).attr('action');
       $(this).closest('.modal').modal('hide');
@@ -125,63 +150,6 @@ function update_html_elements() {
         }
     }
 
-    /*
-     * Sidebar
-     */
-    (function(){
-        //Toggle
-        $('body').on('click', '#menu-trigger', function(e){
-            e.preventDefault();
-            var x = $(this).data('trigger');
-
-            $(x).toggleClass('toggled');
-            $(this).toggleClass('open');
-
-          //Close opened sub-menus
-          $('.sub-menu.toggled').not('.active').each(function(){
-            $(this).removeClass('toggled');
-            $(this).find('ul').hide();
-          });
-
-          $('.profile-menu .main-menu').hide();
-
-          if (x == '#sidebar') {
-
-              $elem = '#sidebar';
-              $elem2 = '#menu-trigger';
-
-              $('#chat-trigger').removeClass('open');
-
-              if (!$('#chat').hasClass('toggled')) {
-                  $('#header').toggleClass('sidebar-toggled');
-              }
-              else {
-                  $('#chat').removeClass('toggled');
-              }
-          }
-
-          //When clicking outside
-          if ($('#header').hasClass('sidebar-toggled')) {
-              $(document).on('click', function (e) {
-                  if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
-                      setTimeout(function(){
-                          $($elem).removeClass('toggled');
-                          $('#header').removeClass('sidebar-toggled');
-                          $($elem2).removeClass('open');
-                      });
-                  }
-              });
-          }
-        })
-
-        //Submenu
-        $('body').on('click', '.sub-menu > a', function(e){
-          e.preventDefault();
-          $(this).next().slideToggle(200);
-          $(this).parent().toggleClass('toggled');
-        });
-    })();
-
     /*
      * Clear Notification
      */
@@ -539,6 +507,48 @@ function update_html_elements() {
       $(this).find(':submit').attr("disabled",false);
     });
 
+    /*
+     * Sidebar
+     */
+    (function(){
+        //Toggle
+        $('#menu-trigger').unbind('click').on('click', function(e){
+            e.preventDefault();
+            var x = $(this).data('trigger');
+
+            $(x).toggleClass('toggled');
+            $(this).toggleClass('open');
+
+          //Close opened sub-menus
+          $('.sub-menu.toggled').not('.active').each(function(){
+            $(this).removeClass('toggled');
+            $(this).find('ul').hide();
+          });
+
+          $('.profile-menu .main-menu').hide();
+
+          //When clicking outside
+          if ($('#header').hasClass('sidebar-toggled')) {
+              $(document).on('click', function (e) {
+                  if (($(e.target).closest($elem).length === 0) && ($(e.target).closest($elem2).length === 0)) {
+                      setTimeout(function(){
+                          $($elem).removeClass('toggled');
+                          $('#header').removeClass('sidebar-toggled');
+                          $($elem2).removeClass('open');
+                      });
+                  }
+              });
+          }
+        })
+
+        //Submenu
+        $('.sub-menu > a').unbind('click').on('click', function(e){
+          e.preventDefault();
+          $(this).next().slideToggle(200);
+          $(this).parent().toggleClass('toggled');
+        });
+
+    })();
 }
 
 const elementToObserve = document.querySelector("body");
@@ -670,5 +680,9 @@ function read_notify(id,url) {
 }
 
 function capitalize(word) {
-  return word[0].toUpperCase() + word.slice(1).toLowerCase();
+  if (word == "") {
+    return "";
+  } else {
+    return word[0].toUpperCase() + word.slice(1).toLowerCase();
+  }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.7
 platform: ruby
 authors:
 - Marco Zanger
@@ -88,6 +88,7 @@ extra_rdoc_files: []
 files:
 - lib/sinatra/extensions/antiquity.rb
 - lib/sinatra/extensions/date.rb
+- lib/sinatra/extensions/date_time.rb
 - lib/sinatra/extensions/generalmail.rb
 - lib/sinatra/extensions/generalmailnolink.rb
 - lib/sinatra/extensions/init.rb