Update glmBlocks

Adding second image for the application.
Output into site template

diff --git a/Toolkit/Blocks/Admin/EditPage.php b/Toolkit/Blocks/Admin/EditPage.php
index e8f7271..1219bda 100644 (file)
--- a/Toolkit/Blocks/Admin/EditPage.php
+++ b/Toolkit/Blocks/Admin/EditPage.php
@@ -98,7 +98,10 @@ class Toolkit_Blocks_Admin_EditPage
             $stmt->execute();
             while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
                 if ($row['image']) {
-                    $row['imageUrl'] = HEADLINE_THUMB . $row['image'];
+                    $row['imageUrl'] = HOMEPAGE_HEADLINE_THUMB . $row['image'];
+                }
+                if ($row['image2']) {
+                    $row['image2Url'] = HOMEPAGE_HEADLINE_THUMB . $row['image2'];
                 }
                 $row['deleteUrl']
                     = 'blocks.php?ac=Edit&Command=Delete&blockId=' .
@@ -143,10 +146,13 @@ class Toolkit_Blocks_Admin_EditPage
                 header('Location: blocks.php?ac=Edit&page_on=' . $pageOn);
             }
         } else if ($_POST) {
+            $is = new Toolkit_FileServer_ImageAdapter();
             if ($_FILES['image']['size'] > 0) {
-                $is = new Toolkit_FileServer_ImageAdapter();
                 $imageUploaded = $is->upload('image');
             }
+            if ($_FILES['image2']['size'] > 0) {
+                $image2Uploaded = $is->upload('image2');
+            }
             $pageOn = filter_input(
                 INPUT_POST,
                 'page_on',
@@ -194,6 +200,11 @@ class Toolkit_Blocks_Admin_EditPage
                 'oldImage',
                 FILTER_SANITIZE_STRING
             );
+            $oldImage2 = filter_input(
+                INPUT_POST,
+                'oldImage2',
+                FILTER_SANITIZE_STRING
+            );
 
             $values = array(
                 'title'       => $title,
@@ -201,11 +212,15 @@ class Toolkit_Blocks_Admin_EditPage
                 'image'       => (($imageUploaded['name'])
                     ? $imageUploaded['name']
                     :$oldImage),
+                'image2'      => (($image2Uploaded['name'])
+                    ? $image2Uploaded['name']
+                    :$oldImage2),
                 'pageOn'      => $pageOn,
                 'pageTo'      => $pageTo,
                 'url'         => Toolkit_Common::filterURI($url),
                 'external'    => $external
             );
+//            echo '<pre>'.print_r($values, true).'</pre>';
             if ($blockId) {
                 $values['id'] = $blockId;
                 $oldBlock = Toolkit_Blocks_Block::fetchById
@@ -223,6 +238,7 @@ class Toolkit_Blocks_Admin_EditPage
             $block = Toolkit_Blocks_Block::createByValues(
                 $values
             );
+//            echo '<pre>'.print_r($block, true).'</pre>';
             if ($block) {
                 $pageOn = $block->getPageOn();
                 // remove this cache file for the block
@@ -230,6 +246,7 @@ class Toolkit_Blocks_Admin_EditPage
                 $cache->remove($pageOn, 'Block');
                 $block->save($this->_dbh);
             }
+//            echo '<pre>'.print_r($block, true).'</pre>';exit;
             header('Location: blocks.php?ac=Edit&page_on=' . $pageOn);
             return false;
         } else {

diff --git a/Toolkit/Blocks/Block.php b/Toolkit/Blocks/Block.php
index 4ff43ff..d55307b 100644 (file)
--- a/Toolkit/Blocks/Block.php
+++ b/Toolkit/Blocks/Block.php
@@ -36,6 +36,7 @@ class Toolkit_Blocks_Block
     private $_title;
     private $_description;
     private $_image;
+    private $_image2;
     private $_pageOn;
     private $_pageTo;
     private $_url;
@@ -52,6 +53,7 @@ class Toolkit_Blocks_Block
         extract($values);
         $this->setTitle($title)
             ->setImage($image)
+            ->setImage2($image2)
             ->setDescription($description)
             ->setPageOn($pageOn)
             ->setPageTo($pageTo)
@@ -268,6 +270,29 @@ class Toolkit_Blocks_Block
         return $this->_image;
     }
 
+    /**
+     * Returns the Blocks image
+     *
+     * @return image
+     */
+    public function getImage2()
+    {
+        return $this->_image2;
+    }
+
+    /**
+     * Sets the Blocks image
+     *
+     * @param string $image
+     *
+     * @return Toolkit_Blocks_Block
+     */
+    public function setImage2($image2)
+    {
+        $this->_image2 = $image2;
+        return $this;
+    }
+
     /**
      * Sets the Blocks image
      *

diff --git a/Toolkit/Blocks/Display.php b/Toolkit/Blocks/Display.php
index 028f7c2..8f3a5d3 100644 (file)
--- a/Toolkit/Blocks/Display.php
+++ b/Toolkit/Blocks/Display.php
@@ -53,9 +53,8 @@ class Toolkit_BLocks_Display
                 $pageBlocks[] = array(
                     'external' => $block->getExternal(),
                     'href'     => $url,
-                    'img'      => ($block->getImage())
-                        ? HEADLINE_THUMB . $block->getImage()
-                        : '',
+                    'img'      => $block->getImage(),
+                    'img2'     => $block->getImage2(),
                     'header'   => $block->getTitle(),
                     'descr'    => $block->getDescription()
                 );

diff --git a/Toolkit/Blocks/IndexController.php b/Toolkit/Blocks/IndexController.php
index 39e48b0..ee3c291 100644 (file)
--- a/Toolkit/Blocks/IndexController.php
+++ b/Toolkit/Blocks/IndexController.php
@@ -53,7 +53,6 @@ class Toolkit_Blocks_IndexController
         // look at canCreateOnAnyPage
         $canCreateOnAnyPage = $this->registry->appConfig->canCreateOnAnyPage;
         if ($canCreateOnAnyPage) {
-
             $list = new Toolkit_Blocks_Admin_ListPages($this->registry);
             $html = $list->toHtml();
         } else {

diff --git a/Toolkit/Blocks/css/style.css b/Toolkit/Blocks/css/style.css
index 72e5f36..c91bfd6 100644 (file)
--- a/Toolkit/Blocks/css/style.css
+++ b/Toolkit/Blocks/css/style.css
@@ -38,8 +38,8 @@ h2 {
     padding: 0 5px 0 5px;
 }
 .textBlock {
-    float: left;
-    width: 536px;
+    float: right;
+    width: 68%;
     padding: 5px 5px 0 5px;
 }
 .textBlockTextArea {
@@ -457,6 +457,12 @@ a#addPageUrl:hover {
     width: 210px;
     height: auto;
 }
+#sideImage2 {
+    display: block;
+    width: 210px;
+    height: auto;
+}
+div.fileInputs {float:left;width:30%;}
 .internal_link, .external_link {
     display: block;
     float: left;

diff --git a/Toolkit/Blocks/templates/editPage.html b/Toolkit/Blocks/templates/editPage.html
index 808e70b..0c0e0e5 100644 (file)
--- a/Toolkit/Blocks/templates/editPage.html
+++ b/Toolkit/Blocks/templates/editPage.html
@@ -21,7 +21,17 @@
                             name="image"
                             id="image"
                             class="image">
-                        <span class="button">Choose Image</span>
+                        <span class="button">Choose Image 1</span>
+                    </span>
+                </div>
+                <div class="imageBlock">
+                    <span class="file-wrapper">
+                        <input
+                            type="file"
+                            name="image2"
+                            id="image2"
+                            class="image">
+                        <span class="button">Choose Image 2</span>
                     </span>
                 </div>
                 <div class="textBlock">
@@ -91,17 +101,8 @@
                     value="{block[id]}">
                 <input
                     type="hidden" name="oldImage" value="{block[image]}">
-                <div class="imageBlock">
-                    <div class="upload">
-                        <input type="file" class="image" name="image">
-                        <a id="upload_text" class="button">
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Change Image
-                        </a>
-                    </div>
-                    {if:block[imageUrl]}
-                    <img id="sideImage" src="{block[imageUrl]:h}">
-                    {end:}
-                </div>
+                <input
+                    type="hidden" name="oldImage2" value="{block[image2]}">
                 <div class="textBlock">
                     <input
                         type="text"
@@ -154,6 +155,31 @@
                             rel="{block[id]}">Delete</a>
                     </div>
                 </div>
+                <div class="fileInputs">
+                    <div class="imageBlock">
+                        <div class="upload">
+                            <input type="file" class="image" name="image">
+                            <a id="upload_text" class="button">
+                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Change Image 1
+                            </a>
+                        </div>
+                        {if:block[imageUrl]}
+                        <img id="sideImage" src="{block[imageUrl]:h}">
+                        {end:}
+                    </div>
+                    <div class="imageBlock">
+                    <div class="upload">
+                        <input type="file" class="image" name="image2">
+                        <a id="upload_text2" class="button">
+                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Change Image 2
+                        </a>
+                    </div>
+                    {if:block[image2Url]}
+                    <img id="sideImage2" src="{block[image2Url]:h}">
+                    {end:}
+                </div>
+                </div>
+
             </form>
         </li>
     </ul>

diff --git a/templates/template.html b/templates/template.html
index 8cbc7f7..ac81654 100644 (file)
--- a/templates/template.html
+++ b/templates/template.html
@@ -68,37 +68,6 @@
             <!-- Off-canvas menu -->
             <aside class="right-off-canvas-menu">
                 {mobileNavigationUl:h}
-<!--              <ul class="off-canvas-list">
-                <li>
-                  <a class="home" href="/">Home</a>
-                </li>
-                <li>
-                  <a class="activities" href="/activities">Activities</a>
-                </li>
-                <li>
-                  <a class="attractions" href="/attractions">Attractions</a>
-                </li>
-                <li class="has-dropdown">
-                  <a class="lodging" href="/lodging">Lodging</a>
-                  <a class="toggle"></a>
-                  <ul>
-                    <li><a href="#">Bed &amp; Breakfasts</a></li>
-                    <li><a href="#">Cabins/Cottages</a></li>
-                    <li><a href="#">Campgrounds</a></li>
-                    <li><a href="#">Hotels/Motels</a></li>
-                    <li><a href="#">Vacation Homes</a></li>
-                  </ul>
-                </li>
-                <li>
-                  <a class="restaurants" href="/restaurants">Restaurants</a>
-                </li>
-                <li>
-                  <a class="shopping" href="/shopping">Shopping</a>
-                </li>
-                <li>
-                  <a class="calendar" href="/calendar">Calendar</a>
-                </li>
-              </ul>-->
             </aside>
             <!-- /Nav Menus -->
 
@@ -107,7 +76,13 @@
             <div class="row collapse header-content">
               <div class="small-12 medium-7 columns header-image">
                   <div class="center-image">
-                   <img src="{headlines[0][img]:h}" />
+                    {if:isHomePage}
+                      {rotatingImages:h}
+                    {else:}
+                      {if:headlines[0][img2]}
+                      <img src="<?php echo HEADLINE_MAIN;?>{headlines[0][img2]:h}" />
+                      {end:}
+                    {end:}
                  </div>
               </div>
               <div class="small-12 medium-5 columns content">
@@ -117,20 +92,13 @@
                     {headlines[0][descr]:h}
                 </p>
                 <div class="north"></div>
-                <img src="{mediaBaseURL:h}assets/blue_berries.png" />
+                <img src="<?php echo HEADLINE_SMALL;?>{headlines[0][img]:h}" />
               </div>
             </div>
             {end:}
             {if:!isHomePage}
               {if:toolboxContent.breadCrumbs}
                 {toolboxContent.breadCrumbs:h}
-<!--                <div class="row">
-                  <ul class="breadcrumbs">
-                    <li><a href="/">Home</a></li>
-                    <li><a href="/lodging">Lodging</a></li>
-                    <li class="current">Campgrounds</li>
-                  </ul>
-                </div>-->
               {end:}
             {end:}
 
@@ -144,7 +112,9 @@
             {if:headlines[1]}
             <div class="row  collapse bottom-content" flexy:if="isHomePage">
               <div class="small-12 medium-5 columns content">
-                  <img src="{mediaBaseURL:h}assets/rasberries.png" />
+                  {if:headlines[1][img]}
+                  <img src="<?php echo HEADLINE_SMALL;?>{headlines[1][img]:h}" />
+                  {end:}
                 <h2>{headlines[1][header]}</h2>
                 <hr />
                 <p>
@@ -154,7 +124,9 @@
               </div>
               <div class="small-12 medium-7 columns bottom-image">
                  <div class="center-image">
-                   <img src="{headlines[1][img]}" />
+                   {if:headlines[1][img2]}
+                  <img src="<?php echo HEADLINE_MAIN;?>{headlines[1][img2]:h}" />
+                  {end:}
                  </div>
                </div>
             </div>