zen 0.2.7 → 0.2.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (303) hide show
  1. data/.gitignore +15 -0
  2. data/.mailmap +2 -0
  3. data/.rvmrc +2 -0
  4. data/.travis.yml +8 -3
  5. data/AUTHORS +1 -2
  6. data/CHANGELOG.md +48 -17
  7. data/README.md +44 -39
  8. data/Rakefile +4 -0
  9. data/bin/zen +5 -30
  10. data/lib/zen.rb +13 -19
  11. data/lib/zen/asset.rb +99 -64
  12. data/lib/zen/bin/create.rb +94 -0
  13. data/lib/zen/bin/runner.rb +118 -0
  14. data/lib/zen/controller/admin_controller.rb +52 -36
  15. data/lib/zen/controller/base_controller.rb +5 -5
  16. data/lib/zen/controller/frontend_controller.rb +7 -7
  17. data/lib/zen/controller/main_controller.rb +12 -10
  18. data/lib/zen/controller/preview.rb +15 -11
  19. data/lib/zen/helper/acl.rb +73 -53
  20. data/lib/zen/helper/blue_form_vendor.rb +689 -0
  21. data/lib/zen/helper/breadcrumb.rb +23 -19
  22. data/lib/zen/helper/message.rb +3 -3
  23. data/lib/zen/helper/theme.rb +18 -13
  24. data/lib/zen/language.rb +62 -58
  25. data/lib/zen/language/en/zen_general.yml +2 -4
  26. data/lib/zen/language/nl/zen_general.yml +2 -4
  27. data/lib/zen/layout/admin.xhtml +3 -12
  28. data/lib/zen/layout/login.xhtml +1 -6
  29. data/lib/zen/model/methods.rb +6 -6
  30. data/lib/zen/model/settings.rb +5 -4
  31. data/lib/zen/package.rb +47 -38
  32. data/lib/zen/package/all.rb +3 -5
  33. data/lib/zen/package/base.rb +7 -7
  34. data/lib/zen/package/categories/lib/categories.rb +8 -3
  35. data/lib/zen/package/categories/lib/categories/controller/categories.rb +81 -55
  36. data/lib/zen/package/categories/lib/categories/controller/category_groups.rb +45 -44
  37. data/lib/zen/package/categories/lib/categories/helper/category.rb +88 -0
  38. data/lib/zen/package/categories/lib/categories/language/en/categories.yml +5 -4
  39. data/lib/zen/package/categories/lib/categories/language/en/category_groups.yml +5 -4
  40. data/lib/zen/package/categories/lib/categories/language/nl/categories.yml +5 -4
  41. data/lib/zen/package/categories/lib/categories/language/nl/category_groups.yml +5 -4
  42. data/lib/zen/package/categories/lib/categories/model/category.rb +15 -13
  43. data/lib/zen/package/categories/lib/categories/model/category_group.rb +3 -3
  44. data/lib/zen/package/categories/lib/categories/plugin/categories.rb +36 -25
  45. data/lib/zen/package/categories/lib/categories/view/admin/categories/form.xhtml +49 -56
  46. data/lib/zen/package/categories/lib/categories/view/admin/categories/index.xhtml +48 -35
  47. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml +36 -29
  48. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/index.xhtml +42 -37
  49. data/lib/zen/package/comments/lib/comments.rb +4 -1
  50. data/lib/zen/package/comments/lib/comments/controller/comments.rb +39 -32
  51. data/lib/zen/package/comments/lib/comments/controller/comments_form.rb +45 -26
  52. data/lib/zen/package/comments/lib/comments/helper/comment.rb +35 -0
  53. data/lib/zen/package/comments/lib/comments/language/en/comments.yml +9 -7
  54. data/lib/zen/package/comments/lib/comments/language/nl/comments.yml +10 -8
  55. data/lib/zen/package/comments/lib/comments/model/comment.rb +31 -17
  56. data/lib/zen/package/comments/lib/comments/model/comment_status.rb +15 -0
  57. data/lib/zen/package/comments/lib/comments/plugin/anti_spam.rb +27 -18
  58. data/lib/zen/package/comments/lib/comments/plugin/comments.rb +25 -20
  59. data/lib/zen/package/comments/lib/comments/view/admin/comments/form.xhtml +61 -54
  60. data/lib/zen/package/comments/lib/comments/view/admin/comments/index.xhtml +38 -23
  61. data/lib/zen/package/comments/migrations/1308774099_comment_status.rb +60 -0
  62. data/lib/zen/package/custom_fields/lib/custom_fields.rb +33 -7
  63. data/lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb +209 -0
  64. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb +50 -47
  65. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_types.rb +215 -0
  66. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb +111 -73
  67. data/lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.rb +79 -0
  68. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.yml +20 -19
  69. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.yml +40 -0
  70. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.yml +34 -32
  71. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml +5 -4
  72. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.yml +40 -0
  73. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.yml +18 -16
  74. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb +31 -11
  75. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_method.rb +15 -0
  76. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_type.rb +50 -0
  77. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb +28 -7
  78. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/form.xhtml +33 -28
  79. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml +48 -46
  80. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/form.xhtml +61 -0
  81. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/index.xhtml +93 -0
  82. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/form.xhtml +105 -99
  83. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/index.xhtml +43 -39
  84. data/lib/zen/package/custom_fields/migrations/1295255665_create_schema.rb +47 -16
  85. data/lib/zen/package/custom_fields/migrations/1310659580_custom_field_types.rb +148 -0
  86. data/lib/zen/package/custom_fields/migrations/1311694920_rename_css_class.rb +11 -0
  87. data/lib/zen/package/menus/lib/menus/controller/menu_items.rb +40 -35
  88. data/lib/zen/package/menus/lib/menus/controller/menus.rb +47 -43
  89. data/lib/zen/package/menus/lib/menus/helper/{menu_item.rb → menu.rb} +42 -15
  90. data/lib/zen/package/menus/lib/menus/language/en/menu_items.yml +5 -5
  91. data/lib/zen/package/menus/lib/menus/language/en/menus.yml +9 -8
  92. data/lib/zen/package/menus/lib/menus/language/nl/menu_items.yml +8 -8
  93. data/lib/zen/package/menus/lib/menus/language/nl/menus.yml +11 -10
  94. data/lib/zen/package/menus/lib/menus/model/menu.rb +5 -5
  95. data/lib/zen/package/menus/lib/menus/model/menu_item.rb +6 -5
  96. data/lib/zen/package/menus/lib/menus/plugin/menus.rb +41 -43
  97. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml +59 -63
  98. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml +35 -30
  99. data/lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml +46 -37
  100. data/lib/zen/package/menus/lib/menus/view/admin/menus/index.xhtml +37 -37
  101. data/lib/zen/package/menus/migrations/1297184342_create_schema.rb +5 -5
  102. data/lib/zen/package/menus/migrations/1308671733_rename_order_column.rb +11 -0
  103. data/lib/zen/package/menus/migrations/1311695030_rename_css_class.rb +17 -0
  104. data/lib/zen/package/sections/lib/sections.rb +18 -11
  105. data/lib/zen/package/sections/lib/sections/controller/section_entries.rb +115 -109
  106. data/lib/zen/package/sections/lib/sections/controller/sections.rb +72 -50
  107. data/lib/zen/package/sections/lib/sections/helper/section.rb +53 -0
  108. data/lib/zen/package/sections/lib/sections/language/en/section_entries.yml +5 -4
  109. data/lib/zen/package/sections/lib/sections/language/en/sections.yml +5 -4
  110. data/lib/zen/package/sections/lib/sections/language/nl/section_entries.yml +5 -4
  111. data/lib/zen/package/sections/lib/sections/language/nl/sections.yml +5 -4
  112. data/lib/zen/package/sections/lib/sections/model/section.rb +17 -9
  113. data/lib/zen/package/sections/lib/sections/model/section_entry.rb +192 -13
  114. data/lib/zen/package/sections/lib/sections/model/section_entry_status.rb +13 -0
  115. data/lib/zen/package/sections/lib/sections/plugin/section_entries.rb +60 -39
  116. data/lib/zen/package/sections/lib/sections/plugin/sections.rb +14 -11
  117. data/lib/zen/package/sections/lib/sections/view/admin/form.xhtml +100 -97
  118. data/lib/zen/package/sections/lib/sections/view/admin/index.xhtml +41 -39
  119. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml +95 -215
  120. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/index.xhtml +48 -40
  121. data/lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb +40 -0
  122. data/lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb +58 -0
  123. data/lib/zen/package/settings/lib/settings/controller/settings.rb +5 -8
  124. data/lib/zen/package/settings/lib/settings/model/setting.rb +2 -37
  125. data/lib/zen/package/settings/lib/settings/plugin/setting_base.rb +18 -1
  126. data/lib/zen/package/settings/lib/settings/plugin/settings.rb +13 -7
  127. data/lib/zen/package/settings/lib/settings/view/admin/settings/index.xhtml +2 -1
  128. data/lib/zen/package/users/lib/users.rb +3 -1
  129. data/lib/zen/package/users/lib/users/controller/access_rules.rb +77 -60
  130. data/lib/zen/package/users/lib/users/controller/user_groups.rb +41 -36
  131. data/lib/zen/package/users/lib/users/controller/users.rb +48 -42
  132. data/lib/zen/package/users/lib/users/helper/users.rb +72 -0
  133. data/lib/zen/package/users/lib/users/language/en/access_rules.yml +6 -5
  134. data/lib/zen/package/users/lib/users/language/en/user_groups.yml +5 -4
  135. data/lib/zen/package/users/lib/users/language/en/users.yml +1 -0
  136. data/lib/zen/package/users/lib/users/language/nl/access_rules.yml +5 -4
  137. data/lib/zen/package/users/lib/users/language/nl/user_groups.yml +5 -4
  138. data/lib/zen/package/users/lib/users/language/nl/users.yml +1 -0
  139. data/lib/zen/package/users/lib/users/model/access_rule.rb +5 -1
  140. data/lib/zen/package/users/lib/users/model/user.rb +17 -10
  141. data/lib/zen/package/users/lib/users/public/admin/js/users/access_rules.js +10 -37
  142. data/lib/zen/package/users/lib/users/public/admin/js/users/lib/access_rules.js +49 -0
  143. data/lib/zen/package/users/lib/users/view/admin/access-rules/form.xhtml +105 -96
  144. data/lib/zen/package/users/lib/users/view/admin/access-rules/index.xhtml +48 -41
  145. data/lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml +42 -32
  146. data/lib/zen/package/users/lib/users/view/admin/user-groups/index.xhtml +43 -38
  147. data/lib/zen/package/users/lib/users/view/admin/users/form.xhtml +76 -67
  148. data/lib/zen/package/users/lib/users/view/admin/users/index.xhtml +43 -41
  149. data/lib/zen/package/users/lib/users/view/admin/users/login.xhtml +12 -9
  150. data/lib/zen/package/users/migrations/1295281013_create_schema.rb +2 -2
  151. data/lib/zen/plugin.rb +56 -50
  152. data/lib/zen/plugin/markup/lib/markup/markup.rb +33 -21
  153. data/lib/zen/public/admin/css/zen/buttons.css +11 -7
  154. data/lib/zen/public/admin/css/zen/datepicker.css +6 -6
  155. data/lib/zen/public/admin/css/zen/forms.css +2 -1
  156. data/lib/zen/public/admin/css/zen/general.css +15 -10
  157. data/lib/zen/public/admin/css/zen/layout.css +51 -20
  158. data/lib/zen/public/admin/css/zen/tables.css +39 -11
  159. data/lib/zen/public/admin/css/zen/tabs.css +6 -4
  160. data/lib/zen/public/admin/css/zen/window.css +11 -11
  161. data/lib/zen/public/{favicon.ico → admin/favicon.ico} +0 -0
  162. data/lib/zen/public/admin/images/zen/icons/asc.png +0 -0
  163. data/lib/zen/public/admin/images/zen/icons/desc.png +0 -0
  164. data/lib/zen/public/admin/js/vendor/datepicker.js +0 -11
  165. data/lib/zen/public/admin/js/{mootools → vendor/mootools}/core.js +0 -1
  166. data/lib/zen/public/admin/js/{mootools → vendor/mootools}/more.js +100 -29
  167. data/lib/zen/public/admin/js/zen/index.js +48 -0
  168. data/lib/zen/public/admin/js/zen/lib/asset.js +111 -0
  169. data/lib/zen/public/admin/js/zen/{editor.js → lib/editor.js} +107 -127
  170. data/lib/zen/public/admin/js/zen/{editor → lib/editor}/markdown.js +7 -9
  171. data/lib/zen/public/admin/js/zen/{editor → lib/editor}/textile.js +7 -9
  172. data/lib/zen/public/admin/js/zen/lib/html_table.js +143 -0
  173. data/lib/zen/public/admin/js/zen/{tabs.js → lib/tabs.js} +40 -37
  174. data/lib/zen/public/admin/js/zen/{window.js → lib/window.js} +24 -20
  175. data/lib/zen/spec/bacon/color_output.rb +39 -0
  176. data/lib/zen/spec/helper.rb +152 -0
  177. data/lib/zen/spec/simplecov.rb +22 -0
  178. data/lib/zen/task/build.rake +20 -43
  179. data/lib/zen/task/clean.rake +2 -6
  180. data/lib/zen/task/db.rake +8 -12
  181. data/lib/zen/task/package.rake +4 -10
  182. data/lib/zen/task/plugin.rake +3 -9
  183. data/lib/zen/task/proto.rake +0 -62
  184. data/lib/zen/task/test.rake +6 -3
  185. data/lib/zen/task/theme.rake +4 -11
  186. data/lib/zen/theme.rb +22 -24
  187. data/lib/zen/validation.rb +34 -27
  188. data/lib/zen/version.rb +2 -8
  189. data/lib/zen/view/head.xhtml +7 -0
  190. data/lib/zen/view/main.xhtml +7 -22
  191. data/{proto/package/migrations → pkg}/.gitkeep +0 -0
  192. data/proto/app/app.rb +1 -0
  193. data/proto/app/config/config.rb +5 -4
  194. data/proto/app/config/database.rb +19 -41
  195. data/proto/app/config/middlewares.rb +32 -29
  196. data/proto/{package/lib/package/view/admin/package/index.xhtml → app/log/database/dev/.gitkeep} +0 -0
  197. data/proto/app/log/database/live/.gitkeep +0 -0
  198. data/spec/Rakefile +26 -0
  199. data/spec/fixtures/zen/asset.rb +18 -0
  200. data/spec/fixtures/zen/helper/acl.rb +39 -0
  201. data/spec/fixtures/zen/helper/message.rb +19 -0
  202. data/spec/fixtures/zen/language/en/spec.yml +10 -0
  203. data/spec/fixtures/zen/language/nl/spec.yml +7 -0
  204. data/spec/fixtures/zen/package.rb +17 -0
  205. data/spec/fixtures/zen/package/comments/controller/comments_form.rb +27 -0
  206. data/spec/fixtures/zen/package/settings/plugin/settings.rb +20 -0
  207. data/spec/fixtures/zen/plugin.rb +7 -0
  208. data/spec/fixtures/zen/theme/404.xhtml +1 -0
  209. data/spec/fixtures/zen/theme/default-section/index.xhtml +1 -0
  210. data/spec/fixtures/zen/theme/helper/404.xhtml +1 -0
  211. data/spec/fixtures/zen/theme/helper/partial.xhtml +1 -0
  212. data/spec/fixtures/zen/theme/helper/wrong_partial.xhtml +1 -0
  213. data/spec/fixtures/zen/theme/partials/partial.xhtml +1 -0
  214. data/spec/fixtures/zen/theme/theme.rb +11 -0
  215. data/spec/fixtures/zen/validation.rb +22 -0
  216. data/spec/helper.rb +41 -0
  217. data/spec/zen/all.rb +5 -0
  218. data/spec/zen/asset.rb +97 -0
  219. data/spec/zen/bin/create.rb +89 -0
  220. data/spec/zen/bin/runner.rb +47 -0
  221. data/spec/zen/controller/admin_controller.rb +26 -0
  222. data/spec/zen/controller/main_controller.rb +81 -0
  223. data/spec/zen/controller/preview.rb +33 -0
  224. data/spec/zen/helper/acl.rb +149 -0
  225. data/spec/zen/helper/breadcrumb.rb +38 -0
  226. data/spec/zen/helper/message.rb +31 -0
  227. data/spec/zen/helper/theme.rb +58 -0
  228. data/spec/zen/language.rb +55 -0
  229. data/spec/zen/package.rb +23 -0
  230. data/spec/zen/package/categories/controller/categories.rb +123 -0
  231. data/spec/zen/package/categories/controller/category_groups.rb +108 -0
  232. data/spec/zen/package/categories/helper/category.rb +75 -0
  233. data/spec/zen/package/categories/plugin/categories.rb +92 -0
  234. data/spec/zen/package/comments/controller/comments.rb +134 -0
  235. data/spec/zen/package/comments/controller/comments_form.rb +343 -0
  236. data/spec/zen/package/comments/helper/comment.rb +47 -0
  237. data/spec/zen/package/comments/plugin/anti_spam.rb +59 -0
  238. data/spec/zen/package/comments/plugin/comments.rb +107 -0
  239. data/spec/zen/package/custom_fields/blue_form_parameters.rb +183 -0
  240. data/spec/zen/package/custom_fields/controller/custom_field_groups.rb +120 -0
  241. data/spec/zen/package/custom_fields/controller/custom_field_types.rb +169 -0
  242. data/spec/zen/package/custom_fields/controller/custom_fields.rb +158 -0
  243. data/spec/zen/package/custom_fields/helper/custom_field.rb +86 -0
  244. data/spec/zen/package/menus/controller/menu_items.rb +110 -0
  245. data/spec/zen/package/menus/controller/menus.rb +110 -0
  246. data/spec/zen/package/menus/helper/menu.rb +75 -0
  247. data/spec/zen/package/menus/plugin/menus.rb +120 -0
  248. data/spec/zen/package/sections/controller/section_entries.rb +201 -0
  249. data/spec/zen/package/sections/controller/sections.rb +116 -0
  250. data/spec/zen/package/sections/helper/section.rb +74 -0
  251. data/spec/zen/package/sections/plugin/section_entries.rb +161 -0
  252. data/spec/zen/package/sections/plugin/sections.rb +75 -0
  253. data/spec/zen/package/settings/controller/settings.rb +36 -0
  254. data/spec/zen/package/settings/plugin/settings.rb +33 -0
  255. data/spec/zen/package/users/controller/access_rules.rb +90 -0
  256. data/spec/zen/package/users/controller/user_groups.rb +101 -0
  257. data/spec/zen/package/users/controller/users.rb +130 -0
  258. data/spec/zen/package/users/helper/users.rb +97 -0
  259. data/spec/zen/plugin.rb +64 -0
  260. data/spec/zen/plugin/helper.rb +11 -0
  261. data/spec/zen/plugin/markup.rb +44 -0
  262. data/spec/zen/theme.rb +41 -0
  263. data/spec/zen/validation.rb +63 -0
  264. data/zen.gemspec +36 -0
  265. metadata +159 -113
  266. data/MANIFEST +0 -266
  267. data/lib/zen/bin/app.rb +0 -40
  268. data/lib/zen/ext/string.rb +0 -185
  269. data/lib/zen/helper/common.rb +0 -106
  270. data/lib/zen/package/categories/lib/categories/view/admin/categories/edit.xhtml +0 -7
  271. data/lib/zen/package/categories/lib/categories/view/admin/categories/new.xhtml +0 -7
  272. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/edit.xhtml +0 -7
  273. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/new.xhtml +0 -7
  274. data/lib/zen/package/comments/lib/comments/view/admin/comments/edit.xhtml +0 -7
  275. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/edit.xhtml +0 -7
  276. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/new.xhtml +0 -7
  277. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/edit.xhtml +0 -7
  278. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/new.xhtml +0 -7
  279. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/edit.xhtml +0 -7
  280. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/new.xhtml +0 -7
  281. data/lib/zen/package/menus/lib/menus/view/admin/menus/edit.xhtml +0 -7
  282. data/lib/zen/package/menus/lib/menus/view/admin/menus/new.xhtml +0 -7
  283. data/lib/zen/package/sections/lib/sections/view/admin/edit.xhtml +0 -7
  284. data/lib/zen/package/sections/lib/sections/view/admin/new.xhtml +0 -7
  285. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/edit.xhtml +0 -7
  286. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/new.xhtml +0 -7
  287. data/lib/zen/package/users/lib/users/view/admin/access-rules/edit.xhtml +0 -7
  288. data/lib/zen/package/users/lib/users/view/admin/access-rules/new.xhtml +0 -7
  289. data/lib/zen/package/users/lib/users/view/admin/user-groups/edit.xhtml +0 -7
  290. data/lib/zen/package/users/lib/users/view/admin/user-groups/new.xhtml +0 -7
  291. data/lib/zen/package/users/lib/users/view/admin/users/edit.xhtml +0 -7
  292. data/lib/zen/package/users/lib/users/view/admin/users/new.xhtml +0 -7
  293. data/lib/zen/plugin/controller.rb +0 -59
  294. data/lib/zen/public/admin/css/zen/notifications.css +0 -84
  295. data/lib/zen/public/admin/images/zen/icons/large/error.png +0 -0
  296. data/lib/zen/public/admin/images/zen/icons/large/notice.png +0 -0
  297. data/lib/zen/public/admin/images/zen/icons/large/success.png +0 -0
  298. data/lib/zen/public/admin/js/zen/core.js +0 -73
  299. data/lib/zen/public/admin/js/zen/init.js +0 -80
  300. data/proto/package/lib/package.rb +0 -21
  301. data/proto/package/lib/package/controller/controllers.rb +0 -50
  302. data/proto/package/lib/package/language/en/languages.yml +0 -4
  303. data/proto/package/lib/package/model/model.rb +0 -12
