mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-06 10:54:57 +02:00
Code Issues Releases Wiki Activity

kAdmin styling updates. THEME_STYLE value is now correct for admin area.

Browse Source
This commit is contained in:
Cameron 2017-10-31 13:43:42 -07:00
parent 51338d464a
commit b1ad67b0d8
4 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
class2.php
View File

@ -1368,7 +1368,11 @@ if(!defined("THEME_LAYOUT"))
}
*/
if(varset($pref['themecss']) && file_exists(THEME.$pref['themecss']))
if(deftrue('e_ADMIN_AREA'))
{
define("THEME_STYLE", $pref['admincss']);
}
elseif(varset($pref['themecss']) && file_exists(THEME.$pref['themecss']))
{
define("THEME_STYLE", $pref['themecss']);
}

25
e107_core/templates/admin_icons_template.php
View File

@ -448,20 +448,32 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
define("ADMIN_GRID_ICON", "<i class='fa fa-th'></i>");
define("ADMIN_LIST_ICON", "<i class='fa fa-th-list'></i>");
/*
if(THEME_STYLE === 'css/kadmin.css')
{
define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>");
define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>");
define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw text-danger'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>");
define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>");
*/
}
else
{
define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
define("ADMIN_SORT_ICON", "<i class='S32 e-sort-32'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
}
// define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
// define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
// define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
@ -476,8 +488,7 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
define("ADMIN_REPAIRPLUGIN_ICON", "<i class='S32 e-configure-32'></i>");
define("ADMIN_UP_ICON", "<i class='S32 e-up-32'></i>");
define("ADMIN_DOWN_ICON", "<i class='S32 e-down-32'></i>");
define("ADMIN_SORT_ICON", "<i class='S32 e-sort-32'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");

3
e107_themes/bootstrap3/admin_style.css
View File

@ -207,8 +207,9 @@ table label.checkbox { margin-left: 20px }
#admin-ui-edit-db-language span.default,
#admin-ui-list-db-language span.default { color: white }
/*
td.options .btn-group { display: flex; }
*/
.table .nav-tabs a,
.table th a, .table td a { text-decoration: none }

3
e107_themes/bootstrap3/css/kadmin.css
View File

@ -14463,6 +14463,9 @@ font-family: 'Oswald';
margin-bottom: 15px;
}
.popover { }
.popover .popover-title { background-color: #d9534f; color:white; font-weight:bold }