Merge pull request #197 from deanblackborough/form-builder

Form builder, part 2
Dlayer · Jan 26, 2017 · 354b482 · 354b482
2 parents 796e0e1 + f37e9ce
commit 354b482
Show file tree

Hide file tree

Showing 21 changed files with 818 additions and 3,611 deletions.
diff --git a/application/configs/environment.php b/application/configs/environment.php
@@ -14,6 +14,6 @@
 //$environment = 'development';
 
 // Version number for current release
-$version_no = 'v1.07';
+$version_no = 'v1.08';
 // Release date for current release
-$version_release_date = '25th January 2016';
+$version_release_date = '26th January 2016';
diff --git a/application/modules/content/controllers/DesignController.php b/application/modules/content/controllers/DesignController.php
@@ -97,7 +97,7 @@ public function init()
      */
     public function indexAction()
     {
-        $this->_helper->setLayout('designer');
+        $this->_helper->setLayout('content-manager');
 
         /**
          * Auto select the page if not selected, better UX as there is only one page per designer
@@ -350,7 +350,7 @@ private function toolTabViewData($tool, $tab, $multi_use, $edit_mode)
      */
     private function page()
     {
-        $designer_page = new Dlayer_Designer_Page($this->site_id, $this->page_id); // Fix this
+        $designer_page = new Dlayer_Designer_Page($this->site_id, $this->page_id);
 
         $this->view->rows = $designer_page->rows();
         $this->view->columns = $designer_page->columns();
@@ -378,7 +378,7 @@ private function page()
      */
     private function pagePreview()
     {
-        $designer_page = new Dlayer_Designer_Page($this->site_id, $this->page_id); // Fix this
+        $designer_page = new Dlayer_Designer_Page($this->site_id, $this->page_id);
 
         $this->view->page_id = $this->page_id;
 

diff --git a/application/modules/content/views/scripts/design/index.phtml b/application/modules/content/views/scripts/design/index.phtml
@@ -62,15 +62,7 @@
                     }
                     ?>
                 </div>
-
-                <?php if(strlen(trim($this->dlayer_toolbar)) > 0) { ?>
-                <div class="col-lg-12 col-md-4 col-sm-4 tools">
-                    <div class="well well-sm" style="margin-top: 1em;">
-                        <?php echo $this->dlayer_toolbar; ?>
-                    </div>					
-                </div>
-                <?php } ?>
-            </div>            
+            </div>
         </div>
     </div>
 </div>
diff --git a/application/modules/dlayer/views/scripts/index/index.phtml b/application/modules/dlayer/views/scripts/index/index.phtml
@@ -31,15 +31,17 @@
 	</div>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        <h3><span class="label label-success">v1.07</span> Form Builder part 1 <small class="text-muted">(25th January 2017)</small></h3>
+        <h3><span class="label label-success">v1.08</span> Form Builder part 2 <small class="text-muted">(26th January 2017)</small></h3>
 
         <ul>
-            <li>Added the foundation code for the Form Builder module.</li>
-            <li>You can now add and edit form definitions, name and title as of this release.</li>
-            <li>Added initial code for the Form Builder session class.</li>
-            <li>Minor styling updates to forms, the further reading block and lists.</li>
+            <li>I have removed the full SQL exports, no longer required, setup module will be used for all imports.</li>
+            <li>Added foundation for the Form Builder, this shows the currently selected form, the control bar and ribbon.</li>
+            <li>Added a Preview mode to display the final form.</li>
+            <li>Moving to a separate layout per designer.</li>
         </ul>
 
+        <h3><span class="label label-default">v1.07</span> Form Builder part 1 <small class="text-muted">(25th January 2017)</small></h3>
+
 	    <h3><span class="label label-default">v1.06</span> Responsive columns <small class="text-muted">(23rd January 2017)</small></h3>
 
         <h3><span class="label label-default">v1.05</span> Database setup <small class="text-muted">(17th January 2017)</small></h3>