Савинцев Егор 🚶 (savintsev_egor) wrote in changelog,
Савинцев Егор 🚶
savintsev_egor
changelog

[livejournal] r18496: LJSUP-7762: Mail.Ru

Committer: esavintcev
LJSUP-7762: Mail.Ru
U   trunk/htdocs/stc/lj_base.css
U   trunk/templates/CommentForm/Author-Anonymous.tmpl
U   trunk/templates/CommentForm/Author-OpenID.tmpl
U   trunk/templates/CommentForm/Author-User.tmpl
U   trunk/templates/CommentForm/Form.tmpl
Modified: trunk/htdocs/stc/lj_base.css
===================================================================
--- trunk/htdocs/stc/lj_base.css	2011-03-10 06:40:38 UTC (rev 18495)
+++ trunk/htdocs/stc/lj_base.css	2011-03-10 08:05:00 UTC (rev 18496)
@@ -1043,28 +1043,304 @@
 			}
 
 
-.replyform TABLE.b-postform-from {
-	margin: 0 0 0.5em;
+/* Comment Form
+--------------------------- */
+.b-postform-login-label {
+	margin: 0;
+	padding: 5px 0;
+	text-align: right;
+	vertical-align: top;
 	}
-.replyform TABLE TD.b-postform-icon,
-.replyform TABLE TD.b-postform-radio {
-	vertical-align: middle !important;
-	text-align: center;
-	}
-	.replyform TABLE TD.b-postform-radio INPUT {
-		margin: 0;
-		}
-.replyform TABLE TD.b-postform-data {
+.b-postform-login-wrapper {
+	margin: 0;
+	padding: 0;
 	text-align: left;
-	white-space: nowrap;
+	vertical-align: top;
 	}
-	.replyform TABLE TD.b-postform-data .i-postform-label {
-		display: inline-block;
+.b-postform-login {
+	overflow: visible;
+	position: static;
+	display: block;
+	margin: 0 0 10px;
+	zoom: 1;
+	}
+.b-postform-login:before,
+.b-postform-login:after {
+	content: ".";
+	display: block;
+	height: 0;
+	overflow: hidden;
+	}
+.b-postform-login:after {
+	clear: both;
+	}
+.b-postform-ljedit {
+	margin: 0;
+	}
+	.b-postform-login-services {
+		position: relative;
+		float: left;
+		display: block;
+		width: 47px;
+		height: 26px;
+		margin: 2px 0 0;
+		padding: 0;
+		border: 1px solid transparent;
+		border-width: 1px 1px 0;
+		-moz-border-radius-topleft: 5px;
+		-moz-border-radius-topright: 5px;
+		border-top-left-radius: 5px;
+		border-top-right-radius: 5px;
+		background: transparent;
 		}
-	.i-postform-disabled {
-		color: #C0C0C0;
+	.b-postform-login-services:hover {
+		border-color: #CCC;
+		background: #FFF;
 		}
+		.b-postform-login-services-items {
+			position: absolute;
+			top: 26px;
+			left: 0;
+			display: block;
+			margin: 0;
+			padding: 0;
+			border: 0;
+			-moz-border-radius: 0;
+			border-radius: 0;
+			font: 11px Arial,sans-serif;
+			white-space: nowrap;
+			z-index: 998;
+			}
+		.b-postform-login-services:hover .b-postform-login-services-items {
+			position: absolute;
+			top: 25px;
+			left: -1px;
+			display: block;
+			margin: 0;
+			padding: 3px 5px;
+			border: 1px solid #CCC;
+			-moz-border-radius: 5px;
+			-moz-border-radius-topleft: 0;
+			border-radius: 5px;
+			border-top-left-radius: 0;
+			background: #FFF !important;
+			color: #222 !important;
+			font: 11px Arial,sans-serif;
+			white-space: nowrap;
+			z-index: 998;
+			}
+			.b-postform-login-services-item {
+				position: static;
+				display: none;
+				margin: 0;
+				}
+			.b-postform-login-services:hover .b-postform-login-services-item {
+				display: block;
+				}
+				BODY .b-postform-login-services-item A:link,
+				BODY .b-postform-login-services-item A:visited {
+					display: block;
+					margin: 0;
+					padding: 3px 7px 3px 3px;
+					-moz-border-radius: 3px;
+					border-radius: 3px;
+					border: 0;
+					background: #FFF;
+					color: #222 !important;
+					text-decoration: none;
+					}
+				BODY .b-postform-login-services-item A:hover,
+				BODY .b-postform-login-services-item A:active {
+					display: block;
+					margin: 0;
+					padding: 3px 7px 3px 3px;
+					-moz-border-radius: 3px;
+					border-radius: 3px;
+					border: 0;
+					background: #C5E1F7;
+					color: #222 !important;
+					text-decoration: none;
+					}
+				BODY .b-postform-login-services-disabled A:link,
+				BODY .b-postform-login-services-disabled A:visited,
+				BODY .b-postform-login-services-disabled A:hover,
+				BODY .b-postform-login-services-disabled A:active {
+					background: #FFF;
+					-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+					filter: alpha(opacity=50);
+					-moz-opacity: 0.5;
+					-khtml-opacity: 0.5;
+					opacity: 0.5;
+					cursor: default;
+					}
+					.b-postform-login-services-item IMG {
+						margin: 0 5px 0 0;
+						vertical-align: -4px;
+						border: 0;
+						}
+			.b-postform-anonymous .b-postform-login-services-anonymous,
+			.b-postform-livejournal .b-postform-login-services-livejournal,
+			.b-postform-user .b-postform-login-services-livejournal,
+			.b-postform-facebook .b-postform-login-services-facebook,
+			.b-postform-twitter .b-postform-login-services-twitter,
+			.b-postform-openid .b-postform-login-services-openid,
+			.b-postform-mailru .b-postform-login-services-mailru {
+				position: absolute;
+				top: -25px;
+				left: 0;
+				display: block;
+				width: 45px;
+				height: 26px;
+				margin: 0;
+				padding: 0 1px;
+				background: transparent;
+				}
+			.b-postform-anonymous .b-postform-login-services:hover .b-postform-login-services-anonymous,
+			.b-postform-livejournal .b-postform-login-services:hover .b-postform-login-services-livejournal,
+			.b-postform-user .b-postform-login-services:hover .b-postform-login-services-livejournal,
+			.b-postform-facebook .b-postform-login-services:hover .b-postform-login-services-facebook,
+			.b-postform-twitter .b-postform-login-services:hover .b-postform-login-services-twitter,
+			.b-postform-openid .b-postform-login-services:hover .b-postform-login-services-openid,
+			.b-postform-mailru .b-postform-login-services:hover .b-postform-login-services-mailru {
+				background: #FFF;
+				}
+				BODY .b-postform-anonymous .b-postform-login-services-anonymous A:link,
+				BODY .b-postform-anonymous .b-postform-login-services-anonymous A:visited,
+				BODY .b-postform-anonymous .b-postform-login-services-anonymous A:hover,
+				BODY .b-postform-anonymous .b-postform-login-services-anonymous A:active,
+				BODY .b-postform-livejournal .b-postform-login-services-livejournal A:link,
+				BODY .b-postform-livejournal .b-postform-login-services-livejournal A:visited,
+				BODY .b-postform-livejournal .b-postform-login-services-livejournal A:hover,
+				BODY .b-postform-livejournal .b-postform-login-services-livejournal A:active,
+				BODY .b-postform-user .b-postform-login-services-livejournal A:link,
+				BODY .b-postform-user .b-postform-login-services-livejournal A:visited,
+				BODY .b-postform-user .b-postform-login-services-livejournal A:hover,
+				BODY .b-postform-user .b-postform-login-services-livejournal A:active,
+				BODY .b-postform-facebook .b-postform-login-services-facebook A:link,
+				BODY .b-postform-facebook .b-postform-login-services-facebook A:visited,
+				BODY .b-postform-facebook .b-postform-login-services-facebook A:hover,
+				BODY .b-postform-facebook .b-postform-login-services-facebook A:active,
+				BODY .b-postform-twitter .b-postform-login-services-twitter A:link,
+				BODY .b-postform-twitter .b-postform-login-services-twitter A:visited,
+				BODY .b-postform-twitter .b-postform-login-services-twitter A:hover,
+				BODY .b-postform-twitter .b-postform-login-services-twitter A:active,
+				BODY .b-postform-openid .b-postform-login-services-openid A:link,
+				BODY .b-postform-openid .b-postform-login-services-openid A:visited,
+				BODY .b-postform-openid .b-postform-login-services-openid A:hover,
+				BODY .b-postform-openid .b-postform-login-services-openid A:active,
+				BODY .b-postform-mailru .b-postform-login-services-mailru A:link,
+				BODY .b-postform-mailru .b-postform-login-services-mailru A:visited,
+				BODY .b-postform-mailru .b-postform-login-services-mailru A:hover,
+				BODY .b-postform-mailru .b-postform-login-services-mailru A:active {
+					display: block;
+					margin: 0;
+					padding: 0;
+					-moz-border-radius: 0;
+					border-radius: 0;
+					border: 0;
+					background: #FFF !important;
+					color: #222 !important;
+					text-decoration: none;
+					}
+					.b-postform-anonymous .b-postform-login-services-anonymous IMG,
+					.b-postform-livejournal .b-postform-login-services-livejournal IMG,
+					.b-postform-user .b-postform-login-services-livejournal IMG,
+					.b-postform-facebook .b-postform-login-services-facebook IMG,
+					.b-postform-twitter .b-postform-login-services-twitter IMG,
+					.b-postform-openid .b-postform-login-services-openid IMG,
+					.b-postform-mailru .b-postform-login-services-mailru IMG {
+						display: block;
+						width: 17px;
+						height: 16px;
+						margin: 0;
+						padding: 1px 20px 1px 6px;
+						border: 1px solid #8A8A8A;
+						-moz-border-radius: 3px;
+						border-radius: 3px;
+						background: #FFF url(/img/showmore-login.gif) no-repeat 26px 1px;
+						cursor: pointer;
+						text-align: left;
+						}
+					.b-postform-anonymous .b-postform-login-services-anonymous .b-postform-login-services-name,
+					.b-postform-livejournal .b-postform-login-services-livejournal .b-postform-login-services-name,
+					.b-postform-user .b-postform-login-services-livejournal .b-postform-login-services-name,
+					.b-postform-facebook .b-postform-login-services-facebook .b-postform-login-services-name,
+					.b-postform-twitter .b-postform-login-services-twitter .b-postform-login-services-name,
+					.b-postform-openid .b-postform-login-services-openid .b-postform-login-services-name,
+					.b-postform-mailru .b-postform-login-services-mailru .b-postform-login-services-name {
+						display: none;
+						}
+	.b-postform-login-details {
+		overflow: auto;
+		position: static;
+		float: none;
+		display: block;
+		margin: 0 0 0 55px;
+		padding: 0;
+		font: 12px/1.1 Arial,sans-serif;
+		}
+		.b-postform-login-item {
+			display: none;
+			position: static;
+			width: auto;
+			height: auto;
+			margin: 0;
+			padding: 0;
+			}
+		.b-postform-anonymous .b-postform-login-anonymous,
+		.b-postform-livejournal .b-postform-login-livejournal,
+		.b-postform-user .b-postform-login-user,
+		.b-postform-facebook .b-postform-login-facebook,
+		.b-postform-twitter .b-postform-login-twitter,
+		.b-postform-openid .b-postform-login-openid,
+		.b-postform-mailru .b-postform-login-mailru,
+		.b-postform-ljedit .b-postform-login-ljedit {
+			display: block;
+			}
+			.b-postform-login-item .b-postform-login-radio,
+			.b-postform-login-item .b-postform-login-service {
+				display: none;
+				}
+			.b-postform-login-item .i-bubble {
+				padding: 6px 8px;
+				font: 11px/1.1 Arial,sans-serif;
+				color: #222;
+				}
+				.b-postform-login-item .i-bubble-arrow,
+				.b-postform-login-item .i-bubble-arrow-border {
+					margin: -6px 0 0;
+					}
+			.b-postform-login-anonymous .b-postform-login-opts {
+				position: static;
+				display: block;
+				margin: 0;
+				padding: 8px 0;
+				}
+			.b-postform-login-user .b-postform-login-opts {
+				position: static;
+				display: block;
+				margin: 0;
+				padding: 8px 0;
+				}
+			.b-postform-login-livejournal .b-postform-login-opts {
+				position: static;
+				display: block;
+				margin: 0;
+				padding: 4px 2px;
+				}
+			.b-postform-login-ljedit .b-postform-login-opts {
+				position: static;
+				display: block;
+				margin: 0;
+				padding: 5px 0;
+				}
 
+
+
+
+
+
+
 .b-loginpage-btns {
 	}
 	.b-loginpage-btns A:link,
@@ -2117,6 +2393,37 @@
 				}
 
 
+/* Subject Picture Popup */
+.b-subjecticons {
+	display: none;
+	position: absolute;
+	width: 300px;
+	margin: 0;
+	padding: 0;
+	}
+	.b-subjecticons-items {
+		margin: 0;
+		padding: 0;
+		list-style: none;
+		}
+		.b-subjecticons-item {
+			display: inline-block;
+			width: 32px;
+			min-height: 32px;
+			margin: 0;
+			padding: 0;
+			list-style: none;
+			vertical-align: top;
+			zoom: 1;
+			*display: inline;
+			text-align: center;
+			}
+			.b-subjecticons-item IMG {
+				cursor: pointer;
+				}
+	
+
+
 /* Fader
 --------------------------- */
 /* Must be removed after implementation of Framework! */

Modified: trunk/templates/CommentForm/Author-Anonymous.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-10 06:40:38 UTC (rev 18495)
+++ trunk/templates/CommentForm/Author-Anonymous.tmpl	2011-03-10 08:05:00 UTC (rev 18496)
@@ -1,43 +1,37 @@
 <TMPL_IF everyone_can_comment>
     <TMPL_UNLESS is_public>
-        <tr valign='middle'>
-        <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-        <td class="b-postform-radio">(  )</td>
-        <td class="b-postform-data b-postform-active" colspan='2'>
-            <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
-            <span class="i-bubble b-bubble-alert b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')"></span>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">
+            <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost.nonpublic')"></span>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <tr valign='center'>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' onclick='handleRadios(0);'/></td>
-        <td class="b-postform-radio"><input type='radio' name='usertype' value='anonymous' id='talkpostfromanon' <TMPL_IF whocheck_anonymous>checked='checked'</TMPL_IF> tabindex='9' /></td>
-        <td class="b-postform-data">
-            <label for='talkpostfromanon' class="i-postform-label"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></label>
-            <TMPL_VAR ml_willscreen>
-        </td>
-        </tr>
+        <div class="b-postform-login-item b-postform-login-anonymous">
+            <input type="radio" name="usertype" value="anonymous" id="talkpostfromanon" class="b-postform-login-radio" <TMPL_IF whocheck_anonymous>checked="checked"</TMPL_IF> />
+            <label for="talkpostfromanon" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></label>
+            <div class="b-postform-login-opts">
+                <strong><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></strong>
+                <TMPL_VAR ml_willscreen>
+            </div>
+        </div>
     </TMPL_IF>
 <TMPL_ELSIF registered_can_comment>
-    <tr valign='middle'>
-    <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-    <td class="b-postform-radio">(  )</td>
-    <td class="b-postform-data b-postform-active" colspan='2'>
-        <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
+    <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">
+        <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span>
         <TMPL_UNLESS remote_username>
-            <span class="i-bubble b-bubble-alert b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR expr="ml('/talkpost.bml.opt.noanonpost')"></span>
+            </div>
         </TMPL_UNLESS>
-    </td>
-    </tr>
+    </div>
 <TMPL_ELSIF friends_can_comment>
-    <tr valign='middle'>
-    <td class="b-postform-icon" width='20'><img src='<TMPL_VAR lj_imgprefix>/anonymous.gif' /></td>
-    <td class="b-postform-radio">(  )</td>
-    <td class="b-postform-data b-postform-active" colspan='2'>
-        <span class="i-postform-label i-postform-disabled"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></b></span>
+    <div class="b-postform-login-item b-postform-login-anonymous b-postform-login-disabled">
+        <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span>
         <TMPL_IF is_friend>
-            <span class="i-bubble b-bubble-alert b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR ml_friendsonly></span>
+            <div class="b-postform-login-opts">
+                <span class="i-bubble b-bubble-alert"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><TMPL_VAR ml_friendsonly></span>
+            </div>
         </TMPL_IF>
-    </td>
-    </tr>
+    </div>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-OpenID.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-OpenID.tmpl	2011-03-10 06:40:38 UTC (rev 18495)
+++ trunk/templates/CommentForm/Author-OpenID.tmpl	2011-03-10 08:05:00 UTC (rev 18496)
@@ -1,98 +1,89 @@
 <TMPL_IF openid_enabled>
     <TMPL_IF everyone_can_comment>
         <TMPL_IF is_identity>
-            <tr valign='middle' id='oidli' name='oidli'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(5);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromoid' onclick='handleRadios(5);return false;' class="i-postform-label"><b>OpenID identity:</b></label>
-                <strong><TMPL_VAR remote_display_name></strong>
-                <TMPL_VAR ml_willscreen>
-            </td>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid">
+                <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" <TMPL_IF whocheck_openid_cookie>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromoid" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                <div class="b-postform-login-opts">
+                    <strong><TMPL_VAR remote_display_name></strong>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <tr valign='middle' id='oidlo' name='oidlo'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> tabindex="9" /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromoidlo' onclick='handleRadios(5);return false;' class="i-postform-label"><b>OpenID</b></label>
-                <TMPL_VAR ml_willscreen>
-                <span id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' tabindex='1' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></span>
-            </td>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid">
+                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                <div class="b-postform-login-opts">
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
-
     <TMPL_ELSIF registered_can_comment>
         <TMPL_IF is_trusted_identity>
-            <tr valign='middle' id='oidli' name='oidli'>
-            <TMPL_IF remote_banned>
-                <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' /></td>
-                <td class="b-postform-radio">( )</td>
-                <td class="b-postform-data"><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
-            <TMPL_ELSE>
-                <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(5);' /></td>
-                <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-                <td class="b-postform-data">
-                    <label for='talkpostfromoid' onclick='handleRadios(5);return false;' class="i-postform-label"><b>OpenID identity:</b></label>
-                    <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_willscreen>
-                </td>
-            </TMPL_IF>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid">
+                <TMPL_IF remote_banned>
+                    <div class="b-postform-login-opts">
+                        <TMPL_VAR ml_loggedin>
+                        <TMPL_VAR ml_banned>
+                    </div>
+                <TMPL_ELSE>
+                    <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> />
+                    <label for="talkpostfromoidli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                    <div class="b-postform-login-opts">
+                        <strong><TMPL_VAR remote_display_name></strong>
+                        <TMPL_VAR ml_willscreen>
+                    </div>
+                </TMPL_IF>
+            </div>
         <TMPL_ELSIF is_identity>
-            <tr valign='middle'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td class="b-postform-radio">(  )</td>
-            <td class="b-postform-data" colspan='2'>
-                <span class="i-postform-label i-postform-disabled"><b>OpenID</b></span>
-                <TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF>
-                <TMPL_VAR helpicon_openid>
-            </td>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
+                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span>
+                <div class="b-postform-login-opts">
+                    <TMPL_IF is_identity><TMPL_VAR ml_noopenidpost></TMPL_IF>
+                    <TMPL_VAR helpicon_openid>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <tr valign='middle' id='oidlo' name='oidlo'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromoidlo' onclick='handleRadios(5);return false;' class="i-postform-label"><b>OpenID</b></label>
-                <TMPL_VAR ml_willscreen>
-                <span id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' tabindex='2' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></span>
-            </td>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid">
+                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                <div class="b-postform-login-opts">
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class="textbox" name="openid:url" maxlength="60" size="42" id="openid:url" value="<TMPL_VAR openid_url_default>" /><TMPL_VAR helpicon_openid><input type="hidden" name="oiddo_login" id="oidlogincheck" <TMPL_VAR oiddo_login_checked> /></span>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
     <TMPL_ELSIF friends_can_comment>
         <TMPL_IF is_identity>
-            <tr valign='middle' id='oidli' name='oidli'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(5);' /></td>
-
             <TMPL_IF remote_can_comment>
-                <td class="b-postform-radio"><input type='radio' name='usertype' value='openid_cookie' id='talkpostfromoidli' <TMPL_IF whocheck_openid_cookie>checked='checked'</TMPL_IF> /></td>
-                <td class="b-postform-data">
-                    <b><label for='talkpostfromoid' onclick='handleRadios(5);return false;' class="i-postform-label">OpenID identity:</label></b>
-                    <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_willscreen>
-                </td>
+                <div class="b-postform-login-item b-postform-login-openid">
+                    <input type="radio" name="usertype" value="openid_cookie" id="talkpostfromoidli" class="b-postform-login-radio" <TMPL_IF whocheck_openid_cookie>checked="checked"</TMPL_IF> />
+                    <label for="talkpostfromoidli" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                    <div class="b-postform-login-opts">
+                        <strong><TMPL_VAR remote_display_name></strong>
+                        <TMPL_VAR ml_willscreen>
+                    </div>
+                </div>
             <TMPL_ELSE>
-                <td class="b-postform-radio">( )</td>
-                <td class="b-postform-data">
-                    <span class="i-postform-label i-postform-disabled"><b>OpenID identity:</b></span>&nbsp;
-                    <strong><TMPL_VAR remote_display_name></strong>
-                    <TMPL_VAR ml_notafriend>
-                    <TMPL_VAR ml_willscreen>
-                </td>
+                <div class="b-postform-login-item b-postform-login-openid b-postform-login-disabled">
+                    <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span>
+                    <div class="b-postform-login-opts">
+                        <strong><TMPL_VAR remote_display_name></strong>
+                        <TMPL_VAR ml_notafriend>
+                        <TMPL_VAR ml_willscreen>
+                    </div>
+                </div>
             </TMPL_IF>
-
-            </tr>
         <TMPL_ELSE>
-            <tr valign='middle' id='oidlo' name='oidlo'>
-            <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/openid-profile.gif' onclick='handleRadios(3);' /></td>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='openid' id='talkpostfromoidlo' <TMPL_IF whocheck_openid>checked='checked'</TMPL_IF> /></td>
-            <td class="b-postform-data" class="b-postform-td">
-                <label for='talkpostfromoidlo' onclick='handleRadios(5);return false;' class="i-postform-label"><b>OpenID</b></label>
-                <TMPL_VAR ml_willscreen>
-                <span id="oid_more" class="i-bubble b-bubble-lite b-postform-openid"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' tabindex='3' /> <input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /> <TMPL_VAR helpicon_openid></span>
-            </td>
-            </tr>
+            <div class="b-postform-login-item b-postform-login-openid">
+                <input type="radio" name="usertype" value="openid" id="talkpostfromoidlo" class="b-postform-login-radio" <TMPL_IF whocheck_openid>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromoidlo" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></label>
+                <div class="b-postform-login-opts">
+                    <span class="i-bubble b-bubble-lite"><i class="i-bubble-arrow-border"></i><i class="i-bubble-arrow"></i><label for="openid:url"><TMPL_VAR expr="ml('/talkpost.bml.openid.identity.url')">&nbsp;</label><input class='textbox' name='openid:url' maxlength='60' size='42' id='openid:url' value='<TMPL_VAR openid_url_default>' tabindex='3' /><TMPL_VAR helpicon_openid><input type='hidden' name='oiddo_login' id='oidlogincheck' <TMPL_VAR oiddo_login_checked> /></span>
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
     </TMPL_IF>
 </TMPL_IF>

Modified: trunk/templates/CommentForm/Author-User.tmpl
===================================================================
--- trunk/templates/CommentForm/Author-User.tmpl	2011-03-10 06:40:38 UTC (rev 18495)
+++ trunk/templates/CommentForm/Author-User.tmpl	2011-03-10 08:05:00 UTC (rev 18496)
@@ -1,104 +1,52 @@
 <TMPL_IF is_person>
-    <tr valign='middle' id='<TMPL_VAR css_ljuser_row_id>'>
-
     <TMPL_IF remote_banned>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif' /></td>
-        <td class="b-postform-radio">( )</td>
-        <td class="b-postform-data">
-            <span class='ljdeem'><TMPL_VAR ml_loggedin></font>
-            <TMPL_VAR ml_banned>
-
-            <TMPL_IF 0> Don't worry about a real href since js hides the row anyway </TMPL_IF>
-            <script language='JavaScript'>
-                if (document.getElementById) {
-                    document.write("&nbsp;<a href='#' onClick='otherLJUser();return false;'>[other]</a>");
-                }
-            </script>
-        </td>
+        <div class="b-postform-login-item b-postform-login-user">
+            <div class="b-postform-login-opts">
+                <TMPL_VAR ml_loggedin>
+                <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                <TMPL_VAR ml_banned>
+            </div>
+        </div>
     <TMPL_ELSE>
-        <td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif'  onclick='handleRadios(1);' /></td>
         <TMPL_IF remote_can_comment>
-            <td class="b-postform-radio"><input type='radio' name='usertype' value='cookieuser' id='talkpostfromremote' <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> tabindex='9' /></td>
-            <td class="b-postform-data">
-                <label for='talkpostfromremote' class="i-postform-label"><TMPL_VAR ml_loggedin></label>
-
-                <TMPL_IF 0> Don't worry about a real href since js hides the row anyway </TMPL_IF>
-                <script language='JavaScript'>
-                    if (document.getElementById) {
-                        document.write("&nbsp;<a href='#' onClick='otherLJUser();return false;'>[other]</a>");
-                    }
-                </script>
-                <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-user">
+                <input type="radio" name="usertype" value="cookieuser" id="talkpostfromremote" class="b-postform-login-radio" <TMPL_IF whocheck_remote>checked="checked"</TMPL_IF> />
+                <label for="talkpostfromremote" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
+                <div class="b-postform-login-opts">
+                    <TMPL_VAR ml_loggedin>
+                    <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                    <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         <TMPL_ELSE>
-            <td class="b-postform-radio">( )</td>
-            <td class="b-postform-data">
-                <span class="i-postform-label i-postform-disabled"><TMPL_VAR ml_loggedin></span>
-                &nbsp;- <TMPL_VAR ml_notafriend>
-                <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
-                <TMPL_VAR ml_willscreen>
-            </td>
+            <div class="b-postform-login-item b-postform-login-user b-postform-login-disabled">
+                <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span>
+                <div class="b-postform-login-opts">
+                    <TMPL_VAR ml_loggedin>
+                    <span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.other.user')"></a></span>
+                    <TMPL_VAR ml_notafriend>
+                    <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" />
+                    <TMPL_VAR ml_willscreen>
+                </div>
+            </div>
         </TMPL_IF>
     </TMPL_IF>
-    </tr>
 </TMPL_IF>
-
-<tr valign='middle' id='otherljuser_row' name='otherljuser_row'>
-<td class="b-postform-icon"><img src='<TMPL_VAR lj_imgprefix>/pencil.gif' onclick='handleRadios(2);' /></td>
-<td class="b-postform-radio"><input type='radio' name='usertype' value='user' id='talkpostfromlj' <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> /></td>
-<td class="b-postform-data">
-    <label for='talkpostfromlj' onclick='handleRadios(2); return false;' class="i-postform-label"><b><TMPL_VAR expr="ml('/talkpost.bml.opt.ljuser2')"></b></label>
-    <TMPL_VAR ml_willscreen>
-    <TMPL_VAR ml_willscreenfriend>
-</td>
-</tr>
-
-<TMPL_IF is_person>
-    <script language='JavaScript'>
-    <!--
-        if (document.getElementById) {
-            var radio_user = document.getElementById("talkpostfromlj");
-            if (!radio_user.checked) {
-                var otherljuser_row = document.getElementById("otherljuser_row");
-                otherljuser_row.className = 'display_none';
-            }
-        }
-    //-->
-    </script>
-</TMPL_IF>
-
-<tr valign='middle' align='left' id='lj_more'>
-<td colspan='2'></td>
-<td>
-    <table>
-        <tr>
-            <td><TMPL_VAR expr="ml('Username')">:</td>
-            <td>
-                <input class='textbox' name='userpost' size='13' maxlength='15' id='username' value='<TMPL_VAR username_default>' onclick='this.value=""'
-                    style='background: url(<TMPL_VAR lj_imgprefix>/userinfo.gif) no-repeat; background-color: #fff; background-position: 0px 1px; padding-left: 18px; color: #00C; font-weight: bold;'
-                    tabindex='4'
-                />
-            </td>
-        </tr>
-        <tr>
-            <td><TMPL_VAR expr="ml('Password')">:</td>
-            <td><input class='textbox' name='password' type='password' maxlength='30' size='18' id='password' tabindex='5' /></td>
-        </tr>
-        <tr>
-            <td colspan='2'>
-                <input type='hidden' name='do_login' id='logincheck' />
-            </td>
-        </tr>
-    </table>
-</td>
-</tr>
-
-<TMPL_UNLESS create_link>
-    <TMPL_UNLESS is_person>
-        <tr valign='middle' align='left'>
-        <td colspan='2'></td>
-        <td><span style='font-size: 8pt; font-style: italic;'><TMPL_VAR ml_noaccount></span></td>
-        </tr>
-    </TMPL_UNLESS>
-</TMPL_UNLESS>
+<div class="b-postform-login-item b-postform-login-livejournal">
+    <input type="radio" name="usertype" value="user" id="talkpostfromlj" class="b-postform-login-radio" <TMPL_IF whocheck_ljuser>checked="checked"</TMPL_IF> />
+    <label for="talkpostfromlj" class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></label>
+    <div class="b-postform-login-opts">
+        <input class="textbox" name="userpost" size="13" maxlength="15" id="username" value="<TMPL_VAR username_default>" placeholder="<TMPL_VAR expr="ml('Username')">" />
+        <input class="textbox" name="password" type="password" maxlength="30" size="18" id="password" placeholder="<TMPL_VAR expr="ml('Password')">" />
+        <TMPL_IF is_person><span class="b-postform-login-opts-lj"><a href="#"><TMPL_VAR expr="ml('/talkpost.bml.back.to')">&nbsp;<em><TMPL_VAR username_default></em></a></span></TMPL_IF>
+        <TMPL_VAR ml_willscreen>
+        <TMPL_VAR ml_willscreenfriend>
+        <input type="hidden" name="do_login" id="logincheck" />
+        <TMPL_UNLESS create_link>
+            <TMPL_UNLESS is_person>
+                <TMPL_VAR ml_noaccount>
+            </TMPL_UNLESS>
+        </TMPL_UNLESS>
+    </div>
+</div>

Modified: trunk/templates/CommentForm/Form.tmpl
===================================================================
--- trunk/templates/CommentForm/Form.tmpl	2011-03-10 06:40:38 UTC (rev 18495)
+++ trunk/templates/CommentForm/Form.tmpl	2011-03-10 08:05:00 UTC (rev 18496)
@@ -20,29 +20,46 @@
 
 <table>
 <tr>
-    <td align='right' valign='top'><TMPL_VAR expr="ml('/talkpost.bml.opt.from')"></td>
-    <td> <TMPL_IF 0> Internal for "From" options </TMPL_IF>
-        <table class="b-postform-from">
-            <TMPL_IF editid>
-                <tr valign='middle' id='ljuser_row'>
-                    <TMPL_IF remote_banned>
-                        <td align='center'><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif' /></td>
-                        <td align='center'>( )</td>
-                        <td align='left'><span class='ljdeem'><TMPL_VAR ml_loggedin></font><TMPL_VAR ml_banned></td>
-                    <TMPL_ELSE>
-                        <td align='center'><img src='<TMPL_VAR lj_imgprefix>/userinfo.gif'  onclick='handleRadios(1);' /></td>
-                        <td align='left'><label for='talkpostfromremote'><TMPL_VAR ml_loggedin></label>
-                        <input type='hidden' name='usertype' value='cookieuser' />
-                        <input type='hidden' name='cookieuser' value='<TMPL_VAR remote_username>' id='cookieuser' />
-                        </td>
-                    </TMPL_IF>
-                </tr>
-            <TMPL_ELSE>
-                <TMPL_LOOP author_options>
-                    <TMPL_INCLUDE expr="sprintf('templates/CommentForm/Author-%s.tmpl', short_code)">
-                </TMPL_LOOP>
-            </TMPL_IF>
-        </table>
+    <td align='right' valign='top' class="b-postform-login-label"><TMPL_VAR expr="ml('/talkpost.bml.opt.from')"></td>
+    <td class="b-postform-login-wrapper">
+        <TMPL_IF 0> Internal for "From" options </TMPL_IF>
+        <TMPL_IF editid>
+            <div class="b-postform-login b-postform-ljedit">
+                    <div class="b-postform-login-item b-postform-login-ljedit">
+                        <TMPL_IF remote_banned>
+                            <div class="b-postform-login-opts">
+                                <TMPL_VAR ml_loggedin>
+                                <TMPL_VAR ml_banned>
+                            </div>
+                        <TMPL_ELSE>
+                            <span class="b-postform-login-service"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span>
+                            <div class="b-postform-login-opts">
+                                <TMPL_VAR ml_loggedin>
+                                <input type="hidden" name="usertype" value="cookieuser" />
+                                <input type="hidden" name="cookieuser" value="<TMPL_VAR remote_username>" id="cookieuser" />
+                            </div>
+                        </TMPL_IF>
+                </div>
+            </div>
+        <TMPL_ELSE>
+            <div class="b-postform-login b-postform-livejournal">
+                <div class="b-postform-login-services">
+                    <div class="b-postform-login-services-items">
+                        <span class="b-postform-login-services-item b-postform-login-services-anonymous"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/anonymous.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.opt.anonymous')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-livejournal"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/userinfo.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.livejournal')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-facebook"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/icons/facebook-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.facebook')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-twitter"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/icons/twitter-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.twitter')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-openid"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/icons/openid-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.openid')"></span></a></span>
+                        <span class="b-postform-login-services-item b-postform-login-services-mailru"><a href="#"><img src="<TMPL_VAR lj_imgprefix>/icons/mailru-16.gif" /><span class="b-postform-login-services-name"><TMPL_VAR expr="ml('/talkpost.bml.mailru')"></span></a></span>
+                    </div>
+                </div>
+                <div class="b-postform-login-details">
+                    <TMPL_LOOP author_options>
+                        <TMPL_INCLUDE expr="sprintf('templates/CommentForm/Author-%s.tmpl', short_code)">
+                    </TMPL_LOOP>
+                </div>
+            </div>
+        </TMPL_IF>
     </td>
 </tr>
 
@@ -50,46 +67,30 @@
     <td align='right'><TMPL_VAR expr="ml('/talkpost.bml.opt.subject')"></td>
     <td>
         <input class='textbox' type='text' size='50' maxlength='100' name='subject' id='subject' value="<TMPL_VAR basesubject>" onKeyPress='subjectNoHTML(event);' tabindex='10' />
-
         <TMPL_IF 0> subject icon </TMPL_IF>
-            <input type='hidden' id='subjectIconField' name='subjecticon' value='<TMPL_VAR subjicon>'>
-            <script type='text/javascript' language='Javascript'>
-            <!--
-                if (document.getElementById) {
-                    <TMPL_IF subjicon_none>
-                        document.write("<img src='<TMPL_VAR lj_imgprefix>/talk/none.gif' border='0' width='15' height='15' valign='middle' id='subjectIconImage' style='cursor:pointer;cursor:hand' align='absmiddle' onclick='subjectIconListToggle();' title='Click to change the subject icon' />");
-                    <TMPL_ELSE>
-                        document.write("<img src='<TMPL_VAR lj_imgprefix>/talk/<TMPL_VAR subjicon_current_img>' border='0' width='<TMPL_VAR subjicon_current_w>' height='<TMPL_VAR subjicon_current_h>' valign='middle' id='subjectIconImage' onclick='subjectIconListToggle();' style='cursor:pointer;cursor:hand' />");
-                    </TMPL_IF>
-
-                    <TMPL_IF 0> spit out a pretty table of all the possible subjecticons </TMPL_IF>
-                    document.write("<blockquote style='display:none;' id='subjectIconList'>");
-                    document.write("<table border='0' cellspacing='5' cellpadding='0' style='border: 1px solid #AAAAAA'>");
-
-                    <TMPL_LOOP subjicon_types>
-                        document.write("<tr>");
-
-                        <TMPL_IF __first__> <TMPL_IF 0> make an option if they don't want an image </TMPL_IF>
-                            document.write("<td valign='middle' align='center'>");
-                            document.write("<img src='<TMPL_VAR lj_imgprefix>/talk/none.gif' border='0' width='15' height='15' valign='middle' id='none' onclick='subjectIconChange(this);' style='cursor:pointer;cursor:hand' title='No subject icon' />")
-                            document.write("</td>");
-                        </TMPL_IF>
-
-                        <TMPL_LOOP subjicons>
-                            document.write("<td valign='middle' align='center'>");
-                            document.write("<img src='<TMPL_VAR lj_imgprefix>/talk/<TMPL_VAR subjicon_img>' border='0' width='<TMPL_VAR subjicon_w>' height='<TMPL_VAR subjicon_h>' valign='middle' id='<TMPL_VAR subjicon_id>' onclick='subjectIconChange(this);' style='cursor:pointer;cursor:hand' />");
-                            document.write("</td>");
+        <input type='hidden' id='subjectIconField' name='subjecticon' value='<TMPL_VAR subjicon>'>
+        <TMPL_IF subjicon_none>
+            <img src='<TMPL_VAR lj_imgprefix>/talk/none.gif' border='0' width='15' height='15' valign='middle' id='subjectIconImage' style='cursor:pointer;cursor:hand' align='absmiddle' onclick='subjectIconListToggle();' title='Click to change the subject icon' />
+        <TMPL_ELSE>
+            <img src='<TMPL_VAR lj_imgprefix>/talk/<TMPL_VAR subjicon_current_img>' border='0' width='<TMPL_VAR subjicon_current_w>' height='<TMPL_VAR subjicon_current_h>' valign='middle' id='subjectIconImage' onclick='subjectIconListToggle();' style='cursor:pointer;cursor:hand' />
+        </TMPL_IF>
+        <div class="b-popup b-subjecticons">
+            <div class="b-popup-outer">
+                <div class="b-popup-inner">
+                    <ul class="b-subjecticons-items">
+                        <TMPL_LOOP subjicon_types>
+                            <TMPL_IF __first__>
+                                <li class="b-subjecticons-item"><img src='<TMPL_VAR lj_imgprefix>/talk/none.gif' border='0' width='15' height='15' id='none' title='No subject icon' /></li>
+                            </TMPL_IF>
+                            <TMPL_LOOP subjicons>
+                                <li class="b-subjecticons-item"><img src='<TMPL_VAR lj_imgprefix>/talk/<TMPL_VAR subjicon_img>' border='0' width='<TMPL_VAR subjicon_w>' height='<TMPL_VAR subjicon_h>' id='<TMPL_VAR subjicon_id>' /></li>
+                            </TMPL_LOOP>
                         </TMPL_LOOP>
-
-                        document.write("</tr>");
-                    </TMPL_LOOP>
-
-                    <TMPL_IF 0> end that table, bar! </TMPL_IF>
-                    document.write("</table>");
-                    document.write("</blockquote>");
-                }
-            //-->
-            </script>
+                    </ul>
+                </div>
+                <i class="i-popup-arr i-popup-arrtr"></i><i class="i-popup-close"></i>
+            </div>
+        </div>
         <TMPL_IF 0> end subject icon </TMPL_IF>
 
         <div id='ljnohtmlsubj' class='ljdeem'><span style='font-size: 8pt; font-style: italic;'><TMPL_VAR expr="ml('/talkpost.bml.nosubjecthtml')"></span></div>

Tags: css, livejournal, savintsev_egor, tmpl
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments