From 348f4491ff3171d06888a868b22868ce2b8b1eab Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 8 Jan 2017 11:29:41 -0500 Subject: Make icons clickable in menus --- app/Helper/ModalHelper.php | 15 +++++++++----- app/Helper/UrlHelper.php | 29 +++++++++++++++++++++++--- app/Template/activity/project.php | 6 +++--- app/Template/board/tooltip_files.php | 2 +- app/Template/comments/show.php | 3 +-- app/Template/dashboard/layout.php | 6 ++---- app/Template/dashboard/notifications.php | 6 ++---- app/Template/doc/show.php | 3 +-- app/Template/group/index.php | 6 +++--- app/Template/group/users.php | 2 +- app/Template/header/user_dropdown.php | 27 ++++++++---------------- app/Template/link/edit.php | 6 +----- app/Template/link/index.php | 4 ++-- app/Template/plugin/directory.php | 6 ++---- app/Template/project/dropdown.php | 21 +++++++------------ app/Template/project/sidebar.php | 6 +++--- app/Template/project_gantt/show.php | 6 ++++-- app/Template/project_header/dropdown.php | 30 +++++++++------------------ app/Template/project_header/views.php | 15 +++++--------- app/Template/project_list/show.php | 4 ++-- app/Template/project_overview/files.php | 6 ++---- app/Template/project_overview/images.php | 3 +-- app/Template/project_overview/information.php | 6 +++--- app/Template/project_permission/groups.php | 3 +-- app/Template/project_permission/users.php | 3 +-- app/Template/project_user_overview/layout.php | 7 ++----- app/Template/project_view/share.php | 6 +++--- app/Template/project_view/show.php | 6 +++--- app/Template/search/activity.php | 3 +-- app/Template/search/index.php | 3 +-- app/Template/subtask/table.php | 6 ++---- app/Template/swimlane/table.php | 12 ++++------- app/Template/task/details.php | 6 ++---- app/Template/task/dropdown.php | 3 +-- app/Template/task/sidebar.php | 15 +++++--------- app/Template/task_file/files.php | 3 +-- app/Template/task_file/images.php | 3 +-- app/Template/task_gantt/show.php | 6 ++---- app/Template/task_import/show.php | 2 +- app/Template/user_import/show.php | 3 +-- app/Template/user_list/dropdown.php | 3 +-- app/Template/user_list/show.php | 2 +- app/Template/user_view/layout.php | 4 ++-- app/Template/user_view/share.php | 4 ++-- app/Template/user_view/show.php | 4 ++-- 45 files changed, 141 insertions(+), 184 deletions(-) (limited to 'app') diff --git a/app/Helper/ModalHelper.php b/app/Helper/ModalHelper.php index e6037a8c..b3241b9d 100644 --- a/app/Helper/ModalHelper.php +++ b/app/Helper/ModalHelper.php @@ -43,31 +43,36 @@ class ModalHelper extends Base public function large($icon, $label, $controller, $action, array $params = array()) { - $html = ' '.$label; + $html = ''.$label; return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-large'); } public function medium($icon, $label, $controller, $action, array $params = array()) { - $html = ' '.$label; + $html = ''.$label; return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-medium'); } public function small($icon, $label, $controller, $action, array $params = array()) { - $html = ' '.$label; + $html = ''.$label; return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-small'); } public function mediumButton($icon, $label, $controller, $action, array $params = array()) { - $html = ' '.$label; + $html = ''.$label; return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-medium btn'); } public function confirm($icon, $label, $controller, $action, array $params = array()) { - $html = ' '.$label; + $html = ''.$label; return $this->helper->url->link($html, $controller, $action, $params, false, 'js-modal-confirm'); } + + public function confirmLink($label, $controller, $action, array $params = array()) + { + return $this->helper->url->link($label, $controller, $action, $params, false, 'js-modal-confirm'); + } } diff --git a/app/Helper/UrlHelper.php b/app/Helper/UrlHelper.php index bfcf07e6..94412cf5 100644 --- a/app/Helper/UrlHelper.php +++ b/app/Helper/UrlHelper.php @@ -47,6 +47,29 @@ class UrlHelper extends Base return $this->link($html, $controller, $action, $params, false, $class); } + /** + * Link element with icon + * + * @access public + * @param string $icon Icon name + * @param string $label Link label + * @param string $controller Controller name + * @param string $action Action name + * @param array $params Url parameters + * @param boolean $csrf Add a CSRF token + * @param string $class CSS class attribute + * @param string $title Link title + * @param boolean $newTab Open the link in a new tab + * @param string $anchor Link Anchor + * @param bool $absolute + * @return string + */ + public function icon($icon, $label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $newTab = false, $anchor = '', $absolute = false) + { + $html = ''.$label; + return $this->helper->url->link($html, $controller, $action, $params, $csrf, $class, $title, $newTab, $anchor, $absolute); + } + /** * Link element * @@ -58,14 +81,14 @@ class UrlHelper extends Base * @param boolean $csrf Add a CSRF token * @param string $class CSS class attribute * @param string $title Link title - * @param boolean $new_tab Open the link in a new tab + * @param boolean $newTab Open the link in a new tab * @param string $anchor Link Anchor * @param bool $absolute * @return string */ - public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $new_tab = false, $anchor = '', $absolute = false) + public function link($label, $controller, $action, array $params = array(), $csrf = false, $class = '', $title = '', $newTab = false, $anchor = '', $absolute = false) { - return ''.$label.''; + return ''.$label.''; } /** diff --git a/app/Template/activity/project.php b/app/Template/activity/project.php index e8e62777..6d1e4a2e 100644 --- a/app/Template/activity/project.php +++ b/app/Template/activity/project.php @@ -2,10 +2,10 @@ projectHeader->render($project, 'ActivityController', $this->app->getRouterAction()) ?> -
+
    -
  • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    • +
  • url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
diff --git a/app/Template/board/tooltip_files.php b/app/Template/board/tooltip_files.php index a372b1a0..5cb72741 100644 --- a/app/Template/board/tooltip_files.php +++ b/app/Template/board/tooltip_files.php @@ -9,7 +9,7 @@ - url->link(t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>  modal->large('eye', t('open file'), 'FileViewerController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> diff --git a/app/Template/comments/show.php b/app/Template/comments/show.php index dfc13821..3edf7076 100644 --- a/app/Template/comments/show.php +++ b/app/Template/comments/show.php @@ -6,8 +6,7 @@
- - url->link(t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('sort', t('change sorting'), 'CommentController', 'toggleSorting', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
diff --git a/app/Template/dashboard/layout.php b/app/Template/dashboard/layout.php index d5a2695c..15ab8a1a 100644 --- a/app/Template/dashboard/layout.php +++ b/app/Template/dashboard/layout.php @@ -12,12 +12,10 @@
  • - - url->link(t('Search'), 'SearchController', 'index') ?> + url->icon('search', t('Search'), 'SearchController', 'index') ?>
  • - - url->link(t('Project management'), 'ProjectListController', 'show') ?> + url->icon('folder', t('Project management'), 'ProjectListController', 'show') ?>
    • diff --git a/app/Template/dashboard/notifications.php b/app/Template/dashboard/notifications.php index 4fb59e24..81adb348 100644 --- a/app/Template/dashboard/notifications.php +++ b/app/Template/dashboard/notifications.php @@ -7,8 +7,7 @@ @@ -60,8 +59,7 @@ dt->datetime($notification['date_creation']) ?> - - url->link(t('Mark as read'), 'WebNotificationController', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?> + url->icon('check', t('Mark as read'), 'WebNotificationController', 'remove', array('user_id' => $user['id'], 'notification_id' => $notification['id'])) ?> diff --git a/app/Template/doc/show.php b/app/Template/doc/show.php index a8dbd762..879e45b6 100644 --- a/app/Template/doc/show.php +++ b/app/Template/doc/show.php @@ -2,8 +2,7 @@
    diff --git a/app/Template/group/index.php b/app/Template/group/index.php index 8001393b..fe3f398e 100644 --- a/app/Template/group/index.php +++ b/app/Template/group/index.php @@ -1,14 +1,14 @@
      -
    • url->link(t('All users'), 'UserListController', 'show') ?>
      • +
    • url->icon('user', t('All users'), 'UserListController', 'show') ?>
    • modal->medium('user-plus', t('New group'), 'GroupCreationController', 'show') ?>
    isEmpty()): ?>

    - +
    @@ -31,7 +31,7 @@ diff --git a/app/Template/group/users.php b/app/Template/group/users.php index e9f2b361..ef179674 100644 --- a/app/Template/group/users.php +++ b/app/Template/group/users.php @@ -1,7 +1,7 @@
      -
    • url->link(t('View all groups'), 'GroupListController', 'index') ?>
      • +
    • url->icon('users', t('View all groups'), 'GroupListController', 'index') ?>
    • modal->medium('plus', t('Add group member'), 'GroupListController', 'associate', array('group_id' => $group['id'])) ?>
    diff --git a/app/Template/header/user_dropdown.php b/app/Template/header/user_dropdown.php index 49d08213..a74bdd52 100644 --- a/app/Template/header/user_dropdown.php +++ b/app/Template/header/user_dropdown.php @@ -3,46 +3,37 @@
    • text->e($this->user->getFullname()) ?>
    • - - url->link(t('My dashboard'), 'DashboardController', 'show', array('user_id' => $this->user->getId())) ?> + url->icon('tachometer', t('My dashboard'), 'DashboardController', 'show', array('user_id' => $this->user->getId())) ?>
    • - - url->link(t('My profile'), 'UserViewController', 'show', array('user_id' => $this->user->getId())) ?> + url->icon('home', t('My profile'), 'UserViewController', 'show', array('user_id' => $this->user->getId())) ?>
    • - - url->link(t('Projects management'), 'ProjectListController', 'show') ?> + url->icon('folder', t('Projects management'), 'ProjectListController', 'show') ?>
      • user->hasAccess('UserListController', 'show')): ?>
    • - - url->link(t('Users management'), 'UserListController', 'show') ?> + url->icon('user', t('Users management'), 'UserListController', 'show') ?>
    • - - url->link(t('Groups management'), 'GroupListController', 'index') ?> + url->icon('group', t('Groups management'), 'GroupListController', 'index') ?>
    • - - url->link(t('Plugins'), 'PluginController', 'show') ?> + url->icon('cubes', t('Plugins'), 'PluginController', 'show') ?>
    • - - url->link(t('Settings'), 'ConfigController', 'index') ?> + url->icon('cog', t('Settings'), 'ConfigController', 'index') ?>
      • hook->render('template:header:dropdown') ?>
    • - - url->link(t('Documentation'), 'DocumentationController', 'show') ?> + url->icon('life-ring', t('Documentation'), 'DocumentationController', 'show') ?>
    • - - url->link(t('Logout'), 'AuthController', 'logout') ?> + url->icon('sign-out', t('Logout'), 'AuthController', 'logout') ?>
    diff --git a/app/Template/link/edit.php b/app/Template/link/edit.php index cb4f29e2..4be56573 100644 --- a/app/Template/link/edit.php +++ b/app/Template/link/edit.php @@ -13,9 +13,5 @@ form->label(t('Opposite label'), 'opposite_id') ?> form->select('opposite_id', $labels, $values, $errors) ?> -
    - - - url->link(t('cancel'), 'LinkController', 'index') ?> -
    + modal->submitButtons() ?> diff --git a/app/Template/link/index.php b/app/Template/link/index.php index 70ead4a6..b0dcad1e 100644 --- a/app/Template/link/index.php +++ b/app/Template/link/index.php @@ -18,9 +18,9 @@
    diff --git a/app/Template/plugin/directory.php b/app/Template/plugin/directory.php index b6c6734c..b2fffcb9 100644 --- a/app/Template/plugin/directory.php +++ b/app/Template/plugin/directory.php @@ -28,11 +28,9 @@ diff --git a/app/Template/project_permission/users.php b/app/Template/project_permission/users.php index 71cf1c4a..79d08552 100644 --- a/app/Template/project_permission/users.php +++ b/app/Template/project_permission/users.php @@ -21,8 +21,7 @@ )) ?> diff --git a/app/Template/project_user_overview/layout.php b/app/Template/project_user_overview/layout.php index 19b83436..5c739297 100644 --- a/app/Template/project_user_overview/layout.php +++ b/app/Template/project_user_overview/layout.php @@ -2,19 +2,16 @@
    • - - url->link(t('Projects list'), 'ProjectListController', 'show') ?> + url->icon('folder', t('Projects list'), 'ProjectListController', 'show') ?>
      • user->hasAccess('ProjectGanttController', 'show')): ?>
    • - - url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?> + url->icon('sliders', t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
    - render($sidebar_template, array('users' => $users, 'filter' => $filter)) ?>
    diff --git a/app/Template/project_view/share.php b/app/Template/project_view/share.php index 409f37e6..29598c6e 100644 --- a/app/Template/project_view/share.php +++ b/app/Template/project_view/share.php @@ -6,9 +6,9 @@
      -
    • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->icon('share-alt', t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    diff --git a/app/Template/project_view/show.php b/app/Template/project_view/show.php index afe60384..1795e9ef 100644 --- a/app/Template/project_view/show.php +++ b/app/Template/project_view/show.php @@ -13,9 +13,9 @@ -
  • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • -
  • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    • +
  • url->icon('share-alt', t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
    • +
  • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    • diff --git a/app/Template/search/activity.php b/app/Template/search/activity.php index 1dfd9234..f1ee9200 100644 --- a/app/Template/search/activity.php +++ b/app/Template/search/activity.php @@ -2,8 +2,7 @@
    • - - url->link(t('Search tasks'), 'SearchController', 'index') ?> + url->icon('search', t('Search tasks'), 'SearchController', 'index') ?>
    diff --git a/app/Template/search/index.php b/app/Template/search/index.php index c59a5c99..405c88cd 100644 --- a/app/Template/search/index.php +++ b/app/Template/search/index.php @@ -2,8 +2,7 @@
    • - - url->link(t('Activity stream search'), 'SearchController', 'activity') ?> + url->icon('search', t('Activity stream search'), 'SearchController', 'activity') ?>
    diff --git a/app/Template/subtask/table.php b/app/Template/subtask/table.php index bea49aed..156e08c1 100644 --- a/app/Template/subtask/table.php +++ b/app/Template/subtask/table.php @@ -45,12 +45,10 @@ user->getId()): ?>
  • - - url->link(t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> + url->icon('pause', t('Stop timer'), 'SubtaskStatusController', 'timer', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> (dt->age($subtask['timer_start_date']) ?>) - - url->link(t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?> + url->icon('play-circle-o', t('Start timer'), 'SubtaskStatusController', 'timer', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id']), false, 'subtask-toggle-timer') ?>
    • diff --git a/app/Template/swimlane/table.php b/app/Template/swimlane/table.php index 4c9390e0..2d783a00 100644 --- a/app/Template/swimlane/table.php +++ b/app/Template/swimlane/table.php @@ -24,11 +24,9 @@
  • - - url->link(t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?> + url->icon('toggle-off', t('Disable'), 'SwimlaneController', 'disableDefault', array('project_id' => $project['id']), true) ?> - - url->link(t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?> + url->icon('toggle-on', t('Enable'), 'SwimlaneController', 'enableDefault', array('project_id' => $project['id']), true) ?>
    • @@ -61,11 +59,9 @@
  • - - url->link(t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + url->icon('toggle-off', t('Disable'), 'SwimlaneController', 'disable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> - - url->link(t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?> + url->icon('toggle-on', t('Enable'), 'SwimlaneController', 'enable', array('project_id' => $project['id'], 'swimlane_id' => $swimlane['id']), true) ?>
  • diff --git a/app/Template/task/details.php b/app/Template/task/details.php index b616afe3..24099a3c 100644 --- a/app/Template/task/details.php +++ b/app/Template/task/details.php @@ -33,16 +33,14 @@
  • - - url->link(t('Public link'), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?> + url->icon('external-link', t('Public link'), 'TaskViewController', 'readonly', array('task_id' => $task['id'], 'token' => $project['token']), false, '', '', true) ?>
  • - - url->link(t('Back to the board'), 'BoardViewController', 'readonly', array('token' => $project['token'])) ?> + url->icon('th', t('Back to the board'), 'BoardViewController', 'readonly', array('token' => $project['token'])) ?>
    • diff --git a/app/Template/task/dropdown.php b/app/Template/task/dropdown.php index bd424443..1daf8896 100644 --- a/app/Template/task/dropdown.php +++ b/app/Template/task/dropdown.php @@ -3,8 +3,7 @@
    • - - url->link(t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('play', t('Set automatically the start date'), 'TaskModificationController', 'start', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index 9735efcb..f8f1ebde 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -4,25 +4,20 @@
    • app->checkMenuSelection('TaskViewController', 'show') ?>> - - url->link(t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('newspaper-o', t('Summary'), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • app->checkMenuSelection('ActivityController', 'task') ?>> - - url->link(t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('dashboard', t('Activity stream'), 'ActivityController', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • app->checkMenuSelection('TaskViewController', 'transitions') ?>> - - url->link(t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('arrows-h', t('Transitions'), 'TaskViewController', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • app->checkMenuSelection('TaskViewController', 'analytics') ?>> - - url->link(t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('bar-chart', t('Analytics'), 'TaskViewController', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • 0 || $task['time_spent'] > 0): ?>
    • app->checkMenuSelection('TaskViewController', 'timetracking') ?>> - - url->link(t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->icon('clock-o', t('Time tracking'), 'TaskViewController', 'timetracking', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
      • diff --git a/app/Template/task_file/files.php b/app/Template/task_file/files.php index ffebdb84..28633dc4 100644 --- a/app/Template/task_file/files.php +++ b/app/Template/task_file/files.php @@ -24,8 +24,7 @@
    • - - url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
      • user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
    • diff --git a/app/Template/task_file/images.php b/app/Template/task_file/images.php index e3599441..33a31ba8 100644 --- a/app/Template/task_file/images.php +++ b/app/Template/task_file/images.php @@ -19,8 +19,7 @@ text->e($file['name']) ?>
      • - - url->link(t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'FileViewerController', 'download', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'file_id' => $file['id'])) ?>
        • user->hasProjectAccess('TaskFileController', 'remove', $task['project_id'])): ?>
      • diff --git a/app/Template/task_gantt/show.php b/app/Template/task_gantt/show.php index ddc70a43..61a476b7 100644 --- a/app/Template/task_gantt/show.php +++ b/app/Template/task_gantt/show.php @@ -3,12 +3,10 @@
        • > - - url->link(t('Sort by position'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'board')) ?> + url->icon('sort-numeric-asc', t('Sort by position'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'board')) ?>
        • > - - url->link(t('Sort by date'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'date')) ?> + url->icon('sort-amount-asc', t('Sort by date'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'sorting' => 'date')) ?>
        • modal->large('plus', t('Add task'), 'TaskCreationController', 'show', array('project_id' => $project['id'])) ?> diff --git a/app/Template/task_import/show.php b/app/Template/task_import/show.php index cc6a7b3a..54264f30 100644 --- a/app/Template/task_import/show.php +++ b/app/Template/task_import/show.php @@ -31,4 +31,4 @@
        -

        url->link(t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?>

        +

        url->icon('download', t('Download CSV template'), 'TaskImportController', 'template', array('project_id' => $project['id'])) ?>

        diff --git a/app/Template/user_import/show.php b/app/Template/user_import/show.php index fb593bb6..9a8572c5 100644 --- a/app/Template/user_import/show.php +++ b/app/Template/user_import/show.php @@ -2,8 +2,7 @@

        • - - url->link(t('Download CSV template'), 'UserImportController', 'template') ?> + url->icon('download', t('Download CSV template'), 'UserImportController', 'template') ?>
        diff --git a/app/Template/user_list/dropdown.php b/app/Template/user_list/dropdown.php index 44a78162..d18f20aa 100644 --- a/app/Template/user_list/dropdown.php +++ b/app/Template/user_list/dropdown.php @@ -2,8 +2,7 @@
        • - - url->link(t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?> + url->icon('user', t('View profile'), 'UserViewController', 'show', array('user_id' => $user['id'])) ?>
          • user->hasAccess('UserStatusController', 'disable') && ! $this->user->isCurrentUser($user['id'])): ?>
        • diff --git a/app/Template/user_list/show.php b/app/Template/user_list/show.php index 92ea74e7..783a1df7 100644 --- a/app/Template/user_list/show.php +++ b/app/Template/user_list/show.php @@ -12,7 +12,7 @@ modal->medium('upload', t('Import'), 'UserImportController', 'show') ?>
        • - url->link(t('View all groups'), 'GroupListController', 'index') ?> + url->icon('users', t('View all groups'), 'GroupListController', 'index') ?>
        diff --git a/app/Template/user_view/layout.php b/app/Template/user_view/layout.php index 4f0eca94..c126ad89 100644 --- a/app/Template/user_view/layout.php +++ b/app/Template/user_view/layout.php @@ -3,7 +3,7 @@ user->hasAccess('UserCreationController', 'show')): ?>
        • - url->link(t('All users'), 'UserListController', 'show') ?> + url->icon('user', t('All users'), 'UserListController', 'show') ?>
        • modal->medium('plus', t('New local user'), 'UserCreationController', 'show') ?> @@ -15,7 +15,7 @@ modal->medium('upload', t('Import'), 'UserImportController', 'show') ?>
        • - url->link(t('View all groups'), 'GroupListController', 'index') ?> + url->icon('users', t('View all groups'), 'GroupListController', 'index') ?>
        diff --git a/app/Template/user_view/share.php b/app/Template/user_view/share.php index 570b766e..614f058a 100644 --- a/app/Template/user_view/share.php +++ b/app/Template/user_view/share.php @@ -5,8 +5,8 @@
          -
        • url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • -
        • url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • +
        • url->icon('rss-square', t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • +
        • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
        url->link(t('Disable public access'), 'UserViewController', 'share', array('user_id' => $user['id'], 'switch' => 'disable'), true, 'btn btn-red') ?> diff --git a/app/Template/user_view/show.php b/app/Template/user_view/show.php index 2f5a73af..456f57ac 100644 --- a/app/Template/user_view/show.php +++ b/app/Template/user_view/show.php @@ -42,8 +42,8 @@
          -
        • url->link(t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • -
        • url->link(t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • +
        • url->icon('rss-square', t('RSS feed'), 'FeedController', 'user', array('token' => $user['token']), false, '', '', true) ?>
          • +
        • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'user', array('token' => $user['token']), false, '', '', true) ?>
        -- cgit v1.2.3
    order(t('Id'), 'id') ?> order(t('External Id'), 'external_id') ?>
      - url->link(t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?> + modal->medium('edit', t('Edit'), 'LinkController', 'edit', array('link_id' => $link['id'])) ?> - url->link(t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?> + modal->confirm('trash-o', t('Remove'), 'LinkController', 'confirm', array('link_id' => $link['id'])) ?>
    - - url->link(t('Install'), 'PluginController', 'install', array('archive_url' => urlencode($plugin['download'])), true) ?> + url->icon('cloud-download', t('Install'), 'PluginController', 'install', array('archive_url' => urlencode($plugin['download'])), true) ?> - - url->link(t('Update'), 'PluginController', 'update', array('archive_url' => urlencode($plugin['download'])), true) ?> + url->icon('refresh', t('Update'), 'PluginController', 'update', array('archive_url' => urlencode($plugin['download'])), true) ?> diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php index 5fbffde4..eaaa3546 100644 --- a/app/Template/project/dropdown.php +++ b/app/Template/project/dropdown.php @@ -2,33 +2,27 @@ #
    • - - url->link(t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?> + url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'])) ?>
    • - - url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?> + url->icon('calendar', t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'])) ?>
    • - - url->link(t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?> + url->icon('list', t('Listing'), 'TaskListController', 'show', array('project_id' => $project['id'])) ?>
      • user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?>
    • - - url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'])) ?> + url->icon('sliders', t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'])) ?>
    • -   - url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?> + url->icon('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
      • user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
    • -   - url->link(t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?> + url->icon('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
      • @@ -36,8 +30,7 @@ user->hasProjectAccess('ProjectEditController', 'show', $project['id'])): ?>
    • - - url->link(t('Settings'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?> + url->icon('cog', t('Settings'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
    diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php index 507cde3e..812eb351 100644 --- a/app/Template/project/sidebar.php +++ b/app/Template/project/sidebar.php @@ -50,15 +50,15 @@
  • - modal->confirm('close', t('Disable'), 'ProjectStatusController', 'confirmDisable', array('project_id' => $project['id'])) ?> + modal->confirmLink(t('Disable'), 'ProjectStatusController', 'confirmDisable', array('project_id' => $project['id'])) ?>
  • - modal->confirm('check-square-o', t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id'])) ?> + modal->confirmLink(t('Enable'), 'ProjectStatusController', 'confirmEnable', array('project_id' => $project['id'])) ?>
    • user->hasProjectAccess('ProjectStatusController', 'remove', $project['id'])): ?>
  • - modal->confirm('trash-o', t('Remove'), 'ProjectStatusController', 'confirmRemove', array('project_id' => $project['id'])) ?> + modal->confirmLink(t('Remove'), 'ProjectStatusController', 'confirmRemove', array('project_id' => $project['id'])) ?>
    • diff --git a/app/Template/project_gantt/show.php b/app/Template/project_gantt/show.php index af22a6ed..74248d5d 100644 --- a/app/Template/project_gantt/show.php +++ b/app/Template/project_gantt/show.php @@ -2,10 +2,12 @@
    • - url->link(t('Projects list'), 'ProjectListController', 'show') ?> + url->icon('folder', t('Projects list'), 'ProjectListController', 'show') ?>
      • user->hasAccess('ProjectUserOverviewController', 'managers')): ?> -
    • url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?>
      • +
    • + url->icon('user', t('Users overview'), 'ProjectUserOverviewController', 'managers') ?> +
    diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php index 27d3fd3f..eac4fc57 100644 --- a/app/Template/project_header/dropdown.php +++ b/app/Template/project_header/dropdown.php @@ -4,12 +4,10 @@
  • board->isCollapsed($project['id']) ? '' : 'style="display: none;"' ?>> - - url->link(t('Expand tasks'), 'BoardAjaxController', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + url->icon('expand', t('Expand tasks'), 'BoardAjaxController', 'expand', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> board->isCollapsed($project['id']) ? 'style="display: none;"' : '' ?>> - - url->link(t('Collapse tasks'), 'BoardAjaxController', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?> + url->icon('compress', t('Collapse tasks'), 'BoardAjaxController', 'collapse', array('project_id' => $project['id']), false, 'board-display-mode', t('Keyboard shortcut: "%s"', 's')) ?>
  • @@ -29,21 +27,18 @@
  • - - url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?> + url->icon('dashboard', t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
    • user->hasProjectAccess('CustomFilterController', 'index', $project['id'])): ?>
  • - - url->link(t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?> + url->icon('filter', t('Custom filters'), 'CustomFilterController', 'index', array('project_id' => $project['id'])) ?>
  • - - url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?> + url->icon('share-alt', t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
    • @@ -51,35 +46,30 @@ user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
  • - - url->link(t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?> + url->icon('line-chart', t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
    • user->hasProjectAccess('ExportController', 'tasks', $project['id'])): ?>
  • - - url->link(t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?> + url->icon('upload', t('Exports'), 'ExportController', 'tasks', array('project_id' => $project['id'])) ?>
    • user->hasProjectAccess('TaskImportController', 'tasks', $project['id'])): ?>
  • - - url->link(t('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?> + url->icon('download', t('Imports'), 'TaskImportController', 'show', array('project_id' => $project['id'])) ?>
    • user->hasProjectAccess('ProjectEditController', 'show', $project['id'])): ?>
  • - - url->link(t('Settings'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?> + url->icon('cog', t('Settings'), 'ProjectViewController', 'show', array('project_id' => $project['id'])) ?>
  • - - url->link(t('Manage projects'), 'ProjectListController', 'show') ?> + url->icon('folder', t('Manage projects'), 'ProjectListController', 'show') ?>
    • diff --git a/app/Template/project_header/views.php b/app/Template/project_header/views.php index f8a5b39b..0328a051 100644 --- a/app/Template/project_header/views.php +++ b/app/Template/project_header/views.php @@ -1,24 +1,19 @@
    • app->checkMenuSelection('ProjectOverviewController') ?>> - - url->link(t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?> + url->icon('eye', t('Overview'), 'ProjectOverviewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-overview', t('Keyboard shortcut: "%s"', 'v o')) ?>
    • app->checkMenuSelection('BoardViewController') ?>> - - url->link(t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?> + url->icon('th', t('Board'), 'BoardViewController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-board', t('Keyboard shortcut: "%s"', 'v b')) ?>
    • app->checkMenuSelection('CalendarController') ?>> - - url->link(t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?> + url->icon('calendar', t('Calendar'), 'CalendarController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-calendar', t('Keyboard shortcut: "%s"', 'v c')) ?>
    • app->checkMenuSelection('TaskListController') ?>> - - url->link(t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?> + url->icon('list', t('List'), 'TaskListController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-listing', t('Keyboard shortcut: "%s"', 'v l')) ?>
      • user->hasProjectAccess('TaskGanttController', 'show', $project['id'])): ?>
    • app->checkMenuSelection('TaskGanttController') ?>> - - url->link(t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?> + url->icon('sliders', t('Gantt'), 'TaskGanttController', 'show', array('project_id' => $project['id'], 'search' => $filters['search']), false, 'view-gantt', t('Keyboard shortcut: "%s"', 'v g')) ?>
    diff --git a/app/Template/project_list/show.php b/app/Template/project_list/show.php index f8f5862c..92101429 100644 --- a/app/Template/project_list/show.php +++ b/app/Template/project_list/show.php @@ -3,10 +3,10 @@
      hook->render('template:project-list:menu:before') ?> user->hasAccess('ProjectUserOverviewController', 'managers')): ?> -
    • url->link(t('Users overview'), 'ProjectUserOverviewController', 'managers') ?>
      • +
    • url->icon('user', t('Users overview'), 'ProjectUserOverviewController', 'managers') ?>
      • user->hasAccess('ProjectGanttController', 'show')): ?> -
    • url->link(t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
      • +
    • url->icon('sliders', t('Projects Gantt chart'), 'ProjectGanttController', 'show') ?>
      • hook->render('template:project-list:menu:after') ?>
    diff --git a/app/Template/project_overview/files.php b/app/Template/project_overview/files.php index 6518fafb..85de52f7 100644 --- a/app/Template/project_overview/files.php +++ b/app/Template/project_overview/files.php @@ -19,13 +19,11 @@ file->getBrowserViewType($file['name']) !== null): ?>
  • - - url->link(t('View file'), 'FileViewerController', 'browser', array('project_id' => $project['id'], 'file_id' => $file['id']), false, '', '', true) ?> + url->icon('eye', t('View file'), 'FileViewerController', 'browser', array('project_id' => $project['id'], 'file_id' => $file['id']), false, '', '', true) ?>
  • - - url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
    • user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
  • diff --git a/app/Template/project_overview/images.php b/app/Template/project_overview/images.php index cabfd0f6..7e7962e8 100644 --- a/app/Template/project_overview/images.php +++ b/app/Template/project_overview/images.php @@ -19,8 +19,7 @@ text->e($file['name']) ?>
    • - - url->link(t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?> + url->icon('download', t('Download'), 'FileViewerController', 'download', array('project_id' => $project['id'], 'file_id' => $file['id'])) ?>
      • user->hasProjectAccess('ProjectFileController', 'remove', $project['id'])): ?>
    • diff --git a/app/Template/project_overview/information.php b/app/Template/project_overview/information.php index fdf0f753..eb94551e 100644 --- a/app/Template/project_overview/information.php +++ b/app/Template/project_overview/information.php @@ -29,9 +29,9 @@ -
    • url->link(t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • -
    • url->link(t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
      • +
    • url->icon('share-alt', t('Public link'), 'BoardViewController', 'readonly', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->icon('rss-square', t('RSS feed'), 'FeedController', 'project', array('token' => $project['token']), false, '', '', true) ?>
      • +
    • url->icon('calendar', t('iCal feed'), 'ICalendarController', 'project', array('token' => $project['token'])) ?>
    diff --git a/app/Template/project_permission/groups.php b/app/Template/project_permission/groups.php index 582643a2..d3b52be0 100644 --- a/app/Template/project_permission/groups.php +++ b/app/Template/project_permission/groups.php @@ -25,8 +25,7 @@ )) ?>
    		• - - url->link(t('Remove'), 'ProjectPermissionController', 'removeGroup', array('project_id' => $project['id'], 'group_id' => $group['id']), true) ?> + url->icon('trash-o', t('Remove'), 'ProjectPermissionController', 'removeGroup', array('project_id' => $project['id'], 'group_id' => $group['id']), true) ?>
    - - url->link(t('Remove'), 'ProjectPermissionController', 'removeUser', array('project_id' => $project['id'], 'user_id' => $user['id']), true) ?> + url->icon('trash-o', t('Remove'), 'ProjectPermissionController', 'removeUser', array('project_id' => $project['id'], 'user_id' => $user['id']), true) ?>