cg_app_base 1.0.62 → 1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd40601a536193e6e81fabb3c965b06dcaa86c13
-  data.tar.gz: 02c251e7a7f8e84ccd570ebb1b28a25e5efe239b
+  metadata.gz: 6f9b25aa16300608f46df8ee696593646a8e70de
+  data.tar.gz: b2f0df766cbed33da944ad59e3b7e2089f7439fc
 SHA512:
-  metadata.gz: 379fc4401a06d72c6b72e75e3acfd1dd0d2592ae9a691fdd2bb06cfd025da777c0e8ca9ea64f307d4ff9c7acae6d3ff773a466401d45433272b1614f2feb9baa
-  data.tar.gz: d9d26872db1937527caed1b2b00fa19ece40d4cfdfe9e6fc908b26fb32908e43471ee0f86d92df207fab3d36cdb2b9b5bb29b70f42efa1604b64174515123885
+  metadata.gz: 1413723391651e454432977bd0974a93022e527c4e7209fa081870d222dd1e1e56898cb1cc55e9bf643f14fa72c8f0244081481f0c03aea131ec8f4d1ef53931
+  data.tar.gz: 5d4a161f304e0c527e94a8e7d4feb8dc653f48f89eec3d437fa2488acc173912ff8d1c8d57bf7ea740e021570e6b48b1d58bb7147848ad7c5f6b5b7fea2d0ee0

data/app/assets/javascripts/flatty/theme.js.coffee

@@ -50,6 +50,30 @@ $(document).ready ->
 @nav_open = ->
   return $("body").hasClass("main-nav-opened") || $("#main-nav").width() > 50
 
+# --------------------------------------------------------------------------------------------------------------------
+# removes .box after click on .box-remove button
+$(document).on "click", ".box .box-remove", (e) ->
+  $(this).parents(".box").first().remove()
+  e.preventDefault()
+  return false
+
+# hides .box after click on .box-collapse
+$(document).on "click", ".box .box-collapse", (e) ->
+  box = $(this).parents(".box").first()
+  box_content = box.find(".scrollable-area")
+  box_content.hide()
+  box.toggleClass("box-collapsed", 300)
+  box_content.fadeIn(1000)
+  e.preventDefault()
+  return false
+# --------------------------------------------------------------------------------------------------------------------
+
+# --------------------------------------------------------------------------------------------------------------------
+# check all checkboxes in table with class only-checkbox
+$(document).on "click", ".check-all", (e) ->
+  $(this).parents("table:eq(0)").find(".only-checkbox :checkbox").attr "checked", @checked
+# --------------------------------------------------------------------------------------------------------------------
+
 # JS plugins initializations
 $(document).ready ->
   setTimeAgo()
@@ -61,32 +85,8 @@ $(document).ready ->
   setMaxLength()
   setValidateForm()
 
-  # --------------------------------------------------------------------------------------------------------------------
-  # removes .box after click on .box-remove button
-  $(".box .box-remove").live "click", (e) ->
-    $(this).parents(".box").first().remove()
-    e.preventDefault()
-    return false
-
-  # hides .box after click on .box-collapse
-  $(".box .box-collapse").live "click", (e) ->
-    box = $(this).parents(".box").first()
-    box_content = box.find(".scrollable-area")
-    box_content.hide()
-    box.toggleClass("box-collapsed", 300)
-    box_content.fadeIn(1000)
-    e.preventDefault()
-    return false
-  # --------------------------------------------------------------------------------------------------------------------
-
   $('.pwstrength').pwstrength(showVerdicts: false) if jQuery().pwstrength
 
-  # --------------------------------------------------------------------------------------------------------------------
-  # check all checkboxes in table with class only-checkbox
-  $(".check-all").live "click", (e) ->
-    $(this).parents("table:eq(0)").find(".only-checkbox :checkbox").attr "checked", @checked
-  # --------------------------------------------------------------------------------------------------------------------
-
   # --------------------------------------------------------------------------------------------------------------------
   # setting up responsive tabs
   $('.nav-responsive.nav-pills, .nav-responsive.nav-tabs').tabdrop() if jQuery().tabdrop

data/app/assets/stylesheets/application2.scss

@@ -134,6 +134,16 @@ tr.text-fb a {
   font-size: 100% !important;
 }
 
