caboose-cms 0.9.183 → 0.9.184

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/caboose/themes_controller.rb +14 -0
  3. data/app/models/caboose/schema.rb +14 -1
  4. data/app/models/caboose/theme.rb +14 -0
  5. data/app/views/caboose/themes/admin_edit.html.erb +33 -7
  6. data/lib/caboose/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0945be556ffe5758cc00e1046d1af4e634b79e71
4
- data.tar.gz: aa2a7f7f16217941d3c8d95d5290a4e9c422e9bc
3
+ metadata.gz: 2849f6c1e1d775b24f406b2d03a6b88bef387f02
4
+ data.tar.gz: 820168ee5fcfb9fea1d42ff9b77a50b6bc632bfd
5
5
  SHA512:
6
- metadata.gz: 76b1843d89e4fe318ba445c7c9e67de8ee3e3c4130b21d1da17ce17fcee4bc3493660d3a6e229b6ccd68da2a0d6ad849693d76d4c577e30d7b11669d4e000611
7
- data.tar.gz: f4a50d2568fd53991334bdac92622e57355831926ccbaee9553f6eef73b19c0704cc3d45a58d6e425d5c5c252b207672a052107c722593d7419d5f2ace621125
6
+ metadata.gz: 4dffbf05cfae4ae291ae18da8ebc8a9b79457e289c8cca8b6b1df6d4164c35b48eba4f642328a667f2e089eafa171f4da83ecb4923945b06f6c9b46c08decd35
7
+ data.tar.gz: cbce2f5f2e96e5a5f40de9a23b4e3b67974b13d643c492ff21fdeba21928bc2f77f8208d87e8ce05e86e1d6f969100e6c699c13e8ee43a33f0c9b8cd4d413538
data/app/controllers/caboose/themes_controller.rb CHANGED
@@ -81,6 +81,20 @@ module Caboose
81
81
  when 'actual_banner_height' then theme.actual_banner_height = value
82
82
  when 'dropdown_nav_padding' then theme.dropdown_nav_padding = value
83
83
 
84
+ when 'btn_main_bg_color' then theme.btn_main_bg_color = value
85
+ when 'btn_alt_bg_color' then theme.btn_alt_bg_color = value
86
+ when 'header_text_transform' then theme.header_text_transform = value
87
+ when 'ninebar_show' then theme.ninebar_show = value
88
+ when 'ninebar_bg_color' then theme.ninebar_bg_color = value
89
+ when 'ninebar_text' then theme.ninebar_text = value
90
+ when 'header_hover_bg_color' then theme.header_hover_bg_color = value
91
+ when 'header_hover_font_color' then theme.header_hover_font_color = value
92
+ when 'header_border_bottom' then theme.header_border_bottom = value
93
+ when 'note_error_bg' then theme.note_error_bg = value
94
+ when 'note_loading_bg' then theme.note_loading_bg = value
95
+ when 'note_success_bg' then theme.note_success_bg = value
96
+ when 'nav_lineheight_offset' then theme.nav_lineheight_offset = value
97
+
84
98
  end
85
99
  end
86
100
  resp.success = save && theme.save
data/app/models/caboose/schema.rb CHANGED
@@ -1001,7 +1001,20 @@ class Caboose::Schema < Caboose::Utilities::Schema
1001
1001
  [ :actual_banner_height, :string ],
1002
1002
  [ :dropdown_nav_padding, :string ],
1003
1003
  [ :custom_sass, :text ],
1004
- [ :cl_banner_version, :string ]
1004
+ [ :cl_banner_version, :string ],
1005
+ [ :btn_main_bg_color, :string ],
1006
+ [ :btn_alt_bg_color, :string ],
1007
+ [ :header_text_transform, :string ],
1008
+ [ :ninebar_show, :string ],
1009
+ [ :ninebar_bg_color, :string ],
1010
+ [ :ninebar_text, :string ],
1011
+ [ :header_hover_bg_color, :string ],
1012
+ [ :header_hover_font_color, :string ],
1013
+ [ :header_border_bottom, :string ],
1014
+ [ :note_error_bg, :string ],
1015
+ [ :note_loading_bg, :string ],
1016
+ [ :note_success_bg, :string ],
1017
+ [ :nav_lineheight_offset, :string ]
1005
1018
  ],
