thecore_ui_rails_admin 2.1.10 → 2.1.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8cf64ac29415ff7be2ae88370d4bd3e533aeb86816a5f0b1966226b9982388e6
4
- data.tar.gz: a496d1564532b858780c3bd388227398f4beebf46a596ec8ea5f27f980d673ef
3
+ metadata.gz: 469572a946e9c69a3427244a1bd2846806eaf76b911c577eb8d7da6c7f56ab49
4
+ data.tar.gz: '00837d8299c19246cca77aa88e3a02deb11a5b9fbd571bd956ab9a94212aded1'
5
5
  SHA512:
6
- metadata.gz: 851c587fbdc7872d7cfe4cca5489792abb744643946e0f0e3bf4f497bafe291e6b39fb458fc5c9856c2d4cc19f0417134545504c77ec4b8f8d820280da5ea3b2
7
- data.tar.gz: dd5d457e9827e2667551879ab4da61a3d05554d2b68fab7ccc10e53b765f0b320cd96a8cc69e563faadc7b09515e34d49527e31dcb49e4a21f39ada8369e62c4
6
+ metadata.gz: c629be816b1d8519c4e52b5da719bef3903dc83d32b4a374a8f31fbb8401544f89540ad4bde1f21d30f7055c917c2bd6141f52a8e1c87b604afd9a26794a91d5
7
+ data.tar.gz: 5ea85ba800dc9cc4fcd68917dd445c7ace93dab0a304e644759b472a3ee3efce87ccb6ff3f98f9c6708b7c45a132169cecc343c40487caa1ab158d55092aad35
@@ -0,0 +1,23 @@
1
+ // $primary: #1f4068 !default;
2
+ $primary: #ed6501 !default;
3
+
4
+
5
+ $background: lighten($primary, 51%) !default;
6
+ $shadows: darken($primary, 10%) !default;
7
+
8
+ $text: $primary !default;
9
+ $text-highlight: lighten($text, 35%) !default;
10
+
11
+ $link: $text !default;
12
+ $link-highlight: lighten($link, 10%) !default;
13
+
14
+ $element: $primary !default;
15
+ $element-text: lighten($element, 40%) !default;
16
+ $element-text-highlight: lighten($element-text, 10%) !default;
17
+ $element-border: darken($element, 10%) !default;
18
+
19
+ $neutral: #706f6f !default;
20
+ $success: #37BC9B !default;
21
+ $info: #3BAFDA !default;
22
+ $danger: #E9573F !default;
23
+ $warning: #F6BB42 !default;
@@ -1,11 +1,12 @@
1
1
  body {
2
2
  height: 100vh;
3
3
  // background: linear-gradient(-20deg, #09b7b9 30%, #1c51a4 100%);
4
- background-color: rgb(59, 78, 89);
4
+ background-color: $background;
5
5
  }
6
6
 
7
7
  .jumbotron {
8
- background-color: rgb(59, 78, 89);
8
+ background-color: $background;
9
+ color: $text;
9
10
  }
10
11
 
11
12
  .vertical-center {
@@ -31,6 +32,12 @@ body {
31
32
  content: "\f044";
32
33
  }
33
34
 
34
- #new_user div.actions input.btn.btn-warning {
35
+ #new_user div.checkbox:hover {
36
+ color: $text-highlight
37
+ }
38
+
39
+ #new_user div.actions input.btn {
35
40
  width: 100%;
41
+ background-color: $element;
42
+ border-color: $element-border;
36
43
  }
@@ -1,10 +1,3 @@
1
- $primary: #1c2c41;
2
- $secondary: #304158;
3
- $light: #47566c;
4
- $blue: #0C457D;
5
- $grey: #706f6f;
6
- $tertiary: #81C784;
7
-
8
1
  .devise {
9
2
  font-family: 'Raleway', sans-serif;
10
3
  height: 100vh;
@@ -19,11 +12,11 @@
19
12
  }
20
13
 
21
14
  .bckg-dark {
22
- // background: linear-gradient(-20deg, #09b7b9 30%, #1c51a4 100%);
23
- background-color: rgb(59, 78, 89);
15
+ background-color:$background;
24
16
  }