@@ -1,107 +1,113 @@
1
- <div class='tabs'>
2
- <ul>
3
- <li>
4
- <a href="#general" title="#{lang('custom_fields.tabs.general')}">
5
- #{lang('custom_fields.tabs.general')}
6
- </a>
7
- </li>
8
- <li>
9
- <a href="#settings" title="#{lang('custom_fields.tabs.settings')}">
10
- #{lang('custom_fields.tabs.settings')}
11
- </a>
12
- </li>
13
- </ul>
14
- </div>
1
+ <article>
2
+ <header>
3
+ <h1>#{get_breadcrumbs}</h1>
4
+ </header>
15
5
 
16
- #{
17
- form_for(
18
- @custom_field, :method => :post, :action => @form_save_url, :id => :custom_field_form
19
- ) do |f|
6
+ <div class="tabs">
7
+ <ul>
8
+ <li>
9
+ <a href="#general"
10
+ title="#{lang('custom_fields.tabs.general')}">
11
+ #{lang('custom_fields.tabs.general')}
12
+ </a>
13
+ </li>
14
+ <li>
15
+ <a href="#settings"
16
+ title="#{lang('custom_fields.tabs.settings')}">
17
+ #{lang('custom_fields.tabs.settings')}
18
+ </a>
19
+ </li>
20
+ </ul>
21
+ </div>
20
22
 
