Changeset 1385

Timestamp:

06/17/2009 03:22:07 AM (15 months ago)

Author:

DarTar

Message:

New menulets, refs #11 and #891

Location:

branches/1.2

Files:

• actions/clonelink.php (added)
• actions/editlink.php (modified) (1 diff)
• actions/historylink.php (modified) (1 diff)
• actions/ownerlink.php (modified) (3 diffs)
• actions/revertlink.php (added)
• config/options_menu.admin.inc (modified) (1 diff)
• config/options_menu.user.inc (modified) (1 diff)

branches/1.2/actions/editlink.php

@@ -3 +3 @@
  * Edit link menulet
  */
-echo $this->HasAccess('write') ? '<a href="'.$this->Href('edit').'" title="Click to edit this page">Edit</a>' : '<a href="'.$this->Href('showcode').'" title="Display the markup for this page">Source</a>';
+if ($this->method == 'edit' || $this->method == 'showcode')
+{
+        echo '<a href="'.$this->Href().'" title="Displayed the formatted version of this page">[Show]</a>';
+}
+else
+{
+        if ($this->HasAccess('write'))
+        {
+                echo '<a href="'.$this->Href('edit').'" title="Click to edit this page">[Edit]</a>';
+        }
+        else
+        {
+                echo '<a href="'.$this->Href('showcode').'" title="Display the markup for this page">[Source]</a>';
+        }
+}
 ?>

branches/1.2/actions/historylink.php

@@ -3 +3 @@
  * History link menulet
  */
-echo '<a href="'.$this->Href('history').'" title="Click to view recent edits to this page">Page History</a>'."\n";
+echo '<a href="'.$this->Href('history').'" title="Click to view recent edits to this page">History</a>'."\n";
 ?>

branches/1.2/actions/ownerlink.php

@@ -6 +6 @@
                 if ($owner == '(Public)')
                 {
-                        echo "Public page ".($this->IsAdmin() ? '<a href="'.$this->Href('acls').'">(Edit ACLs)</a>'."\n" : "\n");
+                        echo "Public page ".($this->IsAdmin() ? '<a href="'.$this->Href('acls').'">[Edit ACLs]</a>'."\n" : "\n");
                 }
                 // if owner is current user
@@ -13 +13 @@
                 if ($this->IsAdmin())
                 {
-                                echo 'Owner: '.$this->Link($owner, '', '', 0).' (<a href="'.$this->Href('acls').'">Edit ACLs</a>)'."\n";
+                                echo 'Owner: '.$this->Link($owner, '', '', 0).' <a href="'.$this->Href('acls').'">[Edit ACLs]</a>'."\n";
                         } 
                         else
                                 {
-                                echo 'You own this page (<a href="'.$this->Href('acls').'">Edit ACLs</a>)'."\n";
+                                echo 'You own this page <a href="'.$this->Href('acls').'">[Edit ACLs]</a>'."\n";
                         }
                 }
@@ -27 +27 @@
         else
         {
-                echo 'Nobody'.($this->GetUser()? ' (<a href="'.$this->Href('claim').'">Take Ownership</a>)'."\n" : "\n");
+                echo 'Nobody'.($this->GetUser()? ' <a href="'.$this->Href('claim').'">[Take Ownership]</a>'."\n" : "\n");
         }
 }

branches/1.2/config/options_menu.admin.inc

@@ -1 +1 @@
 {{editlink}}
+{{clonelink}}
+{{revertlink}}
 {{historylink}}
 {{revisionlink}}

branches/1.2/config/options_menu.user.inc

@@ -1 +1 @@
 {{editlink}}
+{{clonelink}}
 {{historylink}}
 {{revisionlink}}