qbrick 2.5.0.pre → 2.5.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (341) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +69 -379
  3. data/Rakefile +4 -4
  4. data/app/assets/images/logo.png +0 -0
  5. data/app/assets/javascripts/{kuhsaft → qbrick}/application.js.coffee +1 -1
  6. data/app/assets/javascripts/{kuhsaft → qbrick}/cms/application.js.coffee.erb +40 -17
  7. data/app/assets/javascripts/{kuhsaft → qbrick}/views/read_more_view.js.coffee +0 -0
  8. data/app/assets/stylesheets/{kuhsaft → qbrick}/application.css.sass +0 -0
  9. data/app/assets/stylesheets/{kuhsaft → qbrick}/cms/application.css.sass +38 -1
  10. data/app/assets/stylesheets/{kuhsaft → qbrick}/modules/_text_brick.css.sass +1 -1
  11. data/app/controllers/{kuhsaft → qbrick}/api/pages_controller.rb +2 -2
  12. data/app/controllers/qbrick/cms/accounts_controller.rb +28 -0
  13. data/app/controllers/qbrick/cms/admins_controller.rb +79 -0
  14. data/app/controllers/{kuhsaft → qbrick}/cms/assets_controller.rb +9 -9
  15. data/app/controllers/qbrick/cms/backend_controller.rb +25 -0
  16. data/app/controllers/{kuhsaft → qbrick}/cms/bricks_controller.rb +16 -13
  17. data/app/controllers/{kuhsaft → qbrick}/cms/ckimages_controller.rb +6 -6
  18. data/app/controllers/qbrick/cms/pages_controller.rb +87 -0
  19. data/app/controllers/qbrick/cms/settings_collections_controller.rb +26 -0
  20. data/app/controllers/{kuhsaft → qbrick}/pages_controller.rb +10 -5
  21. data/app/controllers/{kuhsaft → qbrick}/sitemaps_controller.rb +3 -3
  22. data/app/helpers/cms_helper.rb +4 -4
  23. data/app/helpers/pages_helper.rb +18 -10
  24. data/app/helpers/{kuhsaft → qbrick}/admin_helper.rb +2 -2
  25. data/app/helpers/qbrick/cms/admin_helper.rb +73 -0
  26. data/app/helpers/{kuhsaft → qbrick}/cms/pages_helper.rb +2 -2
  27. data/app/models/{kuhsaft → qbrick}/accordion_brick.rb +2 -2
  28. data/app/models/{kuhsaft → qbrick}/accordion_item_brick.rb +1 -1
  29. data/app/models/qbrick/admin.rb +8 -0
  30. data/app/models/{kuhsaft → qbrick}/anchor_brick.rb +1 -1
  31. data/app/models/{kuhsaft → qbrick}/asset.rb +2 -2
  32. data/app/models/{kuhsaft → qbrick}/asset_brick.rb +2 -2
  33. data/app/models/{kuhsaft → qbrick}/brick.rb +11 -8
  34. data/app/models/{kuhsaft → qbrick}/brick_type.rb +1 -1
  35. data/app/models/{kuhsaft → qbrick}/brick_type_filter.rb +4 -4
  36. data/app/models/{kuhsaft → qbrick}/ckimage.rb +1 -1
  37. data/app/models/{kuhsaft → qbrick}/cms.rb +2 -2
  38. data/app/models/qbrick/cms_model.rb +25 -0
  39. data/app/models/{kuhsaft → qbrick}/column_brick.rb +2 -2
  40. data/app/models/{kuhsaft → qbrick}/image_brick.rb +2 -2
  41. data/app/models/{kuhsaft → qbrick}/image_size.rb +3 -3
  42. data/app/models/{kuhsaft → qbrick}/link_brick.rb +1 -1
  43. data/app/models/{kuhsaft → qbrick}/page.rb +78 -17
  44. data/app/models/{kuhsaft → qbrick}/page_type.rb +3 -2
  45. data/app/models/{kuhsaft → qbrick}/partition.rb +1 -1
  46. data/app/models/{kuhsaft → qbrick}/placeholder_brick.rb +4 -4
  47. data/app/models/{kuhsaft → qbrick}/publish_state.rb +1 -1
  48. data/app/models/qbrick/setting.rb +13 -0
  49. data/app/models/qbrick/settings_collection.rb +10 -0
  50. data/app/models/{kuhsaft → qbrick}/slider_brick.rb +3 -3
  51. data/app/models/{kuhsaft → qbrick}/text_brick.rb +1 -1
  52. data/app/models/{kuhsaft → qbrick}/two_column_brick.rb +2 -2
  53. data/app/models/{kuhsaft → qbrick}/video_brick.rb +1 -1
  54. data/app/uploaders/qbrick/asset_brick_asset_uploader.rb +26 -0
  55. data/app/uploaders/{kuhsaft → qbrick}/asset_uploader.rb +3 -2
  56. data/app/uploaders/{kuhsaft → qbrick}/ckimage_uploader.rb +1 -1
  57. data/app/uploaders/{kuhsaft → qbrick}/image_brick_image_uploader.rb +4 -4
  58. data/app/views/devise/confirmations/new.html.haml +10 -0
  59. data/app/views/devise/mailer/confirmation_instructions.html.haml +4 -0
  60. data/app/views/devise/mailer/reset_password_instructions.html.haml +6 -0
  61. data/app/views/devise/mailer/unlock_instructions.html.haml +5 -0
  62. data/app/views/devise/passwords/edit.html.haml +10 -0
  63. data/app/views/devise/passwords/new.html.haml +8 -0
  64. data/app/views/devise/registrations/edit.html.haml +9 -0
  65. data/app/views/devise/registrations/new.html.haml +21 -0
  66. data/app/views/devise/sessions/new.html.haml +12 -0
  67. data/app/views/devise/shared/_links.html.haml +19 -0
  68. data/app/views/devise/unlocks/new.html.haml +10 -0
  69. data/app/views/layouts/devise.html.haml +16 -0
  70. data/app/views/layouts/{kuhsaft → qbrick}/cms/application.html.haml +4 -5
  71. data/app/views/layouts/qbrick/cms/ckimages.html.haml +18 -0
  72. data/app/views/{kuhsaft → qbrick}/accordion_bricks/_accordion_brick.html.haml +0 -0
  73. data/app/views/{kuhsaft → qbrick}/accordion_bricks/accordion_brick/_edit.html.haml +0 -0
  74. data/app/views/{kuhsaft → qbrick}/accordion_item_bricks/_accordion_item_brick.html.haml +0 -0
  75. data/app/views/{kuhsaft → qbrick}/accordion_item_bricks/accordion_item_brick/_edit.html.haml +0 -0
  76. data/app/views/{kuhsaft → qbrick}/anchor_bricks/_anchor_brick.html.haml +0 -0
  77. data/app/views/{kuhsaft → qbrick}/anchor_bricks/anchor_brick/_edit.html.haml +0 -0
  78. data/app/views/{kuhsaft → qbrick}/asset_bricks/_asset_brick.html.haml +0 -0
  79. data/app/views/{kuhsaft → qbrick}/asset_bricks/asset_brick/_edit.html.haml +1 -1
  80. data/app/views/qbrick/cms/accounts/edit.html.haml +12 -0
  81. data/app/views/qbrick/cms/admins/_form.html.haml +10 -0
  82. data/app/views/qbrick/cms/admins/edit.html.haml +5 -0
  83. data/app/views/qbrick/cms/admins/index.html.haml +26 -0
  84. data/app/views/qbrick/cms/admins/new.html.haml +5 -0
  85. data/app/views/{kuhsaft → qbrick}/cms/assets/_form.html.haml +0 -0
  86. data/app/views/{kuhsaft → qbrick}/cms/assets/_list.html.haml +0 -0
  87. data/app/views/{kuhsaft → qbrick}/cms/assets/edit.html.haml +0 -0
  88. data/app/views/qbrick/cms/assets/index.html.haml +3 -0
  89. data/app/views/{kuhsaft → qbrick}/cms/assets/new.html.haml +0 -0
  90. data/app/views/qbrick/cms/backend/_brick_clone_menu.html.haml +16 -0
  91. data/app/views/qbrick/cms/backend/_brick_type_dropdown.html.haml +15 -0
  92. data/app/views/{kuhsaft/cms/admin → qbrick/cms/backend}/_empty_state.html.haml +0 -0
  93. data/app/views/{kuhsaft/cms/admin → qbrick/cms/backend}/_flash.html.haml +0 -0
  94. data/app/views/qbrick/cms/backend/_main_navigation.html.haml +20 -0
  95. data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_header.html.haml +4 -4
  96. data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_item.html.haml +6 -5
  97. data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_list.html.haml +1 -1
  98. data/app/views/{kuhsaft → qbrick}/cms/bricks/_new.html.haml +3 -3
  99. data/app/views/{kuhsaft → qbrick}/cms/bricks/_sort_form.html.haml +0 -0
  100. data/app/views/{kuhsaft → qbrick}/cms/bricks/create.js.erb +1 -1
  101. data/app/views/{kuhsaft → qbrick}/cms/bricks/destroy.js.erb +0 -0
  102. data/app/views/{kuhsaft → qbrick}/cms/bricks/new.js.erb +1 -1
  103. data/app/views/{kuhsaft → qbrick}/cms/bricks/update.js.erb +1 -1
  104. data/app/views/{kuhsaft → qbrick}/cms/ckimages/create.html.haml +0 -0
  105. data/app/views/{kuhsaft → qbrick}/cms/ckimages/destroy.js.erb +0 -0
  106. data/app/views/{kuhsaft → qbrick}/cms/ckimages/index.html.haml +1 -1
  107. data/app/views/{kuhsaft → qbrick}/cms/pages/_branch.html.haml +4 -4
  108. data/app/views/{kuhsaft → qbrick}/cms/pages/_form.html.haml +15 -6
  109. data/app/views/qbrick/cms/pages/_mirror_modal.html.haml +52 -0
  110. data/app/views/qbrick/cms/pages/edit.html.haml +16 -0
  111. data/app/views/{kuhsaft → qbrick}/cms/pages/index.html.haml +1 -1
  112. data/app/views/qbrick/cms/pages/mirror.js.haml +5 -0
  113. data/app/views/qbrick/cms/pages/new.html.haml +1 -0
  114. data/app/views/{kuhsaft → qbrick}/cms/pages/show.html.haml +0 -0
  115. data/app/views/{kuhsaft → qbrick}/cms/pages/sort.js.erb +0 -0
  116. data/app/views/qbrick/cms/settings_collections/_form.html.haml +8 -0
  117. data/app/views/qbrick/cms/settings_collections/index.html.haml +6 -0
  118. data/app/views/{kuhsaft → qbrick}/column_bricks/_column_brick.html.haml +0 -0
  119. data/app/views/{kuhsaft → qbrick}/column_bricks/column_brick/_edit.html.haml +0 -0
  120. data/app/views/{kuhsaft → qbrick}/image_bricks/_image_brick.html.haml +0 -0
  121. data/app/views/{kuhsaft → qbrick}/image_bricks/image_brick/_edit.html.haml +1 -1
  122. data/app/views/{kuhsaft → qbrick}/link_bricks/_link_brick.html.haml +0 -0
  123. data/app/views/{kuhsaft → qbrick}/link_bricks/link_brick/_edit.html.haml +1 -1
  124. data/app/views/{kuhsaft → qbrick}/pages/index.html.haml +2 -2
  125. data/app/views/{kuhsaft → qbrick}/pages/show.html.haml +2 -0
  126. data/app/views/{kuhsaft → qbrick}/placeholder_bricks/_placeholder_brick.html.haml +0 -0
  127. data/app/views/qbrick/placeholder_bricks/placeholder_brick/_edit.html.haml +1 -0
  128. data/app/views/{kuhsaft → qbrick}/search/_form.html.haml +0 -0
  129. data/app/views/{kuhsaft → qbrick}/search/_results.html.haml +2 -2
  130. data/app/views/{kuhsaft → qbrick}/search/_results_entry.html.haml +1 -1
  131. data/app/views/{kuhsaft → qbrick}/sitemaps/index.xml.haml +0 -0
  132. data/app/views/{kuhsaft → qbrick}/slider_bricks/_slider_brick.html.haml +0 -0
  133. data/app/views/{kuhsaft → qbrick}/slider_bricks/slider_brick/_edit.html.haml +0 -0
  134. data/app/views/{kuhsaft → qbrick}/text_bricks/_text_brick.html.haml +0 -0
  135. data/app/views/{kuhsaft → qbrick}/text_bricks/text_brick/_edit.html.haml +0 -0
  136. data/app/views/{kuhsaft → qbrick}/two_column_bricks/_two_column_brick.html.haml +1 -1
  137. data/app/views/qbrick/two_column_bricks/two_column_brick/_childs.html.haml +5 -0
  138. data/app/views/qbrick/two_column_bricks/two_column_brick/_edit.html.haml +1 -0
  139. data/app/views/{kuhsaft → qbrick}/video_bricks/_video_brick.html.haml +2 -2
  140. data/app/views/{kuhsaft → qbrick}/video_bricks/video_brick/_edit.html.haml +1 -1
  141. data/config/initializers/devise.rb +259 -0
  142. data/config/locales/cms.de.yml +11 -0
  143. data/config/locales/cms.en.yml +11 -0
  144. data/config/locales/devise.en.yml +60 -0
  145. data/config/locales/models/qbrick/accordion_brick/de.yml +4 -0
  146. data/config/locales/models/qbrick/accordion_brick/en.yml +4 -0
  147. data/config/locales/models/qbrick/accordion_item_brick/de.yml +7 -0
  148. data/config/locales/models/qbrick/accordion_item_brick/en.yml +7 -0
  149. data/config/locales/models/qbrick/admin/de.yml +13 -0
  150. data/config/locales/models/qbrick/admin/en.yml +13 -0
  151. data/config/locales/models/{kuhsaft → qbrick}/anchor_brick/de.yml +2 -2
  152. data/config/locales/models/{kuhsaft → qbrick}/anchor_brick/en.yml +2 -2
  153. data/config/locales/models/{kuhsaft → qbrick}/asset_brick/de.yml +2 -2
  154. data/config/locales/models/{kuhsaft → qbrick}/asset_brick/en.yml +2 -2
  155. data/config/locales/models/{kuhsaft → qbrick}/brick/de.yml +1 -1
  156. data/config/locales/models/{kuhsaft → qbrick}/brick/en.yml +1 -1
  157. data/config/locales/models/qbrick/column_brick/de.yml +4 -0
  158. data/config/locales/models/qbrick/column_brick/en.yml +4 -0
  159. data/config/locales/models/{kuhsaft → qbrick}/image_brick/de.yml +2 -2
  160. data/config/locales/models/{kuhsaft → qbrick}/image_brick/en.yml +2 -2
  161. data/config/locales/models/{kuhsaft → qbrick}/image_size/de.yml +2 -2
  162. data/config/locales/models/{kuhsaft → qbrick}/image_size/en.yml +2 -2
  163. data/config/locales/models/{kuhsaft → qbrick}/link_brick/de.yml +2 -2
  164. data/config/locales/models/{kuhsaft → qbrick}/link_brick/en.yml +2 -2
  165. data/config/locales/models/{kuhsaft → qbrick}/page/de.yml +2 -2
  166. data/config/locales/models/{kuhsaft → qbrick}/page/en.yml +3 -2
  167. data/config/locales/models/{kuhsaft → qbrick}/placeholder_brick/de.yml +2 -2
  168. data/config/locales/models/{kuhsaft → qbrick}/placeholder_brick/en.yml +2 -2
  169. data/config/locales/models/qbrick/slider_brick/de.yml +4 -0
  170. data/config/locales/models/qbrick/slider_brick/en.yml +4 -0
  171. data/config/locales/models/{kuhsaft → qbrick}/text_brick/de.yml +2 -2
  172. data/config/locales/models/{kuhsaft → qbrick}/text_brick/en.yml +2 -2
  173. data/config/locales/models/qbrick/two_column_brick/de.yml +7 -0
  174. data/config/locales/models/qbrick/two_column_brick/en.yml +7 -0
  175. data/config/locales/models/{kuhsaft → qbrick}/video_brick/de.yml +2 -2
  176. data/config/locales/models/{kuhsaft → qbrick}/video_brick/en.yml +2 -2
  177. data/config/locales/views/qbrick/cms/admin/de.yml +36 -0
  178. data/config/locales/views/{kuhsaft → qbrick}/cms/admin/en.yml +1 -1
  179. data/config/locales/views/{kuhsaft → qbrick}/cms/bricks/de.yml +1 -1
  180. data/config/locales/views/{kuhsaft → qbrick}/cms/bricks/en.yml +1 -1
  181. data/config/locales/views/qbrick/cms/navigation.yml +8 -0
  182. data/config/locales/views/{kuhsaft → qbrick}/cms/pages/de.yml +14 -1
  183. data/config/locales/views/{kuhsaft → qbrick}/cms/pages/en.yml +1 -1
  184. data/config/locales/views/qbrick/cms/settings_collection/de.yml +14 -0
  185. data/config/locales/views/qbrick/cms/settings_collection/en.yml +14 -0
  186. data/config/locales/views/{kuhsaft → qbrick}/image_brick/de.yml +1 -1
  187. data/config/locales/views/{kuhsaft → qbrick}/image_brick/en.yml +1 -1
  188. data/config/locales/views/{kuhsaft → qbrick}/search/de.yml +1 -1
  189. data/config/locales/views/{kuhsaft → qbrick}/search/en.yml +1 -1
  190. data/config/locales/views/{kuhsaft → qbrick}/text_brick/de.yml +1 -1
  191. data/config/locales/views/{kuhsaft → qbrick}/text_brick/en.yml +1 -1
  192. data/config/locales/views/{kuhsaft → qbrick}/video_brick/de.yml +1 -1
  193. data/config/locales/views/{kuhsaft → qbrick}/video_brick/en.yml +1 -1
  194. data/config/routes.rb +14 -2
  195. data/db/migrate/{01_create_kuhsaft_pages.rb → 01_create_qbrick_pages.rb} +5 -5
  196. data/db/migrate/{02_create_kuhsaft_bricks.rb → 02_create_qbrick_bricks.rb} +3 -3
  197. data/db/migrate/03_create_qbrick_brick_types.rb +12 -0
  198. data/db/migrate/04_create_qbrick_assets.rb +10 -0
  199. data/db/migrate/05_remove_cms_admin.rb +3 -3
  200. data/db/migrate/06_add_template_name_to_qbrick_bricks.rb +7 -0
  201. data/db/migrate/07_add_default_value_to_brick_type_enabled.rb +2 -2
  202. data/db/migrate/08_add_display_styles_to_bricks.rb +1 -1
  203. data/db/migrate/09_add_additional_fields_to_qbrick_bricks.rb +6 -0
  204. data/db/migrate/10_add_redirect_url_to_qbrick_pages.rb +7 -0
  205. data/db/migrate/11_update_url_and_redirect_url_value.rb +2 -2
  206. data/db/migrate/12_regenerate_fulltext.rb +1 -1
  207. data/db/migrate/13_add_page_title_to_pages.rb +1 -1
  208. data/db/migrate/14_move_qbrick_assets.rb +22 -0
  209. data/db/migrate/15_add_alt_text_to_bricks.rb +1 -1
  210. data/db/migrate/16_update_default_value_for_page_type.rb +2 -2
  211. data/db/migrate/17_set_page_type_to_content_for_empty_fields.rb +2 -2
  212. data/db/migrate/18_add_identifier_to_qbrick_pages.rb +6 -0
  213. data/db/migrate/19_add_col_count_to_bricks.rb +1 -1
  214. data/db/migrate/20_create_qbrick_ckimages.rb +9 -0
  215. data/db/migrate/21_add_google_verification_key_to_qbrick_pages.rb +5 -0
  216. data/db/migrate/22_create_settings.rb +15 -0
  217. data/db/migrate/22_create_settings_collections.rb +11 -0
  218. data/db/migrate/23_add_metadata_to_asset.rb +6 -0
  219. data/db/migrate/23_devise_create_qbrick_admins.rb +42 -0
  220. data/db/seeds.rb +36 -13
  221. data/lib/generators/{kuhsaft → qbrick}/assets/install_generator.rb +5 -5
  222. data/lib/generators/qbrick/custom_model_generator.rb +117 -0
  223. data/lib/generators/{kuhsaft → qbrick}/translations/add_generator.rb +4 -4
  224. data/lib/qbrick.rb +24 -0
  225. data/lib/{kuhsaft → qbrick}/brick_list.rb +3 -3
  226. data/lib/{kuhsaft → qbrick}/engine.rb +5 -5
  227. data/lib/{kuhsaft → qbrick}/gridded.rb +1 -1
  228. data/lib/{kuhsaft → qbrick}/image_uploader_mounting.rb +2 -2
  229. data/lib/{kuhsaft → qbrick}/orderable.rb +1 -1
  230. data/lib/{kuhsaft → qbrick}/page_tree.rb +1 -1
  231. data/lib/{kuhsaft → qbrick}/partial_extractor.rb +1 -1
  232. data/lib/{kuhsaft → qbrick}/searchable.rb +5 -3
  233. data/lib/{kuhsaft → qbrick}/touch_placeholders.rb +4 -4
  234. data/lib/{kuhsaft → qbrick}/translatable.rb +1 -1
  235. data/lib/qbrick/version.rb +3 -0
  236. data/lib/tasks/{kuhsaft_tasks.rake → qbrick_tasks.rake} +5 -5
  237. data/lib/templates/{kuhsaft → qbrick}/assets/ck-config.js.coffee +0 -0
  238. data/lib/templates/{kuhsaft → qbrick}/assets/customizations.css.sass +0 -0
  239. data/lib/templates/{kuhsaft → qbrick}/assets/customizations.js.coffee +0 -0
  240. data/lib/templates/qbrick/custom_model_generator/base_controller.rb +17 -0
  241. data/lib/templates/qbrick/custom_model_generator/inherited_views/base/_form.html.haml +12 -0
  242. data/lib/templates/qbrick/custom_model_generator/inherited_views/base/edit.html.haml +5 -0
  243. data/lib/templates/qbrick/custom_model_generator/inherited_views/base/index.html.haml +28 -0
  244. data/lib/templates/qbrick/custom_model_generator/inherited_views/base/new.html.haml +5 -0
  245. data/lib/templates/qbrick/custom_model_generator/translations/qbrick_base.yml +11 -0
  246. data/lib/templates/qbrick/custom_model_generator/translations/resource.yml.erb +14 -0
  247. data/lib/templates/qbrick/translations/add_translation.erb +8 -0
  248. data/spec/command_wrapper_helper.rb +21 -0
  249. data/spec/controllers/{kuhsaft → qbrick}/api/pages_controller_spec.rb +5 -5
  250. data/spec/controllers/qbrick/cms/pages_controller_spec.rb +61 -0
  251. data/spec/controllers/{kuhsaft → qbrick}/pages_controller_spec.rb +11 -13
  252. data/spec/controllers/{kuhsaft → qbrick}/sitemaps_controller_spec.rb +2 -2
  253. data/spec/dummy/app/assets/javascripts/{kuhsaft → qbrick}/cms/ck-config.js.coffee +0 -0
  254. data/spec/dummy/app/assets/javascripts/{kuhsaft → qbrick}/cms/customizations.js.coffee +0 -0
  255. data/spec/dummy/app/assets/stylesheets/{kuhsaft → qbrick}/cms/customizations.css.sass +0 -0
  256. data/spec/dummy/app/controllers/application_controller.rb +1 -1
  257. data/spec/dummy/config/application.rb +3 -2
  258. data/spec/dummy/config/database.yml +2 -2
  259. data/spec/dummy/config/environments/production.rb +2 -2
  260. data/spec/dummy/config/environments/test.rb +1 -1
  261. data/spec/dummy/config/initializers/{kuhsaft.rb → qbrick.rb} +1 -1
  262. data/spec/dummy/config/routes.rb +4 -1
  263. data/spec/factories.rb +24 -9
  264. data/spec/features/administrator_management_spec.rb +70 -0
  265. data/spec/features/cms_pages_spec.rb +15 -11
  266. data/spec/features/search_spec.rb +15 -15
  267. data/spec/features_helper.rb +36 -0
  268. data/spec/generators/custom_model_generator_spec.rb +83 -0
  269. data/spec/helpers/{kuhsaft → qbrick}/cms/admin_helper_spec.rb +5 -5
  270. data/spec/helpers/{kuhsaft → qbrick}/cms/pages_helper_spec.rb +6 -6
  271. data/spec/helpers/{kuhsaft → qbrick}/pages_helper_spec.rb +4 -5
  272. data/spec/lib/brick_list_spec.rb +12 -11
  273. data/spec/lib/engine_spec.rb +5 -9
  274. data/spec/lib/gridded_spec.rb +4 -5
  275. data/spec/lib/image_uploader_mounting_spec.rb +3 -4
  276. data/spec/lib/page_tree_spec.rb +5 -5
  277. data/spec/lib/searchable_spec.rb +7 -8
  278. data/spec/lib/touch_placeholders_spec.rb +4 -5
  279. data/spec/lib/translatable_spec.rb +20 -20
  280. data/spec/models/accordion_brick_spec.rb +7 -8
  281. data/spec/models/accordion_item_brick_spec.rb +8 -9
  282. data/spec/models/anchor_brick_spec.rb +5 -6
  283. data/spec/models/asset_brick_spec.rb +8 -9
  284. data/spec/models/asset_spec.rb +9 -11
  285. data/spec/models/brick_spec.rb +34 -34
  286. data/spec/models/brick_type_filter_spec.rb +14 -14
  287. data/spec/models/column_brick_spec.rb +6 -7
  288. data/spec/models/image_brick_spec.rb +9 -10
  289. data/spec/models/image_size_spec.rb +8 -8
  290. data/spec/models/link_brick_spec.rb +9 -10
  291. data/spec/models/page_spec.rb +113 -73
  292. data/spec/models/placeholder_brick_spec.rb +12 -13
  293. data/spec/models/publish_state_spec.rb +7 -7
  294. data/spec/models/setting_spec.rb +28 -0
  295. data/spec/models/slider_brick_spec.rb +5 -6
  296. data/spec/models/text_brick_spec.rb +5 -5
  297. data/spec/models/two_column_brick_spec.rb +14 -15
  298. data/spec/models/video_brick_spec.rb +5 -6
  299. data/spec/postgres_helper.rb +66 -0
  300. data/spec/{kuhsaft_spec.rb → qbrick_spec.rb} +2 -2
  301. data/spec/spec_helper.rb +23 -10
  302. data/spec/support/{kuhsaft_spec_helper.rb → qbrick_spec_helper.rb} +1 -1
  303. data/spec/support/write_expectation.rb +2 -2
  304. data/spec/views/{kuhsaft → qbrick}/sitemaps/index.xml.haml_spec.rb +3 -3
  305. metadata +451 -330
  306. data/app/controllers/kuhsaft/cms/admin_controller.rb +0 -18
  307. data/app/controllers/kuhsaft/cms/pages_controller.rb +0 -71
  308. data/app/helpers/kuhsaft/cms/admin_helper.rb +0 -21
  309. data/app/uploaders/kuhsaft/asset_brick_asset_uploader.rb +0 -43
  310. data/app/views/kuhsaft/cms/admin/_brick_type_dropdown.html.haml +0 -14
  311. data/app/views/kuhsaft/cms/admin/_content_language_switch.html.haml +0 -7
  312. data/app/views/kuhsaft/cms/admin/_main_navigation.html.haml +0 -6
  313. data/app/views/kuhsaft/cms/assets/index.html.haml +0 -3
  314. data/app/views/kuhsaft/cms/pages/edit.html.haml +0 -16
  315. data/app/views/kuhsaft/cms/pages/new.html.haml +0 -1
  316. data/app/views/kuhsaft/placeholder_bricks/placeholder_brick/_edit.html.haml +0 -1
  317. data/app/views/kuhsaft/two_column_bricks/two_column_brick/_childs.html.haml +0 -5
  318. data/app/views/kuhsaft/two_column_bricks/two_column_brick/_edit.html.haml +0 -1
  319. data/app/views/layouts/kuhsaft/cms/ckimages.html.haml +0 -18
  320. data/config/locales/models/kuhsaft/accordion_brick/de.yml +0 -4
  321. data/config/locales/models/kuhsaft/accordion_brick/en.yml +0 -4
  322. data/config/locales/models/kuhsaft/accordion_item_brick/de.yml +0 -7
  323. data/config/locales/models/kuhsaft/accordion_item_brick/en.yml +0 -7
  324. data/config/locales/models/kuhsaft/column_brick/de.yml +0 -4
  325. data/config/locales/models/kuhsaft/column_brick/en.yml +0 -4
  326. data/config/locales/models/kuhsaft/slider_brick/de.yml +0 -4
  327. data/config/locales/models/kuhsaft/slider_brick/en.yml +0 -4
  328. data/config/locales/models/kuhsaft/two_column_brick/de.yml +0 -7
  329. data/config/locales/models/kuhsaft/two_column_brick/en.yml +0 -7
  330. data/config/locales/views/kuhsaft/cms/admin/de.yml +0 -13
  331. data/db/migrate/03_create_kuhsaft_brick_types.rb +0 -12
  332. data/db/migrate/04_create_kuhsaft_assets.rb +0 -10
  333. data/db/migrate/06_add_template_name_to_kuhsaft_bricks.rb +0 -7
  334. data/db/migrate/09_add_additional_fields_to_kuhsaft_bricks.rb +0 -6
  335. data/db/migrate/10_add_redirect_url_to_kuhsaft_pages.rb +0 -7
  336. data/db/migrate/14_move_kuhsaft_assets.rb +0 -22
  337. data/db/migrate/18_add_identifier_to_kuhsaft_pages.rb +0 -6
  338. data/db/migrate/20_create_kuhsaft_ckimages.rb +0 -9
  339. data/lib/kuhsaft.rb +0 -22
  340. data/lib/kuhsaft/version.rb +0 -3
  341. data/lib/templates/kuhsaft/translations/add_translation.erb +0 -8
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/asset_brick: 'Datei'
4
+ qbrick/asset_brick: 'Datei'
5
5
  attributes:
