browsercms 3.5.7 → 4.0.0.alpha

Sign up to get free protection for your applications and to get access to all the features.
Files changed (523) hide show
  1. checksums.yaml +7 -0
  2. data/COPYRIGHT.txt +2 -1
  3. data/README.markdown +3 -3
  4. data/app/assets/fonts/icomoon.dev.svg +61 -0
  5. data/app/assets/fonts/icomoon.eot +0 -0
  6. data/app/assets/fonts/icomoon.svg +61 -0
  7. data/app/assets/fonts/icomoon.ttf +0 -0
  8. data/app/assets/fonts/icomoon.woff +0 -0
  9. data/app/assets/images/ckeditor/plugins/delete_content/icons/deletecontent.png +0 -0
  10. data/app/assets/images/ckeditor/plugins/edit_content/icons/editcontent.png +0 -0
  11. data/app/assets/images/ckeditor/plugins/move_content/icons/movecontentdown.png +0 -0
  12. data/app/assets/images/ckeditor/plugins/move_content/icons/movecontentup.png +0 -0
  13. data/app/assets/images/cms/arrow-down.png +0 -0
  14. data/app/assets/images/cms/arrow-up.png +0 -0
  15. data/app/assets/images/cms/cogs.png +0 -0
  16. data/app/assets/images/cms/dashboard/home.png +0 -0
  17. data/app/assets/images/cms/home.png +0 -0
  18. data/app/assets/images/cms/logo.png +0 -0
  19. data/app/assets/images/cms/pencil.png +0 -0
  20. data/app/assets/images/cms/plus.png +0 -0
  21. data/app/assets/images/cms/user.png +0 -0
  22. data/app/assets/javascripts/bcms/ckeditor_inline.js +23 -0
  23. data/app/assets/javascripts/bcms/ckeditor_standard_config.js +1 -1
  24. data/app/assets/javascripts/ckeditor/plugins/delete_content/plugin.js +36 -0
  25. data/app/assets/javascripts/ckeditor/plugins/edit_content/plugin.js +24 -0
  26. data/app/assets/javascripts/ckeditor/plugins/move_content/plugin.js +25 -0
  27. data/app/assets/javascripts/cms/ajax.js +60 -0
  28. data/app/assets/javascripts/cms/application.js +6 -1
  29. data/app/assets/javascripts/cms/attachment_manager.js.erb +3 -10
  30. data/app/assets/javascripts/cms/content_library.js +31 -12
  31. data/app/assets/javascripts/cms/core_library.js.erb +68 -36
  32. data/app/assets/javascripts/cms/form_builder.js +250 -0
  33. data/app/assets/javascripts/cms/namespace.js +2 -0
  34. data/app/assets/javascripts/cms/new_content_button.js +27 -0
  35. data/app/assets/javascripts/cms/page_editor.js +188 -0
  36. data/app/assets/javascripts/cms/page_toolbar.js +13 -0
  37. data/app/assets/javascripts/cms/site.js +2 -0
  38. data/app/assets/javascripts/cms/sitemap.js +219 -0
  39. data/app/assets/javascripts/cms/toolbar.js +17 -1
  40. data/app/assets/javascripts/cms/user.js +40 -0
  41. data/app/assets/javascripts/jquery.exists.js +5 -0
  42. data/app/assets/javascripts/jquery.taglist.js +37 -23
  43. data/app/assets/stylesheets/cms/_assets.css.scss +55 -0
  44. data/app/assets/stylesheets/cms/_base.css.scss +42 -0
  45. data/app/assets/stylesheets/cms/_cms-buttons.css.scss +73 -0
  46. data/app/assets/stylesheets/cms/_cms-forms.css.scss +70 -0
  47. data/app/assets/stylesheets/cms/_colors.css.scss +20 -0
  48. data/app/assets/stylesheets/cms/_dashboard.css.scss +25 -0
  49. data/app/assets/stylesheets/cms/_glyph.css.scss +60 -0
  50. data/app/assets/stylesheets/cms/_main-area.css.scss +62 -0
  51. data/app/assets/stylesheets/cms/_nav.css.scss +197 -0
  52. data/app/assets/stylesheets/cms/_sidebar.css.scss +64 -0
  53. data/app/assets/stylesheets/cms/_sitemap.css.scss +196 -0
  54. data/app/assets/stylesheets/cms/_submenu.css.scss +48 -0
  55. data/app/assets/stylesheets/cms/application.css.scss +49 -0
  56. data/app/assets/stylesheets/cms/core.css.scss +96 -0
  57. data/app/assets/stylesheets/cms/default-forms.css.scss +3 -0
  58. data/app/assets/stylesheets/cms/includes/_animation.css.scss +2 -0
  59. data/app/assets/stylesheets/cms/includes/_rem.css.scss +120 -0
  60. data/app/assets/stylesheets/cms/includes/animation/_animate.css.scss +31 -0
  61. data/app/assets/stylesheets/cms/includes/animation/_core.css.scss +127 -0
  62. data/app/assets/stylesheets/cms/includes/animation/_shared.css.scss +22 -0
  63. data/app/assets/stylesheets/cms/includes/animation/animate/_attention-seekers.css.scss +152 -0
  64. data/app/assets/stylesheets/cms/includes/animation/animate/_bouncing.css.scss +3 -0
  65. data/app/assets/stylesheets/cms/includes/animation/animate/_classes.css.scss +21 -0
  66. data/app/assets/stylesheets/cms/includes/animation/animate/_fading.css.scss +3 -0
  67. data/app/assets/stylesheets/cms/includes/animation/animate/_flippers.css.scss +87 -0
  68. data/app/assets/stylesheets/cms/includes/animation/animate/_lightspeed.css.scss +24 -0
  69. data/app/assets/stylesheets/cms/includes/animation/animate/_rotating.css.scss +3 -0
  70. data/app/assets/stylesheets/cms/includes/animation/animate/_specials.css.scss +42 -0
  71. data/app/assets/stylesheets/cms/includes/animation/animate/bouncing/_bouncing-entrances.css.scss +68 -0
  72. data/app/assets/stylesheets/cms/includes/animation/animate/bouncing/_bouncing-exits.css.scss +60 -0
  73. data/app/assets/stylesheets/cms/includes/animation/animate/fading/_fading-entrances.css.scss +86 -0
  74. data/app/assets/stylesheets/cms/includes/animation/animate/fading/_fading-exits.css.scss +86 -0
  75. data/app/assets/stylesheets/cms/includes/animation/animate/rotating/_rotating-entrances.css.scss +58 -0
  76. data/app/assets/stylesheets/cms/includes/animation/animate/rotating/_rotating-exits.css.scss +58 -0
  77. data/app/assets/stylesheets/cms/page_content_editing.css.scss +4 -0
  78. data/app/assets/stylesheets/cms/page_editor.css.scss +4 -0
  79. data/app/assets/stylesheets/cms/style.css.scss +138 -0
  80. data/app/assets/stylesheets/cms/styles/_alerts.css.scss +150 -0
  81. data/app/assets/stylesheets/cms/styles/_base-grid.css.scss +299 -0
  82. data/app/assets/stylesheets/cms/styles/_buttons.css.scss +247 -0
  83. data/app/assets/stylesheets/cms/styles/_dropdown.css.scss +155 -0
  84. data/app/assets/stylesheets/cms/styles/_forms.css.scss +728 -0
  85. data/app/assets/stylesheets/cms/styles/_glyph.css.scss +86 -0
  86. data/app/assets/stylesheets/cms/styles/_images.css.scss +75 -0
  87. data/app/assets/stylesheets/cms/styles/_lists.css.scss +115 -0
  88. data/app/assets/stylesheets/cms/styles/_modal.css.scss +174 -0
  89. data/app/assets/stylesheets/cms/styles/_progress.css.scss +43 -0
  90. data/app/assets/stylesheets/cms/styles/_tables.css.scss +141 -0
  91. data/app/assets/stylesheets/cms/styles/_text.css.scss +134 -0
  92. data/app/controllers/cms/application_controller.rb +3 -68
  93. data/app/controllers/cms/attachments_controller.rb +5 -5
  94. data/app/controllers/cms/base_controller.rb +20 -13
  95. data/app/controllers/cms/cache_controller.rb +16 -17
  96. data/app/controllers/cms/category_types_controller.rb +6 -1
  97. data/app/controllers/cms/connectors_controller.rb +12 -7
  98. data/app/controllers/cms/content_block_controller.rb +128 -71
  99. data/app/controllers/cms/content_controller.rb +54 -56
  100. data/app/controllers/cms/dashboard_controller.rb +5 -6
  101. data/app/controllers/cms/dynamic_views_controller.rb +12 -9
  102. data/app/controllers/cms/email_messages_controller.rb +18 -13
  103. data/app/controllers/cms/form_entries_controller.rb +119 -0
  104. data/app/controllers/cms/form_fields_controller.rb +74 -0
  105. data/app/controllers/cms/forms_controller.rb +35 -0
  106. data/app/controllers/cms/groups_controller.rb +13 -16
  107. data/app/controllers/cms/html_blocks_controller.rb +2 -2
  108. data/app/controllers/cms/inline_content_controller.rb +48 -0
  109. data/app/controllers/cms/links_controller.rb +58 -46
  110. data/app/controllers/cms/page_components_controller.rb +20 -0
  111. data/app/controllers/cms/page_routes_controller.rb +44 -40
  112. data/app/controllers/cms/pages_controller.rb +111 -97
  113. data/app/controllers/cms/passwords_controller.rb +17 -0
  114. data/app/controllers/cms/portlet_controller.rb +0 -1
  115. data/app/controllers/cms/portlets_controller.rb +20 -27
  116. data/app/controllers/cms/redirects_controller.rb +13 -9
  117. data/app/controllers/cms/resource_controller.rb +15 -4
  118. data/app/controllers/cms/routes_controller.rb +2 -4
  119. data/app/controllers/cms/section_nodes_controller.rb +6 -37
  120. data/app/controllers/cms/sections_controller.rb +13 -8
  121. data/app/controllers/cms/sessions_controller.rb +8 -66
  122. data/app/controllers/cms/sites/passwords_controller.rb +27 -0
  123. data/app/controllers/cms/sites/sessions_controller.rb +20 -0
  124. data/app/controllers/cms/tags_controller.rb +12 -12
  125. data/app/controllers/cms/tasks_controller.rb +45 -46
  126. data/app/controllers/cms/user_controller.rb +8 -0
  127. data/app/controllers/cms/users_controller.rb +91 -68
  128. data/app/helpers/cms/application_helper.rb +58 -52
  129. data/app/helpers/cms/content_block_helper.rb +8 -7
  130. data/app/helpers/cms/form_tag_helper.rb +21 -25
  131. data/app/helpers/cms/menu_helper.rb +1 -3
  132. data/app/helpers/cms/mobile_helper.rb +12 -2
  133. data/app/helpers/cms/nav_menu_helper.rb +23 -0
  134. data/app/helpers/cms/page_helper.rb +72 -30
  135. data/app/helpers/cms/path_helper.rb +46 -70
  136. data/app/helpers/cms/rendering_helper.rb +68 -12
  137. data/app/helpers/cms/section_nodes_helper.rb +92 -31
  138. data/app/helpers/cms/sites/authentication_helper.rb +25 -0
  139. data/app/helpers/cms/sites/devise_shim_helper.rb +31 -0
  140. data/app/helpers/cms/template_support.rb +1 -7
  141. data/app/helpers/cms/ui_elements_helper.rb +147 -6
  142. data/app/helpers/forgot_password_portlet_helper.rb +9 -0
  143. data/app/helpers/login_portlet_helper.rb +10 -0
  144. data/app/inputs/attachments_input.rb +14 -0
  145. data/app/inputs/cms_text_area_input.rb +10 -0
  146. data/app/inputs/cms_text_field_input.rb +29 -0
  147. data/app/inputs/date_picker_input.rb +8 -0
  148. data/app/inputs/file_picker_input.rb +75 -0
  149. data/app/inputs/path_input.rb +18 -0
  150. data/app/inputs/tag_list_input.rb +3 -0
  151. data/app/inputs/template_editor_input.rb +24 -0
  152. data/app/inputs/text_editor_input.rb +19 -0
  153. data/app/models/cms/abstract_file_block.rb +10 -6
  154. data/app/models/cms/attachment.rb +20 -27
  155. data/app/models/cms/category.rb +17 -7
  156. data/app/models/cms/category_type.rb +8 -4
  157. data/app/models/cms/connector.rb +32 -20
  158. data/app/models/cms/content.rb +31 -0
  159. data/app/models/cms/content_type.rb +114 -62
  160. data/app/models/cms/dynamic_view.rb +19 -45
  161. data/app/models/cms/email_message.rb +32 -2
  162. data/app/models/cms/external_user.rb +60 -0
  163. data/app/models/cms/file_block.rb +1 -0
  164. data/app/models/cms/form.rb +47 -0
  165. data/app/models/cms/form_entry.rb +71 -0
  166. data/app/models/cms/form_field.rb +78 -0
  167. data/app/models/cms/group.rb +19 -9
  168. data/app/models/cms/group_permission.rb +1 -1
  169. data/app/models/cms/group_section.rb +1 -1
  170. data/app/models/cms/group_type.rb +5 -5
  171. data/app/models/cms/group_type_permission.rb +1 -1
  172. data/app/models/cms/html_block.rb +14 -19
  173. data/app/models/cms/image_block.rb +1 -0
  174. data/app/models/cms/link.rb +8 -6
  175. data/app/models/cms/page.rb +156 -59
  176. data/app/models/cms/page_component.rb +43 -0
  177. data/app/models/cms/page_partial.rb +16 -8
  178. data/app/models/cms/page_route.rb +1 -1
  179. data/app/models/cms/page_route_condition.rb +1 -1
  180. data/app/models/cms/page_route_option.rb +1 -1
  181. data/app/models/cms/page_route_requirement.rb +1 -1
  182. data/app/models/cms/page_template.rb +14 -9
  183. data/app/models/cms/permission.rb +4 -2
  184. data/app/models/cms/persistent_user.rb +208 -0
  185. data/app/models/cms/portlet.rb +56 -9
  186. data/app/models/cms/redirect.rb +1 -1
  187. data/app/models/cms/search_filter.rb +18 -0
  188. data/app/models/cms/section.rb +39 -28
  189. data/app/models/cms/section_node.rb +32 -5
  190. data/app/models/cms/site.rb +3 -3
  191. data/app/models/cms/tag.rb +14 -12
  192. data/app/models/cms/tagging.rb +2 -2
  193. data/app/models/cms/task.rb +14 -21
  194. data/app/models/cms/templates.rb +1 -2
  195. data/app/models/cms/user.rb +21 -160
  196. data/app/models/cms/user_group_membership.rb +2 -2
  197. data/app/portlets/deprecated_placeholder.rb +12 -0
  198. data/app/portlets/dynamic_portlet.rb +1 -1
  199. data/app/portlets/email_page_portlet.rb +10 -3
  200. data/app/portlets/forgot_password_portlet.rb +9 -28
  201. data/app/portlets/login_portlet.rb +8 -5
  202. data/app/portlets/tag_cloud_portlet.rb +3 -1
  203. data/app/presenters/cms/user_presenter.rb +24 -0
  204. data/app/views/cms/application/_add_content_modal.html.erb +3 -0
  205. data/app/views/cms/application/_buttons.html.erb +7 -0
  206. data/app/views/cms/{shared → application}/_exception.html.erb +0 -0
  207. data/app/views/cms/application/_form_errors.html.erb +7 -0
  208. data/app/views/cms/application/_form_with_buttons.html.erb +10 -0
  209. data/app/views/cms/application/_main_content.html.erb +3 -0
  210. data/app/views/cms/application/_main_with_sidebar.html.erb +8 -0
  211. data/app/views/cms/application/_mobile_toolbar.html.erb +16 -0
  212. data/app/views/cms/application/_page_title.html.erb +5 -0
  213. data/app/views/cms/application/_pagination.html.erb +26 -0
  214. data/app/views/cms/application/_row.html.erb +1 -0
  215. data/app/views/cms/application/_save_buttons.html.erb +7 -0
  216. data/app/views/cms/application/_sidebar_layout.html.erb +3 -0
  217. data/app/views/cms/application/_version.html.erb +23 -0
  218. data/app/views/cms/{shared → application}/_version_conflict_diff.html.erb +0 -0
  219. data/app/views/cms/{shared → application}/_version_conflict_error.html.erb +0 -0
  220. data/app/views/cms/attachments/_attachment_manager.html.erb +22 -0
  221. data/app/views/cms/attachments/_no_attachments_defined.html.erb +1 -0
  222. data/app/views/cms/cache/show.html.erb +5 -10
  223. data/app/views/cms/categories/_form.html.erb +15 -24
  224. data/app/views/cms/category_types/_form.html.erb +1 -1
  225. data/app/views/cms/connectors/new.html.erb +33 -64
  226. data/app/views/cms/content/editing_frame.html.erb +1 -0
  227. data/app/views/cms/content/no_page.html.erb +9 -27
  228. data/app/views/cms/content/show.html.erb +14 -15
  229. data/app/views/cms/content_block/_block_form.html.erb +15 -0
  230. data/app/views/cms/content_block/_buttonbar.html.erb +29 -0
  231. data/app/views/cms/content_block/_buttons.html.erb +13 -0
  232. data/app/views/cms/content_block/_hidden_fields.html.erb +13 -0
  233. data/app/views/cms/content_block/_sidebar.html.erb +35 -0
  234. data/app/views/cms/content_block/edit.html.erb +3 -0
  235. data/app/views/cms/content_block/index.html.erb +87 -0
  236. data/app/views/cms/content_block/new.html.erb +3 -0
  237. data/app/views/cms/content_block/render_block_in_main_container.html.erb +10 -0
  238. data/app/views/cms/content_block/show.html.erb +1 -0
  239. data/app/views/cms/content_block/show_in_isolation.html.erb +15 -0
  240. data/app/views/cms/content_block/versions.html.erb +24 -0
  241. data/app/views/cms/dashboard/_page_drafts.html.erb +12 -22
  242. data/app/views/cms/dashboard/_tasks.html.erb +32 -45
  243. data/app/views/cms/dashboard/index.html.erb +11 -13
  244. data/app/views/cms/dynamic_views/_form.html.erb +8 -10
  245. data/app/views/cms/dynamic_views/edit.html.erb +2 -3
  246. data/app/views/cms/dynamic_views/index.html.erb +22 -44
  247. data/app/views/cms/dynamic_views/new.html.erb +2 -3
  248. data/app/views/cms/email_messages/index.html.erb +31 -34
  249. data/app/views/cms/email_messages/show.html.erb +45 -52
  250. data/app/views/cms/file_blocks/_form.html.erb +2 -4
  251. data/app/views/cms/form_entries/_buttons.html.erb +2 -0
  252. data/app/views/cms/form_entries/_form.html.erb +7 -0
  253. data/app/views/cms/form_entries/_internal_form.html.erb +9 -0
  254. data/app/views/cms/form_entries/edit.html.erb +5 -0
  255. data/app/views/cms/form_entries/error.html.erb +3 -0
  256. data/app/views/cms/form_entries/index.html.erb +4 -0
  257. data/app/views/cms/form_entries/new.html.erb +5 -0
  258. data/app/views/cms/form_entries/show.html.erb +13 -0
  259. data/app/views/cms/form_entries/submit.html.erb +1 -0
  260. data/app/views/cms/form_fields/_form.html.erb +8 -0
  261. data/app/views/cms/form_fields/_select.html.erb +3 -0
  262. data/app/views/cms/form_fields/_text_area.html.erb +3 -0
  263. data/app/views/cms/form_fields/_text_field.html.erb +3 -0
  264. data/app/views/cms/form_fields/edit.html.erb +0 -0
  265. data/app/views/cms/form_fields/new.html.erb +26 -0
  266. data/app/views/cms/form_fields/preview.html.erb +16 -0
  267. data/app/views/cms/forms/_form.html.erb +66 -0
  268. data/app/views/cms/forms/render.html.erb +15 -0
  269. data/app/views/cms/forms/show.html.erb +6 -0
  270. data/app/views/cms/groups/_form.html.erb +32 -38
  271. data/app/views/cms/groups/_permissions.html.erb +11 -34
  272. data/app/views/cms/groups/_sections.html.erb +11 -17
  273. data/app/views/cms/groups/edit.html.erb +1 -3
  274. data/app/views/cms/groups/index.html.erb +10 -32
  275. data/app/views/cms/groups/new.html.erb +2 -4
  276. data/app/views/cms/html_blocks/_form.html.erb +2 -2
  277. data/app/views/cms/html_blocks/render.html.erb +1 -1
  278. data/app/views/cms/image_blocks/_form.html.erb +3 -3
  279. data/app/views/cms/links/_form.html.erb +6 -11
  280. data/app/views/cms/links/edit.html.erb +3 -12
  281. data/app/views/cms/links/new.html.erb +4 -13
  282. data/app/views/cms/page_components/_content.html.erb +18 -0
  283. data/app/views/cms/page_components/new.html.erb +12 -0
  284. data/app/views/cms/page_routes/_form.html.erb +11 -10
  285. data/app/views/cms/page_routes/edit.html.erb +2 -3
  286. data/app/views/cms/page_routes/index.html.erb +25 -48
  287. data/app/views/cms/page_routes/new.html.erb +2 -3
  288. data/app/views/cms/pages/_edit_content.html.erb +28 -0
  289. data/app/views/cms/pages/_form.html.erb +20 -37
  290. data/app/views/cms/pages/_main_form.html.erb +23 -0
  291. data/app/views/cms/pages/_simple_container.html.erb +8 -0
  292. data/app/views/cms/pages/edit.html.erb +2 -23
  293. data/app/views/cms/pages/new.html.erb +2 -16
  294. data/app/views/cms/pages/versions.html.erb +18 -87
  295. data/app/views/cms/redirects/_form.html.erb +6 -14
  296. data/app/views/cms/redirects/edit.html.erb +2 -3
  297. data/app/views/cms/redirects/index.html.erb +24 -50
  298. data/app/views/cms/redirects/new.html.erb +2 -3
  299. data/app/views/cms/routes/index.html.erb +15 -20
  300. data/app/views/cms/section_nodes/_children.html.erb +3 -0
  301. data/app/views/cms/section_nodes/_row_buttons.html.erb +11 -0
  302. data/app/views/cms/section_nodes/_section_node.html.erb +24 -10
  303. data/app/views/cms/section_nodes/_sitemap_buttons.html.erb +47 -0
  304. data/app/views/cms/section_nodes/_status.html.erb +5 -0
  305. data/app/views/cms/section_nodes/show.html.erb +9 -0
  306. data/app/views/cms/sections/_buttons.html.erb +6 -0
  307. data/app/views/cms/sections/_form.html.erb +22 -49
  308. data/app/views/cms/sections/edit.html.erb +3 -8
  309. data/app/views/cms/sections/new.html.erb +4 -20
  310. data/app/views/cms/sessions/new.html.erb +16 -31
  311. data/app/views/cms/shared/access_denied.html.erb +1 -2
  312. data/app/views/cms/shared/error.html.erb +5 -5
  313. data/app/views/cms/sites/_flash.html.erb +8 -0
  314. data/app/views/cms/sites/passwords/new.html.erb +2 -0
  315. data/app/views/cms/sites/sessions/new.html.erb +2 -0
  316. data/app/views/cms/tags/_form.html.erb +1 -1
  317. data/app/views/cms/tags/render.html.erb +0 -1
  318. data/app/views/cms/tasks/new.html.erb +18 -32
  319. data/app/views/cms/toolbar/_new_pages_menu.html.erb +10 -0
  320. data/app/views/cms/users/_form.html.erb +8 -11
  321. data/app/views/cms/users/_password.html.erb +2 -8
  322. data/app/views/cms/users/_user_fields.html.erb +7 -20
  323. data/app/views/cms/users/change_password.html.erb +12 -21
  324. data/app/views/cms/users/edit.html.erb +1 -15
  325. data/app/views/cms/users/index.html.erb +61 -58
  326. data/app/views/cms/users/new.html.erb +1 -12
  327. data/app/views/devise/confirmations/new.html.erb +16 -0
  328. data/app/views/devise/mailer/confirmation_instructions.html.erb +5 -0
  329. data/app/views/devise/mailer/reset_password_instructions.html.erb +8 -0
  330. data/app/views/devise/mailer/unlock_instructions.html.erb +7 -0
  331. data/app/views/devise/passwords/edit.html.erb +19 -0
  332. data/app/views/devise/passwords/new.html.erb +15 -0
  333. data/app/views/devise/registrations/edit.html.erb +28 -0
  334. data/app/views/devise/registrations/new.html.erb +18 -0
  335. data/app/views/devise/shared/_links.erb +25 -0
  336. data/app/views/devise/unlocks/new.html.erb +16 -0
  337. data/app/views/layouts/cms/_content_types.html.erb +13 -0
  338. data/app/views/layouts/cms/_footer.erb +2 -2
  339. data/app/views/layouts/cms/_head.html.erb +8 -18
  340. data/app/views/layouts/cms/_main_menu.html.erb +78 -0
  341. data/app/views/layouts/cms/application.html.erb +19 -24
  342. data/app/views/layouts/cms/content_page.html.erb +5 -0
  343. data/app/views/layouts/cms/page_editor.html.erb +90 -0
  344. data/app/views/portlets/deprecated_placeholders/_form.html.erb +1 -0
  345. data/app/views/portlets/deprecated_placeholders/render.html.erb +8 -0
  346. data/app/views/portlets/dynamic/_form.html.erb +3 -3
  347. data/app/views/portlets/email_page/_form.html.erb +5 -6
  348. data/app/views/portlets/forgot_password/_form.html.erb +2 -3
  349. data/app/views/portlets/forgot_password/render.html.erb +2 -14
  350. data/app/views/portlets/login/_form.html.erb +4 -6
  351. data/app/views/portlets/login/render.html.erb +8 -27
  352. data/app/views/portlets/portlets/_form.html.erb +7 -6
  353. data/app/views/portlets/tag_cloud/_form.html.erb +4 -4
  354. data/app/views/tests/pretend/open_with_layout.html.erb +1 -1
  355. data/bin/bcms +13 -16
  356. data/config/routes.rb +58 -29
  357. data/db/browsercms.seeds.rb +0 -6
  358. data/db/migrate/{20080815014337_browsercms_3_0_0.rb → 20080815014337_browsercms300.rb} +94 -73
  359. data/db/migrate/20130327184912_browsercms400.rb +90 -0
  360. data/db/migrate/20131206214021_devise_create_users.rb +47 -0
  361. data/db/migrate/20131211223908_kill_reset_password.rb +5 -0
  362. data/db/migrate/20131218222005_create_cms_external_users.rb +10 -0
  363. data/doc/features/design_integration.md +45 -0
  364. data/doc/features/external_user.md +7 -0
  365. data/doc/features/form_builder.md +40 -0
  366. data/doc/features/simple_form_refactor.md +60 -0
  367. data/doc/release_notes.md +224 -10
  368. data/lib/acts_as_list.rb +72 -71
  369. data/lib/browsercms.rb +41 -1
  370. data/lib/cms/acts/content_block.rb +12 -2
  371. data/lib/cms/acts/content_page.rb +3 -4
  372. data/lib/cms/admin_tab.rb +15 -0
  373. data/lib/cms/attachments/configuration.rb +1 -1
  374. data/lib/cms/authentication/controller.rb +83 -177
  375. data/lib/cms/authentication/test_password_strategy.rb +19 -0
  376. data/lib/cms/behaviors.rb +1 -0
  377. data/lib/cms/behaviors/archiving.rb +2 -2
  378. data/lib/cms/behaviors/attaching.rb +21 -45
  379. data/lib/cms/behaviors/connecting.rb +14 -4
  380. data/lib/cms/behaviors/dynamic_attributes.rb +3 -3
  381. data/lib/cms/behaviors/hiding.rb +2 -2
  382. data/lib/cms/behaviors/namespacing.rb +6 -36
  383. data/lib/cms/behaviors/publishing.rb +92 -45
  384. data/lib/cms/behaviors/rendering.rb +15 -7
  385. data/lib/cms/behaviors/searching.rb +5 -4
  386. data/lib/cms/behaviors/soft_deleting.rb +13 -16
  387. data/lib/cms/behaviors/taggable.rb +17 -10
  388. data/lib/cms/behaviors/versioning.rb +12 -16
  389. data/lib/cms/commands/to_version400.rb +10 -0
  390. data/lib/cms/concerns.rb +7 -0
  391. data/lib/cms/concerns/can_be_addressable.rb +326 -0
  392. data/lib/cms/concerns/has_content_type.rb +46 -0
  393. data/lib/cms/concerns/ignores_publishing.rb +9 -0
  394. data/lib/cms/configuration.rb +14 -4
  395. data/lib/cms/configuration/configurable_template.rb +24 -0
  396. data/lib/cms/configuration/devise.rb +256 -0
  397. data/lib/cms/configure_simple_form.rb +142 -0
  398. data/lib/cms/configure_simple_form_bootstrap.rb +49 -0
  399. data/lib/cms/content_filter.rb +18 -0
  400. data/lib/cms/content_page.rb +77 -0
  401. data/lib/cms/content_rendering_support.rb +25 -16
  402. data/lib/cms/controllers/admin_controller.rb +78 -0
  403. data/lib/cms/data_loader.rb +30 -11
  404. data/lib/cms/default_accessible.rb +6 -6
  405. data/lib/cms/domain_support.rb +0 -4
  406. data/lib/cms/engine.rb +52 -20
  407. data/lib/cms/engine_helper.rb +41 -51
  408. data/{app/controllers → lib}/cms/error_handling.rb +11 -5
  409. data/lib/cms/extensions.rb +2 -1
  410. data/lib/cms/extensions/active_model/name.rb +13 -0
  411. data/lib/cms/extensions/active_record/connection_adapters/abstract/schema_statements.rb +49 -89
  412. data/lib/cms/extensions/hash.rb +0 -12
  413. data/lib/cms/form_builder/content_block_form_builder.rb +45 -0
  414. data/lib/cms/form_builder/default_input.rb +13 -0
  415. data/lib/cms/form_builder/deprecated_inputs.rb +40 -0
  416. data/lib/cms/form_builder/workflow_buttons.rb +38 -0
  417. data/lib/cms/module.rb +1 -7
  418. data/lib/cms/polymorphic_single_table_inheritance.rb +19 -0
  419. data/lib/cms/publish_workflow.rb +26 -0
  420. data/lib/cms/responders/content_responder.rb +14 -0
  421. data/lib/cms/route_extensions.rb +112 -20
  422. data/lib/cms/version.rb +1 -1
  423. data/lib/generators/browser_cms/demo_site/templates/demo.seeds.rb +0 -2
  424. data/lib/generators/cms/content_block/content_block_generator.rb +19 -46
  425. data/lib/generators/cms/content_block/templates/_form.html.erb +22 -28
  426. data/lib/generators/cms/project/templates/devise.rb.erb +7 -0
  427. metadata +383 -150
  428. data/app/assets/javascripts/cms/sitemap.js.erb +0 -464
  429. data/app/assets/stylesheets/browsercms/application.css +0 -7
  430. data/app/assets/stylesheets/cms/administration.css.erb +0 -91
  431. data/app/assets/stylesheets/cms/application.css.erb +0 -171
  432. data/app/assets/stylesheets/cms/attachment_manager.css.scss +0 -28
  433. data/app/assets/stylesheets/cms/block.css +0 -26
  434. data/app/assets/stylesheets/cms/buttons.css.erb +0 -120
  435. data/app/assets/stylesheets/cms/content_library.css.erb +0 -139
  436. data/app/assets/stylesheets/cms/content_types.css +0 -4
  437. data/app/assets/stylesheets/cms/dashboard.css.erb +0 -118
  438. data/app/assets/stylesheets/cms/data_table.css.erb.erb +0 -156
  439. data/app/assets/stylesheets/cms/date_picker.css.erb +0 -82
  440. data/app/assets/stylesheets/cms/form_layout.css.erb +0 -282
  441. data/app/assets/stylesheets/cms/login.css.erb +0 -78
  442. data/app/assets/stylesheets/cms/menu.css.erb +0 -116
  443. data/app/assets/stylesheets/cms/nav.css.erb +0 -99
  444. data/app/assets/stylesheets/cms/page_toolbar.css.erb +0 -135
  445. data/app/assets/stylesheets/cms/reset.css +0 -46
  446. data/app/assets/stylesheets/cms/selectbox.css.erb +0 -56
  447. data/app/assets/stylesheets/cms/sitemap.css.erb +0 -390
  448. data/app/assets/stylesheets/cms/taglist.css +0 -18
  449. data/app/controllers/application_controller.rb +0 -14
  450. data/app/controllers/cms/content_types_controller.rb +0 -9
  451. data/app/helpers/application_helper.rb +0 -5
  452. data/app/helpers/cms/form_builder.rb +0 -241
  453. data/app/models/cms/content_type_group.rb +0 -15
  454. data/app/models/cms/forgot_password_mailer.rb +0 -14
  455. data/app/portlets/reset_password_portlet.rb +0 -28
  456. data/app/views/cms/blocks/_hidden_fields.html.erb +0 -10
  457. data/app/views/cms/blocks/_toolbar.html.erb +0 -9
  458. data/app/views/cms/blocks/_toolbar_for_collection.html.erb +0 -23
  459. data/app/views/cms/blocks/_toolbar_for_member.html.erb +0 -36
  460. data/app/views/cms/blocks/edit.html.erb +0 -28
  461. data/app/views/cms/blocks/index.html.erb +0 -86
  462. data/app/views/cms/blocks/new.html.erb +0 -19
  463. data/app/views/cms/blocks/show.html.erb +0 -43
  464. data/app/views/cms/blocks/usages.html.erb +0 -44
  465. data/app/views/cms/blocks/versions.html.erb +0 -90
  466. data/app/views/cms/content_types/index.html.erb +0 -14
  467. data/app/views/cms/form_builder/_cms_attachment_manager.html.erb +0 -27
  468. data/app/views/cms/form_builder/_cms_check_box.html.erb +0 -7
  469. data/app/views/cms/form_builder/_cms_date_picker.html.erb +0 -12
  470. data/app/views/cms/form_builder/_cms_datetime_select.html.erb +0 -12
  471. data/app/views/cms/form_builder/_cms_drop_down.html.erb +0 -12
  472. data/app/views/cms/form_builder/_cms_fancy_drop_down.html.erb +0 -9
  473. data/app/views/cms/form_builder/_cms_file_field.html.erb +0 -28
  474. data/app/views/cms/form_builder/_cms_instructions.html.erb +0 -4
  475. data/app/views/cms/form_builder/_cms_tag_list.html.erb +0 -15
  476. data/app/views/cms/form_builder/_cms_template_editor.html.erb +0 -9
  477. data/app/views/cms/form_builder/_cms_text_area.html.erb +0 -10
  478. data/app/views/cms/form_builder/_cms_text_editor.html.erb +0 -19
  479. data/app/views/cms/form_builder/_cms_text_field.html.erb +0 -12
  480. data/app/views/cms/links/destroy.js.rjs +0 -2
  481. data/app/views/cms/page_routes/show.html.erb +0 -10
  482. data/app/views/cms/pages/_edit_connector.html.erb +0 -19
  483. data/app/views/cms/pages/_edit_container.html.erb +0 -11
  484. data/app/views/cms/section_nodes/_link.html.erb +0 -14
  485. data/app/views/cms/section_nodes/_node.html.erb +0 -44
  486. data/app/views/cms/section_nodes/_page.html.erb +0 -20
  487. data/app/views/cms/section_nodes/_section.html.erb +0 -28
  488. data/app/views/cms/section_nodes/index.html.erb +0 -43
  489. data/app/views/cms/sections/_page.html.erb +0 -4
  490. data/app/views/cms/sections/_section.html.erb +0 -8
  491. data/app/views/cms/sections/destroy.js.rjs +0 -2
  492. data/app/views/cms/sections/index.html.erb +0 -23
  493. data/app/views/cms/shared/_admin_sidebar.html.erb +0 -36
  494. data/app/views/cms/shared/_pagination.html.erb +0 -31
  495. data/app/views/cms/toolbar/_mobile_toggle.html.erb +0 -33
  496. data/app/views/cms/toolbar/index.html.erb +0 -1
  497. data/app/views/cms/users/_groups.html.erb +0 -12
  498. data/app/views/cms/users/_toolbar.html.erb +0 -24
  499. data/app/views/cms/users/show.html.erb +0 -50
  500. data/app/views/layouts/_cms_toolbar.html.erb +0 -54
  501. data/app/views/layouts/_page_toolbar.html.erb +0 -119
  502. data/app/views/layouts/cms/administration.html.erb +0 -51
  503. data/app/views/layouts/cms/content_library.html.erb +0 -96
  504. data/app/views/layouts/cms/dashboard.html.erb +0 -16
  505. data/app/views/layouts/cms/login.html.erb +0 -31
  506. data/app/views/layouts/cms/section_nodes.html.erb +0 -20
  507. data/app/views/layouts/cms/toolbar.html.erb +0 -23
  508. data/app/views/portlets/reset_password/_form.html.erb +0 -3
  509. data/app/views/portlets/reset_password/render.html.erb +0 -22
  510. data/bin/bcms-upgrade +0 -332
  511. data/db/migrate/20091109175123_browsercms_3_0_5.rb +0 -9
  512. data/db/migrate/20100117144038_browsercms314.rb +0 -20
  513. data/db/migrate/20100117144039_browsercms315.rb +0 -95
  514. data/db/migrate/20100705083859_browsercms_3_3_0.rb +0 -56
  515. data/db/migrate/20111130221145_browsercms340.rb +0 -56
  516. data/db/migrate/20120329144406_browsercms350.rb +0 -32
  517. data/db/migrate/20120717182827_browsercms353.rb +0 -19
  518. data/db/migrate/20120813180110_browsercms354.rb +0 -9
  519. data/lib/cms/addressable.rb +0 -93
  520. data/lib/cms/authentication/model.rb +0 -116
  521. data/lib/cms/behaviors/pagination.rb +0 -212
  522. data/lib/cms/upgrades/v3_4_0.rb +0 -31
  523. data/lib/cms/upgrades/v3_5_0.rb +0 -227
