diff --git a/e107_plugins/faqs/faqs.php b/e107_plugins/faqs/faqs.php
index 6ecd2d81e..cfca91656 100644
--- a/e107_plugins/faqs/faqs.php
+++ b/e107_plugins/faqs/faqs.php
@@ -133,7 +133,7 @@ if (isset($_POST['commentsubmit']))
{
$srch = vartrue($_GET['srch']);
$ftmp = $faq->view_all($srch);
- $caption = LAN_FAQS_FAQ;
+ $caption = LAN_FAQS_011;
}
@@ -178,7 +178,7 @@ if (isset($_POST['commentsubmit']))
if($action == "cat" && $idx)
{
$ftmp = $faq->view_faq($idx) ;
- define("e_PAGETITLE",LAN_FAQS_FAQ." - ". $ftmp['title']);
+ define("e_PAGETITLE",LAN_FAQS_011." - ". $ftmp['title']);
require_once(HEADERF);
$ns -> tablerender($ftmp['caption'], $ftmp['text']);
}
@@ -229,7 +229,7 @@ class faq
if(!empty($this->pref['submit_question_limit']) && $existing >= $this->pref['submit_question_limit'])
{
- e107::getMessage()->setTitle(LAN_WARNING,E_MESSAGE_INFO)->addInfo(LAN_FAQS_LIMIT_REACHED);
+ e107::getMessage()->setTitle(LAN_WARNING,E_MESSAGE_INFO)->addInfo(LAN_FAQS_005);
return;
}
@@ -250,7 +250,7 @@ class faq
if($sql->insert('faqs',$insert))
{
- $message = !empty($this->pref['submit_question_acknowledgement']) ? e107::getParser()->toHtml($this->pref['submit_question_acknowledgement'],true, 'BODY') : LAN_FAQS_ASKQUESTION_AFTER;
+ $message = !empty($this->pref['submit_question_acknowledgement']) ? e107::getParser()->toHtml($this->pref['submit_question_acknowledgement'],true, 'BODY') : LAN_FAQS_004;
e107::getMessage()->addSuccess($message);
}
@@ -284,7 +284,7 @@ class faq
$text .= $tp->parseTemplate($template['end'], true, $this->sc); // footer
- $ret['title'] = LAN_FAQS_FAQ;
+ $ret['title'] = LAN_FAQS_011;
$ret['text'] = $text;
if (!empty($this->pref['page_title'][e_LANGUAGE]))
@@ -329,10 +329,10 @@ class faq
$insert = " AND (f.faq_question LIKE '%".$srch."%' OR f.faq_answer LIKE '%".$srch."%' OR FIND_IN_SET ('".$srch."', f.faq_tags) ) ";
- $message = "".$srch." ×";
+ // $message = "".$srch." ×";
- e107::getMessage()->setClose(false,E_MESSAGE_INFO)->setTitle(LAN_FAQS_FILTER_ACTIVE,E_MESSAGE_INFO)->addInfo($message);
- $text = e107::getMessage()->render();
+ // e107::getMessage()->setClose(false,E_MESSAGE_INFO)->setTitle(LAN_FAQS_002,E_MESSAGE_INFO)->addInfo($message);
+ // $text = e107::getMessage()->render();
}
if(!empty($_GET['id'])) // pull out just one specific FAQ.
@@ -355,9 +355,9 @@ class faq
$insert = " AND FIND_IN_SET ('".$srch."', f.faq_tags) ";
- $message = "".$srch." ×";
+ $message = "".$srch." ×";
- e107::getMessage()->setClose(false,E_MESSAGE_INFO)->setTitle(LAN_FAQS_FILTER_ACTIVE,E_MESSAGE_INFO)->addInfo($message);
+ e107::getMessage()->setClose(false,E_MESSAGE_INFO)->setTitle(LAN_FAQS_002,E_MESSAGE_INFO)->addInfo($message);
$text = e107::getMessage()->render();
}
@@ -368,7 +368,7 @@ class faq
if(!$data = $sql->retrieve($query, true))
{
- $message = (!empty($srch)) ? e107::getParser()->lanVars(LAN_FAQS_X_NOT_FOUND, $srch)."".LAN_FAQS_RESET."" : LAN_FAQS_NONE_AVAILABLE;
+ $message = (!empty($srch)) ? e107::getParser()->lanVars(LAN_FAQS_008, $srch)."".LAN_FAQS_007."" : LAN_FAQS_003;
return "
".$message."
" ;
}
@@ -475,7 +475,7 @@ class faq
$text .= $tp->parseTemplate($FAQ_LIST_END, true);
- $ret['title'] = LAN_FAQS_FAQ." - ".$category_title;
+ $ret['title'] = LAN_FAQS_011." - ".$category_title;
$ret['text'] = $text.$this->faq_footer($id);
$ret['caption'] = $caption;
return $ret;
@@ -601,7 +601,7 @@ class faq
if (ADMIN && getperms("B"))
{
// bkwon 05-Jun-2004 fix URL to moderate comment
- echo "
";
+ echo "
";
}
}
$cobj->form_comment($action, $table, $idx.".".$id, $subject, $content_type);
@@ -614,7 +614,7 @@ class faq
{
global $faqpref,$timing_start,$tp,$cust_footer, $CUSTOMPAGES, $CUSTOMHEADER, $CUSTOMHEADER;
$text_menu .= "
- [
".LAN_FAQS_BACK_TO_CATEGORIES." ] ";
+ [
".LAN_FAQS_010." ] ";
if(check_class($faqpref['add_faq'])){
$text_menu .="[
".LAN_FAQS_ASK_A_QUESTION." ]";
diff --git a/e107_plugins/faqs/faqs_shortcodes.php b/e107_plugins/faqs/faqs_shortcodes.php
index 7b76ae1c1..30daf3f93 100644
--- a/e107_plugins/faqs/faqs_shortcodes.php
+++ b/e107_plugins/faqs/faqs_shortcodes.php
@@ -90,7 +90,7 @@ class faqs_shortcodes extends e_shortcode
if(vartrue($params['tags']) && $this->var['faq_tags'])
{
- $text .= "
".LAN_FAQS_TAGS.": ".$this->sc_faq_tags()."
";
+ $text .= "
".LAN_FAQS_001.": ".$this->sc_faq_tags()."
";
}
if($this->datestamp == true)
@@ -297,8 +297,8 @@ class faqs_shortcodes extends e_shortcode
{
$text .= $frm->open('faq-ask-question','post');
//TODO LAN ie. [x] character limit.
- $text .= "
".$frm->textarea('ask_a_question','',3, 80 ,array('maxlength'=>$this->questionCharLimit, 'size'=>'xxlarge','placeholder'=>LAN_FAQS_ENTER_A_QUESTION_HERE, 'wrap'=>'soft'))."
-
".$this->questionCharLimit." ".LAN_FAQS_CHAR_LIMIT."
".$frm->submit('submit_a_question',LAN_SUBMIT)."
";
+ $text .= "
".$frm->textarea('ask_a_question','',3, 80 ,array('maxlength' =>$this->questionCharLimit, 'size' =>'xxlarge', 'placeholder' =>LAN_FAQS_012, 'wrap' =>'soft'))."
+
".$this->questionCharLimit." ".LAN_FAQS_013."
".$frm->submit('submit_a_question',LAN_SUBMIT)."
";
$text .= $frm->close();
}
@@ -309,12 +309,12 @@ class faqs_shortcodes extends e_shortcode
']' => ""
);
- $text .= str_replace(array_keys($srp), array_values($srp), LAN_FAQS_PLEASE_REGISTER);
+ $text .= str_replace(array_keys($srp), array_values($srp), LAN_FAQS_014);
}
else
{
- $text .= LAN_FAQS_NOT_PERMITTED;
+ $text .= LAN_FAQS_015;
}
$text .= "
";
@@ -341,7 +341,7 @@ class faqs_shortcodes extends e_shortcode
{
$text = "";
- $text .= "
".LAN_FAQS_YOUR_REQUESTED_FAQS."
";
+ $text .= "
".LAN_FAQS_016."
";
$text .= "
";
foreach($list as $row)
@@ -388,6 +388,11 @@ class faqs_shortcodes extends e_shortcode
$array = array();
// $array[0] = array('url'=> e_REQUEST_SELF, 'text'=>LAN_PLUGIN_FAQS_NAME);
$array[0] = array('url'=> e107::url('faqs','index'), 'text'=>LAN_PLUGIN_FAQS_NAME);
+
+ if(!empty($_GET['srch']))
+ {
+ $array[1] = array('url'=> null, 'text'=>LAN_FAQS_002 .": ".e107::getParser()->filter($_GET['srch'], 'w'));
+ }
return e107::getForm()->breadcrumb($array);
diff --git a/e107_plugins/faqs/languages/English/English_front.php b/e107_plugins/faqs/languages/English/English_front.php
index 8769581c3..9cce0507f 100644
--- a/e107_plugins/faqs/languages/English/English_front.php
+++ b/e107_plugins/faqs/languages/English/English_front.php
@@ -10,20 +10,19 @@
*
*/
-define("LAN_FAQS_TAGS", "Tags");
-define("LAN_FAQS_FILTER_ACTIVE", "Filter Active");
-define("LAN_FAQS_NONE_AVAILABLE", "There are currently no FAQs available.");
-define("LAN_FAQS_ASKQUESTION_AFTER", "Thank you. Your question has been saved and will be answered as soon as possible.");
-define("LAN_FAQS_LIMIT_REACHED", "You have reached the maximum number of new questions. You may ask more once your existing questions have been answered.");
-define("LAN_FAQS_REMOVE", "Remove");
-define("LAN_FAQS_RESET", "Reset");
-define("LAN_FAQS_X_NOT_FOUND", "[x]: Not found in search results.");
-define("LAN_FAQS_MODERATE_COMMENTS", "moderate comments");
-define("LAN_FAQS_BACK_TO_CATEGORIES", "Back to Categories");
-//define("LAN_FAQS_ASK_A_QUESTION", "Ask a Question");// moved to english_global
-define("LAN_FAQS_FAQ", "FAQ");
-define("LAN_FAQS_ENTER_A_QUESTION_HERE", "Enter your question here...");
-define("LAN_FAQS_CHAR_LIMIT", "character limit");
-define("LAN_FAQS_PLEASE_REGISTER", "Please [register] and/or login to post a question.");
-define("LAN_FAQS_NOT_PERMITTED", "Not permitted.");
-define("LAN_FAQS_YOUR_REQUESTED_FAQS", "You have requested answers to the following questions:");
+define("LAN_FAQS_001", "Tags");
+define("LAN_FAQS_002", "Filter");
+define("LAN_FAQS_003", "There are currently no FAQs available.");
+define("LAN_FAQS_004", "Thank you. Your question has been saved and will be answered as soon as possible.");
+define("LAN_FAQS_005", "You have reached the maximum number of new questions. You may ask more once your existing questions have been answered.");
+define("LAN_FAQS_006", "Remove");
+define("LAN_FAQS_007", "Reset");
+define("LAN_FAQS_008", "[x]: Not found in search results.");
+define("LAN_FAQS_009", "moderate comments");
+define("LAN_FAQS_010", "Back to Categories");
+define("LAN_FAQS_011", "FAQ");
+define("LAN_FAQS_012", "Enter your question here...");
+define("LAN_FAQS_013", "character limit");
+define("LAN_FAQS_014", "Please [register] and/or login to post a question.");
+define("LAN_FAQS_015", "Not permitted.");
+define("LAN_FAQS_016", "You have requested answers to the following questions:");
diff --git a/e107_themes/bootstrap3/theme.php b/e107_themes/bootstrap3/theme.php
index 6e971e0ed..ab99eb719 100644
--- a/e107_themes/bootstrap3/theme.php
+++ b/e107_themes/bootstrap3/theme.php
@@ -45,7 +45,7 @@ switch($cndPref)
/* @example prefetch */
//e107::link(array('rel'=>'prefetch', 'href'=>THEME.'images/browsers.png'));
-e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips.
+e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'});"); // activate bootstrap tooltips.
// Legacy Stuff.
define('OTHERNEWS_COLS',false); // no tables, only divs.