cg_app_base 1.0.56 → 1.0.62

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbdf3a6880b7238aa30c5b71745462c92ab21fb4
-  data.tar.gz: dca5b6f199dd5d03ffdef33469e5c9fa8507ee30
+  metadata.gz: bd40601a536193e6e81fabb3c965b06dcaa86c13
+  data.tar.gz: 02c251e7a7f8e84ccd570ebb1b28a25e5efe239b
 SHA512:
-  metadata.gz: 1ec1f9e1518e501eb7383ed393fbef13c5de68e6805fbbc2d1af3ba25fc91c1b1443a2da0c361de824d9dfae09850fd6985ad43972df60b46ee01e4ec24fa3e4
-  data.tar.gz: 8c45b9e94a2c74403ff09e87a9a3bb17a804a0057a8d17ec8b0a7b444d27e3e4e7153b2ef97c72e109150796907d5867e61fa1154e7f7ff4d5e9dcf7e8c3cf70
+  metadata.gz: 379fc4401a06d72c6b72e75e3acfd1dd0d2592ae9a691fdd2bb06cfd025da777c0e8ca9ea64f307d4ff9c7acae6d3ff773a466401d45433272b1614f2feb9baa
+  data.tar.gz: d9d26872db1937527caed1b2b00fa19ece40d4cfdfe9e6fc908b26fb32908e43471ee0f86d92df207fab3d36cdb2b9b5bb29b70f42efa1604b64174515123885

data/app/assets/javascripts/flatty/plugins/validate/additional-methods.js

@@ -401,7 +401,7 @@ jQuery.validator.addMethod("strippedminlength", function(value, element, param)
 
 // same as email, but TLD is optional
 jQuery.validator.addMethod("email2", function(value, element, param) {
-	return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)*(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(value);
+  return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))+@+((([a-z]|\d)|(([a-z]|\d)([a-z]|\d|-|\.|_)*([a-z]|\d)))\.)+(([a-z])|(([a-z])([a-z]|\d|-|\.|_)*([a-z])))$/i.test(value);
 }, jQuery.validator.messages.email);
 
 // same as url, but TLD is optional

data/app/assets/javascripts/flatty/plugins/validate/jquery.validate.js

@@ -1012,7 +1012,7 @@ $.extend($.validator, {
 		// http://docs.jquery.com/Plugins/Validation/Methods/email
 		email: function( value, element ) {
 			// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
-			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(value);
+			return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))+@+((([a-z]|\d)|(([a-z]|\d)([a-z]|\d|-|\.|_)*([a-z]|\d)))\.)+(([a-z])|(([a-z])([a-z]|\d|-|\.|_)*([a-z])))$/i.test(value);
 		},
 
 		// http://docs.jquery.com/Plugins/Validation/Methods/url

data/app/assets/stylesheets/application2.scss

