lalala 4.0.0.dev.416 → 4.1.0.dev.299

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.
Files changed (111) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/Gemfile +1 -3
  4. data/Haraway.md +14 -0
  5. data/app/assets/javascripts/lalala/base.js +8 -0
  6. data/app/assets/javascripts/lalala/initializers/chosen.module.js +3 -0
  7. data/app/assets/javascripts/lalala/initializers/haraway.module.js +8 -0
  8. data/app/assets/javascripts/lalala/lib/overlay.js +335 -0
  9. data/app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js +26 -33
  10. data/app/assets/javascripts/lalala/modules/editor.module.js +37 -23
  11. data/app/assets/javascripts/lalala/modules/file-uploader-metadata.module.js +248 -0
  12. data/app/assets/javascripts/lalala/modules/file-uploader.module.js +376 -0
  13. data/app/assets/javascripts/lalala/modules/init.module.js +1 -5
  14. data/app/assets/javascripts/lalala/modules/media_selector.module.js +250 -0
  15. data/app/assets/javascripts/lalala/modules/overlay.module.js +33 -0
  16. data/app/assets/stylesheets/lalala/_base.css.scss +5 -2
  17. data/app/assets/stylesheets/lalala/components/_buttons.css.scss +11 -3
  18. data/app/assets/stylesheets/lalala/components/_forms.css.scss +14 -64
  19. data/app/assets/stylesheets/lalala/lib/_overlay.css.scss +66 -0
  20. data/app/assets/stylesheets/lalala/modules/_dashboard.css.scss +10 -51
  21. data/app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss +1 -17
  22. data/app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss +118 -0
  23. data/app/assets/stylesheets/lalala/modules/_file-uploader.css.scss +289 -0
  24. data/app/assets/stylesheets/lalala/modules/_media-selector.css.scss +113 -0
  25. data/app/assets/stylesheets/lalala/modules/_title-bar.css.scss +0 -17
  26. data/app/controllers/lalala/public/errors_controller.rb +7 -0
  27. data/app/models/lalala/page.rb +0 -1
  28. data/app/views/lalala/markdown/cheatsheet.html.erb +0 -2
  29. data/config/routes.rb +12 -1
  30. data/lalala-assets.gemspec +3 -3
  31. data/lalala-development.gemspec +1 -1
  32. data/lalala-test.gemspec +1 -1
  33. data/lalala.gemspec +4 -5
  34. data/lib/formtastic/form_builder_ext.rb +10 -0
  35. data/lib/formtastic/inputs/haraway_input.rb +151 -0
  36. data/lib/generators/lalala/assets/templates/bower.json.erb +1 -1
  37. data/lib/generators/lalala/install/install_generator.rb +0 -23
  38. data/lib/lalala/admin/pages.rb +1 -26
  39. data/lib/lalala/engine.rb +0 -7
  40. data/lib/lalala/ext_action_dispatch.rb +0 -1
  41. data/lib/lalala/ext_active_record/i18n_translations_writer.rb +0 -1
  42. data/lib/lalala/ext_active_record.rb +0 -1
  43. data/lib/lalala/ext_i18n/input_helper.rb +0 -1
  44. data/lib/lalala/ext_i18n/negotiation_adapter.rb +0 -4
  45. data/lib/lalala/ext_i18n/test_negotiation_adapter.rb +0 -4
  46. data/lib/lalala/ext_rack/i18n_negotiator.rb +7 -9
  47. data/lib/lalala/markdown/handlers/asset.rb +24 -0
  48. data/lib/lalala/markdown/handlers/youtube.rb +9 -13
  49. data/lib/lalala/markdown/html_renderer.rb +2 -2
  50. data/lib/lalala/markdown.rb +2 -3
  51. data/lib/lalala/utils/install_template.rb +3 -9
  52. data/lib/lalala/version.rb +2 -2
  53. data/lib/lalala.rb +6 -7
  54. data/script/ci +33 -30
  55. data/test/dummy/app/admin/articles.rb +26 -12
  56. data/test/dummy/app/admin/dashboard.rb +5 -8
  57. data/test/dummy/app/admin/tags.rb +1 -3
  58. data/test/dummy/app/assets/stylesheets/_normalize.css +423 -0
  59. data/test/dummy/app/assets/stylesheets/application.css.scss +2 -0
  60. data/test/dummy/app/assets/stylesheets/base/_base.css.scss +4 -0
  61. data/test/dummy/app/controllers/pages_controller.rb +4 -0
  62. data/test/dummy/app/models/article.rb +10 -4
  63. data/test/dummy/app/pages/application_page.rb +7 -2
  64. data/test/dummy/app/pages/basic_page.rb +5 -6
  65. data/test/dummy/app/pages/home_page.rb +10 -10
  66. data/test/dummy/app/pages/media_page.rb +23 -0
  67. data/test/dummy/app/views/admin/_stats.html.erb +7 -14
  68. data/test/dummy/app/views/layouts/application.html.erb +6 -2
  69. data/test/dummy/app/views/pages/media.html.erb +3 -0
  70. data/test/dummy/config/initializers/haraway.rb +29 -0
  71. data/test/dummy/config/routes.rb +1 -0
  72. data/test/dummy/db/migrate/20130528092721_create_articles.rb +1 -0
  73. data/test/dummy/db/migrate/20130729125648_create_home_page.rb +4 -0
  74. data/test/dummy/db/migrate/20131122144302_enable_haraway.rb +16 -0
  75. data/test/dummy/db/migrate/20140228141749_create_media_page.rb +8 -0
  76. data/test/dummy/db/schema.rb +2 -4
  77. data/test/integration/aricles_test.rb +0 -1
  78. metadata +59 -81
  79. data/app/assets/javascripts/jquery-ui/sortable.js +0 -0
  80. data/app/assets/javascripts/lalala/lib/jquery-ui.js +0 -16617
  81. data/app/assets/javascripts/lalala/modules/grid.module.js +0 -284
  82. data/app/assets/javascripts/lalala/modules/input_group.module.js +0 -36
  83. data/app/assets/stylesheets/lalala/modules/_grid.css.scss +0 -197
  84. data/app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss +0 -89
  85. data/app/models/lalala/abstract_asset.rb +0 -24
  86. data/app/models/lalala/file_asset.rb +0 -3
  87. data/app/models/lalala/image_asset.rb +0 -3
  88. data/config/initializers/carrierwave.rb +0 -34
  89. data/lib/formtastic/inputs/grid_input.rb +0 -159
  90. data/lib/formtastic/inputs/single_file_input.rb +0 -44
  91. data/lib/generators/lalala/install/templates/application.html.erb +0 -64
  92. data/lib/generators/lalala/install/templates/helpers/application_helper.rb +0 -16
  93. data/lib/generators/lalala/install/templates/helpers/html_helper.rb +0 -60
  94. data/lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb +0 -92
  95. data/lib/generators/lalala/install/templates/helpers/pages_helper.rb +0 -15
  96. data/lib/generators/lalala/install/templates/locales/en.yml +0 -6
  97. data/lib/generators/lalala/install/templates/uploaders/file_uploader.rb +0 -2
  98. data/lib/generators/lalala/install/templates/uploaders/image_uploader.rb +0 -11
  99. data/lib/lalala/ext_action_dispatch/multi_file_upload.rb +0 -55
  100. data/lib/lalala/ext_active_record/assets.rb +0 -25
  101. data/lib/lalala/markdown/handlers/soundcloud.rb +0 -36
  102. data/lib/lalala/markdown/handlers/vimeo.rb +0 -40
  103. data/lib/lalala/uploaders/file.rb +0 -50
  104. data/lib/lalala/uploaders/image.rb +0 -13
  105. data/lib/lalala/uploaders.rb +0 -6
  106. data/test/dummy/app/assets/stylesheets/application.css +0 -13
  107. data/test/dummy/app/models/file_asset.rb +0 -2
  108. data/test/dummy/app/models/image_asset.rb +0 -2
  109. data/test/dummy/app/uploaders/file_uploader.rb +0 -2
  110. data/test/dummy/app/uploaders/image_uploader.rb +0 -11
  111. data/test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb +0 -6
data/test/dummy/app/views/admin/_stats.html.erb CHANGED
@@ -6,27 +6,20 @@
6
6
  @user_total = Lalala::AdminUser::all.count
7
7
 
8
8
  # fill array
9
- @values << ["page",@page_total, nil]
10
- @values << ["post",@post_total, "/lalala/articles/new"]
11
- @values << ["file",@assets_total, nil]
12
- @values << ["user",@user_total, "/lalala/admin_users/new"]
9
+ @values << ["pages",@page_total]
10
+ @values << ["posts",@post_total]
11
+ @values << ["files",@assets_total]
12
+ @values << ["user(s)",@user_total]
13
13
 
14
14
  %>
15
15
  <div class="mod-dashboard">
16
16
 
17
17
  <div class="stats count_<%= @values.length %>">
18
18
  <ul>
19
- <% @values.each do |title,val,link| %>
19
+ <% @values.each do |title,val| %>
20
20
  <li>
21
- <div class="default">
22
- <p class="val"><%= val %></p>
23
- <p class="title"><%= title.pluralize %></p>
24
- </div>
25
- <% unless link.nil? %>
26
- <div class="hover">
27
- <a href="<%= link %>" class="button">New <%= title %></a>
28
- </div>
29
- <% end %>
21
+ <p class="val"><%= val %></p>
22
+ <p class="title"><%= title %></p>
30
23
  </li>
31
24
  <% end %>
32
25
  </ul>
data/test/dummy/app/views/layouts/application.html.erb CHANGED
@@ -1,14 +1,18 @@
1
1
  <!DOCTYPE html>
2
2
  <html>
3
3
  <head>
4
+ <meta charset="utf-8">
5
+
4
6
  <title>Dummy</title>
5
- <%= stylesheet_link_tag "application", :media => "all" %>
6
- <%= javascript_include_tag "application" %>
7
+
8
+ <%= stylesheet_link_tag "application" %>
7
9
  <%= csrf_meta_tags %>
8
10
  </head>
9
11
  <body>
10
12
 
13
+
11
14
  <%= yield %>
12
15
 
16
+
13
17
  </body>
14
18
  </html>
data/test/dummy/app/views/pages/media.html.erb ADDED
@@ -0,0 +1,3 @@
1
+ <h1><%= @page.title %></h1>
2
+
3
+ <%= @page.body_html %>
data/test/dummy/config/initializers/haraway.rb ADDED
@@ -0,0 +1,29 @@
1
+ Haraway.configure do |c|
2
+
3
+ c.use_ssl = false
4
+ c.endpoint = "assets.sh"
5
+ c.access_key = "533019cfa622e91c"
6
+ c.secret_key = "74bc88e1a0ab978b88d0c2a4b919f13ebe4a681a8f3a89e812182d09282d26a4"
7
+
8
+ #
9
+ # Profiles
10
+ #
11
+ c.profile("images") do |p|
12
+ p.accept "image/*"
13
+
14
+ p.version("thumb") do |v|
15
+ v.resize_to_fill(158, 110)
16
+ end
17
+
18
+ p.version("cover") do |v|
19
+ v.resize_to_fill(220, 153)
20
+ end
21
+
22
+ p.version("aspect_16-9") do |v|
23
+ v.resize_to_fill(700, 393)
24
+ end
25
+ end
26
+
27
+ c.profile("downloads")
28
+
29
+ end
data/test/dummy/config/routes.rb CHANGED
@@ -1,3 +1,4 @@
1
1
  Dummy::Application.routes.draw do
2
+ pages :media, to: 'pages#media'
2
3
  pages :application, to: 'pages#show'
3
4
  end
data/test/dummy/db/migrate/20130528092721_create_articles.rb CHANGED
@@ -3,6 +3,7 @@ class CreateArticles < ActiveRecord::Migration
3
3
  create_table :articles do |t|
4
4
  t.string :title
5
5
  t.text :body
6
+ t.text :haraway_metadata
6
7
 
7
8
  t.timestamps
8
9
  end
data/test/dummy/db/migrate/20130729125648_create_home_page.rb CHANGED
@@ -1,5 +1,9 @@
1
1
  class CreateHomePage < ActiveRecord::Migration
2
2
  def up
3
+ unless column_exists?(:pages, :haraway_metadata)
4
+ add_column(:pages, :haraway_metadata, :text)
5
+ end
6
+
3
7
  HomePage.create!
4
8
  end
5
9
 
data/test/dummy/db/migrate/20131122144302_enable_haraway.rb ADDED
@@ -0,0 +1,16 @@
1
+ class EnableHaraway < ActiveRecord::Migration
2
+ def up
3
+ unless column_exists?(:articles, :haraway_metadata)
4
+ add_column(:articles, :haraway_metadata, :text)
5
+ end
6
+
7
+ unless column_exists?(:pages, :haraway_metadata)
8
+ add_column(:pages, :haraway_metadata, :text)
9
+ end
10
+ end
11
+
12
+ def down
13
+ remove_column :articles, :haraway_metadata
14
+ remove_column :pages, :haraway_metadata
15
+ end
16
+ end
data/test/dummy/db/migrate/20140228141749_create_media_page.rb ADDED
@@ -0,0 +1,8 @@
1
+ class CreateMediaPage < ActiveRecord::Migration
2
+ def up
3
+ HomePage.first!.save
4
+ end
5
+
6
+ def down
7
+ end
8
+ end
data/test/dummy/db/schema.rb CHANGED
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20140926152646) do
14
+ ActiveRecord::Schema.define(:version => 20140228141749) do
15
15
 
16
16
  create_table "active_admin_comments", :force => true do |t|
17
17
  t.string "resource_id", :null => false
@@ -60,12 +60,10 @@ ActiveRecord::Schema.define(:version => 20140926152646) do
60
60
  add_index "article_translations", ["locale"], :name => "index_article_translations_on_locale"
61
61
 
62
62
  create_table "articles", :force => true do |t|
63
+ t.text "haraway_metadata"
63
64
  t.datetime "created_at", :null => false
64
65
  t.datetime "updated_at", :null => false
65
66
  t.string "category"
66
- t.text "haraway_metadata"
67
- t.string "url"
68
- t.string "price"
69
67
  end