data/app/views/layouts/cms/_footer.erb CHANGED
@@ -1,4 +1,4 @@
1
1
  <div id="footer">
2
- <p>&copy; 1998-<%= Time.now.year %> <a href="#">BrowserMedia</a>. All Rights Reserved</p>
3
- <p>Browser CMS v<%= Cms.version %> | Rails <%= Rails.version %> | Env <%= Rails.env %></p>
2
+ <p>&copy; 1998-<%= Time.now.year %> <%= link_to "BrowserMedia", "http://www.browsermedia.com" %>. All Rights Reserved</p>
3
+ <p><%= link_to "BrowserCMS", "http://www.browsercms.org" %> v<%= Cms.version %> | Rails <%= Rails.version %> | Env <%= Rails.env %></p>
4
4
  </div>
data/app/views/layouts/cms/_head.html.erb CHANGED
@@ -1,18 +1,8 @@
1
- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2
- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3
- <head>
4
- <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
5
- <title><%= @page_title %></title>
6
- <%= stylesheet_link_tag 'cms/application', 'cms/date_picker', 'cms/sitemap', 'cms/taglist' %>
7
- <%= javascript_include_tag "cms/application" %>
8
- <%= javascript_include_tag *cms_content_editor %>
9
- <%= csrf_meta_tags %>
10
- <script type="text/javascript">
11
- jQuery(function($){
12
- <% if protect_against_forgery? %>
13
- $.cms.authenticity_token = '<%= form_authenticity_token %>'
14
- <% end %>
15
- })
16
- </script>
17
- <%= yield :html_head %>
18
- </head>
1
+ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
2
+ <title><%= page_title %></title>
3
+ <%= stylesheet_link_tag 'cms/application' %>
4
+ <link href='http://fonts.googleapis.com/css?family=Roboto:400,100,300,100italic,300italic,400italic,500,500italic,700italic,700,900italic,900' rel='stylesheet' type='text/css'>
5
+ <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,600,700,800,300' rel='stylesheet' type='text/css'>
6
+ <link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700,900,200italic,300italic,400italic,600italic,700italic,900italic' rel='stylesheet' type='text/css'>
7
+ <%= csrf_meta_tags %>
8
+ <%= yield :html_head %>
data/app/views/layouts/cms/_main_menu.html.erb ADDED
@@ -0,0 +1,78 @@
1
+ <div class="logged-in">
2
+ <div class="container center-column">
3
+ <ul class="subnav right">
4
+ <li><%= link_to current_user.full_name, cms.edit_user_path(current_user) unless current_user.guest? %></li>
5
+ <li><%= link_to "Settings", "#" unless current_user.guest? %></li>
6
+ <li><%= link_to "Help", 'https://github.com/browsermedia/browsercms/wiki', target: '_blank' %></li>
7
+ <li><%= link_to "Logout", cms.logout_path unless current_user.guest? %></li>
8
+ </ul>
9
+ </div>
10
+ </div>
11
+
12
+ <div class="primary-nav">
13
+ <div class="container center-column">
14
+ <%= link_to image_tag('cms/logo.png', class: 'main-logo'), "/" %>
15
+ <ul class="mainnav">
16
+ <% if current_user.able_to?(:edit_content) %>
17
+ <li>
18
+ <%= link_to "Dashboard", cms.dashboard_path %>
19
+ <ul class="dropdown-menu">
20
+ </ul>
21
+ </li>
22
+ <li>
23
+ <%= link_to "Pages", cms.sitemap_path %>
24
+ </li>
25
+ <li>
26
+
27
+ <a href="#"
28
+ class="dropdown-toggle"
29
+ data-toggle="dropdown">
30
+ Assets
31
+ <b class="caret"></b>
32
+ </a>
33
+ <%= render partial: 'layouts/cms/content_types', locals: { library: true, id: 'content-library-menu' } %>
34
+ </li>
35
+ <% end %>
36
+ <% if current_user.able_to? :administrate %>
37
+ <li>
38
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin<b class="caret"></b></a>
39
+ <ul class="dropdown-menu">
40
+ <%= nav_link_to "Users", cms.users_path %>
41
+ <%= nav_link_to "Groups", cms.groups_path %>
42
+ <%= divider_tag %>
43
+ <%= nav_link_to "Partials", cms.page_partials_path %>
44
+ <%= nav_link_to "Page Templates", cms.page_templates_path %>
45
+ <%= divider_tag %>
46
+ <%= nav_link_to "Redirects", cms.redirects_path %>
47
+ <%= nav_link_to "Routes", cms.page_routes_path %>
48
+ <%= nav_link_to "Page Cache", cms.cache_path %>
49
+ <%= nav_link_to "Email Messages", cms.email_messages_path %>
50
+ <% Rails.application.config.cms.tools_menu.each do |menu_item| %>
51
+ <%= nav_link_to(menu_item[:name], self.send(menu_item[:engine]).send(menu_item[:route_name])) %>
52
+ <% end %>
53
+ </ul>
54
+ </li>
55
+ <% end %>
56
+ </ul>
57
+
58
+ <% if current_user.able_to?(:edit_content) %>
59
+ <div class="btn-group">
60
+ <%= menu_button "New", new_button_path, id: 'new-content-button', class: 'btn btn-primary', tabindex: '-1' %>
61
+ <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown" tabindex="-1">
62
+ <span class="caret"></span>
63
+ </button>
64
+ <ul class="dropdown-menu pull-right">
65
+ <%= render 'cms/toolbar/new_pages_menu' %>
66
+ <% modules = Cms::ContentType.available_by_module
67
+ modules.keys.sort.each_with_index do |module_name, i| %>
68
+ <%= divider_tag(i) %>
69
+ <% modules[module_name].each do |type| %>
70
+ <%= nav_link_to h(type.display_name), new_engine_aware_path(type), id: "create_new_#{type.param_key}" %>
71
+ <% end -%>
72
+ <% end %>
73
+ </ul>
74
+
75
+ </div>
76
+ <% end %>
77
+ </div>
78
+ </div>
data/app/views/layouts/cms/application.html.erb CHANGED
@@ -1,25 +1,20 @@
1
- <% @toolbar_tab ||= :dashboard %>
2
- <%= render :partial => 'layouts/cms/head' %>
3
- <body>
4
- <div id="wrapper">
5
- <%= render_cms_toolbar(@toolbar_tab) %>
6
- <div id="main">
7
- <div class="top_cap"></div>
8
- <div id="contentwrapbig">
9
- <div id="functions">
10
- <%= yield :functions %>
11
- </div>
12
- <div class="top_cap_sitemap_content"></div>
13
- <div id="content">
14
- <div class="pad">
15
- <%= yield %>
16
- </div>
17
- </div>
18
- </div>
19
- </div>
20
- <br clear="all" />
21
- <div class="bottom_cap"></div>
22
- <%= render :partial => 'layouts/cms/footer' %>
23
- </div>
24
- </body>
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <%= javascript_include_tag "cms/application" %>
5
+ <%= javascript_include_tag *cms_content_editor %>
6
+ <%= render 'layouts/cms/head' %>
7
+ </head>
8
+ <body>
9
+ <nav id="main-nav">
10
+ <%= render 'layouts/cms/main_menu' %>
11
+ </nav>
12
+ <%= render 'cms/sites/flash' %>
13
+ <section class="container center-column main-container bottom-form-btn clearfix">
14
+ <%= yield %>
15
+ <div class="padded row-fluid">
16
+ <div class="span12"><%= render :partial => 'layouts/cms/footer' %></div>
17
+ </div>
18
+ </section>
19
+ </body>
25
20
  </html>
