Revert changes by infopanel, and introduce flexpanel, which extends infopanel funcionality.

e107_admin/includes/flexpanel.php

@@ -0,0 +1,262 @@
+<?php
+
+/**
+ * @file
+ *
+ */
+
+if(!defined('e107_INIT'))
+{
+	exit;
+}
+
+// Flexpanel uses infopanel's methods to avoid code duplication.
+e107_require_once(e_ADMIN . 'includes/infopanel.php');
+
+
+/**
+ * Class adminstyle_flexpanel.
+ */
+class adminstyle_flexpanel extends adminstyle_infopanel
+{
+
+	private $iconlist = array();
+
+	/**
+	 * Constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->iconlist = $this->getIconList();
+
+		e107::js('core', 'core/admin.flexpanel.js', 'jquery', 4);
+	}
+
+	/**
+	 * Render contents.
+	 */
+	public function render()
+	{
+		$admin_sc = e107::getScBatch('admin');
+		$tp = e107::getParser();
+		$ns = e107::getRender();
+		$mes = e107::getMessage();
+		$pref = e107::getPref();
+		$frm = e107::getForm();
+
+		global $user_pref;
+
+		$panels = array(
+			'Area01' => '', // Sidebar.
+			'Area02' => '',
+			'Area03' => '',
+			'Area04' => '',
+			'Area05' => '',
+			'Area06' => '',
+			'Area07' => '', // Content left.
+			'Area08' => '', // Content right.
+			'Area09' => '',
+			'Area10' => '',
+			'Area11' => '',
+			'Area12' => '',
+			'Area13' => '',
+		);
+
+
+		// "Help" box.
+		$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=site_info}{ADMIN_HELP}', true, $admin_sc);
+		// "Latest" box.
+		$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=admin_menu}{ADMIN_LATEST=infopanel}', true, $admin_sc);
+		// "Status" box.
+		$panels['Area01'] .= $tp->parseTemplate('{SETSTYLE=admin_menu}{ADMIN_STATUS=infopanel}', true, $admin_sc);
+
+
+		// --------------------- Personalized Panel -----------------------
+		if(getperms('0') && !vartrue($user_pref['core-infopanel-mye107'])) // Set default icons.
+		{
+			$defArray = array(
+				0  => 'e-administrator',
+				1  => 'e-cpage',
+				2  => 'e-frontpage',
+				3  => 'e-mailout',
+				4  => 'e-image',
+				5  => 'e-menus',
+				6  => 'e-meta',
+				7  => 'e-newspost',
+				8  => 'e-plugin',
+				9  => 'e-prefs',
+				10 => 'e-links',
+				11 => 'e-theme',
+				12 => 'e-userclass2',
+				13 => 'e-users',
+				14 => 'e-wmessage'
+			);
+			$user_pref['core-infopanel-mye107'] = vartrue($pref['core-infopanel-default'], $defArray);
+		}
+		$tp->parseTemplate("{SETSTYLE=core-infopanel}");
+		$mainPanel = "<div id='core-infopanel_mye107'>";
+		$mainPanel .= "<div class='left'>";
+		foreach($this->iconlist as $key => $val)
+		{
+			if(!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107']))
+			{
+				$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
+			}
+		}
+		$mainPanel .= "</div></div>";
+		// Rendering the saved configuration.
+		$tp->parseTemplate("{SETSTYLE=core-infopanel}");
+		$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
+		$coreInfoPanelMyE107 = $ns->tablerender($caption, $mainPanel, "core-infopanel_mye107", true);
+		$panels['Area07'] .= $coreInfoPanelMyE107;
+
+
+		// --------------------- e107 News --------------------------------
+		$newsTabs = array();
+		$newsTabs['coreFeed'] = array('caption' => LAN_GENERAL, 'text' => "<div id='e-adminfeed' style='min-height:300px'></div><div class='right'><a rel='external' href='" . ADMINFEEDMORE . "'>" . LAN_MORE . "</a></div>");
+		$newsTabs['pluginFeed'] = array('caption' => LAN_PLUGIN, 'text' => "<div id='e-adminfeed-plugin'></div>");
+		$newsTabs['themeFeed'] = array('caption' => LAN_THEMES, 'text' => "<div id='e-adminfeed-theme'></div>");
+
+		$coreInfoPanelNews = $ns->tablerender(LAN_LATEST_e107_NEWS, e107::getForm()->tabs($newsTabs, array('active' => 'coreFeed')), "core-infopanel_news", true);
+		$panels['Area08'] .= $coreInfoPanelNews;
+
+
+		// --------------------- Website Status ---------------------------
+		$coreInfoPanelWebsiteStatus = $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(), "", true);
+		$panels['Area08'] .= $coreInfoPanelWebsiteStatus;
+
+
+		// --------------------- Latest Comments --------------------------
+		$panels['Area01'] .= $this->renderLatestComments();
+
+
+		// --------------------- User Selected Menus ----------------------
+		if(varset($user_pref['core-infopanel-menus']))
+		{
+			foreach($user_pref['core-infopanel-menus'] as $val)
+			{
+				$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
+				$panels['Area01'] .= $inc;
+			}
+		}
+
+		// Sidebar.
+		echo '<div class="row">';
+		echo '<div class="col-md-3 col-lg-2" id="left-panel">';
+		echo '<div class="draggable-panels" id="menu-area-01">';
+		echo $panels['Area01'];
+		echo '</div>';
+		echo '</div>';
+		echo '<div class="col-md-9 col-lg-10" id="right-panel">';
+
+
+		if(vartrue($_GET['mode']) != 'customize')
+		{
+			echo '<div class="row">';
+			echo '<div class="col-sm-12">';
+			echo $mes->render();
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-12">';
+			echo '<div class="draggable-panels" id="menu-area-02">';
+			echo $panels['Area02'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-03">';
+			echo $panels['Area03'];
+			echo '</div>';
+			echo '</div>';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-04">';
+			echo $panels['Area04'];
+			echo '</div>';
+			echo '</div>';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-05">';
+			echo $panels['Area05'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-12">';
+			echo '<div class="draggable-panels" id="menu-area-06">';
+			echo $panels['Area06'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-6">';
+			echo '<div class="draggable-panels" id="menu-area-07">';
+			echo $panels['Area07'];
+			echo '</div>';
+			echo '</div>';
+			echo '<div class="col-sm-6">';
+			echo '<div class="draggable-panels" id="menu-area-08">';
+			echo $panels['Area08'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-12">';
+			echo '<div class="draggable-panels" id="menu-area-09">';
+			echo $panels['Area09'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-10">';
+			echo $panels['Area10'];
+			echo '</div>';
+			echo '</div>';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-11">';
+			echo $panels['Area11'];
+			echo '</div>';
+			echo '</div>';
+			echo '<div class="col-sm-4">';
+			echo '<div class="draggable-panels" id="menu-area-12">';
+			echo $panels['Area12'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+
+
+			echo '<div class="row">';
+			echo '<div class="col-sm-12">';
+			echo '<div class="draggable-panels" id="menu-area-13">';
+			echo $panels['Area13'];
+			echo '</div>';
+			echo '</div>';
+			echo '</div>';
+		}
+		else
+		{
+			echo $frm->open('infopanel', 'post', e_SELF);
+			echo $this->render_infopanel_options(true);
+			echo $frm->close();
+		}
+
+		echo '</div>';
+		echo '</div>';
+	}
+
+}

e107_admin/includes/infopanel.php

@@ -57,12 +57,9 @@ class adminstyle_infopanel
 		{
 			
 			$user_pref['core-infopanel-mye107'] = $_POST['e-mye107'];
-			
+			$user_pref['core-infopanel-menus'] = $_POST['e-mymenus'];
+
 			save_prefs('user');
-			
-			$pref['core-infopanel-menus'] = $_POST['e-mymenus'];
-			
-			save_prefs();
 		}
 		
 		
@@ -72,6 +69,15 @@ class adminstyle_infopanel
 		$this->iconlist = e107::getNav()->adminLinks();
 		
 	}
+
+
+	/**
+	 * Allow to get Icon List.
+	 */
+	function getIconList()
+	{
+		return $this->iconlist;
+	}
 	
 	
 	function render()
@@ -82,23 +88,53 @@ class adminstyle_infopanel
 		$mes = e107::getMessage();
 		$pref = e107::getPref();
 		$frm = e107::getForm();
+		
+		
+	//	XXX Check Bootstrap bug is fixed. 
+	/*
+		echo '
+          <ul class="thumbnails">
+            <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+             <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+             <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+             <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+             <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+             <li class="span4">
+              <a href="#" class="thumbnail">
+                <img src="http://placehold.it/360x270" alt="">
+              </a>
+            </li>
+          </ul>
 
-		$droppableAreaContent1 = '';
-		$droppableAreaContent2 = '';
-		$droppableAreaContent3 = '';
-		$droppableAreaContent4 = '';
-		$droppableAreaContent5 = '';
-		$droppableAreaContent6 = '';
-		$droppableAreaContent7 = '';
-		$droppableAreaContent8 = '';
-		$droppableAreaContent9 = '';
-		$droppableAreaContent10 = '';
-
-		// TODO LANs throughout.
+		';
+	*/	
+		//TODO LANs throughout.
 		
 		global $style, $user_pref;
 
-		// ---------------------- Start Panel -----------------------------
+		// ---------------------- Start Panel --------------------------------
+
+//		$text = "<div >";
 		if (getperms('0') && !vartrue($user_pref['core-infopanel-mye107'])) // Set default icons.
 		{
 			$defArray = array (
@@ -117,136 +153,156 @@ class adminstyle_infopanel
 			    12 => 'e-userclass2',
 			    13 => 'e-users',
 			    14 => 'e-wmessage'
-			);
-
+			  );
 			$user_pref['core-infopanel-mye107'] = vartrue($pref['core-infopanel-default'],$defArray);
+			
 		}
-
+		
+       
+		
+	//	"<form method='post' action='".e_SELF."?".e_QUERY."'>";
+		
 		$tp->parseTemplate("{SETSTYLE=core-infopanel}");
-
-		// --------------------- Personalized Panel -----------------------
+		
+		// Personalized Panel 
 		// Rendering the saved configuration.
 		
-		$mainPanel = "<div id='core-infopanel_mye107'>";
-		$mainPanel .= "<div class='left'>";
-		foreach ($this->iconlist as $key=>$val)
-		{
-			if (!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107']))
+		$mainPanel = "
+		<div id='core-infopanel_mye107' >
+		";
+		
+		/*
+		$mainPanel .= '<span class="pull-right">
+		          <span class="options">
+		            <div class="btn-group">
+		              <a class="dropdown-toggle" data-toggle="dropdown"><i class="icon-cog"></i></a>
+		              <ul class="dropdown-menu black-box-dropdown dropdown-right">
+		                <li>'.$this->render_infopanel_icons().'</li>
+		              </ul>
+		            </div>
+		          </span>
+		        </span>';
+		
+		*/
+		
+	//	print_a($user_pref['core-infopanel-mye107']);
+        
+		$mainPanel .= "
+		
+		
+		
+		
+			
+				<div class='left'>";
+			
+			foreach ($this->iconlist as $key=>$val)
 			{
-				$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
+				if (!vartrue($user_pref['core-infopanel-mye107']) || in_array($key, $user_pref['core-infopanel-mye107']))
+				{
+					$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
+				}
 			}
-		}
-		$mainPanel .= "</div></div>";
+	
+			// $mainPanel .= "<div class='clear'>&nbsp;</div>";
+			$mainPanel .= "</div>
+	      
+			</div>";
 
 		$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
-		$coreInfoPanelMyE107 = $ns->tablerender($caption, $mainPanel, "core-infopanel_mye107",true);
-		$droppableAreaContent1 .= $coreInfoPanelMyE107;
+		$text = $ns->tablerender($caption, $mainPanel, "core-infopanel_mye107",true);
 		
 	
-		// --------------------- e107 News --------------------------------
+	//  ------------------------------- e107 News --------------------------------
+
 		$newsTabs = array();
 		$newsTabs['coreFeed'] = array('caption'=>LAN_GENERAL,'text'=>"<div id='e-adminfeed' style='min-height:300px'></div><div class='right'><a rel='external' href='".ADMINFEEDMORE."'>".LAN_MORE."</a></div>");
 		$newsTabs['pluginFeed'] = array('caption'=>LAN_PLUGIN,'text'=>"<div id='e-adminfeed-plugin'></div>");
 		$newsTabs['themeFeed'] = array('caption'=>LAN_THEMES,'text'=>"<div id='e-adminfeed-theme'></div>");
 
-		$coreInfoPanelNews = $ns->tablerender(LAN_LATEST_e107_NEWS,e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true);
-		$droppableAreaContent2 .= $coreInfoPanelNews;
+		$text2 = $ns->tablerender(LAN_LATEST_e107_NEWS,e107::getForm()->tabs($newsTabs, array('active'=>'coreFeed')),"core-infopanel_news",true);
+	
+	
+	
+	
+	// ---------------------Latest Stuff ---------------------------
+	
+		//require_once (e_CORE."shortcodes/batch/admin_shortcodes.php");
+		e107::getScBatch('admin');
+		
 
 
-		// --------------------- Website Status ---------------------------
-		$coreInfoPanelWebsiteStatus = $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(),"",true);
-		$droppableAreaContent2 .= $coreInfoPanelWebsiteStatus;
-
-
-		// --------------------- Latest Comments --------------------------
-		$droppableAreaContent1 .= $this->renderLatestComments();
-
-
-		// --------------------- User Selected Menus ----------------------
+		
+		$text2 .= $ns->tablerender(LAN_WEBSITE_STATUS, $this->renderWebsiteStatus(),"",true);	
+		
+		
+	//	$text .= $ns->tablerender(ADLAN_LAT_1,$tp->parseTemplate("{ADMIN_LATEST=norender}"),"core-infopanel_latest",true);
+	//	$text .= $ns->tablerender(LAN_STATUS,$tp->parseTemplate("{ADMIN_STATUS=norender}"),"core-infopanel_latest",true);
+	/*
+	
+			$text .= "<li class='span6'>
+				".$tp->parseTemplate("{ADMIN_LATEST=norender}").
+				$tp->parseTemplate("{ADMIN_STATUS=norender}")."
+						</div>";
+		
+		*/
+	
+	
+	$text .= $this->renderLatestComments();
+	
+	
+	// ---------------------- Who's Online  ------------------------
+	// TODO Could use a new _menu item instead.
+	
+	
+	//	$text2 .= $ns->tablerender('Visitors Online : '.vartrue($nOnline), $panelOnline,'core-infopanel_online',true);
+		
+	// --------------------- User Selected Menus -------------------
+		
+	
 		if (varset($pref['core-infopanel-menus']))
 		{
 			foreach ($pref['core-infopanel-menus'] as $val)
 			{
 				$id = $frm->name2id('core-infopanel_'.$val);			
 				$inc = $tp->parseTemplate("{PLUGIN=$val|TRUE}");
-				$droppableAreaContent1 .= $inc;
+				$text .= $inc;
+				// $text .= $ns->tablerender("", $inc, $id,true);
 			}
 		}
-
-		$droppableAreaContent1 .= $this->render_infopanel_options();
+	
+	
+		
+		
+		
+		
+		
+	//	$text .= "<div class='clear'>&nbsp;</div>";
+		
+		$text .= $this->render_infopanel_options();
+		
+		
+		
+	//	$text .= "</div>";
 		
 		if(vartrue($_GET['mode']) != 'customize')
 		{
-			echo '<div class="row">';
-			echo '<div class="col-sm-12">';
-			echo $mes->render();
-			echo '</div>';
-			echo '</div>';
+			// $ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text);	
+			echo $mes->render().'
 
-			echo '<div class="row">';
-			echo '<div class="col-sm-12">';
-			echo '<div class="draggable-panels" id="droppable-area-content-4">';
-			echo $droppableAreaContent4;
-			echo '</div>';
-			echo '</div>';
-			echo '</div>';
+			<!-- INFOPANEL -->
+			<div class="row">
+				<div class="span6 col-md-6">
+				    '.$text.'
+				 </div>
 
-			echo '<div class="row">';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-5">';
-			echo $droppableAreaContent5;
-			echo '</div>';
-			echo '</div>';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-6">';
-			echo $droppableAreaContent6;
-			echo '</div>';
-			echo '</div>';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-7">';
-			echo $droppableAreaContent7;
-			echo '</div>';
-			echo '</div>';
-			echo '</div>';
-
-			echo '<div class="row">';
-			echo '<div class="col-sm-6">';
-			echo '<div class="draggable-panels" id="droppable-area-content-1">';
-			echo $droppableAreaContent1; // Control Panel
-			echo '</div>';
-			echo '</div>';
-			echo '<div class="col-sm-6">';
-			echo '<div class="draggable-panels" id="droppable-area-content-2">';
-			echo $droppableAreaContent2; // Latest e107 News
-			echo '</div>';
-			echo '</div>';
-			echo '</div>';
-
-			echo '<div class="row">';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-8">';
-			echo $droppableAreaContent8;
-			echo '</div>';
-			echo '</div>';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-9">';
-			echo $droppableAreaContent9;
-			echo '</div>';
-			echo '</div>';
-			echo '<div class="col-sm-4">';
-			echo '<div class="draggable-panels" id="droppable-area-content-10">';
-			echo $droppableAreaContent10;
-			echo '</div>';
-			echo '</div>';
-			echo '</div>';
-
-			echo '<div class="row">';
-			echo '<div class="col-sm-12">';
-			echo '<div class="draggable-panels" id="droppable-area-content-3">';
-			echo $droppableAreaContent3; // Website Status
-			echo '</div>';
-			echo '</div>';
-			echo '</div>';
+				 <div class="span6 col-md-6">
+				    '.$text2.'
+				 </div>
+			</div>
+			<!--  -->  
+			 
+			 
+			 ';
 		}
 		else
 		{