summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/Locale/pt_BR/translations.php102
-rw-r--r--app/Template/app/filters_helper.php4
-rw-r--r--app/Template/app/overview.php5
-rw-r--r--app/Template/project_header/header.php3
-rw-r--r--app/Template/project_header/search.php74
-rw-r--r--app/Template/search/index.php5
6 files changed, 96 insertions, 97 deletions
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index cd2b49dc..ea4a028c 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -949,57 +949,57 @@ return array(
'Duplicates are not imported' => 'Registros duplicados não são importados',
'Usernames must be lowercase and unique' => 'Nomes de usuário devem ser únicos e em letras minúsculas',
'Passwords will be encrypted if present' => 'Senhas serão encriptadas, se presentes',
- // '%s attached a new file to the task %s' => '',
- // 'Assign automatically a category based on a link' => '',
- // 'BAM - Konvertible Mark' => '',
- // 'Assignee Username' => '',
- // 'Assignee Name' => '',
- // 'Groups' => '',
- // 'Members of %s' => '',
- // 'New group' => '',
- // 'Group created successfully.' => '',
- // 'Unable to create your group.' => '',
- // 'Edit group' => '',
- // 'Group updated successfully.' => '',
- // 'Unable to update your group.' => '',
- // 'Add group member to "%s"' => '',
- // 'Group member added successfully.' => '',
- // 'Unable to add group member.' => '',
- // 'Remove user from group "%s"' => '',
- // 'User removed successfully from this group.' => '',
- // 'Unable to remove this user from the group.' => '',
- // 'Remove group' => '',
- // 'Group removed successfully.' => '',
- // 'Unable to remove this group.' => '',
- // 'Project Permissions' => '',
- // 'Manager' => '',
- // 'Project Manager' => '',
- // 'Project Member' => '',
- // 'Project Viewer' => '',
- // 'Your account is locked for %d minutes' => '',
- // 'Invalid captcha' => '',
- // 'The name must be unique' => '',
- // 'View all groups' => '',
- // 'View group members' => '',
- // 'There is no user available.' => '',
- // 'Do you really want to remove the user "%s" from the group "%s"?' => '',
- // 'There is no group.' => '',
- // 'External Id' => '',
- // 'Add group member' => '',
- // 'Do you really want to remove this group: "%s"?' => '',
- // 'There is no user in this group.' => '',
- // 'Remove this user' => '',
- // 'Permissions' => '',
- // 'Allowed Users' => '',
- // 'No user have been allowed specifically.' => '',
- // 'Role' => '',
- // 'Enter user name...' => '',
- // 'Allowed Groups' => '',
- // 'No group have been allowed specifically.' => '',
- // 'Group' => '',
- // 'Group Name' => '',
- // 'Enter group name...' => '',
- // 'Role:' => '',
+ '%s attached a new file to the task %s' => '%s anexou um novo arquivo a tarefa %s',
+ 'Assign automatically a category based on a link' => 'Atribuir automaticamente uma categoria baseada num link',
+ 'BAM - Konvertible Mark' => 'BAM - Mark conversível',
+ 'Assignee Username' => 'Usuário designado',
+ 'Assignee Name' => 'Nome do designado',
+ 'Groups' => 'Grupos',
+ 'Members of %s' => 'Membros do %s',
+ 'New group' => 'Novo grupo',
+ 'Group created successfully.' => 'Grupo criado com sucesso.',
+ 'Unable to create your group.' => 'Não foi possível de criar o seu grupo.',
+ 'Edit group' => 'Editar o grupo',
+ 'Group updated successfully.' => 'Grupo atualizado com sucesso.',
+ 'Unable to update your group.' => 'Não foi possível atualizar o seu grupo.',
+ 'Add group member to "%s"' => 'Adicionar um membro ao grupo "%s"',
+ 'Group member added successfully.' => 'Membro adicionado com sucesso ao o grupo.',
+ 'Unable to add group member.' => 'Não foi possivel adicionar esse membro ao grupo.',
+ 'Remove user from group "%s"' => 'Remover usuário do grupo "%s"',
+ 'User removed successfully from this group.' => 'Usuário removido com sucesso deste grupo.',
+ 'Unable to remove this user from the group.' => 'Não foi possivel remover este Usuário do grupo.',
+ 'Remove group' => 'Remover o grupo',
+ 'Group removed successfully.' => 'Grupo removido com sucesso.',
+ 'Unable to remove this group.' => 'Não foi possível remover este grupo.',
+ 'Project Permissions' => 'Permissões do projeto',
+ 'Manager' => 'Gerente',
+ 'Project Manager' => 'Gerente de projeto',
+ 'Project Member' => 'Membro de projeto',
+ 'Project Viewer' => '',
+ 'Your account is locked for %d minutes' => 'A sua conta está bloqueada por %d minutos',
+ 'Invalid captcha' => 'Captcha inválido',
+ 'The name must be unique' => 'O nome deve ser único',
+ 'View all groups' => 'Ver todos os grupos',
+ 'View group members' => 'Ver os membros do grupo',
+ 'There is no user available.' => 'Não há nenhum usuário disponível',
+ 'Do you really want to remove the user "%s" from the group "%s"?' => 'Você realmente deseja remover o usuário "%s" do grupo "%s"?',
+ 'There is no group.' => 'Não há nenhum grupo.',
+ 'External Id' => 'Id externo',
+ 'Add group member' => 'Adicionar um membro ao grupo',
+ 'Do you really want to remove this group: "%s"?' => 'Você realmente deseja excluir este grupo: "%s"?',
+ 'There is no user in this group.' => 'Não há usuários neste grupo.',
+ 'Remove this user' => 'Remover este usuário',
+ 'Permissions' => 'Permissões',
+ 'Allowed Users' => 'Usuários autorizados',
+ 'No user have been allowed specifically.' => 'Nenhum usuário foi especificamente autorizado.',
+ 'Role' => 'Função',
+ 'Enter user name...' => 'Digite o nome do usuário...',
+ 'Allowed Groups' => 'Grupos autorizados',
+ 'No group have been allowed specifically.' => 'Nenhum grupo foi especificamente autorizado.',
+ 'Group' => 'Grupo',
+ 'Group Name' => 'Nome do grupo',
+ 'Enter group name...' => 'Digite o nome do grupo',
+ 'Role:' => 'Função:',
'Project members' => 'Membros de projeto',
// 'Compare hours for "%s"' => '',
// '%s mentioned you in the task #%d' => '',
diff --git a/app/Template/app/filters_helper.php b/app/Template/app/filters_helper.php
index e4cbb942..c16c2251 100644
--- a/app/Template/app/filters_helper.php
+++ b/app/Template/app/filters_helper.php
@@ -1,6 +1,6 @@
<?= $this->hook->render('template:app:filters-helper:before', isset($project) ? array('project' => $project) : array()) ?>
-<div class="dropdown filters">
- <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Filters') ?></a>
+<div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('Default filters') ?>"><i class="fa fa-filter fa-fw"></i><i class="fa fa-caret-down"></i></a>
<ul>
<li><a href="#" class="filter-helper filter-reset" data-filter="<?= isset($reset) ? $reset : '' ?>" title="<?= t('Keyboard shortcut: "%s"', 'r') ?>"><?= t('Reset filters') ?></a></li>
<li><a href="#" class="filter-helper" data-filter="status:open assignee:me"><?= t('My tasks') ?></a></li>
diff --git a/app/Template/app/overview.php b/app/Template/app/overview.php
index ebb3b412..0b354791 100644
--- a/app/Template/app/overview.php
+++ b/app/Template/app/overview.php
@@ -1,11 +1,10 @@
-<div class="search">
+<div class="filter-box">
<form method="get" action="<?= $this->url->dir() ?>" class="search">
<?= $this->form->hidden('controller', array('controller' => 'search')) ?>
<?= $this->form->hidden('action', array('action' => 'index')) ?>
<?= $this->form->text('search', array(), array(), array('placeholder="'.t('Search').'"'), 'form-input-large') ?>
+ <?= $this->render('app/filters_helper') ?>
</form>
-
- <?= $this->render('app/filters_helper') ?>
</div>
<?= $this->render('app/projects', array('paginator' => $project_paginator, 'user' => $user)) ?>
diff --git a/app/Template/project_header/header.php b/app/Template/project_header/header.php
index eca9b327..f6e5af9e 100644
--- a/app/Template/project_header/header.php
+++ b/app/Template/project_header/header.php
@@ -1,5 +1,6 @@
-<div class="page-header">
+<div class="project-header">
<?= $this->hook->render('template:project:header:before', array('project' => $project)) ?>
+
<?= $this->render('project_header/dropdown', array('project' => $project, 'is_board' => isset($is_board))) ?>
<?= $this->render('project_header/views', array('project' => $project, 'filters' => $filters)) ?>
<?= $this->render('project_header/search', array(
diff --git a/app/Template/project_header/search.php b/app/Template/project_header/search.php
index 032e3343..2b2a2c39 100644
--- a/app/Template/project_header/search.php
+++ b/app/Template/project_header/search.php
@@ -1,45 +1,45 @@
-<form method="get" action="<?= $this->url->dir() ?>" class="search">
- <?= $this->form->hidden('controller', $filters) ?>
- <?= $this->form->hidden('action', $filters) ?>
- <?= $this->form->hidden('project_id', $filters) ?>
- <?= $this->form->text('search', $filters, array(), array('placeholder="'.t('Filter').'"'), 'form-input-large') ?>
-</form>
+<div class="filter-box">
+ <form method="get" action="<?= $this->url->dir() ?>" class="search">
+ <?= $this->form->hidden('controller', $filters) ?>
+ <?= $this->form->hidden('action', $filters) ?>
+ <?= $this->form->hidden('project_id', $filters) ?>
+ <?= $this->form->text('search', $filters, array(), array('placeholder="'.t('Filter').'"')) ?>
-<div class="filter-dropdowns">
- <?= $this->render('app/filters_helper', array('reset' => 'status:open', 'project' => $project)) ?>
+ <?= $this->render('app/filters_helper', array('reset' => 'status:open', 'project' => $project)) ?>
- <?php if (isset($custom_filters_list) && ! empty($custom_filters_list)): ?>
- <div class="dropdown filters">
- <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('My filters') ?></a>
- <ul>
- <?php foreach ($custom_filters_list as $filter): ?>
- <li><a href="#" class="filter-helper" data-<?php if ($filter['append']): ?><?= 'append-' ?><?php endif ?>filter='<?= $this->e($filter['filter']) ?>'><?= $this->e($filter['name']) ?></a></li>
- <?php endforeach ?>
- </ul>
+ <?php if (isset($custom_filters_list) && ! empty($custom_filters_list)): ?>
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('Custom filters') ?>"><i class="fa fa-bookmark fa-fw"></i><i class="fa fa-caret-down"></i></a>
+ <ul>
+ <?php foreach ($custom_filters_list as $filter): ?>
+ <li><a href="#" class="filter-helper" data-<?php if ($filter['append']): ?><?= 'append-' ?><?php endif ?>filter='<?= $this->e($filter['filter']) ?>'><?= $this->e($filter['name']) ?></a></li>
+ <?php endforeach ?>
+ </ul>
</div>
- <?php endif ?>
+ <?php endif ?>
- <?php if (isset($users_list)): ?>
- <div class="dropdown filters">
- <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Users') ?></a>
- <ul>
- <li><a href="#" class="filter-helper" data-append-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
- <?php foreach ($users_list as $user): ?>
- <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li>
- <?php endforeach ?>
- </ul>
+ <?php if (isset($users_list)): ?>
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('User filters') ?>"><i class="fa fa-users fa-fw"></i> <i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li><a href="#" class="filter-helper" data-append-filter="assignee:nobody"><?= t('Not assigned') ?></a></li>
+ <?php foreach ($users_list as $user): ?>
+ <li><a href="#" class="filter-helper" data-append-filter='assignee:"<?= $this->e($user) ?>"'><?= $this->e($user) ?></a></li>
+ <?php endforeach ?>
+ </ul>
</div>
- <?php endif ?>
+ <?php endif ?>
- <?php if (isset($categories_list) && ! empty($categories_list)): ?>
- <div class="dropdown filters">
- <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Categories') ?></a>
- <ul>
- <li><a href="#" class="filter-helper" data-append-filter="category:none"><?= t('No category') ?></a></li>
- <?php foreach ($categories_list as $category): ?>
- <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li>
- <?php endforeach ?>
- </ul>
+ <?php if (isset($categories_list) && ! empty($categories_list)): ?>
+ <div class="dropdown">
+ <a href="#" class="dropdown-menu dropdown-menu-link-icon" title="<?= t('Category filters') ?>"><i class="fa fa-tags fa-fw"></i><i class="fa fa-caret-down"></i></a>
+ <ul>
+ <li><a href="#" class="filter-helper" data-append-filter="category:none"><?= t('No category') ?></a></li>
+ <?php foreach ($categories_list as $category): ?>
+ <li><a href="#" class="filter-helper" data-append-filter='category:"<?= $this->e($category) ?>"'><?= $this->e($category) ?></a></li>
+ <?php endforeach ?>
+ </ul>
</div>
- <?php endif ?>
+ <?php endif ?>
+ </form>
</div>
diff --git a/app/Template/search/index.php b/app/Template/search/index.php
index 329c072a..9231a6f3 100644
--- a/app/Template/search/index.php
+++ b/app/Template/search/index.php
@@ -8,14 +8,13 @@
</ul>
</div>
- <div class="search">
+ <div class="filter-box">
<form method="get" action="<?= $this->url->dir() ?>" class="search">
<?= $this->form->hidden('controller', $values) ?>
<?= $this->form->hidden('action', $values) ?>
<?= $this->form->text('search', $values, array(), array(empty($values['search']) ? 'autofocus' : '', 'placeholder="'.t('Search').'"'), 'form-input-large') ?>
+ <?= $this->render('app/filters_helper') ?>
</form>
-
- <?= $this->render('app/filters_helper') ?>
</div>
<?php if (empty($values['search'])): ?>