From 8ea4757b68ba0581cffdc2de5468d40a5a925265 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 13 Aug 2014 15:38:21 -0400
Subject: [PATCH] glm blocks admin side

lock down the blocks
---
 Toolkit/Blocks/Admin/EditPage.php      | 2 +-
 Toolkit/Blocks/Admin/ListPages.php     | 3 ++-
 Toolkit/Blocks/css/style.css           | 4 +++-
 Toolkit/Blocks/templates/editPage.html | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Toolkit/Blocks/Admin/EditPage.php b/Toolkit/Blocks/Admin/EditPage.php
index 1219bda..9b3e654 100644
--- a/Toolkit/Blocks/Admin/EditPage.php
+++ b/Toolkit/Blocks/Admin/EditPage.php
@@ -258,7 +258,7 @@ class Toolkit_Blocks_Admin_EditPage
                 $page->pageName = $this->_getPageName();
             }
             $page->baseUrl = MEDIA_BASE_URL;
-            $page->pageOn = $this->_pageId;
+            $page->pageOn  = $this->_pageId;
             $page->blocks
                 = ($this->_pageId)
                 ? $this->_getBlocks()
diff --git a/Toolkit/Blocks/Admin/ListPages.php b/Toolkit/Blocks/Admin/ListPages.php
index e6e9989..fa58a9b 100644
--- a/Toolkit/Blocks/Admin/ListPages.php
+++ b/Toolkit/Blocks/Admin/ListPages.php
@@ -75,7 +75,8 @@ class Toolkit_Blocks_Admin_ListPages
             SELECT count(b.id) as count,b.page_on,p.navigation_name
               FROM blocks.blocks b
                    LEFT OUTER JOIN pages p ON (b.page_on = p.id)
-            GROUP BY navigation_name,page_on";
+            GROUP BY navigation_name,page_on
+            ORDER BY navigation_name";
             $stmt = $this->_dbh->query($sql);
             while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
                 $row['editUrl']
diff --git a/Toolkit/Blocks/css/style.css b/Toolkit/Blocks/css/style.css
index c91bfd6..402c512 100644
--- a/Toolkit/Blocks/css/style.css
+++ b/Toolkit/Blocks/css/style.css
@@ -73,6 +73,7 @@ h2 {
     margin-left: -25px;
 }
 #newBlockForm {
+    display: none;
     float: left;
     clear: both;
     list-style-type: none;
@@ -167,6 +168,7 @@ a#editBtn:hover {
     color: #09F;
     background-position: 0px -28px;
     }
+.deleteBlock {display:none;}
 a#deleteBtn {
     background: url(../assets/btn_delete.gif) no-repeat;
     }
@@ -225,7 +227,7 @@ a#deleteBtn:hover {
     margin: 0 -3px;
     }
 a#addPageUrl {
-    display: block;
+    display: none;
     width: 222px;
     height: 28px;
     line-height: 28px;
diff --git a/Toolkit/Blocks/templates/editPage.html b/Toolkit/Blocks/templates/editPage.html
index 0c0e0e5..2cda95c 100644
--- a/Toolkit/Blocks/templates/editPage.html
+++ b/Toolkit/Blocks/templates/editPage.html
@@ -2,7 +2,7 @@
 <a id="backBtn" href="../admin/blocks.php">Back to All Blocks</a>
 {end:}
 <div id="blocksEditWrapper">
-    <h2>Add New {pageName} Block</h2>
+    <h2 style="display: none;">Add New {pageName} Block</h2>
     <ul id="newBlockForm">
         <li class="ui-widget-content">
             <form
-- 
2.17.1