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
@@ -0,0 +1,50 @@
1
+ #:nodoc:
2
+ module CustomFields
3
+ #:nodoc:
4
+ module Model
5
+ ##
6
+ # Model for managing custom field types.
7
+ #
8
+ # @author Yorick Peterse
9
+ # @since 0.2.8
10
+ #
11
+ class CustomFieldType < Sequel::Model
12
+ many_to_one(
13
+ :custom_field_method,
14
+ :class => 'CustomFields::Model::CustomFieldMethod'
15
+ )
16
+
17
+ ##
18
+ # Returns a hash where the keys are the IDs of all custom field types and
19
+ # the values the full language strings based on the value of the column
20
+ # "language_string".
21
+ #
22
+ # @author Yorick Peterse
23
+ # @since 0.2.8
24
+ # @return [Hash]
25
+ #
26
+ def self.type_hash
27
+ rows = {}
28
+
29
+ CustomFieldType.select(:id, :language_string).each do |row|
30
+ rows[row.id] = lang(row.language_string)
31
+ end
32
+
33
+ return rows
34
+ end
35
+
36
+ ##
37
+ # Validates the model before inserting/updating the database record.
38
+ #
39
+ # @author Yorick Peterse
40
+ # @since 0.2.8
41
+ #
42
+ def validate
43
+ validates_presence([:name, :language_string, :custom_field_method_id])
44
+ validates_integer(:custom_field_method_id)
45
+ validates_type(TrueClass, [:serialize, :allow_markup])
46
+ validates_format(/^[a-zA-Z\-_0-9]*/, [:html_class])
47
+ end
48
+ end # CustomFieldType
49
+ end # Model
50
+ end # CustomFields
@@ -19,17 +19,38 @@ module CustomFields
19
19
  many_to_one(:section_entry, :class => "Sections::Model::SectionEntry")
20
20
 
21
21
  ##
22
- # Hook that is executed before saving a field's value. This hook is used to clean
23
- # up all values making it easier to process them at a later stage.
22
+ # Sets the value and serializes it based on the field type.
24
23
  #
25
24
  # @author Yorick Peterse
26
- # @since 0.2.4
25
+ # @since 0.2.8
26
+ # @param [Mixed] value The value to store.
27
27
  #
28
- def before_save
29
- # T-t-t-t-that's all folks!
30
- if !self.value.nil?
31
- self.value.gsub!(/\r\n/, "\n")
28
+ def value=(val)
29
+ type = custom_field.custom_field_type
30
+
31
+ if !type.nil? and type.serialize === true
32
+ val = [Marshal.dump(val)].pack('m')
32
33
  end
34
+
35
+ super(val)
36
+ end
37
+
38
+ ##
39
+ # Retrieves the value and optionally unserializes it.
40
+ #
41
+ # @author Yorick Peterse
42
+ # @since 0.2.8
43
+ # @return [Mixed]
44
+ #
45
+ def value
46
+ val = super
47
+ type = custom_field.custom_field_type
48
+
49
+ if !type.nil? and type.serialize === true
50
+ val = Marshal.load(val.unpack('m')[0]) rescue Marshal.load(val)
51
+ end
52
+
53
+ return val
33
54
  end
34
55
  end # CustomFieldValue
35
56
  end # Model
@@ -1,30 +1,35 @@
1
- #{
2
- form_for(
3
- @field_group, :method => :post, :action => @form_save_url,
4
- :id => :custom_field_group_form
5
- ) do |f|
6
-
7
- f.input_hidden(:id, @field_group.id)
8
- f.input_hidden(:csrf_token, get_csrf_token)
9
-
10
- f.g.div(:id => 'general') do
11
- f.input_text(
12
- lang('custom_field_groups.labels.name'),
13
- :name
14
- )
1
+ <article>
2
+ <header>
3
+ <h1>#{get_breadcrumbs}</h1>
4
+ </header>
15
5
 
