From 959d5064e9c776b474ff1e52cfa023fc7a8b219b Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Sun, 10 Mar 2013 04:42:18 -0700
Subject: [PATCH] Social Links added - work in progress.

---
 e107_admin/prefs.php           | 40 +++++++++++++++++++++++++++++++---
 e107_handlers/form_handler.php |  7 ++++--
 2 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/e107_admin/prefs.php b/e107_admin/prefs.php
index 82b773460..5fb15163a 100644
--- a/e107_admin/prefs.php
+++ b/e107_admin/prefs.php
@@ -982,14 +982,48 @@ $social_external = array(
  
 $text .= "
 		<fieldset class='e-hideme' id='core-prefs-sociallogin'>
-					<legend>Social Login Options</legend>
-					<div>Note: This section requires further testing</div>
+					<legend>Social Options</legend>
+					<div class='alert alert-warning'>Note: This section requires further testing</div>
 					<table class='table adminform'>
 						<colgroup>
 							<col class='col-label' />
 							<col class='col-control' />
 						</colgroup>
 						<tbody>
+						<tr>
+						<th colspan='2'>External Social Pages</th>
+					</tr>
+					<tr>
+						<td>Your Facebook page</td>
+						<td>
+							".$frm->text('facebook_link', $pref['facebook_link'])."
+							<div class='field-help'>Used in some themes to provide a link to your Facebook page. (FACEBOOK_LINK)</div>
+						</td>
+					</tr>	
+					<tr>
+						<td>Your Twitter page</td>
+						<td>
+							".$frm->text('twitter_link', $pref['twitter_link'])."
+							<div class='field-help'>Used in some themes to provide a link to your Twitter page. (TWITTER_LINK)</div>
+						</td>
+					</tr>		
+					<tr>
+						<td>Your Youtube page</td>
+						<td>
+							".$frm->text('youtube_link', $pref['youtube_link'])."
+							<div class='field-help'>Used in some themes to provide a link to your Youtube page. (YOUTUBE_LINK)</div>
+						</td>
+					</tr>
+						<tr>
+						<td>Your Google+ page</td>
+						<td>
+							".$frm->text('google_link', $pref['google_link'])."
+							<div class='field-help'>Used in some themes to provide a link to your Google+ page. (GOOGLE_LINK)</div>
+						</td>
+					</tr>			
+					<tr>
+						<th colspan='2'>Social Logins</th>
+					</tr>
 					<tr>
 						<td>Enable Social Logins</td>
 						<td>
@@ -1893,7 +1927,7 @@ function prefs_adminmenu()
 	$var['core-prefs-email']['text'] = "Email &amp; Contact Info.";
 	$var['core-prefs-registration']['text'] = PRFLAN_28;
 	$var['core-prefs-signup']['text'] = PRFLAN_19;
-	$var['core-prefs-sociallogin']['text'] = "Social Logins";
+	$var['core-prefs-sociallogin']['text'] = "Social Options";
 	
 	$var['core-prefs-comments']['text'] = PRFLAN_210;
 	$var['core-prefs-uploads']['text'] = "File Uploading"; // TODO LAN
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 1d47b877c..9aaefde0d 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1119,11 +1119,14 @@ class e_form
 	
 			$text[] = $this->radio($name, $value, (string) $checked === (string) $value)."".$this->label($label, $name, $value).(isset($helpLabel) ? "<div class='field-help'>".$helpLabel."</div>" : '');
 		}
-		if(!$multi_line)
+		
+		if($multi_line === false)
+		{
 			return implode("&nbsp;&nbsp;", $text);
+		}
 		
 		// return implode("\n", $text);
-		return "<div class='field-spacer'>".implode("</div><div class='field-spacer'>", $text)."</div>";
+		return "<div class='field-spacer' style='width:50%;float:left'>".implode("</div><div class='field-spacer' style='width:50%;float:left'>", $text)."</div>";
 
 	}