trusty-cms 4.0.2 → 4.1.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -3
- data/Gemfile.lock +89 -89
- data/Rakefile +7 -7
- data/app/assets/images/admin/spinner.gif +0 -0
- data/app/assets/javascripts/admin.js +3 -0
- data/app/assets/javascripts/admin/more-or-less.js +2 -2
- data/app/assets/javascripts/admin/tabcontrol.js.erb +1 -2
- data/app/assets/javascripts/rad_social/rad_ajax_form.js +3 -0
- data/app/assets/javascripts/rad_social/rad_email.js +0 -1
- data/app/assets/javascripts/rad_social/rad_email_form.js +2 -7
- data/app/assets/stylesheets/admin/_base.scss +22 -6
- data/app/assets/stylesheets/admin/_multi_site_main.scss +28 -29
- data/app/assets/stylesheets/admin/_reset.scss +5 -4
- data/app/assets/stylesheets/admin/_site_chooser.scss +44 -69
- data/app/assets/stylesheets/admin/assets.scss +138 -141
- data/app/assets/stylesheets/admin/main.scss +10 -12
- data/app/assets/stylesheets/admin/modules/_boxes.scss +0 -3
- data/app/assets/stylesheets/admin/modules/_buttons.scss +30 -0
- data/app/assets/stylesheets/admin/modules/_links.scss +1 -1
- data/app/assets/stylesheets/admin/partials/_actions.scss +29 -46
- data/app/assets/stylesheets/admin/partials/_avatars.scss +3 -2
- data/app/assets/stylesheets/admin/partials/_content.scss +15 -38
- data/app/assets/stylesheets/admin/partials/_dateinput.scss +23 -14
- data/app/assets/stylesheets/admin/partials/_drawer.scss +78 -0
- data/app/assets/stylesheets/admin/partials/_dropdown.scss +9 -12
- data/app/assets/stylesheets/admin/partials/_footer.scss +4 -3
- data/app/assets/stylesheets/admin/partials/_forms.scss +64 -493
- data/app/assets/stylesheets/admin/partials/_header.scss +9 -118
- data/app/assets/stylesheets/admin/partials/_layout.scss +26 -2
- data/app/assets/stylesheets/admin/partials/_login_form.scss +28 -0
- data/app/assets/stylesheets/admin/partials/_messages.scss +10 -5
- data/app/assets/stylesheets/admin/partials/_popup.scss +61 -50
- data/app/assets/stylesheets/admin/partials/_preferences.scss +37 -0
- data/app/assets/stylesheets/admin/partials/_sidebar.scss +55 -0
- data/app/assets/stylesheets/admin/partials/_tabcontrol.scss +24 -36
- data/app/assets/stylesheets/admin/partials/{_index.scss → _table.scss} +53 -84
- data/app/assets/stylesheets/admin/partials/_toolbar.scss +11 -6
- data/app/assets/stylesheets/admin/partials/_treetable.scss +1 -71
- data/app/assets/stylesheets/admin/partials/_typography.scss +30 -55
- data/app/assets/stylesheets/admin/partials/_validations.scss +6 -5
- data/app/assets/stylesheets/rad_social/rad_screen.scss +64 -67
- data/app/controllers/admin/assets_controller.rb +21 -31
- data/app/controllers/admin/configuration_controller.rb +9 -11
- data/app/controllers/admin/extensions_controller.rb +3 -3
- data/app/controllers/admin/layouts_controller.rb +3 -4
- data/app/controllers/admin/page_attachments_controller.rb +5 -5
- data/app/controllers/admin/page_fields_controller.rb +3 -4
- data/app/controllers/admin/page_parts_controller.rb +4 -5
- data/app/controllers/admin/pages_controller.rb +55 -56
- data/app/controllers/admin/references_controller.rb +1 -1
- data/app/controllers/admin/resource_controller.rb +132 -130
- data/app/controllers/admin/sites_controller.rb +4 -4
- data/app/controllers/admin/snippets_controller.rb +3 -4
- data/app/controllers/admin/users_controller.rb +16 -16
- data/app/controllers/application_controller.rb +47 -48
- data/app/controllers/site_controller.rb +51 -48
- data/app/controllers/social_mailer_controller.rb +12 -22
- data/app/helpers/admin/configuration_helper.rb +19 -20
- data/app/helpers/admin/layouts_helper.rb +0 -1
- data/app/helpers/admin/node_helper.rb +27 -24
- data/app/helpers/admin/pages_helper.rb +2 -2
- data/app/helpers/admin/preferences_helper.rb +0 -1
- data/app/helpers/admin/references_helper.rb +9 -10
- data/app/helpers/admin/regions_helper.rb +3 -3
- data/app/helpers/application_helper.rb +34 -35
- data/app/helpers/rad_social_helper.rb +8 -11
- data/app/helpers/scoped_helper.rb +1 -3
- data/app/helpers/sites_helper.rb +4 -4
- data/app/mailers/devise_mailer.rb +3 -4
- data/app/mailers/rad_social_mailer.rb +8 -8
- data/app/models/asset.rb +62 -63
- data/app/models/asset_type.rb +38 -39
- data/app/models/deprecated_tags.rb +3 -4
- data/app/models/file_not_found_page.rb +1 -3
- data/app/models/haml_filter.rb +1 -1
- data/app/models/layout.rb +4 -5
- data/app/models/legacy_user.rb +2 -2
- data/app/models/menu_renderer.rb +16 -18
- data/app/models/page.rb +96 -93
- data/app/models/page_attachment.rb +1 -2
- data/app/models/page_context.rb +11 -12
- data/app/models/page_part.rb +3 -4
- data/app/models/rails_page.rb +10 -12
- data/app/models/site.rb +22 -21
- data/app/models/snippet.rb +6 -8
- data/app/models/snippet_finder.rb +3 -3
- data/app/models/snippet_tags.rb +4 -4
- data/app/models/standard_tags.rb +258 -252
- data/app/models/status.rb +8 -8
- data/app/models/trusty_cms/config.rb +25 -25
- data/app/models/trusty_cms/page_response_cache_director.rb +2 -3
- data/app/models/user.rb +15 -14
- data/app/models/user_action_observer.rb +3 -3
- data/app/users/_choose_site.html.haml +3 -7
- data/app/views/admin/assets/_form.html.haml +2 -1
- data/app/views/admin/assets/_search.html.haml +2 -1
- data/app/views/admin/assets/edit.html.haml +2 -10
- data/app/views/admin/assets/index.html.haml +4 -2
- data/app/views/admin/assets/new.html.haml +4 -8
- data/app/views/admin/assets/remove.html.haml +2 -1
- data/app/views/admin/configuration/edit.html.haml +7 -7
- data/app/views/admin/configuration/show.html.haml +6 -8
- data/app/views/admin/layouts/_choose_site.html.haml +2 -3
- data/app/views/admin/layouts/_form.html.haml +13 -12
- data/app/views/admin/layouts/_site_chooser.html.haml +2 -2
- data/app/views/admin/layouts/index.html.haml +11 -4
- data/app/views/admin/layouts/remove.html.haml +6 -5
- data/app/views/admin/page_attachments/_attachment.html.haml +2 -2
- data/app/views/admin/page_fields/_page_field.html.haml +3 -3
- data/app/views/admin/page_parts/_page_part.html.haml +5 -6
- data/app/views/admin/pages/_asset_popups.html.haml +15 -16
- data/app/views/admin/pages/_assets.html.haml +8 -7
- data/app/views/admin/pages/_fields.html.haml +16 -13
- data/app/views/admin/pages/_node.html.haml +3 -3
- data/app/views/admin/pages/_popups.html.haml +11 -11
- data/app/views/admin/pages/edit.html.haml +2 -2
- data/app/views/admin/pages/index.html.haml +5 -2
- data/app/views/admin/pages/new.html.haml +3 -3
- data/app/views/admin/pages/remove.html.haml +4 -3
- data/app/views/admin/preferences/edit.html.haml +5 -5
- data/app/views/admin/references/filters.haml +1 -1
- data/app/views/admin/references/tags.haml +3 -3
- data/app/views/admin/removed/_assets_bucket.html.haml +3 -3
- data/app/views/admin/removed/_assets_container.html.haml +18 -18
- data/app/views/admin/removed/_bucket.html.haml +1 -1
- data/app/views/admin/removed/_bucket_asset.html.haml +3 -3
- data/app/views/admin/removed/_show_bucket_link.html.haml +1 -1
- data/app/views/admin/removed/_upload_to_page.html.haml +5 -5
- data/app/views/admin/sites/_form.haml +18 -18
- data/app/views/admin/sites/edit.haml +1 -1
- data/app/views/admin/sites/index.haml +8 -4
- data/app/views/admin/sites/new.haml +1 -1
- data/app/views/admin/snippets/_choose_site.html.haml +4 -5
- data/app/views/admin/snippets/_form.html.haml +8 -9
- data/app/views/admin/snippets/edit.html.haml +1 -1
- data/app/views/admin/snippets/index.html.haml +11 -4
- data/app/views/admin/snippets/new.html.haml +1 -1
- data/app/views/admin/snippets/remove.html.haml +7 -6
- data/app/views/admin/users/_avatar.html.haml +2 -2
- data/app/views/admin/users/_choose_site.html.haml +3 -7
- data/app/views/admin/users/_form.html.haml +18 -21
- data/app/views/admin/users/_password_fields.html.haml +6 -6
- data/app/views/admin/users/index.html.haml +13 -6
- data/app/views/admin/users/remove.html.haml +4 -4
- data/app/views/admin/welcome/login.html.haml +8 -8
- data/app/views/devise/passwords/edit.html.haml +6 -6
- data/app/views/devise/passwords/new.html.haml +3 -3
- data/app/views/devise/sessions/new.html.haml +8 -8
- data/app/views/devise/shared/_links.html.haml +2 -2
- data/app/views/layouts/application.html.haml +24 -19
- data/app/views/rad_social_mailer/social_mail_form.html.haml +15 -17
- data/app/views/widget/_email_form.html.haml +13 -18
- data/app/views/widget/_horizontal_widget.html.haml +5 -5
- data/bin/rails +4 -4
- data/bin/trusty_cms +3 -5
- data/config.ru +1 -1
- data/config/application.rb +14 -15
- data/config/boot.rb +1 -2
- data/config/environment.rb +1 -1
- data/config/environments/production.rb +0 -1
- data/config/environments/test.rb +1 -2
- data/config/initializers/devise.rb +1 -1
- data/config/initializers/kraken.rb +2 -2
- data/config/initializers/tmp.rb +1 -1
- data/config/initializers/trusty_cms_config.rb +48 -48
- data/config/locales/en.yml +8 -8
- data/config/routes.rb +6 -7
- data/lib/active_record_extensions/active_record_extensions.rb +1 -2
- data/lib/annotatable.rb +3 -5
- data/lib/configuration_extensions/configuration_extensions.rb +1 -1
- data/lib/inheritable_class_attributes.rb +13 -9
- data/lib/login_system.rb +73 -73
- data/lib/method_observer.rb +13 -12
- data/lib/ostruct.rb +7 -10
- data/lib/simpleton.rb +0 -4
- data/lib/string_extensions/string_extensions.rb +3 -3
- data/lib/symbol_extensions/symbol_extensions.rb +1 -1
- data/lib/tasks/database.rake +28 -28
- data/lib/tasks/extensions.rake +18 -18
- data/lib/tasks/framework.rake +68 -68
- data/lib/tasks/radiant_config.rake +4 -4
- data/lib/tasks/snippets_extension_tasks.rake +11 -11
- data/lib/tasks/translate.rake +14 -14
- data/lib/tasks/upgrade_to_devise.rake +1 -1
- data/lib/translation_support.rb +22 -22
- data/lib/trusty_cms.rb +2 -2
- data/lib/trusty_cms/admin_ui.rb +19 -16
- data/lib/trusty_cms/admin_ui/region_partials.rb +4 -3
- data/lib/trusty_cms/admin_ui/region_set.rb +4 -5
- data/lib/trusty_cms/available_locales.rb +2 -4
- data/lib/trusty_cms/config/definition.rb +11 -8
- data/lib/trusty_cms/engine.rb +13 -14
- data/lib/trusty_cms/extension.rb +14 -16
- data/lib/trusty_cms/extension_loader.rb +6 -6
- data/lib/trusty_cms/extension_migrator.rb +42 -41
- data/lib/trusty_cms/extension_path.rb +20 -19
- data/lib/trusty_cms/initializer.rb +5 -8
- data/lib/trusty_cms/pagination/controller.rb +7 -10
- data/lib/trusty_cms/pagination/link_renderer.rb +2 -2
- data/lib/trusty_cms/resource_responses.rb +3 -3
- data/lib/trusty_cms/setup.rb +130 -132
- data/lib/trusty_cms/taggable.rb +19 -22
- data/lib/trusty_cms/task_support.rb +9 -6
- data/package.json +10 -2
- data/public/dispatch.fcgi +1 -1
- data/public/dispatch.rb +2 -2
- data/script/extension +1 -1
- data/script/rails +2 -2
- data/spec/dummy/package.json +1 -1
- data/spec/dummy/yarn.lock +3 -3
- data/trusty_cms.gemspec +25 -25
- data/vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb +1 -1
- data/yarn.lock +1992 -4
- metadata +54 -43
- data/app/assets/javascripts/rad_social/captcha.js +0 -42
- data/app/assets/stylesheets/admin/partials/_deprecated.scss +0 -65
- data/app/assets/stylesheets/admin/partials/_jquery-ui-structure.scss +0 -258
- data/app/assets/stylesheets/admin/partials/_jquery-ui-theme.scss +0 -410
- data/app/assets/stylesheets/admin/partials/_jquery-ui.scss +0 -650
- data/app/views/admin/assets/refresh.html.haml +0 -14
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: trusty-cms
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.
|
4
|
+
version: 4.1.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- TrustyCms CMS dev team
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-06-19 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: acts_as_list
|
@@ -181,7 +181,7 @@ dependencies:
|
|
181
181
|
- !ruby/object:Gem::Version
|
182
182
|
version: '0'
|
183
183
|
- !ruby/object:Gem::Dependency
|
184
|
-
name:
|
184
|
+
name: mini_racer
|
185
185
|
requirement: !ruby/object:Gem::Requirement
|
186
186
|
requirements:
|
187
187
|
- - ">="
|
@@ -195,7 +195,7 @@ dependencies:
|
|
195
195
|
- !ruby/object:Gem::Version
|
196
196
|
version: '0'
|
197
197
|
- !ruby/object:Gem::Dependency
|
198
|
-
name:
|
198
|
+
name: mysql2
|
199
199
|
requirement: !ruby/object:Gem::Requirement
|
200
200
|
requirements:
|
201
201
|
- - ">="
|
@@ -226,16 +226,22 @@ dependencies:
|
|
226
226
|
name: rack
|
227
227
|
requirement: !ruby/object:Gem::Requirement
|
228
228
|
requirements:
|
229
|
-
- - "
|
229
|
+
- - ">="
|
230
230
|
- !ruby/object:Gem::Version
|
231
231
|
version: 2.0.1
|
232
|
+
- - "<"
|
233
|
+
- !ruby/object:Gem::Version
|
234
|
+
version: 2.3.0
|
232
235
|
type: :runtime
|
233
236
|
prerelease: false
|
234
237
|
version_requirements: !ruby/object:Gem::Requirement
|
235
238
|
requirements:
|
236
|
-
- - "
|
239
|
+
- - ">="
|
237
240
|
- !ruby/object:Gem::Version
|
238
241
|
version: 2.0.1
|
242
|
+
- - "<"
|
243
|
+
- !ruby/object:Gem::Version
|
244
|
+
version: 2.3.0
|
239
245
|
- !ruby/object:Gem::Dependency
|
240
246
|
name: rack-cache
|
241
247
|
requirement: !ruby/object:Gem::Requirement
|
@@ -250,6 +256,20 @@ dependencies:
|
|
250
256
|
- - "~>"
|
251
257
|
- !ruby/object:Gem::Version
|
252
258
|
version: '1.7'
|
259
|
+
- !ruby/object:Gem::Dependency
|
260
|
+
name: radius
|
261
|
+
requirement: !ruby/object:Gem::Requirement
|
262
|
+
requirements:
|
263
|
+
- - "~>"
|
264
|
+
- !ruby/object:Gem::Version
|
265
|
+
version: '0.7'
|
266
|
+
type: :runtime
|
267
|
+
prerelease: false
|
268
|
+
version_requirements: !ruby/object:Gem::Requirement
|
269
|
+
requirements:
|
270
|
+
- - "~>"
|
271
|
+
- !ruby/object:Gem::Version
|
272
|
+
version: '0.7'
|
253
273
|
- !ruby/object:Gem::Dependency
|
254
274
|
name: rails
|
255
275
|
requirement: !ruby/object:Gem::Requirement
|
@@ -265,39 +285,39 @@ dependencies:
|
|
265
285
|
- !ruby/object:Gem::Version
|
266
286
|
version: '0'
|
267
287
|
- !ruby/object:Gem::Dependency
|
268
|
-
name:
|
288
|
+
name: rake
|
269
289
|
requirement: !ruby/object:Gem::Requirement
|
270
290
|
requirements:
|
271
|
-
- - ">="
|
272
|
-
- !ruby/object:Gem::Version
|
273
|
-
version: '5.1'
|
274
291
|
- - "<"
|
275
292
|
- !ruby/object:Gem::Version
|
276
|
-
version: '
|
293
|
+
version: '13.0'
|
277
294
|
type: :runtime
|
278
295
|
prerelease: false
|
279
296
|
version_requirements: !ruby/object:Gem::Requirement
|
280
297
|
requirements:
|
281
|
-
- - ">="
|
282
|
-
- !ruby/object:Gem::Version
|
283
|
-
version: '5.1'
|
284
298
|
- - "<"
|
285
299
|
- !ruby/object:Gem::Version
|
286
|
-
version: '
|
300
|
+
version: '13.0'
|
287
301
|
- !ruby/object:Gem::Dependency
|
288
|
-
name:
|
302
|
+
name: rdoc
|
289
303
|
requirement: !ruby/object:Gem::Requirement
|
290
304
|
requirements:
|
291
|
-
- - "
|
305
|
+
- - ">="
|
292
306
|
- !ruby/object:Gem::Version
|
293
|
-
version: '
|
307
|
+
version: '5.1'
|
308
|
+
- - "<"
|
309
|
+
- !ruby/object:Gem::Version
|
310
|
+
version: '7.0'
|
294
311
|
type: :runtime
|
295
312
|
prerelease: false
|
296
313
|
version_requirements: !ruby/object:Gem::Requirement
|
297
314
|
requirements:
|
298
|
-
- - "
|
315
|
+
- - ">="
|
299
316
|
- !ruby/object:Gem::Version
|
300
|
-
version: '
|
317
|
+
version: '5.1'
|
318
|
+
- - "<"
|
319
|
+
- !ruby/object:Gem::Version
|
320
|
+
version: '7.0'
|
301
321
|
- !ruby/object:Gem::Dependency
|
302
322
|
name: RedCloth
|
303
323
|
requirement: !ruby/object:Gem::Requirement
|
@@ -312,20 +332,6 @@ dependencies:
|
|
312
332
|
- - '='
|
313
333
|
- !ruby/object:Gem::Version
|
314
334
|
version: 4.3.2
|
315
|
-
- !ruby/object:Gem::Dependency
|
316
|
-
name: rake
|
317
|
-
requirement: !ruby/object:Gem::Requirement
|
318
|
-
requirements:
|
319
|
-
- - "<"
|
320
|
-
- !ruby/object:Gem::Version
|
321
|
-
version: '13.0'
|
322
|
-
type: :runtime
|
323
|
-
prerelease: false
|
324
|
-
version_requirements: !ruby/object:Gem::Requirement
|
325
|
-
requirements:
|
326
|
-
- - "<"
|
327
|
-
- !ruby/object:Gem::Version
|
328
|
-
version: '13.0'
|
329
335
|
- !ruby/object:Gem::Dependency
|
330
336
|
name: roadie-rails
|
331
337
|
requirement: !ruby/object:Gem::Requirement
|
@@ -378,16 +384,22 @@ dependencies:
|
|
378
384
|
name: tzinfo
|
379
385
|
requirement: !ruby/object:Gem::Requirement
|
380
386
|
requirements:
|
381
|
-
- - "
|
387
|
+
- - ">="
|
382
388
|
- !ruby/object:Gem::Version
|
383
389
|
version: 1.2.3
|
390
|
+
- - "<"
|
391
|
+
- !ruby/object:Gem::Version
|
392
|
+
version: 2.1.0
|
384
393
|
type: :runtime
|
385
394
|
prerelease: false
|
386
395
|
version_requirements: !ruby/object:Gem::Requirement
|
387
396
|
requirements:
|
388
|
-
- - "
|
397
|
+
- - ">="
|
389
398
|
- !ruby/object:Gem::Version
|
390
399
|
version: 1.2.3
|
400
|
+
- - "<"
|
401
|
+
- !ruby/object:Gem::Version
|
402
|
+
version: 2.1.0
|
391
403
|
- !ruby/object:Gem::Dependency
|
392
404
|
name: uglifier
|
393
405
|
requirement: !ruby/object:Gem::Requirement
|
@@ -594,7 +606,6 @@ files:
|
|
594
606
|
- app/assets/javascripts/admin/validations/user_validations.js
|
595
607
|
- app/assets/javascripts/ckeditor/config.js
|
596
608
|
- app/assets/javascripts/ckeditor/contents.css
|
597
|
-
- app/assets/javascripts/rad_social/captcha.js
|
598
609
|
- app/assets/javascripts/rad_social/jquery.validate.min.js
|
599
610
|
- app/assets/javascripts/rad_social/rad_ajax_form.js
|
600
611
|
- app/assets/javascripts/rad_social/rad_email.js
|
@@ -608,24 +619,25 @@ files:
|
|
608
619
|
- app/assets/stylesheets/admin/assets.scss
|
609
620
|
- app/assets/stylesheets/admin/main.scss
|
610
621
|
- app/assets/stylesheets/admin/modules/_boxes.scss
|
622
|
+
- app/assets/stylesheets/admin/modules/_buttons.scss
|
611
623
|
- app/assets/stylesheets/admin/modules/_links.scss
|
612
624
|
- app/assets/stylesheets/admin/partials/_actions.scss
|
613
625
|
- app/assets/stylesheets/admin/partials/_avatars.scss
|
614
626
|
- app/assets/stylesheets/admin/partials/_content.scss
|
615
627
|
- app/assets/stylesheets/admin/partials/_dateinput.scss
|
616
|
-
- app/assets/stylesheets/admin/partials/
|
628
|
+
- app/assets/stylesheets/admin/partials/_drawer.scss
|
617
629
|
- app/assets/stylesheets/admin/partials/_dropdown.scss
|
618
630
|
- app/assets/stylesheets/admin/partials/_footer.scss
|
619
631
|
- app/assets/stylesheets/admin/partials/_forms.scss
|
620
632
|
- app/assets/stylesheets/admin/partials/_header.scss
|
621
|
-
- app/assets/stylesheets/admin/partials/_index.scss
|
622
|
-
- app/assets/stylesheets/admin/partials/_jquery-ui-structure.scss
|
623
|
-
- app/assets/stylesheets/admin/partials/_jquery-ui-theme.scss
|
624
|
-
- app/assets/stylesheets/admin/partials/_jquery-ui.scss
|
625
633
|
- app/assets/stylesheets/admin/partials/_layout.scss
|
634
|
+
- app/assets/stylesheets/admin/partials/_login_form.scss
|
626
635
|
- app/assets/stylesheets/admin/partials/_messages.scss
|
627
636
|
- app/assets/stylesheets/admin/partials/_popup.scss
|
637
|
+
- app/assets/stylesheets/admin/partials/_preferences.scss
|
638
|
+
- app/assets/stylesheets/admin/partials/_sidebar.scss
|
628
639
|
- app/assets/stylesheets/admin/partials/_tabcontrol.scss
|
640
|
+
- app/assets/stylesheets/admin/partials/_table.scss
|
629
641
|
- app/assets/stylesheets/admin/partials/_toolbar.scss
|
630
642
|
- app/assets/stylesheets/admin/partials/_treetable.scss
|
631
643
|
- app/assets/stylesheets/admin/partials/_typography.scss
|
@@ -705,7 +717,6 @@ files:
|
|
705
717
|
- app/views/admin/assets/edit.html.haml
|
706
718
|
- app/views/admin/assets/index.html.haml
|
707
719
|
- app/views/admin/assets/new.html.haml
|
708
|
-
- app/views/admin/assets/refresh.html.haml
|
709
720
|
- app/views/admin/assets/remove.html.haml
|
710
721
|
- app/views/admin/configuration/_clipped_edit.html.haml
|
711
722
|
- app/views/admin/configuration/_clipped_show.html.haml
|
@@ -1,42 +0,0 @@
|
|
1
|
-
function Captcha(element) {
|
2
|
-
var self = this;
|
3
|
-
var challengeFieldSelector = "#recaptcha_challenge_field";
|
4
|
-
var responseFieldSelector = "#recaptcha_response_field";
|
5
|
-
|
6
|
-
self.challengeValue = function() {
|
7
|
-
return $(element).find(challengeFieldSelector).val();
|
8
|
-
};
|
9
|
-
|
10
|
-
self.responseValue = function() {
|
11
|
-
return $(element).find(responseFieldSelector).val();
|
12
|
-
};
|
13
|
-
|
14
|
-
self.visible = function() {
|
15
|
-
return ($(element).find("#recaptcha_area").length > 0);
|
16
|
-
};
|
17
|
-
|
18
|
-
self.requestData = function() {
|
19
|
-
requestHash = {};
|
20
|
-
if(this.visible()) {
|
21
|
-
$.extend(requestHash, {
|
22
|
-
'recaptcha_challenge_field': this.challengeValue(),
|
23
|
-
'recaptcha_response_field': this.responseValue()
|
24
|
-
});
|
25
|
-
}
|
26
|
-
return requestHash;
|
27
|
-
};
|
28
|
-
|
29
|
-
self.isValid = function() {
|
30
|
-
if(this.visible()) {
|
31
|
-
return this.responseValue().length > 0;
|
32
|
-
}
|
33
|
-
return true;
|
34
|
-
};
|
35
|
-
|
36
|
-
self.reload = function() {
|
37
|
-
if(Recaptcha) {
|
38
|
-
Recaptcha.reload();
|
39
|
-
}
|
40
|
-
};
|
41
|
-
|
42
|
-
}
|
@@ -1,65 +0,0 @@
|
|
1
|
-
// The styles here will be deprecated in a future version of TrustyCms, but
|
2
|
-
// will be maintained here for a time so that older extensions continue to
|
3
|
-
// look reasonable.
|
4
|
-
|
5
|
-
// Use for "empty" instead of "note"
|
6
|
-
table.index td.note {
|
7
|
-
color: silver;
|
8
|
-
font-size: 85%;
|
9
|
-
font-style: italic;
|
10
|
-
padding: 3em;
|
11
|
-
text-align: center;
|
12
|
-
}
|
13
|
-
|
14
|
-
// Use "set" instead of "row" on forms
|
15
|
-
.row {
|
16
|
-
clear: both;
|
17
|
-
margin-top: 20px;
|
18
|
-
width: 100%;
|
19
|
-
p {
|
20
|
-
float: left;
|
21
|
-
margin: 0 2em 1.25em 0;
|
22
|
-
font-size: 95%;
|
23
|
-
label {
|
24
|
-
display: inline;
|
25
|
-
text-shadow: #666666 1px 1px 0;
|
26
|
-
}
|
27
|
-
}
|
28
|
-
}
|
29
|
-
|
30
|
-
// Use a div with a class of "popup_title" instead of an h3 with a class of "title"
|
31
|
-
div.popup h3.title {
|
32
|
-
background: #c5dff5;
|
33
|
-
background-image: linear-gradient(to bottom, #e5f5ff, #c5dff5);
|
34
|
-
border-bottom: 1px solid #a7cdf0;
|
35
|
-
font-size: 100%;
|
36
|
-
margin: -10px -20px 20px -20px;
|
37
|
-
padding: 6px 10px;
|
38
|
-
}
|
39
|
-
|
40
|
-
// Reuse this style instead by applying the "action_button" class
|
41
|
-
#actions {
|
42
|
-
a {
|
43
|
-
background: #d8d8d8;
|
44
|
-
background-image: linear-gradient(to bottom, #ffffff, #cccccc);
|
45
|
-
color: #333333;
|
46
|
-
font-size: 80%;
|
47
|
-
padding: 8px 12px;
|
48
|
-
text-decoration: none;
|
49
|
-
text-shadow: 1px 1px 1px #eeeeee;
|
50
|
-
border-radius: 5px;
|
51
|
-
@include button-shadow;
|
52
|
-
&:hover {
|
53
|
-
color: #0076a3;
|
54
|
-
text-shadow: 1px 1px 1px white;
|
55
|
-
}
|
56
|
-
&:active {
|
57
|
-
background: white;
|
58
|
-
@include no-button-shadow;
|
59
|
-
color: black;
|
60
|
-
}
|
61
|
-
img {
|
62
|
-
vertical-align: -20%;
|
63
|
-
}
|
64
|
-
}
|
65
|
-
}
|
@@ -1,258 +0,0 @@
|
|
1
|
-
/*!
|
2
|
-
* jQuery UI CSS Framework 1.11.0
|
3
|
-
* http://jqueryui.com
|
4
|
-
*
|
5
|
-
* Copyright 2014 jQuery Foundation and other contributors
|
6
|
-
* Released under the MIT license.
|
7
|
-
* http://jquery.org/license
|
8
|
-
*
|
9
|
-
* http://api.jqueryui.com/category/theming/
|
10
|
-
*/
|
11
|
-
|
12
|
-
/* Layout helpers
|
13
|
-
----------------------------------*/
|
14
|
-
.ui-helper-hidden {
|
15
|
-
display: none;
|
16
|
-
}
|
17
|
-
.ui-helper-hidden-accessible {
|
18
|
-
border: 0;
|
19
|
-
clip: rect(0 0 0 0);
|
20
|
-
height: 1px;
|
21
|
-
margin: -1px;
|
22
|
-
overflow: hidden;
|
23
|
-
padding: 0;
|
24
|
-
position: absolute;
|
25
|
-
width: 1px;
|
26
|
-
}
|
27
|
-
.ui-helper-reset {
|
28
|
-
margin: 0;
|
29
|
-
padding: 0;
|
30
|
-
border: 0;
|
31
|
-
outline: 0;
|
32
|
-
line-height: 1.3;
|
33
|
-
text-decoration: none;
|
34
|
-
font-size: 100%;
|
35
|
-
list-style: none;
|
36
|
-
}
|
37
|
-
.ui-helper-clearfix:before,
|
38
|
-
.ui-helper-clearfix:after {
|
39
|
-
content: "";
|
40
|
-
display: table;
|
41
|
-
border-collapse: collapse;
|
42
|
-
}
|
43
|
-
.ui-helper-clearfix:after {
|
44
|
-
clear: both;
|
45
|
-
}
|
46
|
-
.ui-helper-clearfix {
|
47
|
-
min-height: 0; /* support: IE7 */
|
48
|
-
}
|
49
|
-
.ui-helper-zfix {
|
50
|
-
width: 100%;
|
51
|
-
height: 100%;
|
52
|
-
top: 0;
|
53
|
-
left: 0;
|
54
|
-
position: absolute;
|
55
|
-
opacity: 0;
|
56
|
-
filter:Alpha(Opacity=0);
|
57
|
-
}
|
58
|
-
|
59
|
-
.ui-front {
|
60
|
-
z-index: 100;
|
61
|
-
}
|
62
|
-
|
63
|
-
|
64
|
-
/* Interaction Cues
|
65
|
-
----------------------------------*/
|
66
|
-
.ui-state-disabled {
|
67
|
-
cursor: default !important;
|
68
|
-
}
|
69
|
-
|
70
|
-
|
71
|
-
/* Icons
|
72
|
-
----------------------------------*/
|
73
|
-
|
74
|
-
/* states and images */
|
75
|
-
.ui-icon {
|
76
|
-
display: block;
|
77
|
-
text-indent: -99999px;
|
78
|
-
overflow: hidden;
|
79
|
-
background-repeat: no-repeat;
|
80
|
-
}
|
81
|
-
|
82
|
-
|
83
|
-
/* Misc visuals
|
84
|
-
----------------------------------*/
|
85
|
-
|
86
|
-
/* Overlays */
|
87
|
-
.ui-widget-overlay {
|
88
|
-
position: fixed;
|
89
|
-
top: 0;
|
90
|
-
left: 0;
|
91
|
-
width: 100%;
|
92
|
-
height: 100%;
|
93
|
-
}
|
94
|
-
.ui-datepicker {
|
95
|
-
width: 17em;
|
96
|
-
padding: .2em .2em 0;
|
97
|
-
display: none;
|
98
|
-
}
|
99
|
-
.ui-datepicker .ui-datepicker-header {
|
100
|
-
position: relative;
|
101
|
-
padding: .2em 0;
|
102
|
-
}
|
103
|
-
.ui-datepicker .ui-datepicker-prev,
|
104
|
-
.ui-datepicker .ui-datepicker-next {
|
105
|
-
position: absolute;
|
106
|
-
top: 2px;
|
107
|
-
width: 1.8em;
|
108
|
-
height: 1.8em;
|
109
|
-
}
|
110
|
-
.ui-datepicker .ui-datepicker-prev-hover,
|
111
|
-
.ui-datepicker .ui-datepicker-next-hover {
|
112
|
-
top: 1px;
|
113
|
-
}
|
114
|
-
.ui-datepicker .ui-datepicker-prev {
|
115
|
-
left: 2px;
|
116
|
-
}
|
117
|
-
.ui-datepicker .ui-datepicker-next {
|
118
|
-
right: 2px;
|
119
|
-
}
|
120
|
-
.ui-datepicker .ui-datepicker-prev-hover {
|
121
|
-
left: 1px;
|
122
|
-
}
|
123
|
-
.ui-datepicker .ui-datepicker-next-hover {
|
124
|
-
right: 1px;
|
125
|
-
}
|
126
|
-
.ui-datepicker .ui-datepicker-prev span,
|
127
|
-
.ui-datepicker .ui-datepicker-next span {
|
128
|
-
display: block;
|
129
|
-
position: absolute;
|
130
|
-
left: 50%;
|
131
|
-
margin-left: -8px;
|
132
|
-
top: 50%;
|
133
|
-
margin-top: -8px;
|
134
|
-
}
|
135
|
-
.ui-datepicker .ui-datepicker-title {
|
136
|
-
margin: 0 2.3em;
|
137
|
-
line-height: 1.8em;
|
138
|
-
text-align: center;
|
139
|
-
}
|
140
|
-
.ui-datepicker .ui-datepicker-title select {
|
141
|
-
font-size: 1em;
|
142
|
-
margin: 1px 0;
|
143
|
-
}
|
144
|
-
.ui-datepicker select.ui-datepicker-month,
|
145
|
-
.ui-datepicker select.ui-datepicker-year {
|
146
|
-
width: 49%;
|
147
|
-
}
|
148
|
-
.ui-datepicker table {
|
149
|
-
width: 100%;
|
150
|
-
font-size: .9em;
|
151
|
-
border-collapse: collapse;
|
152
|
-
margin: 0 0 .4em;
|
153
|
-
}
|
154
|
-
.ui-datepicker th {
|
155
|
-
padding: .7em .3em;
|
156
|
-
text-align: center;
|
157
|
-
font-weight: bold;
|
158
|
-
border: 0;
|
159
|
-
}
|
160
|
-
.ui-datepicker td {
|
161
|
-
border: 0;
|
162
|
-
padding: 1px;
|
163
|
-
}
|
164
|
-
.ui-datepicker td span,
|
165
|
-
.ui-datepicker td a {
|
166
|
-
display: block;
|
167
|
-
padding: .2em;
|
168
|
-
text-align: right;
|
169
|
-
text-decoration: none;
|
170
|
-
}
|
171
|
-
.ui-datepicker .ui-datepicker-buttonpane {
|
172
|
-
background-image: none;
|
173
|
-
margin: .7em 0 0 0;
|
174
|
-
padding: 0 .2em;
|
175
|
-
border-left: 0;
|
176
|
-
border-right: 0;
|
177
|
-
border-bottom: 0;
|
178
|
-
}
|
179
|
-
.ui-datepicker .ui-datepicker-buttonpane button {
|
180
|
-
float: right;
|
181
|
-
margin: .5em .2em .4em;
|
182
|
-
cursor: pointer;
|
183
|
-
padding: .2em .6em .3em .6em;
|
184
|
-
width: auto;
|
185
|
-
overflow: visible;
|
186
|
-
}
|
187
|
-
.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current {
|
188
|
-
float: left;
|
189
|
-
}
|
190
|
-
|
191
|
-
/* with multiple calendars */
|
192
|
-
.ui-datepicker.ui-datepicker-multi {
|
193
|
-
width: auto;
|
194
|
-
}
|
195
|
-
.ui-datepicker-multi .ui-datepicker-group {
|
196
|
-
float: left;
|
197
|
-
}
|
198
|
-
.ui-datepicker-multi .ui-datepicker-group table {
|
199
|
-
width: 95%;
|
200
|
-
margin: 0 auto .4em;
|
201
|
-
}
|
202
|
-
.ui-datepicker-multi-2 .ui-datepicker-group {
|
203
|
-
width: 50%;
|
204
|
-
}
|
205
|
-
.ui-datepicker-multi-3 .ui-datepicker-group {
|
206
|
-
width: 33.3%;
|
207
|
-
}
|
208
|
-
.ui-datepicker-multi-4 .ui-datepicker-group {
|
209
|
-
width: 25%;
|
210
|
-
}
|
211
|
-
.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,
|
212
|
-
.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header {
|
213
|
-
border-left-width: 0;
|
214
|
-
}
|
215
|
-
.ui-datepicker-multi .ui-datepicker-buttonpane {
|
216
|
-
clear: left;
|
217
|
-
}
|
218
|
-
.ui-datepicker-row-break {
|
219
|
-
clear: both;
|
220
|
-
width: 100%;
|
221
|
-
font-size: 0;
|
222
|
-
}
|
223
|
-
|
224
|
-
/* RTL support */
|
225
|
-
.ui-datepicker-rtl {
|
226
|
-
direction: rtl;
|
227
|
-
}
|
228
|
-
.ui-datepicker-rtl .ui-datepicker-prev {
|
229
|
-
right: 2px;
|
230
|
-
left: auto;
|
231
|
-
}
|
232
|
-
.ui-datepicker-rtl .ui-datepicker-next {
|
233
|
-
left: 2px;
|
234
|
-
right: auto;
|
235
|
-
}
|
236
|
-
.ui-datepicker-rtl .ui-datepicker-prev:hover {
|
237
|
-
right: 1px;
|
238
|
-
left: auto;
|
239
|
-
}
|
240
|
-
.ui-datepicker-rtl .ui-datepicker-next:hover {
|
241
|
-
left: 1px;
|
242
|
-
right: auto;
|
243
|
-
}
|
244
|
-
.ui-datepicker-rtl .ui-datepicker-buttonpane {
|
245
|
-
clear: right;
|
246
|
-
}
|
247
|
-
.ui-datepicker-rtl .ui-datepicker-buttonpane button {
|
248
|
-
float: left;
|
249
|
-
}
|
250
|
-
.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,
|
251
|
-
.ui-datepicker-rtl .ui-datepicker-group {
|
252
|
-
float: right;
|
253
|
-
}
|
254
|
-
.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,
|
255
|
-
.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header {
|
256
|
-
border-right-width: 0;
|
257
|
-
border-left-width: 1px;
|
258
|
-
}
|