Merge branch 'uiredesign' of ../evan into uiredesign

[quix0rs-gnu-social.git] / lib / action.php

diff --git a/lib/action.php b/lib/action.php
index d5060758e0b9dbe2a85081b36f2c510b949f7793..33b138905474c68590736dad67400b3383f059ff 100644 (file)
--- a/lib/action.php
+++ b/lib/action.php
@@ -314,7 +314,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'content'));
         $this->showPageTitle();
-        $this->showPageNotice();
+        $this->showPageNoticeBlock();
         $this->elementStart('div', array('id' => 'content_inner'));
         // show the actual content (forms, lists, whatever)
         $this->showContent();
@@ -326,19 +326,23 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('h1', NULL, $this->title());
     }
 
+    function showPageNoticeBlock()
+    {
+       $this->elementStart('dl', array('id' => 'page_notice',
+                                       'class' => 'system_notice'));
+       $this->element('dt', null, _('Page notice'));
+       $this->elementStart('dd', null);
+       $this->showPageNotice();
+       $this->elementEnd('dd');
+       $this->elementEnd('dl');
+       }
+
     // SHOULD overload (unless there's not a notice)
 
     function showPageNotice()
     {
-        $this->elementStart('dl', array('id' => 'page_notice',
-                                        'class' => 'system_notice'));
-        $this->element('dt', null, _('Page notice'));
-        $this->elementStart('dd', null);
-        // Output a bunch of paragraphs here
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
     }
-
+    
     // MUST overload
 
     function showContent()
@@ -524,14 +528,14 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
-    function server_error($msg, $code=500)
+    function serverError($msg, $code=500)
     {
         $action = $this->trimmed('action');
         common_debug("Server error '$code' on '$action': $msg", __FILE__);
         common_server_error($msg, $code);
     }
 
-    function client_error($msg, $code=400)
+    function clientError($msg, $code=400)
     {
         $action = $this->trimmed('action');
         common_debug("User error '$code' on '$action': $msg", __FILE__);