summaryrefslogtreecommitdiff
path: root/app/Template
diff options
context:
space:
mode:
Diffstat (limited to 'app/Template')
-rw-r--r--app/Template/app/activity.php4
-rw-r--r--app/Template/app/calendar.php (renamed from app/Template/user/calendar.php)2
-rw-r--r--app/Template/app/dashboard.php60
-rw-r--r--app/Template/app/layout.php21
-rw-r--r--app/Template/app/overview.php3
-rw-r--r--app/Template/app/projects.php4
-rw-r--r--app/Template/app/sidebar.php23
-rw-r--r--app/Template/app/subtasks.php4
-rw-r--r--app/Template/app/tasks.php4
-rw-r--r--app/Template/event/events.php2
-rw-r--r--app/Template/user/sidebar.php5
11 files changed, 63 insertions, 69 deletions
diff --git a/app/Template/app/activity.php b/app/Template/app/activity.php
new file mode 100644
index 00000000..71a67fb2
--- /dev/null
+++ b/app/Template/app/activity.php
@@ -0,0 +1,4 @@
+<div class="page-header">
+ <h2><?= t('My activity stream') ?></h2>
+</div>
+<?= $this->render('event/events', array('events' => $events)) ?> \ No newline at end of file
diff --git a/app/Template/user/calendar.php b/app/Template/app/calendar.php
index 7ec12496..6acee6ec 100644
--- a/app/Template/user/calendar.php
+++ b/app/Template/app/calendar.php
@@ -3,4 +3,4 @@
data-user-id="<?= $user['id'] ?>"
data-save-url="<?= $this->url->href('calendar', 'save') ?>"
>
-</div> \ No newline at end of file
+</div>
diff --git a/app/Template/app/dashboard.php b/app/Template/app/dashboard.php
deleted file mode 100644
index faf49ef5..00000000
--- a/app/Template/app/dashboard.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<section id="main">
- <div class="page-header page-header-mobile">
- <ul>
- <?php if ($this->user->isAdmin()): ?>
- <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'project', 'create') ?></li>
- <?php endif ?>
- <li><i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
- <li><i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Project management'), 'project', 'index') ?></li>
- <?php if ($this->user->isAdmin()): ?>
- <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('User management'), 'user', 'index') ?></li>
- <li><i class="fa fa-cog fa-fw"></i><?= $this->url->link(t('Settings'), 'config', 'index') ?></li>
- <?php endif ?>
- <li>
- <span class="dropdown">
- <span>
- <i class="fa fa-caret-down"></i> <a href="#" class="dropdown-menu"><?= t('Change dashboard view') ?></a>
- <ul>
- <li>
- <a href="#" class="dashboard-toggle" data-toggle="projects"><?= t('Show/hide projects') ?></a>
- </li>
- <li>
- <a href="#" class="dashboard-toggle" data-toggle="tasks"><?= t('Show/hide tasks') ?></a>
- </li>
- <li>
- <a href="#" class="dashboard-toggle" data-toggle="subtasks"><?= t('Show/hide subtasks') ?></a>
- </li>
- <li>
- <a href="#" class="dashboard-toggle" data-toggle="calendar"><?= t('Show/hide calendar') ?></a>
- </li>
- <li>
- <a href="#" class="dashboard-toggle" data-toggle="activities"><?= t('Show/hide activities') ?></a>
- </li>
- </ul>
- </span>
- </span>
- </li>
- </ul>
- </div>
- <section id="dashboard">
- <div class="dashboard-left-column">
- <div id="dashboard-projects"><?= $this->render('app/projects', array('paginator' => $project_paginator)) ?></div>
- <div id="dashboard-tasks"><?= $this->render('app/tasks', array('paginator' => $task_paginator)) ?></div>
- <div id="dashboard-subtasks"><?= $this->render('app/subtasks', array('paginator' => $subtask_paginator)) ?></div>
- </div>
- <div class="dashboard-right-column">
- <div id="dashboard-calendar">
- <div id="user-calendar"
- data-check-url="<?= $this->url->href('calendar', 'user') ?>"
- data-user-id="<?= $user_id ?>"
- data-save-url="<?= $this->url->href('calendar', 'save') ?>"
- >
- </div>
- </div>
- <div id="dashboard-activities">
- <h2><?= t('Activity stream') ?></h2>
- <?= $this->render('event/events', array('events' => $events)) ?>
- </div>
- </div>
- </section>
-</section> \ No newline at end of file
diff --git a/app/Template/app/layout.php b/app/Template/app/layout.php
new file mode 100644
index 00000000..d2d63f25
--- /dev/null
+++ b/app/Template/app/layout.php
@@ -0,0 +1,21 @@
+<section id="main">
+ <div class="page-header page-header-mobile">
+ <ul>
+ <?php if ($this->user->isAdmin()): ?>
+ <li><i class="fa fa-plus fa-fw"></i><?= $this->url->link(t('New project'), 'project', 'create') ?></li>
+ <?php endif ?>
+ <li><i class="fa fa-lock fa-fw"></i><?= $this->url->link(t('New private project'), 'project', 'create', array('private' => 1)) ?></li>
+ <li><i class="fa fa-folder fa-fw"></i><?= $this->url->link(t('Project management'), 'project', 'index') ?></li>
+ <?php if ($this->user->isAdmin()): ?>
+ <li><i class="fa fa-user fa-fw"></i><?= $this->url->link(t('User management'), 'user', 'index') ?></li>
+ <li><i class="fa fa-cog fa-fw"></i><?= $this->url->link(t('Settings'), 'config', 'index') ?></li>
+ <?php endif ?>
+ </ul>
+ </div>
+ <section class="sidebar-container" id="dashboard">
+ <?= $this->render('app/sidebar', array('user' => $user)) ?>
+ <div class="sidebar-content">
+ <?= $content_for_sublayout ?>
+ </div>
+ </section>
+</section> \ No newline at end of file
diff --git a/app/Template/app/overview.php b/app/Template/app/overview.php
new file mode 100644
index 00000000..bd7d28db
--- /dev/null
+++ b/app/Template/app/overview.php
@@ -0,0 +1,3 @@
+<?= $this->render('app/projects', array('paginator' => $project_paginator)) ?>
+<?= $this->render('app/tasks', array('paginator' => $task_paginator)) ?>
+<?= $this->render('app/subtasks', array('paginator' => $subtask_paginator)) ?> \ No newline at end of file
diff --git a/app/Template/app/projects.php b/app/Template/app/projects.php
index 27060f7d..22e0cc47 100644
--- a/app/Template/app/projects.php
+++ b/app/Template/app/projects.php
@@ -1,4 +1,6 @@
-<h2><?= t('My projects') ?> (<?= $paginator->getTotal() ?>)</h2>
+<div class="page-header">
+ <h2><?= t('My projects') ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('Your are not member of any project.') ?></p>
<?php else: ?>
diff --git a/app/Template/app/sidebar.php b/app/Template/app/sidebar.php
new file mode 100644
index 00000000..40bf6401
--- /dev/null
+++ b/app/Template/app/sidebar.php
@@ -0,0 +1,23 @@
+<div class="sidebar">
+ <h2><?= $this->e($user['name'] ?: $user['username']) ?></h2>
+ <ul>
+ <li>
+ <?= $this->url->link(t('Overview'), 'app', 'index', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->url->link(t('My projects'), 'app', 'projects', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->url->link(t('My tasks'), 'app', 'tasks', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->url->link(t('My subtasks'), 'app', 'subtasks', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->url->link(t('My calendar'), 'app', 'calendar', array('user_id' => $user['id'])) ?>
+ </li>
+ <li>
+ <?= $this->url->link(t('My activity stream'), 'app', 'activity', array('user_id' => $user['id'])) ?>
+ </li>
+ </ul>
+</div> \ No newline at end of file
diff --git a/app/Template/app/subtasks.php b/app/Template/app/subtasks.php
index d6cbde6f..67f2d04f 100644
--- a/app/Template/app/subtasks.php
+++ b/app/Template/app/subtasks.php
@@ -1,4 +1,6 @@
-<h2><?= t('My subtasks') ?> (<?= $paginator->getTotal() ?>)</h2>
+<div class="page-header">
+ <h2><?= t('My subtasks') ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('There is nothing assigned to you.') ?></p>
<?php else: ?>
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
index 6fd7d56d..8e7fe74a 100644
--- a/app/Template/app/tasks.php
+++ b/app/Template/app/tasks.php
@@ -1,4 +1,6 @@
-<h2><?= t('My tasks') ?> (<?= $paginator->getTotal() ?>)</h2>
+<div class="page-header">
+ <h2><?= t('My tasks') ?> (<?= $paginator->getTotal() ?>)</h2>
+</div>
<?php if ($paginator->isEmpty()): ?>
<p class="alert"><?= t('There is nothing assigned to you.') ?></p>
<?php else: ?>
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index 971f6587..aec0b29e 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -1,5 +1,5 @@
<?php if (empty($events)): ?>
- <p class="alert"><?= t('No activity.') ?></p>
+ <p class="alert"><?= t('There is no activity yet.') ?></p>
<?php else: ?>
<?php foreach ($events as $event): ?>
diff --git a/app/Template/user/sidebar.php b/app/Template/user/sidebar.php
index 2c8e909a..e61a43bf 100644
--- a/app/Template/user/sidebar.php
+++ b/app/Template/user/sidebar.php
@@ -6,10 +6,7 @@
</li>
<?php if ($this->user->isAdmin()): ?>
<li>
- <?= $this->url->link(t('User dashboard'), 'app', 'dashboard', array('user_id' => $user['id'])) ?>
- </li>
- <li>
- <?= $this->url->link(t('User calendar'), 'user', 'calendar', array('user_id' => $user['id'])) ?>
+ <?= $this->url->link(t('User dashboard'), 'app', 'index', array('user_id' => $user['id'])) ?>
</li>
<?php endif ?>
<?php if ($this->user->isAdmin() || $this->user->isCurrentUser($user['id'])): ?>
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-26 04:50:15 +0000