6
- kuhsaft/asset_brick:
6
+ qbrick/asset_brick:
7
7
  caption: 'Anzeigetext'
8
8
  link_style: 'Stil'
9
9
  asset: 'Datei'
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/asset_brick: 'Asset'
4
+ qbrick/asset_brick: 'Asset'
5
5
  attributes:
6
- kuhsaft/asset_brick:
6
+ qbrick/asset_brick:
7
7
  caption: 'Display text'
8
8
  link_style: 'Style'
9
9
  asset: 'Asset'
@@ -1,5 +1,5 @@
1
1
  de:
2
2
  activerecord:
3
3
  attributes:
4
- kuhsaft/brick:
4
+ qbrick/brick:
5
5
  col_count: 'Breite im Grid'
@@ -1,5 +1,5 @@
1
1
  en:
2
2
  activerecord:
3
3
  attributes:
4
- kuhsaft/brick:
4
+ qbrick/brick:
5
5
  col_count: 'Grid width'
@@ -0,0 +1,4 @@
1
+ de:
2
+ activerecord:
3
+ models:
4
+ qbrick/column_brick: 'Spalte'
@@ -0,0 +1,4 @@
1
+ en:
2
+ activerecord:
3
+ models:
4
+ qbrick/column_brick: 'Column'
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/image_brick: 'Bild'
4
+ qbrick/image_brick: 'Bild'
5
5
  attributes:
6
- kuhsaft/image_brick:
6
+ qbrick/image_brick:
7
7
  image: 'Bild'
8
8
  caption: 'Beschreibung'
9
9
  alt_text: 'Alt-Text'
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/image_brick: 'Image'
4
+ qbrick/image_brick: 'Image'
5
5
  attributes:
6
- kuhsaft/image_brick:
6
+ qbrick/image_brick:
7
7
  image: 'Image'
8
8
  caption: 'Caption'
9
9
  alt_text: 'Alt text'
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/image_size: 'Bildgrösse'
4
+ qbrick/image_size: 'Bildgrösse'
5
5
  attributes:
6
- kuhsaft/image_size:
6
+ qbrick/image_size:
7
7
  name: 'Name'
8
8
  label: 'Label'
9
9
  width: 'Breite'
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/image_size: 'Image size'
4
+ qbrick/image_size: 'Image size'
5
5
  attributes:
6
- kuhsaft/image_size:
6
+ qbrick/image_size:
7
7
  name: 'Name'
8
8
  label: 'Label'
9
9
  width: 'Width'
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/link_brick: 'Link'
4
+ qbrick/link_brick: 'Link'
5
5
  attributes:
6
- kuhsaft/link_brick:
6
+ qbrick/link_brick:
7
7
  caption: 'Linktext'