21
- f.input_hidden(:id, @custom_field.id)
22
- f.input_hidden(:custom_field_group_id, @custom_field_group_id)
23
- f.input_hidden(:csrf_token, get_csrf_token)
24
-
25
- f.g.div(:id => 'general') do
23
+ #{
24
+ form_for(
25
+ @custom_field,
26
+ :method => :post,
27
+ :action => CustomFields::Controller::CustomFields.r(:save),
28
+ :id => :custom_field_form
29
+ ) do |f|
30
+ f.input_hidden(:id , @custom_field.id)
31
+ f.input_hidden(:custom_field_group_id, @custom_field_group_id)
32
+ f.input_hidden(:csrf_token , get_csrf_token)
26
33
 
27
- f.input_text(
28
- lang('custom_fields.labels.name'),
29
- :name
30
- )
34
+ f.g.div(:id => 'general') do
35
+ f.input_text(
36
+ lang('custom_fields.labels.name'),
37
+ :name
38
+ )
31
39
 
32
- f.input_text(
33
- lang('custom_fields.labels.slug'),
34
- :slug
35
- )
36
-
37
- f.select(
38
- lang('custom_fields.labels.type'),
39
- :type,
40
- :values => @field_type_hash,
41
- :size => 1,
42
- :selected => @custom_field.type
43
- )
44
-
45
- f.select(
46
- lang('custom_fields.labels.format'),
47
- :format,
48
- :values => Zen::Plugin::Markup::Engines,
49
- :size => 1,
50
- :selected => @custom_field.format
51
- )
52
-
53
- f.textarea(
54
- lang('custom_fields.labels.description'),
55
- :description,
56
- :rows => 8
57
- )
40
+ f.input_text(
41
+ lang('custom_fields.labels.slug'),
42
+ :slug
43
+ )
58
44
 
