locomotive_cms 2.0.0.rc12 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (519) hide show
  1. data/Gemfile +35 -28
  2. data/LICENSE +1 -1
  3. data/README.textile +9 -4
  4. data/app/assets/images/locomotive/icons/flags/de.png +0 -0
  5. data/app/assets/images/locomotive/icons/flags/en.png +0 -0
  6. data/app/assets/images/locomotive/icons/flags/es.png +0 -0
  7. data/app/assets/images/locomotive/icons/flags/et.png +0 -0
  8. data/app/assets/images/locomotive/icons/flags/fr.png +0 -0
  9. data/app/assets/images/locomotive/icons/flags/it.png +0 -0
  10. data/app/assets/images/locomotive/icons/flags/nb.png +0 -0
  11. data/app/assets/images/locomotive/icons/flags/nl.png +0 -0
  12. data/app/assets/images/locomotive/icons/flags/pl.png +0 -0
  13. data/app/assets/images/locomotive/icons/flags/pt-BR.png +0 -0
  14. data/app/assets/images/locomotive/icons/flags/ru.png +0 -0
  15. data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/css/image.css +1 -1
  16. data/app/assets/javascripts/aloha/plugins/custom/locomotive_media/lib/locomotive_media-plugin.js +10 -21
  17. data/app/assets/javascripts/locomotive/models/content_entry.js.coffee +1 -1
  18. data/app/assets/javascripts/locomotive/models/content_type.js.coffee +6 -0
  19. data/app/assets/javascripts/locomotive/models/translation.js.coffee +5 -0
  20. data/app/assets/javascripts/locomotive/utils/aloha_settings.js.coffee +20 -2
  21. data/app/assets/javascripts/locomotive/utils/tinymce_settings.js.coffee +6 -6
  22. data/app/assets/javascripts/locomotive/views/application_view.js.coffee +4 -4
  23. data/app/assets/javascripts/locomotive/views/content_assets/picker_item_view.js.coffee +1 -1
  24. data/app/assets/javascripts/locomotive/views/content_entries/_form_view.js.coffee +10 -3
  25. data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee +7 -6
  26. data/app/assets/javascripts/locomotive/views/content_entries/index_view.js.coffee +1 -1
  27. data/app/assets/javascripts/locomotive/views/content_types/_form_view.js.coffee +4 -1
  28. data/app/assets/javascripts/locomotive/views/content_types/custom_field_entry_view.js.coffee +2 -2
  29. data/app/assets/javascripts/locomotive/views/content_types/custom_fields_view.coffee +5 -0
  30. data/app/assets/javascripts/locomotive/views/content_types/edit_view.coffee +1 -1
  31. data/app/assets/javascripts/locomotive/views/content_types/select_options_view.js.coffee +6 -6
  32. data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee +2 -1
  33. data/app/assets/javascripts/locomotive/views/editable_elements/edit_all_view.js.coffee +1 -1
  34. data/app/assets/javascripts/locomotive/views/editable_elements/file_view.js.coffee +2 -2
  35. data/app/assets/javascripts/locomotive/views/inline_editor/application_view.js.coffee +36 -15
  36. data/app/assets/javascripts/locomotive/views/inline_editor/toolbar_view.js.coffee +30 -14
  37. data/app/assets/javascripts/locomotive/views/pages/_form_view.js.coffee +24 -11
  38. data/app/assets/javascripts/locomotive/views/pages/edit_view.js.coffee +1 -1
  39. data/app/assets/javascripts/locomotive/views/pages/list_view.js.coffee +2 -2
  40. data/app/assets/javascripts/locomotive/views/shared/fields/file_view.js.coffee +5 -4
  41. data/app/assets/javascripts/locomotive/views/shared/fields/has_many_view.js.coffee +2 -1
  42. data/app/assets/javascripts/locomotive/views/shared/fields/many_to_many_view.js.coffee +1 -1
  43. data/app/assets/javascripts/locomotive/views/shared/fields/select_view.js.coffee +6 -2
  44. data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee +17 -12
  45. data/app/assets/javascripts/locomotive/views/shared/list_item_view.js.coffee +1 -1
  46. data/app/assets/javascripts/locomotive/views/sites/membership_entry_view.js.coffee +2 -1
  47. data/app/assets/javascripts/locomotive/views/snippets/_form_view.js.coffee +19 -3
  48. data/app/assets/javascripts/locomotive/views/theme_assets/index_view.js.coffee +8 -1
  49. data/app/assets/javascripts/locomotive/views/translations/_form_view.js.coffee +20 -0
  50. data/app/assets/javascripts/locomotive/views/translations/edit_view.js.coffee +6 -0
  51. data/app/assets/javascripts/locomotive/views/translations/new_view.js.coffee +8 -0
  52. data/app/assets/javascripts/tinymce/plugins/jqueryinlinepopups/editor_plugin.js +2 -2
  53. data/app/assets/javascripts/tinymce/plugins/locomotive_media/editor_plugin.js +1 -0
  54. data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/en.js +1 -0
  55. data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/fr.js +1 -0
  56. data/app/assets/javascripts/tinymce/plugins/locomotive_media/langs/ru.js +1 -0
  57. data/app/assets/stylesheets/locomotive.css +2 -1
  58. data/app/assets/stylesheets/locomotive/backoffice/_box.css.scss +3 -13
  59. data/app/assets/stylesheets/locomotive/backoffice/_buttons.css.scss +39 -16
  60. data/app/assets/stylesheets/locomotive/backoffice/application.css.scss +45 -56
  61. data/app/assets/stylesheets/locomotive/backoffice/codemirror_changes.css.scss +2 -0
  62. data/app/assets/stylesheets/locomotive/backoffice/content_assets.css.scss +5 -8
  63. data/app/assets/stylesheets/locomotive/backoffice/datepicker.css.scss +23 -9
  64. data/app/assets/stylesheets/locomotive/backoffice/formtastic_changes.css.scss +36 -32
  65. data/app/assets/stylesheets/locomotive/backoffice/layout.css.scss +2 -1
  66. data/app/assets/stylesheets/locomotive/backoffice/menu/_colors.css.scss +2 -1
  67. data/app/assets/stylesheets/locomotive/backoffice/menu/default.css.scss +4 -39
  68. data/app/assets/stylesheets/locomotive/backoffice/menu/main.css.scss +1 -1
  69. data/app/assets/stylesheets/locomotive/backoffice/menu/sub.css.scss +28 -36
  70. data/app/assets/stylesheets/locomotive/inline_editor.css +2 -1
  71. data/app/assets/stylesheets/locomotive/inline_editor/_buttons.css.scss +1 -11
  72. data/app/assets/stylesheets/locomotive/inline_editor/toolbar.css.scss +3 -4
  73. data/app/assets/stylesheets/locomotive/not_logged_in.css +1 -0
  74. data/app/assets/stylesheets/locomotive/not_logged_in/layout.css.scss +17 -8
  75. data/app/assets/stylesheets/locomotive/shared/_helpers.css.scss +21 -41
  76. data/app/assets/stylesheets/locomotive/shared/common.css.scss +2 -1
  77. data/app/assets/stylesheets/locomotive/shared/content_locale_picker.css.scss +11 -13
  78. data/app/cells/locomotive/content_locale_picker/show.html.haml +2 -2
  79. data/app/cells/locomotive/content_locale_picker_cell.rb +6 -2
  80. data/app/cells/locomotive/global_actions_cell.rb +1 -1
  81. data/app/cells/locomotive/main_menu/show.html.haml +1 -1
  82. data/app/cells/locomotive/main_menu_cell.rb +2 -2
  83. data/app/cells/locomotive/settings_menu_cell.rb +1 -0
  84. data/app/controllers/locomotive/api/accounts_controller.rb +70 -0
  85. data/app/controllers/locomotive/api/base_controller.rb +8 -0
  86. data/app/controllers/locomotive/api/content_assets_controller.rb +7 -9
  87. data/app/controllers/locomotive/api/content_entries_controller.rb +18 -14
  88. data/app/controllers/locomotive/api/content_types_controller.rb +56 -9
  89. data/app/controllers/locomotive/api/current_site_controller.rb +47 -1
  90. data/app/controllers/locomotive/api/documentation_controller.rb +15 -0
  91. data/app/controllers/locomotive/api/memberships_controller.rb +49 -14
  92. data/app/controllers/locomotive/api/my_account_controller.rb +19 -2
  93. data/app/controllers/locomotive/api/pages_controller.rb +56 -9
  94. data/app/controllers/locomotive/api/sites_controller.rb +62 -14
  95. data/app/controllers/locomotive/api/snippets_controller.rb +56 -9
  96. data/app/controllers/locomotive/api/theme_assets_controller.rb +7 -9
  97. data/app/controllers/locomotive/api/tokens_controller.rb +32 -5
  98. data/app/controllers/locomotive/api/translations_controller.rb +33 -0
  99. data/app/controllers/locomotive/public/base_controller.rb +1 -1
  100. data/app/controllers/locomotive/public/content_entries_controller.rb +13 -12
  101. data/app/controllers/locomotive/public/pages_controller.rb +3 -1
  102. data/app/controllers/locomotive/public/robots_controller.rb +2 -2
  103. data/app/controllers/locomotive/public/sitemaps_controller.rb +2 -2
  104. data/app/controllers/locomotive/sites_controller.rb +2 -2
  105. data/app/controllers/locomotive/snippets_controller.rb +6 -1
  106. data/app/controllers/locomotive/translations_controller.rb +39 -0
  107. data/app/helpers/locomotive/accounts_helper.rb +1 -1
  108. data/app/helpers/locomotive/base_helper.rb +68 -2
  109. data/app/helpers/locomotive/content_entries_helper.rb +27 -1
  110. data/app/helpers/locomotive/custom_fields_helper.rb +2 -2
  111. data/app/helpers/locomotive/pages_helper.rb +30 -2
  112. data/app/helpers/locomotive/snippets_helper.rb +20 -0
  113. data/app/helpers/locomotive/translations_helper.rb +19 -0
  114. data/app/inputs/locomotive/code_input.rb +29 -7
  115. data/app/inputs/locomotive/file_input.rb +5 -1
  116. data/app/inputs/locomotive/locale_input.rb +3 -2
  117. data/app/inputs/locomotive/locales_input.rb +3 -2
  118. data/app/mailers/locomotive/notifications.rb +7 -1
  119. data/app/models/locomotive/ability.rb +9 -3
  120. data/app/models/locomotive/account.rb +11 -5
  121. data/app/models/locomotive/content_asset.rb +2 -7
  122. data/app/models/locomotive/content_entry.rb +26 -20
  123. data/app/models/locomotive/content_type.rb +56 -28
  124. data/app/models/locomotive/editable_control.rb +0 -4
  125. data/app/models/locomotive/editable_element.rb +15 -4
  126. data/app/models/locomotive/editable_file.rb +11 -5
  127. data/app/models/locomotive/editable_long_text.rb +1 -7
  128. data/app/models/locomotive/editable_short_text.rb +12 -3
  129. data/app/models/locomotive/extensions/content_type/default_values.rb +2 -4
  130. data/app/models/locomotive/extensions/page/editable_elements.rb +22 -3
  131. data/app/models/locomotive/extensions/page/listed.rb +1 -1
  132. data/app/models/locomotive/extensions/page/parse.rb +18 -12
  133. data/app/models/locomotive/extensions/page/redirect.rb +6 -4
  134. data/app/models/locomotive/extensions/page/render.rb +1 -1
  135. data/app/models/locomotive/extensions/page/templatized.rb +48 -19
  136. data/app/models/locomotive/extensions/page/tree.rb +14 -2
  137. data/app/models/locomotive/extensions/site/locales.rb +11 -3
  138. data/app/models/locomotive/extensions/site/subdomain_domains.rb +7 -2
  139. data/app/models/locomotive/membership.rb +0 -4
  140. data/app/models/locomotive/page.rb +5 -13
  141. data/app/models/locomotive/site.rb +16 -23
  142. data/app/models/locomotive/snippet.rb +1 -9
  143. data/app/models/locomotive/theme_asset.rb +24 -28
  144. data/app/models/locomotive/translation.rb +35 -0
  145. data/app/presenters/locomotive/account_presenter.rb +12 -4
  146. data/app/presenters/locomotive/base_presenter.rb +122 -20
  147. data/app/presenters/locomotive/content_asset_presenter.rb +22 -11
  148. data/app/presenters/locomotive/content_entry_presenter.rb +151 -36
  149. data/app/presenters/locomotive/content_field_presenter.rb +76 -0
  150. data/app/presenters/locomotive/content_type_presenter.rb +66 -8
  151. data/app/presenters/locomotive/editable_control_presenter.rb +9 -8
  152. data/app/presenters/locomotive/editable_element_presenter.rb +26 -7
  153. data/app/presenters/locomotive/editable_file_presenter.rb +26 -5
  154. data/app/presenters/locomotive/editable_short_text_presenter.rb +21 -4
  155. data/app/presenters/locomotive/membership_presenter.rb +14 -16
  156. data/app/presenters/locomotive/page_presenter.rb +60 -14
  157. data/app/presenters/locomotive/site_presenter.rb +23 -8
  158. data/app/presenters/locomotive/snippet_presenter.rb +10 -8
  159. data/app/presenters/locomotive/theme_asset_presenter.rb +32 -15
  160. data/app/presenters/locomotive/translation_presenter.rb +9 -0
  161. data/app/uploaders/locomotive/editable_file_uploader.rb +4 -0
  162. data/app/views/locomotive/content_assets/_asset.html.haml +1 -1
  163. data/app/views/locomotive/content_assets/_picker.html.haml +1 -1
  164. data/app/views/locomotive/content_entries/_form.html.haml +2 -2
  165. data/app/views/locomotive/content_entries/_list.html.haml +1 -2
  166. data/app/views/locomotive/content_entries/edit.html.haml +6 -3
  167. data/app/views/locomotive/content_entries/index.html.haml +2 -2
  168. data/app/views/locomotive/content_entries/new.html.haml +5 -2
  169. data/app/views/locomotive/content_types/edit.html.haml +2 -2
  170. data/app/views/locomotive/current_site/edit.html.haml +1 -1
  171. data/app/views/locomotive/custom_fields/_form.html.haml +4 -4
  172. data/app/views/locomotive/custom_fields/_select_templates.html.haml +2 -2
  173. data/app/views/locomotive/custom_fields/types/_has_many.html.haml +6 -34
  174. data/app/views/locomotive/custom_fields/types/_has_many_form.html.haml +31 -0
  175. data/app/views/locomotive/custom_fields/types/_many_to_many.html.haml +2 -3
  176. data/app/views/locomotive/layouts/not_logged_in.html.haml +1 -1
  177. data/app/views/locomotive/my_account/edit.html.haml +2 -2
  178. data/app/views/locomotive/pages/_form.html.haml +8 -4
  179. data/app/views/locomotive/pages/_page.html.haml +7 -1
  180. data/app/views/locomotive/pages/edit.html.haml +1 -1
  181. data/app/views/locomotive/pages/index.html.haml +1 -1
  182. data/app/views/locomotive/public/pages/show_toolbar.html.haml +2 -3
  183. data/app/views/locomotive/public/sitemaps/show.xml.builder +4 -4
  184. data/app/views/locomotive/shared/_head.html.haml +3 -2
  185. data/app/views/locomotive/shared/_locale_picker_link.html.haml +3 -4
  186. data/app/views/locomotive/shared/actions/_contents.html.haml +3 -1
  187. data/app/views/locomotive/shared/menu/_contents.html.haml +14 -3
  188. data/app/views/locomotive/sites/_domains.html.haml +1 -1
  189. data/app/views/locomotive/sites/_form.html.haml +5 -5
  190. data/app/views/locomotive/sites/_memberships.html.haml +4 -2
  191. data/app/views/locomotive/snippets/_form.html.haml +2 -2
  192. data/app/views/locomotive/snippets/_snippet.html.haml +1 -1
  193. data/app/views/locomotive/snippets/edit.html.haml +1 -1
  194. data/app/views/locomotive/theme_assets/_asset.html.haml +1 -1
  195. data/app/views/locomotive/theme_assets/_form.html.haml +6 -2
  196. data/app/views/locomotive/theme_assets/edit.html.haml +1 -1
  197. data/app/views/locomotive/theme_assets/index.html.haml +15 -11
  198. data/app/views/locomotive/translations/_form.html.haml +12 -0
  199. data/app/views/locomotive/translations/edit.html.haml +15 -0
  200. data/app/views/locomotive/translations/index.html.haml +28 -0
  201. data/app/views/locomotive/translations/new.html.haml +12 -0
  202. data/config/initializers/deny_phantomjs_ttf.rb +29 -0
  203. data/config/locales/admin_ui.de.yml +1 -0
  204. data/config/locales/admin_ui.en.yml +22 -2
  205. data/config/locales/admin_ui.es.yml +1 -0
  206. data/config/locales/admin_ui.et.yml +14 -0
  207. data/config/locales/admin_ui.fr.yml +36 -14
  208. data/config/locales/admin_ui.it.yml +1 -0
  209. data/config/locales/admin_ui.nb.yml +1 -0
  210. data/config/locales/admin_ui.pl.yml +319 -0
  211. data/config/locales/admin_ui.pt-BR.yml +38 -6
  212. data/config/locales/admin_ui.ru.yml +1 -0
  213. data/config/locales/carrierwave.pl.yml +4 -0
  214. data/config/locales/default.fr.yml +3 -1
  215. data/config/locales/default.pl.yml +317 -0
  216. data/config/locales/devise.de.yml +1 -0
  217. data/config/locales/devise.en.yml +1 -0
  218. data/config/locales/devise.es.yml +1 -0
  219. data/config/locales/devise.et.yml +1 -0
  220. data/config/locales/devise.fr.yml +3 -2
  221. data/config/locales/devise.it.yml +1 -0
  222. data/config/locales/devise.nb.yml +1 -0
  223. data/config/locales/devise.nl.yml +1 -0
  224. data/config/locales/devise.pl.yml +64 -0
  225. data/config/locales/devise.pt-BR.yml +1 -0
  226. data/config/locales/devise.ru.yml +1 -0
  227. data/config/locales/flash.en.yml +9 -0
  228. data/config/locales/flash.pl.yml +106 -0
  229. data/config/locales/formtastic.en.yml +2 -0
  230. data/config/locales/formtastic.fr.yml +3 -1
  231. data/config/locales/formtastic.pl.yml +105 -0
  232. data/config/routes.rb +46 -38
  233. data/features/api/accounts.feature +25 -0
  234. data/features/api/authentication.feature +19 -0
  235. data/features/api/authorization/accounts.feature +125 -0
  236. data/features/api/authorization/content_assets.feature +147 -0
  237. data/features/api/authorization/content_entries.feature +202 -0
  238. data/features/api/authorization/content_types.feature +237 -0
  239. data/features/api/authorization/current_site.feature +30 -0
  240. data/features/api/authorization/memberships.feature +225 -0
  241. data/features/api/authorization/pages.feature +187 -0
  242. data/features/api/authorization/sites.feature +213 -0
  243. data/features/api/authorization/snippets.feature +179 -0
  244. data/features/api/authorization/theme_assets.feature +185 -0
  245. data/features/api/authorization/translations.feature +253 -0
  246. data/features/api/content_entries.feature +169 -0
  247. data/features/api/content_types.feature +156 -0
  248. data/features/api/editable_elements.feature +190 -0
  249. data/features/api/entries_custom_fields.feature +150 -0
  250. data/features/api/pages.feature +72 -0
  251. data/features/backoffice/authorization/account_settings.feature +28 -0
  252. data/features/backoffice/authorization/content_type.feature +35 -0
  253. data/features/backoffice/authorization/current_site.feature +53 -0
  254. data/features/backoffice/authorization/inline_front_end_editing.feature +46 -0
  255. data/features/backoffice/authorization/pages.feature +95 -0
  256. data/features/backoffice/authorization/theme_assets.feature +50 -0
  257. data/features/backoffice/content_types/edit.feature +20 -0
  258. data/features/backoffice/content_types/has_many.feature +60 -0
  259. data/features/backoffice/content_types/many_to_many.feature +42 -0
  260. data/features/backoffice/contents.feature +70 -0
  261. data/features/backoffice/editable_elements.feature +22 -0
  262. data/features/backoffice/login.feature +33 -0
  263. data/features/backoffice/mounting.feature +13 -0
  264. data/features/backoffice/pages.feature +35 -0
  265. data/features/backoffice/site.feature +45 -0
  266. data/features/backoffice/snippets.feature +39 -0
  267. data/features/backoffice/theme_assets.feature +72 -0
  268. data/features/backoffice/translations.feature +44 -0
  269. data/features/public/basic.feature +30 -0
  270. data/features/public/contact_form.feature +78 -0
  271. data/features/public/content_entries.feature +56 -0
  272. data/features/public/editable_elements.feature +138 -0
  273. data/features/public/has_many.feature +8 -0
  274. data/features/public/inheritance.feature +157 -0
  275. data/features/public/inline_front_end_editing.feature +26 -0
  276. data/features/public/many_to_many.feature +64 -0
  277. data/features/public/pagination.feature +8 -0
  278. data/features/public/robots.feature +22 -0
  279. data/features/public/sitemap.feature +74 -0
  280. data/features/public/snippets.feature +21 -0
  281. data/features/public/tablerow.feature +42 -0
  282. data/features/step_definitions/api_steps.rb +176 -0
  283. data/features/step_definitions/backoffice/mounting_steps.rb +22 -0
  284. data/features/step_definitions/backoffice_steps.rb +43 -0
  285. data/features/step_definitions/content_assets_steps.rb +12 -0
  286. data/features/step_definitions/content_types_steps.rb +106 -0
  287. data/features/step_definitions/current_site_steps.rb +43 -0
  288. data/features/step_definitions/editable_elements_steps.rb +24 -0
  289. data/features/step_definitions/membership_steps.rb +19 -0
  290. data/features/step_definitions/more_web_steps.rb +96 -0
  291. data/features/step_definitions/page_steps.rb +110 -0
  292. data/features/step_definitions/pagination_steps.rb +35 -0
  293. data/features/step_definitions/pickle_steps.rb +100 -0
  294. data/features/step_definitions/relationships_steps.rb +107 -0
  295. data/features/step_definitions/site_steps.rb +100 -0
  296. data/features/step_definitions/snippet_steps.rb +37 -0
  297. data/features/step_definitions/theme_asset_steps.rb +64 -0
  298. data/features/step_definitions/translation_steps.rb +7 -0
  299. data/features/step_definitions/web_steps.rb +197 -0
  300. data/features/step_definitions/within_steps.rb +14 -0
  301. data/features/support/cleaner.rb +4 -0
  302. data/features/support/env.rb +82 -0
  303. data/features/support/factory_girl.rb +2 -0
  304. data/features/support/http.rb +22 -0
  305. data/features/support/paths.rb +62 -0
  306. data/features/support/pickle.rb +24 -0
  307. data/features/support/selectors.rb +57 -0
  308. data/lib/generators/locomotive/install/install_generator.rb +5 -0
  309. data/lib/generators/locomotive/install/templates/dragonfly.rb +2 -3
  310. data/lib/generators/locomotive/install/templates/locomotive.rb +2 -2
  311. data/lib/locomotive.rb +13 -2
  312. data/lib/locomotive/action_controller/locale_helpers.rb +1 -1
  313. data/lib/locomotive/action_controller/public_responder.rb +17 -1
  314. data/lib/locomotive/action_controller/responder.rb +3 -2
  315. data/lib/locomotive/action_controller/url_helpers.rb +1 -1
  316. data/lib/locomotive/cancan.rb +22 -0
  317. data/lib/locomotive/carrierwave.rb +2 -0
  318. data/lib/locomotive/carrierwave/asset.rb +17 -7
  319. data/lib/locomotive/configuration.rb +6 -2
  320. data/lib/locomotive/core_ext.rb +5 -4
  321. data/lib/locomotive/custom_fields.rb +11 -0
  322. data/lib/locomotive/dependencies.rb +3 -3
  323. data/lib/locomotive/dragonfly.rb +1 -1
  324. data/lib/locomotive/engine.rb +24 -8
  325. data/lib/locomotive/formtastic.rb +26 -1
  326. data/lib/locomotive/liquid/drops/current_user.rb +2 -2
  327. data/lib/locomotive/liquid/drops/page.rb +5 -1
  328. data/lib/locomotive/liquid/filters/date.rb +19 -0
  329. data/lib/locomotive/liquid/filters/html.rb +7 -7
  330. data/lib/locomotive/liquid/filters/misc.rb +5 -7
  331. data/lib/locomotive/liquid/filters/text.rb +11 -0
  332. data/lib/locomotive/liquid/filters/translate.rb +16 -0
  333. data/lib/locomotive/liquid/patches.rb +21 -0
  334. data/lib/locomotive/liquid/tags/consume.rb +13 -2
  335. data/lib/locomotive/liquid/tags/csrf.rb +3 -3
  336. data/lib/locomotive/liquid/tags/editable/base.rb +11 -4
  337. data/lib/locomotive/liquid/tags/inline_editor.rb +5 -2
  338. data/lib/locomotive/liquid/tags/locale_switcher.rb +12 -4
  339. data/lib/locomotive/liquid/tags/nav.rb +1 -1
  340. data/lib/locomotive/liquid/tags/paginate.rb +4 -1
  341. data/lib/locomotive/liquid/tags/seo.rb +2 -2
  342. data/lib/locomotive/liquid/tags/snippet.rb +10 -2
  343. data/lib/locomotive/liquid/tags/with_scope.rb +11 -0
  344. data/lib/locomotive/middlewares.rb +2 -1
  345. data/lib/locomotive/middlewares/fonts.rb +2 -2
  346. data/lib/locomotive/middlewares/permalink.rb +22 -0
  347. data/lib/locomotive/misc/api_documentation.rb +114 -0
  348. data/lib/locomotive/misc/api_documentation/bootstrap.html.haml +196 -0
  349. data/lib/locomotive/mongoid.rb +2 -1
  350. data/lib/locomotive/mongoid/document.rb +3 -2
  351. data/lib/locomotive/mongoid/liquid.rb +39 -0
  352. data/lib/locomotive/mongoid/presenter.rb +73 -0
  353. data/lib/locomotive/presentable.rb +216 -0
  354. data/lib/locomotive/render.rb +76 -24
  355. data/lib/locomotive/routing/site_dispatcher.rb +15 -4
  356. data/lib/locomotive/version.rb +1 -1
  357. data/lib/tasks/development.rake +29 -0
  358. data/lib/tasks/locomotive.rake +58 -7
  359. data/spec/cells/locomotive/global_actions_spec.rb +98 -0
  360. data/spec/cells/locomotive/main_menu_cell_spec.rb +99 -0
  361. data/spec/cells/locomotive/settings_menu_cell_spec.rb +107 -0
  362. data/spec/dummy/Rakefile +7 -0
  363. data/spec/dummy/app/assets/javascripts/application.js +9 -0
  364. data/spec/dummy/app/assets/javascripts/locomotive_misc.js.coffee +2 -0
  365. data/spec/dummy/app/assets/stylesheets/application.css +7 -0
  366. data/spec/dummy/app/cells/locomotive/main_menu_cell.rb +9 -0
  367. data/spec/dummy/app/controllers/application_controller.rb +3 -0
  368. data/spec/dummy/app/controllers/foo_controller.rb +10 -0
  369. data/spec/dummy/app/helpers/application_helper.rb +2 -0
  370. data/spec/dummy/app/models/foo.rb +7 -0
  371. data/spec/dummy/app/views/foo/index.html.haml +1 -0
  372. data/spec/dummy/app/views/layouts/application.html.erb +14 -0
  373. data/spec/dummy/app/views/locomotive/shared/_main_app_head.html.haml +1 -0
  374. data/spec/dummy/config.ru +4 -0
  375. data/spec/dummy/config/application.rb +57 -0
  376. data/spec/dummy/config/boot.rb +20 -0
  377. data/spec/dummy/config/environment.rb +5 -0
  378. data/spec/dummy/config/environments/development.rb +38 -0
  379. data/spec/dummy/config/environments/production.rb +60 -0
  380. data/spec/dummy/config/environments/test.rb +39 -0
  381. data/spec/dummy/config/initializers/carrierwave.rb +8 -0
  382. data/spec/dummy/config/initializers/devise.rb +190 -0
  383. data/spec/dummy/config/initializers/dragonfly.rb +21 -0
  384. data/spec/dummy/config/initializers/formtastic.rb +5 -0
  385. data/spec/dummy/config/initializers/haml.rb +2 -0
  386. data/spec/dummy/config/initializers/locomotive.rb +80 -0
  387. data/spec/dummy/config/initializers/secret_token.rb +7 -0
  388. data/spec/dummy/config/initializers/session_store.rb +8 -0
  389. data/spec/dummy/config/initializers/wrap_parameters.rb +14 -0
  390. data/spec/dummy/config/locales/en.yml +10 -0
  391. data/spec/dummy/config/locales/fr.yml +10 -0
  392. data/spec/dummy/config/mongoid.yml +23 -0
  393. data/spec/dummy/config/routes.rb +9 -0
  394. data/spec/dummy/public/404.html +26 -0
  395. data/spec/dummy/public/422.html +26 -0
  396. data/spec/dummy/public/500.html +26 -0
  397. data/spec/dummy/script/rails +6 -0
  398. data/spec/fixtures/assets/5k.png +0 -0
  399. data/spec/fixtures/assets/5k_2.png +0 -0
  400. data/spec/fixtures/assets/application.js +1 -0
  401. data/spec/fixtures/assets/main.css +1 -0
  402. data/spec/fixtures/assets/wrong.txt +1 -0
  403. data/spec/fixtures/images/logo1.jpg +0 -0
  404. data/spec/fixtures/images/logo2.jpg +0 -0
  405. data/spec/lib/core_ext_spec.rb +37 -0
  406. data/spec/lib/locomotive/configuration_spec.rb +26 -0
  407. data/spec/lib/locomotive/httparty/webservice_spec.rb +33 -0
  408. data/spec/lib/locomotive/liquid/drops/content_entry_spec.rb +46 -0
  409. data/spec/lib/locomotive/liquid/drops/current_user.rb +63 -0
  410. data/spec/lib/locomotive/liquid/drops/page_spec.rb +143 -0
  411. data/spec/lib/locomotive/liquid/drops/site_spec.rb +32 -0
  412. data/spec/lib/locomotive/liquid/filters/date_spec.rb +68 -0
  413. data/spec/lib/locomotive/liquid/filters/html_spec.rb +224 -0
  414. data/spec/lib/locomotive/liquid/filters/misc_spec.rb +56 -0
  415. data/spec/lib/locomotive/liquid/filters/resize_spec.rb +61 -0
  416. data/spec/lib/locomotive/liquid/filters/text_spec.rb +32 -0
  417. data/spec/lib/locomotive/liquid/filters/translate_spec.rb +50 -0
  418. data/spec/lib/locomotive/liquid/tags/consume_spec.rb +52 -0
  419. data/spec/lib/locomotive/liquid/tags/csrf_spec.rb +26 -0
  420. data/spec/lib/locomotive/liquid/tags/editable/short_text_spec.rb +46 -0
  421. data/spec/lib/locomotive/liquid/tags/extends_spec.rb +58 -0
  422. data/spec/lib/locomotive/liquid/tags/locale_switcher_spec.rb +47 -0
  423. data/spec/lib/locomotive/liquid/tags/nav_spec.rb +142 -0
  424. data/spec/lib/locomotive/liquid/tags/paginate_spec.rb +139 -0
  425. data/spec/lib/locomotive/liquid/tags/seo_spec.rb +135 -0
  426. data/spec/lib/locomotive/liquid/tags/with_scope_spec.rb +49 -0
  427. data/spec/lib/locomotive/presentable_spec.rb +184 -0
  428. data/spec/lib/locomotive/render_spec.rb +209 -0
  429. data/spec/lib/locomotive/routing/site_dispatcher_spec.rb +258 -0
  430. data/spec/mailers/locomotive/notifications_spec.rb +57 -0
  431. data/spec/models/locomotive/ability_spec.rb +132 -0
  432. data/spec/models/locomotive/account_spec.rb +87 -0
  433. data/spec/models/locomotive/content_asset_spec.rb +46 -0
  434. data/spec/models/locomotive/content_entry_spec.rb +269 -0
  435. data/spec/models/locomotive/content_type_spec.rb +391 -0
  436. data/spec/models/locomotive/editable_control_spec.rb +70 -0
  437. data/spec/models/locomotive/editable_file_spec.rb +95 -0
  438. data/spec/models/locomotive/editable_long_text_spec.rb +50 -0
  439. data/spec/models/locomotive/editable_short_text_spec.rb +174 -0
  440. data/spec/models/locomotive/extensions/page/editable_elements_spec.rb +67 -0
  441. data/spec/models/locomotive/extensions/page/redirect_spec.rb +28 -0
  442. data/spec/models/locomotive/extensions/page/render_spec.rb +88 -0
  443. data/spec/models/locomotive/extensions/site/locales_spec.rb +52 -0
  444. data/spec/models/locomotive/extensions/site/subdomain_domains_spec.rb +25 -0
  445. data/spec/models/locomotive/membership_spec.rb +61 -0
  446. data/spec/models/locomotive/page_spec.rb +427 -0
  447. data/spec/models/locomotive/site_spec.rb +176 -0
  448. data/spec/models/locomotive/snippet_spec.rb +77 -0
  449. data/spec/models/locomotive/theme_asset_spec.rb +128 -0
  450. data/spec/requests/seo_trailing_slash_spec.rb +25 -0
  451. data/spec/support/carrierwave.rb +50 -0
  452. data/spec/support/cells.rb +3 -0
  453. data/spec/support/controller.rb +32 -0
  454. data/spec/support/factories.rb +156 -0
  455. data/spec/support/locomotive.rb +37 -0
  456. data/spec/support/matchers.rb +127 -0
  457. data/spec/support/middlewares.rb +0 -0
  458. data/vendor/assets/fonts/locomotive/fontawesome-webfont.eot +0 -0
  459. data/vendor/assets/fonts/locomotive/fontawesome-webfont.svg +255 -0
  460. data/vendor/assets/fonts/locomotive/fontawesome-webfont.ttf +0 -0
  461. data/vendor/assets/fonts/locomotive/fontawesome-webfont.woff +0 -0
  462. data/vendor/assets/javascripts/locomotive/backbone.modelbinding.js +34 -9
  463. data/vendor/assets/javascripts/locomotive/backbone.sync.js +2 -2
  464. data/vendor/assets/javascripts/locomotive/form_submit_notification.js +2 -2
  465. data/vendor/assets/javascripts/locomotive/growl.js +10 -10
  466. data/vendor/assets/javascripts/locomotive/menu_toggler.js +8 -4
  467. data/vendor/assets/javascripts/locomotive/slugify.js +21 -5
  468. data/vendor/assets/stylesheets/locomotive/font-awesome.scss +329 -0
  469. data/vendor/assets/stylesheets/locomotive/jquery/{ui.css → ui.css.scss} +19 -19
  470. metadata +538 -195
  471. data/app/assets/images/locomotive/background/light.png +0 -0
  472. data/app/assets/images/locomotive/datepicker/ui-widget-left-icon.png +0 -0
  473. data/app/assets/images/locomotive/datepicker/ui-widget-right-icon.png +0 -0
  474. data/app/assets/images/locomotive/form/folded-arrow-off.png +0 -0
  475. data/app/assets/images/locomotive/form/folded-arrow-on.png +0 -0
  476. data/app/assets/images/locomotive/form/icons/drag.png +0 -0
  477. data/app/assets/images/locomotive/form/icons/edit.png +0 -0
  478. data/app/assets/images/locomotive/form/icons/error.png +0 -0
  479. data/app/assets/images/locomotive/form/icons/spinner.gif +0 -0
  480. data/app/assets/images/locomotive/form/icons/trash.png +0 -0
  481. data/app/assets/images/locomotive/form/pen.png +0 -0
  482. data/app/assets/images/locomotive/form/spinner.gif +0 -0
  483. data/app/assets/images/locomotive/icons/actions.png +0 -0
  484. data/app/assets/images/locomotive/icons/asset_add.png +0 -0
  485. data/app/assets/images/locomotive/icons/asset_switch.png +0 -0
  486. data/app/assets/images/locomotive/icons/membership_edit.png +0 -0
  487. data/app/assets/images/locomotive/icons/membership_lock.png +0 -0
  488. data/app/assets/images/locomotive/inline_editor/back.png +0 -0
  489. data/app/assets/images/locomotive/list/icons/cross.png +0 -0
  490. data/app/assets/images/locomotive/list/icons/drag.png +0 -0
  491. data/app/assets/images/locomotive/list/icons/move.png +0 -0
  492. data/app/assets/images/locomotive/list/icons/move_off.png +0 -0
  493. data/app/assets/images/locomotive/list/icons/node_closed.png +0 -0
  494. data/app/assets/images/locomotive/list/icons/node_open.png +0 -0
  495. data/app/assets/images/locomotive/list/icons/pencil.png +0 -0
  496. data/app/assets/images/locomotive/list/icons/pencil_off.png +0 -0
  497. data/app/assets/images/locomotive/list/icons/popup.png +0 -0
  498. data/app/assets/images/locomotive/list/icons/popup_off.png +0 -0
  499. data/app/assets/images/locomotive/list/icons/redirect.png +0 -0
  500. data/app/assets/images/locomotive/list/icons/states.png +0 -0
  501. data/app/assets/images/locomotive/list/icons/template.png +0 -0
  502. data/app/assets/images/locomotive/list/icons/toggle.png +0 -0
  503. data/app/assets/images/locomotive/list/icons/toggle_off.png +0 -0
  504. data/app/assets/images/locomotive/list/icons/trash.png +0 -0
  505. data/app/assets/images/locomotive/list/icons/trash_off.png +0 -0
  506. data/app/assets/images/locomotive/menu/icons.png +0 -0
  507. data/app/assets/images/locomotive/menu/popup/add.png +0 -0
  508. data/app/assets/images/locomotive/menu/popup/bottom-right-corner.png +0 -0
  509. data/app/assets/images/locomotive/menu/popup/bullet.png +0 -0
  510. data/app/assets/images/locomotive/plugins/selectmenu/arrow.png +0 -0
  511. data/app/assets/images/locomotive/plugins/selectmenu/background.png +0 -0
  512. data/app/assets/images/locomotive/plugins/sites_picker_entry_bg.png +0 -0
  513. data/app/assets/images/locomotive/simple/light_bg.png +0 -0
  514. data/app/assets/images/locomotive/simple/wrapper_bg.png +0 -0
  515. data/app/assets/stylesheets/locomotive/backoffice/menu/_icons.css.scss +0 -30
  516. data/app/uploaders/locomotive/theme_uploader.rb +0 -19
  517. data/lib/locomotive/mongoid/model_extensions.rb +0 -1
  518. data/lib/tasks/cucumber.rake +0 -66
  519. data/vendor/assets/stylesheets/locomotive/jquery.css +0 -3
