diff --git a/README.md b/README.md index 3b42dd7..713b251 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # imscp-theme-bootstrap -Vanilla bootstrap 3 theme for i-MSCP hosting panel +Vanilla Bootstrap 4 theme for i-MSCP hosting panel diff --git a/admin/admin_add.phtml b/admin/admin_add.phtml new file mode 100644 index 0000000..6eaa3fd --- /dev/null +++ b/admin/admin_add.phtml @@ -0,0 +1,94 @@ +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ + +
+
diff --git a/admin/admin_add.tpl b/admin/admin_add.tpl deleted file mode 100644 index 44c9304..0000000 --- a/admin/admin_add.tpl +++ /dev/null @@ -1,97 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_CORE_DATA}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_ADDITIONAL_DATA}
- -
- -
- - -
-
diff --git a/admin/admin_edit.tpl b/admin/admin_edit.tpl deleted file mode 100644 index bcffb35..0000000 --- a/admin/admin_edit.tpl +++ /dev/null @@ -1,97 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - -
{TR_CORE_DATA}
{TR_USERNAME}{USERNAME}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_ADDITIONAL_DATA}
- -
-
- - - -
-
diff --git a/admin/circular.tpl b/admin/circular.tpl index 213b351..4538582 100644 --- a/admin/circular.tpl +++ b/admin/circular.tpl @@ -39,6 +39,6 @@
- {TR_CANCEL} + {TR_CANCEL}
diff --git a/admin/custom_menus.tpl b/admin/custom_menus.tpl index d66b6e7..d8106b0 100644 --- a/admin/custom_menus.tpl +++ b/admin/custom_menus.tpl @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@
{TR_CANCEL} - +
diff --git a/admin/database_update.tpl b/admin/database_update.tpl deleted file mode 100644 index aee0f55..0000000 --- a/admin/database_update.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -
- - - - - - - - - - - - - - - -
{TR_DATABASE_UPDATES}{TR_DATABASE_UPDATE_DETAIL}
{DB_UPDATE_REVISION}{DB_UPDATE_DETAIL}
- -
- - -
-
- diff --git a/admin/index.tpl b/admin/index.tpl index 8cd04c6..98d4a6a 100644 --- a/admin/index.tpl +++ b/admin/index.tpl @@ -50,7 +50,8 @@

{TR_SERVER_TRAFFIC}

-

{TRAFFIC_WARNING}

-   +   + {TRAFFIC_PERCENT}%
+

{TRAFFIC_WARNING}

diff --git a/admin/manage_reseller_owners.phtml b/admin/manage_reseller_owners.phtml new file mode 100644 index 0000000..804d35c --- /dev/null +++ b/admin/manage_reseller_owners.phtml @@ -0,0 +1,128 @@ + +

+
+

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
+ + +
+
diff --git a/admin/manage_reseller_owners.tpl b/admin/manage_reseller_owners.tpl deleted file mode 100644 index 9e06206..0000000 --- a/admin/manage_reseller_owners.tpl +++ /dev/null @@ -1,37 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - -
{TR_NUMBER}{TR_MARK}{TR_RESELLER_NAME}{TR_OWNER}
{NUMBER}{OWNER}
- - -
- - - - -
- -
diff --git a/admin/manage_reseller_users.phtml b/admin/manage_reseller_users.phtml new file mode 100644 index 0000000..02fcd56 --- /dev/null +++ b/admin/manage_reseller_users.phtml @@ -0,0 +1,130 @@ + + +

+
+ +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+
+ + +
+
diff --git a/admin/manage_reseller_users.tpl b/admin/manage_reseller_users.tpl deleted file mode 100644 index 9a36f7b..0000000 --- a/admin/manage_reseller_users.tpl +++ /dev/null @@ -1,56 +0,0 @@ - - -
- -
- - -
- - - - - - - - - - - - - - - - - - - -
{TR_CUSTOMER_ID}{TR_MARK}{TR_USER_NAME}
{CUSTOMER_ID}
- - -
- - - - -
- -
diff --git a/admin/manage_users.phtml b/admin/manage_users.phtml deleted file mode 100644 index 5ee8b6f..0000000 --- a/admin/manage_users.phtml +++ /dev/null @@ -1,184 +0,0 @@ - - -

{TR_ADMINISTRATORS}

- -
{ADMIN_MESSAGE}
- - - - - - - - - - - - - - - - - - - - - -
{TR_ADMIN_USERNAME}{TR_CREATED_ON}{TR_ADMIN_CREATED_BY}{TR_ADMIN_ACTIONS}
{ADMIN_USERNAME}{ADMIN_CREATED_ON}{ADMIN_CREATED_BY} - {TR_EDIT} - - {TR_DELETE} - -
- -

{TR_RESELLERS}

- -
{RSL_MESSAGE}
- - - - - - - - - - - - - - - - - - - - - -
{TR_RSL_USERNAME}{TR_CREATED_ON}{TR_RSL_CREATED_BY}{TR_RSL_ACTIONS}
{RSL_USERNAME}{RESELLER_CREATED_ON}{RSL_CREATED_BY} - {GO_TO_USER_INTERFACE} - {TR_EDIT} - {TR_DELETE} -
- -

{TR_CUSTOMERS}

