diff --git a/docs/credits.rst b/docs/credits.rst index f60734c8..672fee5d 100644 --- a/docs/credits.rst +++ b/docs/credits.rst @@ -116,5 +116,6 @@ The following libraries are being used by PHP Server Monitor: * jqPlot - http://www.jqplot.com * Twitter Bootstrap - http://getbootstrap.com +* Bootstrap Multiselect - https://github.com/davidstutz/bootstrap-multiselect * PHP Mailer - https://github.com/PHPMailer/PHPMailer * php-pushover - https://github.com/kryap/php-pushover \ No newline at end of file diff --git a/src/lang/bg_BG.lang.php b/src/lang/bg_BG.lang.php index 048003ed..ca5ba0d3 100644 --- a/src/lang/bg_BG.lang.php +++ b/src/lang/bg_BG.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'преди минута', 'seconds_ago' => 'преди %d секунди', 'a_second_ago' => 'преди секунда', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Настройки', diff --git a/src/lang/da_DK.lang.php b/src/lang/da_DK.lang.php index bca9c62d..b7fc3357 100644 --- a/src/lang/da_DK.lang.php +++ b/src/lang/da_DK.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'omkring et minut siden', 'seconds_ago' => '%d sekunder siden', 'a_second_ago' => 'et sekund siden', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Indstillinger', diff --git a/src/lang/de_DE.lang.php b/src/lang/de_DE.lang.php index f7353e81..d1d0f54b 100644 --- a/src/lang/de_DE.lang.php +++ b/src/lang/de_DE.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'about a minute ago', 'seconds_ago' => '%d seconds ago', 'a_second_ago' => 'a second ago', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Einstellungen', diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 999da3ad..1019013a 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'about a minute ago', 'seconds_ago' => '%d seconds ago', 'a_second_ago' => 'a second ago', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Config', diff --git a/src/lang/es_ES.lang.php b/src/lang/es_ES.lang.php index 243f59d7..45833263 100644 --- a/src/lang/es_ES.lang.php +++ b/src/lang/es_ES.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'about a minute ago', 'seconds_ago' => '%d seconds ago', 'a_second_ago' => 'a second ago', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Configurar', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index b326cf1f..fbf0cdf4 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'Il y a une minute', 'seconds_ago' => 'Il y a %d secondes', 'a_second_ago' => 'Il y a une seconde', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Configuration', diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php index 1b831df8..0d311573 100644 --- a/src/lang/it_IT.lang.php +++ b/src/lang/it_IT.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'about a minute ago', 'seconds_ago' => '%d seconds ago', 'a_second_ago' => 'a second ago', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Configurazione', diff --git a/src/lang/ko_KR.lang.php b/src/lang/ko_KR.lang.php index d9316189..1fb127db 100644 --- a/src/lang/ko_KR.lang.php +++ b/src/lang/ko_KR.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'about a minute ago', 'seconds_ago' => '%d seconds ago', 'a_second_ago' => 'a second ago', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => '설정', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index 5864d8f6..ba0035ba 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'een minuut geleden', 'seconds_ago' => '%d seconden geleden', 'a_second_ago' => 'een seconde geleden', - 'check_all' => 'Selecteer alles', - 'uncheck_all' => 'Deselecteer alles', ), 'menu' => array( 'config' => 'Configuratie', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index 7921eecc..d4c7a23b 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'cerca de um minuto atrás', 'seconds_ago' => '%d segundos atrás', 'a_second_ago' => 'um segundo atrás', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Configuração', diff --git a/src/lang/ru_RU.lang.php b/src/lang/ru_RU.lang.php index c9007b2c..7e1b79ee 100644 --- a/src/lang/ru_RU.lang.php +++ b/src/lang/ru_RU.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => 'минуту назад', 'seconds_ago' => '%d секунд назад', 'a_second_ago' => 'секунду назад', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => 'Параметры', diff --git a/src/lang/zh_CN.lang.php b/src/lang/zh_CN.lang.php index bb9fe4ec..1884fad0 100644 --- a/src/lang/zh_CN.lang.php +++ b/src/lang/zh_CN.lang.php @@ -58,8 +58,6 @@ $sm_lang = array( 'a_minute_ago' => '1分钟前', 'seconds_ago' => '%d 秒前', 'a_second_ago' => '刚刚', - 'check_all' => 'Check all', - 'uncheck_all' => 'Uncheck all', ), 'menu' => array( 'config' => '设置', diff --git a/src/psm/Module/Server/Controller/ServerController.class.php b/src/psm/Module/Server/Controller/ServerController.class.php index 10e59878..0d144537 100644 --- a/src/psm/Module/Server/Controller/ServerController.class.php +++ b/src/psm/Module/Server/Controller/ServerController.class.php @@ -190,7 +190,7 @@ class ServerController extends AbstractServerController { $user_idc_selected = $this->getServerUsers($this->server_id); foreach($users as &$user) { if(in_array($user['user_id'], $user_idc_selected)) { - $user['edit_checked'] = 'checked="checked"'; + $user['edit_selected'] = 'selected="selected"'; } } @@ -443,8 +443,6 @@ class ServerController extends AbstractServerController { 'label_yes' => psm_get_lang('system', 'yes'), 'label_no' => psm_get_lang('system', 'no'), 'label_add_new' => psm_get_lang('system', 'add_new'), - 'label_check_all' => psm_get_lang('system', 'check_all'), - 'label_uncheck_all' => psm_get_lang('system', 'uncheck_all'), ) ); diff --git a/src/psm/Module/User/Controller/UserController.class.php b/src/psm/Module/User/Controller/UserController.class.php index 571ccdf2..0552d6d6 100644 --- a/src/psm/Module/User/Controller/UserController.class.php +++ b/src/psm/Module/User/Controller/UserController.class.php @@ -168,7 +168,7 @@ class UserController extends AbstractController { foreach($this->servers as &$server) { if(in_array($server['server_id'], $user_servers)) { - $server['edit_checked'] = 'checked="checked"'; + $server['edit_selected'] = 'selected="selected"'; $server['class'] = 'active'; } } @@ -329,8 +329,6 @@ class UserController extends AbstractController { 'label_edit' => psm_get_lang('system', 'edit'), 'label_delete' => psm_get_lang('system', 'delete'), 'label_add_new' => psm_get_lang('system', 'add_new'), - 'label_check_all' => psm_get_lang('system', 'check_all'), - 'label_uncheck_all' => psm_get_lang('system', 'uncheck_all'), 'icon_level_10' => 'icon-admin', 'icon_level_20' => 'icon-user', ) diff --git a/src/templates/main.tpl.html b/src/templates/main.tpl.html index a317917a..15924793 100644 --- a/src/templates/main.tpl.html +++ b/src/templates/main.tpl.html @@ -13,6 +13,7 @@ + +
diff --git a/src/templates/server/server.tpl.html b/src/templates/server/server.tpl.html index 56f8cf1f..7a1b89cf 100644 --- a/src/templates/server/server.tpl.html +++ b/src/templates/server/server.tpl.html @@ -75,110 +75,102 @@