59
- f.textarea(
60
- lang('custom_fields.labels.possible_values'),
61
- :possible_values,
62
- :rows => 8
63
- )
64
-
65
- end
66
-
67
- f.g.div(:id => 'settings') do
45
+ f.select(
46
+ lang('custom_fields.labels.custom_field_type_id'),
47
+ :custom_field_type_id,
48
+ :values => @custom_field_types,
49
+ :size => 1,
50
+ :selected => @custom_field.custom_field_type_id
51
+ )
68
52
 
69
- f.input_radio(
70
- lang('custom_fields.labels.required'),
71
- :required,
72
- @custom_field.required,
73
- :values => @boolean_hash
74
- )
75
-
76
- f.input_radio(
77
- lang('custom_fields.labels.visual_editor'),
78
- :visual_editor,
79
- @custom_field.visual_editor,
80
- :values => @boolean_hash
81
- )
82
-
83
- f.input_text(
84
- lang('custom_fields.labels.textarea_rows'),
85
- :textarea_rows
86
- )
87
-
88
- f.input_text(
89
- lang('custom_fields.labels.text_limit'),
90
- :text_limit
91
- )
92
-
93
- f.input_text(
94
- lang('custom_fields.labels.sort_order'),
95
- :sort_order
96
- )
53
+ f.select(
54
+ lang('custom_fields.labels.format'),
55
+ :format,
56
+ :values => Zen::Plugin::Markup::Engines,
57
+ :size => 1,
58
+ :selected => @custom_field.format
59
+ )
97
60
 