- -
-
- - - - - - -
-
- {TR_VIEW_DETAILS} -
-
-
- - -
{USR_MESSAGE}
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_USER_STATUS}{TR_USR_USERNAME}{TR_CREATED_ON}{TR_USR_CREATED_BY}{TR_USR_ACTIONS}
- - {TR_STATUS} - - - {TR_STATUS} - - - - {USR_USERNAME} - - - {USR_USERNAME} - - {USER_CREATED_ON}{USR_CREATED_BY} - {TR_DETAILS} - {GO_TO_USER_INTERFACE} - {TR_EDIT_USR} - - - - {TR_DELETE} - -
{ALIAS_DOMAIN}
-
- - {TR_PREVIOUS} - - - - - - - - - {TR_NEXT} - -
- diff --git a/admin/multilanguage.phtml b/admin/multilanguage.phtml index cf7127b..2956d1f 100644 --- a/admin/multilanguage.phtml +++ b/admin/multilanguage.phtml @@ -21,7 +21,7 @@ {TR_LANGUAGE_NAME} {TR_NUMBER_TRANSLATED_STRINGS} - {TR_LANGUAGE_REVISION} + {TR_LANGUAGE_CREATION_DATE} {TR_LAST_TRANSLATOR} {TR_DEFAULT_LANGUAGE} @@ -31,13 +31,12 @@ {NUMBER_TRANSLATED_STRINGS} - {LANGUAGE_REVISION} + {LANGUAGE_CREATION_DATE} {LAST_TRANSLATOR}
- +
diff --git a/admin/navigation.php b/admin/navigation.php index 501db77..53350aa 100644 --- a/admin/navigation.php +++ b/admin/navigation.php @@ -1,5 +1,4 @@ @@ -19,325 +18,317 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -return array( - 'general' => array( +return [ + 'general' => [ 'label' => tr('General'), - 'uri' => '/admin/index.php', + 'uri' => '/admin/index.php', 'class' => 'general', - 'pages' => array( - 'overview' => array( - 'label' => tr('Overview'), - 'uri' => '/admin/index.php', + 'pages' => [ + 'overview' => [ + 'label' => tr('Overview'), + 'uri' => '/admin/index.php', 'title_class' => 'general' - ), - 'server_status' => array( - 'label' => tr('Services status'), - 'uri' => '/admin/server_status.php', + ], + 'services_statuses' => [ + 'label' => tr('Service statuses'), + 'uri' => '/admin/service_statuses.php', 'title_class' => 'serverstatus' - ), - 'admin_log' => array( - 'label' => tr('Admin log'), - 'uri' => '/admin/admin_log.php', + ], + 'admin_log' => [ + 'label' => tr('Admin log'), + 'uri' => '/admin/admin_log.php', 'title_class' => 'adminlog' - ) - ) - ), - 'users' => array( + ] + ] + ], + 'users' => [ 'label' => tr('Users'), - 'uri' => '/admin/manage_users.php', + 'uri' => '/admin/users.php', 'class' => 'manage_users', - 'pages' => array( - 'overview' => array( - 'label' => tr('Overview'), - 'uri' => '/admin/manage_users.php', + 'pages' => [ + 'overview' => [ + 'label' => tr('Overview'), + 'uri' => '/admin/users.php', 'title_class' => 'users', - 'pages' => array( - 'reseller_edit_link' => array( - 'label' => tr('Edit reseller'), - 'uri' => '/admin/reseller_edit.php', + 'pages' => [ + 'user_edit' => [ + 'dynamic_title' => '{TR_DYNAMIC_TITLE}', + 'uri' => '/admin/user_edit.php', + 'title_class' => '{DYNAMIC_TITLE_CLASS}', + 'visible' => '0' + ], + 'reseller_edit' => [ + 'label' => tr('Edit reseller'), + 'uri' => '/admin/reseller_edit.php', 'title_class' => 'user_green', - 'visible' => '0' - ), - 'domain_detail_link' => array( - 'label' => tr('Domain details'), - 'uri' => '/admin/domain_details.php', + 'visible' => '0' + ], + 'domain_detail' => [ + 'label' => tr('Domain details'), + 'uri' => '/admin/domain_details.php', 'title_class' => 'general', - 'visible' => '0' - ), - 'customer_edit_link' => array( - 'label' => tr('Edit admin'), - 'uri' => '/admin/admin_edit.php', - 'title_class' => 'user_blue', - 'visible' => '0' - ) - ) - ), - 'add_admin' => array( - 'label' => tr('Add admin'), - 'uri' => '/admin/admin_add.php', + 'visible' => '0' + ] + ] + ], + 'add_admin' => [ + 'label' => tr('Add admin'), + 'uri' => '/admin/admin_add.php', 'title_class' => 'user_yellow' - ), - 'add_reseller' => array( - 'label' => tr('Add reseller'), - 'uri' => '/admin/reseller_add.php', + ], + 'add_reseller' => [ + 'label' => tr('Add reseller'), + 'uri' => '/admin/reseller_add.php', 'title_class' => 'user_green' - ), - 'resellers_assignment' => array( - 'label' => tr('Reseller assignments'), - 'uri' => '/admin/manage_reseller_owners.php', - 'title_class' => 'users2', - 'privilege_callback' => array( - array( + ], + 'resellers_assignment' => [ + 'label' => tr('Reseller assignments'), + 'uri' => '/admin/manage_reseller_owners.php', + 'title_class' => 'users2', + 'privilege_callback' => [ + [ 'name' => 'systemHasManyAdmins', - ), - array( + ], + [ 'name' => 'systemHasResellers' - ) - ) - ), - 'customers_assignment' => array( - 'label' => tr('Customer assignments'), - 'uri' => '/admin/manage_reseller_users.php', - 'title_class' => 'users2', - 'privilege_callback' => array( - 'name' => 'systemHasResellers', + ] + ] + ], + 'customers_assignment' => [ + 'label' => tr('Customer assignments'), + 'uri' => '/admin/manage_reseller_users.php', + 'title_class' => 'users2', + 'privilege_callback' => [ + 'name' => 'systemHasResellers', 'param' => '2' - ) - ), - 'circular' => array( - 'label' => tr('Circular'), - 'uri' => '/admin/circular.php', - 'title_class' => 'email', - 'privilege_callback' => array( + ] + ], + 'circular' => [ + 'label' => tr('Circular'), + 'uri' => '/admin/circular.php', + 'title_class' => 'email', + 'privilege_callback' => [ 'name' => 'systemHasAdminsOrResellersOrCustomers' - ) - ), - 'sessions_management' => array( - 'label' => tr('Sessions'), - 'uri' => '/admin/sessions_manage.php', + ] + ], + 'sessions_management' => [ + 'label' => tr('Sessions'), + 'uri' => '/admin/sessions_manage.php', 'title_class' => 'users2' - ) - ) - ), - 'system_tools' => array( + ] + ] + ], + 'system_tools' => [ 'label' => tr('System tools'), - 'uri' => '/admin/system_info.php', + 'uri' => '/admin/system_info.php', 'class' => 'webtools', - 'pages' => array( - 'overview' => array( - 'label' => tr('System information'), - 'uri' => '/admin/system_info.php', + 'pages' => [ + 'overview' => [ + 'label' => tr('System information'), + 'uri' => '/admin/system_info.php', 'title_class' => 'tools' - ), - 'maintenance_settings' => array( - 'label' => tr('Maintenance settings'), - 'uri' => '/admin/settings_maintenance_mode.php', + ], + 'maintenance_settings' => [ + 'label' => tr('Maintenance settings'), + 'uri' => '/admin/settings_maintenance_mode.php', 'title_class' => 'maintenancemode' - ), - 'updates' => array( - 'label' => tr('i-MSCP updates'), - 'uri' => '/admin/imscp_updates.php', - 'title_class' => 'update' - ), - 'database_updates' => array( - 'label' => tr('Database update'), - 'uri' => '/admin/database_update.php', - 'title_class' => 'update' - ), - 'debugger' => array( - 'label' => tr('Debugger'), - 'uri' => '/admin/imscp_debugger.php', + ], + 'updates' => [ + 'label' => tr('i-MSCP updates'), + 'uri' => '/admin/imscp_updates.php', + 'title_class' => 'update', + 'privilege_callback' => [ + 'name' => function () { + return stripos(iMSCP_Registry::get('config')['Version'], 'git') === false; + } + ] + ], + 'debugger' => [ + 'label' => tr('Debugger'), + 'uri' => '/admin/imscp_debugger.php', 'title_class' => 'debugger' - ), - 'rootkits_log' => array( - 'label' => tr('Anti-Rootkits Logs'), - 'uri' => '/admin/rootkit_log.php', - 'title_class' => 'general', - 'privilege_callback' => array( + ], + 'rootkits_log' => [ + 'label' => tr('Anti-Rootkits Logs'), + 'uri' => '/admin/rootkit_log.php', + 'title_class' => 'general', + 'privilege_callback' => [ 'name' => 'systemHasAntiRootkits' - ) - ) - ) - ), - 'statistics' => array( + ] + ] + ] + ], + 'statistics' => [ 'label' => tr('Statistics'), - 'uri' => '/admin/server_statistic.php', + 'uri' => '/admin/server_statistic.php', 'class' => 'statistics', - 'pages' => array( - 'server_statistic' => array( - 'label' => tr('Server statistics'), - 'uri' => '/admin/server_statistic.php', - 'title_class' => 'stats', - 'pages' => array( - 'server_day_statistics_link' => array( - 'label' => tr('Day statistics'), - 'uri' => '/admin/server_statistic_day.php', - 'title_class' => 'stats', - 'visible' => '0' - ) - ) - ), - 'resellers_statistics' => array( - 'label' => tr('Reseller statistics'), - 'uri' => '/admin/reseller_statistics.php', - 'title_class' => 'stats', - 'privilege_callback' => array( + 'pages' => [ + 'server_statistic' => [ + 'label' => tr('Server statistics'), + 'uri' => '/admin/server_statistic.php', + 'title_class' => 'stats' + ], + 'resellers_statistics' => [ + 'label' => tr('Reseller statistics'), + 'uri' => '/admin/reseller_statistics.php', + 'title_class' => 'stats', + 'privilege_callback' => [ 'name' => 'systemHasResellers', - ), - 'pages' => array( - 'reseller_user_statistics_link' => array( - 'label' => tr('User statistics'), - 'uri' => '/admin/reseller_user_statistics.php', - 'visible' => '0', + ], + 'pages' => [ + 'reseller_user_statistics' => [ + 'label' => tr('User statistics'), + 'uri' => '/admin/reseller_user_statistics.php', + 'visible' => '0', 'title_class' => 'stats', - 'pages' => array( - 'reseller_user_statistics_detail_link' => array( - 'label' => tr('{USERNAME} user statistics'), - 'uri' => '/admin/reseller_user_statistics_details.php', - 'visible' => '0', + 'pages' => [ + 'reseller_user_statistics_detail' => [ + 'label' => tr('{USERNAME} user statistics'), + 'uri' => '/admin/reseller_user_statistics_details.php', + 'visible' => '0', 'title_class' => 'stats' - ) - ) - ) - ) - ), - 'ip_usage' => array( - 'label' => tr('IP usage'), - 'uri' => '/admin/ip_usage.php', - 'title_class' => 'ip', - 'privilege_callback' => array( + ] + ] + ] + ] + ], + 'ip_usage' => [ + 'label' => tr('IP usage'), + 'uri' => '/admin/ip_usage.php', + 'title_class' => 'ip', + 'privilege_callback' => [ 'name' => 'systemHasCustomers' - ) - ) - ) - ), - 'support' => array( - 'label' => tr('Support'), - 'uri' => '/admin/ticket_system.php', - 'class' => 'support', - 'privilege_callback' => array( + ] + ] + ] + ], + 'support' => [ + 'label' => tr('Support'), + 'uri' => '/admin/ticket_system.php', + 'class' => 'support', + 'privilege_callback' => [ 'name' => 'systemHasResellers' - ), - 'pages' => array( - 'open_tickets' => array( - 'label' => tr('Open tickets'), - 'uri' => '/admin/ticket_system.php', + ], + 'pages' => [ + 'open_tickets' => [ + 'label' => tr('Open tickets'), + 'uri' => '/admin/ticket_system.php', 'title_class' => 'support' - ), - 'closed_tickets' => array( - 'label' => tr('Closed tickets'), - 'uri' => '/admin/ticket_closed.php', + ], + 'closed_tickets' => [ + 'label' => tr('Closed tickets'), + 'uri' => '/admin/ticket_closed.php', 'title_class' => 'support' - ), - 'view_ticket' => array( - 'label' => tr('View ticket'), - 'uri' => '/admin/ticket_view.php', + ], + 'view_ticket' => [ + 'label' => tr('View ticket'), + 'uri' => '/admin/ticket_view.php', 'title_class' => 'support', - 'visible' => '0' - ) - ) - ), - 'settings' => array( + 'visible' => '0' + ] + ] + ], + 'settings' => [ 'label' => tr('Settings'), - 'uri' => '/admin/settings.php', + 'uri' => '/admin/settings.php', 'class' => 'settings', - 'pages' => array( - 'general' => array( - 'label' => tr('General settings'), - 'uri' => '/admin/settings.php', + 'pages' => [ + 'general' => [ + 'label' => tr('General settings'), + 'uri' => '/admin/settings.php', 'title_class' => 'general' - ), - 'language' => array( - 'label' => tr('Languages'), - 'uri' => '/admin/multilanguage.php', + ], + 'language' => [ + 'label' => tr('Languages'), + 'uri' => '/admin/multilanguage.php', 'title_class' => 'multilanguage' - ), - 'custom_menus' => array( - 'label' => tr('Custom menus'), + ], + 'custom_menus' => [ + 'label' => tr('Custom menus'), 'dynamic_title' => '{TR_DYNAMIC_TITLE}', - 'uri' => '/admin/custom_menus.php', - 'title_class' => 'custom_link' - ), - 'ip_management' => array( - 'label' => tr('IP management'), - 'uri' => '/admin/ip_manage.php', + 'uri' => '/admin/custom_menus.php', + 'title_class' => 'custom_link' + ], + 'ip_management' => [ + 'label' => tr('IP management'), + 'uri' => '/admin/ip_manage.php', 'title_class' => 'ip' - ), - 'server_traffic' => array( - 'label' => tr('Server traffic'), - 'uri' => '/admin/settings_server_traffic.php', + ], + 'server_traffic' => [ + 'label' => tr('Monthly server traffic'), + 'uri' => '/admin/settings_server_traffic.php', 'title_class' => 'traffic' - ), - 'welcome_mail' => array( - 'label' => tr('Welcome email'), - 'uri' => '/admin/settings_welcome_mail.php', + ], + 'welcome_mail' => [ + 'label' => tr('Welcome email'), + 'uri' => '/admin/settings_welcome_mail.php', 'title_class' => 'email' - ), - 'lostpassword_mail' => array( - 'label' => tr('Lost password email'), - 'uri' => '/admin/settings_lostpassword.php', + ], + 'lostpassword_mail' => [ + 'label' => tr('Lost password email'), + 'uri' => '/admin/settings_lostpassword.php', 'title_class' => 'email' - ), - 'service_ports' => array( - 'label' => tr('Service ports'), - 'uri' => '/admin/settings_ports.php', + ], + 'service_ports' => [ + 'label' => tr('Service ports'), + 'uri' => '/admin/settings_ports.php', 'title_class' => 'general' - ), - 'softwares_management' => array( - 'label' => tr('Software management'), - 'uri' => '/admin/software_manage.php', + ], + 'softwares_management' => [ + 'label' => tr('Software management'), + 'uri' => '/admin/software_manage.php', 'title_class' => 'apps_installer', - 'pages' => array( - 'softwares_permissions_link' => array( - 'label' => tr('Software permissions'), - 'uri' => '/admin/software_rights.php', - 'visible' => '0', + 'pages' => [ + 'softwares_permissions' => [ + 'label' => tr('Software permissions'), + 'uri' => '/admin/software_rights.php', + 'visible' => '0', 'title_class' => 'apps_installer' - ) - ) - ), - 'softwares_options' => array( - 'label' => tr('Software options'), - 'uri' => '/admin/software_options.php', + ] + ] + ], + 'softwares_options' => [ + 'label' => tr('Software options'), + 'uri' => '/admin/software_options.php', 'title_class' => 'apps_installer' - ), - 'plugins_management' => array( - 'label' => tr('Plugin management'), - 'uri' => '/admin/settings_plugins.php', + ], + 'plugins_management' => [ + 'label' => tr('Plugin management'), + 'uri' => '/admin/settings_plugins.php', 'title_class' => 'plugin' - ) - ) - ), - 'profile' => array( + ] + ] + ], + 'profile' => [ 'label' => tr('Profile'), - 'uri' => '/admin/profile.php', + 'uri' => '/admin/profile.php', 'class' => 'profile', - 'pages' => array( - 'overview' => array( - 'label' => tr('Account summary'), - 'uri' => '/admin/profile.php', + 'pages' => [ + 'overview' => [ + 'label' => tr('Account summary'), + 'uri' => '/admin/profile.php', 'title_class' => 'profile' - ), - 'personal_change' => array( - 'label' => tr('Personal data'), - 'uri' => '/admin/personal_change.php', + ], + 'personal_change' => [ + 'label' => tr('Personal data'), + 'uri' => '/admin/personal_change.php', 'title_class' => 'profile' - ), - 'passsword_change' => array( - 'label' => tr('Password'), - 'uri' => '/admin/password_update.php', + ], + 'passsword_change' => [ + 'label' => tr('Password'), + 'uri' => '/admin/password_update.php', 'title_class' => 'profile' - ), - 'language' => array( - 'label' => tr('Language'), - 'uri' => '/admin/language.php', + ], + 'language' => [ + 'label' => tr('Language'), + 'uri' => '/admin/language.php', 'title_class' => 'multilanguage', - ), - 'layout' => array( - 'label' => tr('Layout'), - 'uri' => '/admin/layout.php', + ], + 'layout' => [ + 'label' => tr('Layout'), + 'uri' => '/admin/layout.php', 'title_class' => 'layout' - ) - ) - ) -); + ] + ] + ] +]; diff --git a/admin/personal_change.tpl b/admin/personal_change.tpl deleted file mode 100644 index f88033d..0000000 --- a/admin/personal_change.tpl +++ /dev/null @@ -1,74 +0,0 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_PERSONAL_DATA}
- -
-
- - -
-
diff --git a/admin/reseller_add.tpl b/admin/reseller_add.phtml similarity index 80% rename from admin/reseller_add.tpl rename to admin/reseller_add.phtml index 4280365..13d4d95 100644 --- a/admin/reseller_add.tpl +++ b/admin/reseller_add.phtml @@ -1,4 +1,3 @@ - +
- - + {MONTH_VALUE} - + diff --git a/admin/rootkit_log.tpl b/admin/rootkit_log.tpl index e77663a..25ab196 100644 --- a/admin/rootkit_log.tpl +++ b/admin/rootkit_log.tpl @@ -1,15 +1,3 @@ - -
diff --git a/admin/server_statistic.tpl b/admin/server_statistic.tpl index 90bc258..148d4e1 100644 --- a/admin/server_statistic.tpl +++ b/admin/server_statistic.tpl @@ -1,5 +1,18 @@ - - + + + + - + {YEAR_VALUE} - - - +
@@ -50,9 +61,63 @@ - + + + + + + + + + + + + + + + + + +
{DAY}{WEB_IN}{WEB_OUT}{SMTP_IN}{SMTP_OUT}{POP_IN}{POP_OUT}{OTHER_IN}{OTHER_OUT}{ALL_IN}{ALL_OUT}{ALL}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -65,7 +130,7 @@ - +
{TR_HOUR}{TR_WEB_IN}{TR_WEB_OUT}{TR_SMTP_IN}{TR_SMTP_OUT}{TR_POP_IN}{TR_POP_OUT}{TR_OTHER_IN}{TR_OTHER_OUT}{TR_ALL_IN}{TR_ALL_OUT}{TR_ALL}
{TR_ALL}{WEB_IN_ALL}{WEB_OUT_ALL}{SMTP_IN_ALL}{SMTP_OUT_ALL}{POP_IN_ALL}{POP_OUT_ALL}{OTHER_IN_ALL}{OTHER_OUT_ALL}{ALL_IN_ALL}{ALL_OUT_ALL}{ALL_ALL}
{DAY}{HOUR} {WEB_IN} {WEB_OUT} {SMTP_IN}{ALL_OUT} {ALL}
- + diff --git a/admin/server_statistic_day.tpl b/admin/server_statistic_day.tpl deleted file mode 100644 index f2d4ae5..0000000 --- a/admin/server_statistic_day.tpl +++ /dev/null @@ -1,56 +0,0 @@ - - -