data/app/views/layouts/cms/content_page.html.erb ADDED
@@ -0,0 +1,5 @@
1
+ <%# Sub-layout
2
+ Wraps a view so it will display in the :main container of a page without needing to call content_for(:main)
3
+ %>
4
+ <% content_for :main do %><%= yield %><% end %>
5
+ <%= render template: cms_template %>
data/app/views/layouts/cms/page_editor.html.erb ADDED
@@ -0,0 +1,90 @@
1
+ <!DOCTYPE html>
2
+ <html>
3
+ <head>
4
+ <%= javascript_include_tag 'cms/page_toolbar' %>
5
+ <%= render 'layouts/cms/head' %>
6
+ <%= stylesheet_link_tag 'cms/page_editor' %>
7
+ </head>
8
+ <body>
9
+ <nav id="main-nav">
10
+ <%= render 'layouts/cms/main_menu' %>
11
+ </nav>
12
+ <div id="submenu">
13
+ <div class="container center-column">
14
+ <% if !@page.live? %>
15
+ <span class="status draft" id="page-status-label">This page is in draft status</span>
16
+ <% else %>
17
+ <span class="status published" id="page-status-label">Published</span>
18
+ <% end %>
19
+ <%= render 'add_content_modal' %>
20
+ <span class="last-saved">Last saved: &nbsp;<strong><%= format_date(@page.updated_at) %></strong></span>
21
+
22
+ <%= link_to "Publish",
23
+ engine(@page).polymorphic_path([:publish, @page]),
24
+ class: "right btn btn-small btn-primary primary-cta http_put",
25
+ :id => "publish_button",
26
+ :target => "_top",
27
+ :enabled => !(!current_user.able_to?(:publish_content) || !current_user.able_to_edit?(@page) || @page.version != @page.draft.version || @page.live?)
28
+ %>
29
+
30
+ <div class="btn-group">
31
+ <% if @page.respond_to?(:current_task) %>
32
+ <% unless @page.current_task %>
33
+ <%= link_to "Assign",
34
+ cms.new_page_task_path(@page),
35
+ :id => "assign_button",
36
+ :target => "_top",
37
+ :align => 'none',
38
+ class: 'btn btn-small',
39
+ :enabled => !(@page.assigned_to == current_user || !current_user.able_to_edit?(@page))
40
+ %>
41
+ <% else %>
42
+ <%= link_to "Complete Task",
43
+ cms.complete_task_path(@page.current_task),
44
+ :id => "complete_task_button",
45
+ class: 'http_put btn btn-small',
46
+ :target => "_top",
47
+ :enabled => !(@page.assigned_to != current_user || !current_user.able_to_edit?(@page)) %>
48
+ <% end %>
49
+ <% end %>
50
+ <%= link_to "Versions",
51
+ engine(@page).polymorphic_path([:versions, @page]),
52
+ :target => "_top",
53
+ class: "btn btn-small",
54
+ :enabled => current_user.able_to_edit?(@page)
55
+ %>
56
+ </div>
57
+
58
+ <div class='btn-group'>
59
+ <%= able_to? :publish_content do %>
60
+ <%= link_to "Delete",
61
+ engine_aware_path(@page),
62
+ :id => "delete_button",
63
+ title: "Are you sure you want to delete '#{@page.name}'?",
64
+ :target => "_top",
65
+ :enabled => current_user.able_to_publish?(@page),
66
+ class: 'btn btn-small btn-danger http_delete confirm_with_title' %>
67
+ <% end %>
68
+ </div>
69
+ <%= render 'mobile_toolbar' %>
70
+
71
+ <div class="btn-group right">
72
+ <%= link_to "Configure",
73
+ edit_engine_aware_path(@page),
74
+ class: "btn btn-small",
75
+ :id => "edit_properties_button",
76
+ :target => "_top",
77
+ :enabled => current_user.able_to_edit?(@page)
78
+ %>
79
+ <%= link_to "Preview", preview_content_path(@page), id: "preview_button", class: 'btn btn-small', target: "_blank" if @page.class.addressable? %>
80
+
81
+ </div>
82
+
83
+ <%= yield :page_buttons if content_for?(:page_buttons) %>
84
+
85
+ </div>
86
+ </div>
87
+ <%= render 'cms/sites/flash' %>
88
+ <%= yield %>
89
+ </body>
90
+ </html>
data/app/views/portlets/deprecated_placeholders/_form.html.erb ADDED
@@ -0,0 +1 @@
1
+ Remove this portlet from any pages its on, delete it and consider removing the page if appropriate.
data/app/views/portlets/deprecated_placeholders/render.html.erb ADDED
@@ -0,0 +1,8 @@
1
+ This portlet type '<%= @portlet.name %>' has been deprecated.
2
+
3
+ <h3>Next Steps:</h3>
4
+ <ol>
5
+ <li>Remove this portlet from any pages it was placed on.</li>
6
+ <li>Delete it from the content library.</li>
7
+ <li>If it makes sense, remove any pages they were previously placed on.</li>
8
+ </ol>
data/app/views/portlets/dynamic/_form.html.erb CHANGED
@@ -1,3 +1,3 @@
1
- <%= f.cms_text_field :name %>
2
- <%= f.cms_text_area :code %>
3
- <%= f.cms_text_area :template %>
1
+ <%= f.input :name %>
2
+ <%= f.input :code, as: :text %>
3
+ <%= f.input :template, as: :text %>
data/app/views/portlets/email_page/_form.html.erb CHANGED
@@ -1,6 +1,5 @@
1
- <%= f.cms_text_field :name %>
2
- <%= f.cms_text_field :subject,
3
- :default_value => "A link you might be interested in" %>
4
- <%= f.cms_text_field :success_url,
5
- :instructions => "Leave blank to return the same page" %>
6
- <%= f.cms_text_area :template, :default_value => EmailPagePortlet.default_template %>
1
+ <%= f.input :name %>
2
+ <%= f.input :sender, hint: "Enter the email for the 'from' field on any emails sent out." %>
3
+ <%= f.input :subject, as: :cms_text_field, default: "A link you might be interested in" %>
4
+ <%= f.input :success_url, hint: "Leave blank to return the same page" %>
5
+ <%= f.input :template, as: :template_editor %>
data/app/views/portlets/forgot_password/_form.html.erb CHANGED
@@ -1,6 +1,5 @@
1
- <%= f.cms_text_field :name %>
2
- <%= f.cms_text_field :reset_password_url, :instructions => 'URL to page where user will reset his or her password. No get parameters allowed.' %>
3
- <%= f.cms_template_editor :template %>
1
+ <%= f.input :name %>
2
+ <%= f.input :template, as: :template_editor %>
4
3
 
5
4
 
6
5
 
data/app/views/portlets/forgot_password/render.html.erb CHANGED
@@ -1,14 +1,2 @@
1
- <% if flash_scope = flash[:forgot_password] -%>
2
- <% if flash_scope[:error] -%>
3
- <span class="forgot-password-error"><%= flash_scope[:error] %></span>
4
- <% end -%>
5
- <% if flash_scope[:notice] -%>
6
- <span class="forgot-password-notice"><%= flash_scope[:notice] %></span>
7
- <% end -%>
8
- <% end -%>
9
-
10
- <%= form_tag '' do %>
11
- <label for="email">Your account email address:</label>
12
- <%= text_field_tag "email" %><br>
13
- <%= submit_tag "Request reset password token"%>
14
- <% end %>
1
+ <%= render 'cms/sites/flash' %>
2
+ <%= render file: 'devise/passwords/new' %>
data/app/views/portlets/login/_form.html.erb CHANGED
@@ -1,6 +1,4 @@
1
- <%= f.cms_text_field :name %>
2
- <%= f.cms_text_field :success_url,
3
- :instructions => "Leave blank to send the user to the page they were trying to access" %>
4
- <%= f.cms_text_field :failure_url,
5
- :instructions => "Leave blank to send the user to the page they tried to login from" %>
6
- <%= f.cms_text_area :template, :default_value => LoginPortlet.default_template %>
1
+ <%= f.input :name %>
2
+ <%= f.input :success_url, hint: "Leave blank to send the user to the page they were trying to access" %>
3
+ <%= f.input :failure_url, hint: "Leave blank to send the user to the page they tried to login from" %>
4
+ <%= f.input :template, as: :template_editor %>
data/app/views/portlets/login/render.html.erb CHANGED
@@ -1,29 +1,10 @@
1
1
  <div class="login-portlet">