16
- f.textarea(
17
- lang('custom_field_groups.labels.description'),
18
- :description,
19
- :rows => 8
20
- )
21
- end
22
-
23
- f.g.div(:class => 'clearfix') do
24
- f.g.div(:class => 'button') do
25
- f.g.input(:type => 'submit', :value => lang('custom_field_groups.buttons.save'))
6
+ #{
7
+ form_for(
8
+ @field_group,
9
+ :method => :post,
10
+ :action => CustomFields::Controller::CustomFieldGroups.r(:save),
11
+ :id => :custom_field_group_form
12
+ ) do |f|
13
+ f.input_hidden(:id , @field_group.id)
14
+ f.input_hidden(:csrf_token, get_csrf_token)
15
+
16
+ f.input_text(
17
+ lang('custom_field_groups.labels.name'),
18
+ :name
19
+ )
20
+
21
+ f.textarea(
22
+ lang('custom_field_groups.labels.description'),
23
+ :description,
24
+ :rows => 8
25
+ )
26
+
27
+ f.g.div(:class => 'button') do
28
+ f.g.input(
29
+ :type => 'submit',
30
+ :value => lang('custom_field_groups.buttons.save')
31
+ )
32
+ end
26
33
  end
27
- end
28
-
29
- end
30
- }
34
+ }
35
+ </article>
@@ -2,25 +2,26 @@
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::CustomFieldGroups.r(:delete)}">
7
8
  <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
8
-
9
+
9
10
  <?r if @field_groups and !@field_groups.empty? ?>
10
-
11
- <table class="table">
11
+
12
+ <table>
12
13
  <thead>
13
14
  <tr>
14
15
  <?r if user_authorized?([:delete]) ?>
15
- <th>
16
+ <th class="no_sort">
16
17
  <input type="checkbox" />
17
18
  </th>
18
19
  <?r end ?>
19
-
20
+
20
21
  <th>#{lang('custom_field_groups.labels.id')}</th>
21
22
  <th>#{lang('custom_field_groups.labels.name')}</th>
22
23
  <th>#{lang('custom_field_groups.labels.sections')}</th>
23
-
24
+
24
25
  <?r if user_authorized?(
25
26
  [:read], true, 'CustomFields::Controller::CustomFields'
26
27
  ) ?>
@@ -33,72 +34,73 @@
33
34
  <tr>
34
35
  <?r if user_authorized?([:delete]) ?>
35
36
  <td>
36
- <input type="checkbox" name="custom_field_group_ids[]" value="#{group.id}" />
37
+ <input type="checkbox" name="custom_field_group_ids[]"
38
+ value="#{group.id}" />
37
39
  </td>
38
40
  <?r end ?>
39
-
41
+
40
42
  <td>#{group.id}</td>
41
-
43
+
42
44
  <?r if user_authorized?([:update]) ?>
43
45
  <td>
44
- #{anchor_to(
45
- group.name,
46
- CustomFields::Controller::CustomFieldGroups.r(:edit, group.id),
47
- :title => group.name
46
+ #{CustomFields::Controller::CustomFieldGroups.a(
47
+ group.name, :edit, group.id
48
48
  )}
49
49
  </td>
50
50
  <?r else ?>
51
51
  <td>#{group.name}</td>
52
52
  <?r end ?>
53
-
53
+
54
54
  <td>
55
- <?r sections = group.sections.map { |s| s.name } ?>
55
+ <?r sections = group.sections.map { |s| s.name } ?>
56
56
  <?r if !sections.empty? ?>
57
- #{sections.join(', ')}
57
+ #{sections.join(', ')}
58
58
  <?r else ?>
59
- #{lang('custom_field_groups.labels.none')}
60
- <?r end ?>
59
+ #{lang('custom_field_groups.labels.none')}
60
+ <?r end ?>
61
61
  </td>
