zen 0.2.8 → 0.3b

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (422) hide show
  1. data/.gems +20 -0
  2. data/.mailmap +3 -2
  3. data/.rvmrc +1 -1
  4. data/.travis.yml +13 -2
  5. data/.yardopts +13 -0
  6. data/AUTHORS +1 -1
  7. data/README.md +115 -77
  8. data/Rakefile +6 -7
  9. data/bin/zen +12 -5
  10. data/guide/_static/categories/categories.png +0 -0
  11. data/guide/_static/categories/category_groups.png +0 -0
  12. data/guide/_static/categories/new_category.png +0 -0
  13. data/guide/_static/categories/new_category_group.png +0 -0
  14. data/guide/_static/comments/comments.png +0 -0
  15. data/guide/_static/comments/edit_comment.png +0 -0
  16. data/guide/_static/custom_fields/custom_field_groups.png +0 -0
  17. data/guide/_static/custom_fields/custom_field_types.png +0 -0
  18. data/guide/_static/custom_fields/custom_fields.png +0 -0
  19. data/guide/_static/custom_fields/edit_custom_field_general.png +0 -0
  20. data/guide/_static/custom_fields/edit_custom_field_group.png +0 -0
  21. data/guide/_static/custom_fields/edit_custom_field_settings.png +0 -0
  22. data/guide/_static/custom_fields/edit_custom_field_type.png +0 -0
  23. data/guide/_static/menus/edit_menu.png +0 -0
  24. data/guide/_static/menus/edit_menu_item.png +0 -0
  25. data/guide/_static/menus/menu_items.png +0 -0
  26. data/guide/_static/menus/menus.png +0 -0
  27. data/guide/_static/sections/edit_entry.png +0 -0
  28. data/guide/_static/sections/edit_entry_categories.png +0 -0
  29. data/guide/_static/sections/edit_entry_general.png +0 -0
  30. data/guide/_static/sections/edit_entry_meta.png +0 -0
  31. data/guide/_static/sections/edit_section_comments.png +0 -0
  32. data/guide/_static/sections/edit_section_general.png +0 -0
  33. data/guide/_static/sections/edit_section_groups.png +0 -0
  34. data/guide/_static/sections/entries.png +0 -0
  35. data/guide/_static/sections/sections.png +0 -0
  36. data/guide/_static/settings/overview_general.png +0 -0
  37. data/guide/_static/settings/overview_security.png +0 -0
  38. data/guide/_static/settings/overview_user.png +0 -0
  39. data/guide/_static/users/edit_user.png +0 -0
  40. data/guide/_static/users/edit_user_group.png +0 -0
  41. data/guide/_static/users/edit_user_group_permissions.png +0 -0
  42. data/guide/_static/users/edit_user_permissions.png +0 -0
  43. data/guide/_static/users/overview.png +0 -0
  44. data/guide/_static/users/user_groups_overview.png +0 -0
  45. data/guide/asset_management.md +117 -0
  46. data/{CHANGELOG.md → guide/changelog.md} +42 -0
  47. data/guide/css/common.css +20 -0
  48. data/guide/getting_started.md +61 -0
  49. data/guide/hacking.md +52 -0
  50. data/guide/installation.md +44 -0
  51. data/guide/javascript.md +352 -0
  52. data/lib/vendor/sequel_sluggable.rb +137 -0
  53. data/lib/yard/tags.rb +13 -0
  54. data/lib/zen.rb +148 -78
  55. data/lib/zen/asset_groups.rb +85 -0
  56. data/lib/zen/bin/create.rb +267 -56
  57. data/lib/zen/bin/default.rb +84 -0
  58. data/lib/zen/controller/admin_controller.rb +1 -82
  59. data/lib/zen/controller/base_controller.rb +9 -5
  60. data/lib/zen/controller/frontend_controller.rb +0 -1
  61. data/lib/zen/controller/main_controller.rb +30 -42
  62. data/lib/zen/controller/preview.rb +9 -8
  63. data/lib/zen/controller/translations.rb +49 -0
  64. data/lib/zen/error.rb +17 -0
  65. data/lib/zen/event.rb +118 -0
  66. data/lib/zen/helper/asset.rb +63 -0
  67. data/lib/zen/helper/breadcrumb.rb +1 -4
  68. data/lib/zen/helper/controller.rb +73 -0
  69. data/lib/zen/helper/locale.rb +42 -0
  70. data/lib/zen/helper/message.rb +0 -3
  71. data/lib/zen/helper/search.rb +54 -0
  72. data/lib/zen/helper/stacked_aspect.rb +249 -0
  73. data/lib/zen/helper/theme.rb +3 -10
  74. data/lib/zen/language.rb +356 -181
  75. data/lib/zen/language/en/zen_general.rb +52 -0
  76. data/lib/zen/language/en/zen_models.rb +19 -0
  77. data/lib/zen/language/nl/zen_general.rb +57 -0
  78. data/lib/zen/language/nl/zen_models.rb +22 -0
  79. data/lib/zen/language/translation.rb +132 -0
  80. data/lib/zen/languages.rb +9 -0
  81. data/lib/zen/layout/admin.xhtml +3 -3
  82. data/lib/zen/layout/login.xhtml +1 -1
  83. data/lib/zen/markup.rb +189 -0
  84. data/lib/zen/model/helper.rb +65 -0
  85. data/lib/zen/model/init.rb +62 -0
  86. data/lib/zen/model/methods.rb +6 -7
  87. data/lib/zen/package.rb +312 -201
  88. data/lib/zen/package/all.rb +4 -3
  89. data/lib/zen/package/categories/lib/categories.rb +29 -41
  90. data/lib/zen/package/categories/lib/categories/controller/categories.rb +185 -130
  91. data/lib/zen/package/categories/lib/categories/controller/category_groups.rb +172 -102
  92. data/lib/zen/package/categories/lib/categories/helper/category.rb +4 -9
  93. data/lib/zen/package/categories/lib/categories/helper/category_frontend.rb +86 -0
  94. data/lib/zen/package/categories/lib/categories/language/en/categories.rb +40 -0
  95. data/lib/zen/package/categories/lib/categories/language/en/category_groups.rb +39 -0
  96. data/lib/zen/package/categories/lib/categories/language/nl/categories.rb +42 -0
  97. data/lib/zen/package/categories/lib/categories/language/nl/category_groups.rb +42 -0
  98. data/lib/zen/package/categories/lib/categories/model/category.rb +21 -25
  99. data/lib/zen/package/categories/lib/categories/model/category_group.rb +21 -15
  100. data/lib/zen/package/categories/lib/categories/view/admin/categories/form.xhtml +25 -26
  101. data/lib/zen/package/categories/lib/categories/view/admin/categories/index.xhtml +24 -24
  102. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/form.xhtml +18 -20
  103. data/lib/zen/package/categories/lib/categories/view/admin/category-groups/index.xhtml +21 -18
  104. data/lib/zen/package/comments/lib/comments.rb +30 -50
  105. data/lib/zen/package/comments/lib/comments/anti_spam.rb +138 -0
  106. data/lib/zen/package/comments/lib/comments/controller/comments.rb +159 -92
  107. data/lib/zen/package/comments/lib/comments/controller/comments_form.rb +122 -34
  108. data/lib/zen/package/comments/lib/comments/helper/comment.rb +0 -3
  109. data/lib/zen/package/comments/lib/comments/helper/comment_frontend.rb +90 -0
  110. data/lib/zen/package/comments/lib/comments/language/en/comments.rb +57 -0
  111. data/lib/zen/package/comments/lib/comments/language/nl/comments.rb +61 -0
  112. data/lib/zen/package/comments/lib/comments/model/comment.rb +147 -49
  113. data/lib/zen/package/comments/lib/comments/model/comment_status.rb +0 -2
  114. data/lib/zen/package/comments/lib/comments/view/admin/comments/form.xhtml +37 -40
  115. data/lib/zen/package/comments/lib/comments/view/admin/comments/index.xhtml +23 -42
  116. data/lib/zen/package/comments/migrations/1308774099_comment_status.rb +12 -4
  117. data/lib/zen/package/comments/migrations/1313851786_remove_defensio_signature.rb +11 -0
  118. data/lib/zen/package/custom_fields/lib/custom_fields.rb +40 -43
  119. data/lib/zen/package/custom_fields/lib/custom_fields/blue_form_parameters.rb +72 -17
  120. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_groups.rb +154 -118
  121. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_field_types.rb +147 -90
  122. data/lib/zen/package/custom_fields/lib/custom_fields/controller/custom_fields.rb +161 -131
  123. data/lib/zen/package/custom_fields/lib/custom_fields/helper/custom_field.rb +4 -9
  124. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.rb +42 -0
  125. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.rb +51 -0
  126. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.rb +60 -0
  127. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.rb +41 -0
  128. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.rb +49 -0
  129. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.rb +61 -0
  130. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field.rb +18 -23
  131. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_group.rb +20 -19
  132. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_method.rb +1 -3
  133. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_type.rb +19 -9
  134. data/lib/zen/package/custom_fields/lib/custom_fields/model/custom_field_value.rb +18 -15
  135. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/form.xhtml +18 -18
  136. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-groups/index.xhtml +30 -24
  137. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/form.xhtml +15 -10
  138. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-field-types/index.xhtml +24 -19
  139. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/form.xhtml +18 -13
  140. data/lib/zen/package/custom_fields/lib/custom_fields/view/admin/custom-fields/index.xhtml +30 -20
  141. data/lib/zen/package/extensions/lib/extensions.rb +20 -0
  142. data/lib/zen/package/extensions/lib/extensions/controller/extensions.rb +41 -0
  143. data/lib/zen/package/extensions/lib/extensions/language/en/extensions.rb +23 -0
  144. data/lib/zen/package/extensions/lib/extensions/language/nl/extensions.rb +25 -0
  145. data/lib/zen/package/extensions/lib/extensions/view/admin/extensions/index.xhtml +86 -0
  146. data/lib/zen/package/menu.rb +109 -0
  147. data/lib/zen/package/menus/lib/menus.rb +25 -34
  148. data/lib/zen/package/menus/lib/menus/controller/menu_items.rb +143 -107
  149. data/lib/zen/package/menus/lib/menus/controller/menus.rb +166 -115
  150. data/lib/zen/package/menus/lib/menus/helper/menu.rb +2 -8
  151. data/lib/zen/package/menus/lib/menus/helper/menu_frontend.rb +114 -0
  152. data/lib/zen/package/menus/lib/menus/language/en/menu_items.rb +48 -0
  153. data/lib/zen/package/menus/lib/menus/language/en/menus.rb +48 -0
  154. data/lib/zen/package/menus/lib/menus/language/nl/menu_items.rb +48 -0
  155. data/lib/zen/package/menus/lib/menus/language/nl/menus.rb +50 -0
  156. data/lib/zen/package/menus/lib/menus/model/menu.rb +24 -17
  157. data/lib/zen/package/menus/lib/menus/model/menu_item.rb +37 -13
  158. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/form.xhtml +32 -25
  159. data/lib/zen/package/menus/lib/menus/view/admin/menu-items/index.xhtml +23 -17
  160. data/lib/zen/package/menus/lib/menus/view/admin/menus/form.xhtml +31 -26
  161. data/lib/zen/package/menus/lib/menus/view/admin/menus/index.xhtml +20 -22
  162. data/lib/zen/package/sections/lib/sections.rb +25 -68
  163. data/lib/zen/package/sections/lib/sections/controller/section_entries.rb +178 -138
  164. data/lib/zen/package/sections/lib/sections/controller/sections.rb +173 -140
  165. data/lib/zen/package/sections/lib/sections/helper/section.rb +3 -6
  166. data/lib/zen/package/sections/lib/sections/helper/section_frontend.rb +146 -0
  167. data/lib/zen/package/sections/lib/sections/language/en/section_entries.rb +50 -0
  168. data/lib/zen/package/sections/lib/sections/language/en/sections.rb +55 -0
  169. data/lib/zen/package/sections/lib/sections/language/nl/section_entries.rb +50 -0
  170. data/lib/zen/package/sections/lib/sections/language/nl/sections.rb +55 -0
  171. data/lib/zen/package/sections/lib/sections/model/section.rb +36 -36
  172. data/lib/zen/package/sections/lib/sections/model/section_entry.rb +52 -59
  173. data/lib/zen/package/sections/lib/sections/model/section_entry_status.rb +2 -2
  174. data/lib/zen/package/sections/lib/sections/view/admin/form.xhtml +24 -21
  175. data/lib/zen/package/sections/lib/sections/view/admin/index.xhtml +24 -26
  176. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/form.xhtml +33 -31
  177. data/lib/zen/package/sections/lib/sections/view/admin/section-entries/index.xhtml +24 -25
  178. data/lib/zen/package/sections/migrations/1308672298_use_id_for_default_section.rb +14 -10
  179. data/lib/zen/package/sections/migrations/1308813320_section_entry_statuses.rb +12 -6
  180. data/lib/zen/package/settings/lib/settings.rb +25 -120
  181. data/lib/zen/package/settings/lib/settings/blue_form_parameters.rb +157 -0
  182. data/lib/zen/package/settings/lib/settings/controller/settings.rb +94 -69
  183. data/lib/zen/package/settings/lib/settings/language/en/settings.rb +41 -0
  184. data/lib/zen/package/settings/lib/settings/language/nl/settings.rb +41 -0
  185. data/lib/zen/package/settings/lib/settings/model/setting.rb +0 -2
  186. data/lib/zen/package/settings/lib/settings/setting.rb +379 -0
  187. data/lib/zen/package/settings/lib/settings/setting_groups.rb +11 -0
  188. data/lib/zen/package/settings/lib/settings/settings.rb +83 -0
  189. data/lib/zen/package/settings/lib/settings/settings_group.rb +84 -0
  190. data/lib/zen/package/settings/lib/settings/singleton_methods.rb +35 -0
  191. data/lib/zen/package/settings/lib/settings/view/admin/settings/index.xhtml +15 -57
  192. data/lib/zen/package/settings/migrations/1321197919_remove_unused_columns.rb +17 -0
  193. data/lib/zen/package/users/lib/users.rb +51 -36
  194. data/lib/zen/package/users/lib/users/controller/user_groups.rb +133 -98
  195. data/lib/zen/package/users/lib/users/controller/users.rb +253 -136
  196. data/lib/zen/package/users/lib/users/helper/access.rb +102 -0
  197. data/lib/zen/package/users/lib/users/helper/acl.rb +113 -0
  198. data/lib/zen/package/users/lib/users/helper/users.rb +41 -24
  199. data/lib/zen/package/users/lib/users/language/en/permissions.rb +16 -0
  200. data/lib/zen/package/users/lib/users/language/en/user_groups.rb +39 -0
  201. data/lib/zen/package/users/lib/users/language/en/users.rb +73 -0
  202. data/lib/zen/package/users/lib/users/language/nl/permissions.rb +16 -0
  203. data/lib/zen/package/users/lib/users/language/nl/user_groups.rb +41 -0
  204. data/lib/zen/package/users/lib/users/language/nl/users.rb +74 -0
  205. data/lib/zen/package/users/lib/users/model/permission.rb +28 -0
  206. data/lib/zen/package/users/lib/users/model/user.rb +104 -65
  207. data/lib/zen/package/users/lib/users/model/user_group.rb +28 -24
  208. data/lib/zen/package/users/lib/users/model/user_status.rb +27 -0
  209. data/lib/zen/package/users/lib/users/public/admin/css/users/permissions.css +22 -0
  210. data/lib/zen/package/users/lib/users/public/admin/js/users/permissions.js +33 -0
  211. data/lib/zen/package/users/lib/users/settings.rb +19 -0
  212. data/lib/zen/package/users/lib/users/view/admin/user-groups/form.xhtml +58 -28
  213. data/lib/zen/package/users/lib/users/view/admin/user-groups/index.xhtml +19 -15
  214. data/lib/zen/package/users/lib/users/view/admin/users/form.xhtml +93 -62
  215. data/lib/zen/package/users/lib/users/view/admin/users/index.xhtml +23 -36
  216. data/lib/zen/package/users/lib/users/view/admin/users/login.xhtml +13 -6
  217. data/lib/zen/package/users/lib/users/view/admin/users/permissions.xhtml +33 -0
  218. data/lib/zen/package/users/lib/users/view/admin/users/register.xhtml +52 -0
  219. data/lib/zen/package/users/migrations/1313786058_update_default_date.rb +41 -0
  220. data/lib/zen/package/users/migrations/1316432327_permissions.rb +36 -0
  221. data/lib/zen/package/users/migrations/1320272365_status_ids.rb +67 -0
  222. data/lib/zen/public/admin/css/zen/buttons.css +3 -11
  223. data/lib/zen/public/admin/css/zen/datepicker.css +23 -13
  224. data/lib/zen/public/admin/css/zen/editor.css +6 -14
  225. data/lib/zen/public/admin/css/zen/forms.css +19 -12
  226. data/lib/zen/public/admin/css/zen/general.css +22 -18
  227. data/lib/zen/public/admin/css/zen/grid.css +1 -20
  228. data/lib/zen/public/admin/css/zen/layout.css +26 -11
  229. data/lib/zen/public/admin/css/zen/messages.css +3 -10
  230. data/lib/zen/public/admin/css/zen/reset.css +13 -15
  231. data/lib/zen/public/admin/css/zen/tables.css +8 -10
  232. data/lib/zen/public/admin/css/zen/tabs.css +2 -10
  233. data/lib/zen/public/admin/css/zen/window.css +2 -8
  234. data/lib/zen/public/admin/js/vendor/datepicker.js +540 -240
  235. data/lib/zen/public/admin/js/vendor/mootools/core.js +273 -283
  236. data/lib/zen/public/admin/js/vendor/mootools/more.js +131 -136
  237. data/lib/zen/public/admin/js/zen/index.js +8 -14
  238. data/lib/zen/public/admin/js/zen/lib/editor.js +36 -33
  239. data/lib/zen/public/admin/js/zen/lib/editor/markdown.js +0 -6
  240. data/lib/zen/public/admin/js/zen/lib/editor/textile.js +0 -6
  241. data/lib/zen/public/admin/js/zen/lib/html_table.js +0 -5
  242. data/lib/zen/public/admin/js/zen/lib/tabs.js +22 -79
  243. data/lib/zen/public/admin/js/zen/lib/window.js +12 -22
  244. data/lib/zen/spec/bacon/color_output.rb +1 -1
  245. data/lib/zen/spec/helper.rb +6 -11
  246. data/lib/zen/spec/simplecov.rb +3 -3
  247. data/lib/zen/task.rb +0 -1
  248. data/lib/zen/task/build.rake +46 -26
  249. data/lib/zen/task/clean.rake +14 -7
  250. data/lib/zen/task/db.rake +31 -29
  251. data/lib/zen/task/package.rake +19 -23
  252. data/lib/zen/task/proto.rake +3 -5
  253. data/lib/zen/task/setup.rake +4 -0
  254. data/lib/zen/task/test.rake +31 -6
  255. data/lib/zen/task/theme.rake +13 -19
  256. data/lib/zen/theme.rb +377 -52
  257. data/lib/zen/validation.rb +22 -30
  258. data/lib/zen/version.rb +1 -2
  259. data/lib/zen/view/bottom.xhtml +9 -1
  260. data/lib/zen/view/head.xhtml +1 -1
  261. data/lib/zen/view/main.xhtml +1 -1
  262. data/lib/zen/view/search.xhtml +9 -0
  263. data/proto/app/Rakefile +0 -1
  264. data/proto/app/app.rb +21 -16
  265. data/proto/app/config/config.rb.erb +41 -0
  266. data/proto/app/config/{database.rb → database.rb.erb} +17 -14
  267. data/proto/app/config/middlewares.rb +1 -1
  268. data/proto/app/theme/default/index.xhtml +25 -0
  269. data/proto/app/theme/theme.rb +19 -0
  270. data/proto/app/{log/database/dev → tmp}/.gitkeep +0 -0
  271. data/proto/migration.rb +3 -5
  272. data/proto/rack/thin.yml +41 -0
  273. data/proto/rack/unicorn.rb +38 -0
  274. data/spec/Rakefile +15 -11
  275. data/spec/fixtures/zen/helper/controller.rb +13 -0
  276. data/spec/fixtures/zen/helper/locale.rb +7 -0
  277. data/spec/fixtures/zen/helper/message.rb +0 -4
  278. data/spec/fixtures/zen/language.rb +31 -0
  279. data/spec/fixtures/zen/language/en/spec.rb +11 -0
  280. data/spec/fixtures/zen/language/nl/spec.rb +11 -0
  281. data/spec/fixtures/zen/package.rb +0 -10
  282. data/spec/fixtures/zen/package/categories/helper/category_frontend.rb +16 -0
  283. data/spec/fixtures/zen/package/comments/helper/comment_frontend.rb +16 -0
  284. data/spec/fixtures/zen/package/sections/helper/section_frontend.rb +16 -0
  285. data/spec/fixtures/zen/package/settings/controller/settings.rb +17 -0
  286. data/spec/fixtures/zen/package/users/helper/access.rb +18 -0
  287. data/spec/fixtures/zen/package/users/helper/acl.rb +23 -0
  288. data/spec/fixtures/zen/theme/{default-section → default}/index.xhtml +0 -0
  289. data/spec/helper.rb +12 -27
  290. data/{proto/app/log/database/live → spec/public}/.gitkeep +0 -0
  291. data/spec/zen/controller/admin_controller.rb +5 -6
  292. data/spec/zen/controller/main_controller.rb +29 -35
  293. data/spec/zen/controller/preview.rb +9 -10
  294. data/spec/zen/event.rb +44 -0
  295. data/spec/zen/helper/breadcrumb.rb +4 -5
  296. data/spec/zen/helper/controller.rb +21 -0
  297. data/spec/zen/helper/locale.rb +25 -0
  298. data/spec/zen/helper/message.rb +4 -11
  299. data/spec/zen/helper/theme.rb +11 -14
  300. data/spec/zen/language.rb +48 -22
  301. data/spec/zen/markup.rb +39 -0
  302. data/spec/zen/package.rb +48 -11
  303. data/spec/zen/package/categories/controller/categories.rb +99 -45
  304. data/spec/zen/package/categories/controller/category_groups.rb +109 -33
  305. data/spec/zen/package/categories/helper/category.rb +19 -32
  306. data/spec/zen/package/categories/helper/category_frontend.rb +61 -0
  307. data/spec/zen/package/comments/anti_spam.rb +50 -0
  308. data/spec/zen/package/comments/controller/comments.rb +121 -61
  309. data/spec/zen/package/comments/controller/comments_form.rb +120 -94
  310. data/spec/zen/package/comments/helper/comment.rb +13 -13
  311. data/spec/zen/package/comments/helper/comment_frontend.rb +92 -0
  312. data/spec/zen/package/custom_fields/blue_form_parameters.rb +50 -50
  313. data/spec/zen/package/custom_fields/controller/custom_field_groups.rb +135 -43
  314. data/spec/zen/package/custom_fields/controller/custom_field_types.rb +153 -48
  315. data/spec/zen/package/custom_fields/controller/custom_fields.rb +130 -51
  316. data/spec/zen/package/custom_fields/helper/custom_field.rb +8 -8
  317. data/spec/zen/package/extensions/controller/extensions.rb +38 -0
  318. data/spec/zen/package/menus/controller/menu_items.rb +121 -42
  319. data/spec/zen/package/menus/controller/menus.rb +125 -38
  320. data/spec/zen/package/menus/helper/menu.rb +26 -26
  321. data/spec/zen/package/menus/helper/menu_frontend.rb +104 -0
  322. data/spec/zen/package/sections/controller/section_entries.rb +145 -89
  323. data/spec/zen/package/sections/controller/sections.rb +130 -35
  324. data/spec/zen/package/sections/helper/section.rb +27 -38
  325. data/spec/zen/package/sections/helper/section_frontend.rb +160 -0
  326. data/spec/zen/package/settings/controller/settings.rb +73 -8
  327. data/spec/zen/package/settings/settings.rb +119 -0
  328. data/spec/zen/package/users/controller/user_groups.rb +134 -34
  329. data/spec/zen/package/users/controller/users.rb +189 -44
  330. data/spec/zen/package/users/helper/access.rb +29 -0
  331. data/spec/zen/package/users/helper/acl.rb +46 -0
  332. data/spec/zen/package/users/helper/users.rb +20 -64
  333. data/spec/zen/theme.rb +7 -9
  334. data/spec/zen/validation.rb +1 -2
  335. data/zen.gemspec +25 -22
  336. metadata +303 -222
  337. data/lib/zen/asset.rb +0 -292
  338. data/lib/zen/bin/runner.rb +0 -118
  339. data/lib/zen/error/language_error.rb +0 -10
  340. data/lib/zen/error/package_error.rb +0 -10
  341. data/lib/zen/error/plugin_error.rb +0 -10
  342. data/lib/zen/error/theme_error.rb +0 -10
  343. data/lib/zen/error/validation_error.rb +0 -10
  344. data/lib/zen/helper/acl.rb +0 -182
  345. data/lib/zen/helper/blue_form_vendor.rb +0 -689
  346. data/lib/zen/language/en/zen_general.yml +0 -25
  347. data/lib/zen/language/en/zen_models.yml +0 -13
  348. data/lib/zen/language/nl/zen_general.yml +0 -25
  349. data/lib/zen/language/nl/zen_models.yml +0 -13
  350. data/lib/zen/model/settings.rb +0 -78
  351. data/lib/zen/package/base.rb +0 -62
  352. data/lib/zen/package/categories/lib/categories/language/en/categories.yml +0 -36
  353. data/lib/zen/package/categories/lib/categories/language/en/category_groups.yml +0 -34
  354. data/lib/zen/package/categories/lib/categories/language/nl/categories.yml +0 -40
  355. data/lib/zen/package/categories/lib/categories/language/nl/category_groups.yml +0 -34
  356. data/lib/zen/package/categories/lib/categories/plugin/categories.rb +0 -141
  357. data/lib/zen/package/comments/lib/comments/language/en/comments.yml +0 -48
  358. data/lib/zen/package/comments/lib/comments/language/nl/comments.yml +0 -50
  359. data/lib/zen/package/comments/lib/comments/plugin/anti_spam.rb +0 -156
  360. data/lib/zen/package/comments/lib/comments/plugin/comments.rb +0 -115
  361. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_groups.yml +0 -33
  362. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_field_types.yml +0 -40
  363. data/lib/zen/package/custom_fields/lib/custom_fields/language/en/custom_fields.yml +0 -54
  364. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_groups.yml +0 -33
  365. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_field_types.yml +0 -40
  366. data/lib/zen/package/custom_fields/lib/custom_fields/language/nl/custom_fields.yml +0 -54
  367. data/lib/zen/package/menus/lib/menus/language/en/menu_items.yml +0 -41
  368. data/lib/zen/package/menus/lib/menus/language/en/menus.yml +0 -40
  369. data/lib/zen/package/menus/lib/menus/language/nl/menu_items.yml +0 -41
  370. data/lib/zen/package/menus/lib/menus/language/nl/menus.yml +0 -40
  371. data/lib/zen/package/menus/lib/menus/plugin/menus.rb +0 -152
  372. data/lib/zen/package/sections/lib/sections/language/en/section_entries.yml +0 -44
  373. data/lib/zen/package/sections/lib/sections/language/en/sections.yml +0 -48
  374. data/lib/zen/package/sections/lib/sections/language/nl/section_entries.yml +0 -44
  375. data/lib/zen/package/sections/lib/sections/language/nl/sections.yml +0 -48
  376. data/lib/zen/package/sections/lib/sections/plugin/section_entries.rb +0 -244
  377. data/lib/zen/package/sections/lib/sections/plugin/sections.rb +0 -87
  378. data/lib/zen/package/settings/lib/settings/language/en/settings.yml +0 -36
  379. data/lib/zen/package/settings/lib/settings/language/nl/settings.yml +0 -37
  380. data/lib/zen/package/settings/lib/settings/plugin/group_base.rb +0 -39
  381. data/lib/zen/package/settings/lib/settings/plugin/setting_base.rb +0 -133
  382. data/lib/zen/package/settings/lib/settings/plugin/settings.rb +0 -251
  383. data/lib/zen/package/users/lib/users/controller/access_rules.rb +0 -284
  384. data/lib/zen/package/users/lib/users/language/en/access_rules.yml +0 -38
  385. data/lib/zen/package/users/lib/users/language/en/user_groups.yml +0 -32
  386. data/lib/zen/package/users/lib/users/language/en/users.yml +0 -57
  387. data/lib/zen/package/users/lib/users/language/nl/access_rules.yml +0 -38
  388. data/lib/zen/package/users/lib/users/language/nl/user_groups.yml +0 -32
  389. data/lib/zen/package/users/lib/users/language/nl/users.yml +0 -57
  390. data/lib/zen/package/users/lib/users/model/access_rule.rb +0 -42
  391. data/lib/zen/package/users/lib/users/public/admin/js/users/access_rules.js +0 -65
  392. data/lib/zen/package/users/lib/users/public/admin/js/users/lib/access_rules.js +0 -49
  393. data/lib/zen/package/users/lib/users/view/admin/access-rules/form.xhtml +0 -120
  394. data/lib/zen/package/users/lib/users/view/admin/access-rules/index.xhtml +0 -102
  395. data/lib/zen/plugin.rb +0 -182
  396. data/lib/zen/plugin/base.rb +0 -46
  397. data/lib/zen/plugin/helper.rb +0 -47
  398. data/lib/zen/plugin/markup/lib/markup.rb +0 -14
  399. data/lib/zen/plugin/markup/lib/markup/language/en/markup.yml +0 -6
  400. data/lib/zen/plugin/markup/lib/markup/markup.rb +0 -165
  401. data/lib/zen/public/admin/js/zen/lib/asset.js +0 -111
  402. data/lib/zen/task/plugin.rake +0 -18
  403. data/lib/zen/theme/base.rb +0 -65
  404. data/proto/app/config/config.rb +0 -18
  405. data/spec/fixtures/zen/language/en/spec.yml +0 -10
  406. data/spec/fixtures/zen/language/nl/spec.yml +0 -7
  407. data/spec/fixtures/zen/package/settings/plugin/settings.rb +0 -20
  408. data/spec/zen/asset.rb +0 -97
  409. data/spec/zen/bin/create.rb +0 -89
  410. data/spec/zen/bin/runner.rb +0 -47
  411. data/spec/zen/helper/acl.rb +0 -149
  412. data/spec/zen/package/categories/plugin/categories.rb +0 -92
  413. data/spec/zen/package/comments/plugin/anti_spam.rb +0 -59
  414. data/spec/zen/package/comments/plugin/comments.rb +0 -107
  415. data/spec/zen/package/menus/plugin/menus.rb +0 -120
  416. data/spec/zen/package/sections/plugin/section_entries.rb +0 -161
  417. data/spec/zen/package/sections/plugin/sections.rb +0 -75
  418. data/spec/zen/package/settings/plugin/settings.rb +0 -33
  419. data/spec/zen/package/users/controller/access_rules.rb +0 -90
  420. data/spec/zen/plugin.rb +0 -64
  421. data/spec/zen/plugin/helper.rb +0 -11
  422. data/spec/zen/plugin/markup.rb +0 -44
