worx ;D

Jens Krumsieck · Jens Krumsieck · commit 7326e0f939f3 · 2013-11-26T15:41:53.000+01:00
diff --git a/acptemplates/pageAdd.tpl b/acptemplates/pageAdd.tpl
@@ -177,8 +177,8 @@
 						<dt><label for="position">{lang}cms.acp.page.optional.sidebarOrientation{/lang}</label></dt>
 						<dd>
 							<select id="sidebarOrientation" name="sidebarOrientation">
-								<option value="sidebar" {if $sidebarOrientation =="right"}selected="selected"{/if}">{lang}cms.acp.page.sidebarOrientation.right{/lang}</option>
-								<option value="body" {if $sidebarOrientation =="left"}selected="selected"{/if}>{lang}cms.acp.page.sidebarOrientation.left{/lang}</option>
+								<option value="right" {if $sidebarOrientation =="right"}selected="selected"{/if}">{lang}cms.acp.page.sidebarOrientation.right{/lang}</option>
+								<option value="left" {if $sidebarOrientation =="left"}selected="selected"{/if}>{lang}cms.acp.page.sidebarOrientation.left{/lang}</option>
 							</select>
 						</dd>
 					</dl>
diff --git a/files/lib/acp/form/PageAddForm.class.php b/files/lib/acp/form/PageAddForm.class.php
@@ -101,8 +101,8 @@ public function save(){
                        'showOrder' => $this->showOrder,
                        'layoutID' => $this->layoutID,
                        'parentID' => $this->parentID,
-                       'showSidebar' =>$this->showSidebar,
-                       'sidebarOrientation' =>$this->sidebarOrientation,
+                       'showSidebar' => $this->showSidebar,
+                       'sidebarOrientation' => $this->sidebarOrientation,
                        'robots' => $this->robots,
                        'isCommentable' => $this->isCommentable);
                        
diff --git a/files/lib/acp/form/PageEditForm.class.php b/files/lib/acp/form/PageEditForm.class.php
@@ -125,8 +125,8 @@ public function save(){
                                                                                            'menuItem' => serialize($this->menuItem),
                                                                                            'parentID' => $this->parentID,
                                                                                            'layoutID' => $this->layoutID,
-                                                                                           'showSidebar' =>$this->showSidebar,
-                                                                                           'sidebarOrientation' =>$this->sidebarOrientation,
+                                                                                           'showSidebar' => $this->showSidebar,
+                                                                                           'sidebarOrientation' => $this->sidebarOrientation,
                                                                                            'robots' => $this->robots,
                                                                                             'isCommentable' => $this->isCommentable)));
         $objectAction->executeAction();
@@ -181,8 +181,8 @@ public function assignVariables(){
                                     'metaDescription' => $this->metaDescription,
                                     'metaKeywords' => $this->metaKeywords,
                                     'menuItem' => $this->menuItem['has'],
-                                    'showSidebar' =>$this->showSidebar,
-                                    'sidebarOrientation' =>$this->sidebarOrientation,
+                                    'showSidebar' => $this->showSidebar,
+                                    'sidebarOrientation' => $this->sidebarOrientation,
                                     'menuID' => isset($this->menuItem['id']) ? $this->menuItem['id'] : 0,
                                     'page' => $this->page,
                                     'layoutList' => $this->layoutList,
diff --git a/package.xml b/package.xml
@@ -44,7 +44,7 @@
     <instruction type="sql">install.sql</instruction>
   </instructions>
   
-  <instructions type="update" fromversion="1.0.0 Alpha 4">
+  <instructions type="update" fromversion="1.0.0 Alpha 3">
     <!--lang-->
     <instruction type="language">language/*.xml</instruction>
 
diff --git a/updateA3-A4.sql b/updateA3-A4.sql
@@ -0,0 +1,3 @@
+ALTER TABLE cms1_page ADD sidebarOrientation ENUM('left', 'right') NOT NULL DEFAULT 'right' AFTER showSidebar;
+
+ALTER TABLE cms1_content ADD position ENUM('body', 'sidebar') NOT NULL DEFAULT 'body' AFTER cssClasses; 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+ALTER TABLE cms1_page ADD sidebarOrientation ENUM('left', 'right') NOT NULL DEFAULT 'right' AFTER showSidebar;`
	`2`	`+`
	`3`	`+ALTER TABLE cms1_content ADD position ENUM('body', 'sidebar') NOT NULL DEFAULT 'body' AFTER cssClasses;`