Merge pull request #596 from godDLL/add-page-layout-column

(#460) Adds a column in Pages where a Layout can be glanced.
wolfcms · Sep 3, 2014 · efc0407 · efc0407
2 parents d0a8ffa + 696aefa
commit efc0407
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/wolf/admin/stylesheets/admin.css b/wolf/admin/stylesheets/admin.css
@@ -585,6 +585,7 @@ table.index td.note {
 }
 #site-map-def { margin-top: 20px; position: relative; }
 #site-map-def .page {}
+#site-map-def .page-layout { position: absolute; text-align: center; top: 0; right: 325px; width: 150px }
 #site-map-def .status { position: absolute; text-align: center; top: 0; right: 175px; width: 100px }
 #site-map-def .view { position: absolute; text-align: center; top: 0; right: 100px; width: 75px }
 #site-map-def .modify { position: absolute; text-align: center; top: 0; right: 5px; width: 85px; }
@@ -620,6 +621,7 @@ table.index td.note {
 #site-map ul { list-style: none; margin:0; padding:0; background: #fff; }
 #site-map .node > span { display: block; position: relative; }
 #site-map .page, #site-map-root .page {}
+#site-map .page-layout, #site-map-root .page-layout { position: absolute; text-align: center; top: 10px; right: 325px; width: 150px }
 #site-map .status, #site-map-root .status { position: absolute; text-align: center; top: 10px; right: 175px; width: 100px }
 #site-map .view-page, #site-map-root .view-page { position: absolute; text-align: center; top: 10px; right: 100px; width: 75px }
 #site-map .modify, #site-map-root .modify { position: absolute; text-align: center; top: 10px; right: 7px; width: 85px }

diff --git a/wolf/app/views/page/children.php b/wolf/app/views/page/children.php
@@ -32,6 +32,7 @@
           <img align="middle" alt="" class="busy" id="busy-<?php echo $child->id; ?>" src="<?php echo PATH_PUBLIC;?>wolf/admin/images/spinner.gif" title="" />
         </span>
       </div>
+      <div class="page-layout"><?php $layout = Layout::findById($child->layout_id); echo isset($layout->name) ? htmlspecialchars($layout->name) : __('inherit'); ?></div>
 <?php switch ($child->status_id) {
       case Page::STATUS_DRAFT: echo '<div class="status draft-status">'.__('Draft').'</div>'; break;
       case Page::STATUS_PREVIEW: echo '<div class="status preview-status">'.__('Preview').'</div>'; break;

diff --git a/wolf/app/views/page/index.php b/wolf/app/views/page/index.php
@@ -20,6 +20,7 @@
 
 <div id="site-map-def">
     <div class="page"><?php echo __('Page'); ?> (<a href="#" id="toggle_reorder"><?php echo __('reorder'); ?></a>)</div>
+    <div class="page-layout"><?php echo __('Layout'); ?></div>
     <div class="status"><?php echo __('Status'); ?></div>
     <div class="view"><?php echo __('View'); ?></div>
     <div class="modify"><?php echo __('Modify'); ?></div>
@@ -36,6 +37,7 @@
 <?php endif; ?>
         </span>
       </div>
+      <div class="page-layout"><?php echo Layout::findById($root->layout_id)->name; ?></div>
       <div class="status published-status"><?php echo __('Published'); ?></div>
       <div class="view-page"><a href="<?php echo URL_PUBLIC; ?>" target="_blank"><img src="<?php echo PATH_PUBLIC;?>wolf/admin/images/magnify.png" align="middle" alt="<?php echo __('View Page'); ?>" title="<?php echo __('View Page'); ?>" /></a></div>
       <div class="modify">