98
- end
99
-
100
- f.g.div(:class => 'clearfix') do
101
- f.g.div(:class => 'button') do
102
- f.g.input(:type => 'submit', :value => lang('custom_fields.buttons.save'))
103
- end
104
- end
61
+ f.textarea(
62
+ lang('custom_fields.labels.description'),
63
+ :description,
64
+ :rows => 8
65
+ )
66
+
67
+ f.textarea(
68
+ lang('custom_fields.labels.possible_values'),
69
+ :possible_values,
70
+ :rows => 8
71
+ )
72
+ end
73
+
74
+ f.g.div(:id => 'settings') do
75
+ f.input_radio(
76
+ lang('custom_fields.labels.required'),
77
+ :required,
78
+ @custom_field.required,
79
+ :values => @boolean_hash.invert
80
+ )
81
+
82
+ f.input_radio(
83
+ lang('custom_fields.labels.text_editor'),
84
+ :text_editor,
85
+ @custom_field.text_editor,
86
+ :values => @boolean_hash.invert
87
+ )
105
88
 
106
- end
107
- }
89
+ f.input_text(
90
+ lang('custom_fields.labels.textarea_rows'),
91
+ :textarea_rows
92
+ )
93
+
94
+ f.input_text(
95
+ lang('custom_fields.labels.text_limit'),
96
+ :text_limit
97
+ )
98
+
99
+ f.input_text(
100
+ lang('custom_fields.labels.sort_order'),
101
+ :sort_order
102
+ )
103
+ end
104
+
105
+ f.g.div(:class => 'button') do
106
+ f.g.input(
107
+ :type => 'submit',
108
+ :value => lang('custom_fields.buttons.save')
109
+ )
110
+ end
111
+ end
112
+ }
113
+ </article>
@@ -2,83 +2,87 @@
2
2
  <header>
