Merge pull request #236 from deanblackborough/content-styling-table

Content styling tables and shared classes
Dlayer · Mar 14, 2017 · d26225a · d26225a
2 parents ef7b9fd + 6988167
commit d26225a
Show file tree

Hide file tree

Showing 139 changed files with 1,025 additions and 1,516 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@
 
 Full changelog for Dlayer since the v1.00 release.
 
+## v1.17: 
+
+* New styling table for content items, stores all defined styles, no need for a table per styling group. [Refactoring]
+* Cleaned up tools, removed redundant model classes and moved around shared classes, now more apparent if they relate to content or not. [Refactoring]
+
 ## v1.16: 12th March 2017
 
 * Enabled link support in Quill rich text fields. [v0.30.0 of PHP Quill renderer]

diff --git a/application/configs/environment.php b/application/configs/environment.php
@@ -10,8 +10,8 @@
 * production, development, testing or staging
 */
 
-$environment = 'production';
-//$environment = 'development';
+//$environment = 'production';
+$environment = 'development';
 
 // Version number for current release
 $version_no = 'v1.17';

diff --git a/application/modules/dlayer/views/scripts/index/index.phtml b/application/modules/dlayer/views/scripts/index/index.phtml
@@ -31,22 +31,15 @@
 	</div>
 
     <div class="col-md-6 col-sm-6 col-xs-12">
-        <h3><span class="label label-success">v1.16</span> Horizontal rule & styling <small class="text-muted">(12th March 2017)</small></h3>
+        <h3><span class="label label-success">v1.17</span> Not yet named <small class="text-muted">(In progress)</small></h3>
 
         <ul>
-	        <li>Enabled link support in Quill rich text fields. [v0.30.0 of PHP Quill renderer]</li>
-            <li>Enabled superscript and subscript support in Quill rich text fields. [v0.40.0 of PHP Quill renderer]</li>
-            <li>I have changed the name of the background colour property on the page styling sub tool; it is now called content background colour which is more accurate.</li>
-            <li>I have added the ability to define the background colour for your website (Page background colour, in the future this will be configurable per template). [Feature]</li>
-            <li>I have added a horizontal rule tool, under the content layout drop down. [Feature]</li>
-            <li>I have added a styling sub tool for horizontal rule content items, allows the colour to be defined. [Feature]</li>
-            <li>I have added a delete sub tool for horizontal rule content items. [Feature]</li>
-            <li>I have made improvements to the styling code, less duplication of both data and code. [Refactoring]</li>
-            <li>New tables to manage any styling attributes defined for the page, HTML and content items, additional refactoring required. [Database]</li>
-            <li>Control bar improvements. [UX]</li>
-            <li>General fixes and improvements.</li>
+            <li>New styling table for content items, stores all defined styles, no need for a table per styling group. [Refactoring]</li>
+            <li>Cleaned up tools, removed redundant model classes and moved around shared classes, now more apparent if they relate to content or not. [Refactoring]</li>
         </ul>
 
+        <h3><span class="label label-default">v1.16</span> Horizontal rule & styling <small class="text-muted">(12th March 2017)</small></h3>
+
         <h3><span class="label label-default">v1.15</span> Blog/Rich text content items <small class="text-muted">(3rd March 2017)</small></h3>
 
         <h3><span class="label label-default">v1.14</span> Composite content items soon <small class="text-muted">(23rd February 2017)</small></h3>

diff --git a/application/modules/setup/models/Import.php b/application/modules/setup/models/Import.php
@@ -78,7 +78,6 @@ class Setup_Model_Import extends Zend_Db_Table_Abstract
         'user_site_page_structure_content',
         'user_site_page_structure_row',
         'user_site_page_styling',
