cg_app_base 1.0.56 → 1.0.62
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/flatty/plugins/validate/additional-methods.js +1 -1
- data/app/assets/javascripts/flatty/plugins/validate/jquery.validate.js +1 -1
- data/app/assets/stylesheets/application2.scss +27 -15
- data/app/assets/stylesheets/flatty/theme/_navigation.scss +1 -0
- data/app/views/layouts/application.html.erb +14 -20
- data/config/navigation.rb +9 -16
- data/lib/cg_app_base/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bd40601a536193e6e81fabb3c965b06dcaa86c13
|
|
4
|
+
data.tar.gz: 02c251e7a7f8e84ccd570ebb1b28a25e5efe239b
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 379fc4401a06d72c6b72e75e3acfd1dd0d2592ae9a691fdd2bb06cfd025da777c0e8ca9ea64f307d4ff9c7acae6d3ff773a466401d45433272b1614f2feb9baa
|
|
7
|
+
data.tar.gz: d9d26872db1937527caed1b2b00fa19ece40d4cfdfe9e6fc908b26fb32908e43471ee0f86d92df207fab3d36cdb2b9b5bb29b70f42efa1604b64174515123885
|
|
@@ -401,7 +401,7 @@ jQuery.validator.addMethod("strippedminlength", function(value, element, param)
|
|
|
401
401
|
|
|
402
402
|
// same as email, but TLD is optional
|
|
403
403
|
jQuery.validator.addMethod("email2", function(value, element, param) {
|
|
404
|
-
|
|
404
|
+
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);
|
|
405
405
|
}, jQuery.validator.messages.email);
|
|
406
406
|
|
|
407
407
|
// same as url, but TLD is optional
|
|
@@ -1012,7 +1012,7 @@ $.extend($.validator, {
|
|
|
1012
1012
|
// http://docs.jquery.com/Plugins/Validation/Methods/email
|
|
1013
1013
|
email: function( value, element ) {
|
|
1014
1014
|
// contributed by Scott Gonzalez: http://projects.scottsplayground.com/email_address_validation/
|
|
1015
|
-
return this.optional(element) || /^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]
|
|
1015
|
+
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);
|
|
1016
1016
|
},
|
|
1017
1017
|
|
|
1018
1018
|
// http://docs.jquery.com/Plugins/Validation/Methods/url
|
|
@@ -15,6 +15,7 @@ body {
|
|
|
15
15
|
font-size: 14px;
|
|
16
16
|
line-height: 1.42857;
|
|
17
17
|
color: #333;
|
|
18
|
+
background-color: #ffffff;
|
|
18
19
|
|
|
19
20
|
label {
|
|
20
21
|
font-size: 14px !important;
|
|
@@ -26,6 +27,7 @@ body {
|
|
|
26
27
|
|
|
27
28
|
.page-header {
|
|
28
29
|
min-height: 66px;
|
|
30
|
+
width: 100%;
|
|
29
31
|
|
|
30
32
|
> h1 {
|
|
31
33
|
font-size: 24px;
|
|
@@ -375,17 +377,11 @@ tr.subtablebkg {
|
|
|
375
377
|
}
|
|
376
378
|
|
|
377
379
|
a.state_collapser {
|
|
378
|
-
color: #0163AC;
|
|
379
|
-
width: 49%;
|
|
380
|
-
line-height: 2.7em;
|
|
381
380
|
text-decoration: none;
|
|
382
381
|
cursor: pointer !important;
|
|
383
|
-
margin-left: 6px;
|
|
384
382
|
|
|
385
383
|
&:hover {
|
|
386
|
-
color: #014171;
|
|
387
384
|
text-decoration: none;
|
|
388
|
-
margin-left: 6px;
|
|
389
385
|
}
|
|
390
386
|
}
|
|
391
387
|
|
|
@@ -501,9 +497,9 @@ abbr[data-original-title] {
|
|
|
501
497
|
margin: 0px;
|
|
502
498
|
background: white;
|
|
503
499
|
display: block;
|
|
504
|
-
-webkit-box-shadow:
|
|
505
|
-
-moz-box-shadow:
|
|
506
|
-
box-shadow:
|
|
500
|
+
-webkit-box-shadow: 2px 1px 3px #dddddd !important;
|
|
501
|
+
-moz-box-shadow: 2px 1px 3px rgba(0, 0, 0, 0.1) !important;
|
|
502
|
+
box-shadow: 2px 1px 3px rgba(0, 0, 0, 0.1) !important;
|
|
507
503
|
|
|
508
504
|
tbody {
|
|
509
505
|
padding: 5px 0 !important;
|
|
@@ -531,7 +527,7 @@ abbr[data-original-title] {
|
|
|
531
527
|
}
|
|
532
528
|
|
|
533
529
|
.datepicker-inline {
|
|
534
|
-
width: 100%;
|
|
530
|
+
//width: 100%;
|
|
535
531
|
}
|
|
536
532
|
|
|
537
533
|
table.table-condensed thead {
|
|
@@ -546,10 +542,12 @@ abbr[data-original-title] {
|
|
|
546
542
|
|
|
547
543
|
tr {
|
|
548
544
|
width: 100%;
|
|
545
|
+
float: left;
|
|
549
546
|
}
|
|
550
547
|
|
|
551
548
|
tr th {
|
|
552
549
|
border-radius: 0;
|
|
550
|
+
width: 15%;
|
|
553
551
|
}
|
|
554
552
|
|
|
555
553
|
tr th.prev, tr th.next {
|
|
@@ -558,8 +556,7 @@ abbr[data-original-title] {
|
|
|
558
556
|
|
|
559
557
|
th.dow {
|
|
560
558
|
color: #01284d;
|
|
561
|
-
width: 15%;
|
|
562
|
-
padding: 0 0;
|
|
559
|
+
width: 15.2%;
|
|
563
560
|
}
|
|
564
561
|
}
|
|
565
562
|
|
|
@@ -674,6 +671,12 @@ abbr[data-original-title] {
|
|
|
674
671
|
display: block;
|
|
675
672
|
}
|
|
676
673
|
|
|
674
|
+
.box .mainBox {
|
|
675
|
+
padding: 0px;
|
|
676
|
+
margin: 20px -10px;
|
|
677
|
+
display: block;
|
|
678
|
+
}
|
|
679
|
+
|
|
677
680
|
.box .fullbox-content {
|
|
678
681
|
padding: 10px;
|
|
679
682
|
margin-bottom: 0px;
|
|
@@ -862,7 +865,7 @@ em {
|
|
|
862
865
|
#content_embedded {
|
|
863
866
|
background: #fbfbfb;
|
|
864
867
|
min-width: 276px;
|
|
865
|
-
background: #
|
|
868
|
+
background: #ffffff;
|
|
866
869
|
}
|
|
867
870
|
|
|
868
871
|
.navbar h2 {
|
|
@@ -1138,11 +1141,14 @@ input, button, select, textarea {
|
|
|
1138
1141
|
.modal-body {
|
|
1139
1142
|
height: auto;
|
|
1140
1143
|
}
|
|
1144
|
+
iframe {
|
|
1145
|
+
border: 0px inset;
|
|
1146
|
+
}
|
|
1141
1147
|
/* line 135, /Users/rem/Projects/cg_fiche_client_master/app/assets/stylesheets/flatty/bootstrap/bootstrap/_modals.scss */
|
|
1142
1148
|
.modal-dialog {
|
|
1143
1149
|
left: 50%;
|
|
1144
1150
|
right: auto;
|
|
1145
|
-
width:
|
|
1151
|
+
width: 95%;
|
|
1146
1152
|
padding-top: 30px;
|
|
1147
1153
|
padding-bottom: 30px;
|
|
1148
1154
|
}
|
|
@@ -1785,8 +1791,14 @@ p.titletable {
|
|
|
1785
1791
|
line-height: 1.428571429;
|
|
1786
1792
|
vertical-align: top;
|
|
1787
1793
|
border-top: 1px solid #dddddd;
|
|
1788
|
-
font-size: 0.
|
|
1794
|
+
font-size: 0.83em;
|
|
1789
1795
|
text-overflow: ellipsis;
|
|
1796
|
+
|
|
1797
|
+
> table > tbody > tr {
|
|
1798
|
+
> td {
|
|
1799
|
+
font-size: 1em;
|
|
1800
|
+
}
|
|
1801
|
+
}
|
|
1790
1802
|
}
|
|
1791
1803
|
#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 {
|
|
1792
1804
|
font-size: 0.845em;
|
|
@@ -67,13 +67,11 @@
|
|
|
67
67
|
<%= render 'shared/main_navigation' if navigation_on? %>
|
|
68
68
|
|
|
69
69
|
<section id="content<%= navigation_on? ? '' : '_embedded' %>">
|
|
70
|
-
<div
|
|
71
|
-
|
|
72
|
-
<%= render 'shared/flash_message' %>
|
|
73
|
-
</div>
|
|
70
|
+
<div id="flash_messages">
|
|
71
|
+
<%= render 'shared/flash_message' %>
|
|
74
72
|
</div>
|
|
75
73
|
|
|
76
|
-
<div class="
|
|
74
|
+
<div class="container">
|
|
77
75
|
<div class="page-header margbottom0">
|
|
78
76
|
<h1 class="pull-left">
|
|
79
77
|
<span> <%= yield(:title) %></span>
|
|
@@ -86,18 +84,18 @@
|
|
|
86
84
|
</div>
|
|
87
85
|
</div>
|
|
88
86
|
|
|
89
|
-
<div class="
|
|
90
|
-
<div class="box
|
|
87
|
+
<div class="container">
|
|
88
|
+
<div class="box">
|
|
89
|
+
<div class="mainBox">
|
|
91
90
|
|
|
92
|
-
|
|
93
|
-
<div class='col-xs-12 col-sm-12 col-md-12'>
|
|
91
|
+
<div class='container'>
|
|
94
92
|
<%= yield %>
|
|
95
93
|
</div>
|
|
94
|
+
|
|
96
95
|
</div>
|
|
97
96
|
</div>
|
|
98
97
|
</div>
|
|
99
98
|
</section>
|
|
100
|
-
|
|
101
99
|
</div>
|
|
102
100
|
|
|
103
101
|
<div class="loader">
|
|
@@ -108,16 +106,12 @@
|
|
|
108
106
|
|
|
109
107
|
<div class="modal" id="modal-window">
|
|
110
108
|
<div class="modal-dialog">
|
|
111
|
-
<div class="
|
|
112
|
-
<div class="
|
|
113
|
-
<
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
</div>
|
|
118
|
-
<div class="modal-body">
|
|
119
|
-
</div>
|
|
120
|
-
</div>
|
|
109
|
+
<div class="modal-content">
|
|
110
|
+
<div class="modal-header">
|
|
111
|
+
<button aria-hidden="true" class="close btn-link" data-dismiss="modal" type="button">×</button>
|
|
112
|
+
<h4 class="modal-title title">Modal title</h4>
|
|
113
|
+
</div>
|
|
114
|
+
<div class="modal-body">
|
|
121
115
|
</div>
|
|
122
116
|
</div>
|
|
123
117
|
</div>
|
data/config/navigation.rb
CHANGED
|
@@ -55,23 +55,20 @@ SimpleNavigation::Configuration.run do |navigation|
|
|
|
55
55
|
# against the current URI. You may also use a proc, or the symbol <tt>:subpath</tt>.
|
|
56
56
|
#
|
|
57
57
|
|
|
58
|
-
primary.dom_class = 'nav nav-stacked'
|
|
58
|
+
primary.dom_class = 'nav nav-stacked in'
|
|
59
59
|
|
|
60
60
|
client_sub_items = [
|
|
61
|
-
{name: :customer_search, descr: 'Clients', url: "customers", icon: '
|
|
62
|
-
{name: :contract_search, descr: 'Contrats', url: "contracts", icon: '
|
|
61
|
+
{name: :customer_search, descr: 'Clients', url: "customers", icon: 'group'},
|
|
62
|
+
{name: :contract_search, descr: 'Contrats', url: "contracts", icon: 'file-text'}
|
|
63
63
|
]
|
|
64
64
|
|
|
65
65
|
if current_user.has_role? :admin
|
|
66
|
-
client_sub_items << {name: :customer_merges, descr: 'Fusionner clients', url: "customers_merges", icon: '
|
|
67
|
-
client_sub_items << {name: :new_customer, descr: 'Nouveau client', url: "customers/new/particulier", icon: '
|
|
66
|
+
client_sub_items << {name: :customer_merges, descr: 'Fusionner clients', url: "customers_merges", icon: 'code-fork'}
|
|
67
|
+
client_sub_items << {name: :new_customer, descr: 'Nouveau client', url: "customers/new/particulier", icon: 'user'}
|
|
68
68
|
end
|
|
69
69
|
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
client_sub_items.each do |sni|
|
|
73
|
-
sub_nav.item sni[:name], sni[:descr], "#{ENV['CUSTOMER_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
|
|
74
|
-
end
|
|
70
|
+
client_sub_items.each do |sni|
|
|
71
|
+
primary.item sni[:name], sni[:descr], "#{ENV['CUSTOMER_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
|
|
75
72
|
end
|
|
76
73
|
|
|
77
74
|
ship_sub_items = []
|
|
@@ -84,14 +81,10 @@ SimpleNavigation::Configuration.run do |navigation|
|
|
|
84
81
|
ship_sub_items << {name: :vehicles, descr: 'Véhicules', url: "shipping/vehicles", icon: 'truck'}
|
|
85
82
|
ship_sub_items << {name: :employees, descr: 'Employés', url: "shipping/employees", icon: 'user'}
|
|
86
83
|
ship_sub_items << {name: :shipping_routes, descr: 'Routes', url: "shipping/routes", icon: 'road'}
|
|
87
|
-
ship_sub_items << {name: :shipping_methods, descr: 'Méthodes de livraison', url: "shipping/methods", icon: 'suitcase'}
|
|
88
84
|
end
|
|
89
85
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
ship_sub_items.each do |sni|
|
|
93
|
-
sub_nav.item sni[:name], sni[:descr], "#{ENV['SHIPPING_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
|
|
94
|
-
end
|
|
86
|
+
ship_sub_items.each do |sni|
|
|
87
|
+
primary.item sni[:name], sni[:descr], "#{ENV['SHIPPING_URL']}/#{sni[:url]}", icon: "icon-#{sni[:icon]}"
|
|
95
88
|
end
|
|
96
89
|
|
|
97
90
|
end
|
data/lib/cg_app_base/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cg_app_base
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.62
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nicolas Pineault
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-10-
|
|
11
|
+
date: 2015-10-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|