Changeset 1092 for trunk/wifidog-auth/wifidog/classes/Content.php

Timestamp:

09/07/06 04:38:25 (5 years ago)

Author:

benoitg

Message:

• Fix #63
• Fix problem with my Splash only user fix (I used match on the

user_id instead of the username).

• Prevent the Splash only user from logging out, wrecking havock

in the tokens.

• Do not allow SplashOnlyUser? to set his preferences.
• Assigning a reusable content to a contentgroup element would

make it non-reusable.
Usability and UI fixes:

• Allow other users to log in when they are at a splash only

node.

• Make isSimpleContent class available for Simple content types.

Make it borderless and backgroundless in the default theme_pack.

• Simplify HTML output for simple content.
• Fix IE layout bug in node admin
• Content linked to nodes and networks now edits in a new

window.

• Remove "Add new node" menu item for consistency.

Files:

• trunk/wifidog-auth/wifidog/classes/Content.php (modified) (6 diffs)

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

@@ -559 +559 @@
                 $html .= "<td>\n";
                 $name = "{$user_prefix}_" . $content->GetId() . "_edit";
-                $html .= "<input type='button' class='submit' name='$name' value='" . _("Edit") . "' onClick='window.location.href = \"" . GENERIC_OBJECT_ADMIN_ABS_HREF . "?object_class=Content&action=edit&object_id=" . $content->GetId() . "\";'>\n";
+                $html .= "<input type='button' class='submit' name='$name' value='" . _("Edit") . "' onClick='window.open(\"" . GENERIC_OBJECT_ADMIN_ABS_HREF . "?object_class=Content&action=edit&object_id=" . $content->GetId() . "\");'>\n";
                 $name = "{$user_prefix}_" . $content->GetId() . "_erase";
                 $html .= "<input type='submit' class='submit' name='$name' value='" . _("Remove") . "'>";
@@ -734 +734 @@
             }
 
-            $html .= _("Add existing content") . ": ";
+            $html .= _("Add reusable content from library") . ": ";
         }
 
@@ -1025 +1025 @@
     public function getUserUI($subclass_user_interface = null) {
         $html = '';
-        $html .= "<div class='user_ui_main_outer " . get_class($this) . "'>\n";
+        $this->isSimpleContent() ? $isSimpleContentClass = 'isSimpleContent' : $isSimpleContentClass = null;
+        $html .= "<div class='user_ui_main_outer " . get_class($this) . " $isSimpleContentClass'>\n";
         $html .= "<div class='user_ui_main_inner'>\n";
 
@@ -1039 +1040 @@
         }
 
-        $html .= "<table><tr>\n";
+if($this->isSimpleContent())
+{
+    $html .= "\n$subclass_user_interface\n";
+}
+else{
+$html .= "<table><tr>\n";
         $html .= "<td>\n$subclass_user_interface</td>\n";
-
         $html .= "<td>\n";
+}
         $authors = $this->getAuthors();
         if (count($authors) > 0) {
@@ -1077 +1083 @@
             }
         }
-
+if(!$this->isSimpleContent())
+{
         $html .= "</td>\n";
         $html .= "</tr></table>\n";
-
+}
         $html .= "</div>\n";
         $html .= "</div>\n";
@@ -1270 +1277 @@
                 /* is_persistent */
                 $html .= "<li class='admin_element_item_container admin_section_edit_persistant'>\n";
-                $html .= "<div class='admin_element_label'>" . _("Is persistent (reusable and read-only)?") . ": </div>\n";
+                $html .= "<div class='admin_element_label'>" . _("Is part of reusable content library (protected from deletion)?") . ": </div>\n";
                 $html .= "<div class='admin_element_data'>\n";
                 $name = "content_" . $this->id . "_is_persistent";