alchemy_cms 2.2.4 → 2.3.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (215) hide show
  1. data/.gitignore +1 -1
  2. data/.travis.yml +3 -4
  3. data/Gemfile +1 -0
  4. data/README.md +10 -6
  5. data/alchemy_cms.gemspec +5 -2
  6. data/app/assets/images/alchemy/icons.png +0 -0
  7. data/app/assets/images/sassy-ie-overlay.png +0 -0
  8. data/app/assets/javascripts/alchemy/alchemy.base.js +50 -59
  9. data/app/assets/javascripts/alchemy/alchemy.buttons.js +14 -4
  10. data/app/assets/javascripts/alchemy/alchemy.datepicker.js +8 -2
  11. data/app/assets/javascripts/alchemy/alchemy.elements_window.js +11 -3
  12. data/app/assets/javascripts/alchemy/alchemy.gui.js.coffee +1 -1
  13. data/app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee +14 -1
  14. data/app/assets/javascripts/alchemy/alchemy.preview.js +1 -1
  15. data/app/assets/javascripts/alchemy/alchemy.preview_window.js +12 -4
  16. data/app/assets/javascripts/alchemy/alchemy.uploader.js +4 -1
  17. data/app/assets/javascripts/alchemy/alchemy.windows.js +18 -8
  18. data/app/assets/stylesheets/alchemy/_defaults.scss +84 -120
  19. data/app/assets/stylesheets/alchemy/alchemy.css +2 -2
  20. data/app/assets/stylesheets/alchemy/archive.css.scss +288 -0
  21. data/app/assets/stylesheets/alchemy/base.css.scss +95 -390
  22. data/app/assets/stylesheets/alchemy/dashboard.css.scss +4 -4
  23. data/app/assets/stylesheets/alchemy/elements.css.scss +83 -118
  24. data/app/assets/stylesheets/alchemy/flash.css.scss +1 -1
  25. data/app/assets/stylesheets/alchemy/form_elements.css.scss +528 -0
  26. data/app/assets/stylesheets/alchemy/frame.css.scss +13 -39
  27. data/app/assets/stylesheets/alchemy/icons.css.scss +217 -228
  28. data/app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss +48 -50
  29. data/app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss +1 -1
  30. data/app/assets/stylesheets/alchemy/login.css.scss +1 -5
  31. data/app/assets/stylesheets/alchemy/menubar.css.scss +19 -29
  32. data/app/assets/stylesheets/alchemy/pagination.css.scss +3 -4
  33. data/app/assets/stylesheets/alchemy/sitemap.css.scss +81 -81
  34. data/app/assets/stylesheets/alchemy/tables.css.scss +63 -57
  35. data/app/assets/stylesheets/alchemy/tinymce_dialog.css.scss +57 -57
  36. data/app/assets/stylesheets/alchemy/upload.css.scss +6 -6
  37. data/app/assets/stylesheets/tiny_mce/plugins/inlinepopups/skins/alchemy/window.css.scss +6 -10
  38. data/app/controllers/alchemy/admin/attachments_controller.rb +5 -4
  39. data/app/controllers/alchemy/admin/base_controller.rb +1 -9
  40. data/app/controllers/alchemy/admin/contents_controller.rb +4 -6
  41. data/app/controllers/alchemy/admin/elements_controller.rb +2 -2
  42. data/app/controllers/alchemy/admin/pages_controller.rb +2 -2
  43. data/app/controllers/alchemy/admin/pictures_controller.rb +74 -15
  44. data/app/controllers/alchemy/attachments_controller.rb +8 -2
  45. data/app/controllers/alchemy/base_controller.rb +47 -5
  46. data/app/controllers/alchemy/elements_controller.rb +1 -1
  47. data/app/controllers/alchemy/messages_controller.rb +12 -12
  48. data/app/controllers/alchemy/pages_controller.rb +5 -1
  49. data/app/controllers/alchemy/pictures_controller.rb +9 -4
  50. data/app/controllers/alchemy/user_sessions_controller.rb +2 -4
  51. data/app/helpers/alchemy/admin/base_helper.rb +98 -19
  52. data/app/helpers/alchemy/admin/contents_helper.rb +2 -2
  53. data/app/helpers/alchemy/admin/elements_helper.rb +2 -3
  54. data/app/helpers/alchemy/base_helper.rb +6 -5
  55. data/app/helpers/alchemy/elements_helper.rb +2 -2
  56. data/app/helpers/alchemy/essences_helper.rb +4 -5
  57. data/app/helpers/alchemy/pages_helper.rb +15 -79
  58. data/app/helpers/alchemy/url_helper.rb +67 -0
  59. data/app/mailers/alchemy/messages.rb +1 -1
  60. data/app/mailers/alchemy/notifications.rb +1 -1
  61. data/app/models/alchemy/attachment.rb +11 -2
  62. data/app/models/alchemy/cell.rb +20 -10
  63. data/app/models/alchemy/content.rb +4 -3
  64. data/app/models/alchemy/element.rb +170 -178
  65. data/app/models/alchemy/language/code.rb +4 -1
  66. data/app/models/alchemy/message.rb +19 -3
  67. data/app/models/alchemy/page.rb +45 -40
  68. data/app/models/alchemy/picture.rb +24 -2
  69. data/app/models/alchemy/user.rb +2 -3
  70. data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb +12 -12
  71. data/app/views/alchemy/admin/attachments/_attachment.html.erb +1 -1
  72. data/app/views/alchemy/admin/attachments/create.js.erb +1 -0
  73. data/app/views/alchemy/admin/attachments/edit.html.erb +9 -3
  74. data/app/views/alchemy/admin/attachments/index.html.erb +3 -2
  75. data/app/views/alchemy/admin/contents/_missing.html.erb +1 -1
  76. data/app/views/alchemy/admin/contents/create.js.erb +54 -0
  77. data/app/views/alchemy/admin/contents/new.html.erb +9 -4
  78. data/app/views/alchemy/admin/elements/{_add_content.html.erb → _add_picture.html.erb} +4 -4
  79. data/app/views/alchemy/admin/elements/_elements_select.html.erb +2 -1
  80. data/app/views/alchemy/admin/elements/_new_element_form.html.erb +1 -1
  81. data/app/views/alchemy/admin/elements/{_picture_editor.html.erb → _picture_gallery_editor.html.erb} +7 -11
  82. data/app/views/alchemy/admin/elements/fold.js.erb +46 -0
  83. data/app/views/alchemy/admin/elements/index.html.erb +24 -24
  84. data/app/views/alchemy/admin/elements/list.js.erb +11 -9
  85. data/app/views/alchemy/admin/essence_files/assign.js.erb +3 -1
  86. data/app/views/alchemy/admin/essence_pictures/destroy.js.erb +28 -0
  87. data/app/views/alchemy/admin/pages/_contactform_links.html.erb +8 -6
  88. data/app/views/alchemy/admin/pages/_external_link.html.erb +11 -9
  89. data/app/views/alchemy/admin/pages/_file_link.html.erb +10 -8
  90. data/app/views/alchemy/admin/pages/_internal_link.html.erb +14 -10
  91. data/app/views/alchemy/admin/pages/_new_page_form.html.erb +1 -1
  92. data/app/views/alchemy/admin/pages/_page.html.erb +1 -1
  93. data/app/views/alchemy/admin/pages/_page_for_links.html.erb +32 -21
  94. data/app/views/alchemy/admin/pages/configure.html.erb +2 -2
  95. data/app/views/alchemy/admin/pages/configure_external.html.erb +13 -13
  96. data/app/views/alchemy/admin/pages/edit.html.erb +2 -2
  97. data/app/views/alchemy/admin/pages/index.html.erb +26 -24
  98. data/app/views/alchemy/admin/pages/link.html.erb +2 -5
  99. data/app/views/alchemy/admin/partials/_upload_form.html.erb +28 -12
  100. data/app/views/alchemy/admin/pictures/_archive.html.erb +54 -0
  101. data/app/views/alchemy/admin/pictures/_archive_overlay.html.erb +10 -7
  102. data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb +21 -22
  103. data/app/views/alchemy/admin/pictures/_filter_bar.html.erb +31 -0
  104. data/app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb +9 -0
  105. data/app/views/alchemy/admin/pictures/_picture.html.erb +36 -6
  106. data/app/views/alchemy/admin/pictures/_tag_list.html.erb +27 -0
  107. data/app/views/alchemy/admin/pictures/archive_overlay.js.erb +3 -1
  108. data/app/views/alchemy/admin/pictures/create.js.erb +4 -5
  109. data/app/views/alchemy/admin/pictures/edit.html.erb +26 -0
  110. data/app/views/alchemy/admin/pictures/edit_multiple.html.erb +39 -0
  111. data/app/views/alchemy/admin/pictures/index.html.erb +81 -70
  112. data/app/views/alchemy/admin/pictures/index.js.erb +3 -0
  113. data/app/views/alchemy/admin/pictures/new.html.erb +1 -0
  114. data/app/views/alchemy/admin/resources/index.html.erb +3 -1
  115. data/app/views/alchemy/admin/users/_table.html.erb +1 -1
  116. data/app/views/alchemy/admin/users/index.html.erb +27 -23
  117. data/app/views/alchemy/elements/_article_editor.html.erb +7 -2
  118. data/app/views/alchemy/elements/_bild_editor.html.erb +1 -1
  119. data/app/views/alchemy/elements/_bild_text_editor.html.erb +6 -1
  120. data/app/views/alchemy/elements/_bild_text_view.html.erb +3 -3
  121. data/app/views/alchemy/elements/_image_mosaic_editor.html.erb +1 -1
  122. data/app/views/alchemy/elements/_image_mosaic_view.html.erb +2 -2
  123. data/app/views/alchemy/elements/_intro_image_text_view.html.erb +4 -4
  124. data/app/views/alchemy/elements/_searchresult_editor.html.erb +4 -1
  125. data/app/views/alchemy/essences/_essence_boolean_editor.html.erb +1 -1
  126. data/app/views/alchemy/essences/_essence_picture_editor.html.erb +2 -3
  127. data/app/views/alchemy/essences/_essence_picture_tools.html.erb +1 -1
  128. data/app/views/alchemy/search/_form.html.erb +8 -0
  129. data/app/views/alchemy/search/_result.html.erb +3 -2
  130. data/app/views/alchemy/search/_results.html.erb +28 -0
  131. data/app/views/alchemy/user_sessions/leave.html.erb +4 -4
  132. data/app/views/alchemy/user_sessions/login.html.erb +1 -2
  133. data/app/views/layouts/alchemy/admin.html.erb +30 -10
  134. data/app/views/layouts/alchemy/login.html.erb +2 -39
  135. data/config/alchemy/elements.yml +1 -2
  136. data/config/alchemy/page_layouts.yml +8 -5
  137. data/config/authorization_rules.rb +27 -18
  138. data/config/initializers/localeapp.rb +9 -0
  139. data/config/locales/alchemy.de.yml +93 -56
  140. data/config/locales/alchemy.en.yml +73 -50
  141. data/config/routes.rb +3 -1
  142. data/db/migrate/20120704181529_add_upload_hash_to_alchemy_picture.rb +5 -0
  143. data/db/migrate/20120705214247_acts_as_taggable_on_migration.rb +28 -0
  144. data/db/migrate/20120728185830_add_cached_tag_list_to_alchemy_pictures.rb +5 -0
  145. data/db/migrate/20120831135441_set_alchemy_languages_country_code_default_to_empty_string.rb +9 -0
  146. data/lib/alchemy/capistrano.rb +2 -2
  147. data/lib/alchemy/essence.rb +14 -0
  148. data/lib/alchemy/page_layout.rb +0 -6
  149. data/lib/alchemy/resource.rb +9 -15
  150. data/lib/alchemy/upgrader.rb +18 -3
  151. data/lib/alchemy/version.rb +5 -1
  152. data/lib/alchemy_cms.rb +4 -1
  153. data/lib/rails/generators/alchemy/deploy_script/deploy_script_generator.rb +16 -6
  154. data/lib/rails/generators/alchemy/deploy_script/templates/deploy.rb.tt +17 -3
  155. data/lib/rails/generators/alchemy/elements/elements_generator.rb +6 -1
  156. data/lib/rails/generators/alchemy/elements/templates/editor.html.erb +10 -1
  157. data/lib/rails/generators/alchemy/elements/templates/view.html.erb +17 -18
  158. data/lib/rails/generators/alchemy/scaffold/files/pages.html.erb +4 -2
  159. data/lib/tasks/fleximage.rake +2 -2
  160. data/spec/controllers/admin/contents_controller_spec.rb +2 -2
  161. data/spec/controllers/admin/elements_controller_spec.rb +30 -1
  162. data/spec/controllers/admin/pages_controller_spec.rb +35 -18
  163. data/spec/controllers/admin/trash_controller_spec.rb +40 -16
  164. data/spec/controllers/attachments_controller_spec.rb +62 -0
  165. data/spec/controllers/base_controller_spec.rb +43 -42
  166. data/spec/controllers/elements_controller_spec.rb +30 -0
  167. data/spec/controllers/pages_controller_spec.rb +22 -5
  168. data/spec/controllers/pictures_controller_spec.rb +82 -0
  169. data/spec/dummy/app/models/event.rb +2 -1
  170. data/spec/dummy/config/database.yml +3 -2
  171. data/spec/dummy/db/schema.rb +51 -27
  172. data/spec/factories.rb +29 -8
  173. data/spec/helpers/admin/base_helper_spec.rb +134 -21
  174. data/spec/helpers/admin/contents_helper_spec.rb +2 -2
  175. data/spec/helpers/admin/elements_helper_spec.rb +17 -9
  176. data/spec/helpers/admin/essences_helper_spec.rb +7 -6
  177. data/spec/helpers/essences_helper_spec.rb +8 -7
  178. data/spec/helpers/pages_helper_spec.rb +208 -325
  179. data/spec/helpers/url_helper_spec.rb +171 -0
  180. data/spec/integration/admin/link_overlay_spec.rb +53 -0
  181. data/spec/integration/admin/modules_integration_spec.rb +22 -26
  182. data/spec/integration/admin/pages_controller_spec.rb +10 -19
  183. data/spec/integration/admin/picture_library_integration_spec.rb +52 -0
  184. data/spec/integration/admin/resources_integration_spec.rb +68 -75
  185. data/spec/integration/pages_controller_spec.rb +70 -61
  186. data/spec/integration/security_spec.rb +3 -5
  187. data/spec/integration/translation_integration_spec.rb +56 -0
  188. data/spec/libraries/essence_spec.rb +18 -0
  189. data/spec/libraries/resource_spec.rb +101 -79
  190. data/spec/libraries/resources_helper_spec.rb +3 -0
  191. data/spec/models/content_spec.rb +63 -60
  192. data/spec/models/element_spec.rb +203 -93
  193. data/spec/models/language_spec.rb +90 -65
  194. data/spec/models/page_layout_spec.rb +37 -0
  195. data/spec/models/page_spec.rb +181 -113
  196. data/spec/models/picture_spec.rb +73 -26
  197. data/spec/models/resource_spec.rb +52 -23
  198. data/spec/support/alchemy/specs_helpers.rb +2 -0
  199. data/spec/support/image.png +0 -0
  200. data/spec/{helpers/url_helpers_spec.rb → url_helpers_spec.rb} +0 -0
  201. data/vendor/assets/javascripts/jquery_plugins/jquery.selectBoxIt.js +1909 -0
  202. data/vendor/assets/javascripts/jquery_plugins/preloadCssImages.jQuery_v5.js +152 -0
  203. metadata +106 -33
  204. data/app/assets/stylesheets/alchemy/buttons.css.scss +0 -361
  205. data/app/assets/stylesheets/alchemy/jquery.sb.css.scss +0 -260
  206. data/app/views/alchemy/admin/contents/create.js.coffee +0 -49
  207. data/app/views/alchemy/admin/elements/fold.js.coffee +0 -37
  208. data/app/views/alchemy/admin/essence_pictures/destroy.js.coffee +0 -19
  209. data/app/views/alchemy/admin/pictures/_pictures_list.html.erb +0 -16
  210. data/app/views/alchemy/admin/pictures/update.js.erb +0 -3
  211. data/spec/dummy/config/locales/en.yml +0 -5
  212. data/spec/dummy/config/locales/fo.yml +0 -5
  213. data/spec/page_layout_spec.rb +0 -35
  214. data/vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js +0 -172
  215. data/vendor/assets/javascripts/jquery_plugins/jquery.sb.min.js +0 -14