70
68
 
71
69
  create_table "articles_tags", :id => false, :force => true do |t|
data/test/integration/aricles_test.rb CHANGED
@@ -20,7 +20,6 @@ class ArticlesTest < ActionDispatch::IntegrationTest
20
20
  assert_equal('/lalala/articles/new', current_path)
21
21
 
22
22
  first('input[name="article[translations_writer][en][title]"]').set('My Article')
23
- attach_file('Image', File.expand_path('../../fixtures/files/image.png', __FILE__))
24
23
  click_on('Create Article')
25
24
  page.save_page
26
25
  assert_equal 200, page.status_code
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lalala
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.0.dev.416
4
+ version: 4.1.0.dev.299
5
5
  platform: ruby
6
6
  authors:
7
7
  - Simon Menke
@@ -13,7 +13,7 @@ authors:
13
13
  autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
- date: 2016-02-17 00:00:00.000000000 Z
16
+ date: 2014-03-03 00:00:00.000000000 Z
17
17
  dependencies:
18
18
  - !ruby/object:Gem::Dependency
19
19
  name: activeadmin
@@ -21,28 +21,14 @@ dependencies:
21
21
  requirements:
22
22
  - - '='
23
23
  - !ruby/object:Gem::Version
24
- version: 0.6.3
24
+ version: 0.6.2
25
25
  type: :runtime
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
28
28
  requirements:
29
29
  - - '='
30
30
  - !ruby/object:Gem::Version
31
- version: 0.6.3
32
- - !ruby/object:Gem::Dependency
33
- name: carrierwave
34
- requirement: !ruby/object:Gem::Requirement
35
- requirements:
36
- - - '='
37
- - !ruby/object:Gem::Version
38
- version: 0.8.0
39
- type: :runtime
40
- prerelease: false
41
- version_requirements: !ruby/object:Gem::Requirement
42
- requirements:
43
- - - '='
44
- - !ruby/object:Gem::Version
45
- version: 0.8.0
31
+ version: 0.6.2
46
32
  - !ruby/object:Gem::Dependency
47
33
  name: closure_tree
48
34
  requirement: !ruby/object:Gem::Requirement
@@ -155,20 +141,6 @@ dependencies:
155
141
  - - '='
156
142
  - !ruby/object:Gem::Version
157
143
  version: 1.1.3
158
- - !ruby/object:Gem::Dependency
159
- name: mini_magick
160
- requirement: !ruby/object:Gem::Requirement
161
- requirements:
162
- - - '='
163
- - !ruby/object:Gem::Version
164
- version: 3.6.0
165
- type: :runtime
166
- prerelease: false
167
- version_requirements: !ruby/object:Gem::Requirement
168
- requirements:
169
- - - '='
170
- - !ruby/object:Gem::Version
171
- version: 3.6.0
172
144
  - !ruby/object:Gem::Dependency
173
145
  name: pg
174
146
  requirement: !ruby/object:Gem::Requirement
@@ -189,14 +161,14 @@ dependencies:
189
161
  requirements:
190
162
  - - '='
191
163
  - !ruby/object:Gem::Version
192
- version: 2.14.0
164
+ version: 2.0.1
193
165
  type: :runtime
194
166
  prerelease: false
195
167
  version_requirements: !ruby/object:Gem::Requirement
196
168
  requirements:
197
169
  - - '='
198
170
  - !ruby/object:Gem::Version
199
- version: 2.14.0
171
+ version: 2.0.1
200
172
  - !ruby/object:Gem::Dependency
201
173
  name: rails
202
174
  requirement: !ruby/object:Gem::Requirement
@@ -254,19 +226,33 @@ dependencies:
254
226
  - !ruby/object:Gem::Version
255
227
  version: 1.5.1
256
228
  - !ruby/object:Gem::Dependency
257
- name: rails_12factor
229
+ name: sentry-raven
258
230
  requirement: !ruby/object:Gem::Requirement
259
231
  requirements:
260
232
  - - '='
261
233
  - !ruby/object:Gem::Version
262
- version: 0.0.3
234
+ version: 0.6.0
263
235
  type: :runtime
264
236
  prerelease: false
265
237
  version_requirements: !ruby/object:Gem::Requirement
266
238
  requirements:
267
239
  - - '='
268
240
  - !ruby/object:Gem::Version
269
- version: 0.0.3
241
+ version: 0.6.0
242
+ - !ruby/object:Gem::Dependency
243
+ name: haraway
244
+ requirement: !ruby/object:Gem::Requirement
245
+ requirements:
246
+ - - ~>
247
+ - !ruby/object:Gem::Version
248
+ version: 0.1.0.dev
249
+ type: :runtime
250
+ prerelease: false
251
+ version_requirements: !ruby/object:Gem::Requirement
252
+ requirements:
253
+ - - ~>
254
+ - !ruby/object:Gem::Version
255
+ version: 0.1.0.dev
270
256
  description: 'Lalala: Probably the best CMS in the world'
