locomotive_cms 0.0.4.beta12 → 0.0.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (229) hide show
  1. data/Gemfile +13 -15
  2. data/README.textile +4 -5
  3. data/app/controllers/admin/api_contents_controller.rb +1 -10
  4. data/app/controllers/admin/base_controller.rb +2 -2
  5. data/app/controllers/admin/cross_domain_sessions_controller.rb +4 -7
  6. data/app/controllers/admin/current_sites_controller.rb +0 -2
  7. data/app/controllers/admin/imports_controller.rb +19 -13
  8. data/app/controllers/admin/pages_controller.rb +1 -1
  9. data/app/controllers/admin/passwords_controller.rb +2 -2
  10. data/app/controllers/admin/sessions_controller.rb +2 -2
  11. data/app/controllers/admin/sites_controller.rb +0 -2
  12. data/app/controllers/admin/theme_assets_controller.rb +1 -1
  13. data/app/controllers/application_controller.rb +1 -1
  14. data/app/controllers/home_controller.rb +7 -0
  15. data/app/helpers/admin/assets_helper.rb +6 -0
  16. data/app/helpers/admin/custom_fields_helper.rb +2 -2
  17. data/app/helpers/admin/{box_helper.rb → login_helper.rb} +3 -7
  18. data/app/models/asset_collection.rb +3 -15
  19. data/app/models/content_instance.rb +0 -19
  20. data/app/models/content_type.rb +3 -21
  21. data/app/models/extensions/page/tree.rb +7 -63
  22. data/app/models/page.rb +0 -2
  23. data/app/models/site.rb +3 -15
  24. data/app/uploaders/asset_uploader.rb +1 -1
  25. data/app/uploaders/theme_asset_uploader.rb +1 -12
  26. data/app/views/admin/asset_collections/edit.html.haml +2 -2
  27. data/app/views/admin/asset_collections/new.html.haml +1 -1
  28. data/app/views/admin/assets/_form.html.haml +2 -2
  29. data/app/views/admin/content_types/_form.html.haml +2 -2
  30. data/app/views/admin/content_types/new.html.haml +1 -1
  31. data/app/views/admin/contents/_form.html.haml +2 -2
  32. data/app/views/admin/contents/index.html.haml +1 -1
  33. data/app/views/admin/cross_domain_sessions/new.html.haml +1 -1
  34. data/app/views/admin/current_sites/_form.html.haml +3 -3
  35. data/app/views/admin/current_sites/edit.html.haml +1 -1
  36. data/app/views/admin/imports/new.html.haml +0 -11
  37. data/app/views/admin/imports/show.html.haml +1 -1
  38. data/app/views/admin/my_accounts/edit.html.haml +1 -1
  39. data/app/views/admin/pages/_form.html.haml +3 -2
  40. data/app/views/admin/pages/_page.html.haml +2 -4
  41. data/app/views/admin/pages/index.html.haml +1 -1
  42. data/app/views/admin/passwords/edit.html.haml +2 -2
  43. data/app/views/admin/passwords/new.html.haml +2 -2
  44. data/app/views/admin/sessions/new.html.haml +2 -2
  45. data/app/views/admin/shared/_head.html.haml +5 -4
  46. data/app/views/admin/shared/menu/_contents.html.haml +1 -1
  47. data/app/views/admin/sites/_form.html.haml +3 -3
  48. data/app/views/admin/snippets/_form.html.haml +2 -2
  49. data/app/views/admin/snippets/index.html.haml +15 -0
  50. data/app/views/admin/theme_assets/_form.html.haml +2 -2
  51. data/app/views/admin/theme_assets/index.html.haml +1 -1
  52. data/app/views/home/show.html.haml +4 -0
  53. data/app/views/{admin/layouts → layouts/admin}/application.html.haml +0 -0
  54. data/app/views/layouts/admin/box.html.haml +19 -0
  55. data/app/views/layouts/application.html.haml +7 -0
  56. data/config/application.rb +3 -1
  57. data/config/environments/development.rb +6 -1
  58. data/config/environments/production.rb +1 -1
  59. data/config/environments/test.rb +5 -1
  60. data/config/initializers/locomotive.rb +0 -14
  61. data/config/locales/admin_ui_en.yml +1 -33
  62. data/config/locales/admin_ui_fr.yml +1 -34
  63. data/config/locales/default_en.yml +0 -1
  64. data/config/locales/default_fr.yml +0 -1
  65. data/config/locales/flash.en.yml +0 -1
  66. data/config/locales/flash.fr.yml +0 -1
  67. data/config/mongoid.yml +5 -13
  68. data/config/routes.rb +1 -6
  69. data/lib/generators/locomotive/copy_assets/copy_assets_generator.rb +14 -0
  70. data/lib/generators/locomotive/install/install_generator.rb +10 -18
  71. data/lib/generators/locomotive/install/templates/README +13 -23
  72. data/lib/generators/locomotive/install/templates/locomotive.rb +1 -15
  73. data/lib/locomotive/carrierwave.rb +0 -1
  74. data/lib/locomotive/configuration.rb +1 -3
  75. data/lib/locomotive/custom_fields.rb +1 -0
  76. data/lib/locomotive/delayed_job.rb +2 -1
  77. data/lib/locomotive/engine.rb +7 -24
  78. data/lib/locomotive/heroku.rb +0 -1
  79. data/lib/locomotive/httparty/webservice.rb +1 -12
  80. data/lib/locomotive/import.rb +0 -2
  81. data/lib/locomotive/import/asset_collections.rb +8 -40
  82. data/lib/locomotive/import/assets.rb +12 -20
  83. data/lib/locomotive/import/content_types.rb +15 -51
  84. data/lib/locomotive/import/job.rb +11 -106
  85. data/lib/locomotive/import/pages.rb +26 -79
  86. data/lib/locomotive/import/site.rb +5 -3
  87. data/lib/locomotive/import/snippets.rb +8 -6
  88. data/lib/locomotive/inherited_resources.rb +0 -1
  89. data/lib/locomotive/liquid/drops/asset_collections.rb +4 -4
  90. data/lib/locomotive/liquid/drops/contents.rb +16 -21
  91. data/lib/locomotive/liquid/drops/page.rb +0 -4
  92. data/lib/locomotive/liquid/filters/html.rb +29 -15
  93. data/lib/locomotive/liquid/tags/consume.rb +1 -1
  94. data/lib/locomotive/liquid/tags/nav.rb +17 -48
  95. data/lib/locomotive/liquid/tags/paginate.rb +3 -3
  96. data/lib/locomotive/middlewares/fonts.rb +11 -3
  97. data/lib/locomotive/misc_form_builder.rb +7 -2
  98. data/lib/locomotive/regexps.rb +1 -1
  99. data/lib/locomotive/render.rb +3 -9
  100. data/lib/locomotive/routing/site_dispatcher.rb +6 -10
  101. data/lib/locomotive/version.rb +1 -2
  102. data/public/images/admin/box/buttons/right_bg.png +0 -0
  103. data/public/javascripts/admin/aloha/VERSION.txt +1 -1
  104. data/public/javascripts/admin/aloha/aloha-nodeps.js +101 -140
  105. data/public/javascripts/admin/aloha/aloha.js +105 -193
  106. data/public/javascripts/admin/aloha/css/aloha.css +4 -65
  107. data/public/javascripts/admin/aloha/deps/prettyPhoto/resources/css/prettyPhoto.css +2 -2
  108. data/public/javascripts/admin/aloha/i18n/de.dict +0 -2
  109. data/public/javascripts/admin/aloha/i18n/en.dict +0 -2
  110. data/public/javascripts/admin/aloha/images/base.png +0 -0
  111. data/public/javascripts/admin/aloha/images/base_multi.png +0 -0
  112. data/public/javascripts/admin/aloha/images/fade_in.png +0 -0
  113. data/public/javascripts/admin/aloha/images/fade_out.png +0 -0
  114. data/public/javascripts/admin/aloha/images/gentics_logo.png +0 -0
  115. data/public/javascripts/admin/aloha/images/grabhandle.png +0 -0
  116. data/public/javascripts/admin/aloha/images/maximize.png +0 -0
  117. data/public/javascripts/admin/aloha/images/pin.png +0 -0
  118. data/public/javascripts/admin/aloha/images/removeformat.png +0 -0
  119. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/de.dict +2 -0
  120. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/en.dict +2 -0
  121. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/eo.dict +2 -0
  122. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fi.dict +2 -0
  123. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fr.dict +2 -0
  124. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/it.dict +2 -0
  125. data/public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/plugin.js +7 -0
  126. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/i18n/de.dict +0 -0
  127. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/i18n/en.dict +0 -0
  128. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/i18n/fi.dict +0 -0
  129. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/i18n/fr.dict +0 -0
  130. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/i18n/it.dict +0 -0
  131. data/public/javascripts/admin/aloha/plugins/{com.example.aloha.plugins.Save → com.example.aloha.DummySave}/plugin.js +0 -0
  132. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/plugin.js +1 -1
  133. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/de.dict +20 -0
  134. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/en.dict +20 -0
  135. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/eo.dict +16 -0
  136. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fi.dict +20 -0
  137. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fr.dict +16 -0
  138. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/it.dict +20 -0
  139. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/plugin.js +7 -0
  140. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.HighlightEditables/plugin.js +1 -1
  141. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/css/jquery.autocomplete.css +48 -0
  142. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/deps/jquery.autocomplete.js +1 -0
  143. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/plugin.js +1 -1
  144. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressource.js +7 -0
  145. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourcedummy.js +7 -0
  146. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourceregistry.js +7 -0
  147. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/plugin.js +1 -1
  148. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/plugin.js +1 -1
  149. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/de.dict +0 -2
  150. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/en.dict +0 -2
  151. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/plugin.js +1 -1
  152. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/table.css +110 -28
  153. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Loader/plugin.js +1 -0
  154. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/en.dict +2 -0
  155. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fi.dict +2 -0
  156. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fr.dict +2 -0
  157. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/person.css +3 -0
  158. data/public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/plugin.js +1 -0
  159. data/public/javascripts/admin/aloha/plugins/simpletable/plugin.js.deactivated +2330 -0
  160. data/public/javascripts/admin/asset_collections.js +7 -11
  161. data/public/javascripts/admin/contents.js +1 -3
  162. data/public/javascripts/admin/site.js +3 -9
  163. data/public/javascripts/admin/snippets.js +1 -1
  164. data/public/javascripts/admin/utils.js +3 -5
  165. data/public/stylesheets/admin/application.css +1 -1
  166. data/public/stylesheets/admin/box.css +5 -5
  167. data/public/stylesheets/admin/buttons.css +5 -0
  168. data/public/stylesheets/admin/formtastic_changes.css +12 -5
  169. data/public/stylesheets/admin/inline_editor.css +5 -22
  170. data/public/stylesheets/admin/layout.css +4 -9
  171. metadata +130 -187
  172. data/app/controllers/admin/installation_controller.rb +0 -79
  173. data/app/uploaders/theme_uploader.rb +0 -19
  174. data/app/views/admin/errors/no_page.html.haml +0 -1
  175. data/app/views/admin/errors/no_site.html.haml +0 -1
  176. data/app/views/admin/installation/step_1.html.haml +0 -24
  177. data/app/views/admin/installation/step_2.html.haml +0 -26
  178. data/app/views/admin/installation/step_3.html.haml +0 -23
  179. data/app/views/admin/layouts/box.html.haml +0 -21
  180. data/app/views/admin/layouts/error.html.haml +0 -1
  181. data/config/assets.yml +0 -96
  182. data/config/initializers/carrierwave.rb +0 -17
  183. data/lib/locomotive/import/base.rb +0 -46
  184. data/lib/locomotive/import/logger.rb +0 -13
  185. data/lib/locomotive/railties/tasks.rake +0 -16
  186. data/public/javascripts/admin/aloha/i18n/pl.dict +0 -5
  187. data/public/javascripts/admin/aloha/images/base_big.png +0 -0
  188. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.css +0 -86
  189. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.html +0 -44
  190. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/de.dict +0 -4
  191. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/en.dict +0 -4
  192. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/fr.dict +0 -4
  193. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/plugin.js +0 -1
  194. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/product.js +0 -1
  195. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/2xu-wetsuit.jpg +0 -0
  196. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/asics-noosa.jpg +0 -0
  197. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/fivefingers-kso.jpg +0 -0
  198. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/kuota-kueen-k.jpg +0 -0
  199. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/mizuno-wave-musha2.jpg +0 -0
  200. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product.css +0 -69
  201. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product_button.gif +0 -0
  202. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/simplon-mrt.jpg +0 -0
  203. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trek-fuel-ex.jpg +0 -0
  204. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trisports.jpg +0 -0
  205. data/public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/zoggs-predator.jpg +0 -0
  206. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.css +0 -48
  207. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.html +0 -69
  208. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/de.dict +0 -4
  209. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/en.dict +0 -4
  210. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/plugin.js +0 -7
  211. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/pl.dict +0 -30
  212. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/LinkList.js +0 -7
  213. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/delicious.js +0 -7
  214. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/pl.dict +0 -4
  215. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/css/LinkChecker.css +0 -14
  216. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.css +0 -49
  217. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.html +0 -82
  218. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/i18n/en.dict +0 -27
  219. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/plugin.js +0 -7
  220. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/proxy.php +0 -235
  221. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/plugin.js +0 -7
  222. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/wordpastehandler.js +0 -7
  223. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/de.dict +0 -1
  224. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/en.dict +0 -1
  225. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/pl.dict +0 -12
  226. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_green.png +0 -0
  227. data/public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_red.png +0 -0
  228. data/public/stylesheets/admin/installation.css +0 -50
  229. data/public/stylesheets/admin/safari.css +0 -15
