sinatra-hexacta 0.9.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b09731f11bb84a5c0cdf375704854f8221af4551f0b19a2215c2c6501695f1f
-  data.tar.gz: f303c526ff69d7e2c1d077842807c5c2efe6961262d23d821d34cb020c30024f
+  metadata.gz: 235207ce86479d51ab5c1852a286ab92d5b4de8fbd159d584bc79234bcafd5dc
+  data.tar.gz: 933097a5eca58c05479cb29e93543c9e9ca292eb45c61b940be4ab9c4cf80f9c
 SHA512:
-  metadata.gz: 9ab7ed10ae230ba1ea869c047ff81f49eae1f3b5cc51916848cf40ee97ac3a34d38fe6ee33f90b5f1130a933842022f446bfa835d01be7adf3b8a6a0d872716a
-  data.tar.gz: 4625603c05c8ec901ff9fd8e183cbf9691a2b6f501902c2cefdbd1ec346000593e26c398aeee49cea683fd866072f23f5c569c3d70dcf0d9d6101696ec088352
+  metadata.gz: c57ec64f35c7f71a043278ffc15e8e131f53cc8a29dfcb353475baa4763a27b09e323eacb16c0f652b209eb44d22383f8e91096403e42e35cfd73f08c5ec10ef
+  data.tar.gz: 2bfb5b976a50e30124bce1b534953b68e4c95f7398b4d34dace6afee55204b32adaec6bf67ac892f2cd33554a048a4f98be171a0ad17ac72581ef19aa32b8e5e

data/lib/sinatra/extensions/antiquity.rb

@@ -5,16 +5,16 @@ class Antiquity
     @periods = periods.sort { |a,b| a.start_date <=> b.start_date }
   end
 
-  def days
-    @periods.inject(0) { |total, period| total + period.days }
+  def days(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.days(upto_date) }
   end
 
-  def months
-    @periods.inject(0) { |total, period| total + period.months }
+  def months(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.months(upto_date) }
   end
 
-  def years
-    months.divmod(12).first
+  def years(upto_date=Date.today)
+    months(upto_date).divmod(12).first
   end
 
   def to_s(upto_date=Date.today)
@@ -22,11 +22,13 @@ class Antiquity
     result = ""
     return result if @periods.empty?
     if date >= @periods.first.start_date
-      result += years > 1 ? "#{years} años" : "#{years} año" unless years == 0
-      result += ", " if years >= 1 && !(months.modulo(12).eql?(0))
-      result += months.modulo(12) > 1 ? "#{months.modulo(12)} meses" : "#{months.modulo(12)} mes" unless months.modulo(12) == 0
-      result += "#{(date - @periods.last.start_date).to_i} dias" if months.modulo(12) == 0 && years == 0 && date > @periods.last.start_date
-      result += "Hoy!" if months.modulo(12) == 0 && date == @periods.last.start_date
+      years_upto_date = years(date)
+      months_upto_date = months(date)
+      result += years_upto_date > 1 ? "#{years_upto_date} años" : "#{years_upto_date} año" unless years_upto_date == 0
+      result += ", " if years_upto_date >= 1 && !(months_upto_date.modulo(12).eql?(0))
+      result += months_upto_date.modulo(12) > 1 ? "#{months_upto_date.modulo(12)} meses" : "#{months_upto_date.modulo(12)} mes" unless months_upto_date.modulo(12) == 0
+      result += "#{(date - @periods.last.start_date).to_i} dias" if months_upto_date.modulo(12) == 0 && years_upto_date == 0 && date > @periods.last.start_date
+      result += "Hoy!" if months_upto_date.modulo(12) == 0 && date == @periods.last.start_date
     end
     result += "En unos días..." if date < @periods.first.start_date
     result

data/lib/sinatra/extensions/init.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
-require_relative 'date'
 require_relative 'antiquity'
-require_relative 'notification'
+require_relative 'date'
+require_relative 'mailbuilder'
 require_relative 'mailsender'
 require_relative 'mail'
 require_relative 'generalmail'
-require_relative 'mailbuilder'
-require_relative 'processmanager'
+require_relative 'generalmailnolink'
 require_relative 'menu'
+require_relative 'notification'
+require_relative 'processmanager'

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

