From a35bcc84327da0adeb3401f906fa958f70942ce2 Mon Sep 17 00:00:00 2001
From: Cameron <cameron@e107coders.org>
Date: Wed, 28 Nov 2012 21:07:23 -0800
Subject: [PATCH] More GUI fixes

---
 README.md                      | 23 +++++++++++++++++++++--
 e107_admin/newspost.php        |  4 ++--
 e107_handlers/admin_ui.php     |  2 +-
 e107_handlers/form_handler.php | 10 +++++++++-
 e107_handlers/media_class.php  | 21 ++++++++++++++++-----
 5 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index e07a74d3b..b67674508 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,21 @@
-e107 CMS
-For more details see www.e107.org 
\ No newline at end of file
+## e107 Content Management System - v2
+
+Important: This is an unstable, developer version of e107.  
+For a stable earlier release see [www.e107.org][1] 
+
+### Installation
+
+* Create an empty text file in the root directory and name it *e107_config.php*
+* Point your browser to the *http://localhost/YOUR FOLDER/install_.php* (depending on your webserver setup)
+* Follow the installation wizard
+
+### Reporting Bugs
+
+Be sure you are using the most recent version prior to reporting an issue. 
+Your may report any bugs or feature requests on Github [here][2] 
+
+
+
+
+  [1]: http://www.e107.org
+  [2]: https://github.com/e107inc/e107/issues
\ No newline at end of file
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php
index 627c0735d..c4e4bf19d 100644
--- a/e107_admin/newspost.php
+++ b/e107_admin/newspost.php
@@ -2025,8 +2025,8 @@ class admin_newspost
 		// -----
 		
 		$text .= "<tr>
-					<td>".NWSLAN_13.":<br /></td>
-					<td>\n";
+					
+					<td colspan='2'>\n";
 		$text .= "<div class='e-tabs'>
 		<ul>
 			<li><a href='#news-body-container'>".NWSLAN_13."</a></li>
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 930e938b4..21a515923 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -4534,7 +4534,7 @@ class e_admin_form_ui extends e_form
 					".$filter_pre."
 					<div class='left'>
 						".$this->text('searchquery', $current_query[0], 50, $input_options)."
-						".$this->select_open('filter_options', array('class' => 'tbox select filter', 'id' => false))."
+						".$this->select_open('filter_options', array('class' => 'e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
 							".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
 							".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."
 							".$this->renderBatchFilter('filter', $current_query[1])."
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index f2b4f73d0..932dad70c 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -113,6 +113,7 @@ class e_form
 
 	function text($name, $value, $maxlength = 200, $options = array())
 	{
+		if(!vartrue($options['class']) && $maxlength > 99) $options['class'] = 'tbox span5';
 		$options = $this->format_options('text', $name, $options);
 		//never allow id in format name-value for text fields
 		return "<input type='text' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->get_attributes($options, $name)." />";
@@ -1137,7 +1138,14 @@ class e_form
 			break;
 			
 			case 'other':
-			case 'login':
+			case 'login':	
+				$options['class'] .= 'btn-primary';
+			break;	
+			
+			case 'warning':
+				$options['class'] .= 'btn-warning';
+			break;
+			
 			case 'batch':
 			case 'batch e-hide-if-js': // FIXME hide-js shouldn't be here. 
 				$options['class'] .= 'btn-primary';
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index a16a4e0cc..97877222c 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -525,12 +525,23 @@ class e_media
 
 		if($navMode === false)
 		{
-			$text .= "<div>Filter: <input type='text' id='media-search' title='Enter some text to filter the results' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' />";
-			$text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason. 
-		//	$text .= "<input type='button' value='&laquo;' />"; // see previous page of images. 
-			$text .= "<button title='previous page' class='button e-nav e-media-nav e-tip'  data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&laquo;</button>"; // see next page of images. 
+			/*
+			 *     <div class="input-append">
+    <input class="span2" id="appendedInputButtons" type="text">
+    <button class="btn" type="button">Search</button>
+    <button class="btn" type="button">Options</button>
+    </div>
+			 */
+			
+			
+			
+			$text .= "<div style='margin-top:10px'>Filter: <input type='text' id='media-search' title='Enter some text to filter results' name='search' value='' class='e-tip' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' />";
+		//	$text .= "<input type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' /> "; // Manual filter, if onkeyup ajax fails for some reason. 
+			$text .= "<button type='button' value='Go' class='btn btn-primary e-media-nav' data-target='media-select-container' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >Go</button>"; // Manual filter, if onkeyup ajax fails for some reason. 
+	
+			$text .= "&nbsp;<button type='button' title='previous page' class='btn button e-nav e-media-nav e-tip'  data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='down' data-nav-inc='".$limit."' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&laquo;</button>"; // see next page of images. 
 		
-			$text .= "&nbsp;<button title='next page' class='button e-nav e-media-nav e-tip' style='text-align:center'  data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&raquo;</button>"; // see next page of images. 
+			$text .= "<button type='button' title='next page' class='btn button e-nav e-media-nav e-tip' style='text-align:center'  data-target='media-select-container' data-nav-total='".$total."' data-nav-dir='up' data-nav-inc='".$limit."' data-src='".$this->mediaSelectNav($category,"tagid=".$tagid."&bbcode=".$bbcode)."&amp;from=0' >&raquo;</button>"; // see next page of images. 
 			$text .= "</div>
 			<div id='media-select-container'>";	
 		}