refactoring and a lot of new design

This commit is contained in:
2017-02-10 18:07:21 +01:00
parent 30577d3c6b
commit 290b8ac157
9 changed files with 696 additions and 186 deletions
@@ -98,62 +98,31 @@
<div id="main">
<?php if ($primary_local_tasks || $secondary_local_tasks || $action_links): ?>
<div id="tasks">
<?php if ($primary_local_tasks): ?>
<ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul>
<?php endif; ?>
<?php if ($secondary_local_tasks): ?>
<ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul>
<?php endif; ?>
<?php if ($action_links = render($action_links)): ?>
<ul class="action-links"><?php print $action_links; ?></ul>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($show_messages && $messages): print $messages; endif; ?>
<?php print render($page['help']); ?>
<?php print render($page['content_top']); ?>
<?php if($title): ?><h1 class="page-title"><?php print $title ?></h1><?php endif; ?>
<?php print render($page['content']); ?>
<?php if ($method == 0 || $method == 2): ?>
<?php print render($page['sidebar_first']); ?>
<?php endif; ?>
<?php if ($method == 2): ?>
<?php print render($page['sidebar_second']) ?>
<?php endif; ?>
<?php if(isset($page['sidebar_first']) || isset($page['sidebar_second'])): ?>
<section id="center">
<?php endif; ?>
<?php if ($primary_local_tasks || $secondary_local_tasks || $action_links): ?>
<div id="tasks">
<?php if ($primary_local_tasks): ?>
<ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul>
<?php endif; ?>
<?php if ($secondary_local_tasks): ?>
<ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul>
<?php endif; ?>
<?php if ($action_links = render($action_links)): ?>
<ul class="action-links"><?php print $action_links; ?></ul>
<?php endif; ?>
</div>
<?php endif; ?>
<?php if ($show_messages && $messages): print $messages; endif; ?>
<?php print render($page['help']); ?>
<?php print render($page['content_top']); ?>
<section id="content">
<?php if($title): ?><h1 class="page-title"><?php print $title ?></h1><?php endif; ?>
<?php print render($page['content']); ?>
</section>
<?php print render($page['content_bottom']); ?>
<?php if(isset($page['sidebar_first']) || isset($page['sidebar_second'])): ?>
</section>
<?php endif; ?>
<!-- /center -->
<?php if ($method == 1): ?>
<?php print render($page['sidebar_first']); ?>
<?php endif; ?>
<?php if ($method == 0 || $method == 1): ?>
<?php print render($page['sidebar_second']) ?>
<?php endif; ?>
<?php print render($page['content_bottom']); ?>
</div><!-- /main -->