@@ -1,11 +1,3 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Text editor (supports Textile, Markdown, etc).
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.1
8
- */
9
1
  .editor_container
10
2
  {
11
3
  background: #eee;
@@ -55,32 +47,32 @@
55
47
  /* Individual toolbar buttons */
56
48
  .editor_container .editor_toolbar ul li.bold
57
49
  {
58
- background: url("../../images/zen/icons/bold.png") no-repeat 6px 5px;
50
+ background: url("/admin/images/zen/icons/bold.png") no-repeat 6px 5px;
59
51
  }
60
52
 
61
53
  .editor_container .editor_toolbar ul li.italic
62
54
  {
63
- background: url("../../images/zen/icons/italic.png") no-repeat 6px 5px;
55
+ background: url("/admin/images/zen/icons/italic.png") no-repeat 6px 5px;
64
56
  }
65
57
 
66
58
  .editor_container .editor_toolbar ul li.link
67
59
  {
68
- background: url("../../images/zen/icons/link.png") no-repeat 7px 5px;
60
+ background: url("/admin/images/zen/icons/link.png") no-repeat 7px 5px;
69
61
  }
70
62
 
71
63
  .editor_container .editor_toolbar ul li.ul
72
64
  {
73
- background: url("../../images/zen/icons/ul.png") no-repeat 6px 5px;
65
+ background: url("/admin/images/zen/icons/ul.png") no-repeat 6px 5px;
74
66
  }
75
67
 
76
68
  .editor_container .editor_toolbar ul li.ol
77
69
  {
78
- background: url("../../images/zen/icons/ol.png") no-repeat 6px 5px;
70
+ background: url("/admin/images/zen/icons/ol.png") no-repeat 6px 5px;
79
71
  }
80
72
 
81
73
  .editor_container .editor_toolbar ul li.preview
82
74
  {
83
- background: url('../../images/zen/icons/preview.png') no-repeat 7px 6px;
75
+ background: url('/admin/images/zen/icons/preview.png') no-repeat 7px 6px;
84
76
  }
85
77
 
86
78
  .editor_container .editor_toolbar ul li:hover
@@ -1,20 +1,14 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Forms
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.1
8
- */
9
- form label
1
+ label
10
2
  {
3
+ cursor: pointer;
11
4
  display: block;
12
5
  margin-bottom: 5px;
13
6
  }
14
7
 
15
- form label .error
8
+ label .error
16
9
  {
17
- background: url("../../images/zen/icons/error.png") no-repeat center left;
10
+ background: url("/admin/images/zen/icons/error.png") no-repeat
11
+ center left;
18
12
  color: #eb5e4a;
19
13
  display: block;
20
14
  margin-top: 8px;
@@ -69,5 +63,18 @@ select
69
63
 
70
64
  *[disabled], *[disabled="disabled"]
71
65
  {
72
- cursor: not-allowed;
66
+ background: #f2f2f2;
67
+ cursor: not-allowed;
68
+ }
69
+
70
+ fieldset
71
+ {
72
+ border: 1px solid #ddd;
73
+ padding: 5px 10px;
73
74
  }
75
+
76
+ fieldset legend
77
+ {
78
+ font-size: 14px;
79
+ font-weight: bold;
80
+ }
@@ -1,47 +1,39 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Stylesheet used for styling general elements such as tables and forms.
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.1a
8
- */
9
-
10
1
  body
11
2
  {
12
3
  background: #eee;
13
- font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial, sans-serif;
4
+ font-family: 'Lucida Grande', 'Lucida Sans Unicode', Verdana, Arial,
5
+ sans-serif;
14
6
  font-size: 13px;
15
7
  line-height: 1.6;
16
8
  }
17
9
 
18
10
  /* Headings */
19
- h1
11
+ h1
20
12
  {
21
13
  font-size:25px;
22
14
  }
23
15
 
24
- h2
16
+ h2
25
17
  {
26
18
  font-size:23px;
27
19
  }
28
20
 
29
- h3
21
+ h3
30
22
  {
31
23
  font-size:21px;
32
24
  }
33
25
 
34
- h4
26
+ h4
35
27
  {
36
28
  font-size:19px;
37
29
  }
38
30
 
39
- h5
31
+ h5
40
32
  {
41
33
  font-size:17px;
42
34
  }
43
35
 
44
- h6
36
+ h6
45
37
  {
46
38
  font-size:15px;
47
39
  }
@@ -52,7 +44,7 @@ h1, h2, h3, h4, h5, h6
52
44
  }
53
45
 
54
46
  /* General */
55
- p, dl, hr, ol, ul, pre, table, address, fieldset
47
+ p, dl, hr, ol, ul, pre, table, address, fieldset
56
48
  {
57
49
  margin-bottom: 20px;
58
50
  }
@@ -90,7 +82,8 @@ pre
90
82
  }
