alchemy_cms 2.1.beta6 → 2.1.rc2

data/app/assets/javascripts/alchemy/alchemy.preview_window.js

@@ -0,0 +1,98 @@
+if (typeof(Alchemy) === 'undefined') {
+	var Alchemy = {};
+}
+
+(function($) {
+
+	var PreviewWindow = {};
+	$.extend(Alchemy, PreviewWindow);
+
+	Alchemy.PreviewWindow = {
+
+		init : function (url, title) {
+			var $iframe = $('#alchemyPreviewWindow');
+			if ($iframe.length === 0) {
+				$iframe = $('<iframe src="'+url+'" id="alchemyPreviewWindow" frameborder="0"></iframe>');
+				$iframe.load(function() {
+					$('#preview_load_info').hide();
+				});
+				$iframe.css({'background-color': '#ffffff'});
+				Alchemy.PreviewWindow.currentWindow = $iframe.dialog({
+					modal: false,
+					title: title,
+					width: $(window).width() - 504,
+					height: $(window).height() - 78,
+					minWidth: 600,
+					minHeight: 300,
+					show: "fade",
+					hide: "fade",
+					position: [70, 84],
+					autoResize: true,
+					closeOnEscape: false,
+					create: function() {
+						var $spinner = $('<img src="/assets/alchemy/ajax_loader.gif" alt="" id="preview_load_info" />');
+						$('#ui-dialog-title-alchemyPreviewWindow').after($spinner);
+						var $reload = $('<a href="#" class="ui-dialog-titlebar-refresh ui-corner-all" role="button"></a>');
+						$reload.append('<span class="ui-icon ui-icon-refresh">reload</span>');
+						$('#ui-dialog-title-alchemyPreviewWindow').after($reload);
+						$reload.click(Alchemy.reloadPreview);
+					},
+					close: function(event, ui) { 
+						Alchemy.PreviewWindow.button.enable();
+					},
+					open: function (event, ui) { 
+						$(this).css({width: '100%'}); 
+						Alchemy.PreviewWindow.button.disable();
+						Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
+					}
+				}).dialogExtend({
+					"maximize" : true,
+					"dblclick" : "maximize",
+					"events" : {
+						beforeMaximize: function(evt, dlg) {
+							Alchemy.previewWindowPosition = $('#alchemyPreviewWindow').dialog('widget').offset();
+							Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
+						},
+						maximize : function(evt, dlg) {
+							$('#alchemyPreviewWindow').css({width: "100%"});
+						},
+						restore : function(evt, dlg) {
+							$('#alchemyPreviewWindow').dialog('widget').css(Alchemy.previewWindowPosition);
+							$('#alchemyPreviewWindow').css({width: Alchemy.previewWindowFrameWidth});
+						} 
+					}
+				});
+			} else {
+				$('#alchemyPreviewWindow').dialog('open');
+			}
+		},
+
+		refresh : function() {
+			var $iframe = $('#alchemyPreviewWindow');
+			$('#preview_load_info').show();
+			$iframe.load(function() {
+				$('#preview_load_info').hide();
+			});
+			$iframe.attr('src', $iframe.attr('src'));
+			return true;
+		},
+
+		button : {
+			enable: function() {
+				$('div#show_preview_window').removeClass('disabled');
+			},
+			disable: function() {
+				$('div#show_preview_window').addClass('disabled');
+			},
+			toggle: function() {
+				$('div#show_preview_window').toggleClass('disabled');
+			}
+		}
+
+	};
+
+	Alchemy.reloadPreview = function() {
+		Alchemy.PreviewWindow.refresh();
+	};
+
+})(jQuery);

data/app/assets/javascripts/alchemy/alchemy.windows.js

@@ -41,180 +41,7 @@ if (typeof(Alchemy) === 'undefined') {
 			}
 		},
 
