From 26cced27c56d5e9eebec12bea17e350d842aa45b Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 6 Feb 2013 00:20:11 -0800
Subject: [PATCH] Private Message GUI fixes.

---
 e107_plugins/pm/pm.php            | 23 +++++++++++++----------
 e107_plugins/pm/pm_shortcodes.php |  4 ++--
 e107_plugins/pm/pm_template.php   |  8 ++++----
 page.php                          |  4 +++-
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/e107_plugins/pm/pm.php b/e107_plugins/pm/pm.php
index 819038877..c53e5ee2c 100755
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
@@ -332,7 +332,7 @@ class pm_extended extends private_message
 	 */
 	function post_pm()
 	{
-		print_a($_POST);
+		// print_a($_POST);
 		
 		
 		if(!check_class($this->pmPrefs['pm_class']))
@@ -628,11 +628,14 @@ if(isset($_POST['postpm']))
 	$action = 'outbox';
 }
 
-
+$mes = e107::getMessage();
 
 if($message != '')
 {
-	$ns->tablerender('', $message);
+	
+	$mes->add($message);
+	
+//	$ns->tablerender('', "<div class='alert alert-block'>". $message."</div>");
 }
 
 
@@ -643,7 +646,7 @@ if($message != '')
 switch ($action)
 {
 	case 'send' :
-		$ns->tablerender(LAN_PM, $pm->show_send($pm_proc_id));
+		$ns->tablerender(LAN_PM, $mes->render() . $pm->show_send($pm_proc_id));
 		break;
 
 	case 'reply' :
@@ -652,25 +655,25 @@ switch ($action)
 		{
 			if($pm_info['pm_to'] != USERID)
 			{
-				$ns->tablerender(LAN_PM, LAN_PM_56);
+				$ns->tablerender(LAN_PM, $mes->render() . LAN_PM_56);
 			}
 			else
 			{
-				$ns->tablerender(LAN_PM, $pm->show_send($pm_info));
+				$ns->tablerender(LAN_PM, $mes->render() . $pm->show_send($pm_info));
 			}
 		}
 		else
 		{
-			$ns->tablerender(LAN_PM, LAN_PM_57);
+			$ns->tablerender(LAN_PM, $mes->render() . LAN_PM_57);
 		}
 		break;
 
 	case 'inbox' :
-		$ns->tablerender(LAN_PM.' - '.LAN_PM_25, $pm->show_inbox($pm_proc_id), 'PM');
+		$ns->tablerender(LAN_PM.' - '.LAN_PM_25, $mes->render() . $pm->show_inbox($pm_proc_id), 'PM');
 		break;
 
 	case 'outbox' :
-		$ns->tablerender(LAN_PM.' - '.LAN_PM_26, $pm->show_outbox($pm_proc_id), 'PM');
+		$ns->tablerender(LAN_PM.' - '.LAN_PM_26, $mes->render() . $pm->show_outbox($pm_proc_id), 'PM');
 		break;
 
 	case 'show' :
@@ -678,7 +681,7 @@ switch ($action)
 		break;
 
 	case 'blocked' :
-		$ns->tablerender(LAN_PM.' - '.LAN_PM_66, $pm->showBlocked($pm_proc_id), 'PM');
+		$ns->tablerender(LAN_PM.' - '.LAN_PM_66, $mes->render() . $pm->showBlocked($pm_proc_id), 'PM');
 		break;
 }
 
diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index c4ca02636..ced9b65b5 100755
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -113,9 +113,9 @@ class pm_shortcodes extends e_shortcode
 		{
 			$frm = e107::getForm();
 			//TODO Use $frm->userpicker();
-			return $frm->text('pm_to','',10,'typeahead=users');
+			return $frm->text('pm_to','',20,'typeahead=users');
 			
-			$ret = $us->select_form($type, 'pm_to', '', $this->pmPrefs['pm_class']);
+			// $ret = $us->select_form($type, 'pm_to', '', $this->pmPrefs['pm_class']);
 		}
 		return $ret;
 	}
diff --git a/e107_plugins/pm/pm_template.php b/e107_plugins/pm/pm_template.php
index c1bbcf458..af099f9b8 100755
--- a/e107_plugins/pm/pm_template.php
+++ b/e107_plugins/pm/pm_template.php
@@ -95,7 +95,7 @@ $PM_SEND_PM = "<div style='text-align: center'>
 ";
 
 $PM_INBOX_HEADER = "
-<table class='table fborder' style='width:95%'>
+<table class='table table-striped fborder>
 <tr>
 	<td class='fcaption' style='width:1%'>&nbsp;</td>
 	<td class='fcaption' style='width:1%'>&nbsp;</td>
@@ -135,7 +135,7 @@ $PM_INBOX_FOOTER = "
 ";
 
 $PM_OUTBOX_HEADER = "
-<table class='table fborder' style='width:95%'>
+<table class='table table-striped fborder'>
 <thead>
 <tr>
 	<th class='fcaption' style='width:1%'>&nbsp;</th>
@@ -180,7 +180,7 @@ $PM_OUTBOX_FOOTER = "
 
 
 $PM_BLOCKED_HEADER = "
-<table class='table fborder' style='width:95%'>
+<table class='table table-striped fborder'>
 <tr>
 	<td class='fcaption' style='width:5%'>&nbsp;</td>
 	<td class='fcaption' style='width:48%'>".LAN_PM_68."</td>
@@ -217,7 +217,7 @@ $PM_BLOCKED_FOOTER = "
 
 $PM_SHOW =
 "<div style='text-align: center'>
-<table class='table fborder' style='width:95%'>
+<table class='table fborder'>
 <tr>
 	<td class='fcaption' colspan='2'>{PM_SUBJECT}</td>
 </tr>
diff --git a/page.php b/page.php
index 59afebde9..bce7cf8b7 100644
--- a/page.php
+++ b/page.php
@@ -23,9 +23,11 @@ if(!e_QUERY)
 	require_once(HEADERF);
 //	$tmp = $e107CorePage->listPages();
 	$tmp = $e107CorePage->listBooks();
+	
+//	$text = $tp->parseTemplate("{PAGE_NAVIGATION=book=2}",true);
 	if(is_array($tmp))
 	{
-		$ns->tablerender($tmp['title'], $tmp['text'], 'cpage');
+		$ns->tablerender($tmp['title'], $text, 'cpage');
 		require_once(FOOTERF);
 		exit;
 	}