Changeset 1086

Timestamp:

09/01/06 07:00:58 (5 years ago)

Author:

benoitg

Message:

• Content.php: Improve handling of simple but persistent content.

Location:

trunk/wifidog-auth

Files:

• CHANGELOG (modified) (1 diff)
• wifidog/classes/Content.php (modified) (5 diffs)

trunk/wifidog-auth/CHANGELOG

@@ +1 @@
+2006-09-01 Benoit Grégoire  <bock@step.polymtl.ca>
+        * Content.php:  Improve handling of simple but persistent content.
+        
 2006-08-31 Benoit Grégoire  <bock@step.polymtl.ca>
         * Server.php:  Make sure getCurrentServer returns the default server if the hostname isn't recognised.

trunk/wifidog-auth/wifidog/classes/Content.php

@@ -1171 +1171 @@
         } else {
            // Content metadata
-            if ($this->is_trivial_content == false) {
+            if ($this->is_trivial_content == false || $this->isPersistent()) {
                         $html .= "<fieldset class='admin_element_group'>\n";
                                 $html .= "<legend>".sprintf(_("%s MetaData"),get_class($this))."</legend>\n";
@@ -1198 +1198 @@
                 }
                 $html .= "</li>\n";
-
+            }
+            
+            if ($this->is_trivial_content == false) {
                 /* description */
                 $html .= "<li class='admin_element_item_container admin_section_edit_description'>\n";
@@ -1249 +1251 @@
                 }
                 $html .= "</li>\n";
-            }//End content medatada
+            }
             
+            //End content medatada
+                        if ($this->is_trivial_content == false || $this->isPersistent()) {
+                        $html .= "</fieldset>\n";
+                        }
             if ($this->is_trivial_content == false || $this->isPersistent()) {                  
                 $html .= "<fieldset class='admin_element_group'>\n";
@@ -1323 +1329 @@
             } else
             {//Content medatada
-                            /* title_is_displayed */
+
+                
+                            if ($this->is_trivial_content == false || $this->isPersistent()) {
+                                            /* title_is_displayed */
                 if (!empty ($this->content_row['title'])){
                 $name = "content_".$this->id."_title_is_displayed";
                 !empty ($_REQUEST[$name]) ? $this->setTitleIsDisplayed(true) : $this->setTitleIsDisplayed(false);
                 }
-                
-                if ($this->is_trivial_content == false) {
                     /* title */
                     if (empty ($this->content_row['title'])) {
@@ -1347 +1354 @@
                         }
                     }
-
+                            }
+                            if ($this->is_trivial_content == false) {
                     /* description */
                     if (empty ($this->content_row['description'])) {