2
- <% if logged_in? %>
3
- <p>Welcome, <%= current_user.login %></p>
4
- <p><%= link_to "Logout", '' %></p>
5
- <p><%#= link_to "Logout", cms.logout_path %></p>
6
- <% else %>
7
- <div class="error"><%= flash[:login_error] %></div>
8
- <%= form_tag '' do %>
9
- <%#= form_tag cms.login_path do %>
10
- <%= hidden_field_tag :success_url, @success_url %>
11
- <%= hidden_field_tag :failure_url, @failure_url %>
12
- <p>
13
- <%= label_tag :login %>
14
- <%= text_field_tag :login, @login %>
15
- </p>
16
- <p>
17
- <%= label_tag :password %>
18
- <%= password_field_tag :password %>
19
- </p>
20
- <p>
21
- <%= label_tag :remember_me %>
22
- <%= check_box_tag :remember_me, '1', @remember_me %>
23
- </p>
24
- <p>
25
- <%= submit_tag "Login" %>
26
- </p>
27
- <% end %>
28
- <% end %>
2
+ <%= render 'cms/sites/flash' %>
3
+ <span class='authenticated' style="display: none">
4
+ <p>Hello, <span class="first-name"></span></p>
5
+ <p><%= link_to "Logout", cms.logout_path %></p>
6
+ </span>
7
+ <span class='guest'>
8
+ <%= render file: 'cms/sessions/new' %>
9
+ </span>
29
10
  </div>