-        'user_site_page_styling_content_item_background_color',
         'user_site_page_styling_content_item_typography',
         'user_site_row_styling'
     );

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/Model.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/Model.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_BlogPost_Model extends
-    Dlayer_DesignerTool_ContentManager_Shared_Model_Content
+    Dlayer_DesignerTool_ContentManager_Shared_Model_Content_Item
 {
     /**
      * Fetch all the heading types supported by Dlayer

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Form.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Form.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_BlogPost_SubTool_Delete_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Delete
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Delete
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Model.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Model.php
diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Tool.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Delete/Tool.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_BlogPost_SubTool_Delete_Tool extends
-    Dlayer_DesignerTool_ContentManager_Shared_Tool_Delete
+    Dlayer_DesignerTool_ContentManager_Shared_Tool_Content_Delete
 {
     // No custom logic required
 }
diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Form.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Form.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_BlogPost_SubTool_Styling_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Styling
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Styling
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Model.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Model.php
diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Ribbon.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Ribbon.php
@@ -47,7 +47,7 @@ protected function contentData()
             );
 
             if ($this->tool['content_id'] !== null) {
-                $model_styling = new Dlayer_DesignerTool_ContentManager_BlogPost_SubTool_Styling_Model();
+                $model_styling = new Dlayer_DesignerTool_ContentManager_Shared_Model_Content_Styling();
                 $content_background_color = $model_styling->backgroundColor(
                     $this->tool['site_id'],
                     $this->tool['page_id'],

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Tool.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Styling/Tool.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Text_SubTool_Styling_Tool extends
-    Dlayer_DesignerTool_ContentManager_Shared_Tool_Styling
+    Dlayer_DesignerTool_ContentManager_Shared_Tool_Content_Styling
 {
     /**
      * Generate the return ids array

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Form.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Form.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_BlogPost_SubTool_Typography_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Typography
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Typography
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Model.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Model.php
diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Ribbon.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Ribbon.php
@@ -49,22 +49,26 @@ protected function contentData()
             );
 
             if ($this->tool['content_id'] !== null) {
-                $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Typography();
+                $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Content_Typography();
 
-                $font_and_text_values = $model->fontAndTextValues(
+                $font_weight = $model->fontWeight(
                     $this->tool['site_id'],
                     $this->tool['page_id'],
                     $this->tool['content_id']
                 );
 
-                if ($font_and_text_values !== false) {
-                    if ($font_and_text_values['text_weight_id'] !== null) {
-                        $this->content_data['text_weight_id'] = $font_and_text_values['text_weight_id'];
-                    }
+                $font_family = $model->fontFamily(
+                    $this->tool['site_id'],
+                    $this->tool['page_id'],
+                    $this->tool['content_id']
+                );
+
+                if ($font_weight !== false) {
+                    $this->content_data['text_weight_id'] = $font_weight;
+                }
 
-                    if ($font_and_text_values['font_family_id'] !== null) {
-                        $this->content_data['font_family_id'] = $font_and_text_values['font_family_id'];
-                    }
+                if ($font_family !== false) {
+                    $this->content_data['font_family_id'] = $font_family;
                 }
             }
 
@@ -86,14 +90,14 @@ protected function elementData()
                 'text_weights' => false
             );
 
-            $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Typography();
+            $model = new Dlayer_Model_DesignerTool_ContentManager_Typography();
 
             $font_families = $model->fontFamiliesForSelect();
             if ($font_families !== false) {
                 $this->element_data['font_families'] = $font_families;
             }
 
-            $text_weights = $model->textWeightsForSelect();
+            $text_weights = $model->fontWeightsForSelect();
             if ($text_weights !== false) {
                 $this->element_data['text_weights'] = $text_weights;
             }
@@ -120,14 +124,14 @@ protected function previewData()
                 'text_weights' => false
             );
 
-            $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Typography();
+            $model = new Dlayer_Model_DesignerTool_ContentManager_Typography();
 
             $font_families = $model->fontFamiliesForPreview();
             if ($font_families !== false) {
                 $this->preview_data['font_families'] = $font_families;
             }
 
-            $text_weights = $model->textWeightsForPreview();
+            $text_weights = $model->fontWeightsForPreview();
             if ($text_weights !== false) {
                 $this->preview_data['text_weights'] = $text_weights;
             }

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Tool.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/SubTool/Typography/Tool.php
@@ -6,7 +6,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Text_SubTool_Typography_Tool extends
-    Dlayer_DesignerTool_ContentManager_Shared_Tool_Typography
+    Dlayer_DesignerTool_ContentManager_Shared_Tool_Content_Typography
 {
     /**
      * Generate the return ids array

diff --git a/library/Dlayer/DesignerTool/ContentManager/BlogPost/Tool.php b/library/Dlayer/DesignerTool/ContentManager/BlogPost/Tool.php
@@ -180,7 +180,7 @@ protected function returnIds($content_id = null)
      */
     protected function validateInstances($site_id, $content_id)
     {
-        $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Content();
+        $model = new Dlayer_DesignerTool_ContentManager_Shared_Model_Content_Item();
         $instances = $model->instancesOfData($site_id, $content_id, 'BlogPost');
 
         if ($instances > 1) {

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Form.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Form.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Form_SubTool_Delete_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Delete
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Delete
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Model.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Model.php
diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Tool.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Delete/Tool.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Form_SubTool_Delete_Tool extends
-    Dlayer_DesignerTool_ContentManager_Shared_Tool_Delete
+    Dlayer_DesignerTool_ContentManager_Shared_Tool_Content_Delete
 {
     // No custom logic required
 }
diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Form.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Form.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Form_SubTool_Styling_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Styling
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Styling
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Model.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Model.php
diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Ribbon.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Ribbon.php
@@ -49,7 +49,7 @@ protected function contentData()
             );
 
             if ($this->tool['content_id'] !== null) {
-                $model_styling = new Dlayer_DesignerTool_ContentManager_Form_SubTool_Styling_Model();
+                $model_styling = new Dlayer_DesignerTool_ContentManager_Shared_Model_Content_Styling();
                 $content_background_color = $model_styling->backgroundColor(
                     $this->tool['site_id'],
                     $this->tool['page_id'],

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Tool.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Styling/Tool.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Form_SubTool_Styling_Tool extends
-    Dlayer_DesignerTool_ContentManager_Shared_Tool_Styling
+    Dlayer_DesignerTool_ContentManager_Shared_Tool_Content_Styling
 {
     /**
      * Generate the return ids array

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Typography/Form.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Typography/Form.php
@@ -8,7 +8,7 @@
  * @license https://github.com/Dlayer/dlayer/blob/master/LICENSE
  */
 class Dlayer_DesignerTool_ContentManager_Form_SubTool_Typography_Form extends
-    Dlayer_DesignerTool_ContentManager_Shared_Form_Typography
+    Dlayer_DesignerTool_ContentManager_Shared_Form_Content_Typography
 {
     /**
      * Set the properties for the form

diff --git a/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Typography/Model.php b/library/Dlayer/DesignerTool/ContentManager/Form/SubTool/Typography/Model.php