1006
1019
  Caboose::ThemeFile => [
1007
1020
  [ :filename, :string ],
data/app/models/caboose/theme.rb CHANGED
@@ -79,6 +79,20 @@ class Caboose::Theme < ActiveRecord::Base
79
79
  :actual_banner_height,
80
80
  :dropdown_nav_padding,
81
81
 
82
+ :btn_main_bg_color,
83
+ :btn_alt_bg_color,
84
+ :header_text_transform,
85
+ :ninebar_show,
86
+ :ninebar_bg_color,
87
+ :ninebar_text,
88
+ :header_hover_bg_color,
89
+ :header_hover_font_color,
90
+ :header_border_bottom,
91
+ :note_error_bg,
92
+ :note_loading_bg,
93
+ :note_success_bg,
94
+ :nav_lineheight_offset,
95
+
82
96
  :digest,
83
97
  :custom_sass,
84
98
  :cl_banner_version
data/app/views/caboose/themes/admin_edit.html.erb CHANGED
@@ -48,6 +48,11 @@ position = header.child('position') if header
48
48
  <div id="theme_<%= @theme.id %>_logo_width"></div>
49
49
  <div id="theme_<%= @theme.id %>_logo_height"></div>
50
50
  <div id="theme_<%= @theme.id %>_logo_top_padding"></div>
51
+ <div id="theme_<%= @theme.id %>_header_text_transform"></div>
52
+ <div id="theme_<%= @theme.id %>_header_hover_bg_color"></div>
53
+ <div id="theme_<%= @theme.id %>_header_hover_font_color"></div>
54
+ <div id="theme_<%= @theme.id %>_header_border_bottom"></div>
55
+ <div id="theme_<%= @theme.id %>_nav_lineheight_offset"></div>
51
56
  <div id="theme_<%= @theme.id %>_default_header_style"></div>
52
57
  <div id="theme_<%= @theme.id %>_default_header_position"></div>
53
58
  </section>
@@ -60,6 +65,9 @@ position = header.child('position') if header
60
65
  <div id="theme_<%= @theme.id %>_footer_padding"></div>
61
66
  <div id="theme_<%= @theme.id %>_footer_font_size"></div>
62
67
  <div id="theme_<%= @theme.id %>_actual_footer_height"></div>
68
+ <div id="theme_<%= @theme.id %>_ninebar_show"></div>
69
+ <div id="theme_<%= @theme.id %>_ninebar_bg_color"></div>
70
+ <div id="theme_<%= @theme.id %>_ninebar_text"></div>
63
71
  </section>
64
72
 
65
73
  <section>
@@ -77,6 +85,8 @@ position = header.child('position') if header
77
85
  <div class="unit1of2 right">
78
86
  <section>
79
87
  <h5>Buttons</h5>
88
+ <div id="theme_<%= @theme.id %>_btn_main_bg_color"></div>
89
+ <div id="theme_<%= @theme.id %>_btn_alt_bg_color"></div>
80
90
  <div id="theme_<%= @theme.id %>_btn_border_radius"></div>
81
91
  <div id="theme_<%= @theme.id %>_btn_border_width"></div>
82
92
  <div id="theme_<%= @theme.id %>_btn_border_color"></div>
@@ -90,7 +100,7 @@ position = header.child('position') if header
90
100
  </section>
91
101
 
92
102
  <section>
93
- <h5>Inputs</h5>
103
+ <h5>Forms &amp; Inputs</h5>
94
104
  <div id="theme_<%= @theme.id %>_input_border_radius"></div>
95
105
  <div id="theme_<%= @theme.id %>_input_bg_color"></div>
96
106
  <div id="theme_<%= @theme.id %>_input_border_color"></div>
@@ -99,6 +109,9 @@ position = header.child('position') if header
99
109
  <div id="theme_<%= @theme.id %>_input_font_size"></div>
100
110
  <div id="theme_<%= @theme.id %>_input_padding"></div>
101
111
  <div id="theme_<%= @theme.id %>_note_padding"></div>
112
+ <div id="theme_<%= @theme.id %>_note_error_bg"></div>
113
+ <div id="theme_<%= @theme.id %>_note_loading_bg"></div>
114
+ <div id="theme_<%= @theme.id %>_note_success_bg"></div>
102
115
  </section>
103
116
 
104
117
  <section>
@@ -244,8 +257,8 @@ $(document).ready(function() {
244
257
  { name: 'btn_font_color', nice_name: "<%= 'font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.btn_font_color) %>, width: 400 },
245
258
  { name: 'btn_font_size', nice_name: "<%= 'font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_size) %>, width: 400 },
246
259
  { name: 'btn_font_weight', nice_name: "<%= 'font_weight'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_weight) %>, width: 400 },
247
- { name: 'btn_font_case', nice_name: "<%= 'font_case'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_font_case) %>, width: 400 },
248
- { name: 'btn_border_side', nice_name: "<%= 'border_side'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.btn_border_side) %>, width: 400 },
260
+ { name: 'btn_font_case', nice_name: "<%= 'font_case'.titleize %>", type: 'select', value: <%== Caboose.json(@theme.btn_font_case) %>, options: [{'text':'none','value':'none'},{'text':'uppercase','value':'uppercase'},{'text':'lowercase','value':'lowercase'}], width: 400 },
261
+ { name: 'btn_border_side', nice_name: "<%= 'border_side'.titleize %>", type: 'select', options: [{'text':'none','value':'none'},{'text':'all','value':'all'},{'text':'bottom','value':'bottom'}], value: <%== Caboose.json(@theme.btn_border_side) %>, width: 400 },
249
262
  { name: 'input_border_radius', nice_name: "<%= 'border_radius'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.input_border_radius) %>, width: 400 },
250
263
  { name: 'input_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.input_bg_color) %>, width: 400 },
251
264
  { name: 'input_border_color', nice_name: "<%= 'border_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.input_border_color) %>, width: 400 },
@@ -286,10 +299,23 @@ $(document).ready(function() {
286
299
  { name: 'sidebar_bg_color', nice_name: "<%= 'background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.sidebar_bg_color) %>, width: 400 },
287
300
  { name: 'default_banner_image' , nice_name: 'Default Banner Image' , type: 'image' , value: <%= raw Caboose.json(@theme.default_banner_image ? @theme.default_banner_image.url(:huge) : 'https://res.cloudinary.com/caboose/image/upload/c_scale,f_auto,q_auto:good,w_300/v1539265856/default_banner.jpg') %>, width: 150, update_url: '/admin/themes/<%= @theme.id %>/default-banner-image' },
288
301
  { name: 'banner_font_size', nice_name: "<%= 'banner_font_size'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.banner_font_size) %>, width: 400 },
289
- { name: 'footer_hover_color', nice_name: "<%= 'footer_hover_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.footer_hover_color) %>, width: 400 },
290
- { name: 'actual_footer_height', nice_name: "<%= 'actual_footer_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_footer_height) %>, width: 400 },
291
- { name: 'actual_banner_height', nice_name: "<%= 'actual_banner_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_banner_height) %>, width: 400 },
292
- { name: 'dropdown_nav_padding', nice_name: "<%= 'dropdown_nav_padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.dropdown_nav_padding) %>, width: 400 }
302
+ { name: 'footer_hover_color', nice_name: "<%= 'hover_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.footer_hover_color) %>, width: 400 },
303
+ { name: 'actual_footer_height', nice_name: "<%= 'actual_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_footer_height) %>, width: 400 },
304
+ { name: 'actual_banner_height', nice_name: "<%= 'actual_height'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.actual_banner_height) %>, width: 400 },
305
+ { name: 'dropdown_nav_padding', nice_name: "<%= 'dropdown_nav_padding'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.dropdown_nav_padding) %>, width: 400 },
306
+ { name: 'btn_main_bg_color', nice_name: "<%= 'main background color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.btn_main_bg_color) %>, width: 400 },
307
+ { name: 'btn_alt_bg_color', nice_name: "<%= 'alternate_background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.btn_alt_bg_color) %>, width: 400 },
308
+ { name: 'header_text_transform', nice_name: "<%= 'font_case'.titleize %>", type: 'select', value: <%== Caboose.json(@theme.header_text_transform) %>, options: [{'text':'none','value':'none'},{'text':'uppercase','value':'uppercase'},{'text':'lowercase','value':'lowercase'}], width: 400 },
309
+ { name: 'ninebar_show', nice_name: "Show Nine Bar", type: 'select', value: <%== Caboose.json(@theme.ninebar_show) %>, options: [{'text':'Yes','value':'Yes'},{'text':'No','value':'No'}], width: 400 },
310
+ { name: 'ninebar_bg_color', nice_name: "Nine Bar Background Color", type: 'color', value: <%== Caboose.json(@theme.ninebar_bg_color) %>, width: 400 },
311
+ { name: 'ninebar_text', nice_name: "Nine Bar Text", type: 'text', value: <%== Caboose.json(@theme.ninebar_text) %>, width: 400 },
312
+ { name: 'header_hover_bg_color', nice_name: "<%= 'hover_background_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.header_hover_bg_color) %>, width: 400 },
313
+ { name: 'header_hover_font_color', nice_name: "<%= 'hover_font_color'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.header_hover_font_color) %>, width: 400 },
314
+ { name: 'header_border_bottom', nice_name: "<%= 'border_bottom'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.header_border_bottom) %>, width: 400 },
315
+ { name: 'note_error_bg', nice_name: "<%= 'note_error_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_error_bg) %>, width: 400 },
316
+ { name: 'note_loading_bg', nice_name: "<%= 'note_loading_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_loading_bg) %>, width: 400 },
317
+ { name: 'note_success_bg', nice_name: "<%= 'note_success_background'.titleize %>", type: 'color', value: <%== Caboose.json(@theme.note_success_bg) %>, width: 400 },
318
+ { name: 'nav_lineheight_offset', nice_name: "<%= 'nav_line_height_offset'.titleize %>", type: 'text', value: <%== Caboose.json(@theme.nav_lineheight_offset) %>, width: 400 }
293
319
  ]
294
320
  });
295
321
  });
data/lib/caboose/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.9.183'
2
+ VERSION = '0.9.184'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.183
4
+ version: 0.9.184
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-24 00:00:00.000000000 Z
11
+ date: 2018-10-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: pg