271
257
  email:
272
258
  - hello@mrhenry.be
@@ -274,9 +260,10 @@ executables: []
274
260
  extensions: []
275
261
  extra_rdoc_files: []
276
262
  files:
277
- - ".gitignore"
278
- - ".travis.yml"
263
+ - .gitignore
264
+ - .travis.yml
279
265
  - Gemfile
266
+ - Haraway.md
280
267
  - LICENSE.txt
281
268
  - README.md
282
269
  - Rakefile
@@ -1307,23 +1294,26 @@ files:
1307
1294
  - app/assets/javascripts/browser/navigator.module.js
1308
1295
  - app/assets/javascripts/browser/screen.module.js
1309
1296
  - app/assets/javascripts/browser/window.module.js
1310
- - app/assets/javascripts/jquery-ui/sortable.js
1311
1297
  - app/assets/javascripts/lalala/base.js
1298
+ - app/assets/javascripts/lalala/initializers/chosen.module.js
1299
+ - app/assets/javascripts/lalala/initializers/haraway.module.js
1312
1300
  - app/assets/javascripts/lalala/lib/jquery-chosen.js
1313
1301
  - app/assets/javascripts/lalala/lib/jquery-markitup.js
1314
- - app/assets/javascripts/lalala/lib/jquery-ui.js
1315
1302
  - app/assets/javascripts/lalala/lib/moment.js
1303
+ - app/assets/javascripts/lalala/lib/overlay.js
1316
1304
  - app/assets/javascripts/lalala/lib/pikaday.js
1317
1305
  - app/assets/javascripts/lalala/modules/calendar.module.js
1318
1306
  - app/assets/javascripts/lalala/modules/collapsible_pages_tree.module.js
1319
1307
  - app/assets/javascripts/lalala/modules/dashboard.module.js
1320
1308
  - app/assets/javascripts/lalala/modules/editor.module.js
1321
- - app/assets/javascripts/lalala/modules/grid.module.js
1309
+ - app/assets/javascripts/lalala/modules/file-uploader-metadata.module.js
1310
+ - app/assets/javascripts/lalala/modules/file-uploader.module.js
1322
1311
  - app/assets/javascripts/lalala/modules/helpers.module.js
1323
1312
  - app/assets/javascripts/lalala/modules/init.module.js
1324
- - app/assets/javascripts/lalala/modules/input_group.module.js
1325
1313
  - app/assets/javascripts/lalala/modules/locale_chooser.module.js
1326
1314
  - app/assets/javascripts/lalala/modules/login.module.js
1315
+ - app/assets/javascripts/lalala/modules/media_selector.module.js
1316
+ - app/assets/javascripts/lalala/modules/overlay.module.js
1327
1317
  - app/assets/javascripts/lalala/modules/sorted_pages_tree.module.js
1328
1318
  - app/assets/javascripts/lalala/modules/storage.module.js
1329
1319
  - app/assets/stylesheets/lalala/_base.css.scss
@@ -1341,6 +1331,7 @@ files:
1341
1331
  - app/assets/stylesheets/lalala/editor-preview.css.scss
1342
1332
  - app/assets/stylesheets/lalala/lib/_chosen.css.scss
1343
1333
  - app/assets/stylesheets/lalala/lib/_jquery-ui.css.scss
1334
+ - app/assets/stylesheets/lalala/lib/_overlay.css.scss
1344
1335
  - app/assets/stylesheets/lalala/lib/_pikaday.css
1345
1336
  - app/assets/stylesheets/lalala/modules/_action-items.css.scss
1346
1337
  - app/assets/stylesheets/lalala/modules/_dashboard.css.scss
@@ -1348,16 +1339,17 @@ files:
1348
1339
  - app/assets/stylesheets/lalala/modules/_editor-cheatsheet.css.scss
1349
1340
  - app/assets/stylesheets/lalala/modules/_editor-preview.css.scss
1350
1341
  - app/assets/stylesheets/lalala/modules/_editor.css.scss
1342
+ - app/assets/stylesheets/lalala/modules/_file-uploader-metadata.css.scss
1343
+ - app/assets/stylesheets/lalala/modules/_file-uploader.css.scss
1351
1344
  - app/assets/stylesheets/lalala/modules/_filter-form.css.scss
1352
1345
  - app/assets/stylesheets/lalala/modules/_flashes.css.scss
1353
1346
  - app/assets/stylesheets/lalala/modules/_footer.css.scss
1354
- - app/assets/stylesheets/lalala/modules/_grid.css.scss
1355
1347
  - app/assets/stylesheets/lalala/modules/_header.css.scss
1356
- - app/assets/stylesheets/lalala/modules/_index-as-sortable.css.scss
1357
1348
  - app/assets/stylesheets/lalala/modules/_index-as-table.css.scss