8
8
  href: 'Link'
9
9
  link_style: 'Stil'
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/link_brick: 'Link'
4
+ qbrick/link_brick: 'Link'
5
5
  attributes:
6
- kuhsaft/link_brick:
6
+ qbrick/link_brick:
7
7
  caption: 'Linktext'
8
8
  href: 'Link'
9
9
  link_style: 'Style'
@@ -1,11 +1,11 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/page:
4
+ qbrick/page:
5
5
  one: 'Seite'
6
6
  other: 'Seiten'
7
7
  attributes:
8
- kuhsaft/page:
8
+ qbrick/page:
9
9
  title: 'Titel'
10
10
  slug: 'URL Name'
11
11
  page_title: 'Seitentitel (im Browser)'
@@ -1,11 +1,11 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/page:
4
+ qbrick/page:
5
5
  one: 'Page'
6
6
  other: 'Pages'
7
7
  attributes:
8
- kuhsaft/page:
8
+ qbrick/page:
9
9
  title: 'Title'
10
10
  slug: 'URL Name'
11
11
  page_title: 'Page title (in browser)'
@@ -17,3 +17,4 @@ en:
17
17
  page_type: 'Pagetype'
18
18
  parent_id: 'Parent page'
19
19
  parent: 'Parent page'
20
+ google_verification_key: Google Verification Key
@@ -1,8 +1,8 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/placeholder_brick: 'Platzhalter'
4
+ qbrick/placeholder_brick: 'Platzhalter'
5
5
  attributes:
6
- kuhsaft/placeholder_brick:
6
+ qbrick/placeholder_brick:
7
7
  template_name: 'Template'
8
8
  contact_form: 'Kontaktformular'
@@ -1,8 +1,8 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/placeholder_brick: 'Placeholder'
4
+ qbrick/placeholder_brick: 'Placeholder'
5
5
  attributes:
6
- kuhsaft/placeholder_brick:
6
+ qbrick/placeholder_brick:
7
7
  template_name: 'Template'
8
8
  contact_form: 'Contact form'
@@ -0,0 +1,4 @@
1
+ de:
2
+ activerecord:
3
+ models:
4
+ qbrick/slider_brick: 'Slider / Karussel'
@@ -0,0 +1,4 @@
1
+ en:
2
+ activerecord:
3
+ models:
4
+ qbrick/slider_brick: 'Slider / Carousel'
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/text_brick: 'Text'
4
+ qbrick/text_brick: 'Text'
5
5
  attributes:
6
- kuhsaft/text_brick:
6
+ qbrick/text_brick:
7
7
  text: 'Text'
8
8
  read_more_text: 'Mehr lesen'
9
9
  errors:
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/text_brick: 'Text'
4
+ qbrick/text_brick: 'Text'
5
5
  attributes:
6
- kuhsaft/text_brick:
6
+ qbrick/text_brick:
7
7
  text: 'Text'
