From 474a7df56611c19e1779230875f59b4c2bf1812b Mon Sep 17 00:00:00 2001 From: Cameron Date: Mon, 4 Mar 2013 02:47:51 -0800 Subject: [PATCH] More Plugin Manager Lookup fixes. And bbarea expand option fixes. --- e107_admin/plugin.php | 14 +++++++------- e107_handlers/form_handler.php | 16 +++++++++++++--- e107_plugins/faqs/admin_config.php | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index a2955d686..83dd12a54 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -150,17 +150,17 @@ class pluginManager{ "plugin_checkboxes" => array("title" => "", "forced"=>TRUE, "width"=>"3%"), "plugin_icon" => array("title" => EPL_ADLAN_82, "type"=>"icon", "width" => "5%", "thclass" => "middle center",'class'=>'center', "url" => ""), - "plugin_name" => array("title" => EPL_ADLAN_10, "type"=>"text", "width" => "20%", "thclass" => "middle", "url" => ""), + "plugin_name" => array("title" => EPL_ADLAN_10, "type"=>"text", "width" => "15%", "thclass" => "middle", "url" => ""), "plugin_version" => array("title" => EPL_ADLAN_11, "type"=>"numeric", "width" => "5%", "thclass" => "middle", "url" => ""), "plugin_date" => array("title" => "Released ", "type"=>"text", "width" => "auto", "thclass" => "middle"), "plugin_folder" => array("title" => EPL_ADLAN_64, "type"=>"text", "width" => "10%", "thclass" => "middle", "url" => ""), "plugin_category" => array("title" => LAN_CATEGORY, "type"=>"text", "width" => "10%", "thclass" => "middle", "url" => ""), - "plugin_author" => array("title" => EPL_ADLAN_12, "type"=>"text", "width" => "auto", "thclass" => "middle", "url" => ""), + "plugin_author" => array("title" => EPL_ADLAN_12, "type"=>"text", "width" => "5%", "thclass" => "middle", "url" => ""), "plugin_website" => array("title" => EPL_WEBSITE, "type"=>"url", "width" => "5%", "thclass" => "middle center", "url" => ""), - "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "auto", "thclass" => "middle", "url" => ""), + "plugin_compatible" => array("title" => EPL_ADLAN_13, "type"=>"text", "width" => "5%", "thclass" => "middle", "url" => ""), - "plugin_description" => array("title" => EPL_ADLAN_14, "type"=>"text", "width" => "auto", "thclass" => "middle center", "url" => ""), + "plugin_description" => array("title" => EPL_ADLAN_14, "type"=>"bbarea", "width" => "30%", "thclass" => "middle center", 'readParms' => 'expand=1&truncate=180&bb=1'), "plugin_compliant" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), // "plugin_release" => array("title" => EPL_ADLAN_81, "type"=>"text", "width" => "5%", "thclass" => "middle center", "url" => ""), // "plugin_notes" => array("title" => EPL_ADLAN_83, "type"=>"url", "width" => "5%", "thclass" => "middle center", "url" => ""), @@ -326,7 +326,7 @@ class pluginManager{ 'plugin_category' => vartrue($r['category'][0]), 'plugin_author' => vartrue($row['author']), 'plugin_version' => $row['version'], - 'plugin_description' => $tp->text_truncate(vartrue($r['description'][0]),200), + 'plugin_description' => nl2br(vartrue($r['description'][0])), 'plugin_compatible' => $badge, 'plugin_website' => vartrue($row['authorUrl']), @@ -359,7 +359,7 @@ class pluginManager{ - +
".$frm->colGroup($fieldList,$this->fieldpref). $frm->thead($fieldList,$this->fieldpref)." @@ -380,7 +380,7 @@ class pluginManager{ continue; } // echo '
v='.$v; - $text .= "\n"; + $text .= "\n"; } $text .= ""; $text .= ""; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 26eeac9ee..dd44746c8 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -2332,8 +2332,15 @@ class e_form if(!vartrue($parms['noparse'])) $value = $tp->toHTML($value, (vartrue($parms['bb']) ? true : false), vartrue($parms['parse'])); if(vartrue($parms['expand']) || vartrue($parms['truncate']) || vartrue($parms['htmltruncate'])) { - $ttl = vartrue($parms['expand'], ' ...'); - $expand = ' '.defset($ttl, $ttl).""; + $ttl = vartrue($parms['expand']); + if($ttl == 1) + { + $ttl = ""; + // $expand = ""; + } + + $expands = ''.defset($ttl, $ttl).""; + } $oldval = $value; @@ -2352,8 +2359,11 @@ class e_form if($toexpand) { // force hide! TODO - core style .expand-c (expand container) - $value .= ''; + $value .= ''; + $value .= $expands; // Keep it at the bottom so it does't cut the sentence. } + + break; case 'icon': diff --git a/e107_plugins/faqs/admin_config.php b/e107_plugins/faqs/admin_config.php index 4276f6ef3..a984c5745 100644 --- a/e107_plugins/faqs/admin_config.php +++ b/e107_plugins/faqs/admin_config.php @@ -189,7 +189,7 @@ class faq_main_ui extends e_admin_ui 'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'), 'faq_id' => array('title'=> LAN_ID, 'tab' => 0, 'type' => 'int', 'width' =>'5%', 'forced'=> TRUE), 'faq_question' => array('title'=> "Question", 'tab' => 0, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first', 'required'=>TRUE, 'readParms'=>'editable=1'), - 'faq_answer' => array('title'=> "Answer", 'tab' => 0, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=...&truncate=50&bb=1'), + 'faq_answer' => array('title'=> "Answer", 'tab' => 0, 'type' => 'bbarea', 'width' => '30%', 'readParms' => 'expand=1&truncate=50&bb=1'), 'faq_parent' => array('title'=> LAN_CATEGORY, 'tab' => 0, 'type' => 'dropdown', 'data'=> 'int', 'inline'=>true,'width' => '10%', 'filter'=>TRUE, 'batch'=>TRUE), 'faq_comment' => array('title'=> "Comment", 'tab' => 1, 'type' => 'userclass', 'data' => 'int', 'width' => 'auto', 'inline'=> true), // User id 'faq_datestamp' => array('title'=> LAN_DATE, 'tab' => 1, 'type' => 'datestamp', 'data'=> 'int','width' => 'auto', 'noedit' => false,'writeParms'=>'auto=1'),
".$frm->renderValue($v, $val[$v], $this->fields[$v])."".$frm->renderValue($v, $val[$v], $this->fields[$v], $key)."".$this->options($val)."