@@ -12,6 +12,7 @@ de:
12
12
  unconfirmed: 'Du musst deinen Account aktivieren bevor es weiter geht.'
13
13
  locked: 'Dein Account ist gesperrt.'
14
14
  invalid: 'Ungültige Email oder falsches Passwort.'
15
+ not_found_in_database: 'Ungültige Email oder falsches Passwort.'
15
16
  invalid_token: 'Ungültiges Authentifizierungs-Merkmal.'
16
17
  timeout: 'Deine Session ist abgelaufe. Bitte logge dich erneut ein, dann geht es weiter.'
17
18
  inactive: 'Dein Account wurde noch nicht aktiviert.'
@@ -12,6 +12,7 @@ en:
12
12
  unconfirmed: 'You have to confirm your account before continuing.'
13
13
  locked: 'Your account is locked.'
14
14
  invalid: 'Invalid email or password.'
15
+ not_found_in_database: 'Invalid email or password.'
15
16
  no_membership: 'Your account is not a member of this site, please contact the site administrator to gain access.'
16
17
  invalid_token: 'Invalid authentication token.'
17
18
  timeout: 'Your session expired, please sign in again to continue.'
@@ -12,6 +12,7 @@ es:
12
12
  unconfirmed: 'Debe confirmar su cuenta para continuar.'