+.label_install {
+  background-color: #fcd052;
+  border: 5px solid #fcd052;
+  border-radius: 4px;
+  width: auto;
+  float: left;
+  clear: both;
+  min-width: 50%;
+}
+
 .quote_highlight {
   color: #ffffff;
   padding: 3px;
@@ -415,6 +425,27 @@ legend {
 }
 
 .form-control {
+  height: 31px;
+  padding: 3px 6px;
+  font-size: 14px;
+  line-height: 1.428571429;
+  color: #555555;
+  vertical-align: middle;
+  background-color: white;
+  border: 1px solid #cccccc;
+  border-radius: 0px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+  transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;
+}
+
+#selectAccount .form-control, #selectContact .form-control {
+  height: 38px;
+  -webkit-appearance: none;
+}
+
+.fc-special {
   height: 31px;
   padding: 3px 6px;
   font-size: 14px;
@@ -887,6 +918,102 @@ address {
   word-wrap: break-word;
 }
 
+/* ICONES DE DETAILS DE SHIPPING ET DASHBOARD */
+
+#actionsIcons .list-unstyled li {
+  margin-top: 8px;
+  float: left;
+  margin-right: 2px;
+  width: 30px;
+  height: 30px;
+}
+
+#actionsDetailIcons .list-unstyled li {
+  margin-top: 8px;
+  float: left;
+  margin-right: 1px;
+  width: 36px;
+  height: 30px;
+}
+
+#actionsIcons .list-unstyled li a {
+  text-align: center;
+  text-decoration: none;
+  max-width: 100%;
+  height: 100%;
+  border-radius: 100%;
+  -webkit-border-radius: 100%;
+  padding: 0.88em 1em;
+  position: relative;
+}
+
+#actionsDetailIcons .list-unstyled li a {
+  text-align: center;
+  text-decoration: none;
+  max-width: 100%;
+  height: 100%;
+  border-radius: 100%;
+  -webkit-border-radius: 100%;
+  padding: 0.4em 0.6em;
+  position: relative;
+}
+
+#actionsIcons .list-unstyled li a.inActionOrderIcn, #actionsDetailIcons .list-unstyled li a.inActionOrderIcn {
+  color: #ffffff;
+  background-color: #000000;
+}
+
+#actionsIcons .list-unstyled li a.inActionOrderIcn:hover, #actionsDetailIcons .list-unstyled li a.inActionOrderIcn:hover {
+  cursor: pointer !important;
+  color: rgba(255, 255, 255, 0.8);
+  background-color: #555555;
+  -webkit-transition: all ease-in-out 0.2s;
+  -moz-transition: all ease-in-out 0.2s;
+  -o-transition: all ease-in-out 0.2s;
+  transition: all ease-in-out 0.2s;
+}
+
+#actionsIcons .list-unstyled li a.inActionIcn, #actionsDetailIcons .list-unstyled li a.inActionIcn {
+  color: #ffffff;
+  background-color: #3b9e3b;
+}
+
+#actionsIcons .list-unstyled li a.inActionIcn:hover, #actionsDetailIcons .list-unstyled li a.inActionIcn:hover {
+  cursor: pointer !important;
+  color: rgba(255, 255, 255, 0.8);
+  background-color: #47bb47;
+  -webkit-transition: all ease-in-out 0.2s;
+  -moz-transition: all ease-in-out 0.2s;
+  -o-transition: all ease-in-out 0.2s;
+  transition: all ease-in-out 0.2s;
+}
+
+#actionsIcons .list-unstyled li a.inActionNotesIcn, #actionsDetailIcons .list-unstyled li a.inActionNotesIcn {
+  color: #ffffff;
+  background-color: #356691;
+}
+
+#actionsIcons .list-unstyled li a.inActioNotesIcn:hover, #actionsDetailIcons .list-unstyled li a.inActionNotesIcn:hover {
+  cursor: pointer !important;
+  color: rgba(255, 255, 255, 0.8);
+  background-color: #4086bc;
+  -webkit-transition: all ease-in-out 0.2s;
+  -moz-transition: all ease-in-out 0.2s;
+  -o-transition: all ease-in-out 0.2s;
+  transition: all ease-in-out 0.2s;
+}
+
+#actionsIcons .list-unstyled li a i {
+  font-size: 1.2em;
+  width: 100%;
+  position: relative;
+}
+
+#actionsDetailIcons .list-unstyled li a i {
+  width: 100%;
+  position: relative;
+}
+
 .responsive-table {
   position: relative;
   overflow: hidden;
@@ -929,6 +1056,10 @@ address {
   }
 }
 
+.table-hover > tbody > tr.label-danger:hover > td, .table-hover > tbody > tr.label-danger:hover > th {
+  background-color: rgba(160, 219, 255, 0.0) !important;
+}
+
 div.invoiceTitle, span.invoiceTitle {
   text-align: right !important;
   border: 0px solid rgba(255, 255, 255, 1) !important;
@@ -1037,6 +1168,10 @@ header .navbar .toggle-nav {
   padding: 7px;
 }
 
+.btn-sm, .btn-group-sm > .btn, .btn-xs, .btn-group-xs > .btn {
+  border-radius: 0px;
+}
+
 .dropdown_liltableup {
   margin-bottom: 5px;
   z-index: 50;
@@ -1107,6 +1242,20 @@ input, button, select, textarea {
 .searchblock {
   background-color: #0163AC;
   padding: 14px;
+
+  .select2-container.form-control:focus, .select2-container-multi .select2-choices:focus, select:focus, textarea:focus, input[type="text"]:focus, input[type="password"]:focus, input[type="datetime"]:focus, input[type="datetime-local"]:focus, input[type="date"]:focus, input[type="month"]:focus, input[type="time"]:focus, input[type="week"]:focus, input[type="number"]:focus, input[type="email"]:focus, input[type="url"]:focus, input[type="search"]:focus, input[type="tel"]:focus, input[type="color"]:focus, .form-control:focus, .uneditable-input:focus {
+    border-color: #aaaaaa;
+    -webkit-box-shadow: 0 0 0px #dce1e5;
+    -moz-box-shadow: 0 0 0px #dce1e5;
+    box-shadow: 0 0 0px #dce1e5;
+  }
+  .form-control:focus {
+     border-color: #66afe9;
+     outline: 0;
+     -webkit-box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0), 0 0 0px rgba(102, 175, 233, 0);
+     box-shadow: inset 0 0px 0px rgba(0, 0, 0, 0), 0 0 0px rgba(102, 175, 233, 0);
+   }
+
 }
 
 .searchblock label {
@@ -1213,6 +1362,11 @@ input, button, select, textarea {
   height: 17px !important;
 }
 
+/* MAPS */
+body div#map {
+  height: 700px;
+}
+
 #map-outer {
   height: 440px;
   padding: 20px;
@@ -1221,8 +1375,10 @@ input, button, select, textarea {
   background-color: #FFF
 }
 
-#map-canvas {
-  height: 600px
+@media print {
+  body div#map, div#map-outer {
+    height: 310px !important;
+  }
 }
 
 @media all and (max-width: 600px) {
@@ -1231,6 +1387,39 @@ input, button, select, textarea {
   }
 }
 
+@media (max-width: 992px) {
+  .rteMap {
+    height: 600px;
+  }
+  .rteExcept {
+    height: 300px;
+  }
+  .rteExceptForm {
+    height: 300px;
+    margin-top: 0px;
+  }
+  .rteExceptFormLg {
+    display: none;
+    height: 175px;
+  }
+}
+
+@media (min-width: 992px) {
+  .rteMap {
+    height: 600px;
+  }
+  .rteExcept {
+    height: 500px;
+  }
+  .rteExceptForm {
+    height: 200px;
+    margin-top: -175px;
+  }
+  .rteExceptFormLg {
+    height: 175px;
+  }
+}
+
 .status {
   display: inline;
   padding: .2em 0.5em;
@@ -1800,6 +1989,7 @@ p.titletable {
     }
   }
 }
+
 #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%;
@@ -1872,4 +2062,105 @@ p.titletable {
     }
   }
 
+}
+
+/* DÉTAILS DU CONTRAT PRODUITS */
+
+#product_table {
+
+  span.productCateg {
+    font-size: 1.25em;
+    font-weight: 400;
+  }
+  span.productName {
+    font-size: 1.25em;
+    font-weight: 600;
+  }
+  span.productSku {
+    font-size: 1.5em;
+    font-weight: 400;
+  }
+  span.productConfig, span.productQty {
+    font-size: 1.1em;
+    font-weight: 400;
+
+    b {
+      font-weight: 600;
+    }
+  }
+  span.productSerie {
+    text-transform: uppercase;
+    border-bottom: 1px solid #2b2d30;
+    float: left;
+    font-size: 1.4em;
+    font-weight: 400;
+    margin: 0 0 2px 0;
+    width: 100%;
+  }
+  span.productColor {
+    font-size: 1.3em;
+    font-weight: 600;
+    padding: 4px 0;
+  }
+  span.productLocation {
+    text-transform: capitalize;
+    font-size: 1.2em;
+    font-weight: 400;
+    padding: 4px 0;
+  }
+  span.productSize {
+    font-size: 1.3em;
+    font-weight: 400;
+    border: 1px solid #dbf2fe;
+    background-color: #ffffff;
+    -webkit-border-radius: 3px;
+    border-radius: 3px;
+    -moz-border-radius: 3px;
+    padding: 4px;
+
+    b {
+      font-weight: 600;
+
+      &:first-child {
+        margin-right: 5px;
+      }
+    }
+    i {
+      margin-right: 5px;
+    }
+  }
+
+  span.productNote {
+    border: 1px solid #dbf2fe;
+    height: 100px;
+    width: 100%;
+    float: left;
+    text-align: left;
+    background-color: #ffffff;
+    -webkit-border-radius: 6px;
+    border-radius: 6px;
+    -moz-border-radius: 6px;
+    padding: 5px;
+  }
+
+  #imageProduct {
+    height: 100px;
+    float: left;
+    text-align: center;
+
+    .imageBox {
+      border: 1px solid #dbf2fe;
+      background-color: #ffffff;
+      -webkit-border-radius: 6px;
+      border-radius: 6px;
+      -moz-border-radius: 6px;
+
+      img {
+        width: auto;
+        max-height: 100px;
+        position: relative;
+      }
+    }
+  }
+
 }

