summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2019-05-10 11:36:33 +0000
committerAleksander Machniak <machniak@kolabsys.com>2019-05-10 11:36:33 +0000
commit1995649953b587fce4ca72e215e4c64b863410f7 (patch)
treeb147772d41ef2e070aa57aa631a0280985f475af /lib
parent0f51ea19380e770215694416f598e1bb8f9d5352 (diff)
downloadwebadmin-1995649953b587fce4ca72e215e4c64b863410f7.tar.gz
New skin
Diffstat (limited to 'lib')
-rw-r--r--lib/client/kolab_client_task_ou.php2
-rw-r--r--lib/client/kolab_client_task_settings.php83
-rw-r--r--lib/client/kolab_client_task_user.php3
-rw-r--r--lib/kolab_client_task.php69
-rw-r--r--lib/kolab_form.php51
-rw-r--r--lib/kolab_html.php28
-rw-r--r--lib/locale/bg_BG.php7
-rw-r--r--lib/locale/cs_CZ.php8
-rw-r--r--lib/locale/de_CH.php7
-rw-r--r--lib/locale/de_DE.php7
-rw-r--r--lib/locale/en_US.php8
-rw-r--r--lib/locale/es_ES.php7
-rw-r--r--lib/locale/et_EE.php8
-rw-r--r--lib/locale/fi_FI.php7
-rw-r--r--lib/locale/fr_FR.php7
-rw-r--r--lib/locale/it_IT.php7
-rw-r--r--lib/locale/ja_JP.php7
-rw-r--r--lib/locale/nl_NL.php7
-rw-r--r--lib/locale/pl_PL.php7
-rw-r--r--lib/locale/pt_BR.php7
-rw-r--r--lib/locale/ru_RU.php7
21 files changed, 177 insertions, 167 deletions
diff --git a/lib/client/kolab_client_task_ou.php b/lib/client/kolab_client_task_ou.php
index 2a99f92..11cf7cc 100644
--- a/lib/client/kolab_client_task_ou.php
+++ b/lib/client/kolab_client_task_ou.php
@@ -97,7 +97,7 @@ class kolab_client_task_ou extends kolab_client_task
}
if ($item['has_children']) {
- $tree .= '<span class="expando"></span>';
+ $tree .= '<span class="expando font-icon"></span>';
}
else if ($max_tree_level) {
$tree .= '<span class="spacer"></span>';
diff --git a/lib/client/kolab_client_task_settings.php b/lib/client/kolab_client_task_settings.php
index d811f1e..961b457 100644
--- a/lib/client/kolab_client_task_settings.php
+++ b/lib/client/kolab_client_task_settings.php
@@ -288,12 +288,12 @@ class kolab_client_task_settings extends kolab_client_task
$count_str = kolab_html::span(array(
'content' => $this->translate('list.records', $start, $end, $count)), true);
$prev = kolab_html::a(array(
- 'class' => 'prev' . ($prev ? '' : ' disabled'),
+ 'class' => 'prev font-icon' . ($prev ? '' : ' disabled'),
'href' => '#',
'onclick' => $prev ? "kadm.command('settings.type_list', {page: $prev})" : "return false",
));
$next = kolab_html::a(array(
- 'class' => 'next' . ($next ? '' : ' disabled'),
+ 'class' => 'next font-icon' . ($next ? '' : ' disabled'),
'href' => '#',
'onclick' => $next ? "kadm.command('settings.type_list', {page: $next})" : "return false",
));
@@ -324,7 +324,7 @@ class kolab_client_task_settings extends kolab_client_task
$table = kolab_html::table(array(
'id' => 'settingstypelist',
- 'class' => 'list',
+ 'class' => 'list table table-sm',
'head' => $head,
'body' => $rows,
'foot' => $foot,
@@ -565,7 +565,7 @@ class kolab_client_task_settings extends kolab_client_task
$debug = kolab_html::escape(print_r($data, true));
$debug = preg_replace('/(^Array\n\(|\n*\)$|\t)/', '', $debug);
$debug = str_replace("\n ", "\n", $debug);
- $debug = '<pre class="debug">' . $debug . '</pre>';
+ $debug = '<pre class="debug form-control">' . $debug . '</pre>';
$fields['debug'] = array(
'label' => 'debug',
'section' => 'props',
@@ -606,7 +606,7 @@ class kolab_client_task_settings extends kolab_client_task
$attr_table = array();
$table = array(
'id' => 'type_attr_table',
- 'class' => 'list',
+ 'class' => 'list table table-sm',
);
$cells = array(
'name' => array(
@@ -717,13 +717,13 @@ class kolab_client_task_settings extends kolab_client_task
if (in_array('delete', $rights)) {
$row['actions']['body'] .= kolab_html::a(array(
'href' => '#delete', 'onclick' => "kadm.type_attr_delete('$attr')",
- 'class' => 'button delete', 'title' => $this->translate('delete')));
+ 'class' => 'button font-icon delete', 'title' => $this->translate('delete')));
}
if (in_array('write', $rights)) {
$row['actions']['body'] .= kolab_html::a(array(
'href' => '#edit', 'onclick' => "kadm.type_attr_edit('$attr')",
- 'class' => 'button edit', 'title' => $this->translate('edit')));
+ 'class' => 'button font-icon edit', 'title' => $this->translate('edit')));
}
}
@@ -789,7 +789,6 @@ class kolab_client_task_settings extends kolab_client_task
private function type_form_attributes_form($attributes)
{
// build form
- $rows = array();
$form = array(
'name' => array(
'type' => kolab_form::INPUT_SELECT,
@@ -837,57 +836,41 @@ class kolab_client_task_settings extends kolab_client_task
),
);
+ $result = new kolab_form();
+
foreach ($form as $idx => $element) {
- $element['name'] = 'attr_' . $idx;
- $body = kolab_form::get_element($element);
+ $element['name'] = 'attr_' . $idx;
+
+ if ($idx === 'value') {
+ $add = array(
+ 'name' => 'attr_data',
+ 'type' => kolab_form::INPUT_TEXT,
+ );
- if ($idx == 'value') {
- $body .= kolab_form::get_element(array(
- 'name' => 'attr_data',
- 'type' => kolab_form::INPUT_TEXT,
+ $element = kolab_html::div(array(
+ 'class' => 'input-group',
+ 'content' => kolab_form::get_element($element) . kolab_form::get_element($add)
));
+
+ $element = array('value' => $element);
}
- $rows[] = array(
- 'id' => 'attr_form_row_' . $idx,
- 'cells' => array(
- array(
- 'class' => 'label',
- 'body' => $this->translate('attribute.' . $idx),
- ),
- array(
- 'class' => 'value',
- 'body' => $body,
- ),
- ),
- );
+ $element['label'] = $this->translate('attribute.' . $idx);
+
+ $result->add_element($element);
}
- $rows[] = array(
- 'cells' => array(
- array(
- 'colspan' => 2,
- 'class' => 'formbuttons',
- 'body' => kolab_html::input(array(
- 'type' => 'button',
- 'value' => $this->translate('button.save'),
- 'onclick' => "kadm.type_attr_save()",
- ))
- . kolab_html::input(array(
- 'type' => 'button',
- 'value' => $this->translate('button.cancel'),
- 'onclick' => "kadm.type_attr_cancel()",
- )),
- ),
- ),
- );
+ $result->add_button(array(
+ 'value' => $this->translate('button.save'),
+ 'onclick' => "kadm.type_attr_save()",
+ ));
- $table = array(
- 'class' => 'form',
- 'body' => $rows,
- );
+ $result->add_button(array(
+ 'value' => $this->translate('button.cancel'),
+ 'onclick' => "kadm.type_attr_cancel()",
+ ));
- return kolab_html::table($table);
+ return $result->output();
}
/**
diff --git a/lib/client/kolab_client_task_user.php b/lib/client/kolab_client_task_user.php
index 357d7c6..9171c7f 100644
--- a/lib/client/kolab_client_task_user.php
+++ b/lib/client/kolab_client_task_user.php
@@ -181,11 +181,12 @@ class kolab_client_task_user extends kolab_client_task
$fields['userpassword2'] = $fields['userpassword'];
// Add 'Generate password' link
if (empty($fields['userpassword']['readonly'])) {
+ $fields['userpassword']['input-group'] = true;
$fields['userpassword']['suffix'] = kolab_html::a(array(
'content' => $this->translate('password.generate'),
'href' => '#',
'onclick' => "kadm.generate_password('userpassword')",
- 'class' => 'nowrap',
+ 'class' => 'nowrap btn btn-secondary input-group-append',
));
}
}
diff --git a/lib/kolab_client_task.php b/lib/kolab_client_task.php
index 3c6402f..46eecaf 100644
--- a/lib/kolab_client_task.php
+++ b/lib/kolab_client_task.php
@@ -793,28 +793,43 @@ class kolab_client_task
{
$post = $this->get_input('login', 'POST', true);
- $username = kolab_html::label(array(
- 'for' => 'login_name',
- 'content' => $this->translate('login.username')), true)
- . kolab_html::input(array(
- 'type' => 'text',
- 'id' => 'login_name',
- 'name' => 'login[username]',
- 'value' => $post['username'],
- 'autofocus' => true));
-
- $password = kolab_html::label(array(
- 'for' => 'login_pass',
- 'content' => $this->translate('login.password')), true)
- . kolab_html::input(array(
- 'type' => 'password',
- 'id' => 'login_pass',
- 'name' => 'login[password]',
- 'value' => ''));
+ $username = kolab_html::div(array(
+ 'class' => 'form-group input-group input-group-lg',
+ 'content' => kolab_html::label(array(
+ 'for' => 'login_name',
+ 'class' => 'font-icon login input-group-prepend input-group-text',
+ 'content' => kolab_html::span(array(
+ 'class' => 'sr-only',
+ 'content' => $this->translate('login.username'), true))))
+ . kolab_html::input(array(
+ 'type' => 'text',
+ 'id' => 'login_name',
+ 'name' => 'login[username]',
+ 'value' => $post['username'],
+ 'placeholder' => $this->translate('login.username'),
+ 'autofocus' => true))
+ ));
+
+ $password = kolab_html::div(array(
+ 'class' => 'form-group input-group input-group-lg',
+ 'content' => kolab_html::label(array(
+ 'for' => 'login_pass',
+ 'class' => 'font-icon password input-group-prepend input-group-text',
+ 'content' => kolab_html::span(array(
+ 'class' => 'sr-only',
+ 'content' => $this->translate('login.password'), true))))
+ . kolab_html::input(array(
+ 'type' => 'password',
+ 'id' => 'login_pass',
+ 'name' => 'login[password]',
+ 'placeholder' => $this->translate('login.password'),
+ 'value' => ''))
+ ));
$button = kolab_html::input(array(
'type' => 'submit',
'id' => 'login_submit',
+ 'class' => 'btn btn-primary btn-lg text-uppercase w-100',
'value' => $this->translate('login.login')));
$form = kolab_html::form(array(
@@ -822,9 +837,10 @@ class kolab_client_task
'name' => 'login',
'method' => 'post',
'action' => '?'),
- kolab_html::span(array('content' => $username))
- . kolab_html::span(array('content' => $password))
- . $button);
+ kolab_html::div(array('content' => $username))
+ . kolab_html::div(array('content' => $password))
+ . $button
+ );
return $form;
}
@@ -944,7 +960,7 @@ class kolab_client_task
$this->output->add_translation('ldap.one', 'ldap.sub', 'ldap.base',
'ldap.host', 'ldap.basedn','ldap.scope', 'ldap.conditions',
'ldap.filter_any', 'ldap.filter_both', 'ldap.filter_prefix', 'ldap.filter_suffix',
- 'ldap.filter_exact', 'ldap.filter_notexact'
+ 'ldap.filter_exact'
);
}
}
@@ -1225,7 +1241,7 @@ class kolab_client_task
$debug = kolab_html::escape(print_r($data, true));
$debug = preg_replace('/(^Array\n\(|\n*\)$|\t)/', '', $debug);
$debug = str_replace("\n ", "\n", $debug);
- $debug = '<pre class="debug">' . $debug . '</pre>';
+ $debug = '<pre class="debug form-control">' . $debug . '</pre>';
$fields['debug'] = array(
'label' => 'debug',
'section' => 'system',
@@ -1483,6 +1499,7 @@ class kolab_client_task
$id = $data['id'];
$form->add_button(array(
'value' => kolab_html::escape($this->translate('button.delete')),
+ 'class' => 'btn btn-danger',
'onclick' => "kadm.command('{$name}.delete', '{$id}')",
));
}
@@ -1718,12 +1735,12 @@ class kolab_client_task
$count_str = kolab_html::span(array(
'content' => $this->translate('list.records', $start, $end, $count)), true);
$prev = kolab_html::a(array(
- 'class' => 'prev' . ($prev ? '' : ' disabled'),
+ 'class' => 'prev font-icon' . ($prev ? '' : ' disabled'),
'href' => '#',
'onclick' => $prev ? "kadm.command('$task.list', {page: $prev})" : "return false",
));
$next = kolab_html::a(array(
- 'class' => 'next' . ($next ? '' : ' disabled'),
+ 'class' => 'next font-icon' . ($next ? '' : ' disabled'),
'href' => '#',
'onclick' => $next ? "kadm.command('$task.list', {page: $next})" : "return false",
));
@@ -1772,7 +1789,7 @@ class kolab_client_task
$table = kolab_html::table(array(
'id' => $task . 'list',
- 'class' => $table_class,
+ 'class' => $table_class . ' table table-sm',
'head' => $head,
'body' => $rows,
'foot' => $foot,
diff --git a/lib/kolab_form.php b/lib/kolab_form.php
index 9ebf900..ec0afde 100644
--- a/lib/kolab_form.php
+++ b/lib/kolab_form.php
@@ -145,7 +145,7 @@ class kolab_form
if (!empty($rows)) {
$content .= "\n" . kolab_html::fieldset(array(
'legend' => $set,
- 'content' => kolab_html::table(array('body' => $rows, 'class' => 'form')),
+ 'content' => implode("\n", $rows),
'class' => $this->active_section == $set_idx ? 'active' : '',
));
}
@@ -168,7 +168,7 @@ class kolab_form
}
if (!empty($rows)) {
- $content = kolab_html::table(array('body' => $rows, 'class' => 'form'));
+ $content = implode("\n", $rows);
}
if (!empty($hidden)) {
@@ -214,34 +214,39 @@ class kolab_form
*/
private function form_row($element)
{
- $attrib = array();
+ $attrib['class'] = 'form-group';
if (!empty($element['required']) && empty($element['readonly']) && empty($element['disabled'])) {
- $attrib['class'] = 'required';
+ $attrib['class'] .= ' required';
}
if ($element['type'] == self::INPUT_CONTENT) {
- $attrib['cells'] = array(
- 0 => array(
- 'class' => $element['class'],
- 'colspan' => 2,
- 'body' => $element['content'],
- ),
- );
+ $attrib['content'] = kolab_html::div(array(
+ 'class' => $element['class'],
+ 'content' => $element['content'],
+ ));
}
else {
- $attrib['cells'] = array(
- 0 => array(
- 'class' => 'label',
- 'body' => $element['label'],
- ),
- 1 => array(
- 'class' => 'value',
- 'body' => self::get_element($element),
- ),
- );
+ $attrib['class'] .= ' row';
+ $content = self::get_element($element);
+ $class = 'col-sm-9' . ($content[0] != '<' ? ' form-control-plaintext' : '');
+
+ if (is_array($element) && $element['input-group']) {
+ $class .= ' input-group';
+ }
+
+ $attrib['content'] = kolab_html::label(array(
+ 'class' => 'col-form-label col-sm-3',
+ 'content' => $element['label'],
+ ), true)
+ . kolab_html::div(array(
+ 'class' => $class,
+ 'content' => $content,
+ ));
}
+ return kolab_html::div($attrib);
+
return $attrib;
}
@@ -269,10 +274,6 @@ class kolab_form
}
}
- if ($attribs['size'] >= 40) {
- $attribs['class'] = (!empty($attribs['class']) ? $attribs['class'] . ' ' : '') . 'maxsize';
- }
-
$content = kolab_html::input($attribs);
break;
diff --git a/lib/kolab_html.php b/lib/kolab_html.php
index 895647e..a2088a1 100644
--- a/lib/kolab_html.php
+++ b/lib/kolab_html.php
@@ -37,7 +37,7 @@ class kolab_html
public static $td_attribs = array('colspan', 'rowspan');
public static $textarea_attribs = array('cols', 'rows', 'disabled', 'name', 'readonly', 'tabindex');
public static $input_attribs = array('checked', 'disabled', 'name', 'readonly', 'tabindex',
- 'type', 'size', 'maxlength', 'value', 'autofocus');
+ 'type', 'size', 'maxlength', 'value', 'autofocus', 'placeholder');
public static $select_attribs = array('multiple', 'name', 'size', 'disabled', 'readonly', 'autofocus');
public static $option_attribs = array('selected', 'value', 'disabled', 'readonly');
public static $a_attribs = array('href', 'name', 'rel', 'tabindex', 'target');
@@ -66,7 +66,7 @@ class kolab_html
if (!empty($attribs['head']) && is_array($attribs['head'])) {
$table .= '<thead>';
foreach ($attribs['head'] as $row) {
- $table .= "\n" . self::tr($row, null, true);
+ $table .= "\n" . self::tr($row, true);
}
$table .= '</thead>';
}
@@ -155,6 +155,20 @@ class kolab_html
$attribs['disabled'] = 'disabled';
}
+ if ($attribs['type'] == 'button' || $attribs['type'] == 'submit') {
+ $attribs['class'] = trim($attribs['class'] . ' btn');
+
+ if (!preg_match('/btn-/', $attribs['class'])) {
+ $attribs['class'] .= ' btn-' . (strpos($attribs['class'], 'submit') !== false ? 'primary' : 'secondary');
+ }
+ }
+ else if ($attribs['type'] == 'checkbox') {
+ // TODO: Bootstrap style
+ }
+ else {
+ $attribs['class'] = trim($attribs['class'] . ' form-control');
+ }
+
return sprintf('<input%s />', self::attrib_string($attribs, $elem_attribs));
}
@@ -205,8 +219,12 @@ class kolab_html
}
$attribs['data-type'] = 'quota';
+ $select['class'] = 'input-group-append';
- return self::input($attribs) . self::select($select);
+ return self::div(array(
+ 'class' => 'input-group',
+ 'content' => self::input($attribs) . self::select($select)
+ ));
}
/**
@@ -228,6 +246,8 @@ class kolab_html
$content = self::escape($content);
}
+ $attribs['class'] = trim($attribs['class'] . ' form-control');
+
return sprintf('<textarea%s>%s</textarea>',
self::attrib_string($attribs, $elem_attribs), $content);
}
@@ -271,6 +291,8 @@ class kolab_html
}
}
+ $attribs['class'] = trim($attribs['class'] . ' custom-select');
+
return sprintf('<select%s>%s</select>',
self::attrib_string($attribs, $elem_attribs), implode("\n", $content));
}
diff --git a/lib/locale/bg_BG.php b/lib/locale/bg_BG.php
index 21d2094..4c92021 100644
--- a/lib/locale/bg_BG.php
+++ b/lib/locale/bg_BG.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Loading...';
$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
+$LANG['login.username'] = 'Username';
+$LANG['login.password'] = 'Password';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = 'Incorrect username or password!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Запазване на данни...';
-$LANG['search'] = 'Search';
+$LANG['search'] = 'Search...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/cs_CZ.php b/lib/locale/cs_CZ.php
index dfb80b1..26206c7 100644
--- a/lib/locale/cs_CZ.php
+++ b/lib/locale/cs_CZ.php
@@ -201,9 +201,9 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Loading...';
$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
+$LANG['login.username'] = 'Username';
+$LANG['login.password'] = 'Password';
+$LANG['login.domain'] = 'Domain';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = 'Incorrect username or password!';
$LANG['MB'] = 'MB';
@@ -273,7 +273,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Ukládám data...';
-$LANG['search'] = 'Search';
+$LANG['search'] = 'Search...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/de_CH.php b/lib/locale/de_CH.php
index 33c47f1..5750530 100644
--- a/lib/locale/de_CH.php
+++ b/lib/locale/de_CH.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Laden...';
$LANG['logout'] = 'Abmelden';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
+$LANG['login.username'] = 'Username';
+$LANG['login.password'] = 'Password';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = 'Benutzername oder Passwort inkorrekt!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Speichere...';
-$LANG['search'] = 'Suchen';
+$LANG['search'] = 'Suchen...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/de_DE.php b/lib/locale/de_DE.php
index 1727518..bfc8934 100644
--- a/lib/locale/de_DE.php
+++ b/lib/locale/de_DE.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 zu $2 von $3';
$LANG['loading'] = 'Laden…';
$LANG['logout'] = 'Abmelden';
-$LANG['login.username'] = 'Benutzername:';
-$LANG['login.password'] = 'Passwort:';
-$LANG['login.domain'] = 'Domäne:';
+$LANG['login.username'] = 'Benutzername';
+$LANG['login.password'] = 'Passwort';
$LANG['login.login'] = 'Anmelden';
$LANG['loginerror'] = 'Ungültiger Benutzername oder Passwort!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Rollentyp';
$LANG['saving'] = 'Speichern…';
-$LANG['search'] = 'Suchen';
+$LANG['search'] = 'Suchen...';
$LANG['search.reset'] = 'Zurücksetzen';
$LANG['search.criteria'] = 'Suchkriterien';
$LANG['search.field'] = 'Feld:';
diff --git a/lib/locale/en_US.php b/lib/locale/en_US.php
index 4cbe353..d67c413 100644
--- a/lib/locale/en_US.php
+++ b/lib/locale/en_US.php
@@ -193,15 +193,13 @@ $LANG['ldap.filter_both'] = 'contains';
$LANG['ldap.filter_prefix'] = 'starts with';
$LANG['ldap.filter_suffix'] = 'ends with';
$LANG['ldap.filter_exact'] = 'is equal to';
-$LANG['ldap.filter_notexact'] = 'is not equal to';
$LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Loading...';
$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
+$LANG['login.username'] = 'Username';
+$LANG['login.password'] = 'Password';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = 'Incorrect username or password!';
$LANG['MB'] = 'MB';
@@ -272,7 +270,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Saving data...';
-$LANG['search'] = 'Search';
+$LANG['search'] = 'Search...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/es_ES.php b/lib/locale/es_ES.php
index 082478b..c37c800 100644
--- a/lib/locale/es_ES.php
+++ b/lib/locale/es_ES.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Cargando...';
$LANG['logout'] = 'Desloguearse';
-$LANG['login.username'] = 'Nombre de usuario:';
-$LANG['login.password'] = 'Contraseña:';
-$LANG['login.domain'] = 'Dominio:';
+$LANG['login.username'] = 'Nombre de usuario';
+$LANG['login.password'] = 'Contraseña';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = '¡Nombre de usuario o contraseña incorrectos!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Tipo de Rol';
$LANG['saving'] = 'Guardando datos...';
-$LANG['search'] = 'Buscar';
+$LANG['search'] = 'Buscar...';
$LANG['search.reset'] = 'Restablecer';
$LANG['search.criteria'] = 'Criterio de búsqueda';
$LANG['search.field'] = 'Campo:';
diff --git a/lib/locale/et_EE.php b/lib/locale/et_EE.php
index 08ec479..4e5d9d1 100644
--- a/lib/locale/et_EE.php
+++ b/lib/locale/et_EE.php
@@ -201,9 +201,9 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Loading...';
$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Username:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Domain:';
+$LANG['login.username'] = 'Username';
+$LANG['login.password'] = 'Password';
+$LANG['login.domain'] = 'Domain';
$LANG['login.login'] = 'Login';
$LANG['loginerror'] = 'Incorrect username or password!';
$LANG['MB'] = 'MB';
@@ -273,7 +273,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Saving data...';
-$LANG['search'] = 'Search';
+$LANG['search'] = 'Search...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/fi_FI.php b/lib/locale/fi_FI.php
index 6ae5835..d9b9b58 100644
--- a/lib/locale/fi_FI.php
+++ b/lib/locale/fi_FI.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Ladataan...';
$LANG['logout'] = 'Kirjaudu ulos';
-$LANG['login.username'] = 'Käyttäjätunnus:';
-$LANG['login.password'] = 'Salasana:';
-$LANG['login.domain'] = 'Toimialue:';
+$LANG['login.username'] = 'Käyttäjätunnus';
+$LANG['login.password'] = 'Salasana';
$LANG['login.login'] = 'Kirjaudu';
$LANG['loginerror'] = 'Väärä käyttäjätunnus tai salasana!';
$LANG['MB'] = 'Mt';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Roolin tyyppi';
$LANG['saving'] = 'Tallennetaan tietoja...';
-$LANG['search'] = 'Etsi';
+$LANG['search'] = 'Etsi...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Kenttä:';
diff --git a/lib/locale/fr_FR.php b/lib/locale/fr_FR.php
index c86e2de..f77312c 100644
--- a/lib/locale/fr_FR.php
+++ b/lib/locale/fr_FR.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Chargement...';
$LANG['logout'] = 'Déconnexion';
-$LANG['login.username'] = 'Nom d\'Utilisateur:';
-$LANG['login.password'] = 'Mot de passe:';
-$LANG['login.domain'] = 'Domaine:';
+$LANG['login.username'] = 'Nom d\'Utilisateur';
+$LANG['login.password'] = 'Mot de passe';
$LANG['login.login'] = 'Se connecter';
$LANG['loginerror'] = 'Nom d\'utilisateur ou mot de passe incorrect!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Type de Rôle';
$LANG['saving'] = 'Enregistrer...';
-$LANG['search'] = 'Chercher';
+$LANG['search'] = 'Chercher...';
$LANG['search.reset'] = 'Réinitialiser';
$LANG['search.criteria'] = 'Critères de recherche';
$LANG['search.field'] = 'Champ:';
diff --git a/lib/locale/it_IT.php b/lib/locale/it_IT.php
index cc20cb8..c807303 100644
--- a/lib/locale/it_IT.php
+++ b/lib/locale/it_IT.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 to $2 of $3';
$LANG['loading'] = 'Caricamento...';
$LANG['logout'] = 'Logout';
-$LANG['login.username'] = 'Nome Utente:';
-$LANG['login.password'] = 'Password:';
-$LANG['login.domain'] = 'Dominio:';
+$LANG['login.username'] = 'Nome Utente';
+$LANG['login.password'] = 'Password';
$LANG['login.login'] = 'Accedi';
$LANG['loginerror'] = 'Nome utente o password errati!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Role Type';
$LANG['saving'] = 'Salvataggio dati...';
-$LANG['search'] = 'Search';
+$LANG['search'] = 'Search...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Search criteria';
$LANG['search.field'] = 'Field:';
diff --git a/lib/locale/ja_JP.php b/lib/locale/ja_JP.php
index df1eba4..f6a3a7c 100644
--- a/lib/locale/ja_JP.php
+++ b/lib/locale/ja_JP.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1から$2 $3中';
$LANG['loading'] = '読込中…';
$LANG['logout'] = 'ログアウト';
-$LANG['login.username'] = 'ユーザ名:';
-$LANG['login.password'] = 'パスワード:';
-$LANG['login.domain'] = 'ドメイン:';
+$LANG['login.username'] = 'ユーザ名';
+$LANG['login.password'] = 'パスワード';
$LANG['login.login'] = 'ログイン';
$LANG['loginerror'] = 'ユーザ名もしくはパスワードが違います!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'ロールタイプ';
$LANG['saving'] = 'データを保存中…';
-$LANG['search'] = '検索';
+$LANG['search'] = '検索...';
$LANG['search.reset'] = 'リセット';
$LANG['search.criteria'] = '検索設定';
$LANG['search.field'] = 'フィールド:';
diff --git a/lib/locale/nl_NL.php b/lib/locale/nl_NL.php
index c678df9..3bc1d45 100644
--- a/lib/locale/nl_NL.php
+++ b/lib/locale/nl_NL.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 tot $2 van $3';
$LANG['loading'] = 'Bezig met laden...';
$LANG['logout'] = 'Uitloggen';
-$LANG['login.username'] = 'Gebruikersnaam:';
-$LANG['login.password'] = 'Wachtwoord:';
-$LANG['login.domain'] = 'Domein:';
+$LANG['login.username'] = 'Gebruikersnaam';
+$LANG['login.password'] = 'Wachtwoord';
$LANG['login.login'] = 'Gebruikersnaam';
$LANG['loginerror'] = 'Incorrecte gebruikersnaam of wachtwoord!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Rol Type';
$LANG['saving'] = 'Bezig data op te slaan...';
-$LANG['search'] = 'Zoeken';
+$LANG['search'] = 'Zoeken...';
$LANG['search.reset'] = 'Reset';
$LANG['search.criteria'] = 'Zoek criteria';
$LANG['search.field'] = 'Veld:';
diff --git a/lib/locale/pl_PL.php b/lib/locale/pl_PL.php
index d2ef1f7..71d5212 100644
--- a/lib/locale/pl_PL.php
+++ b/lib/locale/pl_PL.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 do $2 z $3';
$LANG['loading'] = 'Ładowanie...';
$LANG['logout'] = 'Wyloguj';
-$LANG['login.username'] = 'Nazwa użytkownika:';
-$LANG['login.password'] = 'Hasło:';
-$LANG['login.domain'] = 'Domena:';
+$LANG['login.username'] = 'Nazwa użytkownika';
+$LANG['login.password'] = 'Hasło';
$LANG['login.login'] = 'Zaloguj';
$LANG['loginerror'] = 'Nieprawidłowa nazwa użytkownika lub hasło!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Typ roli';
$LANG['saving'] = 'Zapisywanie danych...';
-$LANG['search'] = 'Znajdź';
+$LANG['search'] = 'Wyszukaj...';
$LANG['search.reset'] = 'Wyczyść';
$LANG['search.criteria'] = 'Kryteria wyszukiwania';
$LANG['search.field'] = 'Pole:';
diff --git a/lib/locale/pt_BR.php b/lib/locale/pt_BR.php
index 63c8b99..69c3916 100644
--- a/lib/locale/pt_BR.php
+++ b/lib/locale/pt_BR.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = '$1 - $2 de $3';
$LANG['loading'] = 'Carregando...';
$LANG['logout'] = 'Deslogar';
-$LANG['login.username'] = 'Usuário:';
-$LANG['login.password'] = 'Senha:';
-$LANG['login.domain'] = 'Domínio:';
+$LANG['login.username'] = 'Usuário';
+$LANG['login.password'] = 'Senha';
$LANG['login.login'] = 'Usuário';
$LANG['loginerror'] = 'O usuário ou senha estão incorretos!';
$LANG['MB'] = 'MB';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Tipo da função';
$LANG['saving'] = 'Salvando dados...';
-$LANG['search'] = 'Pesquisar';
+$LANG['search'] = 'Pesquisar...';
$LANG['search.reset'] = 'Redefinir';
$LANG['search.criteria'] = 'Critério da pesquisa';
$LANG['search.field'] = 'Campo:';
diff --git a/lib/locale/ru_RU.php b/lib/locale/ru_RU.php
index dda3564..d498765 100644
--- a/lib/locale/ru_RU.php
+++ b/lib/locale/ru_RU.php
@@ -201,9 +201,8 @@ $LANG['list.records'] = 'от $1 до $2 из $3';
$LANG['loading'] = 'Загрузка...';
$LANG['logout'] = 'Выход';
-$LANG['login.username'] = 'Имя пользователя:';
-$LANG['login.password'] = 'Пароль:';
-$LANG['login.domain'] = 'Домен:';
+$LANG['login.username'] = 'Имя пользователя';
+$LANG['login.password'] = 'Пароль';
$LANG['login.login'] = 'Логин';
$LANG['loginerror'] = 'Неверное имя пользователя или пароль!';
$LANG['MB'] = 'МБ';
@@ -273,7 +272,7 @@ $LANG['role.type_id'] = 'Тип роли';
$LANG['saving'] = 'Сохранение данных...';
-$LANG['search'] = 'Поиск';
+$LANG['search'] = 'Поиск...';
$LANG['search.reset'] = 'Сбросить';
$LANG['search.criteria'] = 'Критерий';
$LANG['search.field'] = 'Поле:';