1358
1349
  - app/assets/stylesheets/lalala/modules/_index-as-tree-table.css.scss
1359
1350
  - app/assets/stylesheets/lalala/modules/_index-footer.css.scss
1360
1351
  - app/assets/stylesheets/lalala/modules/_login.css.scss
1352
+ - app/assets/stylesheets/lalala/modules/_media-selector.css.scss
1361
1353
  - app/assets/stylesheets/lalala/modules/_panel.css.scss
1362
1354
  - app/assets/stylesheets/lalala/modules/_scopes.css.scss
1363
1355
  - app/assets/stylesheets/lalala/modules/_sidebar-section.css.scss
@@ -1367,10 +1359,7 @@ files:
1367
1359
  - app/controllers/lalala/markdown_controller.rb
1368
1360
  - app/controllers/lalala/public/errors_controller.rb
1369
1361
  - app/controllers/lalala/public/pages_controller.rb
1370
- - app/models/lalala/abstract_asset.rb
1371
1362
  - app/models/lalala/admin_user.rb
1372
- - app/models/lalala/file_asset.rb
1373
- - app/models/lalala/image_asset.rb
1374
1363
  - app/models/lalala/page.rb
1375
1364
  - app/views/active_admin/devise/sessions/new.html.erb
1376
1365
  - app/views/lalala/markdown/cheatsheet.html.erb
@@ -1381,7 +1370,6 @@ files:
1381
1370
  - app/views/lalala/public/pages/show.html.erb
1382
1371
  - app/views/layouts/lalala/markdown.html.erb
1383
1372
  - config/initializers/active_admin.rb
1384
- - config/initializers/carrierwave.rb
1385
1373
  - config/initializers/database.rb
1386
1374
  - config/initializers/devise.rb
1387
1375
  - config/locales/en.yml
@@ -1398,8 +1386,8 @@ files:
1398
1386
  - lalala-development.gemspec
1399
1387
  - lalala-test.gemspec
1400
1388
  - lalala.gemspec
1401
- - lib/formtastic/inputs/grid_input.rb
1402
- - lib/formtastic/inputs/single_file_input.rb
1389
+ - lib/formtastic/form_builder_ext.rb
1390
+ - lib/formtastic/inputs/haraway_input.rb
1403
1391
  - lib/generators/lalala/assets/assets_generator.rb
1404
1392
  - lib/generators/lalala/assets/templates/.bowerrc
1405
1393
  - lib/generators/lalala/assets/templates/.jshintrc
@@ -1419,16 +1407,10 @@ files:
1419
1407
  - lib/generators/lalala/install/templates/active_admin.rb.erb
1420
1408
  - lib/generators/lalala/install/templates/admin_pages.rb
1421
1409
  - lib/generators/lalala/install/templates/admin_users.rb
1422
- - lib/generators/lalala/install/templates/application.html.erb
1423
1410
  - lib/generators/lalala/install/templates/application_mailer.html.erb
1424
1411
  - lib/generators/lalala/install/templates/dashboard.rb
1425
1412
  - lib/generators/lalala/install/templates/devise.rb.erb
1426
1413
  - lib/generators/lalala/install/templates/errors_controller.rb
1427
- - lib/generators/lalala/install/templates/helpers/application_helper.rb
1428
- - lib/generators/lalala/install/templates/helpers/html_helper.rb
1429
- - lib/generators/lalala/install/templates/helpers/open_graph_helper.rb.erb
1430
- - lib/generators/lalala/install/templates/helpers/pages_helper.rb
1431
- - lib/generators/lalala/install/templates/locales/en.yml
1432
1414
  - lib/generators/lalala/install/templates/models/admin_user.rb
1433
1415
  - lib/generators/lalala/install/templates/models/application_page.rb
1434
1416
  - lib/generators/lalala/install/templates/models/file_asset.rb
@@ -1436,8 +1418,6 @@ files:
1436
1418
  - lib/generators/lalala/install/templates/pages_controller.rb
1437
1419
  - lib/generators/lalala/install/templates/routes.rb.erb
1438
1420
  - lib/generators/lalala/install/templates/staging.rb.erb
1439
- - lib/generators/lalala/install/templates/uploaders/file_uploader.rb
1440
- - lib/generators/lalala/install/templates/uploaders/image_uploader.rb
1441
1421
  - lib/generators/lalala/page/page_generator.rb
1442
1422
  - lib/generators/lalala/page/templates/page.rb
1443
1423
  - lib/generators/lalala/resource/USAGE
@@ -1451,10 +1431,8 @@ files:
1451
1431
  - lib/lalala/development.rb
1452
1432
  - lib/lalala/engine.rb
1453
1433
  - lib/lalala/ext_action_dispatch.rb