-		openPreviewWindow : function (url, title) {
-			var $iframe = $('#alchemyPreviewWindow');
-			if ($iframe.length === 0) {
-				$iframe = $('<iframe src="'+url+'" id="alchemyPreviewWindow"></iframe>');
-				$iframe.load(function() {
-					$('#preview_load_info').hide();
-				});
-				$iframe.css({'background-color': '#ffffff'});
-				Alchemy.PreviewWindow = $iframe.dialog({
-					modal: false,
-					title: title,
-					width: $(window).width() - 504,
-					height: $(window).height() - 78,
-					minWidth: 600,
-					minHeight: 300,
-					show: "fade",
-					hide: "fade",
-					position: [70, 84],
-					autoResize: true,
-					closeOnEscape: false,
-					create: function() {
-						var $spinner = $('<img src="/assets/alchemy/ajax_loader.gif" alt="" id="preview_load_info" />');
-						$('#ui-dialog-title-alchemyPreviewWindow').after($spinner);
-						var $reload = $('<a href="#" class="ui-dialog-titlebar-refresh ui-corner-all" role="button"></a>');
-						$reload.append('<span class="ui-icon ui-icon-refresh">reload</span>');
-						$('#ui-dialog-title-alchemyPreviewWindow').after($reload);
-						$reload.click(Alchemy.reloadPreview);
-					},
-					close: function(event, ui) { 
-						Alchemy.PreviewWindowButton.enable();
-					},
-					open: function (event, ui) { 
-						$(this).css({width: '100%'}); 
-						Alchemy.PreviewWindowButton.disable();
-						Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
-					}
-				}).dialogExtend({
-					"maximize" : true,
-					"dblclick" : "maximize",
-					"events" : {
-						beforeMaximize: function(evt, dlg) {
-							Alchemy.previewWindowPosition = $('#alchemyPreviewWindow').dialog('widget').offset();
-							Alchemy.previewWindowFrameWidth = $('#alchemyPreviewWindow').width();
-						},
-						maximize : function(evt, dlg) {
-							$('#alchemyPreviewWindow').css({width: "100%"});
-						},
-						restore : function(evt, dlg) {
-							$('#alchemyPreviewWindow').dialog('widget').css(Alchemy.previewWindowPosition);
-							$('#alchemyPreviewWindow').css({width: Alchemy.previewWindowFrameWidth});
-						} 
-					}
-				});
-			} else {
-				$('#alchemyPreviewWindow').dialog('open');
-			}
-			Alchemy.PreviewWindow.refresh = function () {
-				var $iframe = $('#alchemyPreviewWindow');
-				$('#preview_load_info').show();
-				$iframe.load(function() {
-					$('#preview_load_info').hide();
-				});
-				$iframe.attr('src', $iframe.attr('src'));
-				return true;
-			};
-		},
-
-		PreviewWindowExists : function() {
-		  if (Alchemy.PreviewWindow) {
-				return true;
-		  } else {
-				return false;
-			}
-		},
-
-		reloadPreview : function() {
-			Alchemy.PreviewWindow.refresh();
-		},
-
-		ElementsWindowButton : {
-			enable: function() {
-				$('div#show_element_window').removeClass('disabled');
-			},
-			disable: function() {
-				$('div#show_element_window').addClass('disabled');
-			},
-			toggle: function() {
-				$('div#show_element_window').toggleClass('disabled');
-			}
-		},
-
-		PreviewWindowButton : {
-			enable: function() {
-				$('div#show_preview_window').removeClass('disabled');
-			},
-			disable: function() {
-				$('div#show_preview_window').addClass('disabled');
-			},
-			toggle: function() {
-				$('div#show_preview_window').toggleClass('disabled');
-			}
-		},
-
-		openElementsWindow : function (path, options, callback) {
-			var $dialog = $('<div style="display: none" id="alchemyElementWindow"></div>');
-			var closeCallback = function() {
-				$dialog.dialog("destroy");
-				$('#alchemyElementWindow').remove();
-				Alchemy.ElementsWindowButton.enable();
-			};
-			$dialog.html(Alchemy.getOverlaySpinner({x: 420, y: 300}));
-			Alchemy.ElementsWindow = $dialog.dialog({
-				modal: false, 
-				minWidth: 422, 
-				minHeight: 300,
-				height: $(window).height() - 90,
-				title: options.texts.title,
-				show: "fade",
-				hide: "fade",
-				position: [$(window).width() - 428, 84],
-				closeOnEscape: false,
-				create: function() {
-					$dialog.before(Alchemy.createElementWindowToolbar(options.toolbarButtons));
-				},
-				open: function(event, ui) {
-					Alchemy.ElementsWindowButton.disable();
-					$.ajax({
-						url: path,
-						success: function(data, textStatus, XMLHttpRequest) {
-							$dialog.html(data);
-							Alchemy.ButtonObserver('#alchemyElementWindow .button');
-							callback.call();
-						},
-						error: function(XMLHttpRequest, textStatus, errorThrown) {
-							Alchemy.AjaxErrorHandler($dialog, XMLHttpRequest.status, textStatus, errorThrown);
-						}
-					});
-				},
-				beforeClose : function() {
-					if (Alchemy.isPageDirty()) {
-						Alchemy.openConfirmWindow({
-							title: options.texts.dirtyTitle,
-							message: options.texts.dirtyMessage,
-							okLabel: options.texts.okLabel,
-							cancelLabel: options.texts.cancelLabel,
-							okCallback: closeCallback
-						});
-						return false;
-					} else {
-						return true;
-					}
-				},
-				close: closeCallback
-			});
-		},
-
-		createElementWindowToolbar : function(buttons) {
-			var $toolbar = $('<div id="overlay_toolbar"></div>'), btn;
-			for (i = 0; i < buttons.length; i++) {
-				btn = buttons[i];
-				$toolbar.append(
-					Alchemy.createToolbarButton({
-						buttonTitle: btn.title, 
-						buttonLabel: btn.label, 
-						iconClass: btn.iconClass,
-						onClick: btn.onClick,
-						buttonId: btn.buttonId
-					})
-				);
-			}
-			return $toolbar;
-		},
-
-		createToolbarButton : function(options) {
+		ToolbarButton : function(options) {
 			var $btn = $('<div class="button_with_label"></div>'), $lnk;
 			if (options.buttonId) $btn.attr({'id': options.buttonId});
 			$lnk = $('<a title="'+options.buttonTitle+'" class="icon_button"></a>');

data/app/assets/javascripts/alchemy/menubar.js

@@ -0,0 +1,2 @@
+//= require alchemy/alchemy.jquery_loader
+//= require alchemy/alchemy.menubar

data/app/assets/javascripts/alchemy/preview.js

@@ -1 +1,2 @@
-//= require alchemy/alchemy.preview
+//= require alchemy/alchemy.jquery_loader
+//= require alchemy/alchemy.preview

data/app/assets/stylesheets/alchemy/_defaults.scss

@@ -133,16 +133,15 @@ $default-border: 1px solid #AFAFAF;
 }
 
 @mixin rounded-search-field {
-  $radius: 12px;
-  border-radius: $radius;
-  -o-border-radius: $radius;
-  -ms-border-radius: $radius;
-  -moz-border-radius: $radius;
-  -webkit-border-radius: $radius;
+	$radius: 12px;
+	border-radius: $radius;
+	-o-border-radius: $radius;
+	-ms-border-radius: $radius;
+	-moz-border-radius: $radius;
+	-webkit-border-radius: $radius;
 }
 
 @mixin opacity($opacity) {
 	opacity: $opacity/100;
-	filter: alpha(opacity = $opacity);
-	-ms-filter: 'alpha(opacity=$opacity)';
+	filter: unquote("progid:DXImageTransform.Microsoft.Alpha(Opacity=#{$opacity})");
 }

data/app/assets/stylesheets/alchemy/base.css.scss

@@ -218,6 +218,16 @@ div.pagination span.gap {
 
 /* @end */
 
+#login_box {
+	height: 310px;
+	width: 394px;
+	margin-top: -210px;
+	margin-left: -197px;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+}
+
 #login table tbody tr td.label {
 	width: 155px;
 	text-align: right;
@@ -233,22 +243,6 @@ form#login.new_user_session {
 	text-align: right;
 }
 