data/app/views/portlets/portlets/_form.html.erb CHANGED
@@ -1,15 +1,16 @@
1
1
  <% if @block.class == Cms::Portlet %>
2
- <% page_title "Content Library / Select Portlet Type" %>
3
- <% Cms::Portlet.types.each do |portlet_type| %>
2
+ <% Cms::Portlet.types.each do |portlet_class|
3
+ type_code = portlet_class.name.underscore
4
+ %>
4
5
  <div style="margin-bottom: 20px;">
5
6
  <%
6
- link_params = {:type => portlet_type.underscore}
7
+ link_params = {:type => type_code}
7
8
  unless params[:portlet].blank?
8
- link_params["#{portlet_type.underscore}[connect_to_page_id]"] = params[:portlet][:connect_to_page_id]
9
- link_params["#{portlet_type.underscore}[connect_to_container]"] = params[:portlet][:connect_to_container]
9
+ link_params["portlet[connect_to_page_id]"] = params[:portlet][:connect_to_page_id]
10
+ link_params["portlet[connect_to_container]"] = params[:portlet][:connect_to_container]
10
11
  end
11
12
  %>
12
- <%= link_to h(portlet_type.titleize), new_portlet_path(link_params) %>
13
+ <%= link_to h(portlet_class.name.titleize), new_portlet_path(link_params) %>: <%= portlet_class.description %>
13
14
  </div>