8
8
  read_more_text: 'Read more'
9
9
  errors:
@@ -0,0 +1,7 @@
1
+ de:
2
+ activerecord:
3
+ models:
4
+ qbrick/two_column_brick: 'Zweispaltiges Element'
5
+ attributes:
6
+ qbrick/two_column_brick:
7
+ partitioning: 'Aufteilung'
@@ -0,0 +1,7 @@
1
+ en:
2
+ activerecord:
3
+ models:
4
+ qbrick/two_column_brick: 'Two column element'
5
+ attributes:
6
+ qbrick/two_column_brick:
7
+ partitioning: 'Partition'
@@ -1,9 +1,9 @@
1
1
  de:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/video_brick: 'Video'
4
+ qbrick/video_brick: 'Video'
5
5
  attributes:
6
- kuhsaft/video_brick:
6
+ qbrick/video_brick:
7
7
  video: 'Quelle'
8
8
  embed_src: 'Embed Code'
9
9
  href: 'Video'
@@ -1,9 +1,9 @@
1
1
  en:
2
2
  activerecord:
3
3
  models:
4
- kuhsaft/video_brick: 'Video'
4
+ qbrick/video_brick: 'Video'
5
5
  attributes:
6
- kuhsaft/video_brick:
6
+ qbrick/video_brick:
7
7
  video: 'Source'
