new popups need new js to drive them. bah

Oleg committed Jun 01, 2011

commit 0d0df036a583654dd8910a4d14ee19904c44aee2

Showing 3 changed files with 41 additions and 9 deletions

app/assets/javascripts/comfortable_mexican_sofa/wymeditor/iframe/default/wymiframe.css +5 -0

@@	@@ -33,3 +33,8 @@ h5 { background-image: url(lbl-h5.png); }
	h6 { background-image: url(lbl-h6.png); }
	blockquote { background-image: url(lbl-blockquote.png); }
	pre { background-image: url(lbl-pre.png); }
+
+	/* Custom Classes */
+	p.align_left { text-align: left }
+	p.align_center { text-align: center }
+	p.align_right { text-align: right }
	\ No newline at end of file

app/assets/javascripts/comfortable_mexican_sofa/wymeditor/jquery.wymeditor.cms.js +27 -4

@@	@@ -29,9 +29,9 @@ var cms_wym_options = {
	],

	classesItems: [
-	{ 'name': 'AlignLeft', 'title': 'Align_Left', 'css': 'align_left' },
-	{ 'name': 'AlignCenter', 'title': 'Align_Center', 'css': 'align_center' },
-	{ 'name': 'AlignRight', 'title': 'Align_Left', 'css': 'align_right' }
+	{ 'name': 'align_left', 'title': 'Align_Left', 'expr': '*' },
+	{ 'name': 'align_center', 'title': 'Align_Center', 'expr': '*' },
+	{ 'name': 'align_right', 'title': 'Align_Left', 'expr': '*' }
	],

	boxHtml: '<div class="wym_box">'
@@	@@ -62,7 +62,30 @@ var cms_wym_options = {
	+ '<textarea class="wym_html_val code"></textarea>'
	+ '</div>',

-	dialogLinkHtml: 'Link Dialog',
+	dialogLinkHtml: '<form>'
+	+ '<input type="hidden" class="wym_dialog_type" value="' + WYMeditor.DIALOG_LINK + '"/>'
+	+ '<div class="form_element">'
+	+ '<div class="label">'
+	+ '<label>{URL}</label>'
+	+ '</div>'
+	+ '<div class="value">'
+	+ '<input type="text" class="wym_href"/>'
+	+ '</div>'
+	+ '</div>'
+	+ '<div class="form_element">'
+	+ '<div class="label">'
+	+ '<label>{Title}</label>'
+	+ '</div>'
+	+ '<div class="value">'
+	+ '<input type="text" class="wym_title"/>'
+	+ '</div>'
+	+ '</div>'
+	+ '<div class="form_element submit_element">'
+	+ '<div class="value">'
+	+ '<input class="wym_submit" name="commit" type="button" value="{Submit}" />'
+	+ '</div>'
+	+ '</div>'
+	+ '</form>',
	dialogImageHtml: 'Image Dialog',
	dialogTableHtml: 'Table Dialog',
	dialogPasteHtml: 'Paste Dialog'

app/assets/stylesheets/comfortable_mexican_sofa/widgets.css +9 -5

@@	@@ -1,9 +1,13 @@
	/* -- Dialog Box --------------------------------------------------------- */
+	.ui-dialog {
+	border: 1px solid #252525;
+	border-radius: 5px;
+	}
	#cms_dialog {
-	border: 4px solid #9f9f9f;
+	border: 5px solid #9f9f9f;
	border-radius: 5px;
	background-color: #d8d8d8;
-	padding: 10px;
+	padding: 30px 15px 15px 15px;
	}
	.ui-widget-overlay {
	position: absolute;
@@	@@ -62,9 +66,9 @@ a.ui-dialog-titlebar-close {
	.wym_box .wym_toolbar li.wym_tools_paste a { background-position: -260px 0px }
	.wym_box .wym_toolbar li.wym_tools_html a { background-position: -280px 0px }

-	.wym_box .wym_toolbar li.wym_classes_AlignLeft a { background-position: -300px 0px }
-	.wym_box .wym_toolbar li.wym_classes_AlignCenter a { background-position: -320px 0px }
-	.wym_box .wym_toolbar li.wym_classes_AlignRight a { background-position: -340px 0px }
+	.wym_box .wym_toolbar li.wym_classes_align_left a { background-position: -300px 0px }
+	.wym_box .wym_toolbar li.wym_classes_align_center a { background-position: -320px 0px }
+	.wym_box .wym_toolbar li.wym_classes_align_right a { background-position: -340px 0px }

	.wym_box .wym_html,
	.wym_box .wym_iframe {