mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-18 04:12:00 +02:00
Code Issues Releases Wiki Activity

Merged upstream repository changes into this fork.

Browse Source
This commit is contained in:
lonalore
2016-11-09 11:11:33 +01:00
parent 7ccfe297dc 1bed9da9ab
commit 8c2c60fefd
13 changed files with 604 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -506,9 +506,8 @@ class admin_shortcodes
// $text .= "</div>";
return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, 'core-menu-latest', TRUE) : $text;
$ns->setUniqueId('e-latest-list');
return ($parm != 'norender') ? $ns -> tablerender(ADLAN_LAT_1, $text, '', TRUE) : $text;
}
}
@@ -982,6 +981,7 @@ class admin_shortcodes
if ($pref['adminpwordchange'] && ((ADMINPWCHANGE+2592000) < time()))
{
$text = "<div style='mediumtext; text-align:center'>".ADLAN_102." <a href='".e_ADMIN."updateadmin.php'>".ADLAN_103.'</a></div>';
$ns->setUniqueId('e-password-change');
return $ns -> tablerender(ADLAN_104, $text, '', true);
}
}
@@ -1207,8 +1207,8 @@ class admin_shortcodes
// $text .= "\n\t\t\t\t\t</div>";
return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, 'core-menu-status', TRUE) : $text;
$ns->setUniqueId('e-status-list');
return ($parm != 'norender') ? $ns -> tablerender(LAN_STATUS, $text, '', TRUE) : $text;
}
}

4
e107_core/templates/search_template.php
View File

@@ -27,7 +27,7 @@ if(!isset($SEARCH_SHORTCODE))
if(!isset($SEARCH_TOP_TABLE))
{
$SEARCH_TOP_TABLE = "<div>
<form id='searchform' method='get' action='".e_SELF."'>
<form id='searchform' method='get' action='{SEARCH_FORM_URL}'>
<table style='".USER_WIDTH."' class='table fborder'><tr>
<td class='forumheader3' style='width: 40%'>".LAN_199."</td>
<td class='forumheader3' style='width: 60%; white-space: nowrap'>
@@ -135,7 +135,7 @@ if(!isset($POST_CHECKBOXES))
$SEARCH_TEMPLATE['form']['start'] = '
<form class="form-horizontal" role="form" id="searchform" method="get" action="'.e_SELF.'">
<form class="form-horizontal" role="form" id="searchform" method="get" action="{SEARCH_FORM_URL}">
<div class="form-group">
<label for="inputEmail3" class="col-sm-3 control-label">'.LAN_199.'</label>
<div class="col-sm-9">{SEARCH_MAIN}