added auto resize property to suggest window

infoserwis · Mar 25, 2016 · 2c48f19 · 2c48f19
1 parent ec523eb
commit 2c48f19
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 6 deletions.
diff --git a/img/autosuggest.js b/img/autosuggest.js
@@ -292,7 +292,13 @@ function AutoSuggest(form,elem,uri,autosubmit) {
 				li.onclick = function() { me.useSuggestion(); }
 				li.appendChild(a);
 			} else {
-				li.innerHTML = word;
+				word_len = word.length;
+
+				if (word_len > AUTOSUGGEST_MAX_LENGTH)
+					li.innerHTML = word.substring(0, AUTOSUGGEST_MAX_LENGTH) + " ...";
+				else
+					li.innerHTML = word;
+
 				li.onclick = function() { me.useSuggestion(); }
 			}
 			ds.innerHTML = desc;

diff --git a/img/style.css b/img/style.css
@@ -184,9 +184,9 @@ div.multiselectlayer ul li input { border: none; }
 
 .pre		{ font-size:  8pt; font-family: Courier, Courier New; }
 
-.suggestion_list { background-color: #EBE4D6; border: 1px solid; padding: 0px; width: 320px; }
-.suggestion_list ul { padding: 0; margin: 0; list-style-type: none; } 
-.suggestion_list span { position: absolute; right: 0; font-size: 9px; margin-right: 2px; color: brown; }
+.suggestion_list { background-color: #EBE4D6; border: 1px solid; padding: 0px; min-width: 320px; }
+.suggestion_list ul { padding: 0; margin: 0; list-style-type: none;} 
+.suggestion_list span { float: right; right: 0; font-size: 9px; margin-right: 2px; color: brown; padding-left: 20px; }
 .suggestion_list a { text-decoration: none; padding-left: 2px; color: black; }
 .suggestion_list .selected { background-color: #CCFFCC; }
 .suggestion_list .selected a { color: black; }

diff --git a/lib/upgradedb/mysql.2016032500.php b/lib/upgradedb/mysql.2016032500.php
@@ -24,9 +24,12 @@
 $this->BeginTrans();
 
 define('CONFIG_TYPE_NONE', 7);
+define('CONFIG_TYPE_POSITIVE_INTEGER', 2);
 
 $this->Execute("INSERT INTO uiconfig (section, var, value, type) VALUES('phpui', 'default_autosuggest_placement', 'bottom', ?)", array(CONFIG_TYPE_NONE));
 
+$this->Execute("INSERT INTO uiconfig (section, var, value, type) VALUES('phpui', 'autosuggest_max_length', '40', ?)", array(CONFIG_TYPE_POSITIVE_INTEGER));
+
 $this->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2016032500', 'dbversion'));
 
 $this->CommitTrans();

diff --git a/lib/upgradedb/postgres.2016032500.php b/lib/upgradedb/postgres.2016032500.php
@@ -24,9 +24,12 @@
 $this->BeginTrans();
 
 define('CONFIG_TYPE_NONE', 7);
+define('CONFIG_TYPE_POSITIVE_INTEGER', 2);
 
 $this->Execute("INSERT INTO uiconfig (section, var, value, type) VALUES('phpui', 'default_autosuggest_placement', 'bottom', ?)", array(CONFIG_TYPE_NONE));
 
+$this->Execute("INSERT INTO uiconfig (section, var, value, type) VALUES('phpui', 'autosuggest_max_length', '40', ?)", array(CONFIG_TYPE_POSITIVE_INTEGER));
+
 $this->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2016032500', 'dbversion'));
 
 $this->CommitTrans();

diff --git a/modules/configlist.php b/modules/configlist.php
@@ -55,7 +55,7 @@ function GetConfigList($order='var,asc', $section='', $search='')
 			case 'phpui':
 				switch($item['var'])
 				{	
-				case 'default_autosuggest_maxlength':
+				case 'autosuggest_max_length':
 					$config[$idx]['description'] = trans('Max length of auto suggest proposal, further characters will be dotted.');
 				break;
 

diff --git a/templates/default/header.html b/templates/default/header.html
@@ -67,6 +67,11 @@
 	</script>
     </div>
     <div id="pagecontent">
+	<script type="text/javascript">
+		<!--//
+		var AUTOSUGGEST_MAX_LENGTH = {ConfigHelper::getConfig('phpui.autosuggest_max_length')};
+		//-->
+	</script>
 	{block name="quicksearch"}
     	<div id="autosuggest"><ul><li></li></ul></div>
     	<form method="post" name="quicksearch" action="?m=quicksearch" id="quicksearch">

diff --git a/templates/default/layout.html b/templates/default/layout.html
@@ -71,14 +71,19 @@
             {/block}
             {block name=pagecontent}
             <div id="pagecontent">
+			<script type="text/javascript">
+				<!--//
+				var AUTOSUGGEST_MAX_LENGTH = {ConfigHelper::getConfig('phpui.autosuggest_max_length')};
+				//-->
+			</script>
                 {block name=quicksearch}
                 <div id="autosuggest"><ul><li></li></ul></div>
                 <form method="post" name="quicksearch" action="?m=quicksearch" id="quicksearch">
                     <table width="100%" cellpadding="0" cellspacing="0">
                         <tr>
                             <td style="width: 1%" class="nobr">
                                 {trans("Search:")}
-				{include file="quicksearchcontents.html"}
+								{include file="quicksearchcontents.html"}
                                 {* Enter key submit hack for IE *}
                                 <input type="image" src="img/empty.gif" width="0" height="0" style="border: none;">
                             </td>