91
83
 
92
84
  /* Icons and other re-usable images. */
93
- .icon_edit,.icon_delete,.icon_add, .icon_success, .icon_error, .icon_info, .icon_view
85
+ .icon_edit, .icon_delete, .icon_add, .icon_success, .icon_error, .icon_info,
86
+ .icon_view
94
87
  {
95
88
  margin-right: 10px;
96
89
  padding: 5px 3px 5px 25px;
@@ -103,3 +96,14 @@ pre
103
96
  .icon_error { background: url("../images/zen/icons/error.png") no-repeat center left; }
104
97
  .icon_info { background: url("../images/zen/icons/info.png") no-repeat center left; }
105
98
  .icon_view { background: url("../images/zen/icons/view.png") no-repeat center left; }
99
+
100
+ .floating_tooltip
101
+ {
102
+ background: #000;
103
+ padding: 5px 10px;
104
+ color: #fff;
105
+
106
+ border-radius: 5px;
107
+ -webkit-border-radius: 5px;
108
+ -moz-border-radius: 5px;
109
+ }
@@ -1,26 +1,7 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Modified version of the CSS grid (aka 1140 CSS) that can be found at http://cssgrid.net
5
- *
6
- * This modified version has some extra enhancements to make it a bit easier to work with
7
- * the grid. Along with these minor fixes I also renamed all grid classes to the names
8
- * used by the 960 grid system as I find "grid_6" easier to write than "sixcol".
9
- *
10
- * @author Yorick Peterse
11
- * @since 0.1a
12
- */
13
-
14
- /**
15
- * Main container element in which all grid elements should be placed.
16
- * This container stretches across the entire screen but has a padding of 20 pixels on both
17
- * the left and the right side.
18
- */
19
1
  .container
20
2
  {
21
- margin: 0 2%;
3
+ margin: 0 30px;
22
4
  overflow: hidden;
23
- width: 96%;
24
5
  }
25
6
  /* Clear the floats so background colors and other properties can be used properly */
26
7
  .container:after, .clearfix:after
@@ -1,18 +1,16 @@
1
- @charset "UTF-8";
1
+ .container
2
+ {
3
+ min-width: 960px;
4
+ }
2
5
 
3
- /**
4
- * Main stylesheet used for the layout of the admin panel.
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.1a
8
- */
9
6
  #login
10
7
  {
11
8
  margin-top: 50px;
12
9
  }
13
10
 
14
11
  /**
15
- * Top part of the admin panel that contains the user bar along with the main navigation menu.
12
+ * Top part of the admin panel that contains the user bar along with the main
13
+ * navigation menu.
16
14
  */
17
15
  #top
18
16
  {
@@ -97,15 +95,16 @@
97
95
  -moz-border-radius: 5px;
98
96
  }
99
97
 
100
- #container article
98
+ #container section
101
99
  {
102
100
  padding: 15px;
103
101
  }
104
102
 
105
103
  #login #container, #login #main_footer
106
104
  {
107
- margin: 20px auto;
108
- width: 500px;
105
+ margin: 20px auto;
106
+ min-width: 500px;
107
+ width: 500px;
109
108
  }
110
109
 
111
110
  /**
@@ -167,3 +166,19 @@
167
166
  {
168
167
  display: none;
169
168
  }
169
+
170
+ /* Styles for the search form */
171
+ #search_form
172
+ {
173
+ float: right;
174
+ }
175
+
176
+ #search_form input[type="text"]
177
+ {
178
+ min-width: 250px;
179
+ }
180
+
181
+ #search_form .button
182
+ {
183
+ margin-right: 0px;
184
+ }
@@ -1,11 +1,3 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Stylesheet used for the messages (such as errors) in the backend.
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.2.6
8
- */
9
1
  #message_container
10
2
  {
11
3
  margin-top: 20px;
@@ -13,8 +5,9 @@
13
5
 
14
6
  #login #message_container
15
7
  {
16
- margin: 20px auto;
17
- width: 510px;
8
+ margin: 20px auto;
9
+ min-width: 510px;
10
+ width: 510px;
18
11
  }
19
12
 
20
13
  #message_container .message
@@ -1,16 +1,14 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * http://meyerweb.com/eric/tools/css/reset/
1
+ /**
2
+ * http://meyerweb.com/eric/tools/css/reset/
5
3
  * v2.0 | 20110126
6
4
  * License: none (public domain)
7
5
  */
8
6
  html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
9
- a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small,
10
- strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset,
11
- form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside,
12
- canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output,
13
- ruby, section, summary, time, mark, audio, video
7
+ a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small,
8
+ strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset,
9
+ form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside,
10
+ canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output,
11
+ ruby, section, summary, time, mark, audio, video
14
12
  {
15
13
  border: 0;
16
14
  font-size: 100%;
@@ -21,12 +19,12 @@ ruby, section, summary, time, mark, audio, video
21
19
  }
22
20
 
23
21
  /* HTML5 display-role reset for older browsers */
24
- article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section
22
+ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section
25
23
  {
26
24
  display: block;
27
25
  }
28
26
 
29
- body
27
+ body
30
28
  {
31
29
  line-height: 1.3;
32
30
  }
@@ -38,18 +36,18 @@ ol, ul, ol li, ul li
38
36
  padding: 0px;
39
37
  }
40
38
 
41
- blockquote, q
39
+ blockquote, q
42
40
  {
43
41
  quotes: none;
44
42
  }
45
43
 
46
- blockquote:before, blockquote:after, q:before, q:after
44
+ blockquote:before, blockquote:after, q:before, q:after
47
45
  {
48
46
  content: '';
49
47
  content: none;
50
48
  }
51
49
 
52
- table
50
+ table
53
51
  {
54
52
  /**
55
53
  * Instead of "collapse" I'm using "separate" as that allows me to give table cells
@@ -73,7 +71,7 @@ pre, code
73
71
 
74
72
  /**
75
73
  * These form elements usually don't trigger any special cursor and thus can confuse
76
- * users when these elements have custom styles (e.g. a background image).
74
+ * users when these elements have custom styles (e.g. a background image).
77
75
  */
78
76
  input[type="submit"], input[type="button"], input[type="checkbox"], input[type="radio"],
79
77
  button, select
@@ -1,5 +1,3 @@
1
- @charset "UTF-8";
2
-
3
1
  table
4
2
  {
5
3
  border: 1px solid #aaa;
@@ -34,7 +32,7 @@ table
34
32
  /* Styles used to indicate the sort order of a column */
35
33
  table thead tr th div
36
34
  {
37
- background: url('../../images/zen/icons/asc.png')
35
+ background: url('/admin/images/zen/icons/asc.png')
38
36
  no-repeat center right;
39
37
 
40
38
  cursor: pointer;
@@ -56,7 +54,7 @@ table
56
54
 
57
55
  table thead tr th.desc div
58
56
  {
59
- background: url('../../images/zen/icons/desc.png')
57
+ background: url('/admin/images/zen/icons/desc.png')
60
58
  no-repeat center right!important;
61
59
  }
62
60
 
@@ -66,22 +64,22 @@ table
66
64
  vertical-align: middle;
67
65
  }
68
66
 
69
- table thead tr th:first-child, table tbody tr td:first-child
70
- {
71
- width: 15px;
72
- }
73
-
74
67
  table thead tr th:first-child input[type="checkbox"],
75
68
  table tbody tr td:first-child input[type="checkbox"]
76
69
  {
77
70
  margin-top: 3px;
78
71
  }
79
72
 
80
- table tr.odd
73
+ table tr:nth-child(even)
81
74
  {
82
75
  background: #f2f2f2;
83
76
  }
84
77
 
78
+ .datepicker tr:nth-child(even)
79
+ {
80
+ background: #fff;
81
+ }
82
+
85
83
  table tbody tr:hover
86
84
  {
87
85
  background: #f2f2f2;
@@ -1,11 +1,3 @@
1
- @charset "UTF-8";
2
-
3
- /**
4
- * Tab navigation.
5
- *
6
- * @author Yorick Peterse
7
- * @since 0.1
8
- */
9
1
  .tabs
10
2
  {
11
3
  border: 1px solid #aaa;
@@ -14,7 +6,7 @@
14
6
  }
15
7
  .tabs ul
16
8
  {
17
- background: #ddd -webkit-gradient(linear, left bottom, left top,
9
+ background: #ddd -webkit-gradient(linear, left bottom, left top,
18
10
  from(#ddd), to(#eee));
19
11
  background: #ddd -moz-linear-gradient(bottom, top, #ddd, #eee);
20
12
  border-top: 1px solid #fff;
@@ -38,7 +30,7 @@
38
30
  }
39
31
  .tabs ul li.active a
40
32
  {
41
- background: #eee -webkit-gradient(linear, left bottom,
33
+ background: #eee -webkit-gradient(linear, left bottom,
42
34
  left top, from(#eee), to(#ddd));
43
35
  background: #eee -moz-linear-gradient(bottom, top, #eee, #ddd);
44
36
  border-bottom: 1px solid #aaa;