lalala 4.0.0.dev.416 → 4.1.0.dev.299
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -1
- data/Gemfile +1 -3
- data/Haraway.md +14 -0
- data/app/assets/javascripts/lalala/base.js +8 -0
- data/app/assets/javascripts/lalala/initializers/chosen.module.js +3 -0
- data/app/assets/javascripts/lalala/initializers/haraway.module.js +8 -0
- data/app/assets/javascripts/lalala/lib/overlay.js +335 -0
- data/app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js +26 -33
- data/app/assets/javascripts/lalala/modules/editor.module.js +37 -23
- data/app/assets/javascripts/lalala/modules/file-uploader-metadata.module.js +248 -0
- data/app/assets/javascripts/lalala/modules/file-uploader.module.js +376 -0
- data/app/assets/javascripts/lalala/modules/init.module.js +1 -5
- data/app/assets/javascripts/lalala/modules/media_selector.module.js +250 -0
- data/app/assets/javascripts/lalala/modules/overlay.module.js +33 -0
- data/app/assets/stylesheets/lalala/_base.css.scss +5 -2
- data/app/assets/stylesheets/lalala/components/_buttons.css.scss +11 -3
- data/app/assets/stylesheets/lalala/components/_forms.css.scss +14 -64
- data/app/assets/stylesheets/lalala/lib/_overlay.css.scss +66 -0
- data/app/assets/stylesheets/lalala/modules/_dashboard.css.scss +10 -51
- data/app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss +1 -17
- data/app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss +118 -0
- data/app/assets/stylesheets/lalala/modules/_file-uploader.css.scss +289 -0
- data/app/assets/stylesheets/lalala/modules/_media-selector.css.scss +113 -0
- data/app/assets/stylesheets/lalala/modules/_title-bar.css.scss +0 -17
- data/app/controllers/lalala/public/errors_controller.rb +7 -0
- data/app/models/lalala/page.rb +0 -1
- data/app/views/lalala/markdown/cheatsheet.html.erb +0 -2
- data/config/routes.rb +12 -1
- data/lalala-assets.gemspec +3 -3
- data/lalala-development.gemspec +1 -1
- data/lalala-test.gemspec +1 -1
- data/lalala.gemspec +4 -5
- data/lib/formtastic/form_builder_ext.rb +10 -0
- data/lib/formtastic/inputs/haraway_input.rb +151 -0
- data/lib/generators/lalala/assets/templates/bower.json.erb +1 -1
- data/lib/generators/lalala/install/install_generator.rb +0 -23
- data/lib/lalala/admin/pages.rb +1 -26
- data/lib/lalala/engine.rb +0 -7
- data/lib/lalala/ext_action_dispatch.rb +0 -1
- data/lib/lalala/ext_active_record/i18n_translations_writer.rb +0 -1
- data/lib/lalala/ext_active_record.rb +0 -1
- data/lib/lalala/ext_i18n/input_helper.rb +0 -1
- data/lib/lalala/ext_i18n/negotiation_adapter.rb +0 -4
- data/lib/lalala/ext_i18n/test_negotiation_adapter.rb +0 -4
- data/lib/lalala/ext_rack/i18n_negotiator.rb +7 -9
- data/lib/lalala/markdown/handlers/asset.rb +24 -0
- data/lib/lalala/markdown/handlers/youtube.rb +9 -13
- data/lib/lalala/markdown/html_renderer.rb +2 -2
- data/lib/lalala/markdown.rb +2 -3
- data/lib/lalala/utils/install_template.rb +3 -9
- data/lib/lalala/version.rb +2 -2
- data/lib/lalala.rb +6 -7
- data/script/ci +33 -30
- data/test/dummy/app/admin/articles.rb +26 -12
- data/test/dummy/app/admin/dashboard.rb +5 -8
- data/test/dummy/app/admin/tags.rb +1 -3
- data/test/dummy/app/assets/stylesheets/_normalize.css +423 -0
- data/test/dummy/app/assets/stylesheets/application.css.scss +2 -0
- data/test/dummy/app/assets/stylesheets/base/_base.css.scss +4 -0
- data/test/dummy/app/controllers/pages_controller.rb +4 -0
- data/test/dummy/app/models/article.rb +10 -4
- data/test/dummy/app/pages/application_page.rb +7 -2
- data/test/dummy/app/pages/basic_page.rb +5 -6
- data/test/dummy/app/pages/home_page.rb +10 -10
- data/test/dummy/app/pages/media_page.rb +23 -0
- data/test/dummy/app/views/admin/_stats.html.erb +7 -14
- data/test/dummy/app/views/layouts/application.html.erb +6 -2
- data/test/dummy/app/views/pages/media.html.erb +3 -0
- data/test/dummy/config/initializers/haraway.rb +29 -0
- data/test/dummy/config/routes.rb +1 -0
- data/test/dummy/db/migrate/20130528092721_create_articles.rb +1 -0
- data/test/dummy/db/migrate/20130729125648_create_home_page.rb +4 -0
- data/test/dummy/db/migrate/20131122144302_enable_haraway.rb +16 -0
- data/test/dummy/db/migrate/20140228141749_create_media_page.rb +8 -0
- data/test/dummy/db/schema.rb +2 -4
- data/test/integration/aricles_test.rb +0 -1
- metadata +59 -81
- data/app/assets/javascripts/jquery-ui/sortable.js +0 -0
- data/app/assets/javascripts/lalala/lib/jquery-ui.js +0 -16617
- data/app/assets/javascripts/lalala/modules/grid.module.js +0 -284
- data/app/assets/javascripts/lalala/modules/input_group.module.js +0 -36
- data/app/assets/stylesheets/lalala/modules/_grid.css.scss +0 -197
- data/app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss +0 -89
- data/app/models/lalala/abstract_asset.rb +0 -24
- data/app/models/lalala/file_asset.rb +0 -3
- data/app/models/lalala/image_asset.rb +0 -3
- data/config/initializers/carrierwave.rb +0 -34
- data/lib/formtastic/inputs/grid_input.rb +0 -159
- data/lib/formtastic/inputs/single_file_input.rb +0 -44
- data/lib/generators/lalala/install/templates/application.html.erb +0 -64
- data/lib/generators/lalala/install/templates/helpers/application_helper.rb +0 -16
- data/lib/generators/lalala/install/templates/helpers/html_helper.rb +0 -60
- data/lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb +0 -92
- data/lib/generators/lalala/install/templates/helpers/pages_helper.rb +0 -15
- data/lib/generators/lalala/install/templates/locales/en.yml +0 -6
- data/lib/generators/lalala/install/templates/uploaders/file_uploader.rb +0 -2
- data/lib/generators/lalala/install/templates/uploaders/image_uploader.rb +0 -11
- data/lib/lalala/ext_action_dispatch/multi_file_upload.rb +0 -55
- data/lib/lalala/ext_active_record/assets.rb +0 -25
- data/lib/lalala/markdown/handlers/soundcloud.rb +0 -36
- data/lib/lalala/markdown/handlers/vimeo.rb +0 -40
- data/lib/lalala/uploaders/file.rb +0 -50
- data/lib/lalala/uploaders/image.rb +0 -13
- data/lib/lalala/uploaders.rb +0 -6
- data/test/dummy/app/assets/stylesheets/application.css +0 -13
- data/test/dummy/app/models/file_asset.rb +0 -2
- data/test/dummy/app/models/image_asset.rb +0 -2
- data/test/dummy/app/uploaders/file_uploader.rb +0 -2
- data/test/dummy/app/uploaders/image_uploader.rb +0 -11
- data/test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb +0 -6
data/lib/lalala/uploaders.rb
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* This is a manifest file that'll be compiled into application.css, which will include all the files
|
|
3
|
-
* listed below.
|
|
4
|
-
*
|
|
5
|
-
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
|
|
6
|
-
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
|
|
7
|
-
*
|
|
8
|
-
* You're free to add application-wide styles to this file and they'll appear at the top of the
|
|
9
|
-
* compiled file, but it's generally better to create a new file per style scope.
|
|
10
|
-
*
|
|
11
|
-
*= require_self
|
|
12
|
-
*= require_tree .
|
|
13
|
-
*/
|