Changeset 1226 for trunk/wifidog-auth/wifidog/classes/ProfileField.php

Timestamp:

05/17/07 16:25:43 (5 years ago)

Author:

fproulx

Message:

2007-05-17 François Proulx <francois.proulx@…>

• WARNING: This has not been fully tested. Full testing to be completed on 2006-05-18 but I'm pretty confident that it works pretty well.
• Added automatic resize on Avatars
• Added FavoriteHotspots? content (mostly used for Profiles)
• Added new features to Content and File
• Fixed URL regexp bug in HyperlinkUtils?
• Updated French translations
• Updates profiles template
• TODO: Add getNewUI et processNewUI to FavoriteHotspots? to simplify input

Files:

• trunk/wifidog-auth/wifidog/classes/ProfileField.php (modified) (3 diffs)

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

@@ -219 +219 @@
         else
         $content_id = "'".$db->escapeString($content->getId())."'";
-         
+
         $_retVal = $db->execSqlUpdate("UPDATE profile_fields SET content_id = $content_id WHERE profile_field_id = '{$this->getId()}'", false);
         $this->refresh();
@@ -286 +286 @@
         throw new Exception("Could not retrieve the associated content type filter.");
 
-         
+
         return $html;
     }
@@ -324 +324 @@
         //echo "ProfileField::getUserUI()";
         $html = "";
+        $template_field = $this->getProfileTemplateField();
+        $html .=  "<div class='user_ui_profile_field ".$template_field->getSemanticId()."'>\n";
+
+        $content_label = $template_field->getDisplayLabelContent();
+        if(!empty($content_label)){
+            $html .=  "<div class='profile_field_label'>".$content_label->getUserUI()."</div>\n";
+        }
+
         $content_field = $this->getContentField();
         if(!empty($content_field)) {
-            $template_field = $this->getProfileTemplateField();
-            $html .=  "<div class='user_ui_profile_field ".$template_field->getSemanticId()."'>\n";
-            $content_label = $template_field->getDisplayLabelContent();
-            if(!empty($content_label)){
-                $html .=  "<div class='profile_field_label'>".$content_label->getUserUI()."</div>\n";
-            }
             // Display the actual value from the profile field
             $html .=  "<div class='profile_field_content'>".$content_field->getUserUI()."</div>\n";
-            $html .=  "</div>\n";
-        }
+        }
+        $html .=  "</div>\n";
 
         return $html;