13
13
  locked: 'Su cuenta está bloqueada.'
14
14
  invalid: 'Email o clave no válidos.'
15
+ not_found_in_database: 'Email o clave no válidos.'
15
16
  no_membership: 'Su cuenta no es miembro de este sitio. Por favor contacte con su administrador para obtener acceso.'
16
17
  invalid_token: 'Token de autenticación no válido.'
17
18
  timeout: 'Su sesión ha expirado. Por favor inicie una nueva sesión para continuar.'
@@ -13,6 +13,7 @@ et:
13
13
  unconfirmed: 'Pead kinnitama oma konto enne jätkamist.'
14
14
  locked: 'Sinu konto on lukus.'
15
15
  invalid: 'Vale email või parool.'
16
+ not_found_in_database: 'Vale email või parool.'
16
17
  no_membership: 'Sinu konto ei ole selle saidi liige, palun võta ühendust saidi administraatoriga, et ligipääsu saada.'
17
18
  invalid_token: 'Vale autentimise identsustõend.'
18
19
  timeout: 'Sinu sessioon aegus, palun logi sisse uuesti, et jätkata.'
@@ -1,7 +1,7 @@
1
1
  fr:
2
2
  errors:
3
3
  messages:
4
- not_found: "pas trouvé"
4
+ not_found: "non trouvé"
5
5
  already_confirmed: "était déjà confirmé"
