mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-25 00:41:52 +02:00
Code Issues Releases Wiki Activity

Optimized search form template for Bootstrap5 and Bootstrap3.

Browse Source
This commit is contained in:
Cameron
2022-03-07 11:39:09 -08:00
parent f008483a8d
commit 06de1752d4
2 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/templates/search_template.php
View File

@@ -6,9 +6,9 @@ if (!defined('e107_INIT')) { exit; }
$SEARCH_TEMPLATE['form']['start'] = ' $SEARCH_TEMPLATE['form']['start'] = '
<form class="form-horizontal" id="searchform" method="get" action="{SEARCH_FORM_URL}"> <form class="form-horizontal" id="searchform" method="get" action="{SEARCH_FORM_URL}">
<div class="form-group"> <div class="form-group mb-3">
<label for="q" class="col-sm-3 control-label">{LAN=199}</label> <label for="q" class="col-sm-3 control-label">{LAN=199}</label>
<div class="col-sm-9">{SEARCH_MAIN} <div class="col-sm-8">{SEARCH_MAIN}
</div> </div>
</div> </div>
<div id="search-enhanced" {ENHANCED_DISPLAY}> <div id="search-enhanced" {ENHANCED_DISPLAY}>
@@ -29,7 +29,7 @@ $SEARCH_TEMPLATE['form']['advanced'] = '
$SEARCH_TEMPLATE['form']['enhanced'] = ' $SEARCH_TEMPLATE['form']['enhanced'] = '
<div id="{ENHANCED_DISPLAY_ID}" class="form-group"> <div id="{ENHANCED_DISPLAY_ID}" class="form-group mb-3">
<label for="{ENHANCED_DISPLAY_FIELDNAME}" class="col-sm-3 control-label">{ENHANCED_TEXT}</label> <label for="{ENHANCED_DISPLAY_FIELDNAME}" class="col-sm-3 control-label">{ENHANCED_TEXT}</label>
<div class="col-sm-9"> <div class="col-sm-9">
{ENHANCED_FIELD} {ENHANCED_FIELD}
@@ -48,9 +48,9 @@ $SEARCH_TEMPLATE['form']['type'] = '
*/ */
$SEARCH_TEMPLATE['form']['category'] = ' $SEARCH_TEMPLATE['form']['category'] = '
<div class="form-group"> <div class="form-group ">
<label for="t" class="col-sm-3 control-label">{LAN=SEARCH_19}</label> <label for="t" class="col-sm-3 control-label">{LAN=SEARCH_19}</label>
<div class="col-sm-9"> <div class="col-sm-9 checkbox form-check-inline">
{SEARCH_MAIN_CHECKBOXES}{SEARCH_DROPDOWN}&nbsp; {SEARCH_MAIN_CHECKBOXES}{SEARCH_DROPDOWN}&nbsp;
</div> </div>

33
search.php
View File