-#login .thin_border {
-	width: 195px;
-	float: right;
-}
-
-#login_notice {
-	overflow: auto;
-	padding: 2*$default-padding;
-	background-color: #fff;
-	text-align: left;
-}
-
-#login label {
-	margin-right: 8px;
-}
-
 .float_right {
   float: right;
 }
@@ -359,10 +353,10 @@ div#top_menu {
 #main_content {
 	background-color: $light-gray;
 	position: absolute;
-	top: 90px;
 	left: 65px;
 	z-index: 0;
 	width: 93%;
+	height: 100%;
 }
 
 div#user_info {
@@ -471,7 +465,7 @@ div.widget p {
 /* @end */
 
 div#alchemy_greeting {
-	width: 100%;
+	width: 370px;
 	margin-right: auto;
 	margin-left: auto;
 	padding: 2*$default-padding;
@@ -522,6 +516,7 @@ a.drop_down_select img {
 	text-align: left;
 	@include rounded-search-field;
 	padding: 3px 24px 2px;
+	height: 19px;
 }
 
 #flags a img {
@@ -541,7 +536,7 @@ a.drop_down_select img {
 .js_filter_field_box .js_filter_field_clear {
 	width: 15px;
 	height: 15px;
-	background: image-url('alchemy/icons.png') no-repeat 0 -104px;
+	background: image-url('alchemy/icons.png') no-repeat 0 -70px;
 	position: absolute;
 	right: 8px;
 	top: 4px;
@@ -1547,7 +1542,6 @@ table.window_form {
 
 table td, table th {
 	padding: $default-padding;
-	white-space: nowrap;
 }
 
 table th {
@@ -1823,7 +1817,7 @@ td.input, td.submit, td.select {
 }
 
 td.value {
-	text-indent: 4px;
+	padding-left: 2*$default-padding;
 }
 
 td.label {
@@ -1833,6 +1827,10 @@ td.label {
 	line-height: 6*$default-padding;
 }
 
+td.label.mandatory:after {
+	content: '*';
+}
+
 td.heading {
 	padding: $default-padding 0;
 	font-weight: bold;
@@ -2709,7 +2707,7 @@ div#image_assign_filter_and_image_sizing {
 	@include rounded-corner;
 }
 
-#picture_archive {
+#pictures {
 	padding: 2*$default-padding;
 	border: $default-border;
 	@include rounded-corner;
@@ -2976,14 +2974,14 @@ div#image_assign_filter_and_image_sizing form input.button {
 	float: right;
 }
 
-div.assign_file_file {
+li.assign_file_file {
+	display: block;
 	text-align: center;
-	background-color: white;
 	width: 100%;
 	margin-bottom: 4px;
 }
 
-#assign_file_list div.assign_file_file a {
+#assign_file_list li.assign_file_file a {
 	overflow: hidden;
 	display: block;
 	padding-right: 4px;
@@ -2994,6 +2992,7 @@ div.assign_file_file {
 div.assign_file_file_icon {
 	float: left;
 	margin: $default-margin;
+	line-height: normal;
 }
 
 #alchemy .ui-dialog-content a img {
@@ -3111,7 +3110,7 @@ div.elements_for_page {
 	top: 0;
 	z-index: 15;
 	background-color: white;
-	width: 206px;
+	width: 240px;
 	padding: $default-padding;
 	border: 1px solid #9c9d9c;
 	-webkit-box-shadow: #9ea09f 0px 0px 4px;
@@ -3165,10 +3164,13 @@ a.close_elements_from_page_selector {
 	float: none;
 }
 
-div#assign_file_list {
+ul#assign_file_list {
 	margin-bottom: 8px;
 	margin-top: 8px;
 	clear: both;
+	height: 280px;
+	overflow-x: hidden;
+	overflow-y: auto;
 }
 
 ul#sitemap li .sitemap_sitename.selected_page a{
@@ -3251,12 +3253,6 @@ select#url_protocol.medium {
 	margin: 0;
 }
 
-#alchemy .ui-dialog-content select.very_long,
-#alchemy .ui-dialog-content .selectbox.very_long,
-#alchemy .ui-dialog-content .selectbox.very_long .display {
-	width: 170px;
-}
-
 #alchemy .ui-dialog-content .short {
 	width: 40px;
 }