Simplify layout and templates generation

This commit is contained in:
Frederic Guillot
2016-01-31 21:44:49 -05:00
parent 271543431e
commit 26492aba7e
51 changed files with 282 additions and 320 deletions

View File

@@ -33,7 +33,7 @@
</div>
<section class="sidebar-container" id="analytic-section">
<?= $this->render('analytic/sidebar', array('project' => $project)) ?>
<?= $this->render($sidebar_template, array('project' => $project)) ?>
<div class="sidebar-content">
<?= $content_for_sublayout ?>

View File

@@ -22,7 +22,7 @@
</ul>
</div>
<section class="sidebar-container" id="dashboard">
<?= $this->render('app/sidebar', array('user' => $user)) ?>
<?= $this->render($sidebar_template, array('user' => $user)) ?>
<div class="sidebar-content">
<?= $content_for_sublayout ?>
</div>

View File

@@ -1,10 +1,10 @@
<section id="main">
<section class="sidebar-container" id="config-section">
<?= $this->render('config/sidebar') ?>
<?= $this->render($sidebar_template) ?>
<div class="sidebar-content">
<?= $config_content_for_layout ?>
<?= $content_for_sublayout ?>
</div>
</section>
</section>

View File

@@ -34,9 +34,6 @@
<li <?= $this->app->checkMenuSelection('config', 'api') ?>>
<?= $this->url->link(t('API'), 'config', 'api') ?>
</li>
<li>
<?= $this->url->link(t('Documentation'), 'doc', 'show') ?>
</li>
<?= $this->hook->render('template:config:sidebar') ?>
</ul>
<div class="sidebar-collapse"><a href="#" title="<?= t('Hide sidebar') ?>"><i class="fa fa-chevron-left"></i></a></div>

View File

@@ -30,7 +30,7 @@
<?= $this->render($sidebar_template, array('project' => $project)) ?>
<div class="sidebar-content">
<?= $project_content_for_layout ?>
<?= $content_for_sublayout ?>
</div>
</section>
</section>

View File

@@ -15,7 +15,7 @@
</div>
<section class="sidebar-container">
<?= $this->render('project_user/sidebar', array('users' => $users, 'filter' => $filter)) ?>
<?= $this->render($sidebar_template, array('users' => $users, 'filter' => $filter)) ?>
<div class="sidebar-content">
<div class="page-header">

View File

@@ -1,5 +1,5 @@
<div class="color-<?= $task['color_id'] ?> task-show-details">
<h2><?= $this->e('#'.$task['id'].' '.$task['title']) ?></h2>
<h2><?= $this->e($task['title']) ?></h2>
<?php if ($task['score']): ?>
<span class="task-score"><?= $this->e($task['score']) ?></span>
<?php endif ?>

View File

@@ -19,10 +19,10 @@
</div>
<section class="sidebar-container" id="task-section">
<?= $this->render('task/sidebar', array('task' => $task)) ?>
<?= $this->render($sidebar_template, array('task' => $task)) ?>
<div class="sidebar-content">
<?= $task_content_for_layout ?>
<?= $content_for_sublayout ?>
</div>
</section>
</section>

View File

@@ -13,7 +13,7 @@
<?= $this->render('user/sidebar', array('user' => $user)) ?>
<div class="sidebar-content">
<?= $user_content_for_layout ?>
<?= $content_for_sublayout ?>
</div>
</section>
</section>