alchemy_cms 2.0.rc2 → 2.0.rc3

data/app/views/essences/_essence_file_editor.html.erb

@@ -6,7 +6,7 @@
 		<div class="file_icon">
 		<%- if content.ingredient.nil? -%>
 			<%= link_to_overlay_window("",
-				archive_overlay_admin_attachments_path(
+				admin_attachments_path(
 					:content_id => content.id,
 					:only => options[:file_assign_show_only],
 					:except => options[:file_assign_do_not_show],
@@ -25,12 +25,12 @@
 		<%- end -%>
 		</div>
 		<div class="file_name">
-			<%= content.ingredient.name rescue "&#x2190;" + _('assign_file_from_archive') %>
+			<%= content.ingredient.name rescue ("&#x2190;" + _('assign_file_from_archive')).html_safe %>
 		</div>
 		<%- unless content.ingredient.nil? -%>
 		<div class="essence_file_tools">
 			<%= link_to_overlay_window("",
-				archive_overlay_admin_attachments_path(
+				admin_attachments_path(
 					:content_id => content.id,
 					:only => options[:file_assign_show_only],
 					:except => options[:file_assign_do_not_show],
@@ -52,7 +52,7 @@
 				),
 				{
 					:title => _('edit_file_properties'),
-					:size => '365x150'
+					:size => '400x150'
 				},
 				:class => 'edit_file',
 				:title => _('edit_file_properties')

data/app/views/essences/_essence_picture_editor.html.erb

@@ -1,5 +1,5 @@
 <div id="<%= content_dom_id(content) %>" class="<%= options[:dragable] ? 'essence_picture_editor dragable_picture' : 'essence_picture_editor' %>">
-  <div class="picture_detail">
+  <div class="picture_thumbnail">
     <span class="picture_tool_delete">
     <%= link_to_confirmation_window(
       "",
@@ -26,7 +26,7 @@
     <%- else -%>
     <div class="picture_handle" title="<%= _('drag_to_sort') if options[:dragable] %>"></div>
     <div class="picture_content_spinner">
-      <%= image_tag("alchemy/ajax_loader.gif", :alt => '') %>
+      <%= image_tag("alchemy/image_loader.gif", :alt => '') %>
     </div>
     <div class="picture_image">
       <div class="thumbnail_background">

data/app/views/essences/_essence_picture_tools.html.erb

@@ -13,9 +13,7 @@
 
 <%= link_to_overlay_window(
   render_icon('swap_picture'),
-  url_for(
-    :controller => 'pictures',
-    :action => 'archive_overlay',
+  admin_pictures_path(
     :element_id => content.element,
     :content_id => content,
     :swap => true,

data/assets/javascripts/alchemy.js

@@ -207,7 +207,7 @@ if (typeof(Alchemy) === 'undefined') {
 						url: path,
 						success: function(data, textStatus, XMLHttpRequest) {
 							$dialog.html(data);
-							Alchemy.ButtonObserver('#alchemyElementWindow button.button');
+							Alchemy.ButtonObserver('#alchemyElementWindow .button');
 						},
 						error: function(XMLHttpRequest, textStatus, errorThrown) {
 							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
@@ -821,7 +821,7 @@ if (typeof(Alchemy) === 'undefined') {
 			var $button = $(button), $clone = $button.clone(), width = $button.outerWidth(), text = $button.text();
 			$button.hide();
 			$button.parent().append($clone);
-			$clone.attr({disabled: true})
+			$clone.attr({disabled: true, href: 'javascript:void(0)'})
 			.addClass('disabled cloned-button')
 			.css({width: width})
 			.html('<img src="/images/alchemy/ajax_loader.gif">')

data/assets/stylesheets/alchemy.css

@@ -2021,6 +2021,7 @@ td.role {
 
 #archive_all {
 	padding: 16px;
+	overflow: auto;
 }
 
 #archive_all .padding_left_right {
@@ -2028,40 +2029,6 @@ td.role {
 	padding-left: 8px;
 }
 
-.picture_image {
-	overflow: hidden;
-	position: absolute;
-	z-index: 0;
-	padding: 1px 0 1px 1px;
-}
-
-div#archive_all .picture_detail {
-	padding: 2px 0 0;
-	margin: 0 16px 16px 0;
-	height: 118px;
-	width: 118px;
-}
-
-#archive_all .picture_name {
-	width: 110px;
-	height: 12px;
-	padding-top: 2px;
-	padding-bottom: 2px;
-	display: block;
-	text-align: center;
-	white-space: nowrap;
-	overflow: hidden;
-	position: absolute;
-	bottom: 3px;
-	left: 4px;
-	font-family: "Courier New", Courier, mono;
-	line-height: 11px;
-}
-
-#archive_all .picture_name.rename.hover {
-	cursor: text;
-}
-
 .inplace-edit {
 	background-color: #ededed;
 	position: absolute;
@@ -2115,70 +2082,6 @@ div.spinner {
 	left: 0;
 }
 
-div.image_spinner {
-	background-color: #666;
-}
-
-div.image_spinner img {
-	position: absolute;
-	z-index: 0;
-	top: 32px;
-	left: 40px;
-}
-
-.picture_detail {
-	width: 118px;
-	height: 118px;
-	padding: 2px 0 0;
-	margin: 2px 1px 2px 2px;
-	background-color: #fff;
-	float: left;
-	padding: 3px 0 0;
-	border: 1px solid #c0c0c0;
-	position: relative;
-	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	-o-border-radius: 3px;
-	border-radius: 3px;
-}
-
-.picture_detail .picture_image {
-	text-align: center;
-	margin-left: 3px;
-	margin-bottom: 2px;
-	width: 110px;
-	height: 93px;
-}
-
-#archive_all .picture_image {
-	margin-bottom: 0;
-	position: relative;
-	margin-top: 1px;
-	height: 93px;
-}
-
-#archive_all .picture_detail:hover .picture_tool_delete {
-	display: block;
-}
-
-.picture_image a {
-	cursor: -webkit-zoom-in;
-	cursor: -moz-zoom-in;
-	cursor: -o-zoom-in;
-	cursor: zoom-in;
-}
-
-.thumbnail_background {
-	margin: auto;
-	float: none;
-	display: table-cell;
-	width: 111px;
-	height: 93px;
-	background-color: #666;
-	vertical-align: middle;
-	text-align: center;
-}
-
 .headline_text_editor {
 	overflow: auto;
 	width: 374px;
@@ -2908,7 +2811,7 @@ label.sup {
 	bottom: 3px;
 }
 
-div.assign_image_list_detail {
+/*div.assign_image_list_detail {
 	background-color: #ffffff;
 	text-align: center;
 	float: left;
@@ -2921,72 +2824,175 @@ div.assign_image_list_detail {
 	-moz-border-radius: 3px;
 	-o-border-radius: 3px;
 	border-radius: 3px;
-}
+}*/
 
 #assign_image_list {
 	padding: 8px;
 	overflow: hidden;
 }
 
-#assign_image_list div.assign_image_list_detail.small {
+/* @group Picture Thumbnails */
+
+.picture_thumbnail {
+	padding: 4px;
+	margin: 2px 1px 2px 2px;
+	background-color: #fff;
+	float: left;
+	border: 1px solid #c0c0c0;
+	position: relative;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	-o-border-radius: 3px;
+	border-radius: 3px;
+}
+
+div#archive_all .picture_thumbnail {
+	margin: 0 16px 16px 0;
+}
+
+#archive_all .picture_thumbnail:hover .picture_tool_delete {
+	display: block;
+}
+
+.picture_thumbnail .thumbnail_background {
+	display: table-cell;
+	width: 160px;
+	height: 120px;
+	background-color: #666;
+	text-align: center;
+	vertical-align: middle;
+	padding: 0;
+}
+
+.picture_thumbnail.small .thumbnail_background {
+	width: 80px;
+	height: 60px;
+}
+
+.picture_thumbnail.medium .thumbnail_background {
+	width: 160px;
+	height: 120px;
+}
+
+.picture_thumbnail.large .thumbnail_background {
+	width: 240px;
+	height: 180px;
+}
+
+#archive_all .picture_thumbnail .thumbnail_background {
+	cursor: -webkit-zoom-in;
+	cursor: -moz-zoom-in;
+	cursor: -o-zoom-in;
+	cursor: zoom-in;
+}
+
+.essence_picture_editor .picture_thumbnail {
+	width: 111px;
+	height: 115px;
+	margin: 3px;
+}
+
+.essence_picture_editor .picture_thumbnail .thumbnail_background {
+	width: 111px;
+	height: 93px;
+}
+
+div.picture_thumbnail.small {
 	width: 80px;
 	height: 75px;
 }
 
-#assign_image_list div.assign_image_list_detail.medium {
+div.picture_thumbnail.medium {
 	width: 160px;
-	height: 135px;
+	height: 140px;
 }
 
-#assign_image_list div.assign_image_list_detail.large {
+div.picture_thumbnail.large {
 	width: 240px;
 	height: 195px;
 }
 
+.picture_thumbnail .picture_name {
+	height: 12px;
+	display: block;
+	text-align: center;
+	white-space: nowrap;
+	overflow: hidden;
+	position: absolute;
+	bottom: 1px;
+	left: 0;
+	font-family: "Courier New", Courier, mono;
+	line-height: 11px;
+	padding: 2px 0;
+	margin-right: 4px;
+	margin-left: 4px;
+}
+
+.picture_thumbnail .picture_name.rename.hover {
+	cursor: text;
+}
+
+.picture_thumbnail.small .picture_name {
+	width: 80px;
+}
+
+.picture_thumbnail.medium .picture_name {
+	width: 160px;
+	bottom: 3px;
+}
+
+.picture_thumbnail.large .picture_name {
+	width: 240px;
+}
+
 div.assign_image_list_image {
 	text-align: center;
 	overflow: hidden;
 	position: relative;
 }
 
-.assign_image_list_detail.small div.image_spinner img {
+div.picture_thumbnail.small div.image_spinner img {
 	top: 14px;
 	left: 25px;
 }
 
-.assign_image_list_detail.medium div.image_spinner img {
+div.picture_thumbnail.medium div.image_spinner img {
 	top: 42px;
 	left: 64px;
 }
 
-.assign_image_list_detail.large div.image_spinner img {
+div.picture_thumbnail.large div.image_spinner img {
 	top: 74px;
 	left: 108px;
 }
 
-#assign_image_list div.assign_image_list_image a {
-	width: 160px;
-	height: 120px;
+div.image_spinner {
+	background-color: #666;
+	width: 1px;
+	margin: 4px;
 }
 
-#assign_image_list div.assign_image_list_detail.small div.assign_image_list_image,
-#assign_image_list div.assign_image_list_detail.small div.assign_image_list_image a {
-	width: 80px;
+div.picture_thumbnail.small .image_spinner {
 	height: 60px;
+	margin: 4px;
 }
 
-#assign_image_list div.assign_image_list_detail.medium div.assign_image_list_image,
-#assign_image_list div.assign_image_list_detail.medium div.assign_image_list_image a {
-	width: 160px;
+div.picture_thumbnail.medium .image_spinner {
 	height: 120px;
+	margin: 4px;
 }
 
-#assign_image_list div.assign_image_list_detail.large div.assign_image_list_image,
-#assign_image_list div.assign_image_list_detail.large div.assign_image_list_image a {
-	width: 240px;
+div.picture_thumbnail.large .image_spinner {
 	height: 180px;
 }
 
+div.image_spinner img {
+	position: absolute;
+	z-index: 0;
+	top: 32px;
+	left: 40px;
+}
+
 #assign_image_list div.assign_image_list_image img {
 	border-style: none;
 }
@@ -2995,6 +3001,8 @@ div.assign_image_list_image {
 	
 }
 
+/* @end */
+
 div#errors {
 	margin-bottom: 8px;
 	padding: 8px 8px 4px 28px;
@@ -3077,14 +3085,6 @@ input#user_admin {
 	line-height: 19px;
 }
 
-#assign_image_list div.assign_image_list_detail .picture_to_assign_name {
-	white-space: nowrap;
-	overflow: hidden;
-	padding-top: 3px;
-	display: block;
-	font: 12px "Courier New", Courier, mono;
-}
-
 #alchemy div#overlay_toolbar div#image_assign_filter_and_image_sizing form {
 	float: right;
 	width: 290px;
@@ -3484,11 +3484,6 @@ div#overlay_toolbar {
 	padding: 8px;
 }
 
-#overlay_toolbar div.js_filter_field_box {
-	margin-top: 6px;
-	margin-right: 8px;
-}
-
 div#overlay_toolbar div.toolbar_spacer {
 	float: left;
 	width: 1px;

data/assets/stylesheets/elements.css

@@ -1,3 +1,5 @@
+/* @override http://localhost:3000/stylesheets/alchemy/elements.css */
+
 /* @override 
 	http://0.0.0.0:3000/stylesheets/alchemy/elements.css
 	http://localhost:3000/stylesheets/alchemy/elements.css
@@ -103,13 +105,13 @@ div.element_foot span.element_public {
 
 .add_content {
 	float: left;
-	margin: 2px 1px 2px 2px;
-	width: 118px;
-	padding: 0;
+	margin: 3px;
+	width: 111px;
+	padding: 4px;
 	background-color: #f0e8d7;
 	border: 1px solid #c2baab;
 	border-radius: 3px;
-	height: 121px;
+	height: 115px;
 }
 
 .add_content a {
@@ -129,8 +131,8 @@ div.element_foot span.element_public {
 .add_content a .icon.assign {
 	background: url(/images/alchemy/icons.png) no-repeat -144px -40px;
 	position: absolute;
-	top: 54px;
-	left: 51px;
+	top: 52px;
+	left: 47px;
 }
 
 .element_foot {
@@ -260,41 +262,19 @@ div.picture_gallery_images {
 	overflow: hidden;
 	margin-bottom: 8px;
 	border: 1px inset #cecece;
-	padding-left: 1px;
+	padding-left: 2px;
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 	background-color: #e5dcca;
 }
 
-div.picture_detail div.picture_image img.img_paddingtop {
+div.picture_thumbnail div.picture_image img.img_paddingtop {
 	-moz-user-select: none;
 	-webkit-user-select: none;
 	user-select: none;
 }
 
-.gallery_index div.picture_gallery_images {
-	margin-top: 8px;
-	height: 100%;
-	border: 1px inset #b1b1b1;
-	padding-left: 1px;
-	padding-top: 1px;
-	padding-bottom: 1px;
-	overflow: hidden;
-	margin-bottom: 11px;
-	width: 374px;
-	margin-left: 7px;
-}
-
-form.add_gallery_to_index span {
-	float: left;
-	padding-top: 3px;
-}
-
-form.add_gallery_to_index select {
-	float: left;
-}
-
 /* @group add moclecule */
 
 .new_alchemy_element {
@@ -481,7 +461,7 @@ div.essence_picture_editor .picture_tool_delete {
 	z-index: 2;
 }
 
-div.essence_picture_editor.validation_failed .picture_detail {
+div.essence_picture_editor.validation_failed .picture_thumbnail {
 	border-color: #931f23;
 	-webkit-box-shadow: #931f23 0px 1px 3px;
 	-moz-box-shadow: #931f23 0px 1px 3px;
@@ -511,23 +491,23 @@ div.essence_picture_editor:hover .picture_tool_delete {
 	float: left;
 }
 
-.picture_detail div.missing_image {
+.picture_thumbnail div.missing_image {
 	height: 94px;
 	text-align: center;
 	line-height: 47px;
 	color: #b3b3b3;
 }
 
-.validation_failed .picture_detail div.missing_image {
+.validation_failed .picture_thumbnail div.missing_image {
 	color: #931f23;
 }
 
-.picture_detail div.missing_image img {
+.picture_thumbnail div.missing_image img {
 	position: relative;
 	top: 10px;
 }
 
-.picture_detail .picture_handle {
+.picture_thumbnail .picture_handle {
 	position: absolute;
 	z-index: 1;
 	width: 110px;
@@ -817,10 +797,10 @@ textarea {
 	border: 1px dotted #bba589;
 	background-color: #f0e8d7;
 	float: left;
-	width: 118px;
-	height: 119px;
-	padding: 2px 0 0;
-	margin: 2px 1px 2px 2px;
+	width: 111px;
+	height: 115px;
+	padding: 4px;
+	margin: 3px;
 }
 
 div.element_editor div.error {