@@ -24,18 +24,9 @@ $(document).ready(function() {
24
24
  $('#asset_collection_assets_order').val(ids || '');
25
25
  }
26
26
 
27
- var setLastClassForAssets = function() {
28
- $('ul.assets li.last').removeClass('last');
29
- var i = parseInt($('ul.assets li.asset').size() / 6);
30
- while (i > 0) {
31
- $('ul.assets li.asset:eq(' + (i * 6 - 1) + ')').addClass('last');
32
- i--;
33
- }
34
- }
35
-
36
27
  $('ul.assets.sortable').sortable({
37
28
  items: 'li.asset',
38
- stop: function(event, ui) { updateAssetsOrder(); setLastClassForAssets(); }
29
+ stop: function(event, ui) { updateAssetsOrder(); }
39
30
  });
40
31
 
41
32
  $('ul.assets.sortable li div.actions a.remove').click(function(e) {
@@ -46,7 +37,12 @@ $(document).ready(function() {
46
37
 
47
38
  if ($('ul.assets li.asset').size() == 0) $('p.no-items').show();
48
39
 
49
- setLastClassForAssets();
40
+ $('ul.assets li.last').removeClass('last');
41
+ var i = parseInt($('ul.assets li.asset').size() / 6);
42
+ while (i > 0) {
43
+ $('ul.assets li.asset:eq(' + (i * 6 - 1) + ')').addClass('last');
44
+ i--;
45
+ }
50
46
  }
51
47
  e.preventDefault();
52
48
  e.stopPropagation();
@@ -15,9 +15,7 @@ $(document).ready(function() {
15
15
  stop: function(event, ui) { updateContentsOrder(); }
16
16
  });
17
17
 
18
- try {
19
- $('textarea.html').tinymce(TinyMceDefaultSettings);
20
- } catch (e) { /* tinymce not loaded */ }
18
+ $('textarea.html').tinymce(TinyMceDefaultSettings);
21
19
 
22
20
  $.datepicker.setDefaults($.datepicker.regional[I18nLocale]);
23
21
  $('input[type=text].date').datepicker($.datepicker.regional[I18nLocale]);
@@ -17,14 +17,12 @@ $(document).ready(function() {
17
17
  var newRow = lastRow.clone(true).removeClass('template').addClass('added').insertBefore(lastRow);
18
18
 
19
19
  // should copy the value of the select box
20
- var input_name = $('input#site_subdomain').attr('name').split('[')[0];
20
+ var input_name = $('input#current_site_subdomain').attr('name').split('[')[0];
21
21
  var input = newRow.find('input.label')
22
22
  .attr('name', input_name + '[domains][]');
23
23
  if (lastRow.find('input.label').val() == '') input.val("undefined");
24
24
 
25
- // then reset and clean the form
26
- $('fieldset.editable-list input.empty-domains').remove();
27
-
25
+ // then reset the form
28
26
  lastRow.find('input').val(defaultValue).addClass('void');
29
27
  lastRow.find('select').val('input');
30
28
  });
@@ -32,16 +30,12 @@ $(document).ready(function() {
32
30
  $('fieldset.editable-list li a.remove').click(function(e) {
33
31
  if (confirm($(this).attr('data-confirm')))
34
32
  $(this).parents('li').remove();
35
-
36
- if ($('fieldset.editable-list .item.added').size() == 0)
37
- $('fieldset.editable-list').append('<input name="site[domains]" type="hidden" value="" class="empty-domains" />');
38
-
39
33
  e.preventDefault();
40
34
  e.stopPropagation();
41
35
  });
42
36
 
43
37
  $.subscribe('form.saved.success', function(event, data) {
44
- var value = $('#site_name').val();
38
+ var value = $('#current_site_name').val();
45
39
  $('#header h1 a.single').html(value);
46
40
  $('#header h1 a span.ui-selectmenu-status').html(value);
47
41
  $('#site-selector-menu li.ui-selectmenu-item-selected a').html(value);
@@ -16,7 +16,7 @@ $(document).ready(function() {
16
16
 
17
17
  $('a#image-picker-link').imagepicker({
18
18
  insertFn: function(link) {
19
- return "{{ '" + link.attr('data-local-path') + "' | theme_image_url }}";
19
+ return "{{ theme_images." + link.attr('data-slug') + " }}";
20
20
  }
21
21
  });
22
22
  });
@@ -9,8 +9,6 @@ function makeSlug(val, sep) { // code largely inspired by http://www.thewebsitet
9
9
  return val.toLowerCase();
10
10
  }
11
11
 
12
- (function() {
13
- String.prototype.trim = function() {
14
- return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
15
- }
16
- })();
12
+ String.prototype.trim = function() {
13
+ return this.replace(/^\s+/g, '').replace(/\s+$/g, '');
14
+ }
@@ -27,7 +27,7 @@ div.notice p {
27
27
 
28
28
  p.no-items {
29
29
  padding: 15px 0px;
30
- background: transparent url(/images/admin/list/none.png) no-repeat center 0;
30
+ background: transparent url(/images/admin/list/none.png) no-repeat 0 0;
31
31
  text-align: center;
32
32
  color: #9d8963 !important;
33
33
  font-size: 1.1em !important;
@@ -65,11 +65,6 @@ body { background: #000 url(/images/admin/background/body.png) repeat 0 0; }
65
65
  color: #222;
66
66
  }
67
67
 
68
- #panel fieldset ol li input[type=file] {
69
- background: none;
70
- padding: 0px;
71
- }
72
-
73
68
  #panel fieldset ol li p.inline-errors {
74
69
  padding: 3px 5px;
75
70
  margin: 5px 0px;
@@ -130,6 +125,11 @@ body { background: #000 url(/images/admin/background/body.png) repeat 0 0; }
130
125
  line-height: 21px;
131
126
  }
132
127
 
128
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
129
+ #panel div.footer .button { padding-left: 5px; }
130
+ #panel div.footer .button span { top: 0px; padding-right: 10px; }
131
+ }
132
+
133
133
  /* ___ Messages ___ */
134
134
 
135
135
  div.application-message {
@@ -21,6 +21,11 @@
21
21
  outline: none;
22
22
  }
23
23
 
24
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
25
+ .button { padding-left: 5px; }
26
+ .button span { top: 0px; }
27
+ }
28
+
24
29
  .button.light {
25
30
  background-image: url(/images/admin/buttons/light-gray-left.png);
26
31
  color: #787a89;
@@ -65,6 +65,11 @@ form.formtastic fieldset.foldable ol {
65
65
 
66
66
  form.formtastic fieldset.foldable.folded ol { display: none; }
67
67
 
68
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
69
+ form.formtastic fieldset.foldable legend span em { top: 0px; }
70
+ form.formtastic fieldset.foldable.folded legend span em { top: 0px; }
71
+ }
72
+
68
73
  /* ___ inputs ___ */
69
74
 
70
75
  form.formtastic fieldset.inputs { min-height: 30px; width: 100%; margin-bottom: 20px; }
@@ -78,6 +83,12 @@ form.formtastic fieldset.inputs ol {
78
83
  border-top: 1px solid #ccced7;
79
84
  }
80
85
 
86
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
87
+ form.formtastic fieldset.inputs ol {
88
+ margin-top: 30px;
89
+ }
90
+ }
91
+
81
92
  form.formtastic fieldset ol li { width: 100%; position: relative; margin-bottom: 1.3em; }
82
93
 
83
94
  form.formtastic fieldset ol li label { text-align: left; padding: 0.3em 2em 0 20px; font-size: 0.8em; color: #17171b; width: 15%; }
@@ -164,7 +175,7 @@ form.formtastic div.actions p {
164
175
  }
165
176
 
166
177
  form.formtastic div.actions a {
167
- color: #fff !important;
178
+ color: #fff;
168
179
  text-decoration: none;
169
180
  font-size: 0.8em;
170
181
  position: relative;
@@ -288,10 +299,6 @@ form.formtastic fieldset.editable-list ol li.added input {
288
299
  cursor: pointer;
289
300
  }
290
301
 
291
- form.formtastic fieldset.editable-list ol li.added input.domain {
292
- width: 250px;
293
- }
294
-
295
302
  form.formtastic fieldset.editable-list ol li.added input:hover {
296
303
  background: #fffbe5;
297
304
  border: 1px dotted #efe4a5;
@@ -6,8 +6,7 @@
6
6
  background: transparent url('/images/admin/inline_editor/bg.png') repeat-x 0 0;
7
7
  padding: 0 10px;
8
8
  font-family: Helvetica;
9
- -webkit-box-shadow: -3px 3px 12px rgba(0, 0, 0, 0.4);
10
- -moz-box-shadow: -3px 3px 12px rgba(0, 0, 0, 0.4);
9
+ -webkit-box-shadow: -3px 3px 12px #818181;
11
10
  z-index: 999;
12
11
  }
13
12
 
@@ -18,25 +17,19 @@
18
17
 
19
18
  #page-toolbar ul li.link {
20
19
  float: left;
21
- margin: 0 0 0 5px;
22
- background: transparent;
23
- padding: 0px;
20
+ margin-right: 5px;
24
21
  }
25
22
 
26
23
  #page-toolbar ul li.link a {
27
24
  display: block;
28
25
  background: transparent url('/images/admin/inline_editor/action-left.png') no-repeat 0 0;
29
- height: 18px;
30
- line-height: 20px;
26
+ height: 21px;
31
27
  padding-left: 24px;
32
28
  text-decoration: none;
33
29
  color: #fff;
34
30
  outline: none;
35
- border: 0px;
36
- font-size: 12px;
37
31
  }
38
32
 
39
- #page-toolbar ul li.link a:active { border: 0px; text-decoration: none; color: #fff; top: 0px; }
40
33
  #page-toolbar ul li.link a:hover span { text-decoration: underline; }
41
34
 
42
35
  #page-toolbar ul li.save a { background-position: 0 -21px; }
@@ -49,7 +42,7 @@
49
42
  #page-toolbar ul li.link a span {
50
43
  display: block;
51
44
  background: transparent url('/images/admin/inline_editor/action-right.png') no-repeat right 0;
52
- height: 19px;
45
+ height: 20px;
53
46
  padding: 1px 10px 0 2px;
54
47
  text-shadow: 1px 1px 1px #000;
55
48
  }
@@ -67,17 +60,12 @@
67
60
  height: 10px;
68
61
  background: transparent url('/images/admin/inline_editor/drawer.png') no-repeat 0 0;
69
62
  text-decoration: none;
70
- border: 0px;
71
- padding: 0px;
72
- margin: 0px;
73
63
  }
74
64
 
75
65
  #page-toolbar ul li.drawer a.off {
76
66
  background-position: 0 -10px;
77
67
  }
78
68
 
79
- #page-toolbar ul li.drawer a:active { border: 0px; text-decoration: none; top: 6px; padding: 0px; }
80
-
81
69
  #page-toolbar ul li.spinner a {
82
70
  padding-left: 24px;
83
71
  position: relative;
@@ -99,9 +87,4 @@
99
87
  border-left: 1px solid #56575e;
100
88
  }
101
89
 
102
- #page-toolbar ul li.clear { clear: both; }
103
-
104
- /* ___ aloha ___ */
105
-
106
- .x-tab-panel a.x-tab-right { border-bottom: 0px; padding-bottom: 0px; }
107
- .x-tab-panel input[type=text] { border: 1px solid gray; border-spacing: 2px; -webkit-border-radius: 0px; -webkit-box-shadow: none; background: #fff; color: #000; padding: 2px; }
90
+ #page-toolbar ul li.clear { clear: both; }
@@ -105,15 +105,6 @@ body {
105
105
  font-size: 0.8em;
106
106
  }
107
107
 
108
- #content div.inner p a {
109
- color: #1F82BC;
110
- text-decoration: none;
111
- }
112
-
113
- #content div.inner p a:hover {
114
- text-decoration: underline;
115
- }
116
-
117
108
  #content #local-actions-bar {
118
109
  position: absolute;
119
110
  top: 13px;
@@ -143,6 +134,10 @@ body {
143
134
  background: transparent url(/images/admin/icons/actions.png) no-repeat 0 0;
144
135
  }
145
136
 
137
+ @media screen and (-webkit-min-device-pixel-ratio:0) {
138
+ #content #local-actions-bar a em { top: 4px; }
139
+ }
140
+
146
141
  #content #local-actions-bar a.show em { background-position: 0 0; }
147
142
  #content #local-actions-bar a.edit em { background-position: 0 -16px; top: 2px; left: 12px; }
148
143
  #content #local-actions-bar a.download em { background-position: 0 -32px; }
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: locomotive_cms
3
3
  version: !ruby/object:Gem::Version
4
- hash: -1967355476
5
- prerelease: true
4
+ hash: 23
5
+ prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
9
  - 4
10
- - beta12
11
- version: 0.0.4.beta12
10
+ version: 0.0.4
12
11
  platform: ruby
13
12
  authors:
14
13
  - Didier Lafforgue
@@ -16,7 +15,7 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2011-01-04 00:00:00 +01:00
18
+ date: 2010-10-15 00:00:00 +02:00
20
19
  default_executable:
21
20
  dependencies:
22
21
  - !ruby/object:Gem::Dependency
@@ -38,32 +37,34 @@ dependencies:
38
37
  - !ruby/object:Gem::Dependency
39
38
  type: :runtime
40
39
  prerelease: false
41
- name: warden
40
+ name: locomotive_liquid
42
41
  version_requirements: &id002 !ruby/object:Gem::Requirement
43
42
  none: false
44
43
  requirements:
45
- - - ">="
44
+ - - "="
46
45
  - !ruby/object:Gem::Version
47
46
  hash: 3
48
47
  segments:
49
- - 0
50
- version: "0"
48
+ - 2
49
+ - 2
50
+ - 2
51
+ version: 2.2.2
51
52
  requirement: *id002
52
53
  - !ruby/object:Gem::Dependency
53
54
  type: :runtime
54
55
  prerelease: false
55
- name: devise
56
+ name: bson_ext
56
57
  version_requirements: &id003 !ruby/object:Gem::Requirement
57
58
  none: false
58
59
  requirements:
59
60
  - - "="
60
61
  - !ruby/object:Gem::Version
61
- hash: 21
62
+ hash: 17
62
63
  segments:
63
64
  - 1
64
65
  - 1
65
- - 3
66
- version: 1.1.3
66
+ - 1
67
+ version: 1.1.1
67
68
  requirement: *id003
68
69
  - !ruby/object:Gem::Dependency
69
70
  type: :runtime
@@ -86,49 +87,49 @@ dependencies:
86
87
  - !ruby/object:Gem::Dependency
87
88
  type: :runtime
88
89
  prerelease: false
89
- name: bson_ext
90
+ name: locomotive_mongoid_acts_as_tree
90
91
  version_requirements: &id005 !ruby/object:Gem::Requirement
91
92
  none: false
92
93
  requirements:
93
94
  - - "="
94
95
  - !ruby/object:Gem::Version
95
- hash: 25
96
+ hash: 81
96
97
  segments:
97
- - 1
98
+ - 0
98
99
  - 1
99
100
  - 5
100
- version: 1.1.5
101
+ - 1
102
+ version: 0.1.5.1
101
103
  requirement: *id005
102
104
  - !ruby/object:Gem::Dependency
103
105
  type: :runtime
104
106
  prerelease: false
105
- name: locomotive_mongoid_acts_as_tree
107
+ name: warden
106
108
  version_requirements: &id006 !ruby/object:Gem::Requirement
107
109
  none: false
108
110
  requirements:
109
- - - "="
111
+ - - ">="
110
112
  - !ruby/object:Gem::Version
111
- hash: 81
113
+ hash: 3
112
114
  segments:
113
115
  - 0
114
- - 1
115
- - 5
116
- - 1
117
- version: 0.1.5.1
116
+ version: "0"
118
117
  requirement: *id006
119
118
  - !ruby/object:Gem::Dependency
120
119
  type: :runtime
121
120
  prerelease: false
122
- name: will_paginate
121
+ name: devise
123
122
  version_requirements: &id007 !ruby/object:Gem::Requirement
124
123
  none: false
125
124
  requirements:
126
- - - ">="
125
+ - - "="
127
126
  - !ruby/object:Gem::Version
128
- hash: 3
127
+ hash: 21
129
128
  segments:
130
- - 0
131
- version: "0"
129
+ - 1
130
+ - 1
131
+ - 3
132
+ version: 1.1.3
132
133
  requirement: *id007
133
134
  - !ruby/object:Gem::Dependency
134
135
  type: :runtime
@@ -149,66 +150,62 @@ dependencies:
149
150
  - !ruby/object:Gem::Dependency
150
151
  type: :runtime
151
152
  prerelease: false
152
- name: locomotive_liquid
153
+ name: rmagick
153
154
  version_requirements: &id009 !ruby/object:Gem::Requirement
154
155
  none: false
155
156
  requirements:
156
157
  - - "="
157
158
  - !ruby/object:Gem::Version
158
- hash: 3
159
+ hash: 59
159
160
  segments:
160
161
  - 2
162
+ - 12
161
163
  - 2
162
- - 2
163
- version: 2.2.2
164
+ version: 2.12.2
164
165
  requirement: *id009
165
166
  - !ruby/object:Gem::Dependency
166
167
  type: :runtime
167
168
  prerelease: false
168
- name: formtastic
169
+ name: fog
169
170
  version_requirements: &id010 !ruby/object:Gem::Requirement
170
171
  none: false
171
172
  requirements:
172
173
  - - ">="
173
174
  - !ruby/object:Gem::Version
174
- hash: 19
175
+ hash: 3
175
176
  segments:
176
- - 1
177
- - 1
178
177
  - 0
179
- version: 1.1.0
178
+ version: "0"
180
179
  requirement: *id010
181
180
  - !ruby/object:Gem::Dependency
182
181
  type: :runtime
183
182
  prerelease: false
184
- name: inherited_resources
183
+ name: mimetype-fu
185
184
  version_requirements: &id011 !ruby/object:Gem::Requirement
186
185
  none: false
187
186
  requirements:
188
187
  - - ">="
189
188
  - !ruby/object:Gem::Version
190
- hash: 23
189
+ hash: 3
191
190
  segments:
192
- - 1
193
- - 1
194
- - 2
195
- version: 1.1.2
191
+ - 0
192
+ version: "0"
196
193
  requirement: *id011
197
194
  - !ruby/object:Gem::Dependency
198
195
  type: :runtime
199
196
  prerelease: false
200
- name: rmagick
197
+ name: formtastic
201
198
  version_requirements: &id012 !ruby/object:Gem::Requirement
202
199
  none: false
203
200
  requirements:
204
- - - "="
201
+ - - ">="
205
202
  - !ruby/object:Gem::Version
206
- hash: 59
203
+ hash: 19
207
204
  segments:
208
- - 2
209
- - 12
210
- - 2
211
- version: 2.12.2
205
+ - 1
206
+ - 1
207
+ - 0
208
+ version: 1.1.0
212
209
  requirement: *id012
213
210
  - !ruby/object:Gem::Dependency
214
211
  type: :runtime
@@ -217,38 +214,31 @@ dependencies:
217
214
  version_requirements: &id013 !ruby/object:Gem::Requirement
218
215
  none: false
219
216
  requirements:
220
- - - "="
217
+ - - ">="
221
218
  - !ruby/object:Gem::Version
222
- hash: -1848229906
219
+ hash: 3
223
220
  segments:
224
221
  - 0
225
- - 5
226
- - 0
227
- - 1
228
- - beta2
229
- version: 0.5.0.1.beta2
222
+ version: "0"
230
223
  requirement: *id013
231
224
  - !ruby/object:Gem::Dependency
232
225
  type: :runtime
233
226
  prerelease: false
234
- name: custom_fields
227
+ name: actionmailer-with-request
235
228
  version_requirements: &id014 !ruby/object:Gem::Requirement
236
229
  none: false
237
230
  requirements:
238
- - - "="
231
+ - - ">="
239
232
  - !ruby/object:Gem::Version
240
- hash: -1848230054
233
+ hash: 3
241
234
  segments:
242
- - 1
243
235
  - 0
244
- - 0
245
- - beta2
246
- version: 1.0.0.beta2
236
+ version: "0"
247
237
  requirement: *id014
248
238
  - !ruby/object:Gem::Dependency
249
239
  type: :runtime
250
240
  prerelease: false
251
- name: fog
241
+ name: heroku
252
242
  version_requirements: &id015 !ruby/object:Gem::Requirement
253
243
  none: false
254
244
  requirements:
@@ -262,21 +252,23 @@ dependencies:
262
252
  - !ruby/object:Gem::Dependency
263
253
  type: :runtime
264
254
  prerelease: false
265
- name: mimetype-fu
255
+ name: httparty
266
256
  version_requirements: &id016 !ruby/object:Gem::Requirement
267
257
  none: false
268
258
  requirements:
269
259
  - - ">="
270
260
  - !ruby/object:Gem::Version
271
- hash: 3
261
+ hash: 5
272
262
  segments:
273
263
  - 0
274
- version: "0"
264
+ - 6
265
+ - 1
266
+ version: 0.6.1
275
267
  requirement: *id016
276
268
  - !ruby/object:Gem::Dependency
277
269
  type: :runtime
278
270
  prerelease: false
279
- name: actionmailer-with-request
271
+ name: RedCloth
280
272
  version_requirements: &id017 !ruby/object:Gem::Requirement
281
273
  none: false
282
274
  requirements:
@@ -290,98 +282,75 @@ dependencies:
290
282
  - !ruby/object:Gem::Dependency
291
283
  type: :runtime
292
284
  prerelease: false
293
- name: heroku
285
+ name: inherited_resources
294
286
  version_requirements: &id018 !ruby/object:Gem::Requirement
295
287
  none: false
296
288
  requirements:
297
289
  - - ">="
298
290
  - !ruby/object:Gem::Version
299
- hash: 3
291
+ hash: 23
300
292
  segments:
301
- - 0
302
- version: "0"
293
+ - 1
294
+ - 1
295
+ - 2
296
+ version: 1.1.2
303
297
  requirement: *id018
304
298
  - !ruby/object:Gem::Dependency
305
299
  type: :runtime
306
300
  prerelease: false
307
- name: httparty
301
+ name: delayed_job
308
302
  version_requirements: &id019 !ruby/object:Gem::Requirement
309
303
  none: false
310
304
  requirements:
311
- - - ">="
305
+ - - "="
312
306
  - !ruby/object:Gem::Version
313
- hash: 5
307
+ hash: -1876988215
314
308
  segments:
315
- - 0
316
- - 6
309
+ - 2
317
310
  - 1
318
- version: 0.6.1
311
+ - 0
312
+ - pre2
313
+ version: 2.1.0.pre2
319
314
  requirement: *id019
320
315
  - !ruby/object:Gem::Dependency
321
316
  type: :runtime
322
317
  prerelease: false
323
- name: RedCloth
318
+ name: delayed_job_mongoid
324
319
  version_requirements: &id020 !ruby/object:Gem::Requirement
325
320
  none: false
326
321
  requirements:
327
- - - ">="
322
+ - - "="
328
323
  - !ruby/object:Gem::Version
329
- hash: 3
324
+ hash: 7712010
330
325
  segments:
326
+ - 1
331
327
  - 0
332
- version: "0"
328
+ - 0
329
+ - rc
330
+ version: 1.0.0.rc
333
331
  requirement: *id020
334
332
  - !ruby/object:Gem::Dependency
335
333
  type: :runtime
336
334
  prerelease: false
337
- name: delayed_job
335
+ name: custom_fields
338
336
  version_requirements: &id021 !ruby/object:Gem::Requirement
339
337
  none: false
340
338
  requirements:
341
339
  - - "="
342
340
  - !ruby/object:Gem::Version
343
- hash: 15
344
- segments:
345
- - 2
346
- - 1
347
- - 2
348
- version: 2.1.2
349
- requirement: *id021
350
- - !ruby/object:Gem::Dependency
351
- type: :runtime
352
- prerelease: false
353
- name: delayed_job_mongoid
354
- version_requirements: &id022 !ruby/object:Gem::Requirement
355
- none: false
356
- requirements:
357
- - - "="
358
- - !ruby/object:Gem::Version
359
- hash: 21
341
+ hash: 31098193
360
342
  segments:
361
343
  - 1
362
344
  - 0
363
- - 1
364
- version: 1.0.1
365
- requirement: *id022
366
- - !ruby/object:Gem::Dependency
367
- type: :runtime
368
- prerelease: false
369
- name: rubyzip
370
- version_requirements: &id023 !ruby/object:Gem::Requirement
371
- none: false
372
- requirements:
373
- - - ">="
374
- - !ruby/object:Gem::Version
375
- hash: 3
376
- segments:
377
345
  - 0
378
- version: "0"
379
- requirement: *id023
346
+ - beta
347
+ version: 1.0.0.beta
348
+ requirement: *id021
380
349
  - !ruby/object:Gem::Dependency
381
350
  type: :runtime
382
351
  prerelease: false
383
- name: locomotive_jammit-s3
384
- version_requirements: &id024 !ruby/object:Gem::Requirement
352
+ name: rubyzip
353
+ version_requirements: &id022 !ruby/object:Gem::Requirement
385
354
  none: false
386
355
  requirements:
387
356
  - - ">="
@@ -390,7 +359,7 @@ dependencies:
390
359
  segments:
391
360
  - 0
392
361
  version: "0"
393
- requirement: *id024
362
+ requirement: *id022
394
363
  description: Locomotive is a next generation CMS system with sexy admin tools, liquid templating, and inline editing powered by mongodb and rails3
395
364
  email:
396
365
  - didier@nocoffee.fr
@@ -415,7 +384,6 @@ files:
415
384
  - app/controllers/admin/custom_fields_controller.rb
416
385
  - app/controllers/admin/images_controller.rb
417
386
  - app/controllers/admin/imports_controller.rb
418
- - app/controllers/admin/installation_controller.rb
419
387
  - app/controllers/admin/memberships_controller.rb
420
388
  - app/controllers/admin/my_accounts_controller.rb
421
389
  - app/controllers/admin/pages_controller.rb
@@ -427,11 +395,12 @@ files:
427
395
  - app/controllers/admin/snippets_controller.rb
428
396
  - app/controllers/admin/theme_assets_controller.rb
429
397
  - app/controllers/application_controller.rb
398
+ - app/controllers/home_controller.rb
430
399
  - app/helpers/admin/accounts_helper.rb
431
400
  - app/helpers/admin/assets_helper.rb
432
401
  - app/helpers/admin/base_helper.rb
433
- - app/helpers/admin/box_helper.rb
434
402
  - app/helpers/admin/custom_fields_helper.rb
403
+ - app/helpers/admin/login_helper.rb
435
404
  - app/helpers/admin/pages_helper.rb
436
405
  - app/helpers/admin/sites_helper.rb
437
406
  - app/models/account.rb
@@ -457,7 +426,6 @@ files:
457
426
  - app/uploaders/asset_uploader.rb
458
427
  - app/uploaders/editable_file_uploader.rb
459
428
  - app/uploaders/theme_asset_uploader.rb
460
- - app/uploaders/theme_uploader.rb
461
429
  - app/views/admin/accounts/new.html.haml
462
430
  - app/views/admin/asset_collections/_asset.html.haml
463
431
  - app/views/admin/asset_collections/edit.html.haml
@@ -483,16 +451,8 @@ files:
483
451
  - app/views/admin/custom_fields/edit_category.html.haml
484
452
  - app/views/admin/errors/404.html.haml
485
453
  - app/views/admin/errors/500.html.haml
486
- - app/views/admin/errors/no_page.html.haml
487
- - app/views/admin/errors/no_site.html.haml
488
454
  - app/views/admin/imports/new.html.haml
489
455
  - app/views/admin/imports/show.html.haml
490
- - app/views/admin/installation/step_1.html.haml
491
- - app/views/admin/installation/step_2.html.haml
492
- - app/views/admin/installation/step_3.html.haml
493
- - app/views/admin/layouts/application.html.haml
494
- - app/views/admin/layouts/box.html.haml
495
- - app/views/admin/layouts/error.html.haml
496
456
  - app/views/admin/mailer/confirmation_instructions.html.haml
497
457
  - app/views/admin/mailer/reset_password_instructions.html.haml
498
458
  - app/views/admin/mailer/unlock_instructions.html.haml
@@ -521,6 +481,7 @@ files:
521
481
  - app/views/admin/snippets/_form.html.haml
522
482
  - app/views/admin/snippets/_snippet.html.haml
523
483
  - app/views/admin/snippets/edit.html.haml
484
+ - app/views/admin/snippets/index.html.haml
524
485
  - app/views/admin/snippets/new.html.haml
525
486
  - app/views/admin/theme_assets/_asset.html.haml
526
487
  - app/views/admin/theme_assets/_form.html.haml
@@ -528,8 +489,11 @@ files:
528
489
  - app/views/admin/theme_assets/images.html.haml
529
490
  - app/views/admin/theme_assets/index.html.haml
530
491
  - app/views/admin/theme_assets/new.html.haml
492
+ - app/views/home/show.html.haml
493
+ - app/views/layouts/admin/application.html.haml
494
+ - app/views/layouts/admin/box.html.haml
495
+ - app/views/layouts/application.html.haml
531
496
  - config/application.rb
532
- - config/assets.yml
533
497
  - config/boot.rb
534
498
  - config/cucumber.yml
535
499
  - config/environment.rb
@@ -537,7 +501,6 @@ files:
537
501
  - config/environments/production.rb
538
502
  - config/environments/test.rb
539
503
  - config/initializers/backtrace_silencers.rb
540
- - config/initializers/carrierwave.rb
541
504
  - config/initializers/devise.rb
542
505
  - config/initializers/formtastic.rb
543
506
  - config/initializers/haml.rb
@@ -558,6 +521,7 @@ files:
558
521
  - config/locales/flash.fr.yml
559
522
  - config/mongoid.yml
560
523
  - config/routes.rb
524
+ - lib/generators/locomotive/copy_assets/copy_assets_generator.rb
561
525
  - lib/generators/locomotive/install/install_generator.rb
562
526
  - lib/generators/locomotive/install/templates/locomotive.rb
563
527
  - lib/generators/locomotive/install/templates/README
@@ -577,10 +541,8 @@ files:
577
541
  - lib/locomotive/httparty.rb
578
542
  - lib/locomotive/import/asset_collections.rb
579
543
  - lib/locomotive/import/assets.rb
580
- - lib/locomotive/import/base.rb
581
544
  - lib/locomotive/import/content_types.rb
582
545
  - lib/locomotive/import/job.rb
583
- - lib/locomotive/import/logger.rb
584
546
  - lib/locomotive/import/pages.rb
585
547
  - lib/locomotive/import/site.rb
586
548
  - lib/locomotive/import/snippets.rb
@@ -623,7 +585,6 @@ files:
623
585
  - lib/locomotive/mongoid/model_extensions.rb
624
586
  - lib/locomotive/mongoid/patches.rb
625
587
  - lib/locomotive/mongoid.rb
626
- - lib/locomotive/railties/tasks.rake
627
588
  - lib/locomotive/regexps.rb
628
589
  - lib/locomotive/render.rb
629
590
  - lib/locomotive/routing/default_constraint.rb
@@ -672,7 +633,6 @@ files:
672
633
  - public/stylesheets/admin/formtastic.css
673
634
  - public/stylesheets/admin/formtastic_changes.css
674
635
  - public/stylesheets/admin/inline_editor.css
675
- - public/stylesheets/admin/installation.css
676
636
  - public/stylesheets/admin/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
677
637
  - public/stylesheets/admin/jquery/images/ui-bg_flat_75_ffffff_40x100.png
678
638
  - public/stylesheets/admin/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
@@ -702,7 +662,6 @@ files:
702
662
  - public/stylesheets/admin/plugins/selectmenu.css
703
663
  - public/stylesheets/admin/plugins/tiny_mce.css
704
664
  - public/stylesheets/admin/plugins/toggle.css
705
- - public/stylesheets/admin/safari.css
706
665
  - public/javascripts/admin/account.js
707
666
  - public/javascripts/admin/aloha/aloha-nodeps.js
708
667
  - public/javascripts/admin/aloha/aloha.js
@@ -1071,11 +1030,9 @@ files:
1071
1030
  - public/javascripts/admin/aloha/i18n/fi.dict
1072
1031
  - public/javascripts/admin/aloha/i18n/fr.dict
1073
1032
  - public/javascripts/admin/aloha/i18n/it.dict
1074
- - public/javascripts/admin/aloha/i18n/pl.dict
1075
1033
  - public/javascripts/admin/aloha/i18n/ru.dict
1076
1034
  - public/javascripts/admin/aloha/images/base.gif
1077
1035
  - public/javascripts/admin/aloha/images/base.png
1078
- - public/javascripts/admin/aloha/images/base_big.png
1079
1036
  - public/javascripts/admin/aloha/images/base_multi.png
1080
1037
  - public/javascripts/admin/aloha/images/fade_in.png
1081
1038
  - public/javascripts/admin/aloha/images/fade_out.png
@@ -1087,61 +1044,47 @@ files:
1087
1044
  - public/javascripts/admin/aloha/images/multisplit_base.jpg
1088
1045
  - public/javascripts/admin/aloha/images/pin.png
1089
1046
  - public/javascripts/admin/aloha/images/removeformat.png
1090
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.css
1091
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/examples/triSports.html
1092
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/de.dict
1093
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/en.dict
1094
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/i18n/fr.dict
1095
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/plugin.js
1096
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/product.js
1097
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/2xu-wetsuit.jpg
1098
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/asics-noosa.jpg
1099
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/fivefingers-kso.jpg
1100
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/kuota-kueen-k.jpg
1101
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/mizuno-wave-musha2.jpg
1102
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product.css
1103
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/product_button.gif
1104
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/simplon-mrt.jpg
1105
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trek-fuel-ex.jpg
1106
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/trisports.jpg
1107
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Product/resources/zoggs-predator.jpg
1108
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/i18n/de.dict
1109
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/i18n/en.dict
1110
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/i18n/fi.dict
1111
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/i18n/fr.dict
1112
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/i18n/it.dict
1113
- - public/javascripts/admin/aloha/plugins/com.example.aloha.plugins.Save/plugin.js
1114
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.css
1115
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/examples/AlohaAbbr.html
1116
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/de.dict
1117
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/i18n/en.dict
1118
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Abbr/plugin.js
1047
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/de.dict
1048
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/en.dict
1049
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/eo.dict
1050
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fi.dict
1051
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/fr.dict
1052
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/i18n/it.dict
1053
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummyDC/plugin.js
1054
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/i18n/de.dict
1055
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/i18n/en.dict
1056
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/i18n/fi.dict
1057
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/i18n/fr.dict
1058
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/i18n/it.dict
1059
+ - public/javascripts/admin/aloha/plugins/com.example.aloha.DummySave/plugin.js
1119
1060
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/de.dict
1120
1061
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/en.dict
1121
1062
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/eo.dict
1122
1063
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/fi.dict
1123
1064
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/fr.dict
1124
1065
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/it.dict
1125
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/pl.dict
1126
1066
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/i18n/ru.dict
1127
1067
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Format/plugin.js
1068
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/de.dict
1069
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/en.dict
1070
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/eo.dict
1071
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fi.dict
1072
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/fr.dict
1073
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/i18n/it.dict
1074
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.GCN/plugin.js
1128
1075
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.HighlightEditables/css/HighlightEditables.css
1129
1076
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.HighlightEditables/plugin.js
1077
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/css/jquery.autocomplete.css
1130
1078
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/css/Link.css
1131
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/delicious.js
1079
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/deps/jquery.autocomplete.js
1132
1080
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/de.dict
1133
1081
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/en.dict
1134
1082
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/fr.dict
1135
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/pl.dict
1136
1083
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/i18n/ru.dict
1137
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/LinkList.js
1138
1084
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/plugin.js
1139
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/css/LinkChecker.css
1140
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.css
1141
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/examples/AlohaLinkChecker.html
1142
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/i18n/en.dict
1143
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/plugin.js
1144
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.LinkChecker/proxy.php
1085
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressource.js
1086
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourcedummy.js
1087
+ - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Link/ressourceregistry.js
1145
1088
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/i18n/de.dict
1146
1089
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/i18n/en.dict
1147
1090
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/i18n/eo.dict
@@ -1150,25 +1093,25 @@ files:
1150
1093
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/i18n/it.dict
1151
1094
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/i18n/ru.dict
1152
1095
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.List/plugin.js
1153
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/plugin.js
1154
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Paste/wordpastehandler.js
1155
1096
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/de.dict
1156
1097
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/en.dict
1157
1098
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/eo.dict
1158
1099
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/fi.dict
1159
1100
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/fr.dict
1160
1101
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/it.dict
1161
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/pl.dict
1162
1102
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/i18n/ru.dict
1163
1103
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/plugin.js
1164
1104
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/down.cur
1165
1105
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/left.cur
1166
1106
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/table.css
1167
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_green.png
1168
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.Table/resources/wai_red.png
1169
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/de.dict
1170
- - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/i18n/en.dict
1171
1107
  - public/javascripts/admin/aloha/plugins/com.gentics.aloha.plugins.TOC/plugin.js
1108
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Loader/plugin.js
1109
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/en.dict
1110
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fi.dict
1111
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/i18n/fr.dict
1112
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/person.css
1113
+ - public/javascripts/admin/aloha/plugins/eu.iksproject.plugins.Person/plugin.js
1114
+ - public/javascripts/admin/aloha/plugins/simpletable/plugin.js.deactivated
1172
1115
  - public/javascripts/admin/aloha/VERSION.txt
1173
1116
  - public/javascripts/admin/application.js
1174
1117
  - public/javascripts/admin/asset_collections.js