8
8
  embed_src: 'Embed Code'
9
9
  href: 'Video'
@@ -0,0 +1,36 @@
1
+ de:
2
+ qbrick:
3
+ cms:
4
+ backend:
5
+ confirm_delete: '"%{name}" wirklich löschen?'
6
+ brick_type_dropdown:
7
+ add_element: 'Element hinzufügen'
8
+ add_specific_element: '%{name} hinzufügen'
9
+ brick_clone_menu:
10
+ clone_bricks: Bricks kopieren
11
+ to_locale: 'in die Sprachversion %{locale_name}'
12
+ not_translated: 'Noch nicht übersetzt'
13
+ brick_clone_info_title: Kopieren von Bricks
14
+ brick_clone_info: |
15
+ Bricks werden mit gesamten Inhalt in eine andere Sprachversion der Seite kopiert.
16
+ </br>
17
+ Texte werden nicht übersetzt und müssen angepasst werden.
18
+ </br>
19
+ </br>
20
+ Kopieren ist nicht möglich, falls:
21
+ <ul>
22
+ <li>Die gewünschte Sprachversion der Seite nicht Übersetzt ist</li>
23
+ <li>Die Seite keine Bricks enthält</li>
24
+ </ul>
25
+ <span class="label label-warning">Achtung:</span>
26
+ </br>
27
+ Diese Funktion dient zum initialen Setup der Seiten.
28
+ </br>
29
+ Eventuell vorhandene Bricks auf der Zielseite werden überschrieben!
30
+ modal_header: Bricks kopieren
31
+ modal_body: 'Kopiere %{brick_count} Brick(s) von %{from_locale} nach %{to_locale}'
32
+ empty_state:
33
+ empty: 'Hier ist bisher noch nichts...'
34
+ main_navigation:
35
+ logout: 'Abmelden'
36
+
@@ -1,5 +1,5 @@
1
1
  en:
