diff options
| author | 85pando <85pando@googlemail.com> | 2016-02-05 10:28:40 +0100 |
|---|---|---|
| committer | 85pando <85pando@googlemail.com> | 2016-02-05 10:28:40 +0100 |
| commit | 791d13c87bf510d913973b77a5f6d152311a1d87 (patch) | |
| tree | 81412e8dbd3ac4fa0047030a6068afafd975687e /app/Template/analytic | |
| parent | 2074aaaa9a75455097e4e77ca09f4fba3e567052 (diff) | |
| parent | 12aaec03b19a07635f59b00f532c92c37ac1df5f (diff) | |
Merge remote-tracking branch 'refs/remotes/upstream/master'
Conflicts:
app/Locale/de_DE/translations.php
Diffstat (limited to 'app/Template/analytic')
| -rw-r--r-- | app/Template/analytic/layout.php | 5 | ||||
| -rw-r--r-- | app/Template/analytic/sidebar.php | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/app/Template/analytic/layout.php b/app/Template/analytic/layout.php index ff532fc0..f1dba552 100644 --- a/app/Template/analytic/layout.php +++ b/app/Template/analytic/layout.php @@ -31,9 +31,8 @@ </li> </ul> </div> - <section class="sidebar-container" id="analytic-section"> - - <?= $this->render('analytic/sidebar', array('project' => $project)) ?> + <section class="sidebar-container"> + <?= $this->render($sidebar_template, array('project' => $project)) ?> <div class="sidebar-content"> <?= $content_for_sublayout ?> diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php index 19eef8d5..f1810c6a 100644 --- a/app/Template/analytic/sidebar.php +++ b/app/Template/analytic/sidebar.php @@ -23,6 +23,4 @@ <?= $this->url->link(t('Estimated vs actual time'), 'analytic', 'compareHours', array('project_id' => $project['id'])) ?> </li> </ul> - <div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div> - <div class="sidebar-expand" style="display: none"><a href="#" title="<?= t('Expand sidebar') ?>"><i class="fa fa-chevron-right"></i></a></div> </div> |