data/app/assets/stylesheets/print.css

@@ -1,193 +1,237 @@
-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 {
+@charset "UTF-8";
+/* CSS Print Document */
+
+@media print {
+
+    @page {
+        margin-left: 0;
+        margin-right: 0;
+    }
+
+    html {
+        font: 62.5%/1.4 'Roboto Condensed', sans-serif;
+    }
+
+    body {
+        font-size: 1.3em;
+        padding: 0 15px;
+    }
+
+    header.letter {
+
+    }
+
+    #header, #footer {
+        width: 960px;
+        margin: 0 auto;
+    }
+
+    h1 {
+        margin: 0;
+        font-family: 'Roboto Condensed', sans-serif;
+    }
+
+    h1 a {
+        display: block;
+        width: 300px;
+        text-decoration: none;
+        margin: 0;
+        color: #253c93;
+    }
+
+    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: 300px;
+        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;
+    }
+
+    #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;
+    }
+
+    /* 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. */
+    /* 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 {
+        color: #000;
+    }
+
+    h1 {
+        font-size: 190%;
+    }
+
+    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 {
+    }
+
+    /* C&G */
+
+    .box .mainBox {
+        padding: 0;
+        margin: 0 -10px;
+        display: block;
+    }
+
+    #content .page-header {
+        display: block;
+        min-height: 16px;
+        border-bottom: 0 solid #eeeeee;
+        position: relative;
+        color: #222222;
+        overflow: hidden;
+        margin: 0;
+        padding: 0
+    }
+
+    #content .page-header h1 { font-size: 18px; margin: 0; }
+
+    #shipmap p {
+        margin: 0;
+    }
+    #shipmap li .dd-handle {
+        font-size: 50%;
+    }
+    #shipmap li .dd-handle span {
+        display: none;
+    }
+    #shipmap .dd-handle img {
+        margin-bottom: 20px;
+    }
+    #routeDrag ol ul {
+        padding-left: 0px;
+    }
+    .ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled {
+        opacity: .85 !important;
+        filter: Alpha(Opacity=85) !important;;
+        background-image: none;
+    }
+
+    #map {
+        height: 450px;
+        overflow: hidden;
+        border: 1px solid #c2c2c2;
+    }
+    #map .gm-style div {
+        margin: -38px 0 0 0;
+        width: 100%;
+        height: 80%;
+    }
+    .gmnoprint, .gmnoscreen, .gmnoprint .gm-style-cc, .gm-style-cc, .gm-style-mtc, .gm-style a  {
+        color: transparent !important;
+        display: none !important;
+    }
+
 }

data/app/controllers/concerns/cg_app_base/cross_domain_concern.rb

@@ -0,0 +1,24 @@
+module CgAppBase
+  module CrossDomainConcern
+    extend ActiveSupport::Concern
+
+    def cors_check
+      if request and request.env["HTTP_ORIGIN"]
+
+        origin = request.env["HTTP_ORIGIN"]
+        allowed = ENV['ALLOWED_CORS']
+
+        if origin and allowed and allowed.include?(origin)
+
+          headers['Access-Control-Allow-Origin'] = origin
+          headers['Access-Control-Allow-Methods'] = 'POST, GET, PUT, DELETE, OPTIONS'
+          headers['Access-Control-Allow-Headers'] = 'X-Requested-With, X-Prototype-Version, Token'
+          headers['Access-Control-Max-Age'] = '60'
+
+        end
+
+      end
+    end
+
+  end
+end

data/app/helpers/cg_app_base/application_helper.rb

@@ -8,8 +8,19 @@ module CgAppBase
       name.gsub(/\]/, '').gsub(/\[/, '_')
     end
 
-    def icon(klass_ending, title='', style='')
-      "<i style='#{style}' class='icon-#{klass_ending}'></i> #{title}".html_safe
+    def icon(klass_ending, title='', style='', mode_tooltip=false)
+
+      if mode_tooltip
+        has_tooltip = 'has-tooltip'
+        tooltip_original_title = "data-original-title='#{title}'"
+        my_title = ''
+      else
+        has_tooltip = ''
+        tooltip_original_title = ""
+        my_title = title
+      end
+
+      "<i style='#{style}' class='#{has_tooltip} icon-#{klass_ending}' #{tooltip_original_title}></i> #{my_title}".html_safe
     end
 
     def blueicon(klass_ending, title='')

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

@@ -9,16 +9,17 @@
   <title><%= app_title %></title>
   <meta name="description" content="<%= content_for?(:description) ? yield(:description) : "Cg Fiche Client" %>">
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-  <%= stylesheet_link_tag "application", media: "all" %>
-  <%= stylesheet_link_tag "application2", media: "all" %>
+  <%= stylesheet_link_tag "application", media: "all", data_turbolinks_track: true %>
+  <%= stylesheet_link_tag "application2", media: "all", data_turbolinks_track: true %>
+  <%= stylesheet_link_tag "print", media: "print", data_turbolinks_track: true %>
 
-  <%= javascript_include_tag "base" %>
-  <%= javascript_include_tag "application" %>
+  <%= javascript_include_tag "base", data_turbolinks_track: true %>
+  <%= javascript_include_tag "application", data_turbolinks_track: true %>
 
   <link href='http://fonts.googleapis.com/css?family=Bitter:400,700|Roboto+Condensed:400,700,300' rel='stylesheet' type='text/css'>
   <!--[if lt IE 9]>
-  <script src="assets/javascripts/ie/html5shiv.js" type="text/javascript"></script>
-  <script src="assets/javascripts/ie/respond.min.js" type="text/javascript"></script>
+  <script src="assets/javascripts/ie/html5shiv.js" type="text/javascript" data_turbolinks_track></script>
+  <script src="assets/javascripts/ie/respond.min.js" type="text/javascript" data_turbolinks_track></script>
   <![endif]-->
 
   <%= csrf_meta_tags %>

data/app/views/shared/_main_navigation.html.erb

@@ -1,6 +1,6 @@
 <div id="main-nav-bg"></div>
 <nav id="main-nav">
-  <div class="navigation">
+  <div class="navigation" data-no-turbolink>
 
     <!-- search form visible on phone -->
     <div class="search">

data/config/navigation.rb

@@ -65,6 +65,8 @@ SimpleNavigation::Configuration.run do |navigation|
     if current_user.has_role? :admin
       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'}
+    else
+      client_sub_items << {name: :new_customer, descr: 'Nouveau prospect', url: "customers/prospects/new", icon: 'user'}
     end
 
     client_sub_items.each do |sni|
@@ -74,10 +76,10 @@ SimpleNavigation::Configuration.run do |navigation|
     ship_sub_items = []
     if can?(:read, :shipping)
 
-      ship_sub_items << {name: :dashboard, descr: 'Tableau de bord', url: "shipping/shipments", icon: 'dashboard'}
+      ship_sub_items << {name: :dashboard, descr: 'Tableau de bord', url: "shipping/shipment_orders", icon: 'dashboard'}
 
       if can?(:manage, :shipping)
-        ship_sub_items << {name: :projections, descr: 'Projections', url: "shipping/shipments/forecast", icon: 'signal'}
+        ship_sub_items << {name: :projections, descr: 'Projections', url: "shipping/shipment_orders/forecast", icon: 'signal'}
         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'}

data/lib/cg_app_base/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cg_app_base
 version: !ruby/object:Gem::Version
-  version: 1.0.62
+  version: 1.0.78
 platform: ruby
 authors:
 - Nicolas Pineault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1052,6 +1052,7 @@ files:
 - app/assets/stylesheets/vehicles.css.scss
 - app/controllers/cg_app_base/application_controller.rb
 - app/controllers/cg_app_base/redirect_tool_controller.rb
+- app/controllers/concerns/cg_app_base/cross_domain_concern.rb
 - app/controllers/concerns/cg_app_base/ip_authorization_concern.rb
 - app/helpers/cg_app_base/application_helper.rb
 - app/models/ability.rb