6
6
  not_locked: "n'était pas verouillé"
7
7
 
@@ -12,6 +12,7 @@ fr:
12
12
  unconfirmed: "Vous devez confirmer votre compte avant de poursuivre."
13
13
  locked: "Votre compte a été vérrouillé."
14
14
  invalid: "Identifiant ou mot de passe invalide."
15
+ not_found_in_database: "Identifiant ou mot de passe invalide."
15
16
  invalid_token: "Jeton d'authentification invalide."
16
17
  timeout: "Votre session a expiré, veuillez vous reconnecter pour poursuivre."
17
18
  inactive: "Votre compte n'a pas encore été activé."
@@ -60,7 +61,7 @@ fr:
60
61
  unchange_password_message: "Votre mot de passe ne sera pas changé tant vous n'aurez pas accédé au lien ci-dessus pour en créer un nouveau."
61
62
  unlock_instructions:
62
63
  # For "Your account has been locked due to an excessive amount of unsuccessful sign in attempts."
63
- locked_account_message: "Votre compte est verrouillé car vous avez échoué lors de votre identification trop de fois."
64
+ locked_account_message: "Votre compte est verrouillé par sécurité suite à un trop grand nombre d'identifications erronées."
64
65
  # For "Click the link below to unlock your account"
65
66
  unlock_account_instruction: "Cliquez sur le lien ci-dessous pour déverrouiller votre compte:"