@@ -15,6 +15,7 @@ body {
   font-size: 14px;
   line-height: 1.42857;
   color: #333;
+  background-color: #ffffff;
 
   label {
     font-size: 14px !important;
@@ -26,6 +27,7 @@ body {
 
 .page-header {
   min-height: 66px;
+  width: 100%;
 
   > h1 {
     font-size: 24px;
@@ -375,17 +377,11 @@ tr.subtablebkg {
 }
 
 a.state_collapser {
-  color: #0163AC;
-  width: 49%;
-  line-height: 2.7em;
   text-decoration: none;
   cursor: pointer !important;
-  margin-left: 6px;
 
   &:hover {
-    color: #014171;
     text-decoration: none;
-    margin-left: 6px;
   }
 }
 
@@ -501,9 +497,9 @@ abbr[data-original-title] {
   margin: 0px;
   background: white;
   display: block;
-  -webkit-box-shadow: 2 1px 3px rgba(0, 0, 0, 0.1) !important;
-  -moz-box-shadow: 2 1px 3px rgba(0, 0, 0, 0.1) !important;
-  box-shadow: 2 1px 3px rgba(0, 0, 0, 0.1) !important;
+  -webkit-box-shadow: 2px 1px 3px #dddddd !important;
+  -moz-box-shadow: 2px 1px 3px rgba(0, 0, 0, 0.1) !important;
+  box-shadow: 2px 1px 3px rgba(0, 0, 0, 0.1) !important;
 
   tbody {
     padding: 5px 0 !important;
@@ -531,7 +527,7 @@ abbr[data-original-title] {
   }
 
   .datepicker-inline {
-    width: 100%;
+    //width: 100%;
   }
 
   table.table-condensed thead {
@@ -546,10 +542,12 @@ abbr[data-original-title] {
 
     tr {
       width: 100%;
+      float: left;
     }
 
     tr th {
       border-radius: 0;
+      width: 15%;
     }
 
     tr th.prev, tr th.next {
@@ -558,8 +556,7 @@ abbr[data-original-title] {
 
     th.dow {
       color: #01284d;
-      width: 15%;
-      padding: 0 0;
+      width: 15.2%;
     }
   }
 
@@ -674,6 +671,12 @@ abbr[data-original-title] {
   display: block;
 }
 
+.box .mainBox {
+  padding: 0px;
+  margin: 20px -10px;
+  display: block;
+}
+
 .box .fullbox-content {
   padding: 10px;
   margin-bottom: 0px;
@@ -862,7 +865,7 @@ em {
 #content_embedded {
   background: #fbfbfb;
   min-width: 276px;
-  background: #fbfbfb;
+  background: #ffffff;
 }
 
 .navbar h2 {
@@ -1138,11 +1141,14 @@ input, button, select, textarea {
   .modal-body {
     height: auto;
   }
+  iframe {
+    border: 0px inset;
+  }
   /* line 135, /Users/rem/Projects/cg_fiche_client_master/app/assets/stylesheets/flatty/bootstrap/bootstrap/_modals.scss */
   .modal-dialog {
     left: 50%;
     right: auto;
-    width: 960px;
+    width: 95%;
     padding-top: 30px;
     padding-bottom: 30px;
   }
@@ -1785,8 +1791,14 @@ p.titletable {
   line-height: 1.428571429;
   vertical-align: top;
   border-top: 1px solid #dddddd;
-  font-size: 0.8em;
+  font-size: 0.83em;
   text-overflow: ellipsis;
+
+  > table > tbody > tr {
+    > td {
+      font-size: 1em;
+    }
+  }
 }
 #projections .table thead > tr > th, #projections .table thead > tr > td, #projections .table tbody > tr > th, #projections .table tbody > tr > td, #projections .table tfoot > tr > th, #projections .table tfoot > tr > td {
   font-size: 0.845em;

data/app/assets/stylesheets/flatty/theme/_navigation.scss

@@ -206,6 +206,7 @@
     // zero level
     > .nav {
       border-bottom: 1px solid $navItemBorderTop;
+      border-right: 1px solid $navItemBorderTop;
       background: $navBackground;
 
       > li {

data/app/views/layouts/application.html.erb

@@ -67,13 +67,11 @@
   <%= render 'shared/main_navigation' if navigation_on? %>
 
   <section id="content<%= navigation_on? ? '' : '_embedded' %>">
-    <div class='row'>
-      <div class='col-xs-12 col-sm-12 col-md-12' id="flash_messages">
-        <%= render 'shared/flash_message' %>
-      </div>
+    <div id="flash_messages">
+      <%= render 'shared/flash_message' %>
     </div>
 
-    <div class="col-xs-12 col-sm-12 col-md-12">
+    <div class="container">
       <div class="page-header margbottom0">
         <h1 class="pull-left">
           <span> <%= yield(:title) %></span>
@@ -86,18 +84,18 @@
       </div>
     </div>
 
-    <div class="box">
-      <div class="box-content-no-border">
+    <div class="container">
+      <div class="box">
+        <div class="mainBox">
 
-        <div class='row'>
-          <div class='col-xs-12 col-sm-12 col-md-12'>
+          <div class='container'>
             <%= yield %>
           </div>
+
         </div>
       </div>
     </div>
   </section>
-
 </div>
 
 <div class="loader">
@@ -108,16 +106,12 @@
 
 <div class="modal" id="modal-window">
   <div class="modal-dialog">
-    <div class="row">
-      <div class="col-xs-10 col-sm-10 col-md-10">
-        <div class="modal-content">
-          <div class="modal-header">
-            <button aria-hidden="true" class="close btn-link" data-dismiss="modal" type="button">×</button>
-            <h4 class="modal-title title">Modal title</h4>
-          </div>
-          <div class="modal-body">
-          </div>
-        </div>
+    <div class="modal-content">
+      <div class="modal-header">
+        <button aria-hidden="true" class="close btn-link" data-dismiss="modal" type="button">×</button>
+        <h4 class="modal-title title">Modal title</h4>
+      </div>
+      <div class="modal-body">
       </div>
     </div>
   </div>

data/config/navigation.rb

@@ -55,23 +55,20 @@ SimpleNavigation::Configuration.run do |navigation|
     #                            against the current URI.  You may also use a proc, or the symbol <tt>:subpath</tt>.
     #
 
-    primary.dom_class = 'nav nav-stacked'
+    primary.dom_class = 'nav nav-stacked in'
 
     client_sub_items = [
-        {name: :customer_search, descr: 'Clients', url: "customers", icon: 'search'},
-        {name: :contract_search, descr: 'Contrats', url: "contracts", icon: 'search'}
+        {name: :customer_search, descr: 'Clients', url: "customers", icon: 'group'},
+        {name: :contract_search, descr: 'Contrats', url: "contracts", icon: 'file-text'}
     ]
 
     if current_user.has_role? :admin
-      client_sub_items << {name: :customer_merges, descr: 'Fusionner clients', url: "customers_merges", icon: 'search'}
-      client_sub_items << {name: :new_customer, descr: 'Nouveau client', url: "customers/new/particulier", icon: 'dashboard'}
+      client_sub_items << {name: :customer_merges, descr: 'Fusionner clients', url: "customers_merges", icon: 'code-fork'}
+      client_sub_items << {name: :new_customer, descr: 'Nouveau client', url: "customers/new/particulier", icon: 'user'}
     end
 
-    primary.item :client, 'Client', "#{ENV['CUSTOMER_URL']}/contracts", :icon => ['icon-folder-open-alt'] do |sub_nav|
-      sub_nav.dom_class = 'nav nav-stacked in'
-      client_sub_items.each do |sni|
-        sub_nav.item sni[:name], sni[:descr], "#{ENV['CUSTOMER_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
-      end
+    client_sub_items.each do |sni|
+      primary.item sni[:name], sni[:descr], "#{ENV['CUSTOMER_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
     end
 
     ship_sub_items = []
@@ -84,14 +81,10 @@ SimpleNavigation::Configuration.run do |navigation|
         ship_sub_items << {name: :vehicles, descr: 'Véhicules', url: "shipping/vehicles", icon: 'truck'}
         ship_sub_items << {name: :employees, descr: 'Employés', url: "shipping/employees", icon: 'user'}
         ship_sub_items << {name: :shipping_routes, descr: 'Routes', url: "shipping/routes", icon: 'road'}
-        ship_sub_items << {name: :shipping_methods, descr: 'Méthodes de livraison', url: "shipping/methods", icon: 'suitcase'}
       end
 
-      primary.item :shipping, 'Expédition', "#{ENV['SHIPPING_URL']}/shipping/shipments", :icon => ['icon-folder-open-alt'] do |sub_nav|
-        sub_nav.dom_class = 'nav nav-stacked in'
-        ship_sub_items.each do |sni|
-          sub_nav.item sni[:name], sni[:descr], "#{ENV['SHIPPING_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
-        end
+      ship_sub_items.each do |sni|
+        primary.item sni[:name], sni[:descr], "#{ENV['SHIPPING_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
       end
 
     end

data/lib/cg_app_base/version.rb

@@ -1,3 +1,3 @@
 module CgAppBase
-  VERSION = "1.0.56"
+  VERSION = "1.0.62"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cg_app_base
 version: !ruby/object:Gem::Version
-  version: 1.0.56
+  version: 1.0.62
 platform: ruby
 authors:
 - Nicolas Pineault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails