cg_app_base 1.0.52 → 1.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75f2f40751e96439c1894c5a8736b9377496919e
-  data.tar.gz: 1d928ffb65bbeedbdfb36d2ce79e6dc47bba5b5b
+  metadata.gz: 94936792548b2781b0e992ba4424d3ec66b079c6
+  data.tar.gz: 11dd4118848ec1ff8198b177c7909584e193c937
 SHA512:
-  metadata.gz: 93ed74c8dbbb98ce29408747cc02c913dce4658b43f5bbc9064527db3a09c49e3f48618be79928255750da314798a947e5cf31efe2fb369650e374752a00a091
-  data.tar.gz: b8855fe77e71bdd3935f9954a3da51e20aaf0d243cd9ae21fb0cb67ac8a694ed7a5eda8acfabef07c73455108cb43edc784f8779dd2d604b3f9e8031531079e8
+  metadata.gz: b00a53f18b481b1dfcfe3b5607a6aa6935acdd85a96080dbfa6e222f83b1192dad9e8055b0812525f930ecca8b027c6835f2434d5cb419c3dd831bc8f78e8b98
+  data.tar.gz: 178999a48ede7132a59ea7c64986748257d806a7c71ce8811780d4c1d8a03d1328fa480dcedf8f1740f98ce37cd21d51db9550e8fdef68743c1590b476c76324

data/app/assets/javascripts/base.js.coffee

@@ -53,4 +53,14 @@ $.MyApp =
   empty_hide_modal: () ->
     $('#modal-window').modal('hide')
     $('#modal-window .modal-body').html('')
-    @
+    @
+
+$ ->
+  $('.row-eq-height').each ->
+    heights = $(this).find('.col-eq-height').map(->
+      $(this).outerHeight()
+    ).get()
+    maxHeight = Math.max.apply(null, heights)
+    $(this).find('.col-eq-height').outerHeight maxHeight
+    @
+  @

data/app/assets/stylesheets/application2.scss

@@ -19,33 +19,114 @@ body {
   label {
     font-size: 14px !important;
   }
+  #modal #checkerMail label.control-label {
+    display: none !important;
+  }
+}
+
+.page-header {
+  min-height: 66px;
+
+  > h1 {
+    font-size: 24px;
+  }
+}
+
+tr.text-muted a {
+  color: #18354c !important;
+}
+
+tr.text-primary a {
+  color: #428bca !important;
+}
+
+tr.text-warning a {
+  color: #efac4f !important;
+}
+
+tr.text-danger a {
+  color: #940004 !important;
+}
+
+tr.text-success a {
+  color: #5cb85c !important;
+}
+
+tr.text-info a {
+  color: #9564e2 !important;
+}
+
+tr.text-muted a {
+  color: #999999 !important;
+}
+
+tr.text-pink a {
+  color: #c44a83 !important;
+}
+
+tr.text-banana a {
+  color: #fcd052 !important;
+}
+
+tr.text-darkOrange a {
+  color: #f56e00 !important;
+}
+
+tr.text-darkColor a {
+  color: #2b2d30 !important;
+}
+
+tr.text-fb a {
+  color: #3d579d !important;
+}
+
+.label-muted {
+  background-color: #18354c !important;
+}
+
+.label-primary {
+  background-color: #428bca !important;
+}
+
+.label-warning {
+  background-color: #efac4f !important;
+}
+
+.label-danger {
+  background-color: #940004 !important;
+}
+
+.label-success {
+  background-color: #5cb85c !important;
+}
+
+.label-info {
+  background-color: #9564e2 !important;
+}
+
+.label-muted {
+  background-color: #999999 !important;
+}
+
+.label-pink {
+  background-color: #c44a83 !important;
 }
 
-tr.text-muted a { color: #18354c !important; }
-tr.text-primary a { color: #428bca !important; }
-tr.text-warning a { color: #efac4f !important; }
-tr.text-danger a { color: #940004 !important; }
-tr.text-success a { color: #5cb85c !important; }
-tr.text-info a { color: #9564e2 !important; }
-tr.text-muted a { color: #999999 !important; }
-tr.text-pink a { color: #c44a83 !important; }
-tr.text-banana a { color: #fcd052 !important; }
-tr.text-darkOrange a { color:#f56e00 !important;}
-tr.text-darkColor a { color: #2b2d30 !important; }
-tr.text-fb a { color: #3d579d !important; }
-
-.label-muted { background-color: #18354c !important; }
-.label-primary { background-color: #428bca !important; }
-.label-warning { background-color: #efac4f !important; }
-.label-danger { background-color: #940004 !important; }
-.label-success { background-color: #5cb85c !important; }
-.label-info { background-color: #9564e2 !important; }
-.label-muted { background-color: #999999 !important; }
-.label-pink { background-color: #c44a83 !important; }
-.label-banana { background-color: #fcd052 !important; }
-.label-darkOrange { background-color:#f56e00 !important;}
-.label-darkColor { background-color: #2b2d30 !important; }
-.label-fb { background-color: #3d579d !important; }
+.label-banana {
+  background-color: #fcd052 !important;
+}
+
+.label-darkOrange {
+  background-color: #f56e00 !important;
+}
+
+.label-darkColor {
+  background-color: #2b2d30 !important;
+}
+
+.label-fb {
+  background-color: #3d579d !important;
+}
 
 .label {
   font-size: 100% !important;
@@ -64,6 +145,13 @@ tr.text-fb a { color: #3d579d !important; }
   margin-bottom: 5px;
 }
 
+.row-eq-height {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
 header .navbar {
   margin: 0;
   padding: 0 0px;
@@ -83,6 +171,8 @@ header .navbar {
 
 .main-nav-opened #main-nav-bg {
   width: 175px;
+  background-color: #FBFBFB !important;
+  border-right: 0px solid #ffffff !important;
 }
 
 .main-nav-opened #content {
@@ -151,9 +241,8 @@ header .navbar {
 
 #content {
   margin-left: 175px;
-  background: #fbfbfb;
+  background: #ffffff;
   min-width: 276px;
-  background: #fbfbfb;
 }
 
 /* end of navigation side */
@@ -399,6 +488,14 @@ abbr[data-original-title] {
   box-shadow: 0 1px 3px rgba(0, 0, 0, 0.055);
 }
 
+.box .box-content-no-border {
+  padding: 10px;
+  margin-bottom: 0px;
+  border: 0px solid #dddddd;
+  background: white;
+  display: block;
+}
+
 .date-box-content {
   padding: 0;
   margin: 0px;
@@ -520,7 +617,7 @@ abbr[data-original-title] {
   }
 
   .datepicker table tr td.old, .datepicker table tr td.new {
-    color: rgba(0,0,0,0.85);
+    color: rgba(0, 0, 0, 0.85);
     opacity: 0.4;
   }
 
@@ -831,8 +928,8 @@ address {
 
 div.invoiceTitle, span.invoiceTitle {
   text-align: right !important;
-  border: 0px solid rgba(255,255,255,1) !important;
-  background-color: rgba(255,255,255,1) !important;
+  border: 0px solid rgba(255, 255, 255, 1) !important;
+  background-color: rgba(255, 255, 255, 1) !important;
 }
 
 .border-cod {
@@ -844,10 +941,10 @@ div.invoiceTitle, span.invoiceTitle {
 }
 
 div.invoiceBkg, span.invoiceBkg {
-  border-top: 0px solid rgba(255,255,255,1) !important;
-  border-bottom: 0px solid rgba(255,255,255,1) !important;
-  border-right: 0px solid rgba(255,255,255,1) !important;
-  background-color: rgba(255,255,255,1) !important;
+  border-top: 0px solid rgba(255, 255, 255, 1) !important;
+  border-bottom: 0px solid rgba(255, 255, 255, 1) !important;
+  border-right: 0px solid rgba(255, 255, 255, 1) !important;
+  background-color: rgba(255, 255, 255, 1) !important;
 }
 
 #contracts {
@@ -870,7 +967,7 @@ div.invoiceBkg, span.invoiceBkg {
 }
 
 .alert {
-  margin-top:20px;
+  margin-top: 20px;
   width: 100%;
   position: relative;
 }
@@ -1009,13 +1106,26 @@ input, button, select, textarea {
   padding: 14px;
 }
 
+.searchblock label {
+  color: #ffffff;
+  font-size: 0.9em !important;
+  font-weight: 400;
+  line-height: 2em;
+}
+
 /* navigation onglets */
 
 .nav > li > a {
   position: relative;
   display: block;
-  padding: 10px 15px;
-  font-size: 1.1em;
+  padding: 7px 9px;
+  font-size: 1em;
+}
+
+/* historiqueux */
+
+.timeline li .title, .timeline li .title small {
+  font-family: 'Roboto Condensed', sans-serif;
 }
 
 @media screen and (min-width: 768px) {
@@ -1180,7 +1290,7 @@ input, button, select, textarea {
 
   .dd-handle {
     text-transform: uppercase;
-    background-color: rgba(255,255,255,1);
+    background-color: rgba(255, 255, 255, 1);
     display: inline-block;
     width: 100%;
     padding: 6px;
@@ -1190,7 +1300,7 @@ input, button, select, textarea {
 
     &:hover {
       color: #000000;
-      background-color: rgba(240,240,240,1);
+      background-color: rgba(240, 240, 240, 1);
       -webkit-transition: all 500ms ease 0.1s;
       -moz-transition: all 500ms ease 0.1s;
       -o-transition: all 500ms ease 0.1s;
@@ -1243,25 +1353,12 @@ input, button, select, textarea {
 
 #projections {
 
-  .autoheight {
-    height: auto;
-  }
-  .fullheight {
-    height: 100%;
-  }
-  .fix-height155 {
-    min-height: 155px;
-  }
-  .fix-height275 {
-    min-height: 275px;
-  }
   .bigtitle {
     font-size: 1.2em;
     font-weight: bold;
   }
 
   .title {
-    margin-left: 6px;
     margin-top: 6px;
 
     a {
@@ -1327,35 +1424,78 @@ input, button, select, textarea {
   table {
     width: 100%;
 
+    .table {
+      width: 100%;
+    }
+
     thead {
-      background-color: rgba(30, 30, 30, 1.0);
+      background-color: rgba(30, 30, 30, 0.7);
+      color: #ffffff;
+
+      > tr {
+        border-bottom: 1px solid #dbdbdb;
+
+        > th {
+          font-size: 60%;
+          font-weight: 400;
+          border: none;
+          float: left;
+        }
+      }
     }
 
     tbody {
-    }
 
-    tr {
-      width: 100%;
+      > tr {
+        width: 100%;
+        margin: 0;
+        > td {
+          margin: 0;
+          border: 0;
+          > table {
+            margin: 0;
+            padding: 0;
+            //width: 100%;
+            > tr {
+              //width: 100%;
+              > td {
+                //width: 100% !important;
+                > tr {
+                  border: 0px solid #ffffff;
+                  //width: 100%;
+
+                  > td {
+                    font-size: 0.8em;
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
 
-    th.bigtitleblack {
-      color: rgba(255, 255, 255, 1.0);
-      text-align: left;
-      border: none;
-    }
+    .blockForecast {
 
-    th {
-      font-size: 70%;
-      font-weight: 400;
-      text-align: left;
-      border: none;
     }
 
-    td {
-      font-size: 0.8em;
+    .odds {
+      background-color: #d7d7d7 !important;
+      //border-top: 2px solid #5B5B5B !important;
+      //border-bottom: 2px solid #5B5B5B !important;
+    }
+    .even {
+      background-color: #ebebeb !important;
+      //border-top: 2px solid #5B5B5B !important;
+      //border-bottom: 2px solid #5B5B5B !important;
     }
 
   }
+  .label {
+    color: #ffffff;
+    font-size: 70% !important;
+    display: inline-block;
+  }
 
   .bigtitlewhite {
     color: rgba(0, 0, 0, 1.0);
@@ -1388,8 +1528,7 @@ input, button, select, textarea {
   .projectionsbox {
     margin: 0 0 8px 0;
     width: 100%;
-    min-height: 250px;
-    //min-width: 150px;
+    height: 100%;
     float: left;
     max-width: 277.8px;
     overflow: hidden;
@@ -1634,7 +1773,7 @@ th.tableheadtitle {
 }
 
 p.titletable {
-  font-size: 115%;
+  font-size: 108%;
   text-align: center;
   margin: 0px;
   padding: 0px;
@@ -1646,9 +1785,13 @@ p.titletable {
   line-height: 1.428571429;
   vertical-align: top;
   border-top: 1px solid #dddddd;
-  font-size: 0.88em;
+  font-size: 0.8em;
   text-overflow: ellipsis;
 }
+#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;
+  width: 50%;
+}
 
 @media print {
   .no-print, .no-print * {
@@ -1672,4 +1815,49 @@ p.titletable {
 
 .white-space-normal {
   white-space: normal !important;
+}
+
+.row-eq-height {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+.col-special {
+  position: relative;
+  min-height: 1px;
+  margin: 0 2px 2px 0;
+  float: left;
+  width: 19.12%;
+
+  &:first-child {
+    margin-left: 15px !important;
+  }
+  &:last-child {
+    margin-right: 15px !important;
+  }
+}
+
+/* survey */
+#surveyGrid {
+
+  table {
+
+    tr {
+
+      td {
+
+        > a {
+          cursor: pointer !important;
+
+          &:hover {
+            color: #940004;
+            text-decoration: none;
+          }
+        }
+      }
+    }
+  }
+
 }

data/app/assets/stylesheets/print.css

@@ -0,0 +1,197 @@
+@import 'flatty/theme-colors';
+@import 'flatty/bootstrap/bootstrap';
+@import 'stylesheets/_timeline';
+
+html {
+    font: 62.5%/1.4 'Roboto Condensed', sans-serif;
+}
+
+body {
+    font-size: 1.3em;
+    padding: 90px;
+    background-color: #b0e6ff;
+}
+
+header.letter {
+
+}
+
+#header, #footer {
+    width: 960px;
+    margin: 0 auto;
+}
+
+#header p {
+    font-size: 150%;
+}
+
+h1, div.source {
+    font-family: "Times New Roman", Times, monospace;
+}
+
+h1 {
+    margin: 0;
+}
+
+h1 a {
+    display: block;
+    width: 300px;
+    text-decoration: none;
+    margin: 0;
+    padding: 52px 0 25px 215px;
+    color: #253c93;
+}
+
+h1 span {
+    display: none;
+}
+
+h2 {
+    margin: 0;
+}
+
+h2 a {
+    font-size: 70%;
+}
+
+a {
+    color: #253c93;
+}
+
+p {
+    text-align: justify;
+}
+
+.example, .source {
+    float: left;
+}
+
+.example {
+    width: 58%;
+}
+
+.source {
+    width: 40%;
+}
+
+iframe.example, div.source {
+    height: 500px;
+    border: 1px solid #ccc;
+    background-color: #fff;
+}
+
+div.source {
+    border-left: 0px none;
+    padding: 0 0 0 1%;
+    overflow: auto;
+}
+
+div.source pre {
+    white-space: pre-wrap;
+    font-size: 12px;
+}
+
+.letterMain {
+    margin: 25px 0 0 0;
+}
+
+a.btn-primary {
+    color: #ffffff !important;
+    text-decoration: none !important;
+}
+.btn-primary:hover {
+    text-decoration: none;
+
+    -webkit-transition: all 500ms ease 0.1s;
+    -moz-transition: all 500ms ease 0.1s;
+    -o-transition: all 500ms ease 0.1s;
+    transition: all 500ms ease 0.1s;
+}
+
+#footer {
+    clear: both;
+    min-height: 125px;
+    text-align: center;
+    padding-top: 1px;
+}
+
+#footer p {
+    font-size: 140%;
+    line-height: 1.2;
+    margin: .5em 0;
+}
+
+#footer a {
+    float: left;
+    margin: .5em 1em 0 0;
+}
+
+#bsap_1239784 {
+    margin: .5em 0;
+}
+
+body, #content, #container {
+    width: 100%;
+    margin: 0;
+    float: none;
+    background: #fff url(none);
+}
+
+/* SECTION 2: Remove any elements not needed in print. 
+   This would include navigation, ads, sidebars, etc. */
+#topnav, #navbar, #nav, #sidebar, .ad, .noprint {
+    display: none;
+}
+
+
+/* SECTION 3: Set body font face, size, and color.
+   Consider using a serif font for readability. */
+body {
+    font-family: "Times New Roman", Times, monospace;
+}
+
+/* SECTION 4: Set heading font face, sizes, and color.
+   Diffrentiate your headings from your body text.
+   Perhaps use a large sans-serif for distinction. */
+h1, h2, h3, h4, h5, h6 {
+    font-family: Helvetica, Arial, sans-serif;
+    color: #000;
+}
+
+h1 {
+    font-size: 250%;
+}
+
+h2 {
+    font-size: 175%;
+}
+
+h3 {
+    font-size: 135%;
+}
+
+h4 {
+    font-size: 100%;
+    font-variant: small-caps;
+}
+
+h5 {
+    font-size: 100%;
+}
+
+h6 {
+    font-size: 90%;
+    font-style: italic;
+}
+
+/* SECTION 5: Make hyperlinks more usable.
+   Ensure links are underlined, and consider appending
+   the URL to the end of the link for usability. */
+a:link, a:visited {
+    color: #00c;
+    font-weight: bold;
+    text-decoration: underline;
+}
+
+#content a:link:after, #content a:visited:after {
+}

data/app/helpers/cg_app_base/application_helper.rb

@@ -1,7 +1,7 @@
 module CgAppBase
   module ApplicationHelper
     def navigation_on?
-      session[:menu_layout] == 'true'
+      session[:menu_layout] == 'true' && !params[:no_menu_layout]
     end
 
     def el_attr_name_to_id(name)

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

@@ -29,8 +29,8 @@
           (function (i, s, o, g, r, a, m) {
               i['GoogleAnalyticsObject'] = r;
               i[r] = i[r] || function () {
-                  (i[r].q = i[r].q || []).push(arguments)
-              }, i[r].l = 1 * new Date();
+                          (i[r].q = i[r].q || []).push(arguments)
+                      }, i[r].l = 1 * new Date();
               a = s.createElement(o),
                       m = s.getElementsByTagName(o)[0];
               a.async = 1;
@@ -72,8 +72,23 @@
         <%= render 'shared/flash_message' %>
       </div>
     </div>
+
+    <div class="col-xs-12 col-sm-12 col-md-12">
+      <div class="page-header margbottom0">
+        <h1 class="pull-left">
+          <span> <%= yield(:title) %></span>
+        </h1>
+
+        <div class="pull-right">
+          <%= yield(:specialmenu) %>
+        </div>
+
+      </div>
+    </div>
+
     <div class="box">
-      <div class="box-content">
+      <div class="box-content-no-border">
+
         <div class='row'>
           <div class='col-xs-12 col-sm-12 col-md-12'>
             <%= yield %>

data/config/navigation.rb

@@ -58,8 +58,8 @@ SimpleNavigation::Configuration.run do |navigation|
     primary.dom_class = 'nav nav-stacked'
 
     client_sub_items = [
-        {name: :customer_search, descr: 'Recherche client', url: "customers", icon: 'search'},
-        {name: :contract_search, descr: 'Recherche contrat', url: "contracts", icon: 'search'}
+        {name: :customer_search, descr: 'Clients', url: "customers", icon: 'search'},
+        {name: :contract_search, descr: 'Contrats', url: "contracts", icon: 'search'}
     ]
 
     if current_user.has_role? :admin

data/lib/cg_app_base/version.rb

@@ -1,3 +1,3 @@
 module CgAppBase
-  VERSION = "1.0.52"
+  VERSION = "1.0.54"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cg_app_base
 version: !ruby/object:Gem::Version
-  version: 1.0.52
+  version: 1.0.54
 platform: ruby
 authors:
 - Nicolas Pineault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-13 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1047,6 +1047,7 @@ files:
 - app/assets/stylesheets/flatty/theme/pages/_orders.scss
 - app/assets/stylesheets/flatty/theme/pages/_pricing_tables.scss
 - app/assets/stylesheets/flatty/theme/pages/_timeline.scss
+- app/assets/stylesheets/print.css
 - app/assets/stylesheets/scaffolds.css.scss
 - app/assets/stylesheets/vehicles.css.scss
 - app/controllers/cg_app_base/application_controller.rb