[livejournal] r19581: LJSUP-9251: Fixes

U   trunk/htdocs/js/ck/contents.css
U   trunk/htdocs/js/ck/plugins/livejournal/plugin.js

Modified: trunk/htdocs/js/ck/contents.css
===================================================================
--- trunk/htdocs/js/ck/contents.css	2011-08-03 07:51:07 UTC (rev 19580)
+++ trunk/htdocs/js/ck/contents.css	2011-08-03 09:45:28 UTC (rev 19581)
@@ -47,7 +47,6 @@
 lj\:cut,
 lj-cut {
 	display: block;
-	min-height: 12px;
 	border: #000 1px dotted;
 	background-color: #d2d2d2;
 }
@@ -82,6 +81,21 @@
 	background-color: #d2d2d2;
 	font-style: italic;
 }
+/* Note popup */
+.note {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	padding: 8px;
+	background: #FFFFDD;
+	border: 1px solid #FFCC33;
+	color: #000;
+	display:block;
+	}
+	.note A {
+		color: #555;
+		cursor:pointer;
+		}
 /* LJ Like buttons */
 .lj-like {
 	overflow: hidden;

Modified: trunk/htdocs/js/ck/plugins/livejournal/plugin.js
===================================================================
--- trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2011-08-03 07:51:07 UTC (rev 19580)
+++ trunk/htdocs/js/ck/plugins/livejournal/plugin.js	2011-08-03 09:45:28 UTC (rev 19581)
@@ -5,7 +5,7 @@
 			label: top.CKLang.LJLike_button_facebook,
 			id: 'facebook',
 			abbr: 'fb',
-			html: '<div class="lj-like-item lj-like-gag fb">' + top.CKLang.LJLike_button_facebook + '</div>',
+			html: '<span class="lj-like-item lj-like-gag fb">' + top.CKLang.LJLike_button_facebook + '</span>',
 			htmlOpt: '<li class="like-fb"><input type="checkbox" id="like-fb" /><label for="like-fb">' + top.CKLang
 				.LJLike_button_facebook + '</label></li>'
 		},
@@ -13,7 +13,7 @@
 			label: top.CKLang.LJLike_button_twitter,
 			id: 'twitter',
 			abbr: 'tw',
-			html: '<div class="lj-like-item lj-like-gag tw">' + top.CKLang.LJLike_button_twitter + '</div>',
+			html: '<span class="lj-like-item lj-like-gag tw">' + top.CKLang.LJLike_button_twitter + '</span>',
 			htmlOpt: '<li class="like-tw"><input type="checkbox" id="like-tw" /><label for="like-tw">' + top.CKLang
 				.LJLike_button_twitter + '</label></li>'
 		},
@@ -21,7 +21,7 @@
 			label: top.CKLang.LJLike_button_google,
 			id: 'google',
 			abbr: 'go',
-			html: '<div class="lj-like-item lj-like-gag go">' + top.CKLang.LJLike_button_google + '</div>',
+			html: '<span class="lj-like-item lj-like-gag go">' + top.CKLang.LJLike_button_google + '</span>',
 			htmlOpt: '<li class="like-go"><input type="checkbox" id="like-go" /><label for="like-go">' + top.CKLang
 				.LJLike_button_google + '</label></li>'
 		}
@@ -32,7 +32,7 @@
 			label: top.CKLang.LJLike_button_vkontakte,
 			id: 'vkontakte',
 			abbr: 'vk',
-			html: '<div class="lj-like-item lj-like-gag vk">' + top.CKLang.LJLike_button_vkontakte + '</div>',
+			html: '<span class="lj-like-item lj-like-gag vk">' + top.CKLang.LJLike_button_vkontakte + '</span>',
 			htmlOpt: '<li class="like-vk"><input type="checkbox" id="like-vk" /><label for="like-vk">' + top.CKLang
 				.LJLike_button_vkontakte + '</label></li>'
 		});
@@ -42,7 +42,7 @@
 		label: top.CKLang.LJLike_button_give,
 		id: 'livejournal',
 		abbr: 'lj',
-		html: '<div class="lj-like-item lj-like-gag lj">' + top.CKLang.LJLike_button_give + '</div>',
+		html: '<span class="lj-like-item lj-like-gag lj">' + top.CKLang.LJLike_button_give + '</span>',
 		htmlOpt: '<li class="like-lj"><input type="checkbox" id="like-lj" /><label for="like-lj">' + top.CKLang
 			.LJLike_button_give + '</label></li>'
 	});
@@ -942,6 +942,7 @@
 						}
 
 						fakeElement.attributes.buttons = attr.join(',');
+						fakeElement.attributes.style = element.attributes.style;
 						return fakeElement;
 					},
 					'lj': function(element){
@@ -1020,10 +1021,13 @@
 
 			dataProcessor.htmlFilter.addRules({
 				elements: {
-					'div': function(element){
+					div: function(element){
 						if(element.attributes['class'] == 'lj-like'){
 							var ljLikeNode = new CKEDITOR.htmlParser.element('lj-like');
 							ljLikeNode.attributes.buttons = element.attributes.buttons;
+							if(element.attributes.style){
+								ljLikeNode.attributes.style = element.attributes.style;
+							}
 							ljLikeNode.isEmpty = true;
 							ljLikeNode.isOptionalClose = true;
 							return ljLikeNode;