25
17
 
26
18
  .bckg-login {
19
+ background-color:$background;
27
20
  }
28
21
 
29
22
  .logo {
@@ -38,11 +31,11 @@
38
31
  }
39
32
 
40
33
  .bckg-dark-light {
41
- background: $secondary;
34
+ background: $text;
42
35
  }
43
36
 
44
37
  .bckg-blue {
45
- background: $blue;
38
+ background: $info;
46
39
  }
47
40
 
48
41
  .centered {
@@ -54,7 +47,7 @@
54
47
 
55
48
  .login-form-user {
56
49
  width: 25%;
57
- color: #fff;
50
+ color: $text-highlight;
58
51
  margin: 0 auto;
59
52
  margin-bottom: 25px;
60
53
 
@@ -65,7 +58,7 @@
65
58
  }
66
59
 
67
60
  .lost_id {
68
- color: #fff;
61
+ color: $text-highlight;
69
62
  margin-bottom: 15px;
70
63
  display: block;
71
64
  font-size: .9em;
@@ -111,16 +104,16 @@
111
104
  border: 0;
112
105
  }
113
106
  input[type="submit"] {
114
- background: $grey;
107
+ background: $neutral;
115
108
  border: 0;
116
109
  border-radius: 0;
117
110
  cursor: pointer;
118
111
  float: right;
119
- color: white;
112
+ color:$text-highlight;
120
113
  width:100%;
121
114
  }
122
115
  h2 {
123
- background: $grey;
116
+ background: $neutral;
124
117
  display: block;
125
118
  padding: 10px 15px;
126
119
  text-align: left;
@@ -129,15 +122,15 @@
129
122
  }
130
123
 
131
124
  .login-form {
132
- color: #fff;
125
+ color:$text-highlight;
133
126
  width: 30%;
134
127
 
135
128
  .links-form {
136
129
  a {
137
- color: $light;
130
+ color:$text-highlight;
138
131
  text-decoration: none;
139
132
  &:hover {
140
- color: $light;
133
+ color: $text-highlight;
141
134
  }
142
135
  }
143
136
  }
@@ -174,8 +167,8 @@
174
167
 
175
168
  input[type="submit"] {
176
169
  cursor: pointer;
177
- background: $tertiary;
178
- color: #fff;
170
+ background: $element-border;
171
+ color:$text-highlight;
179
172
  border-radius: 3px;
180
173
  border: 0;
181
174
  display: block;
@@ -184,15 +177,15 @@
184
177
  margin-top: 55px;
185
178
  width: 100%;
186
179
  &:hover {
187
- background: darken($tertiary, 5%);
180
+ background: darken($element-border, 5%);
188
181
  }
189
182
  }
190
183
 
191
184
  input[type="text"], input[type="email"], input[type="password"] {
192
185
  background-color: transparent;
193
186
  border: 0;
194
- border-bottom: 1px solid $light;
195
- color: #fff;
187
+ border-bottom: 1px solid $text-highlight;
188
+ color:$text-highlight;
196
189
  margin-top: 15px;
197
190
  padding-bottom: 15px;
198
191
  }
@@ -200,8 +193,8 @@
200
193
  .input-group-addon {
201
194
  background-color: transparent;
202
195
  border: 0;
203
- border-bottom: 1px solid $light;
204
- color: #fff;
196
+ border-bottom: 1px solid $text-highlight;
197
+ color:$text-highlight;
205
198
  margin-top: 15px;
206
199
  padding-bottom: 15px;
207
200
  padding-top: 12px;
@@ -11,18 +11,18 @@
11
11
 
12
12
  @-webkit-keyframes flash {
13
13
  0% { background-color: none; }
14
- 50% { background-color: #fbf8b2; }
14
+ 50% { background-color: $text-highlight; }
15
15
  100% { background-color: none; }
16
16
  }
17
17
 
18
18
  @-moz-keyframes flash {
19
19
  0% { background-color: none; }
20
- 50% { background-color: #fbf8b2; }
20
+ 50% { background-color: $text-highlight; }
21
21
  100% { background-color: none; }
22
22
  }
23
23
 
24
24
  @-ms-keyframes flash {
25
25
  0% { background-color: none; }
26
- 50% { background-color: #fbf8b2; }
26
+ 50% { background-color: $text-highlight; }
27
27
  100% { background-color: none; }
28
28
  }
@@ -11,15 +11,33 @@
11
11
  * file per style scope.
12
12
  *
13
13
  *= required _colors
14
-
14
+ *= require thecore_ui_commons/thecore
15
+ *= require rails_admin/rails_admin
16
+ *= require rails_admin_selectize/index
15
17
  *= require_self
16
18
  */
19
+ @import 'colors';
17
20
  @import "jquery-ui";
18
21
  @import "jquery-ui/dialog";
19
22
  @import 'bootstrap-sprockets';
20
23
  @import 'bootstrap';
21
24
  @import 'common';
25
+ @import "flashing";
22
26
  @import 'devise';
23
27
  @import 'animate';
24
28
  @import 'mixins';
25
29
  @import 'apexcharts';
30
+ @import 'thecore_ui_commons/thecore';
31
+ @import "togglable-sidebar";
32
+
33
+ .btn {
34
+ background-color: $element;
35
+ color: $element-text;
36
+ border-color: $element-border;
37
+ }
38
+
39
+ .btn:hover,
40
+ #new_user div.actions input.btn:hover {
41
+ color: $element-text-highlight;
42
+ background-color: $shadows;
43
+ }
@@ -16,34 +16,117 @@
16
16
  *= require rails_admin_selectize/index
17
17
  *= require_self
18
18
  */
19
- @import 'thecore';
20
- @import 'thecore_ui_commons/thecore';
21
- @import "togglable-sidebar";
22
- @import "flashing";
23
- @import 'common';
24
-
25
- $RAprimary: #1c2c41;
26
- $RAgreen: #37BC9B;
27
- $RAblue: #3BAFDA;
28
- $RAred: #E9573F;
29
- $RAyellow: #F6BB42;
19
+ @import "thecore";
30
20
 
31
- .page-header.dashboard {
32
- border-color: $RAprimary;
21
+ #filters > li > a:nth-child(1):hover, .dropdown-menu > li > a:nth-child(1):hover {
22
+ border-radius: 0;
23
+ }
24
+
25
+ span.label.label-info.form-label {
26
+ background-color: $primary;
27
+ }
28
+
29
+ .sidebar-nav li a {
30
+ color: $element-text;
31
+ }
32
+ #sidebar-wrapper .sidebar-nav {
33
+ background-color: $shadows !important;
34
+ color: $element-text;
35
+ &:hover {
36
+ color: $element-text-highlight !important;
37
+ }
38
+ .dropdown-header {
39
+ color: $element-text;
40
+ }
41
+ .sub-menu-container {
42
+ background-color: darken($shadows, 10%) !important;
43
+ }
44
+ .sub-menu-container .sub-menu a:hover {
45
+ color: $element-text-highlight !important;
46
+ }
47
+ .dropdown-header:hover, .dropdown-header.active, .dropdown-header.active .sub-menu-container .submenu:hover, .sub-menu.sub-menu-null a:hover {
48
+ background-color: $element;
49
+ color: $element-text-highlight !important;
50
+ }
51
+ }
52
+
53
+ #app-name {
54
+ color: $primary !important;
55
+ }
56
+
57
+ #sidebar-collapse {
58
+ color: $shadows !important;
33
59
  }
34
60
 
35
61
  .breadcrumb {
36
- background: $RAblue;
62
+ background: $element;
37
63
  .false a, .false:before {
38
- color: darken($RAblue, 30%) !important;
64
+ color: darken($element, 30%) !important;
39
65
  }
40
66
  .active, .active:before {
41
- color: #FFF;
67
+ color: $text-highlight;
68
+ }
69
+ }
70
+
71
+ #list .form-inline {
72
+ margin-bottom: 2em;
73
+ }
74
+
75
+ p.boolean_type a.label-success,
76
+ p.boolean_type a.label-danger {
77
+ background: none;
78
+ font-size: 1.5em;
79
+ &:hover {
80
+ background: none;
42
81
  }
43
82
  }
44
83
 
84
+ body.rails_admin .nav.nav-tabs {
85
+ margin-bottom: 0;
86
+ }
87
+
88
+ #bulk_form .panel:nth-of-type(1) {
89
+ border-top-right-radius: 0;
90
+ border-top-left-radius: 0;
91
+ }
92
+
93
+ #scope_selector li, #action-menu li {
94
+ border-top-left-radius: 0.5em;
95
+ border-top-right-radius: 0.5em;
96
+ &.selected {
97
+ background-color: #fff;
98
+ color: $text !important;
99
+ a {
100
+ color: $text !important;
101
+ }
102
+ }
103
+
104
+ a:hover {
105
+ border-top-left-radius: 0.5em;
106
+ border-top-right-radius: 0.5em;
107
+ background-color: rgba($element, .5);
108
+ color: $element-text-highlight !important;
109
+ }
110
+ }
111
+
112
+ .well {
113
+ background-color: darken($background, 2%);
114
+ border-color: darken($background, 2%);
115
+ }
116
+
117
+ .content a, a {
118
+ color: $link;
119
+ text-decoration: none;
120
+ &:hover {
121
+ color: $link-highlight; }
122
+ }
123
+
124
+ .page-header.dashboard {
125
+ border-color: $background;
126
+ }
127
+
45
128
  .table-striped {
46
- border-top-color: $RAblue;
129
+ border-top-color: $info;
47
130
  .links ul li {
48
131
  padding-right: 0;
49
132
  a {
@@ -55,9 +138,9 @@ $RAyellow: #F6BB42;
55
138
  .content {
56
139
  margin: 0px 0 15px 0;
57
140
  padding: 8px;
58
- background: rgb(59, 78, 89);
141
+ background: $background;
59
142
  &.dashboard {
60
- background: rgb(59, 78, 89);
143
+ background: $background;
61
144
  }
62
145
  .page-header {
63
146
  display: none;
@@ -65,20 +148,23 @@ $RAyellow: #F6BB42;
65
148
  }
66
149
 
67
150
  a.delete {
68
- color: #FFF;
151
+ color: $text-highlight;
69
152
  }
70
153
 
71
154
  .box {
155
+ border-radius: 1em;
156
+ display: block;
72
157
  padding: 15px;
73
158
  margin-bottom: 30px;
74
- border: 1px solid $RAprimary;
159
+ border: 1px solid $element-border;
75
160
  position: relative;
76
- min-height: 170px;
161
+ min-height: 15em;
77
162
  transition: all 0.3s ease;
78
- color: rgba(255,255,255,0.7);
163
+ background-color: lighten($element, 25%);
164
+ color: $element-text;
79
165
  overflow: hidden;
80
166
  &:hover, &:focus {
81
- border-color: #FFF;
167
+ border-color: $shadows;
82
168
  .icon-bg {
83
169
  transform: scale(1.5) rotate(20deg);
84
170
  }
@@ -89,14 +175,14 @@ a.delete {
89
175
  font-weight: 600;
90
176
  a.btn {
91
177
  border-radius: 3px;
92
- color: rgba(255,255,255,0.7) !important;
178
+ color: rgba($text-highlight,0.7) !important;
93
179
  display: inline-block;
94
180
  margin-bottom: 0;
95
181
  font-weight: normal;
96
182
  text-align: center;
97
183
  vertical-align: middle;
98
184
  cursor: pointer;
99
- background-color: rgba(0, 0, 0, 0.19);
185
+ background-color: rgba($shadows, 0.19);
100
186
  border: 1px solid transparent;
101
187
  white-space: nowrap;
102
188
  padding: 6px 12px;
@@ -109,34 +195,41 @@ a.delete {
109
195
  user-select: none;
110
196
  }
111
197
  }
112
- strong {
113
- font-size: 36px;
198
+ strong.count {
199
+ font-size: 10em;
114
200
  font-weight: 600;
115
201
  }
202
+ p.model,
203
+ strong.count {
204
+ color: $element-text;
205
+ &:hover {
206
+ color: $element-text-highlight;
207
+ }
208
+ }
116
209
  .icon-bg {
117
210
  position: absolute;
118
211
  right: 0;
119
212
  bottom: 0;
120
- font-size: 100px;
121
- color: #000;
122
- opacity: 0.08;
123
- filter: alpha(opacity=8);
213
+ font-size: 15em;
214
+ color: $element-text;
215
+ opacity: 0.20;
216
+ filter: alpha(opacity=20);
124
217
  transition: all 1s ease;
125
218
  }
126
219
  &.bg-info {
127
- background-color: $RAblue;
220
+ background-color: $info;
128
221
  }
129
222
  &.bg-success {
130
- background-color: $RAgreen;
223
+ background-color: $success;
131
224
  }
132
225
  &.bg-warning {
133
- background-color: $RAyellow;
226
+ background-color: $warning;
134
227
  }
135
228
  &.bg-danger {
136
- background-color: $RAred;
229
+ background-color: $danger;
137
230
  }
138
231
  &.bg-clear {
139
- background-color: rgb(204, 255, 204);
232
+ background-color: $neutral;
140
233
  }
141
234
  }
142
235
 
@@ -145,14 +238,14 @@ a.delete {
145
238
  max-width: 300px;
146
239
  padding: 19px 29px 29px;
147
240
  margin: 0 auto 20px;
148
- background-color: #fff;
149
- border: 1px solid #e5e5e5;
241
+ background-color: $text-highlight;
242
+ border: 1px solid $element-border;
150
243
  -webkit-border-radius: 5px;
151
244
  -moz-border-radius: 5px;
152
245
  border-radius: 5px;
153
- -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.05);
154
- -moz-box-shadow: 0 1px 2px rgba(0,0,0,.05);
155
- box-shadow: 0 1px 2px rgba(0,0,0,.05);
246
+ -webkit-box-shadow: 0 1px 2px rgba($shadows,.05);
247
+ -moz-box-shadow: 0 1px 2px rgba($shadows,.05);
248
+ box-shadow: 0 1px 2px rgba($shadows,.05);
156
249
  }
157
250
  .border-form-div .form-signin-heading,
158
251
  .border-form-div .checkbox {
@@ -171,13 +264,13 @@ a.delete {
171
264
  background-color: transparent;
172
265
  background-image: none;
173
266
  border: 1px solid transparent;
174
- color: #888;
267
+ color: $neutral;
175
268
  }
176
269
  #sidebar-collapse:focus {
177
270
  outline: 0;
178
271
  }
179
272
  #sidebar-collapse:hover {
180
- color: white;
273
+ color:$text-highlight;
181
274
  }
182
275
 
183
276
  .exit-button {
@@ -190,15 +283,16 @@ a.delete {
190
283
 
191
284
  #app-name {
192
285
  font-size: 2em;
193
- color: #888;
286
+ color: $neutral;
194
287
  font-family: 'Raleway', sans-serif;
195
288
  word-wrap: normal;
196
289
  }
197
290
  #app-name:hover {
198
- color: white;
291
+ color: $text-highlight;
199
292
  text-decoration: none;
200
293
  }
201
294
 
202
295
  body.rails_admin {
203
296
  padding-top: 0px;
204
- }
297
+ background-color: $background;
298
+ }
@@ -32,13 +32,12 @@
32
32
  width: 100%;
33
33
  position: absolute;
34
34
  padding: 15px;
35
- background-color: rgb(59,78,89);
35
+ background-color: $background;
36
36
  min-height: 100vh;
37
37
  }
38
38
  #wrapper.toggled #page-content-wrapper {
39
39
  position: absolute;
40
40
  margin-right: -250px;
41
- background-color: rgb(59,78,89);
42
41
  }
43
42
  /* Sidebar Styles */
44
43
 
@@ -16,10 +16,13 @@
16
16
  - if @abstract_model
17
17
  = breadcrumb
18
18
  .well.well-sm
19
- %ul.nav.nav-pills
19
+ %ul.nav.nav-pills#action-menu
20
20
  = menu_for((@abstract_model ? (@object.try(:persisted?) ? :member : :collection) : :root), @abstract_model, @object)
21
21
  = content_for :contextual_tabs
22
22
  .well.well-sm
23
23
  = yield
24
24
  - else
25
25
  = yield
26
+
27
+ %script
28
+ $('.dropdown-toggle').dropdown()
@@ -1,4 +1,4 @@
1
- %div.panel.panel-success
1
+ %div.panel
2
2
  %div.panel-heading
3
3
  %ul.inline.list-inline.pull-right
4
4
  = menu_for :member, @abstract_model, object, true
@@ -6,6 +6,7 @@
6
6
  = check_box_tag "bulk_ids[]", object.id, false, id: "bulk_ids_#{object.id}"
7
7
  %a{:"data-toggle" => "collapse", href: "#object-id-#{object.id}"}
8
8
  = (object.resume rescue false || object.display_name rescue false || object.title rescue false || object.name rescue false || object.code rescue false)
9
+ %b.caret
9
10
  %div{id: "object-id-#{object.id}", class: "panel-collapse collapse"}
10
11
  %div.panel-body
11
12
  - properties.map{ |property| property.bind(:object, object) }.each do |property|
@@ -9,32 +9,25 @@
9
9
  .row
10
10
  - group.each do |item|
11
11
  .col-sm-6
12
- .box.bg.bg-clear= self.send(item)
12
+ .box= self.send(item)
13
13
 
14
14
  - charts_medium.in_groups_of(3, false).each_with_index do |group, i|
15
15
  .row
16
16
  - group.each do |item|
17
17
  .col-sm-4
18
- .box.bg.bg-clear= self.send(item)
18
+ .box= self.send(item)
19
19
 
20
- - @list_bg = ['info', 'success', 'danger', 'success', 'info', 'warning', 'danger', 'info', 'success']
21
20
  - if @abstract_models
22
21
  .row
23
- - index = 0
24
22
  - @abstract_models.each do |abstract_model|
25
23
  - index_path = index_path(model_name: abstract_model.to_param)
26
- - if authorized?(:index, abstract_model) && !index_path.include?("ckeditor")
27
- - if index == @list_bg.length
28
- - index = 0
29
- - row_class = "box bg-#{ @list_bg[index].to_s } #{"link" if index_path} #{abstract_model.param_key}_links #{abstract_model.config.label_plural}"
24
+ - if authorized?(:index, abstract_model)
30
25
  .col-sm-4
31
- .box{class: row_class, :"data-link" => index_path}
26
+ %a.box.pjax{href: index_path}
32
27
  %i{class: "icon-bg #{abstract_model.config.navigation_icon.present? ? abstract_model.config.navigation_icon : 'file' }"}
33
28
  .text-center
34
- %p= capitalize_first_letter(abstract_model.config.label_plural)
35
- %strong= @count[abstract_model.model.name].to_s
36
- %p= link_to content_tag("i", "", class: "fa fa-list-ul"), index_path, class: 'btn btn-black pjax'
37
- - index += 1
29
+ %p.model= capitalize_first_letter(abstract_model.config.label_plural)
30
+ %strong.count= @count[abstract_model.model.name].to_s
38
31
 
39
32
  - if @auditing_adapter && authorized?(:history_index)
40
33
  #block-tables.block
@@ -24,10 +24,10 @@
24
24
  = bulk_menu
25
25
  - if filterable_fields.present?
26
26
  %li.dropdown{style: 'float:right'}
27
- %a.dropdown-toggle{href: '#', :'data-toggle' => "dropdown"}
27
+ %a.dropdown-toggle#filters-menu{ :'data-toggle' => "dropdown", :'aria-haspopup'=>"true", :'aria-expanded'=>"true"}
28
28
  = t('admin.misc.add_filter')
29
29
  %b.caret
30
- %ul.dropdown-menu#filters{style: 'left:auto; right:0;'}
30
+ %ul.dropdown-menu#filters{style: 'left:auto; right:0;', :'aria-labelledby'=>"filters-menu"}
31
31
  - filterable_fields.each do |field|
32
32
  - field_options = case field.type
33
33
  - when :enum
@@ -44,27 +44,26 @@
44
44
 
45
45
  #list
46
46
  = form_tag(index_path(params.except(*%w[page f query])), method: :get, class: "pjax-form form-inline") do
47
- .well
48
- %span#filters_box{data: {options: ordered_filter_options.to_json}}
49
- %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
50
- .input-group
51
- %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
52
- %span.input-group-btn
53
- %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
54
- %i.icon-white.icon-refresh
55
- = t('admin.misc.refresh')
56
- %button#remove_filter.btn.btn-info{title: "Reset filters"}
57
- %i.icon-white.icon-remove
58
- - if export_action
59
- %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
47
+ %span#filters_box{data: {options: ordered_filter_options.to_json}}
48
+ %hr.filters_box{style: "display:#{ordered_filters.empty? ? 'none' : 'block'}"}
49
+ .input-group
50
+ %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
51
+ %span.input-group-btn
52
+ %button.btn.btn-primary{type: 'submit', :'data-disable-with' => '<i class="icon-white icon-refresh"></i> '.html_safe + t('admin.misc.refresh')}
53
+ %i.icon-white.icon-refresh
54
+ = t('admin.misc.refresh')
55
+ %button#remove_filter.btn.btn-info{title: "Reset filters"}
56
+ %i.icon-white.icon-remove
57
+ - if export_action
58
+ %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
60
59
 
61
60
  - unless @model_config.list.scopes.empty?
62
- %ul.nav.nav-tabs#scope_selector
63
- - @model_config.list.scopes.each_with_index do |scope, index|
61
+ %ul.nav.nav-tabs.nav-justified#scope_selector
62
+ - @model_config.list.scopes.each do |scope|
64
63
  - scope = '_all' if scope.nil?
65
- %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
66
- %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
67
-
64
+ %li{ class: "#{ scope.to_s == params[:scope] || (params[:scope].nil? && scope == "_all") ? "selected" : "inactive"}"}
65
+ %a.nav-link{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
66
+
68
67
  = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: ["form", frozen_columns ? 'ra-sidescroll' : nil], data: (frozen_columns ? {ra_sidescroll: frozen_columns} : {}) do
69
68
  = hidden_field_tag :bulk_action
70
69
  - if description.present?
@@ -14,7 +14,7 @@ it:
14
14
  scopes: ⋔
15
15
  add_filter: ⋔
16
16
  add_new: ⋔
17
- refresh: ""
17
+ refresh: Apply Filters
18
18
  bulk_menu_title: ☰✔
19
19
  select:
20
20
  toggle: ☑
@@ -1,3 +1,3 @@
1
1
  module ThecoreUiRailsAdmin
2
- VERSION = '2.1.10'
2
+ VERSION = '2.1.15'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thecore_ui_rails_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.10
4
+ version: 2.1.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gabriele Tassoni
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-29 00:00:00.000000000 Z
11
+ date: 2020-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thecore_ui_commons
@@ -194,6 +194,7 @@ files:
194
194
  - app/assets/javascripts/thecore_ui_rails_admin/thecore_rails_admin.js
195
195
  - app/assets/stylesheets/thecore_ui_rails_admin/animate.css
196
196
  - app/assets/stylesheets/thecore_ui_rails_admin/apexcharts.scss
197
+ - app/assets/stylesheets/thecore_ui_rails_admin/colors.scss
197
198
  - app/assets/stylesheets/thecore_ui_rails_admin/common.scss
198
199
  - app/assets/stylesheets/thecore_ui_rails_admin/devise.scss
199
200
  - app/assets/stylesheets/thecore_ui_rails_admin/flashing.scss