More comment, user, usersetting fixes.

e107_core/shortcodes/batch/comment_shortcodes.php

@@ -101,13 +101,21 @@ class comment_shortcodes extends e_shortcode
 	
 	function sc_comment_avatar($parm)
 	{
-		$height 	= e107::getPref("im_height");
-		$width 		= e107::getPref("im_width");
+
 		$tp 		= e107::getParser();
 	
 		// 
-		return $tp->parseTemplate("{USER_AVATAR=".$this->var['user_image']."}");
-		exit;					
+		$text = $tp->parseTemplate("{USER_AVATAR=".$this->var['user_image']."}");
+		$text .= "<div class='field-help' style='display;none;'>
+		<div class='left'>";
+		$text .= "<h2>".$this->sc_username()."</h2>";
+	//	$text .= e107::getDate()-> //    convert($this->var['user_lastvisit'],'short');
+		$text .= $this->sc_joined()."<br />".$this->sc_comments()."<br />".$this->sc_rating().$this->sc_location;
+		
+		$text .= "
+		</div>
+		</div>";
+		return $text;				
 	}	
 	
 	

e107_core/shortcodes/single/user_avatar.php

@@ -44,7 +44,7 @@ function user_avatar_shortcode($parm='')
 	{
 		$img = (strpos($image,"://")!==false) ? $image : $tp->thumbUrl(e_MEDIA."avatars/".$image,"aw=".$width."&ah=".$height);
 		$text = "<img class='user-avatar e-tip' src='".$img."' alt='' style='width:".$width."px; height:".$height."px' />
-		<div class='field-help' style='display;none'>User info here</div>";
+		";
 	}
 	else
 	{

e107_themes/templates/usersettings_template.php

@@ -75,7 +75,11 @@ $sc_style['LOGINNAME']['post'] 			= "</td></tr>\n";
 $sc_style['SIGNATURE']['pre']			= "<tr><td style='width:40%;vertical-align:top' class='forumheader3'>".LAN_USER_71.req($pref['signup_option_signature'])."</td>
 											<td style='width:60%' class='forumheader2'>";
 
-$sc_style['SIGNATURE_HELP']['pre']		= "</td></tr>";
+//$sc_style['SIGNATURE']['pre']			= "<tr><td style='width:40%;vertical-align:top' class='forumheader3'></td>
+			//								<td style='width:60%' class='forumheader2'>";
+
+// $sc_style['SIGNATURE_HELP']['pre']		= "</td></tr>";											\
+$sc_style['SIGNATURE_HELP']['post']		= "</td></tr>";
 
 
 $USER_EXTENDED_CAT 						= "<tr><td colspan='2' class='forumheader'>{CATNAME}</td></tr>";

e107_web/css/e107.css

@@ -133,6 +133,8 @@ div.bbcode { margin: 15px 0px; clear: both; } /* layout control via bbcodes */
 
 /* default comments layout   */
 
+
+
 .comment-box										{ padding-bottom:10px; margin-bottom:10px; border-top:1px solid #C0C0C0;  }
 
 .comment-box-left									{ float:left; text-align:center; width:10%; min-width:100px }
@@ -145,7 +147,7 @@ div.comment-avatar										{ margin-top:5px; padding:10px 10px 0px 10px; }
 
 img.user-avatar										{ max-width:128px; -webkit-box-shadow:#CCCCCC 0px 0px 10px; -moz-box-shadow:#CCCCCC  0px 0px 10px; box-shadow:#CCCCCC 0px 0px 10px; -webkit-border-radius:5px; -moz-border-radius:5px; border-radius:5px; }
 
-.comment-box-right									{ width:85%; min-height: 70px; float:left; }
+.comment-box-right									{ width:auto; min-height: 70px; float:left; }
 
 .comment-box-arrow									{ width:11px; height:26px; float:left; position:relative; top:5px; left:-18px; }
 
@@ -155,7 +157,9 @@ img.user-avatar										{ max-width:128px; -webkit-box-shadow:#CCCCCC 0px 0px 1
 
 .comment-replyxxx									{ position:relative; bottom:0px; right:-10px; padding:2px 5px; font-size:0.85em; background-color:#EBFAFF; border:1px solid #C6F1FF; border-bottom:0px none; border-right:0px none; -webkit-border-top-left-radius: 5px; -moz-border-radius-topleft: 5px; border-top-left-radius: 5px; }
 
-.comment-input										{ width:100% }
+.comment-input										{ width:100%;  }
+
+.comment-box-right textarea							{ border:1px solid red; width: 90%; resize: none; margin:0px auto;}
 
 .comment-status										{ float:right; font-style: italic }
 
@@ -179,7 +183,9 @@ div.e-comment-edit-save								{ margin-top:8px; padding: 5px }
 .e-rate-up img										{ opacity: 0.4 }
 .e-rate-down img									{ opacity: 0.4 }
 
-
+#comments-container .comment-box:nth-child(even) {
+     background: red;
+}
     
 .divider 											{ border-bottom: 1px solid silver;  font-size: 18px;  margin-bottom: 30px;  position: relative;  text-align: center; }
 .divider span 										{ background:  #fff; padding: 0 15px; position: relative; top: 10px; }

user.php

@@ -21,7 +21,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 global $user;
 $user['user_id'] = USERID;
 
-require_once(e_CORE."shortcodes/batch/user_shortcodes.php");
+// require_once(e_CORE."shortcodes/batch/user_shortcodes.php");
 require_once(e_HANDLER."form_handler.php");
 
 if (isset($_POST['delp']))
@@ -45,6 +45,16 @@ if (isset($_POST['delp']))
 $qs = explode(".", e_QUERY);
 $self_page =($qs[0] == 'id' && intval($qs[1]) == USERID);
 
+include_once(e107::coreTemplatePath('user')); //correct way to load a core template.
+
+$user_shortcodes = e107::getScBatch('user');
+
+
+
+
+
+
+/*
 if (file_exists(THEME."user_template.php"))
 {
 	require_once(THEME."user_template.php");
@@ -53,6 +63,8 @@ else
 {
 	require_once(e_BASE.$THEMES_DIRECTORY."templates/user_template.php");
 }
+  */
+
 $user_frm = new form;
 require_once(HEADERF);
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }
@@ -164,6 +176,7 @@ else
 	foreach ($userList as $row)
 	{
 		$loop_uid = $row['user_id'];
+		
 		$text .= renderuser($row, "short");
 	}
 	$text .= $tp->parseTemplate($USER_SHORT_TEMPLATE_END, TRUE, $user_shortcodes);
@@ -192,6 +205,8 @@ function renderuser($uid, $mode = "verbose")
 			return FALSE;
 		}
 	}
+	
+	e107::getScBatch('user')->setVars($user);
 
 	if($mode == 'verbose')
 	{
@@ -204,4 +219,4 @@ function renderuser($uid, $mode = "verbose")
 }
 
 require_once(FOOTERF);
-?>
+?>

usersettings.php

@@ -57,10 +57,11 @@ $userMethods = e107::getUserSession();
 
 require_once (e_HANDLER.'ren_help.php');
 include_once (e107::coreTemplatePath('usersettings')); //correct way to load a core template.
-include_once (e_CORE.'shortcodes/batch/usersettings_shortcodes.php');
+// include_once (e_CORE.'shortcodes/batch/usersettings_shortcodes.php');
 
 $usersettings_shortcodes = e107::getScBatch('usersettings');
 
+
 e107::js('inline',"
 		function addtext_us(sc)
 		{