62
-
62
+
63
63
  <?r if user_authorized?(
64
64
  [:read], true, 'CustomFields::Controller::CustomFields'
65
65
  ) ?>
66
66
  <td>
67
- #{anchor_to(
68
- lang('custom_field_groups.labels.manage_fields'),
69
- CustomFields::Controller::CustomFields.r(:index, group.id)
67
+ #{CustomFields::Controller::CustomFields.a(
68
+ lang('custom_field_groups.labels.manage_fields'),
69
+ :index,
70
+ group.id
70
71
  )}
71
72
  </td>
72
73
  <?r end ?>
73
-
74
74
  </tr>
75
75
  <?r end ?>
76
76
  </tbody>
77
77
  </table>
78
-
78
+
79
+ #{
80
+ if @field_groups.respond_to?(:navigation) \
81
+ and @field_groups.page_count > 1
82
+ @field_groups.navigation
83
+ end
84
+ }
85
+
79
86
  <?r else ?>
80
-
81
87
  <p>#{lang('custom_field_groups.messages.no_groups')}</p>
82
-
83
88
  <?r end ?>
84
-
85
- <div class="clearfix">
86
-
87
- <?r if user_authorized?([:create]) ?>
88
- <div class="button">
89
- #{anchor_to(
90
- lang('custom_field_groups.buttons.new'),
91
- CustomFields::Controller::CustomFieldGroups.r(:new)
92
- )}
93
- </div>
94
- <?r end ?>
95
-
96
- <?r if user_authorized?([:delete]) and @field_groups and !@field_groups.empty? ?>
97
- <div class="button">
98
- <input type="submit" value="#{lang('custom_field_groups.buttons.delete')}" />
99
- </div>
100
- <?r end ?>
89
+
90
+ <?r if user_authorized?([:create]) ?>
91
+ <div class="button">
92
+ #{CustomFields::Controller::CustomFieldGroups.a(
93
+ lang('custom_field_groups.buttons.new'),
94
+ :new
95
+ )}
101
96
  </div>
97
+ <?r end ?>
102
98
 
99
+ <?r if user_authorized?([:delete]) and !@field_groups.empty? ?>
100
+ <div class="button">
101
+ <input type="submit"
102
+ value="#{lang('custom_field_groups.buttons.delete')}" />
103
+ </div>
104
+ <?r end ?>
103
105
  </form>
