mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-03-14 01:19:44 +01:00
Code Issues Releases Wiki Activity

Issue #6 - LAN naming fix. Chrome CSS layout issues corrected. Admin Login page restyled using bootstrap3 markup.

Browse Source
This commit is contained in:
Cameron 2015-08-20 16:30:28 -07:00
parent 0176b3e3fd
commit 01cac03324
6 changed files with 35 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
e107_admin/auth.php
View File

@ -232,11 +232,13 @@ else
*/
}
#login-admin div.panel { padding: 0 }
#login-admin label { display: none; text-align: right }
.admin-submit { text-align: center; padding:20px; }
.admin-submit { text-align: center; padding-top:20px; }
.submit { }
@ -254,9 +256,9 @@ else
#userpass {background: url(".e_IMAGE."admin_images/lock_16.png) no-repeat scroll 7px 9px; padding:7px;padding-left:30px; width:80%; max-width:218px; }
#code-verify { padding: 7px; width: 140px }
#code-verify { width: 220px; padding: 7px; margin-left: auto; margin-right: auto; }
input[disabled] { color: silver; }
input[disabled] { color: silver; }
button[disabled] span { color: silver; }
.title_clean { display:none; }
@ -295,12 +297,12 @@ class auth
$text = "<form id='admin-login' method='post' action='".e_SELF."' {$incChap} >
<div id='logo' ><img src='".e_IMAGE."logo_template_large.png' alt='login' /></div>
<div id='login-admin' class='well center'>
<div id='login-admin' class='center'>
<div {$class}>
<div class='navbar navbar-inner'>
<h4>admin area</h4>
</div>
<div>
<div class='panel well panel-primary'>
<div class='panel-heading'><h3 class='panel-title'>".LAN_HEADER_04."</h3></div>
<div class='panel-body'>
<div class='field'>
<label for='username'>".ADLAN_89."</label>
<input class='tbox e-tip' type='text' autofocus required='required' name='authname' placeholder='".ADLAN_89."' id='username' size='30' value='' maxlength='".varset($pref['loginname_maxlength'], 30)."' />
@ -317,7 +319,7 @@ class auth
{
$text .= "
<div class='field'>
<label for='code_verify'>".LAN_ENTER_CODE."</label>"
<label for='code-verify'>".LAN_ENTER_CODE."</label>"
.$sec_img->renderImage().
$sec_img->renderInput()."
</div>";
@ -334,6 +336,7 @@ class auth
$text .= "</div></div>
</div>
</div>
</div>
</form>";
e107::getRender()->tablerender("", $text, 'admin-login');

2
e107_admin/header.php
View File

@ -182,7 +182,7 @@ else // XHTML
echo "<meta name=\"viewport\" content=\"width=device-width; initial-scale=1; maximum-scale=1\" />\n"; // Works better for iOS but still has some issues.
// echo (defined("VIEWPORT")) ? "<meta name=\"viewport\" content=\"".VIEWPORT."\" />\n" : "";
echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_head_4." :: ".SITENAME."</title>\n";
echo "<title>".(defined("e_PAGETITLE") ? e_PAGETITLE." - " : (defined("PAGE_NAME") ? PAGE_NAME." - " : "")).LAN_HEADER_04." :: ".SITENAME."</title>\n";
// print_a(get_included_files());
//

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

@ -589,11 +589,11 @@ class admin_shortcodes
$str = str_replace('.', '', ADMINPERMS);
if (ADMINPERMS == '0')
{
return '<b>'.ADLAN_48.':</b> '.ADMINNAME.' ('.ADLAN_49.') '.( defined('e_DBLANGUAGE') ? '<b>'.LAN_head_5.'</b>: '.e_DBLANGUAGE : '' );
return '<b>'.ADLAN_48.':</b> '.ADMINNAME.' ('.ADLAN_49.') '.( defined('e_DBLANGUAGE') ? '<b>'.LAN_HEADER_05.'</b>: '.e_DBLANGUAGE : '' );
}
else
{
return '<b>'.ADLAN_48.':</b> '.ADMINNAME.' '.( defined('e_DBLANGUAGE') ? '<b>'.LAN_head_5.'</b>: '.e_DBLANGUAGE : '' );
return '<b>'.ADLAN_48.':</b> '.ADMINNAME.' '.( defined('e_DBLANGUAGE') ? '<b>'.LAN_HEADER_05.'</b>: '.e_DBLANGUAGE : '' );
}
}
else
@ -780,11 +780,11 @@ class admin_shortcodes
ob_start();
if(!FILE_UPLOADS)
{
echo message_handler('ADMIN_MESSAGE', LAN_head_2, __LINE__, __FILE__);
echo message_handler('ADMIN_MESSAGE', LAN_HEADER_02, __LINE__, __FILE__);
}
/*
if(OPEN_BASEDIR){
echo message_handler('ADMIN_MESSAGE', LAN_head_3, __LINE__, __FILE__);
echo message_handler('ADMIN_MESSAGE', LAN_HEADER_03, __LINE__, __FILE__);
}
*/
$message_text = ob_get_contents();
@ -880,7 +880,7 @@ class admin_shortcodes
$e107_var['lout']['link']=e_ADMIN_ABS.'admin.php?logout';
$text = e_admin_menu('', '', $e107_var);
return $ns->tablerender(LAN_head_1, $text, array('id' => 'admin_nav', 'style' => 'button_menu'), TRUE);
return $ns->tablerender(LAN_HEADER_01, $text, array('id' => 'admin_nav', 'style' => 'button_menu'), TRUE);
}
}
@ -940,7 +940,7 @@ class admin_shortcodes
}
}
$caption = LAN_head_6;
$caption = LAN_HEADER_06;
if ($i>0 && $pref['admin_alerts_uniquemenu'] == 1)
{
$ns -> tablerender($caption, $text);

5
e107_handlers/admin_ui.php
View File

@ -5902,7 +5902,10 @@ class e_admin_form_ui extends e_form
".$filter_pre."
<div class='row-fluid'>
<div class='left form-inline span8 col-md-8' >
".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i>
<span class='form-group has-feedback has-feedback-left'>
".$this->text('searchquery', $current_query[0], 50, $input_options)."
<i class='fa fa-search searchquery form-control-feedback form-control-feedback-left'></i>
<span>
".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."
".$this->option(LAN_FILTER_LABEL_DISPLAYALL, '')."
".$this->option(LAN_FILTER_LABEL_CLEAR, '___reset___')."

14
e107_languages/English/admin/lan_header.php
View File

@ -1,16 +1,16 @@
<?php
/*
* Copyright (C) 2008-2013 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* Copyright (C) 2008-2015 e107 Inc (e107.org), Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
*
* Admin Language File
*
*/
define("LAN_head_1", "Admin Navigation");
define("LAN_head_2", "Your server does not allow HTTP file uploads so it will not be possible for your users to upload avatars/files etc. To rectify this set file_uploads to On in your php.ini and restart your server. If you don't have access to your php.ini contact your hosts.");
define("LAN_head_3", "Your server is running with a basedir restriction in effect. This disallows usage of any file outside of your home directory and as such could affect certain scripts such as the filemanager.");
define("LAN_head_4", "Admin Area");
define("LAN_head_5", "language displayed in admin area");
define("LAN_head_6", "Plugins info");
define("LAN_HEADER_01", "Admin Navigation");
define("LAN_HEADER_02", "Your server does not allow HTTP file uploads so it will not be possible for your users to upload avatars/files etc. To rectify this set file_uploads to On in your php.ini and restart your server. If you don't have access to your php.ini contact your hosts.");
define("LAN_HEADER_03", "Your server is running with a basedir restriction in effect. This disallows usage of any file outside of your home directory and as such could affect certain scripts such as the filemanager.");
define("LAN_HEADER_04", "Admin Area");
define("LAN_HEADER_05", "language displayed in admin area");
define("LAN_HEADER_06", "Plugins info");
?>

7
e107_themes/bootstrap3/admin_style.css
View File

@ -126,8 +126,11 @@ table label.checkbox { margin-left: 20px }
#admin-ui-list-batch { padding: 10px 15px }
#admin-ui-list-batch img { padding-top:5px }
#admin-ui-list-filter { margin-bottom: 15px }
#admin-ui-list-filter i.searchquery { z-index:100; position:relative; left:-160px; top:3px }
#admin-ui-list-filter #searchquery { padding-left:22px; margin-right:-12px; }
.form-control-feedback-left { left:0; top:0 }
.has-feedback-left input { padding-left:30px; }
/* #admin-ui-list-filter #searchquery { padding-left:22px; } */
#admin-ui-list-db-language { padding-top:20px ; padding-right:30px }
#admin-ui-list-total-records { padding-top:5px }
#admin-ui-list-filter .row-fluid { margin-left: -15px; margin-right: -15px }