[geeklog-hg] geeklog: Staticpage blank page option now works properly for cen...

[geeklog-cvs at lists.geeklog.net]

changeset 8732:06b4b09e3046
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/06b4b09e3046
user: Tom <websitemaster at cogeco.net>
date: Fri Jun 29 09:14:46 2012 -0400
description:
Staticpage blank page option now works properly for centerblock. Also moved the Topic Selection higher in the editor since it affects more than the centerblock (bug #0001460)

diffstat:

 plugins/staticpages/functions.inc                         |  5 ++++-
 plugins/staticpages/templates/admin/editor.thtml          |  6 +++---
 plugins/staticpages/templates/admin/editor_advanced.thtml |  6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (61 lines):

diff -r 484866e17019 -r 06b4b09e3046 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Wed Jun 27 09:45:26 2012 -0400
+++ b/plugins/staticpages/functions.inc	Fri Jun 29 09:14:46 2012 -0400
@@ -1133,7 +1133,10 @@
                 } elseif ($S['sp_format'] != 'blankpage') {
                     $rightblock = -1;
                 }
-                $retval = COM_createHTMLDocument($retval, array('what' => $what, 'rightblock' => $rightblock));
+                
+                if ($S['sp_format'] != 'blankpage') {
+                    $retval = COM_createHTMLDocument($retval, array('what' => $what, 'rightblock' => $rightblock));
+                }
             }
 
             // increment hit counter for page
diff -r 484866e17019 -r 06b4b09e3046 plugins/staticpages/templates/admin/editor.thtml
--- a/plugins/staticpages/templates/admin/editor.thtml	Wed Jun 27 09:45:26 2012 -0400
+++ b/plugins/staticpages/templates/admin/editor.thtml	Fri Jun 29 09:14:46 2012 -0400
@@ -17,6 +17,9 @@
         <dt><label for="sp-editor-sp_label">{lang_label}</label></dt>
         <dd><input type="text" name="sp_label" maxlength="64" value="{sp_label}" id="sp-editor-sp_label" class="size5"{xhtml}></dd>
 
+        <dt><label>{lang_topic}</label></dt>
+        <dd>{topic_selection}</dd>
+        
         <dt><label for="sp-editor-sp_format">{lang_pageformat}</label></dt>
         <dd><select name="sp_format" id="sp-editor-sp_format">
               <option value="blankpage" {blankpage_selected}>{lang_blankpage}</option>
@@ -74,9 +77,6 @@
 
         <dt><label>{lang_position}</label></dt>
         <dd>{pos_selection}</dd>
-
-        <dt><label>{lang_topic}</label></dt>
-        <dd>{topic_selection}</dd>
       </dl>
 
       <hr style="margin-bottom: 15px;"{xhtml}>
diff -r 484866e17019 -r 06b4b09e3046 plugins/staticpages/templates/admin/editor_advanced.thtml
--- a/plugins/staticpages/templates/admin/editor_advanced.thtml	Wed Jun 27 09:45:26 2012 -0400
+++ b/plugins/staticpages/templates/admin/editor_advanced.thtml	Fri Jun 29 09:14:46 2012 -0400
@@ -19,6 +19,9 @@
         <dt><label for="sp-advanced_editor-sp_label">{lang_label}</label></dt>
         <dd><input type="text" name="sp_label" maxlength="64" value="{sp_label}" id="sp-advanced_editor-sp_label" class="size5"{xhtml}></dd>
 
+        <dt><label>{lang_topic}</label></dt>
+        <dd>{topic_selection}</dd>
+        
         <dt><label for="sp-advanced_editor-sp_format">{lang_pageformat}</label></dt>
         <dd><select name="sp_format" id="sp-advanced_editor-sp_format">
               <option value="blankpage" {blankpage_selected}>{lang_blankpage}</option>
@@ -107,9 +110,6 @@
 
         <dt><label>{lang_position}</label></dt>
         <dd>{pos_selection}</dd>
-
-        <dt><label>{lang_topic}</label></dt>
-        <dd>{topic_selection}</dd>
       </dl>
 
       <hr style="margin-bottom: 15px;"{xhtml}>