66
67
  unlock_my_account: "Déverrouiller mon compte"
@@ -12,6 +12,7 @@ it:
12
12
  unconfirmed: "E' necessario confermare l'account prima di continuare."
13
13
  locked: 'Il tuo account è bloccato.'
14
14
  invalid: 'Email o password non validi.'
15
+ not_found_in_database: 'Email o password non validi.'
15
16
  no_membership: "Il tuo account non è un membro di questo sito, si prega di contattare l'amministratore del sito per ottenere l'accesso."
16
17
  invalid_token: 'Token di autenticazione non valido.'
17
18
  timeout: 'La tua sessione è scaduta, si prega di accedere nuovamente per continuare.'
@@ -12,6 +12,7 @@ nb:
12
12
  unconfirmed: 'Kontoen må aktiveres før du kan fortsette.'
13
13
  locked: 'Brukerkontoen er sperret.'
14
14
  invalid: 'Ugyldig epost eller passord.'
15
+ not_found_in_database: 'Ugyldig epost eller passord.'
15
16
  no_membership: 'Kontoen din er ikke medlem av denne siden, kontakt administrator for å få tilgang.'
16
17
  invalid_token: 'Invalid authentication token.'
17
18
  timeout: 'Innloggingen har utløpt. Logg inn på nytt for å fortsette.'
@@ -12,6 +12,7 @@ nl:
12
12
  unconfirmed: 'You have to confirm your account before continuing.'
13
13
  locked: 'Your account is locked.'
14
14
  invalid: 'Invalid email or password.'
15
+ not_found_in_database: 'Invalid email or password.'
15
16
  no_membership: 'Your account is not a member of this site, please contact the site administrator to gain access.'
16
17
  invalid_token: 'Invalid authentication token.'
17
18
  timeout: 'Your session expired, please sign in again to continue.'
@@ -0,0 +1,64 @@
1
+ pl:
2
+ errors:
3
+ messages:
4
+ not_found: "nie znaleziono"
5
+ already_confirmed: "już zostało potwierdzone"
6
+ not_locked: "nie było zablokowane"
7
+
8
+ devise:
9
+ failure:
10
+ locomotive_account:
11
+ unauthenticated: 'Musisz się zalogować lub zarejestrować, aby kontynuować.'
12
+ unconfirmed: 'Musisz dokonać potwierdzenia konta, aby kontunuować.'
13
+ locked: 'Twoje konto jest zablokowane.'
14
+ invalid: 'Niewłaściwy adres e-mailowy lub hasło.'
15
+ not_found_in_database: 'Niewłaściwy adres e-mailowy lub hasło.'
16
+ no_membership: 'Twoje konto nie należy do tej witryny. Skontaktuj się z jej administratorem, aby uzyskać dostęp.'
17
+ invalid_token: 'Błędny token uwierzytelniający.'
18
+ timeout: 'Twoja sesja wygasła, proszę zaloguj się ponownie, aby kontynuować.'
19
+ inactive: 'Twoje konto nie zostało jeszcze aktywowane.'
20
+ sessions:
21
+ locomotive_account:
22
+ signed_in: 'Zalogowano Cię pomyślnie.'
23
+ signed_out: 'Wylogowano Cię pomyślnie.'
24
+ passwords:
25
+ locomotive_account:
26
+ send_instructions: 'W ciągu kilku minut otrzymasz e-mail z instrukcjami dotyczącymi sposobu przywracania hasła.'
27
+ updated: 'Twoje hasło zostało pomyślnie zmienione. Zalogowano Cię automatycznie.'
28
+ confirmations:
29
+ locomotive_account:
30
+ send_instructions: 'W ciągu kilku minut otrzymasz e-maila z instrukcjami dotyczącymi sposobu aktywowania konta.'
31
+ confirmed: 'Twoje konto zostało aktywowane. Zalogowano Cię automatycznie.'
32
+ registrations:
33
+ locomotive_account:
34
+ signed_up: 'Zarejestrowano Cię pomyślnie.'
35
+ updated: 'Pomyślnie zaktualizowano informacje o koncie.'
36
+ destroyed: 'Pa! Pomyślnie unieważniono Twoje konto. Mamy nadzieję, że jeszcze kiedyś tu wrócisz.'
37
+ unlocks:
38
+ locomotive_account:
39
+ send_instructions: 'W ciągu kilku minut otrzymasz e-maila z instrukcjami dotyczącymi procesu odblokowywania konta.'
40
+ unlocked: 'Twoje konto zostało pomyślnie odblokowane. Zalogowano Cię automatycznie.'
41
+ mailer:
42
+ locomotive_account:
43
+ confirmation_instructions: 'Instrukcje aktywowania konta'
44
+ reset_password_instructions: 'Instrukcje przywracania hasła'
45
+ unlock_instructions: 'Instrukcje odblokowywania'
46
+
47
+
48
+ locomotive_account:
49
+ devise_mailer:
50
+ common:
51
+ hello: Witaj
52
+
53
+ confirmation_instructions:
54
+ you_can_confirm_your_account_through_the_link_below: "Możesz aktywować swoje konto, korzystając z poniższego odnośńika:"
55
+ confirm_my_account: "Potwierdź moje konto"
56
+ reset_password_instructions:
57
+ reset_password_instruction: "Ktoś (być może Ty) zażądał odnośnika służącego do zmiany Twojego hasła. Możesz to zrobić klikając poniższy odnośnik:"
58
+ change_my_password: "Zmień hasło"
59
+ wrong_request_instruction: "Jeśli zlecenie nie pochodziło od Ciebie, zignoruj proszę tę wiadomość."
60
+ unchange_password_message: "Twoje hasło nie zostanie zmienione dopóki nie odwiedzisz zasobu wskazywanego przez odnośnik i nie wprowadzisz nowego hasła."
61
+ unlock_instructions:
62
+ locked_account_message: "Twoje konto zostało zablokowane z powodu dużej liczby nieudanych prób zalogowania."
63
+ unlock_account_instruction: "Kliknij poniższy odnośnik, aby odblokować swoje konto:"
64
+ unlock_my_account: "Odblokuj moje konto"
@@ -12,6 +12,7 @@ pt-BR:
12
12
  unconfirmed: 'Você deve confirmar sua conta antes de continuar.'
13
13
  locked: 'Sua conta está bloquada.'
14
14
  invalid: 'Email ou senha inválidos.'
15
+ not_found_in_database: 'Email ou senha inválidos.'
15
16
  invalid_token: 'Autenticação inválida.'
16
17
  timeout: 'Sua sessão expirou. Por favor, faça o login novamente para continuar.'
17
18
  inactive: 'Sua conta não foi ativada ainda.'
@@ -12,6 +12,7 @@ ru:
12
12
  unconfirmed: 'Вы должны подтвердить аккаунт перед продолжением.'
13
13
  locked: 'Ваш аккаунт заблокирован.'
14
14
  invalid: 'Неверный email или пароль.'
15
+ not_found_in_database: 'Неверный email или пароль.'
15
16
  no_membership: 'Ваш аккаунт не зарегистирован на сайте, пожалуйста обратитесь к администратору сайта для получения доступа.'
16
17
  invalid_token: 'Неверный authentication token.'
17
18
  timeout: 'Срок действия вашей сессии истек, пожалуйста залогиньтесь для продолжения.'
@@ -90,6 +90,15 @@ en:
90
90
  alert: "File was not updated."
91
91
  destroy:
92
92
  notice: "File was successfully deleted."
93
+ translations:
94
+ create:
95
+ notice: "Translation was successfully created."
96
+ alert: "Translation was not created."
97
+ update:
98
+ notice: "Translation was successfully updated."
99
+ alert: "Translation was not updated."
100
+ destroy:
101
+ notice: "Translation was successfully deleted."
93
102
 
94
103
  custom_fields:
95
104
  update:
@@ -0,0 +1,106 @@
1
+ pl:
2
+ flash:
3
+ locomotive:
4
+ pages:
5
+ create:
6
+ notice: "Strona została pomyślnie utworzona."
7
+ alert: "Strona nie została utworzona."
8
+ update:
9
+ notice: "Strona została pomyślnie zaktualizowana."
10
+ alert: "Strona nie została zaktualizowana."
11
+ sort:
12
+ notice: "Strony zostały pomyślnie posortowane."
13
+ destroy:
14
+ notice: "Strona została pomyślnie usunięta."
15
+
16
+ content_entries:
17
+ create:
18
+ notice: "Treść została pomyślnie utworzona."
19
+ alert: "Treść nie została utworzona."
20
+ update:
21
+ notice: "Treść została pomyślnie zaktualizowana."
22
+ alert: "Treść nie została zaktualizowana."
23
+ sort:
24
+ notice: "Pozycje zostały pomyślnie posortowane."
25
+ destroy:
26
+ notice: "Treść została pomyślnie usunięta."
27
+
28
+ content_types:
29
+ create:
30
+ notice: "Model został pomyślnie utworzony."
31
+ alert: "Model nie został utworzony."
32
+ update:
33
+ notice: "Model został pomyślnie zaktualizowany."
34
+ alert: "Model nie został zaktualizowany."
35
+ destroy:
36
+ notice: "Model został pomyślnie usunięty."
37
+
38
+ current_site:
39
+ update:
40
+ notice: "Bieżąca witryna została pomyślnie zaktualizowana."
41
+ alert: "Bieżąca witryna nie została zaktualizowana."
42
+
43
+ snippets:
44
+ create:
45
+ notice: "Wstawka została pomyślnie utworzona."
46
+ alert: "Wstawka nie została utworzona."
47
+ update:
48
+ notice: "Wstawka została pomyślnie zaktualizowana."
49
+ alert: "Wstawka nie została zaktualizowana."
50
+ destroy:
51
+ notice: "Wstawka została pomyślnie usunięta."
52
+
53
+ accounts:
54
+ create:
55
+ notice: "Konto zostało pomyślnie utworzone."
56
+ alert: "Konto nie zostało utworzone."
57
+
58
+ my_account:
59
+ update:
60
+ notice: "Konto zostało pomyślnie zaktualizowane."
61
+ alert: "Konto nie zostało zaktualizowane."
62
+
63
+ sites:
64
+ create:
65
+ notice: "Witryna została pomyślnie utworzona."
66
+ alert: "Witryna nie została utworzona."
67
+ destroy:
68
+ notice: "Witryna została pomyślnie usunięta."
69
+
70
+ memberships:
71
+ create:
72
+ notice: "Członkostwo zostało pomyślnie utworzone."
73
+ alert: "Członkostwo nie zostało utworzone."
74
+ already_created: "Konto już jest przypisane do bieżącej strony."
75
+
76
+ assets:
77
+ create:
78
+ notice: "Zasób został pomyślnie utworzony."
79
+ alert: "Zasób nie został utworzony."
80
+ update:
81
+ notice: "Zasób został pomyślnie zaktualizowany."
82
+ alert: "Zasób nie został zaktualizowany."
83
+
84
+ theme_assets:
85
+ create:
86
+ notice: "Plik został pomyślnie utworzony."
87
+ alert: "Plik nie został utworzony."
88
+ update:
89
+ notice: "Plik został pomyślnie zaktualizowany."
90
+ alert: "Plik nie został zaktualizowany."
91
+ destroy:
92
+ notice: "Plik został pomyślnie usunięty."
93
+
94
+ custom_fields:
95
+ update:
96
+ alert: "Pole nie zaktualizowane"
97
+
98
+ cross_domain_sessions:
99
+ create:
100
+ alert: "Musisz się zalogować"
101
+
102
+ import:
103
+ create:
104
+ done: "Twoja witryna została pomyślnie zaktualizowana."
105
+ notice: "Twoja witryna jest aktualizowana."
106
+ alert: "Nie ukończono importowania."
@@ -76,6 +76,8 @@ en:
76
76
  slug: "You do not need to add the extension file (.css or .js)"
77
77
  edit:
78
78
  source: "You can replace it by a file of the same extension"
79
+ translation:
80
+ key: "Do not use dash but underscore instead. Example: welcome_message."
79
81
  asset:
80
82
  source: "All file types are accepted."
81
83
  edit:
@@ -54,7 +54,7 @@ fr:
54
54
  published: "Seuls les administrateurs authentifiés peuvent voir une page non publiée."
55
55
  cache_strategy: "Cache la page pour de meilleure performance. L'option 'Simple' est le meilleur compromis."
56
56
  templatized: "Utilise la page comme un template pour un modèle défini."
57
- listed: "Controle si la page doit être visible depuis les menus automatiquement générés."
57
+ listed: "Contrôle si la page doit être visible depuis les menus automatiquement générés."
58
58
  target_klass_name: "Le type du contenu pour lequel cette page est un template."
59
59
  seo_title: "Définit un titre de page à mettre dans la balise TITLE de la page. Laissez le blanc pour utiliser la valeur par défaut (voir configuration du site)."
60
60
  meta_keywords: "Redéfinit les mots-clés du site. Utilisés à l'intérieur de la balise HEAD. Ils sont séparés par une virgule."
@@ -70,6 +70,8 @@ fr:
70
70
  plain_text_name: "Vous n'avez pas besoin de mettre l'extension du fichier (.css ou .js)"
71
71
  edit:
72
72
  source: "Vous pouvez le remplacer par un fichier avec la meme extension."
73
+ translation:
74
+ key: "Ne pas utiliser '-' mais plutot '_'. Exemple: welcome_message."
73
75
  asset:
74
76
  source: "Tous les types de fichier sont acceptés."
75
77
  edit:
@@ -0,0 +1,105 @@
1
+ pl:
2
+ formtastic:
3
+ titles:
4
+ information: Informacje ogólne
5
+ advanced_options: Ustawienia zaawansowane
6
+ meta: Metadane SEO
7
+ seo: Ustawienia SEO
8
+ robots_txt: Plik Robots.txt
9
+ code: Kod
10
+ raw_template: Szablon
11
+ credentials: Informacje uwierzytelniające
12
+ language: Język
13
+ sites: Witryny
14
+ access_points: Punkty dostępowe
15
+ memberships: Konta
16
+ membership_email: Adres e-mailowy konta
17
+ file: Plik
18
+ preview: Podgląd
19
+ options: Ustawienia zaawansowane
20
+ custom_fields: Pola własne
21
+ other_fields: Inne informacje
22
+ presentation: Prezentacja
23
+ attributes: Atrybuty
24
+ upload: Wysyłanie
25
+ labels:
26
+ theme_asset:
27
+ plain_text_name: Nazwa pliku
28
+ content_type: Typ pliku
29
+ new:
30
+ source: Plik
31
+ edit:
32
+ source: Zastąp plikiem
33
+ custom_fields:
34
+ form:
35
+ empty: Brak pól
36
+ field:
37
+ name: Nazwa
38
+ content_type:
39
+ raw_item_template: Szablon treści
40
+ public_submission_enabled: Publiczne wprowadzanie
41
+ public_submission_accounts: Odbiorcy powiadomień
42
+ "custom_fields/field":
43
+ select_options: "Opcje"
44
+ content_entry:
45
+ _slug: Odnośnik bezpośredni
46
+ account:
47
+ edit:
48
+ locale: Język interfejsu
49
+ password: Nowe hasło
50
+ password_confirmation: Powtórzenie hasła
51
+ page:
52
+ seo_title: Tytuł
53
+ target_klass_name: Model
54
+ site:
55
+ locales: Języki
56
+
57
+ hints:
58
+ page:
59
+ handle: "Unikatowy identyfikator służący do pobierania tej strony z użyciem zewnętrznej instancji kontrolera."
60
+ published: "Tylko uwierzytelnieni użytkownicy mogą oglądać nieopublikowane strony."
61
+ cache_strategy: "Buforuj zawartość strony w celu polepszenia wydajności. Wybór opcji 'proste' jest dobrym kompromisem między wydajnością, a aktualnością informacji."
62
+ templatized: "Użyj tej strony jako szablonu dla stworzonego modelu."
63
+ listed: "Decyduj czy strona powinna ukazywać się w generowanych menu."
64
+ target_klass_name: "Typ zawartości, dla której ta strona będzie szablonem."
65
+ seo_title: "Określ tytuł strony, który będzie użyty jako wartość dla znacznika title umieszczanego w sekcji head kodu HTML. Pozostaw to pole puste, jeśli chcesz, aby wykorzystana została domyślna wartość określona ustawieniami witryny."
66
+ meta_keywords: "Nadpisz słowa kluczowe (meta keywords) umieszczane w sekcji head kodu HTML. Słowa powinny być oddzielone przecinkami."
67
+ meta_description: "Nadpisz znacznik opisu (meta description) umieszczanego w sekcji head kodu HTML."
68
+ snippet:
69
+ slug: "Musisz go znać, aby umieścić wstawkę w stronie."
70
+ site:
71
+ locales: "Przeciągnij flagę i upuść ją na pozycję, która ma stać się wartością domyślną."
72
+ seo_title: "Zdefiniuj globalną wartość, która będzie używana jako tytuł (znacznik title w sekcji head kodu HTML)."
73
+ meta_keywords: "Oddzielone przecinkami słowa kluczowe (znacznik meta keywords sekcji head kodu HTML). Wymagane przez SEO."
74
+ meta_description: "Opis (znacznik meta description sekcji head kodu HTML). Wymagany przez SEO."
75
+ domain_name: "np. locomotiveapp.org"
76
+ robots_txt: "Zawartość pliku <span class='code'>/robots.txt</span>. Pod umieszczonym <a href='http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1'>tutaj</a> odnośnikiem znajdziesz więcej informacji."
77
+ theme_asset:
78
+ slug: "Nie musisz dodawać rozszerzenia pliku (.css lub .js)"
79
+ edit:
80
+ source: "Możesz zastąpić go plikiem o takim samym rozszerzeniu"
81
+ asset:
82
+ source: "Akceptowane są pliki każdego typu."
83
+ edit:
84
+ source: "Bieżący plik jest dostępny pod adresem %{url}"
85
+ update:
86
+ source: "Bieżący plik jest dostępny pod adresem %{url}"
87
+ content_entry:
88
+ _slug: "Właściwość używana do generowania łańcucha URL strony pełniącej funkcję szablonu dla tego typu zawartości (np. \"strona_szablonu/{{ twój_obiekt._permalink }})\"."
89
+ seo_title: "Wartość, którą tu podasz, zastąpi tytuł SEO strony szablonowej odnoszącej się do stworzonego modelu."
90
+ meta_keywords: "Nadpisz słowa kluczowe (meta keywords) witryny, umieszczane w sekcji head kodu HTML strony. Powinny być oddzielone przecinkami."
91
+ meta_description: "Nadpisz opis (meta description) witryny, umieszczany w sekcji head kodu HTML strony."
92
+ import:
93
+ source: "Archiwum ZIP zawierające plik database.yml razem z zasobami i szablonami."
94
+ samples: "Gdy włączone, w procesie importowania uwzględnione zostaną również zasoby i treści."
95
+ reset: "Gdy włączone, wszystkie dane Twojej witryny zostaną zniszczone przed importowaniem nowej witryny."
96
+ content_type:
97
+ name: "Sugerujemy, aby nazwa modelu była słowem z języka angielskiego w liczbie mnogiej i zaczynała się wielką literą, np.: Projects, Recipes, Posts, Articles, itp."
98
+ slug: "Będzie użyta jako nazwa kolekcji w szablonach Liquid, np. <span class='code'>{{ contents.moje_projekty }}</span>"
99
+ raw_item_template: "Możesz dostosować tekst wyświetlany dla każdego elementu listy. Po prostu użyj Liquida, np. <span class='code'>{{ entry.nazwa }})</span>"
100
+ public_submission_enabled: "Używane, aby pozwalać każdemu z zewnątrz na dodawanie zawartości (np. na tworzenie wiadomości formularza kontaktowego)."
101
+ public_submission_accounts: "Jeśli publiczne wprowadzanie jest włączone, to dla każdej utworzonej zawartości będzie wysyłane e-mailowe powiadomienie do wskazanych osób."
102
+ "custom_fields/field":
103
+ name: "Nazwa właściwości dla szablonów Liquid, np. <span class='code'>&#123;&#123; twój_obiekt.&lt;nazwa_twojego_pola&gt; &#125;&#125;</span>"
104
+ hint: "Tekst wyświetlany w formularzu modelu tuż pod miejscem do wypełnienia."
105
+
data/config/routes.rb CHANGED
@@ -2,107 +2,115 @@ Locomotive::Engine.routes.draw do
2
2
 