@@ -15859,6 +15859,30 @@ body.login-content:before {
   width: 100%;
 }
 
+#profile-main .pm-overview {
+  transition: width 300ms ease-in-out;
+}
+
+#profile-main .pm-overview .pmo-block, #profile-main .pm-overview .pmop-message {
+  transition: opacity 300ms ease-in-out;
+}
+
+#profile-main .pm-body {
+  transition: padding 300ms ease-in-out;
+}
+
+#profile-main .pm-overview.detail_view {
+  width:112px !Important;
+}
+
+#profile-main .pm-overview.detail_view .pmo-block, #profile-main .pm-overview.detail_view .pmop-message{
+  opacity: 0;
+}
+
+#profile-main .pm-body.detail_view {
+  padding-left: 112px !Important;
+}
+
 @media (max-width: 767px) {
   .c-timeline {
     background: #edecec;

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

@@ -45,6 +45,14 @@ $(document).ready(function(){
         }
     });
 
+    // Expand and reduce profile view
+    $(".detail_view").on('click',function() {
+      $('.toggled_view').addClass('detail_view');
+    })
+    $(".regular_view").on('click',function() {
+      $('.toggled_view').removeClass('detail_view');
+    })
+
     /* --------------------------------------------------------
         Scrollbar
     -----------------------------------------------------------*/

data/lib/sinatra/views/menu/menu.slim

@@ -1,28 +1,29 @@
-.footer-text
-  a.text.btn.bgm-white.c-gray onclick='toggle_menu()' Menu
+-unless menu.empty?
+  .footer-text
+    a.text.btn.bgm-white.c-gray onclick='toggle_menu()' Menu
 
-.actions-menu.hidden
-  -for item in menu
-    -idx = menu.index(item) + 1
-    -if item[:type] == 'link'
-      a.text.btn.bgm-white.c-gray type="button" href="#{item[:link]}" target="#{item[:target]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s" #{item[:text]}
-    -if item[:type] == 'modal'
-      a.text.btn.bgm-white.c-gray type="button" data-toggle="modal" data-target="#{item[:link]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s" #{item[:text]}
+  .actions-menu.hidden
+    -for item in menu
+      -idx = menu.index(item) + 1
+      -if item[:type] == 'link'
+        a.text.btn.bgm-white.c-gray type="button" href="#{item[:link]}" target="#{item[:target]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s" #{item[:text]}
+      -if item[:type] == 'modal'
+        a.text.btn.bgm-white.c-gray type="button" data-toggle="modal" data-target="#{item[:link]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s" #{item[:text]}
 
-.footer-btn
-  a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float onclick='toggle_menu()'
-    i.zmdi.zmdi-menu
+  .footer-btn
+    a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float onclick='toggle_menu()'
+      i.zmdi.zmdi-menu
 
-.actions-menu.hidden
-  -for item in menu
-    -idx = menu.index(item) + 1
-    -if item[:type] == 'link'
-      a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float type="button" href="#{item[:link]}" target="#{item[:target]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s"
-        i.zmdi class="zmdi-#{item[:icon]}"
+  .actions-menu.hidden
+    -for item in menu
+      -idx = menu.index(item) + 1
+      -if item[:type] == 'link'
+        a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float type="button" href="#{item[:link]}" target="#{item[:target]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s"
+          i.zmdi class="zmdi-#{item[:icon]}"
 
-    -if item[:type] == 'modal'
-      a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float type="button" data-toggle="modal" data-target="#{item[:link]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s"
-        i.zmdi class="zmdi-#{item[:icon]}"
+      -if item[:type] == 'modal'
+        a.btn.btn-float.bgm-blue.m-btn.waves-effect.waves-circle.waves-float type="button" data-toggle="modal" data-target="#{item[:link]}" style="bottom:#{50+idx*45}px;animation-duration: #{(idx.to_f/10.0).round(2)}s"
+          i.zmdi class="zmdi-#{item[:icon]}"
 
 
 css:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 1.0.0
 platform: ruby
 authors:
 - Marco Zanger
@@ -163,7 +163,6 @@ files:
 - lib/sinatra/public/vendors/malihu-custom-scrollbar-plugin/mCSB_buttons.png
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.css
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.min.css
-- lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff