From fbb78d42056522adf3623dd724dc42fc62bd0594 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 26 Sep 2014 15:25:54 -0400 Subject: [PATCH] finishing up with the new layout for the home page glm blocks Showing three blocks across on the bottom of the home page. --- Toolkit/Blocks/Admin/EditPage.php | 6 ++-- Toolkit/Blocks/css/style.css | 2 -- Toolkit/Blocks/templates/editPage.html | 30 ++++++++++++------ Toolkit/Page.php | 23 +++++++++++--- setup.phtml | 1 + styles.css | 25 ++++++++++++++- templates/template.html | 42 +++++++++++++++++++++++++- 7 files changed, 110 insertions(+), 19 deletions(-) diff --git a/Toolkit/Blocks/Admin/EditPage.php b/Toolkit/Blocks/Admin/EditPage.php index 92fc483..b2ca0a7 100644 --- a/Toolkit/Blocks/Admin/EditPage.php +++ b/Toolkit/Blocks/Admin/EditPage.php @@ -257,13 +257,15 @@ class Toolkit_Blocks_Admin_EditPage if (is_numeric($this->_pageId)) { $page->pageName = $this->_getPageName(); } - $page->baseUrl = MEDIA_BASE_URL; - $page->pageOn = $this->_pageId; + $page->baseUrl = MEDIA_BASE_URL; + $page->pageOn = $this->_pageId; + $page->isHomePage = ($this->_pageId == HOME_ID); $page->blocks = ($this->_pageId) ? $this->_getBlocks() : false; $page->canCreateOnAnyPage = $this->_canCreateOnAnyPage; + //echo '
'.print_r($page, true).'
';exit; return $tpl->bufferedOutputObject($page); } } diff --git a/Toolkit/Blocks/css/style.css b/Toolkit/Blocks/css/style.css index 402c512..97e82df 100644 --- a/Toolkit/Blocks/css/style.css +++ b/Toolkit/Blocks/css/style.css @@ -73,7 +73,6 @@ h2 { margin-left: -25px; } #newBlockForm { - display: none; float: left; clear: both; list-style-type: none; @@ -168,7 +167,6 @@ a#editBtn:hover { color: #09F; background-position: 0px -28px; } -.deleteBlock {display:none;} a#deleteBtn { background: url(../assets/btn_delete.gif) no-repeat; } diff --git a/Toolkit/Blocks/templates/editPage.html b/Toolkit/Blocks/templates/editPage.html index 2cda95c..1ae3563 100644 --- a/Toolkit/Blocks/templates/editPage.html +++ b/Toolkit/Blocks/templates/editPage.html @@ -2,8 +2,14 @@ Back to All Blocks {end:}
-

Add New {pageName} Block

+ {if:isHomePage} +

Add New {pageName} Block

+ {end:} + {if:isHomePage}
+ {if:!isHomePage}
Choose Image 2
+ {end:}
{block[description]} + {if:isHomePage}
Delete
+ {end:}
@@ -167,18 +177,20 @@ {end:}
+ {if:!isHomePage}
-
- - -        Change Image 2 - +
+ + +        Change Image 2 + +
+ {if:block[image2Url]} + + {end:}
- {if:block[image2Url]} - {end:}
-
diff --git a/Toolkit/Page.php b/Toolkit/Page.php index b51e86c..1d1e6e9 100755 --- a/Toolkit/Page.php +++ b/Toolkit/Page.php @@ -966,14 +966,29 @@ class Toolkit_Page } $cache = new Cache_Lite($GLOBALS['cacheOptions']); if ($blockContent = $cache->get($parentId, 'Block')) { - $this->headlines = unserialize($blockContent); + $homePageBlocks = unserialize($blockContent); + $this->headlines = $homePageBlocks['headlines']; + $this->blocks = $homePageBlocks['blocks']; } else { $blocks = new Toolkit_Blocks_Display( Toolkit_Database::getInstance() ); - $this->headlines - = $blocks->getPageBlocksAsArray((int)$parentId); - $cache->save(serialize($this->headlines), $parentId, 'Block'); + $blocks = $blocks->getPageBlocksAsArray((int)$parentId); + if (count($blocks) > 1) { + $blocks = array_reverse($blocks); + $this->headlines[0] = array_pop($blocks); + $blocks[0]['end'] = true; + $blocks = array_reverse($blocks); + $blocks = array_chunk($blocks, 3); + $this->blocks = $blocks; + } else { + $this->headlines = $blocks; + } + $homePageBlocks = array( + 'headlines' => $this->headlines, + 'blocks' => $this->blocks + ); + $cache->save(serialize($homePageBlocks), $parentId, 'Block'); } $this->hasHeadlines = !empty($this->headlines); } diff --git a/setup.phtml b/setup.phtml index 68746cf..ac8d89f 100644 --- a/setup.phtml +++ b/setup.phtml @@ -882,6 +882,7 @@ define('PHOTO_SMALL_URL', FILE_SERVER_URL.IS_OWNER_ID."/pgs2/"); * Home page headlines thumbnail */ define('HOMEPAGE_HEADLINE_THUMB', FILE_SERVER_URL.IS_OWNER_ID."/homepageHeadlineThumb/"); +define('HEADLINE_THUMB_BOTTOM', FILE_SERVER_URL.IS_OWNER_ID."/headlineThumbBottom/"); define('MAIN_NAV_THUMB', FILE_SERVER_URL.IS_OWNER_ID."/mainNavThumb/"); define('HEADLINE_THUMB', FILE_SERVER_URL.IS_OWNER_ID.'/headline/'); define('HEADLINE_MAIN', HEADLINE_THUMB); diff --git a/styles.css b/styles.css index be82505..66c3262 100644 --- a/styles.css +++ b/styles.css @@ -1384,4 +1384,27 @@ footer .copyright .separator { .header-content .content p, .bottom-content .content p { font-size: 10pt; -} \ No newline at end of file +} +.homeBlockRow { + background-color: #fff; +} +.homeBlocks { + background-color: #fff; + /*border: solid 1px #000;*/ + padding: 5px; + margin-bottom: 20px; +} +.homeBlocks p { + line-height: 130%; +} +.blockImg { + margin-bottom: 10px; +} +.homeBlockHeader { + margin-top: 10px; + margin-bottom: 10px; + min-height: 24px; +} +.inner-container p a { + text-decoration: underline; +} diff --git a/templates/template.html b/templates/template.html index 6fcbb90..952e902 100755 --- a/templates/template.html +++ b/templates/template.html @@ -18,7 +18,7 @@ {styles:h} - + {topScripts:h} @@ -152,6 +152,46 @@ + {if:blocks} + {foreach:blocks,blockRow} +
+ {foreach:blockRow,block} + {if:block[end]} +
+ {else:} +
+ {end:} +
+
+ {if:block[href]}{end:} +

{block[header]}

+ {if:block[href]}{end:} +
+
+ {if:block[img]} + {if:block[href]} + + {else:} + + {end:} + + + {end:} +
+
+ {if:block[href]}{end:} +

{block[header]}

+ {if:block[href]}{end:} +
+
+ {block[descr]:h} +
+
+
+ {end:} +
+ {end:} + {end:} {if:headlines[1]}
-- 2.17.1