@@ -161,9 +161,9 @@ class search_front extends e_shortcode
$tp = e107::getParser(); $tp = e107::getParser();
$value = isset($_GET['q']) ? $tp->post_toForm($_GET['q']) : ""; $value = isset($_GET['q']) ? $tp->post_toForm($_GET['q']) : "";
$text = "<div class='input-group'> $text = "<div class='input-group input-group-btn'>
<input class='tbox form-control m_search' type='text' id='q' name='q' size='35' value='".$value."' maxlength='50' /> <input class='tbox form-control m_search' type='text' id='q' name='q' size='35' value='".$value."' maxlength='50' />
<div class='input-group-btn'> <div class='btn-group'>
<button class='btn btn-primary' type='submit' name='s' value='1' data-loading-icon='fa-spinner' >".$tp->toGlyph('fa-search',false)."</button>"; <button class='btn btn-primary' type='submit' name='s' value='1' data-loading-icon='fa-spinner' >".$tp->toGlyph('fa-search',false)."</button>";
if(empty($parm['mode'])) if(empty($parm['mode']))
@@ -175,8 +175,8 @@ class search_front extends e_shortcode
$text .= "<span class='caret'></span></button>"; $text .= "<span class='caret'></span></button>";
} }
$text .= '<ul class="dropdown-menu pull-right"> $text .= '<ul class="dropdown-menu dropdown-menu-end pull-right">
<li><a class="e-expandit" href="#" data-target="search-advanced,search-enhanced"><small>'.LAN_SEARCH_202.'</small></a></li> <li><a class="dropdown-item e-expandit" href="#" data-target="search-advanced,search-enhanced"><small>'.LAN_SEARCH_202.'</small></a></li>
</ul>'; </ul>';
} }
@@ -264,8 +264,8 @@ class search_front extends e_shortcode
{ {
// standard search config // standard search config
$dropdown = ''; $dropdown = '';
$PRE_CHECKBOXES = ''; $PRE_CHECKBOXES = '<label class="checkbox form-check">';
$POST_CHECKBOXES = ''; $POST_CHECKBOXES = '</label>';
$search_count = count($this->search_info); $search_count = count($this->search_info);
$google_id = $search_count + 1; $google_id = $search_count + 1;
@@ -301,7 +301,7 @@ class search_front extends e_shortcode
} }
else if ($this->search_prefs['selector'] == 1) else if ($this->search_prefs['selector'] == 1)
{ {
$checkboxes .= $PRE_CHECKBOXES."<input ".$google_js." type='checkbox' name='t[".$key."]' ".$sel." />".$value['qtype'].$POST_CHECKBOXES; $checkboxes .= $PRE_CHECKBOXES."<input ".$google_js." class='form-check-input' type='checkbox' name='t[".$key."]' ".$sel." />".$value['qtype'].$POST_CHECKBOXES;
} }
else else
{ {
@@ -318,7 +318,7 @@ class search_front extends e_shortcode
else if else if
($this->search_prefs['selector'] == 1) //FIXME PRE_CHECKBOXES and POST_CHECKBOXES ($this->search_prefs['selector'] == 1) //FIXME PRE_CHECKBOXES and POST_CHECKBOXES
{ {
$checkboxes .= $PRE_CHECKBOXES."<input id='google' type='checkbox' name='t[".$google_id."]' onclick='uncheckAll(this)' />Google".$POST_CHECKBOXES; $checkboxes .= $PRE_CHECKBOXES."<input id='google' class='form-check-input' type='checkbox' name='t[".$google_id."]' onclick='uncheckAll(this)' />Google".$POST_CHECKBOXES;
} }
else else
{ {
@@ -455,13 +455,15 @@ class search_front extends e_shortcode
$vars['SEARCH_ADV_A'] = $adv_value['text']; $vars['SEARCH_ADV_A'] = $adv_value['text'];
$vars['SEARCH_ADV_B'] = " $vars['SEARCH_ADV_B'] = "
<div class='form-inline'> <div class='form-inline row row-cols-lg-auto g-3'>
<select id='on' name='on' class='tbox form-control '> <div class='col col-sm-3'>
<option value='new' ".($_GET['on'] == 'new' ? "selected='selected'" : "").">".LAN_SEARCH_34."</option> <select id='on' name='on' class='tbox form-control col'>
<option value='old' ".($_GET['on'] == 'old' ? "selected='selected'" : "").">".LAN_SEARCH_35."</option> <option value='new' ".($_GET['on'] == 'new' ? "selected='selected'" : "").">".LAN_SEARCH_34."</option>
</select>&nbsp; <option value='old' ".($_GET['on'] == 'old' ? "selected='selected'" : "").">".LAN_SEARCH_35."</option>
</select>&nbsp;
<select id='time' name='time' class='tbox form-control '>"; </div>
<div class='col'>
<select id='time' name='time' class='tbox form-control'>";
$time = array(LAN_SEARCH_36 => 'any', LAN_SEARCH_37 => 86400, LAN_SEARCH_38 => 172800, LAN_SEARCH_39 => 259200, LAN_SEARCH_40 => 604800, LAN_SEARCH_41 => 1209600, LAN_SEARCH_42 => 1814400, LAN_SEARCH_43 => 2628000, LAN_SEARCH_44 => 5256000, LAN_SEARCH_45 => 7884000, LAN_SEARCH_46 => 15768000, LAN_SEARCH_47 => 31536000, LAN_SEARCH_48 => 63072000, LAN_SEARCH_49 => 94608000); $time = array(LAN_SEARCH_36 => 'any', LAN_SEARCH_37 => 86400, LAN_SEARCH_38 => 172800, LAN_SEARCH_39 => 259200, LAN_SEARCH_40 => 604800, LAN_SEARCH_41 => 1209600, LAN_SEARCH_42 => 1814400, LAN_SEARCH_43 => 2628000, LAN_SEARCH_44 => 5256000, LAN_SEARCH_45 => 7884000, LAN_SEARCH_46 => 15768000, LAN_SEARCH_47 => 31536000, LAN_SEARCH_48 => 63072000, LAN_SEARCH_49 => 94608000);
@@ -471,6 +473,7 @@ class search_front extends e_shortcode
} }
$vars['SEARCH_ADV_B'] .= "</select> $vars['SEARCH_ADV_B'] .= "</select>
</div>
</div>"; </div>";
} }
else if ($adv_value['type'] == 'author') else if ($adv_value['type'] == 'author')