1454
- - lib/lalala/ext_action_dispatch/multi_file_upload.rb
1455
1434
  - lib/lalala/ext_action_dispatch/page_name.rb
1456
1435
  - lib/lalala/ext_active_record.rb
1457
- - lib/lalala/ext_active_record/assets.rb
1458
1436
  - lib/lalala/ext_active_record/i18n_translations_writer.rb
1459
1437
  - lib/lalala/ext_active_record/schema.rb
1460
1438
  - lib/lalala/ext_active_record/schema/join_table.rb
@@ -1473,9 +1451,8 @@ files:
1473
1451
  - lib/lalala/ext_with_advisory_lock/flock.rb
1474
1452
  - lib/lalala/markdown.rb
1475
1453
  - lib/lalala/markdown/active_model.rb
1454
+ - lib/lalala/markdown/handlers/asset.rb
1476
1455
  - lib/lalala/markdown/handlers/base.rb
1477
- - lib/lalala/markdown/handlers/soundcloud.rb
1478
- - lib/lalala/markdown/handlers/vimeo.rb
1479
1456
  - lib/lalala/markdown/handlers/youtube.rb
1480
1457
  - lib/lalala/markdown/html_renderer.rb
1481
1458
  - lib/lalala/markdown/input_helper.rb
@@ -1490,9 +1467,6 @@ files:
1490
1467
  - lib/lalala/pages/route_mapper.rb
1491
1468
  - lib/lalala/test.rb
1492
1469
  - lib/lalala/test/login_helper.rb
1493
- - lib/lalala/uploaders.rb
1494
- - lib/lalala/uploaders/file.rb
1495
- - lib/lalala/uploaders/image.rb
1496
1470
  - lib/lalala/utils/install_template.rb
1497
1471
  - lib/lalala/vendor.rb
1498
1472
  - lib/lalala/version.rb
@@ -1511,8 +1485,10 @@ files:
1511
1485
  - test/dummy/app/admin/tags.rb
1512
1486
  - test/dummy/app/assets/javascripts/active_admin.js
1513
1487
  - test/dummy/app/assets/javascripts/application.js
1488
+ - test/dummy/app/assets/stylesheets/_normalize.css
1514
1489
  - test/dummy/app/assets/stylesheets/active_admin.css.scss
1515
- - test/dummy/app/assets/stylesheets/application.css
1490
+ - test/dummy/app/assets/stylesheets/application.css.scss
1491
+ - test/dummy/app/assets/stylesheets/base/_base.css.scss
1516
1492
  - test/dummy/app/controllers/application_controller.rb
1517
1493
  - test/dummy/app/controllers/errors_controller.rb
1518
1494
  - test/dummy/app/controllers/pages_controller.rb
@@ -1521,16 +1497,14 @@ files:
1521
1497
  - test/dummy/app/models/.gitkeep
1522
1498
  - test/dummy/app/models/admin_user.rb
1523
1499
  - test/dummy/app/models/article.rb
1524
- - test/dummy/app/models/file_asset.rb
1525
- - test/dummy/app/models/image_asset.rb
1526
1500
  - test/dummy/app/models/tag.rb
1527
1501
  - test/dummy/app/pages/application_page.rb
1528
1502
  - test/dummy/app/pages/basic_page.rb
1529
1503
  - test/dummy/app/pages/home_page.rb
1530
- - test/dummy/app/uploaders/file_uploader.rb
1531
- - test/dummy/app/uploaders/image_uploader.rb
1504
+ - test/dummy/app/pages/media_page.rb
1532
1505
  - test/dummy/app/views/admin/_stats.html.erb
1533
1506
  - test/dummy/app/views/layouts/application.html.erb
1507
+ - test/dummy/app/views/pages/media.html.erb
1534
1508
  - test/dummy/config.ru
1535
1509
  - test/dummy/config/application.rb
1536
1510
  - test/dummy/config/boot.rb
@@ -1542,6 +1516,7 @@ files:
1542
1516
  - test/dummy/config/initializers/active_admin.rb
1543
1517
  - test/dummy/config/initializers/backtrace_silencers.rb
1544
1518
  - test/dummy/config/initializers/devise.rb
1519
+ - test/dummy/config/initializers/haraway.rb
1545
1520
  - test/dummy/config/initializers/inflections.rb
1546
1521
  - test/dummy/config/initializers/mime_types.rb
1547
1522
  - test/dummy/config/initializers/secret_token.rb
@@ -1555,9 +1530,10 @@ files:
1555
1530
  - test/dummy/db/migrate/20130729125648_create_home_page.rb
1556
1531
  - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
1557
1532
  - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
1533
+ - test/dummy/db/migrate/20131122144302_enable_haraway.rb
1558
1534
  - test/dummy/db/migrate/20131122165715_create_tags.rb
1559
1535
  - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
1560
- - test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
1536
+ - test/dummy/db/migrate/20140228141749_create_media_page.rb
1561
1537
  - test/dummy/db/schema.rb
1562
1538
  - test/dummy/lib/assets/.gitkeep
1563
1539
  - test/dummy/log/.gitkeep
@@ -1588,17 +1564,17 @@ require_paths:
1588
1564
  - lib
1589
1565
  required_ruby_version: !ruby/object:Gem::Requirement
1590
1566
  requirements:
1591
- - - ">="
1567
+ - - '>='
1592
1568
  - !ruby/object:Gem::Version
1593
1569
  version: '0'
1594
1570
  required_rubygems_version: !ruby/object:Gem::Requirement
1595
1571
  requirements:
1596
- - - ">"
1572
+ - - '>'
1597
1573
  - !ruby/object:Gem::Version
1598
1574
  version: 1.3.1
1599
1575
  requirements: []
1600
1576
  rubyforge_project:
1601
- rubygems_version: 2.4.8
1577
+ rubygems_version: 2.2.2
1602
1578
  signing_key:
1603
1579
  specification_version: 4
1604
1580
  summary: 'Lalala: Probably the best CMS in the world.'
@@ -1612,8 +1588,10 @@ test_files:
1612
1588
  - test/dummy/app/admin/tags.rb
1613
1589
  - test/dummy/app/assets/javascripts/active_admin.js
1614
1590
  - test/dummy/app/assets/javascripts/application.js
1591
+ - test/dummy/app/assets/stylesheets/_normalize.css
1615
1592
  - test/dummy/app/assets/stylesheets/active_admin.css.scss
1616
- - test/dummy/app/assets/stylesheets/application.css
1593
+ - test/dummy/app/assets/stylesheets/application.css.scss
1594
+ - test/dummy/app/assets/stylesheets/base/_base.css.scss
1617
1595
  - test/dummy/app/controllers/application_controller.rb
1618
1596
  - test/dummy/app/controllers/errors_controller.rb
1619
1597
  - test/dummy/app/controllers/pages_controller.rb
@@ -1622,16 +1600,14 @@ test_files:
1622
1600
  - test/dummy/app/models/.gitkeep
1623
1601
  - test/dummy/app/models/admin_user.rb
1624
1602
  - test/dummy/app/models/article.rb
1625
- - test/dummy/app/models/file_asset.rb
1626
- - test/dummy/app/models/image_asset.rb
1627
1603
  - test/dummy/app/models/tag.rb
1628
1604
  - test/dummy/app/pages/application_page.rb
1629
1605
  - test/dummy/app/pages/basic_page.rb
1630
1606
  - test/dummy/app/pages/home_page.rb
1631
- - test/dummy/app/uploaders/file_uploader.rb
1632
- - test/dummy/app/uploaders/image_uploader.rb
1607
+ - test/dummy/app/pages/media_page.rb
1633
1608
  - test/dummy/app/views/admin/_stats.html.erb
1634
1609
  - test/dummy/app/views/layouts/application.html.erb
1610
+ - test/dummy/app/views/pages/media.html.erb
1635
1611
  - test/dummy/config.ru
1636
1612
  - test/dummy/config/application.rb
1637
1613
  - test/dummy/config/boot.rb
@@ -1643,6 +1619,7 @@ test_files:
1643
1619
  - test/dummy/config/initializers/active_admin.rb
1644
1620
  - test/dummy/config/initializers/backtrace_silencers.rb
1645
1621
  - test/dummy/config/initializers/devise.rb
1622
+ - test/dummy/config/initializers/haraway.rb
1646
1623
  - test/dummy/config/initializers/inflections.rb
1647
1624
  - test/dummy/config/initializers/mime_types.rb
1648
1625
  - test/dummy/config/initializers/secret_token.rb
@@ -1656,9 +1633,10 @@ test_files:
1656
1633
  - test/dummy/db/migrate/20130729125648_create_home_page.rb
1657
1634
  - test/dummy/db/migrate/20131113134503_add_category_to_articles.rb
1658
1635
  - test/dummy/db/migrate/20131121092946_make_articles_translatable.rb
1636
+ - test/dummy/db/migrate/20131122144302_enable_haraway.rb
1659
1637
  - test/dummy/db/migrate/20131122165715_create_tags.rb
1660
1638
  - test/dummy/db/migrate/20131122170308_add_articles_tags_binding.rb
1661
- - test/dummy/db/migrate/20140926152646_add_pre_and_postpend_test_columns_to_articles.rb
1639
+ - test/dummy/db/migrate/20140228141749_create_media_page.rb
1662
1640
  - test/dummy/db/schema.rb
1663
1641
  - test/dummy/lib/assets/.gitkeep
1664
1642
  - test/dummy/log/.gitkeep
data/app/assets/javascripts/jquery-ui/sortable.js DELETED
File without changes