clean up inline login form and use choose div classes based on what they represent and not what they look like

1 files changed, 12 insertions, 13 deletions

diff --git a/templates/comments_post_inc.tpl b/templates/comments_post_inc.tpl
index a9d0836..2f4fa19 100644
--- a/templates/comments_post_inc.tpl
+++ b/templates/comments_post_inc.tpl
@@ -8,16 +8,16 @@
 		</div><!-- end .preview -->
 	{/if}
 
-		{form enctype="multipart/form-data" action="`$comments_return_url`#editcomments" id="editcomment-form"}
+	{form enctype="multipart/form-data" action="`$comments_return_url`#editcomments" id="editcomment-form"}
 		{formfeedback hash=$formfeedback}
-		
-		
+
+
 		{if $post_comment_request || $smarty.request.post_comment_preview || $comments_ajax}
-			{legend legend=$post_title} 
+			{legend legend=$post_title}
 				<input type="hidden" name="post_comment_reply_id" value="{$post_comment_reply_id}" />
 				<input type="hidden" name="post_comment_id" value="{$post_comment_id}" />
 				<input type="hidden" name="comments_return_url" value="{$comments_return_url}" />
-				
+
 				{* This is a little extra value for the funky case when bw learns browser has js at the same time a preview is asked for
 				   This will keep comment in non-js mode until previewing is done. Things get messy without this *}
 				{if !$gBitThemes->isJavascriptEnabled() || $no_js_preview == "y"}
@@ -31,21 +31,20 @@
 						{formhelp note=""}
 					{/forminput}
 				</div>
-				
+
 				{if !$gBitUser->isRegistered()}
 					<div class="row" id="post-login">
-						{assign var=loginLabel value=$gBitSystem->mConfig.site_title|default:Site}
-						{formlabel label="`$loginLabel` Login" for="login-email"}
+						{formlabel label="Login" for="login-email"}
 						{forminput}
-							<div style="display:inline-block">
+							<div style="display:inline-block;padding-right:20px;">
 								<input type="text" size="20" name="login_email" id="login-email" value="{$smarty.request.login_email|escape:html}" />
-								<div class="date">{tr}Email{/tr}</div>
+								<div class="label">{tr}Username or Email{/tr}</div>
 							</div>
 							<div style="display:inline-block">
 								<input type="password" size="8" name="login_password" id="login-password" value="{$smarty.request.login_password|escape:html}" />
-								<div class="date">{tr}Password{/tr}</div>
+								<div class="label">{tr}Password{/tr}</div>
 							</div>
-					
+							<div class="formhelp">{tr}If you are already registered with <strong>{$gBitSystem->mConfig.site_title|default:"this site"}</strong> please enter your login details above.{/tr}</div>
 						{/forminput}
 					</div>
 					<div class="row" style="display:none" id="post-anon">
@@ -77,7 +76,7 @@
 					{/if}
 				{/if}
 
-				<div class="row submit"> 
+				<div class="row submit">
 					<input type="submit" name="post_comment_preview" value="{tr}Preview{/tr}" {if $comments_ajax}onclick="LibertyComment.previewComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" name="post_comment_submit" value="{tr}Post{/tr}" {if $comments_ajax}onclick="LibertyComment.postComment(); return false;"{/if}/>&nbsp;
 					<input type="submit" name="post_comment_cancel" value="{tr}Cancel{/tr}" {if $comments_ajax}onclick="LibertyComment.cancelComment(true); return false;"{/if}/>