2
- kuhsaft:
2
+ qbrick:
3
3
  cms:
4
4
  admin:
5
5
  confirm_delete: 'Are you sure you want to delete %{name}?'
@@ -1,5 +1,5 @@
1
1
  de:
2
- kuhsaft:
2
+ qbrick:
3
3
  cms:
4
4
  bricks:
5
5
  brick_item:
@@ -1,5 +1,5 @@
1
1
  en:
2
- kuhsaft:
2
+ qbrick:
3
3
  cms:
4
4
  bricks:
5
5
  brick_item:
@@ -0,0 +1,8 @@
1
+ en:
2
+ qbrick:
3
+ cms:
4
+ backend:
5
+ main_navigation:
6
+ change_passowrd: "Change Password"
7
+ logout: "Log out"
8
+ account: "Account"
@@ -1,5 +1,5 @@
1
1
  de:
2
- kuhsaft:
2
+ qbrick:
3
3
  cms:
4
4
  pages:
5
5
  index:
@@ -7,6 +7,7 @@ de:
7
7
  form:
8
8
  tab_metadata: 'Einstellungen'
9
9
  tab_content: 'Inhalt'
10
+ not_translated: 'Übersetzungen fehlen'
10
11
  hint_keywords: |
11
12
  Geben Sie hier 2 - 6 zentrale Begriffe, welche für diese Seite gelten, als Stichwörter an.
12
13
  </br>
@@ -29,3 +30,15 @@ de:
29
30
  expand_all: Alle aufklappen
30
31
  collapse_all: Alle zuklappen
31
32
  none: Keine
33
+
34
+ mirror_modal:
35
+ no_bricks_to_clone: 'Die Seite enthält keine Bricks zum kopieren.'
36
+ bricks_cloned: '%{brick_count} Brick(s) erfolgreich kopiert.'
37
+ target_page_contains_bricks: |
38
+ <strong>Achtung:</strong>
39
+ Die Zielseite enthält %{brick_count} Brick(s). Diese werden überschrieben.
40
+ abort: Abbrechen
41
+ proceed_replace: 'Kopieren & Ersetzen'
42
+ okay: OK
43
+ edit_language: '%{language} Bricks bearbeiten'
44
+ failed_to_clone_folowwing_bricks: 'Folgende Bricks konnten nicht kopiert werden:'
@@ -1,5 +1,5 @@
1
1
  en:
2
- kuhsaft:
2
+ qbrick:
3
3
  cms:
4
4
  pages:
5
5
  index:
@@ -0,0 +1,14 @@
1
+ de:
2
+ qbrick:
3
+ cms:
4
+ settings_collections:
5
+ index:
6
+ title: Settings
7
+ form:
8
+ save: Speichern
9
+ site_title: Seitentitel
10
+ site_description: Seitenbeschreibung
11
+ default_page_title: Standard Titel
12
+ default_page_description: Standard Beschreibung
13
+ google_analytics_key: Google Analytics Key
14
+ typekit_id: Typekit ID
@@ -0,0 +1,14 @@
1
+ en:
2
+ qbrick:
3
+ cms:
4
+ settings_collections:
5
+ index:
6
+ title: Settings
7
+ form:
8
+ save: Save
9
+ site_title: Site Title
10
+ site_description: Site Description
11
+ default_page_title: Default Title
12
+ default_page_description: Default Description
13
+ google_analytics_key: Google Analytics Key
14
+ typekit_id: Typekit ID
@@ -1,5 +1,5 @@
1
1
  de:
2
- kuhsaft:
2
+ qbrick:
3
3
  image_bricks:
4
4
  image_brick:
5
5
  edit:
@@ -1,5 +1,5 @@
1
1
  en:
2
- kuhsaft:
2
+ qbrick:
3
3
  image_bricks:
4
4
  image_brick:
5
5
  edit:
@@ -1,5 +1,5 @@
1
1
  de:
2
- kuhsaft:
2
+ qbrick:
3
3
  search:
4
4
  results:
5
5
  title: 'Suchresultate'