104
- </article>
106
+ </article>
@@ -0,0 +1,61 @@
1
+ <article>
2
+ <header>
3
+ <h1>#{get_breadcrumbs}</h1>
4
+ </header>
5
+
6
+ #{
7
+ form_for(
8
+ @custom_field_type,
9
+ :method => :post,
10
+ :id => :custom_field_type_form,
11
+ :action => CustomFields::Controller::CustomFieldTypes.r(:save)
12
+ ) do |f|
13
+ f.input_hidden(:csrf_token, get_csrf_token)
14
+ f.input_hidden(:id , @custom_field_type.id)
15
+
16
+ f.input_text(
17
+ lang('custom_field_types.labels.name'),
18
+ :name
19
+ )
20
+
21
+ f.input_text(
22
+ lang('custom_field_types.labels.language_string'),
23
+ :language_string
24
+ )
25
+
26
+ f.input_text(
27
+ lang('custom_field_types.labels.html_class'),
28
+ :html_class
29
+ )
30
+
31
+ f.input_radio(
32
+ lang('custom_field_types.labels.serialize'),
33
+ :serialize,
34
+ @custom_field_type.serialize,
35
+ :values => @boolean_hash.invert
36
+ )
37
+
38
+ f.input_radio(
39
+ lang('custom_field_types.labels.allow_markup'),
40
+ :allow_markup,
41
+ @custom_field_type.allow_markup,
42
+ :values => @boolean_hash.invert
43
+ )
44
+
45
+ f.select(
46
+ lang('custom_field_types.labels.custom_field_method_id'),
47
+ :custom_field_method_id,
48
+ :values => @custom_field_methods,
49
+ :size => 1,
50
+ :selected => @custom_field_type.custom_field_method_id
51
+ )
52
+
53
+ f.g.div(:class => 'button') do
54
+ f.g.input(
55
+ :type => :submit,
56
+ :value => lang('custom_field_types.buttons.save')
57
+ )
58
+ end
59
+ end
60
+ }
61
+ </article>
@@ -0,0 +1,93 @@
1
+ <article>
2
+ <header>
3
+ <h1>#{get_breadcrumbs}</h1>
4
+ </header>
5
+
6
+ <form action="#{CustomFields::Controller::CustomFieldTypes.r(:delete)}"
7
+ method="post">
8
+ <input type="hidden" name="csrf_token" value="#{get_csrf_token}" />
9
+
10
+ <?r if !@field_types.empty? ?>
11
+
12
+ <table>
13
+ <thead>
14
+ <tr>
15
+ <?r if user_authorized?([:delete]) ?>
16
+ <th class="no_sort">
17
+ <input type="checkbox" />
18
+ </th>
19
+ <?r end ?>
20
+
21
+ <th>#{lang('custom_field_types.labels.id')}</th>
22
+ <th>#{lang('custom_field_types.labels.name')}</th>
23
+ <th>#{lang('custom_field_types.labels.language_string')}</th>
24
+ <th>#{lang('custom_field_types.labels.html_class')}</th>
25
+ <th>#{lang('custom_field_types.labels.serialize')}</th>
26
+ <th>#{lang('custom_field_types.labels.allow_markup')}</th>
27
+ <th>
28
+ #{lang(
29
+ 'custom_field_types.labels.custom_field_method_id'
30
+ )}
31
+ </th>
32
+ </tr>
33
+ </thead>
34
+ <tbody>
35
+ <?r @field_types.each do |type| ?>
36
+ <tr>
37
+ <?r if user_authorized?([:delete]) ?>
38
+ <td>
39
+ <input type="checkbox" name="custom_field_type_ids[]"
40
+ id="custom_field_type_#{type.id}" value="#{type.id}" />
41
+ </td>
42
+ <?r end ?>
43
+
44
+ <td>#{type.id}</td>
45
+ <td>
46
+ <?r if user_authorized?([:update]) ?>
47
+ #{CustomFields::Controller::CustomFieldTypes.a(
48
+ type.name,
49
+ :edit,
50
+ type.id
51
+ )}
52
+ <?r else ?>
53
+ #{type.name}
54
+ <?r end ?>
55
+ </td>
56
+ <td>#{type.language_string}</td>
57
+ <td>#{type.html_class}</td>
58
+ <td>#{@boolean_hash[type.serialize]}</td>
59
+ <td>#{@boolean_hash[type.allow_markup]}</td>
60
+ <td>#{type.custom_field_method.name}</td>
61
+ </tr>
62
+ <?r end ?>
63
+ </tbody>
64
+ </table>
65
+
66
+ #{
67
+ if @field_types.respond_to?(:navigation) \
68
+ and @field_types.page_count > 1
69
+ @field_types.navigation
70
+ end
71
+ }
72
+
73
+ <?r else ?>
74
+ <p>#{lang('custom_field_types.messages.no_field_types')}</p>
75
+ <?r end ?>
76
+
77
+ <?r if user_authorized?([:create]) ?>
78
+ <div class="button">
79
+ #{CustomFields::Controller::CustomFieldTypes.a(
80
+ lang('custom_field_types.buttons.new'),
81
+ :new
82
+ )}
83
+ </div>
84
+ <?r end ?>
85
+
86
+ <?r if user_authorized?([:delete]) and !@field_types.empty? ?>
87
+ <div class="button">
88
+ <input type="submit"
89
+ value="#{lang('custom_field_types.buttons.delete')}" />
90
+ </div>
91
+ <?r end ?>
92
+ </form>
93
+ </article>