@@ -0,0 +1,152 @@
1
+ /**
2
+ * jQuery-Plugin "preloadCssImages"
3
+ * by Scott Jehl, scott@filamentgroup.com
4
+ * http://www.filamentgroup.com
5
+ * reference article: http://www.filamentgroup.com/lab/update_automatically_preload_images_from_css_with_jquery/
6
+ * demo page: http://www.filamentgroup.com/examples/preloadImages/index_v2.php
7
+ *
8
+ * Copyright (c) 2008 Filament Group, Inc
9
+ * Dual licensed under the MIT (filamentgroup.com/examples/mit-license.txt) and GPL (filamentgroup.com/examples/gpl-license.txt) licenses.
10
+ *
11
+ * Version: 5.0, 10.31.2008
12
+ * Changelog:
13
+ * 02.20.2008 initial Version 1.0
14
+ * 06.04.2008 Version 2.0 : removed need for any passed arguments. Images load from any and all directories.
15
+ * 06.21.2008 Version 3.0 : Added options for loading status. Fixed IE abs image path bug (thanks Sam Pohlenz).
16
+ * 07.24.2008 Version 4.0 : Added support for @imported CSS (credit: http://marcarea.com/). Fixed support in Opera as well.
17
+ * 10.31.2008 Version: 5.0 : Many feature and performance enhancements from trixta
18
+ * --------------------------------------------------------------------
19
+ */
20
+
21
+ ;jQuery.preloadCssImages = function(settings){
22
+ settings = jQuery.extend({
23
+ statusTextEl: null,
24
+ statusBarEl: null,
25
+ errorDelay: 999, // handles 404-Errors in IE
26
+ simultaneousCacheLoading: 2
27
+ }, settings);
28
+ var allImgs = [],
29
+ loaded = 0,
30
+ imgUrls = [],
31
+ thisSheetRules,
32
+ errorTimer;
33
+
34
+ function onImgComplete(){
35
+ clearTimeout(errorTimer);
36
+ if (imgUrls && imgUrls.length && imgUrls[loaded]) {
37
+ loaded++;
38
+ if (settings.statusTextEl) {
39
+ var nowloading = (imgUrls[loaded]) ?
40
+ 'Now Loading: <span>' + imgUrls[loaded].split('/')[imgUrls[loaded].split('/').length - 1] :
41
+ 'Loading complete'; // wrong status-text bug fixed
42
+ jQuery(settings.statusTextEl).html('<span class="numLoaded">' + loaded + '</span> of <span class="numTotal">' + imgUrls.length + '</span> loaded (<span class="percentLoaded">' + (loaded / imgUrls.length * 100).toFixed(0) + '%</span>) <span class="currentImg">' + nowloading + '</span></span>');
43
+ }
44
+ if (settings.statusBarEl) {
45
+ var barWidth = jQuery(settings.statusBarEl).width();
46
+ jQuery(settings.statusBarEl).css('background-position', -(barWidth - (barWidth * loaded / imgUrls.length).toFixed(0)) + 'px 50%');
47
+ }
48
+ loadImgs();
49
+ }
50
+ }
51
+
52
+ function loadImgs(){
53
+ //only load 1 image at the same time / most browsers can only handle 2 http requests, 1 should remain for user-interaction (Ajax, other images, normal page requests...)
54
+ // otherwise set simultaneousCacheLoading to a higher number for simultaneous downloads
55
+ if(imgUrls && imgUrls.length && imgUrls[loaded]){
56
+ var img = new Image(); //new img obj
57
+ img.src = imgUrls[loaded]; //set src either absolute or rel to css dir
58
+ if(!img.complete){
59
+ jQuery(img).bind('error load onreadystatechange', onImgComplete);
60
+ } else {
61
+ onImgComplete();
62
+ }
63
+ errorTimer = setTimeout(onImgComplete, settings.errorDelay); // handles 404-Errors in IE
64
+ }
65
+ }
66
+
67
+ function parseCSS(sheets, urls) {
68
+ var w3cImport = false,
69
+ imported = [],
70
+ importedSrc = [],
71
+ baseURL;
72
+ var sheetIndex = sheets.length;
73
+ while(sheetIndex--){//loop through each stylesheet
74
+
75
+ var cssPile = '';//create large string of all css rules in sheet
76
+
77
+ if(urls && urls[sheetIndex]){
78
+ baseURL = urls[sheetIndex];
79
+ } else {
80
+ var csshref = (sheets[sheetIndex].href) ? sheets[sheetIndex].href : 'window.location.href';
81
+ var baseURLarr = csshref.split('/');//split href at / to make array
82
+ baseURLarr.pop();//remove file path from baseURL array
83
+ baseURL = baseURLarr.join('/');//create base url for the images in this sheet (css file's dir)
84
+ if (baseURL) {
85
+ baseURL += '/'; //tack on a / if needed
86
+ }
87
+ }
88
+ if(sheets[sheetIndex].cssRules || sheets[sheetIndex].rules){
89
+ thisSheetRules = (sheets[sheetIndex].cssRules) ? //->>> http://www.quirksmode.org/dom/w3c_css.html
90
+ sheets[sheetIndex].cssRules : //w3
91
+ sheets[sheetIndex].rules; //ie
92
+ var ruleIndex = thisSheetRules.length;
93
+ while(ruleIndex--){
94
+ if(thisSheetRules[ruleIndex].style && thisSheetRules[ruleIndex].style.cssText){
95
+ var text = thisSheetRules[ruleIndex].style.cssText;
96
+ if(text.toLowerCase().indexOf('url') != -1){ // only add rules to the string if you can assume, to find an image, speed improvement
97
+ cssPile += text; // thisSheetRules[ruleIndex].style.cssText instead of thisSheetRules[ruleIndex].cssText is a huge speed improvement
98
+ }
99
+ } else if(thisSheetRules[ruleIndex].styleSheet) {
100
+ imported.push(thisSheetRules[ruleIndex].styleSheet);
101
+ w3cImport = true;
102
+ }
103
+
104
+ }
105
+ }
106
+ //parse cssPile for image urls
107
+ var tmpImage = cssPile.match(/[^\("]+\.(gif|jpg|jpeg|png)/g);//reg ex to get a string of between a "(" and a ".filename" / '"' for opera-bugfix
108
+ if(tmpImage){
109
+ var i = tmpImage.length;
110
+ while(i--){ // handle baseUrl here for multiple stylesheets in different folders bug
111
+ var imgSrc = (tmpImage[i].charAt(0) == '/' || tmpImage[i].match('://')) ? // protocol-bug fixed
112
+ tmpImage[i] :
113
+ baseURL + tmpImage[i];
114
+
115
+ if(jQuery.inArray(imgSrc, imgUrls) == -1){
116
+ imgUrls.push(imgSrc);
117
+ }
118
+ }
119
+ }
120
+
121
+ if(!w3cImport && sheets[sheetIndex].imports && sheets[sheetIndex].imports.length) {
122
+ for(var iImport = 0, importLen = sheets[sheetIndex].imports.length; iImport < importLen; iImport++){
123
+ var iHref = sheets[sheetIndex].imports[iImport].href;
124
+ iHref = iHref.split('/');
125
+ iHref.pop();
126
+ iHref = iHref.join('/');
127
+ if (iHref) {
128
+ iHref += '/'; //tack on a / if needed
129
+ }
130
+ var iSrc = (iHref.charAt(0) == '/' || iHref.match('://')) ? // protocol-bug fixed
131
+ iHref :
132
+ baseURL + iHref;
133
+
134
+ importedSrc.push(iSrc);
135
+ imported.push(sheets[sheetIndex].imports[iImport]);
136
+ }
137
+
138
+
139
+ }
140
+ }//loop
141
+ if(imported.length){
142
+ parseCSS(imported, importedSrc);
143
+ return false;
144
+ }
145
+ var downloads = settings.simultaneousCacheLoading;
146
+ while( downloads--){
147
+ setTimeout(loadImgs, downloads);
148
+ }
149
+ }
150
+ parseCSS(document.styleSheets);
151
+ return imgUrls;
152
+ };
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: alchemy_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.4
5
- prerelease:
4
+ version: 2.3.rc5
5
+ prerelease: 4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas von Deyen
@@ -12,7 +12,7 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2013-01-10 00:00:00.000000000 Z
15
+ date: 2012-09-07 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: rails
@@ -21,7 +21,7 @@ dependencies:
21
21
  requirements:
22
22
  - - ~>
23
23
  - !ruby/object:Gem::Version
24
- version: 3.2.11
24
+ version: 3.2.5
25
25
  type: :runtime
26
26
  prerelease: false
27
27
  version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
29
29
  requirements:
30
30
  - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: 3.2.11
32
+ version: 3.2.5
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: authlogic
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -62,6 +62,22 @@ dependencies:
62
62
  - - ~>
63
63
  - !ruby/object:Gem::Version
64
64
  version: '2.0'
65
+ - !ruby/object:Gem::Dependency
66
+ name: acts-as-taggable-on
67
+ requirement: !ruby/object:Gem::Requirement
68
+ none: false
69
+ requirements:
70
+ - - ~>
71
+ - !ruby/object:Gem::Version
72
+ version: '2.1'
73
+ type: :runtime
74
+ prerelease: false
75
+ version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
77
+ requirements:
78
+ - - ~>
79
+ - !ruby/object:Gem::Version
80
+ version: '2.1'
65
81
  - !ruby/object:Gem::Dependency
66
82
  name: declarative_authorization
67
83
  requirement: !ruby/object:Gem::Requirement
@@ -238,6 +254,38 @@ dependencies:
238
254
  - - ~>
239
255
  - !ruby/object:Gem::Version
240
256
  version: 3.2.1
257
+ - !ruby/object:Gem::Dependency
258
+ name: compass-rails
259
+ requirement: !ruby/object:Gem::Requirement
260
+ none: false
261
+ requirements:
262
+ - - ~>
263
+ - !ruby/object:Gem::Version
264
+ version: 1.0.3
265
+ type: :runtime
266
+ prerelease: false
267
+ version_requirements: !ruby/object:Gem::Requirement
268
+ none: false
269
+ requirements:
270
+ - - ~>
271
+ - !ruby/object:Gem::Version
272
+ version: 1.0.3
273
+ - !ruby/object:Gem::Dependency
274
+ name: sassy-buttons
275
+ requirement: !ruby/object:Gem::Requirement
276
+ none: false
277
+ requirements:
278
+ - - ~>
279
+ - !ruby/object:Gem::Version
280
+ version: 0.1.3
281
+ type: :runtime
282
+ prerelease: false
283
+ version_requirements: !ruby/object:Gem::Requirement
284
+ none: false
285
+ requirements:
286
+ - - ~>
287
+ - !ruby/object:Gem::Version
288
+ version: 0.1.3
241
289
  - !ruby/object:Gem::Dependency
242
290
  name: bumpy
243
291
  requirement: !ruby/object:Gem::Requirement
@@ -291,17 +339,17 @@ dependencies:
291
339
  requirement: !ruby/object:Gem::Requirement
292
340
  none: false
293
341
  requirements:
294
- - - '='
342
+ - - ! '>='
295
343
  - !ruby/object:Gem::Version
296
- version: 2.12.0
344
+ version: '0'
297
345
  type: :development
298
346
  prerelease: false
299
347
  version_requirements: !ruby/object:Gem::Requirement
300
348
  none: false
301
349
  requirements:
302
- - - '='
350
+ - - ! '>='
303
351
  - !ruby/object:Gem::Version
304
- version: 2.12.0
352
+ version: '0'
305
353
  - !ruby/object:Gem::Dependency
306
354
  name: sqlite3
307
355
  requirement: !ruby/object:Gem::Requirement
@@ -369,6 +417,7 @@ files:
369
417
  - app/assets/images/alchemy/swfupload/browse_button.png
370
418
  - app/assets/images/alchemy/tabs.gif
371
419
  - app/assets/images/alchemy/ui-icons_666666_256x240.png
420
+ - app/assets/images/sassy-ie-overlay.png
372
421
  - app/assets/javascripts/alchemy/alchemy.base.js
373
422
  - app/assets/javascripts/alchemy/alchemy.buttons.js
374
423
  - app/assets/javascripts/alchemy/alchemy.custom.js
@@ -401,17 +450,17 @@ files:
401
450
  - app/assets/javascripts/tiny_mce/plugins/alchemy_link/langs/en.js
402
451
  - app/assets/stylesheets/alchemy/_defaults.scss
403
452
  - app/assets/stylesheets/alchemy/alchemy.css
453
+ - app/assets/stylesheets/alchemy/archive.css.scss
404
454
  - app/assets/stylesheets/alchemy/base.css.scss
405
- - app/assets/stylesheets/alchemy/buttons.css.scss
406
455
  - app/assets/stylesheets/alchemy/custom.css
407
456
  - app/assets/stylesheets/alchemy/dashboard.css.scss
408
457
  - app/assets/stylesheets/alchemy/elements.css.scss
409
458
  - app/assets/stylesheets/alchemy/flash.css.scss
459
+ - app/assets/stylesheets/alchemy/form_elements.css.scss
410
460
  - app/assets/stylesheets/alchemy/frame.css.scss
411
461
  - app/assets/stylesheets/alchemy/icons.css.scss
412
462
  - app/assets/stylesheets/alchemy/jquery-ui.alchemy.css.scss
413
463
  - app/assets/stylesheets/alchemy/jquery.Jcrop.css.scss
414
- - app/assets/stylesheets/alchemy/jquery.sb.css.scss
415
464
  - app/assets/stylesheets/alchemy/login.css.scss
416
465
  - app/assets/stylesheets/alchemy/menubar.css.scss
417
466
  - app/assets/stylesheets/alchemy/modules.css.scss
@@ -461,6 +510,7 @@ files:
461
510
  - app/helpers/alchemy/essences_helper.rb
462
511
  - app/helpers/alchemy/pages_helper.rb
463
512
  - app/helpers/alchemy/pictures_helper.rb
513
+ - app/helpers/alchemy/url_helper.rb
464
514
  - app/mailers/alchemy/messages.rb
465
515
  - app/mailers/alchemy/notifications.rb
466
516
  - app/models/alchemy.rb
@@ -506,20 +556,20 @@ files:
506
556
  - app/views/alchemy/admin/clipboard/insert.js.erb
507
557
  - app/views/alchemy/admin/clipboard/remove.js.erb
508
558
  - app/views/alchemy/admin/contents/_missing.html.erb
509
- - app/views/alchemy/admin/contents/create.js.coffee
559
+ - app/views/alchemy/admin/contents/create.js.erb
510
560
  - app/views/alchemy/admin/contents/destroy.js.coffee
511
561
  - app/views/alchemy/admin/contents/new.html.erb
512
562
  - app/views/alchemy/admin/contents/order.js.erb
513
563
  - app/views/alchemy/admin/dashboard/index.html.erb
514
- - app/views/alchemy/admin/elements/_add_content.html.erb
564
+ - app/views/alchemy/admin/elements/_add_picture.html.erb
515
565
  - app/views/alchemy/admin/elements/_element.html.erb
516
566
  - app/views/alchemy/admin/elements/_element_foot.html.erb
517
567
  - app/views/alchemy/admin/elements/_element_head.html.erb
518
568
  - app/views/alchemy/admin/elements/_elements_select.html.erb
519
569
  - app/views/alchemy/admin/elements/_new_element_form.html.erb
520
- - app/views/alchemy/admin/elements/_picture_editor.html.erb
570
+ - app/views/alchemy/admin/elements/_picture_gallery_editor.html.erb
521
571
  - app/views/alchemy/admin/elements/create.js.erb
522
- - app/views/alchemy/admin/elements/fold.js.coffee
572
+ - app/views/alchemy/admin/elements/fold.js.erb
523
573
  - app/views/alchemy/admin/elements/index.html.erb
524
574
  - app/views/alchemy/admin/elements/list.js.erb
525
575
  - app/views/alchemy/admin/elements/new.html.erb
@@ -530,7 +580,7 @@ files:
530
580
  - app/views/alchemy/admin/essence_files/edit.html.erb
531
581
  - app/views/alchemy/admin/essence_pictures/assign.js.coffee
532
582
  - app/views/alchemy/admin/essence_pictures/crop.html.erb
533
- - app/views/alchemy/admin/essence_pictures/destroy.js.coffee
583
+ - app/views/alchemy/admin/essence_pictures/destroy.js.erb
534
584
  - app/views/alchemy/admin/essence_pictures/edit.html.erb
535
585
  - app/views/alchemy/admin/essence_pictures/save_link.js.erb
536
586
  - app/views/alchemy/admin/essence_pictures/update.js.erb
@@ -574,18 +624,23 @@ files:
574
624
  - app/views/alchemy/admin/partials/_search_form.html.erb
575
625
  - app/views/alchemy/admin/partials/_sub_navigation_tab.html.erb
576
626
  - app/views/alchemy/admin/partials/_upload_form.html.erb
627
+ - app/views/alchemy/admin/pictures/_archive.html.erb
577
628
  - app/views/alchemy/admin/pictures/_archive_overlay.html.erb
578
629
  - app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb
630
+ - app/views/alchemy/admin/pictures/_filter_bar.html.erb
631
+ - app/views/alchemy/admin/pictures/_overlay_picture_list.html.erb
579
632
  - app/views/alchemy/admin/pictures/_picture.html.erb
580
633
  - app/views/alchemy/admin/pictures/_picture_to_assign.html.erb
581
- - app/views/alchemy/admin/pictures/_pictures_list.html.erb
634
+ - app/views/alchemy/admin/pictures/_tag_list.html.erb
582
635
  - app/views/alchemy/admin/pictures/archive_overlay.js.erb
583
636
  - app/views/alchemy/admin/pictures/create.js.erb
637
+ - app/views/alchemy/admin/pictures/edit.html.erb
638
+ - app/views/alchemy/admin/pictures/edit_multiple.html.erb
584
639
  - app/views/alchemy/admin/pictures/flush.js.erb
585
640
  - app/views/alchemy/admin/pictures/index.html.erb
641
+ - app/views/alchemy/admin/pictures/index.js.erb
586
642
  - app/views/alchemy/admin/pictures/new.html.erb
587
643
  - app/views/alchemy/admin/pictures/show_in_window.html.erb
588
- - app/views/alchemy/admin/pictures/update.js.erb
589
644
  - app/views/alchemy/admin/resources/_form.html.erb
590
645
  - app/views/alchemy/admin/resources/_resource.html.erb
591
646
  - app/views/alchemy/admin/resources/_table.html.erb
@@ -696,7 +751,9 @@ files:
696
751
  - app/views/alchemy/pictures/thumbnail.png.flexi
697
752
  - app/views/alchemy/pictures/zoom.jpg.flexi
698
753
  - app/views/alchemy/pictures/zoom.png.flexi
754
+ - app/views/alchemy/search/_form.html.erb
699
755
  - app/views/alchemy/search/_result.html.erb
756
+ - app/views/alchemy/search/_results.html.erb
700
757
  - app/views/alchemy/user_sessions/leave.html.erb
701
758
  - app/views/alchemy/user_sessions/login.html.erb
702
759
  - app/views/alchemy/user_sessions/logout.html.erb
@@ -719,6 +776,7 @@ files:
719
776
  - config/authorization_rules.rb
720
777
  - config/initializers/cache_storage.rb
721
778
  - config/initializers/kaminari_config.rb
779
+ - config/initializers/localeapp.rb
722
780
  - config/locales/alchemy.de.yml
723
781
  - config/locales/alchemy.en.yml
724
782
  - config/routes.rb
@@ -762,6 +820,10 @@ files:
762
820
  - db/migrate/20120216135355_add_country_code_to_languages.rb
763
821
  - db/migrate/20120608085509_create_alchemy_essence_selects.rb
764
822
  - db/migrate/20120611221734_create_alchemy_essence_booleans.rb
823
+ - db/migrate/20120704181529_add_upload_hash_to_alchemy_picture.rb
824
+ - db/migrate/20120705214247_acts_as_taggable_on_migration.rb
825
+ - db/migrate/20120728185830_add_cached_tag_list_to_alchemy_pictures.rb
826
+ - db/migrate/20120831135441_set_alchemy_languages_country_code_default_to_empty_string.rb
765
827
  - lib/alchemy/auth_engine.rb
766
828
  - lib/alchemy/authentication_helpers.rb
767
829
  - lib/alchemy/capistrano.rb
@@ -819,8 +881,11 @@ files:
819
881
  - spec/controllers/admin/pages_controller_spec.rb
820
882
  - spec/controllers/admin/resources_controller_spec.rb
821
883
  - spec/controllers/admin/trash_controller_spec.rb
884
+ - spec/controllers/attachments_controller_spec.rb
822
885
  - spec/controllers/base_controller_spec.rb
886
+ - spec/controllers/elements_controller_spec.rb
823
887
  - spec/controllers/pages_controller_spec.rb
888
+ - spec/controllers/pictures_controller_spec.rb
824
889
  - spec/dummy/Rakefile
825
890
  - spec/dummy/app/assets/javascripts/application.js
826
891
  - spec/dummy/app/assets/stylesheets/application.css
@@ -846,8 +911,6 @@ files:
846
911
  - spec/dummy/config/initializers/secret_token.rb
847
912
  - spec/dummy/config/initializers/session_store.rb
848
913
  - spec/dummy/config/initializers/wrap_parameters.rb
849
- - spec/dummy/config/locales/en.yml
850
- - spec/dummy/config/locales/fo.yml
851
914
  - spec/dummy/config/routes.rb
852
915
  - spec/dummy/db/schema.rb
853
916
  - spec/dummy/lib/assets/.gitkeep
@@ -867,13 +930,16 @@ files:
867
930
  - spec/helpers/essences_helper_spec.rb
868
931
  - spec/helpers/pages_helper_spec.rb
869
932
  - spec/helpers/pictures_helper_spec.rb
870
- - spec/helpers/url_helpers_spec.rb
933
+ - spec/helpers/url_helper_spec.rb
934
+ - spec/integration/admin/link_overlay_spec.rb
871
935
  - spec/integration/admin/modules_integration_spec.rb
872
936
  - spec/integration/admin/pages_controller_spec.rb
937
+ - spec/integration/admin/picture_library_integration_spec.rb
873
938
  - spec/integration/admin/resources_integration_spec.rb
874
939
  - spec/integration/navigation_spec.rb
875
940
  - spec/integration/pages_controller_spec.rb
876
941
  - spec/integration/security_spec.rb
942
+ - spec/integration/translation_integration_spec.rb
877
943
  - spec/javascripts/alchemy/link_overlay_spec.js.coffee
878
944
  - spec/javascripts/alchemy_integration_spec.coffee
879
945
  - spec/javascripts/fixtures/select.html
@@ -883,6 +949,7 @@ files:
883
949
  - spec/javascripts/helpers/test_responses/test_responses.js
884
950
  - spec/javascripts/spec.css
885
951
  - spec/javascripts/spec.js
952
+ - spec/libraries/essence_spec.rb
886
953
  - spec/libraries/resource_spec.rb
887
954
  - spec/libraries/resources_helper_spec.rb
888
955
  - spec/models/clipboard_spec.rb
@@ -893,24 +960,26 @@ files:
893
960
  - spec/models/essence_richtext_spec.rb
894
961
  - spec/models/essence_select_spec.rb
895
962
  - spec/models/language_spec.rb
963
+ - spec/models/page_layout_spec.rb
896
964
  - spec/models/page_spec.rb
897
965
  - spec/models/picture_spec.rb
898
966
  - spec/models/resource_spec.rb
899
967
  - spec/models/user_spec.rb
900
- - spec/page_layout_spec.rb
901
968
  - spec/routing_spec.rb
902
969
  - spec/spec_helper.rb
903
970
  - spec/support/alchemy/controller_hacks.rb
904
971
  - spec/support/alchemy/specs_helpers.rb
905
972
  - spec/support/alchemy/test_tweaks.rb
973
+ - spec/support/image.png
974
+ - spec/url_helpers_spec.rb
906
975
  - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
907
976
  - vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.min.js
908
977
  - vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js
909
- - vendor/assets/javascripts/jquery_plugins/jquery.in-place-edit.js
910
- - vendor/assets/javascripts/jquery_plugins/jquery.sb.min.js
911
978
  - vendor/assets/javascripts/jquery_plugins/jquery.scrollTo-1.4.2-min.js
979
+ - vendor/assets/javascripts/jquery_plugins/jquery.selectBoxIt.js
912
980
  - vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js
913
981
  - vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js
982
+ - vendor/assets/javascripts/jquery_plugins/preloadCssImages.jQuery_v5.js
914
983
  - vendor/assets/javascripts/swfupload/SWFObject License.txt
915
984
  - vendor/assets/javascripts/swfupload/swfupload.cookies.js
916
985
  - vendor/assets/javascripts/swfupload/swfupload.js
@@ -1020,12 +1089,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
1020
1089
  required_rubygems_version: !ruby/object:Gem::Requirement
1021
1090
  none: false
1022
1091
  requirements:
1023
- - - ! '>='
1092
+ - - ! '>'
1024
1093
  - !ruby/object:Gem::Version
1025
- version: '0'
1026
- segments:
1027
- - 0
1028
- hash: 1586942543063871905
1094
+ version: 1.3.1
1029
1095
  requirements:
1030
1096
  - ImageMagick (libmagick), v6.6 or greater.
1031
1097
  rubyforge_project:
@@ -1043,8 +1109,11 @@ test_files:
1043
1109
  - spec/controllers/admin/pages_controller_spec.rb
1044
1110
  - spec/controllers/admin/resources_controller_spec.rb
1045
1111
  - spec/controllers/admin/trash_controller_spec.rb
1112
+ - spec/controllers/attachments_controller_spec.rb
1046
1113
  - spec/controllers/base_controller_spec.rb
1114
+ - spec/controllers/elements_controller_spec.rb
1047
1115
  - spec/controllers/pages_controller_spec.rb
1116
+ - spec/controllers/pictures_controller_spec.rb
1048
1117
  - spec/dummy/Rakefile
1049
1118
  - spec/dummy/app/assets/javascripts/application.js
1050
1119
  - spec/dummy/app/assets/stylesheets/application.css
@@ -1070,8 +1139,6 @@ test_files:
1070
1139
  - spec/dummy/config/initializers/secret_token.rb
1071
1140
  - spec/dummy/config/initializers/session_store.rb
1072
1141
  - spec/dummy/config/initializers/wrap_parameters.rb
1073
- - spec/dummy/config/locales/en.yml
1074
- - spec/dummy/config/locales/fo.yml
1075
1142
  - spec/dummy/config/routes.rb
1076
1143
  - spec/dummy/db/schema.rb
1077
1144
  - spec/dummy/lib/assets/.gitkeep
@@ -1091,13 +1158,16 @@ test_files:
1091
1158
  - spec/helpers/essences_helper_spec.rb
1092
1159
  - spec/helpers/pages_helper_spec.rb
1093
1160
  - spec/helpers/pictures_helper_spec.rb
1094
- - spec/helpers/url_helpers_spec.rb
1161
+ - spec/helpers/url_helper_spec.rb
1162
+ - spec/integration/admin/link_overlay_spec.rb
1095
1163
  - spec/integration/admin/modules_integration_spec.rb
1096
1164
  - spec/integration/admin/pages_controller_spec.rb
1165
+ - spec/integration/admin/picture_library_integration_spec.rb
1097
1166
  - spec/integration/admin/resources_integration_spec.rb
1098
1167
  - spec/integration/navigation_spec.rb
1099
1168
  - spec/integration/pages_controller_spec.rb
1100
1169
  - spec/integration/security_spec.rb
1170
+ - spec/integration/translation_integration_spec.rb
1101
1171
  - spec/javascripts/alchemy/link_overlay_spec.js.coffee
1102
1172
  - spec/javascripts/alchemy_integration_spec.coffee
1103
1173
  - spec/javascripts/fixtures/select.html
@@ -1107,6 +1177,7 @@ test_files:
1107
1177
  - spec/javascripts/helpers/test_responses/test_responses.js
1108
1178
  - spec/javascripts/spec.css
1109
1179
  - spec/javascripts/spec.js
1180
+ - spec/libraries/essence_spec.rb
1110
1181
  - spec/libraries/resource_spec.rb
1111
1182
  - spec/libraries/resources_helper_spec.rb
1112
1183
  - spec/models/clipboard_spec.rb
@@ -1117,14 +1188,16 @@ test_files:
1117
1188
  - spec/models/essence_richtext_spec.rb
1118
1189
  - spec/models/essence_select_spec.rb
1119
1190
  - spec/models/language_spec.rb
1191
+ - spec/models/page_layout_spec.rb
1120
1192
  - spec/models/page_spec.rb
1121
1193
  - spec/models/picture_spec.rb
1122
1194
  - spec/models/resource_spec.rb
1123
1195
  - spec/models/user_spec.rb
1124
- - spec/page_layout_spec.rb
1125
1196
  - spec/routing_spec.rb
1126
1197
  - spec/spec_helper.rb
1127
1198
  - spec/support/alchemy/controller_hacks.rb
1128
1199
  - spec/support/alchemy/specs_helpers.rb
1129
1200
  - spec/support/alchemy/test_tweaks.rb
1201
+ - spec/support/image.png
1202
+ - spec/url_helpers_spec.rb
1130
1203
  has_rdoc: