diff --git a/src/lang/en_US.lang.php b/src/lang/en_US.lang.php index 92f0c6b3..2a504f53 100644 --- a/src/lang/en_US.lang.php +++ b/src/lang/en_US.lang.php @@ -70,7 +70,7 @@ $sm_lang = array( 'help' => 'Help', ), 'users' => array( - 'user' => 'user', + 'user' => 'User', 'name' => 'Name', 'user_name' => 'Username', 'password' => 'Password', diff --git a/src/lang/fr_FR.lang.php b/src/lang/fr_FR.lang.php index a47e68fe..d9a9e91d 100644 --- a/src/lang/fr_FR.lang.php +++ b/src/lang/fr_FR.lang.php @@ -80,7 +80,7 @@ $sm_lang = array( 'level_10' => 'Administrateur', 'level_20' => 'Utilisateur', 'level_description' => 'Les Administrateurs ont un accès total. Ils peuvent gérer les serveurs, les utilisateurs et éditer la configuration globale.
Les Utilisateurs ne peuvent que voir et mettre à jour les serveurs qui leur ont été assignés.', - 'mobile' => 'Numéro de téléphone', + 'mobile' => 'Téléphone', 'email' => 'Email', 'delete_title' => 'Supprimer un utilisateur', 'delete_message' => 'Êtes-vous sûr de vouloir supprimer l\'utilisateur \'%1\' ?', diff --git a/src/lang/it_IT.lang.php b/src/lang/it_IT.lang.php index 38577636..23c0f38f 100644 --- a/src/lang/it_IT.lang.php +++ b/src/lang/it_IT.lang.php @@ -70,7 +70,7 @@ $sm_lang = array( 'help' => 'Aiuto', ), 'users' => array( - 'user' => 'utente', + 'user' => 'Utente', 'name' => 'Nome', 'user_name' => 'Username', 'password' => 'Password', diff --git a/src/lang/nl_NL.lang.php b/src/lang/nl_NL.lang.php index c4485b80..23639fba 100644 --- a/src/lang/nl_NL.lang.php +++ b/src/lang/nl_NL.lang.php @@ -70,7 +70,7 @@ $sm_lang = array( 'help' => 'Help', ), 'users' => array( - 'user' => 'gebruiker', + 'user' => 'Gebruiker', 'name' => 'Naam', 'user_name' => 'Gebruikersnaam', 'password' => 'Wachtwoord', diff --git a/src/lang/pt_BR.lang.php b/src/lang/pt_BR.lang.php index 64b6b4e6..a9268e5e 100644 --- a/src/lang/pt_BR.lang.php +++ b/src/lang/pt_BR.lang.php @@ -70,7 +70,7 @@ $sm_lang = array( 'help' => 'Ajuda', ), 'users' => array( - 'user' => 'usuário', + 'user' => 'Usuário', 'name' => 'Nome', 'user_name' => 'Username', 'password' => 'Senha', diff --git a/src/psm/Module/User/Controller/UserController.class.php b/src/psm/Module/User/Controller/UserController.class.php index 35130655..46bbe1af 100644 --- a/src/psm/Module/User/Controller/UserController.class.php +++ b/src/psm/Module/User/Controller/UserController.class.php @@ -290,6 +290,7 @@ class UserController extends AbstractController { array( 'subtitle' => psm_get_lang('menu', 'user'), 'label_users' => psm_get_lang('menu', 'users'), + 'label_user' => psm_get_lang('users', 'user'), 'label_name' => psm_get_lang('users', 'name'), 'label_user_name' => psm_get_lang('users', 'user_name'), 'label_password' => psm_get_lang('users', 'password'), @@ -304,9 +305,11 @@ class UserController extends AbstractController { 'label_action' => psm_get_lang('system', 'action'), 'label_save' => psm_get_lang('system', 'save'), 'label_go_back' => psm_get_lang('system', 'go_back'), - 'label_edit' => psm_get_lang('system', 'edit') . ' ' . psm_get_lang('users', 'user'), - 'label_delete' => psm_get_lang('system', 'delete') . ' ' . psm_get_lang('users', 'user'), + 'label_edit' => psm_get_lang('system', 'edit'), + 'label_delete' => psm_get_lang('system', 'delete'), 'label_add_new' => psm_get_lang('system', 'add_new'), + 'icon_level_10' => 'icon-admin', + 'icon_level_20' => 'icon-user', ) ); diff --git a/src/templates/server/server.tpl.html b/src/templates/server/server.tpl.html index d8978300..e62a2b26 100755 --- a/src/templates/server/server.tpl.html +++ b/src/templates/server/server.tpl.html @@ -1,9 +1,9 @@ - +
- + @@ -18,29 +18,29 @@ - - - - - - - - - - - - + + + + + + + + + + + +
 {label_label}{label_label} {label_domain} {label_port} {label_type}
- {status} - {label} {ip_short}{ip}{port}{type}{rtime} s{last_online} {active}{email}{sms}
{status}
{label}
{ip_short}
{ip}
{port}
{type}
{rtime} s
{last_online}
{active}
{email}
{sms}
 - - {html_actions} +
+ + {html_actions} +
{status} - {label} + {label}
  diff --git a/src/templates/user/profile.tpl.html b/src/templates/user/profile.tpl.html index 71e0b85e..fd158fb2 100755 --- a/src/templates/user/profile.tpl.html +++ b/src/templates/user/profile.tpl.html @@ -2,15 +2,15 @@
- +
- +
- +
- +
@@ -29,18 +29,18 @@
-
- -
- -
-
+
+ +
+ +
+
diff --git a/src/templates/user/user.tpl.html b/src/templates/user/user.tpl.html index fab0ef4c..27d436ae 100755 --- a/src/templates/user/user.tpl.html +++ b/src/templates/user/user.tpl.html @@ -2,25 +2,50 @@ - - - - - - - + + + + + + + - - - - - - + + + + + +
{label_name}{label_user_name}{label_level}{label_mobile}{label_email}{label_servers}{label_action}{label_user}{label_name}{label_level}{label_email}{label_mobile}{label_servers}{label_action}
{name}{user_name}{label_level_{level}}{mobile}{email}{emp_servers} +
+
+   + {user_name} +  ({name}) +
+
+
+ + + + + + +
+
+
+
+
+
{label_email}: 
{email}
+
{label_mobile}: 
{mobile}
+
{label_servers}: 
{emp_servers}
+
+
+
{name}
{label_level_{level}}
{email}
{mobile}
{emp_servers}
 @@ -39,18 +64,18 @@
{titlemode} -
- -
- -
-
+
+ +
+ +
+
@@ -77,18 +102,18 @@
-
- -
- -
-
+
+ +
+ +
+
diff --git a/static/css/style.css b/static/css/style.css index fc146c39..d5a78a7f 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -85,7 +85,7 @@ fieldset { } /* Tables */ -.table-align-middle td { +.align-middle { vertical-align: middle; } .tight { @@ -111,13 +111,18 @@ fieldset { display: table-cell; vertical-align: middle; height: 32px; - font-size: 1.1em; - font-weight: bold; } .table-cell-title .label { position: relative; top: -2px; } + +@media (max-width: 767px) { + .table-cell-title .title { + font-size: 1.1em; + font-weight: bold; + } +} .table-cell-details { display: table-cell; font-size: 11px; @@ -184,11 +189,18 @@ td.hidden-tablet, th.hidden-tablet { display: table-cell; } -td.visible-phone, th.visible-phone, -td.visible-tablet, th.visible-tablet, -td.hidden-desktop, th.hidden-desktop { +span.visible-desktop, span.visible-desktop, +span.hidden-phone, span.hidden-phone, +span.hidden-tablet, span.hidden-tablet { + display: inline-block; +} + +span.visible-phone, span.visible-phone, +span.visible-tablet, span.visible-tablet, +span.hidden-desktop, span.hidden-desktop { display: none; } + @media (min-width: 980px) { .hidden-desktop { display: none !important; @@ -227,20 +239,36 @@ td.hidden-desktop, th.hidden-desktop { td.hidden-desktop, th.hidden-desktop { display: table-cell; } + span.visible-phone, span.visible-phone, + span.hidden-desktop, span.hidden-desktop { + display: inline-block; + } td.hidden-phone, th.hidden-phone, td.visible-desktop, th.visible-desktop { display: none; } + span.hidden-phone, span.hidden-phone, + span.visible-desktop, span.visible-desktop { + display: none; + } } @media (min-width: 768px) and (max-width: 979px) { td.visible-tablet, th.visible-tablet, td.hidden-desktop, th.hidden-desktop { display: table-cell; } + span.visible-tablet, span.visible-tablet, + span.hidden-desktop, span.hidden-desktop { + display: inline-block; + } td.hidden-tablet, th.hidden-tablet, td.visible-desktop, th.visible-desktop { display: none; } + span.hidden-tablet, span.hidden-tablet, + span.visible-desktop, span.visible-desktop { + display: none; + } } @media (max-width: 479px) { #main-container, .container-fluid { @@ -437,6 +465,11 @@ legend{ .icon-chart { background-position: 0px -168px; } + .icon-mobile { background-position: -24px -168px; -} \ No newline at end of file +} + +.icon-admin { + background-position: -48px -168px; +} diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png index a09b8785..d1be41bb 100644 Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings-white.png differ diff --git a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png index f14778e2..590346d1 100644 Binary files a/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png and b/static/plugin/twitter-bootstrap/img/glyphicons-halflings.png differ