14
15
  <% end %>
15
16
  <% @hide_buttons = true %>
data/app/views/portlets/tag_cloud/_form.html.erb CHANGED
@@ -1,4 +1,4 @@
1
- <%= f.cms_text_field :name %>
2
- <%= f.cms_text_field :limit, :size => 4 %>
3
- <%= f.cms_text_field :sizes, :default_value => TagCloudPortlet.default_sizes %>
4
- <%= f.cms_text_area :template, :default_value => TagCloudPortlet.default_template %>
1
+ <%= f.input :name %>
2
+ <%= f.input :limit, :size => 4 %>
3
+ <%= f.input :sizes, :default => TagCloudPortlet.default_sizes, as: :cms_text_field %>
4
+ <%= f.input :template, as: :template_editor %>
data/app/views/tests/pretend/open_with_layout.html.erb CHANGED
@@ -1,5 +1,5 @@
1
1
  <%# This view is for testing the dummy layouts for browsercms. It should never be used/included in a project that
2
2
  uses BrowserCMS as gem.
3
3
  %>
4
- <% @page_title = 'Open With Layout' %>
4
+ <% page_title = 'Open With Layout' %>
5
5
  <%= content_for :main do %>hello<% end %>
data/bin/bcms CHANGED
@@ -4,11 +4,12 @@ require 'rubygems'
4
4
  require 'thor'
