Merge pull request #458 from PHPCraftdream/master

more detailed partitioning of layout for easy redefinition layout items

src/Whoops/Handler/PrettyPageHandler.php

@@ -188,10 +188,17 @@ class PrettyPageHandler extends Handler
             "javascript" => file_get_contents($jsFile),
 
             // Template paths:
-            "header"      => $this->getResource("views/header.html.php"),
-            "frame_list"  => $this->getResource("views/frame_list.html.php"),
-            "frame_code"  => $this->getResource("views/frame_code.html.php"),
-            "env_details" => $this->getResource("views/env_details.html.php"),
+            "header"                     => $this->getResource("views/header.html.php"),
+            "header_outer"               => $this->getResource("views/header_outer.html.php"),
+            "frame_list"                 => $this->getResource("views/frame_list.html.php"),
+            "frames_description"         => $this->getResource("views/frames_description.html.php"),
+            "frames_container"           => $this->getResource("views/frames_container.html.php"),
+            "panel_details"              => $this->getResource("views/panel_details.html.php"),
+            "panel_details_outer"        => $this->getResource("views/panel_details_outer.html.php"),
+            "panel_left"                 => $this->getResource("views/panel_left.html.php"),
+            "panel_left_outer"           => $this->getResource("views/panel_left_outer.html.php"),
+            "frame_code"                 => $this->getResource("views/frame_code.html.php"),
+            "env_details"                => $this->getResource("views/env_details.html.php"),
 
             "title"          => $this->getPageTitle(),
             "name"           => explode("\\", $inspector->getExceptionName()),

src/Whoops/Resources/views/frames_container.html.php

@@ -0,0 +1,3 @@
+<div class="frames-container <?php echo $active_frames_tab == 'application' ? 'frames-container-application' : '' ?>">
+  <?php $tpl->render($frame_list) ?>
+</div>

src/Whoops/Resources/views/frames_description.html.php

@@ -0,0 +1,20 @@
+<div class="frames-description <?php echo $has_frames_tabs ? 'frames-description-application' : '' ?>">
+  <?php if ($has_frames_tabs): ?>
+    <?php if ($active_frames_tab == 'application'): ?>
+      <a href="#" id="application-frames-tab" class="frames-tab frames-tab-active">
+        Application frames (<?php echo $frames->countIsApplication() ?>)
+      </a>
+    <?php else: ?>
+      <span href="#" id="application-frames-tab" class="frames-tab">
+        Application frames (<?php echo $frames->countIsApplication() ?>)
+      </span>
+    <?php endif; ?>
+    <a href="#" id="all-frames-tab" class="frames-tab <?php echo $active_frames_tab == 'all' ? 'frames-tab-active' : '' ?>">
+      All frames (<?php echo count($frames) ?>)
+    </a>
+  <?php else: ?>
+    <span>
+        Stack frames (<?php echo count($frames) ?>)
+    </span>
+  <?php endif; ?>
+</div>

src/Whoops/Resources/views/header_outer.html.php

@@ -0,0 +1,3 @@
+<header>
+  <?php $tpl->render($header) ?>
+</header>

src/Whoops/Resources/views/layout.html.php

@@ -15,40 +15,11 @@
 
     <div class="Whoops container">
       <div class="stack-container">
-        <div class="panel left-panel cf <?php echo (!$has_frames ? 'empty' : '') ?>">
-          <header>
-            <?php $tpl->render($header) ?>
-          </header>
 
-          <div class="frames-description <?php echo $has_frames_tabs ? 'frames-description-application' : '' ?>">
-            <?php if ($has_frames_tabs): ?>
-              <?php if ($active_frames_tab == 'application'): ?>
-                <a href="#" id="application-frames-tab" class="frames-tab frames-tab-active">
-                  Application frames (<?php echo $frames->countIsApplication() ?>)
-                </a>
-              <?php else: ?>
-                <span href="#" id="application-frames-tab" class="frames-tab">
-                  Application frames (<?php echo $frames->countIsApplication() ?>)
-                </span>
-              <?php endif; ?>
-              <a href="#" id="all-frames-tab" class="frames-tab <?php echo $active_frames_tab == 'all' ? 'frames-tab-active' : '' ?>">
-                All frames (<?php echo count($frames) ?>)
-              </a>
-            <?php else: ?>
-              <span>
-                  Stack frames (<?php echo count($frames) ?>)
-              </span>
-            <?php endif; ?>
-          </div>
+        <?php $tpl->render($panel_left_outer) ?>
+
+        <?php $tpl->render($panel_details_outer) ?>
 
-          <div class="frames-container <?php echo $active_frames_tab == 'application' ? 'frames-container-application' : '' ?>">
-            <?php $tpl->render($frame_list) ?>
-          </div>
-        </div>
-        <div class="panel details-container cf">
-          <?php $tpl->render($frame_code) ?>
-          <?php $tpl->render($env_details) ?>
-        </div>
       </div>
     </div>
 

src/Whoops/Resources/views/panel_details.html.php

@@ -0,0 +1,2 @@
+<?php $tpl->render($frame_code) ?>
+<?php $tpl->render($env_details) ?>

src/Whoops/Resources/views/panel_details_outer.html.php

@@ -0,0 +1,3 @@
+<div class="panel details-container cf">
+  <?php $tpl->render($panel_details) ?>
+</div>

src/Whoops/Resources/views/panel_left.html.php

@@ -0,0 +1,3 @@
+<?php $tpl->render($header_outer) ?>
+<?php $tpl->render($frames_description) ?>
+<?php $tpl->render($frames_container) ?>

src/Whoops/Resources/views/panel_left_outer.html.php

@@ -0,0 +1,3 @@
+<div class="panel left-panel cf <?php echo (!$has_frames ? 'empty' : '') ?>">
+  <?php $tpl->render($panel_left) ?>
+</div>