3
3
  <h1>#{get_breadcrumbs}</h1>
4
4
  </header>
5
-
6
- <form method="post" action="#{@form_delete_url}">
5
+
6
+ <form method="post"
7
+ action="#{CustomFields::Controller::CustomFields.r(:delete)}">
7
8
  <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
8
- <input type="hidden" name="custom_field_group_id" value="#{@custom_field_group_id}" />
9
-
9
+ <input type="hidden" name="custom_field_group_id"
10
+ value="#{@custom_field_group_id}" />
11
+
10
12
  <?r if @custom_fields and !@custom_fields.empty? ?>
11
-
12
- <table class="table">
13
+
14
+ <table>
13
15
  <thead>
14
16
  <tr>
15
17
  <?r if user_authorized?([:delete]) ?>
16
- <th>
18
+ <th class="no_sort">
17
19
  <input type="checkbox" />
18
20
  </th>
19
21
  <?r end ?>
20
-
22
+
21
23
  <th>#{lang('custom_fields.labels.id')}</th>
22
24
  <th>#{lang('custom_fields.labels.name')}</th>
23
25
  <th>#{lang('custom_fields.labels.slug')}</th>
24
- <th>#{lang('custom_fields.labels.type')}</th>
26
+ <th>#{lang('custom_fields.labels.custom_field_type_id')}</th>
25
27
  <th>#{lang('custom_fields.labels.format')}</th>
26
28
  </tr>
27
29
  </thead>
28
-
29
30
  <tbody>
30
31
  <?r @custom_fields.each do |field| ?>
31
32
  <tr>
32
33
  <?r if user_authorized?([:delete]) ?>
33
34
  <td>
34
- <input type="checkbox" name="custom_field_ids[]" value="#{field.id}" />
35
+ <input type="checkbox" name="custom_field_ids[]"
36
+ value="#{field.id}" />
35
37
  </td>
36
38
  <?r end ?>
37
-
39
+
38
40
  <td>#{field.id}</td>
39
-
41
+
40
42
  <?r if user_authorized?([:update]) ?>
41
43
  <td>
42
- #{anchor_to(
43
- field.name,
44
- CustomFields::Controller::CustomFields.r(:edit, @custom_field_group_id, field.id),
45
- :title => field.name
44
+ #{CustomFields::Controller::CustomFields.a(
45
+ field.name, :edit, @custom_field_group_id, field.id
46
46
  )}
47
47
  </td>
48
48
  <?r else ?>
49
49
  <td>#{field.name}</td>
50
50
  <?r end ?>
51
-
51
+
52
52
  <td>#{field.slug}</td>
53
- <td>#{lang("custom_fields.special.type_hash.#{field.type}")}</td>
53
+ <td>#{@custom_field_types[field.custom_field_type_id]}</td>
54
54
  <td>#{Zen::Plugin::Markup::Engines[field.format]}</td>
55
55
  </tr>
56
56
  <?r end ?>
57
57
  </tbody>
58
58
  </table>
59
-
59
+
60
+ #{
61
+ if @custom_fields.respond_to?(:navigation) \
62
+ and @custom_fields.page_count > 1
63
+ @custom_fields.navigation
64
+ end
65
+ }
66
+
60
67
  <?r else ?>
61
-
62
68
  <p>#{lang('custom_fields.messages.no_fields')}</p>
63
-
64
69
  <?r end ?>
65
-
66
- <div class="clearfix">
67
- <?r if user_authorized?([:create]) ?>
68
- <div class="button">
69
- #{anchor_to(
70
- lang('custom_fields.buttons.new'),
71
- CustomFields::Controller::CustomFields.r(:new, @custom_field_group_id)
72
- )}
73
- </div>
74
- <?r end ?>
75
-
76
- <?r if user_authorized?([:delete]) and @custom_fields and !@custom_fields.empty? ?>
77
- <div class="button">
78
- <input type="submit" value="#{lang('custom_fields.buttons.delete')}" />
79
- </div>
80
- <?r end ?>
81
-
70
+
71
+ <?r if user_authorized?([:create]) ?>
72
+ <div class="button">
73
+ #{CustomFields::Controller::CustomFields.a(
74
+ lang('custom_fields.buttons.new'),
75
+ :new,
76
+ @custom_field_group_id
77
+ )}
82
78
  </div>
79
+ <?r end ?>
80
+
81
+ <?r if user_authorized?([:delete]) and !@custom_fields.empty? ?>
82
+ <div class="button">
83
+ <input type="submit"
84
+ value="#{lang('custom_fields.buttons.delete')}" />
85
+ </div>
86
+ <?r end ?>
83
87
  </form>
84
88
  </article>
@@ -11,27 +11,45 @@ Sequel.migration do
11
11
  create_table :custom_fields do
12
12
  primary_key :id
13
13
 
14
- String :name, :null => false
15
- String :slug, :null => false, :unique => true
16
- String :description, :text => true
17
- Integer :sort_order, :default => 0
18
- String :type, :null => false, :default => 'textbox'
19
- String :format, :null => false, :default => 'plain'
20
- String :possible_values, :text => true
14
+ String :name, :null => false
15
+ String :slug, :null => false, :unique => true
16
+ String :description, :text => true
17
+ Integer :sort_order, :default => 0
18
+ String :type, :null => false, :default => 'textbox'
19
+ String :format, :null => false, :default => 'plain'
20
+ String :possible_values, :text => true
21
21
 
22
22
  # Custom field settings
23
- TrueClass :required, :null => false, :default => false
24
- TrueClass :visual_editor, :null => false, :default => true
25
- Integer :textarea_rows, :default => 10
23
+ TrueClass :required, :null => false, :default => false
24
+ TrueClass :visual_editor, :null => false, :default => true
25
+ Integer :textarea_rows, :default => 10
26
26
  Integer :text_limit
27
27
 
28
- foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade,
29
- :on_update => :cascade, :key => :id
28
+ foreign_key(
29
+ :custom_field_group_id,
30
+ :custom_field_groups,
31
+ :on_delete => :cascade,
32
+ :on_update => :cascade,
33
+ :key => :id
34
+ )
30
35
  end
31
36
 
32
37
  create_table :custom_field_groups_sections do
33
- foreign_key :custom_field_group_id, :custom_field_groups, :on_delete => :cascade, :on_update => :cascade, :key => :id
34
- foreign_key :section_id, :sections, :on_delete => :cascade, :on_update => :cascade, :key => :id
38
+ foreign_key(
39
+ :custom_field_group_id,
40
+ :custom_field_groups,
41
+ :on_delete => :cascade,
42
+ :on_update => :cascade,
43
+ :key => :id
44
+ )
45
+
46
+ foreign_key(
47
+ :section_id,
48
+ :sections,
49
+ :on_delete => :cascade,
50
+ :on_update => :cascade,
51
+ :key => :id
52
+ )
35
53
  end
36
54
 
37
55
  create_table :custom_field_values do
@@ -39,8 +57,21 @@ Sequel.migration do
39
57
 
40
58
  String :value, :text => true
41
59
 
42
- foreign_key :custom_field_id, :custom_fields, :on_delete => :cascade, :on_update => :cascade, :key => :id
43
- foreign_key :section_entry_id, :section_entries, :on_delete => :cascade, :on_update => :cascade, :key => :id
60
+ foreign_key(
61
+ :custom_field_id,
62
+ :custom_fields,
63
+ :on_delete => :cascade,
64
+ :on_update => :cascade,
65
+ :key => :id
66
+ )
67
+
68
+ foreign_key(
69
+ :section_entry_id,
70
+ :section_entries,
71
+ :on_delete => :cascade,
72
+ :on_update => :cascade,
73
+ :key => :id
74
+ )
44
75
  end