{TR_YEAR}: {YEAR} {TR_MONTH}: {MONTH} {TR_DAY}: {DAY}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{TR_HOUR}{TR_WEB_IN}{TR_WEB_OUT}{TR_SMTP_IN}{TR_SMTP_OUT}{TR_POP_IN}{TR_POP_OUT}{TR_OTHER_IN}{TR_OTHER_OUT}{TR_ALL_IN}{TR_ALL_OUT}{TR_ALL}
{TR_ALL}{WEB_IN_ALL}{WEB_OUT_ALL}{SMTP_IN_ALL}{SMTP_OUT_ALL}{POP_IN_ALL}{POP_OUT_ALL}{OTHER_IN_ALL}{OTHER_OUT_ALL}{ALL_IN_ALL}{ALL_OUT_ALL}{ALL_ALL}
{HOUR}{WEB_IN}{WEB_OUT}{SMTP_IN}{SMTP_OUT}{POP_IN}{POP_OUT}{OTHER_IN}{OTHER_OUT}{ALL_IN}{ALL_OUT}{ALL}
- diff --git a/admin/server_status.tpl b/admin/service_statuses.tpl similarity index 55% rename from admin/server_status.tpl rename to admin/service_statuses.tpl index fcaa6ed..7c73a9c 100644 --- a/admin/server_status.tpl +++ b/admin/service_statuses.tpl @@ -1,4 +1,3 @@ - - @@ -32,12 +22,18 @@ - - - - + + + + + + + + +
{SERVICE}{IP}{PORT}{STATUS}{SERVICE}{IP}{PORT}{STATUS}
+ +
- diff --git a/admin/settings.tpl b/admin/settings.tpl index 22a5fdc..059d509 100644 --- a/admin/settings.tpl +++ b/admin/settings.tpl @@ -27,7 +27,9 @@

{TR_UPDATES}

-
+
+ +
@@ -49,7 +53,9 @@
-
+
+ +
@@ -59,7 +65,9 @@

{TR_PASSWORD_SETTINGS}

-
+
+ +
@@ -79,7 +89,9 @@

{TR_BRUTEFORCE}

-
+
+ +
@@ -98,19 +112,25 @@
-
+
+ +
-
+
+ +
-
+
+ +
@@ -123,7 +143,9 @@
-
+
+ +
@@ -133,7 +155,9 @@

{TR_MAIL_SETTINGS}

-
+
+ +
@@ -152,7 +177,20 @@
-
+
+ +
+
+ +
+
+
+
+ +
-
-
+
+
+ +
@@ -183,7 +225,9 @@
-
+
+ +
- - - -
-
-
-
-
- +
+
-
-
-
- +
-
+
+ +
@@ -238,8 +268,9 @@
-
+
+ +
@@ -258,7 +290,9 @@
-
+
+ +
- + - + - - {TR_DELETE} - + {TR_DELETE} @@ -115,16 +101,16 @@ diff --git a/admin/settings_server_traffic.tpl b/admin/settings_server_traffic.tpl index 2ea5f2a..46cbc95 100644 --- a/admin/settings_server_traffic.tpl +++ b/admin/settings_server_traffic.tpl @@ -9,11 +9,11 @@ - {TR_MIB} + {TR_MIB} - {TR_MIB} + {TR_MIB} diff --git a/admin/ticket_closed.tpl b/admin/ticket_closed.tpl index 1ff16c3..827783e 100644 --- a/admin/ticket_closed.tpl +++ b/admin/ticket_closed.tpl @@ -38,7 +38,7 @@ diff --git a/admin/users.phtml b/admin/users.phtml new file mode 100644 index 0000000..1a2ab53 --- /dev/null +++ b/admin/users.phtml @@ -0,0 +1,79 @@ + +