5
5
  require 'term/ansicolor'
6
6
  require 'rails/generators/actions'
7
+ require 'active_support/core_ext/array/extract_options'
7
8
  require 'active_support/core_ext/string/inflections'
8
9
  require 'cms/version'
9
10
  require 'cms/commands/actions'
10
- require 'cms/upgrades/v3_4_0'
11
- require 'cms/upgrades/v3_5_0'
11
+ require 'cms/commands/to_version400'
12
+
12
13
  # This seems to be required only due to a bug in Thor documented here:
13
14
  # https://rails.lighthouseapp.com/projects/8994/tickets/4692-error-when-creating-app-from-template-undefined-method-wrap-for-arrayclass
14
15
  # If this bug is fixed the following line can probably be removed.
@@ -24,8 +25,7 @@ class Cms::Install < Thor
24
25
  include Thor::Actions
25
26
  include Rails::Generators::Actions
26
27
  include Cms::Commands::Actions
27
- include Cms::Upgrades::V3_4_0
28
- include Cms::Upgrades::V3_5_0
28
+ include Cms::Commands::ToVersion400
29
29
 
30
30
  def self.common_options
31
31
  method_option :database, :aliases => "-d", :desc => "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite3/frontbase/ibm_db) [Default: sqlite3]"
@@ -70,7 +70,7 @@ class Cms::Install < Thor
70
70
  generate_browsercms_project
71
71
  generate_installation_script
72
72
  generate_default_template
73
-
73
+ generate_devise_configuration
74
74
  display_instructions(name)
75
75
  end
76
76
 
@@ -83,9 +83,7 @@ class Cms::Install < Thor
83
83
  comment_out_rails_in_gemfile
84
84
  run_bundle_update
85
85
  install_migrations
86
- rake "rails:update" unless options[:skip_rails]
87
- generate_rails_3_4_0_migration
88
- upgrade_to_3_5_0
86
+ generate_devise_configuration
89
87
  install_cms_seed_data
90
88
 
91
89
  instructions = <<TEXT
@@ -108,7 +106,6 @@ TEXT
108
106
  option_skip_bundle
109
107
  def install
110
108
  common_setup('.')
111
- prefix_cms_tables
112
109
  generate_default_template
113
110
  puts "BrowserCMS has been installed. Run rake db:install to add the tables then restart your server."
114
111
  end
@@ -121,12 +118,6 @@ TEXT
121
118
 
122
119
  private
123
120
 
124
- def prefix_cms_tables
125
- append_to_file "config/initializers/browsercms.rb", <<-CODE
126
- Cms.table_prefix = "cms_"
127
- CODE
128
- end
129
-
130
121
  def create_license_files
131
122
  template 'COPYRIGHT.txt'
132
123
  template 'LICENSE.txt'
@@ -188,6 +179,12 @@ Cms.table_prefix = "cms_"
188
179
 
189
180
  def enable_asset_precompiling
190
181
  gsub_file "config/environments/production.rb", /config\.assets\.compile = false/, 'config.assets.compile = true'
182
+ gsub_file 'config/application.rb', /^(\s*)(config\.assets\.enabled = true)/, <<-RUBY
183
+ \1\2
184
+
185
+ \1# Don't require environment or DB during asset compilation
186
+ \1config.assets.initialize_on_precompile = false
187
+ RUBY
191
188
  end
192
189
 
193
190
  def configure_mail_server
@@ -267,6 +264,7 @@ Cms.table_prefix = "cms_"
267
264
  run_bundle_install
268
265
  generate :jdbc if defined?(JRUBY_VERSION)
269
266
  generate_browsercms_project
267
+ generate_devise_configuration
270
268
  end
271
269
 
272
270
  def generate_default_template
@@ -295,7 +293,6 @@ Cms.table_prefix = "cms_"
295
293
  common_setup name
296
294
  create_browsercms_initializer
297
295
  generate_default_template
298
-
299
296
  end
300
297
 
301
298
  def create_browsercms_initializer