3
3
  # authentication
4
4
  devise_for :locomotive_account,
5
- :class_name => 'Locomotive::Account',
6
- :path => '',
7
- :path_prefix => nil,
8
- :failure_app => 'Locomotive::Devise::FailureApp',
9
- :controllers => { :sessions => 'locomotive/sessions', :passwords => 'locomotive/passwords' }
5
+ class_name: 'Locomotive::Account',
6
+ path: '',
7
+ path_prefix: nil,
8
+ failure_app: 'Locomotive::Devise::FailureApp',
9
+ controllers: { sessions: 'locomotive/sessions', passwords: 'locomotive/passwords' }
10
10
 
11
11
  devise_scope :locomotive_account do
12
12
  match '/' => 'sessions#new'
13
- delete 'signout' => 'sessions#destroy', :as => :destroy_locomotive_session
13
+ delete 'signout' => 'sessions#destroy', as: :destroy_locomotive_session
14
14
  end
15
15
 
16
- root :to => 'pages#index'
16
+ root to: 'pages#index'
17
17
 
18
18
  resources :pages do
19
- put :sort, :on => :member
20
- get :get_path, :on => :collection
19
+ put :sort, on: :member
20
+ get :get_path, on: :collection
21
21
  end
22
22
 
23
23
  resources :snippets
24
24
 
25
25
  resources :sites
26
26
 
27
- resource :current_site, :controller => 'current_site'
27
+ resource :current_site, controller: 'current_site'
28
28
 
29
29
  resources :accounts
30
30
 
31
- resource :my_account, :controller => 'my_account'
31
+ resource :my_account, controller: 'my_account'
32
32
 
33
33
  resources :memberships
34
34
 
35
35
  resources :theme_assets do
36
- get :all, :action => 'index', :on => :collection, :defaults => { :all => true }
36
+ get :all, action: 'index', on: :collection, defaults: { all: true }
37
37
  end
38
38
 
39
+ resources :translations
40
+
39
41
  resources :content_assets
40
42
 
41
43
  resources :content_types
42
44
 
43
- resources :content_entries, :path => 'content_types/:slug/entries' do
44
- put :sort, :on => :collection
45
+ resources :content_entries, path: 'content_types/:slug/entries' do
46
+ put :sort, on: :collection
45
47
  end
46
48
 
47
49
  # installation guide
48
- match '/installation' => 'installation#show', :defaults => { :step => 1 }, :as => :installation
49
- match '/installation/:step' => 'installation#show', :as => :installation_step
50
+ match '/installation' => 'installation#show', defaults: { step: 1 }, as: :installation
51
+ match '/installation/:step' => 'installation#show', as: :installation_step
50
52
 
51
53
  end
52
54
 
53
55
  Rails.application.routes.draw do
54
56
 
55
57
  # API
56
- namespace :locomotive, :module => 'locomotive' do
58
+ namespace :locomotive, module: 'locomotive' do
57
59
  namespace :api do
58
60
 
59
- resources :tokens, :only => [:create, :destroy]
61
+ resources :tokens, only: [:create, :destroy]
62
+
63
+ resource :current_site, controller: 'current_site', only: [:show, :update, :destroy]
64
+
65
+ resources :memberships, only: [:index, :show, :create, :update, :destroy]
60
66
 
61
- resources :theme_assets
67
+ resource :my_account, controller: 'my_account', only: :show
62
68
 
63
- resources :content_assets
69
+ resources :accounts, only: [:index, :show, :create, :destroy]
64
70
 
65
- resources :snippets
71
+ with_options only: [:index, :show, :create, :update, :destroy] do |api|
66
72
 
67
- resources :pages
73
+ api.resources :sites
68
74
 
69
- resources :content_types
75
+ api.resources :pages
70
76
 
71
- resources :content_entries, :path => 'content_types/:slug/entries'
77
+ api.resources :snippets
72
78
 
73
- resources :sites
79
+ api.resources :content_types
74
80
 
75
- resources :memberships
81
+ api.resources :content_entries, path: 'content_types/:slug/entries'
76
82
 
77
- resource :current_site, :controller => 'current_site'
83
+ api.resources :theme_assets
78
84
 
79
- resource :my_account, :controller => 'my_account'
85
+ api.resources :translations
80
86
 
87
+ api.resources :content_assets
88
+ end
81
89
  end
82
90
  end
83
91
 
84
92
  # sitemap
85
- match '/sitemap.xml' => 'locomotive/public/sitemaps#show', :format => 'xml'
93
+ match '/sitemap.xml' => 'locomotive/public/sitemaps#show', format: 'xml'
86
94
 
87
95
  # robots.txt
88
- match '/robots.txt' => 'locomotive/public/robots#show', :format => 'txt'
96
+ match '/robots.txt' => 'locomotive/public/robots#show', format: 'txt'
89
97
 
90
98
  # public content entry submissions
91
- resources :locomotive_entry_submissions, :controller => 'locomotive/public/content_entries', :path => 'entry_submissions/:slug'
99
+ resources :locomotive_entry_submissions, controller: 'locomotive/public/content_entries', path: 'entry_submissions/:slug'
92
100
 
93
101
  # magic urls
94
102
  match '/_admin' => 'locomotive/public/pages#show_toolbar'
95
- match ':locale/_admin' => 'locomotive/public/pages#show_toolbar', :locale => /(#{Locomotive.config.site_locales.join('|')})/
96
- match ':locale/*path/_admin' => 'locomotive/public/pages#show_toolbar', :locale => /(#{Locomotive.config.site_locales.join('|')})/
103
+ match ':locale/_admin' => 'locomotive/public/pages#show_toolbar', locale: /(#{Locomotive.config.site_locales.join('|')})/
104
+ match ':locale/*path/_admin' => 'locomotive/public/pages#show_toolbar', locale: /(#{Locomotive.config.site_locales.join('|')})/
97
105
  match '*path/_admin' => 'locomotive/public/pages#show_toolbar'
98
106
 
99
107
  match '/_edit' => 'locomotive/public/pages#edit'
100
- match ':locale/_edit' => 'locomotive/public/pages#edit', :page_path => 'index', :locale => /(#{Locomotive.config.site_locales.join('|')})/
101
- match ':locale/*path/_edit' => 'locomotive/public/pages#edit', :locale => /(#{Locomotive.config.site_locales.join('|')})/
108
+ match ':locale/_edit' => 'locomotive/public/pages#edit', page_path: 'index', locale: /(#{Locomotive.config.site_locales.join('|')})/
109
+ match ':locale/*path/_edit' => 'locomotive/public/pages#edit', locale: /(#{Locomotive.config.site_locales.join('|')})/
102
110
  match '*path/_edit' => 'locomotive/public/pages#edit'
103
111
 
104
- root :to => 'locomotive/public/pages#show'
105
- match ':locale' => 'locomotive/public/pages#show', :page_path => 'index', :locale => /(#{Locomotive.config.site_locales.join('|')})/
106
- match ':locale/*path' => 'locomotive/public/pages#show', :locale => /(#{Locomotive.config.site_locales.join('|')})/
112
+ root to: 'locomotive/public/pages#show'
113
+ match ':locale' => 'locomotive/public/pages#show', page_path: 'index', locale: /(#{Locomotive.config.site_locales.join('|')})/
114
+ match ':locale/*path' => 'locomotive/public/pages#show', locale: /(#{Locomotive.config.site_locales.join('|')})/
107
115
  match '*path' => 'locomotive/public/pages#show'
108
116
  end