+ +
+ + + + + + + + + + + + + + + + + + + + + +
{ADMINISTRATOR_USERNAME}{ADMINISTRATOR_CREATED_ON}{ADMINISTRATPR_CREATED_BY} + + + + +
+ +

+ +
+ + + + + + + + + + + + + + + + + + + + + +
{RESELLER_USERNAME}{RESELLER_CREATED_ON}{RESELLER_CREATED_BY} + + + +
+ + diff --git a/assets/css/black.css b/assets/css/black.css index 7b6d438..e9e3b66 100644 --- a/assets/css/black.css +++ b/assets/css/black.css @@ -49,7 +49,7 @@ a:hover.link_as_button { color: #ffffff; } -span.clickable:hover { +.clickable:hover { color:#5cbada; cursor: pointer; } @@ -152,6 +152,7 @@ input[type="number"], input[type="password"], input[type="search"], select, +select[multiple], textarea { background: #ffffff; border-color: #cccccc; @@ -162,19 +163,29 @@ input[type="number"]:focus, input[type="password"]:focus, input[type="search"]:focus, textarea:focus, -select:focus { +select:focus, +select[multiple]:focus { border: 1px solid #000000; -webkit-box-shadow: 0 0 5px #000000; -moz-box-shadow: 0 0 5px #000000; box-shadow: 0 0 5px #000000; } +select[multiple]{ + width: auto !important;; + height: auto !important; + min-height: 1px; + padding: 0; + margin: 0; +} + input[readonly="readonly"], input[readonly], input[type="text"]:disabled, input[type="number"]:disabled, input[type="password"]:disabled, select:disabled, +select[multiple]:disabled, textarea[readonly], textarea:disabled, .disabled { @@ -188,6 +199,7 @@ input[type="text"]:disabled:focus, input[type="number"]:disabled:focus, input[type="password"]:disabled:focus, select:disabled:focus, +select[multiple]:disabled:focus, textarea[readonly]:focus, textarea:disabled:focus, .disabled:focus { diff --git a/assets/css/blue.css b/assets/css/blue.css index 30adb07..9281679 100644 --- a/assets/css/blue.css +++ b/assets/css/blue.css @@ -50,7 +50,7 @@ a:hover.link_as_button { color: #ffffff; } -span.clickable:hover { +.clickable:hover { color:#5cbada; cursor: pointer; } diff --git a/assets/css/green.css b/assets/css/green.css index 6c6da95..0e68b58 100644 --- a/assets/css/green.css +++ b/assets/css/green.css @@ -50,7 +50,7 @@ a:hover.link_as_button { color: #ffffff; } -span.clickable:hover { +.clickable:hover { color:#5cbada; cursor: pointer; } diff --git a/assets/css/red.css b/assets/css/red.css index 5e01b24..e599cd7 100644 --- a/assets/css/red.css +++ b/assets/css/red.css @@ -50,7 +50,7 @@ a:hover.link_as_button { color: #ffffff; } -span.clickable:hover { +.clickable:hover { color:#5cbada; cursor: pointer; } diff --git a/assets/css/ui.css b/assets/css/ui.css index 5390913..7a50cdd 100644 --- a/assets/css/ui.css +++ b/assets/css/ui.css @@ -292,8 +292,8 @@ a { .location { position: relative; - height: 24px; - line-height: 24px; + height: 30px; + line-height: 30px; padding-left: 197px; /*z-index: 2;*/ } @@ -308,11 +308,11 @@ a { } .location-area h1 { - background: no-repeat center left; + background: no-repeat left center; height: 30px; - font-size: 1.1em; + font-size: 1.3em; font-weight: bold; - padding-left: 35px; + padding-left: 36px; font-variant: small-caps; } @@ -376,7 +376,8 @@ a { .path { float: left; margin-left: 0.5em; - font-size: 0.9em; + font-size: 1.0em; + font-weight: bold; } .path li { @@ -744,6 +745,7 @@ table { table input, table select, +table select[multiple], table textarea, table button { font-family: Geneva, Arial, Helvetica, sans-serif; @@ -798,7 +800,7 @@ table .icon { /* Icons */ .app_icon { - background-position: top left; + background-position: left center; background-repeat: no-repeat; padding-left: 20px; height: 16px; @@ -817,13 +819,7 @@ table .icon { height: 16px; line-height: 16px; vertical-align: middle; - padding-left: 18px; -} - -.paginator .icon { - width: 0; - height: 16px; - line-height: 32px; + padding-left: 20px; } .icon.big { @@ -842,12 +838,16 @@ table .icon { } .body .icon_center { - display: block; + display: block; text-align: center; - background-position: top center; + background-position: left center; background-repeat: no-repeat; - padding-top: 46px; + line-height: 46px; + width: 46px; + height: 46px; + margin: 0.5em; cursor: pointer; + *cursor: hand; } /* Content icons (link icons) */ @@ -1072,11 +1072,11 @@ table .icon { } .i_lock { - background-image: url('../images/login/i_lock.png'); + background-image: url(../images/login/i_lock.png); } .i_unlock { - background-image: url('../images/login/i_unlock.png'); + background-image: url(../images/login/i_unlock.png); } /* * * * * * * @@ -1130,6 +1130,7 @@ table .icon { th.sorting, th.sorting_asc, th.sorting_desc { cursor: pointer; + *cursor: hand; } .dataTables_info { @@ -1137,19 +1138,20 @@ th.sorting, th.sorting_asc, th.sorting_desc { float: left; } -.dataTables_paginate { +.dataTables_paginate, .paginator { float: right; text-align: right; } /* Pagination nested */ .paginate_button.previous.disabled, .paginate_button.previous, -.paginate_button.next.disabled, .paginate_button.next { +.paginate_button.next.disabled, .paginate_button.next, +.paginator .icon +{ float: left; cursor: pointer; *cursor: hand; color: transparent !important; - display: inline-block; overflow: hidden; width: 0; @@ -1164,24 +1166,23 @@ th.sorting, th.sorting_asc, th.sorting_desc { .dataTables_info, .dataTables_paginate { - margin-top: 0.5em; - margin-bottom: 1.5em; + margin-bottom: 0.5em; } .paginate_button.previous.disabled { - background: url('../images/icons/prev_gray.png') no-repeat top left; + background: url(../images/icons/prev_gray.png) no-repeat left center; } .paginate_button.previous { - background: url('../images/icons/prev.png') no-repeat top left; + background: url(../images/icons/prev.png) no-repeat left center; } .paginate_button.next.disabled { - background: url('../images/icons/next_gray.png') no-repeat top right; + background: url(../images/icons/next_gray.png) no-repeat left center; } .paginate_button.next { - background: url('../images/icons/next.png') no-repeat top right; + background: url(../images/icons/next.png) no-repeat left center; } /* * * * * * * * * ** @@ -1201,7 +1202,10 @@ table input[type="password"] { min-width: 200px; } -input, select, textarea { +input, +select, +select[multiple], +textarea { vertical-align: middle; } @@ -1215,6 +1219,7 @@ input[type="number"], input[type="search"], input[type="password"], select, +select[multiple], textarea { padding: 4px; border: 1px solid; @@ -1306,9 +1311,8 @@ table .graph { -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; - max-width: 90%; - text-wrap: none; - word-wrap:break-word; + max-width: 30%; + word-wrap: break-word; } .ui-tooltip.ui-tooltip-notice { padding-left: 45px; @@ -1323,28 +1327,16 @@ table .graph { .tips { cursor: pointer; + *cursor: hand; } .icon.i_help { position: relative; width: 0; vertical-align: middle; - /*margin-left: 0.5em;*/ overflow: hidden; cursor: pointer; -} - -/* Pagination (for backward compatibility) - Will be removed ASAP */ -.paginator { - margin: 0.5em 0; - float: right; -} - -.paginator .icon { - width: 0; - overflow: hidden; - height: 20px; - margin: 0; + *cursor: hand; } /** @@ -1358,7 +1350,6 @@ table .graph { height: 4em; font-weight: bold; line-height: 1.2em; - /*padding: 1em 0;*/ } .no_footer .footer { diff --git a/assets/css/yellow.css b/assets/css/yellow.css index 56f417c..beac110 100644 --- a/assets/css/yellow.css +++ b/assets/css/yellow.css @@ -50,7 +50,7 @@ a:hover.link_as_button { color: #ffffff; } -span.clickable:hover { +.clickable:hover { color:#5cbada; cursor: pointer; } diff --git a/assets/js/imscp.js b/assets/js/imscp.js index 202262f..bc7643f 100644 --- a/assets/js/imscp.js +++ b/assets/js/imscp.js @@ -429,12 +429,6 @@ function sbmt(form, uaction) { return false; } -function sbmt_details(form, uaction) { - form.details.value = uaction; - form.submit(); - return false; -} - /** * * Javascript sprintf by http://jan.moesen.nu/ diff --git a/assets/js/imscp.min.js b/assets/js/imscp.min.js index 38f9710..5c2cbd9 100644 --- a/assets/js/imscp.min.js +++ b/assets/js/imscp.min.js @@ -1 +1 @@ -function sbmt(a,b){return a.uaction.value=b,a.submit(),!1}function sbmt_details(a,b){return a.details.value=b,a.submit(),!1}function sprintf(){if(arguments&&!(arguments.length<1)&&RegExp){for(var a=arguments[0],b=/([^%]*)%('.|0|\x20)?(-)?(\d+)?(\.\d+)?(%|b|c|d|u|f|o|s|x|X)(.*)/,c=[],e=0,f=0;c=b.exec(a);){var g=c[1],h=c[2],i=c[3],j=c[4],k=c[5],l=c[6],m=c[7];f++;var n;if("%"==l)n="%";else{e++,e>=arguments.length&&alert("Error! Not enough function arguments ("+(arguments.length-1)+", excluding the string)\nfor the number of substitution parameters in string ("+e+" so far).");var o=arguments[e];h&&"'"==h.substr(0,1)?g.substr(1,1):h&&h;i&&"-"===i&&!1;j&&parseInt(j,10);var s=-1;k&&"f"==l&&(s=parseInt(k.substring(1),10)),n=o,"b"==l?n=parseInt(o,10).toString(2):"c"==l?n=String.fromCharCode(parseInt(o,10)):"d"==l?n=parseInt(o,10)?parseInt(o,10):0:"u"==l?n=Math.abs(o):"f"==l?n=s>-1?Math.round(parseFloat(o)*Math.pow(10,s))/Math.pow(10,s):parseFloat(o):"o"==l?n=parseInt(o).toString(8):"s"==l?n=o:"x"==l?n=(""+parseInt(o).toString(16)).toLowerCase():"X"==l&&(n=(""+parseInt(o).toString(16)).toUpperCase())}a=g+n+m}return a}}!function(a){var b=function(){a("body").on("message_timeout",".success,.info,.warning,.error",function(){a(this).hide().slideDown("fast").delay(1e4).slideUp("normal",function(){a(this).remove()})}),a(".success,.info,.warning,.error").trigger("message_timeout")},c=function(b){"simple"==b?a("a").tooltip({tooltipClass:"ui-tooltip-notice",track:!0,position:{collision:"flipfit"},content:function(){return a(this).attr("title")}}):(a(".main_menu a").tooltip({track:!0}),a(".body a, .body span, .body input, .dataTables_paginate div").tooltip({tooltipClass:"ui-tooltip-notice",track:!0,position:{collision:"flipfit"},content:function(){a(this).attr("title");return a(this).attr("title")}}))},d=function(b){"simple"==b?(a(".link_as_button,button").button({icons:{secondary:"ui-icon-triangle-1-e"}}),a("input").first().focus()):(a("input:submit, input:button, input:reset, button, .link_as_button").button(),a(".radio, .checkbox").buttonset())},e=function(){a("body").on("updateTable","table",function(){a(this).find("tbody:first > tr:visible:odd").removeClass("odd").addClass("even"),a(this).find("tbody:first > tr:visible:even").removeClass("even").addClass("odd")}),a("tbody").trigger("updateTable");var b=a.fn.show;a.fn.show=function(){return b.apply(this,arguments).trigger("updateTable")};var c=a.fn.hide;a.fn.hide=function(){return c.apply(this,arguments).trigger("updateTable")}},f=function(){var b=a(".pwd_generator");if(b.length){var c=a("#password,#cpassword");a("",{style:"display:inline-block;margin-left:5px",html:[a("