45
76
  end
46
77
 
@@ -0,0 +1,148 @@
1
+ Sequel.migration do
2
+ # Updates the database with the changes specified in the block.
3
+ up do
4
+ rename_column(:custom_fields, :visual_editor, :text_editor)
5
+
6
+ create_table(:custom_field_methods) do
7
+ primary_key :id
8
+
9
+ String :name, :unique => true
10
+ end
11
+
12
+ # Insert all the possible methods.
13
+ Zen.database[:custom_field_methods].insert_multiple([
14
+ {:name => 'input_text'},
15
+ {:name => 'input_checkbox'},
16
+ {:name => 'input_radio'},
17
+ {:name => 'input_password'},
18
+ {:name => 'textarea'},
19
+ {:name => 'select'},
20
+ {:name => 'select_multiple'},
21
+ ])
22
+
23
+ create_table(:custom_field_types) do
24
+ primary_key :id
25
+
26
+ String :name , :null => false
27
+ String :language_string, :null => false
28
+ String :css_class
29
+
30
+ TrueClass :serialize , :null => false, :default => false
31
+ TrueClass :allow_markup, :null => false, :default => false
32
+
33
+ foreign_key(
34
+ :custom_field_method_id,
35
+ :custom_field_methods,
36
+ :on_delete => :cascade,
37
+ :on_update => :cascade,
38
+ :key => :id
39
+ )
40
+ end
41
+
42
+ # For some reason foreign keys didn't work for this column.
43
+ add_column(
44
+ :custom_fields,
45
+ :custom_field_type_id,
46
+ Integer,
47
+ :index => true
48
+ )
49
+
50
+ field_methods = {}
51
+
52
+ Zen.database[:custom_field_methods].each do |m|
53
+ field_methods[m[:name]] = m[:id]
54
+ end
55
+
56
+ default_types = [
57
+ {
58
+ :name => 'textbox',
59
+ :language_string => 'custom_fields.special.type_hash.textbox',
60
+ :custom_field_method_id => field_methods['input_text']
61
+ },
62
+ {
63
+ :name => 'checkbox',
64
+ :language_string => 'custom_fields.special.type_hash.checkbox',
65
+ :serialize => true,
66
+ :custom_field_method_id => field_methods['input_checkbox']
67
+ },
68
+ {
69
+ :name => 'radio',
70
+ :language_string => 'custom_fields.special.type_hash.radio',
71
+ :custom_field_method_id => field_methods['input_radio']
72
+ },
73
+ {
74
+ :name => 'password',
75
+ :language_string => 'custom_fields.special.type_hash.password',
76
+ :custom_field_method_id => field_methods['input_password']
77
+ },
78
+ {
79
+ :name => 'textarea',
80
+ :language_string => 'custom_fields.special.type_hash.textarea',
81
+ :allow_markup => true,
82
+ :custom_field_method_id => field_methods['textarea'],
83
+ :css_class => 'text_editor'
84
+ },
85
+ {
86
+ :name => 'select',
87
+ :language_string => 'custom_fields.special.type_hash.select',
88
+ :custom_field_method_id => field_methods['select']
89
+ },
90
+ {
91
+ :name => 'select_multiple',
92
+ :language_string => 'custom_fields.special.type_hash.select_multiple',
93
+ :serialize => true,
94
+ :custom_field_method_id => field_methods['select_multiple']
95
+ },
96
+ {
97
+ :name => 'date',
98
+ :language_string => 'custom_fields.special.type_hash.date',
99
+ :custom_field_method_id => field_methods['input_text'],
100
+ :css_class => 'date'
101
+ }
102
+ ]
103
+
104
+ # Insert the default fields
105
+ Zen.database[:custom_field_types].insert_multiple(default_types)
106
+
107
+ field_types = {}
108
+
109
+ Zen.database[:custom_field_types].each do |t|
110
+ field_types[t[:name]] = t[:id]
111
+ end
112
+
113
+ # Replace the text values with the correct IDs
114
+ Zen.database[:custom_fields].each do |field|
115
+ Zen.database[:custom_fields].filter(:id => field[:id]).update(
116
+ :custom_field_type_id => field_types[field[:type]]
117
+ )
118
+ end
119
+
120
+ # Drop the text based column now that all the data has been migrated.
121
+ drop_column(:custom_fields, :type)
122
+ end
123
+
124
+ # Reverts the changes made in the up() block.
125
+ down do
126
+ rename_column(:custom_fields, :text_editor, :visual_editor)
127
+
128
+ types = {}
129
+ fields = Zen.database[:custom_fields].all
130
+
131
+ Zen.database[:custom_field_types].each do |type|
132
+ types[type[:id]] = type[:name]
133
+ end
134
+
135
+ # Put the string based fields type back in place
136
+ add_column(:custom_fields, :type, String)
137
+
138
+ fields.each do |field|
139
+ Zen.database[:custom_fields].filter(:id => field[:id]).update(
140
+ :type => types[field[:custom_field_type_id]]
141
+ )
142
+ end
143
+
144
+ drop_column(:custom_fields, :custom_field_type_id)
145
+ drop_table(:custom_field_types)
146
+ drop_table(:custom_field_methods)
147
+ end
148
+ end