From 2ff7bcfc5d05fc0bd01201af33f80dae2f9cd688 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 10:56:50 -0500
Subject: [PATCH 001/256] Move low-level xml outputting code to a class

Made a class for outputting XML code
---
 lib/xmloutputter.php | 223 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 223 insertions(+)
 create mode 100644 lib/xmloutputter.php

diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
new file mode 100644
index 0000000000..9a7d12e4c9
--- /dev/null
+++ b/lib/xmloutputter.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Low-level generator for XML
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Output
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Low-level generator for XML
+ *
+ * This is a thin wrapper around PHP's XMLWriter. The main
+ * advantage is the element() method, which simplifies outputting
+ * an element.
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      Action
+ * @see      HTMLOutputter
+ */
+
+class XMLOutputter
+{
+    /**
+     * Wrapped XMLWriter object, which does most of the heavy lifting
+     * for output.
+     */
+
+    var $xw = null;
+
+    /**
+     * Constructor
+     *
+     * Initializes the wrapped XMLWriter.
+     *
+     * @param $output URL for outputting, defaults to stdout
+     * @param $indent Whether to indent output, default true
+     */
+
+    function __construct($output='php://output', $indent=true)
+    {
+        $this->xw = new XMLWriter();
+        $this->xw->openURI($output);
+        $this->xw->setIndent($indent);
+        $this->xw->startDocument('1.0', 'UTF-8');
+    }
+
+    /**
+     * Start a new XML document
+     *
+     * @param string $doc    document element
+     * @param string $public public identifier
+     * @param string $system system identifier
+     *
+     * @return void
+     */
+
+    function startXML($doc=null, $public=null, $system=null)
+    {
+        if ($doc) {
+            $this->xw->writeDTD($doc, $public, $system);
+        }
+    }
+
+    /**
+     * finish an XML document
+     *
+     * It's probably a bad idea to continue to use this object
+     * after calling endXML().
+     *
+     * @return void
+     */
+
+    function endXML()
+    {
+        $this->xw->endDocument();
+        $this->xw->flush();
+    }
+
+    /**
+     * output an XML element
+     *
+     * Utility for outputting an XML element. A convenient wrapper
+     * for a bunch of longer XMLWriter calls. This is best for
+     * when an element doesn't have any sub-elements; if that's the
+     * case, use elementStart() and elementEnd() instead.
+     *
+     * The $content element will be escaped for XML. If you need
+     * raw output, use elementStart() and elementEnd() with a call
+     * to raw() in the middle.
+     *
+     * @param string $tag     Element type or tagname
+     * @param array  $attrs   Array of element attributes, as
+     *                        key-value pairs
+     * @param string $content string content of the element
+     *
+     * @return void
+     */
+
+    function element($tag, $attrs=null, $content=null)
+    {
+        $this->elementStart($tag, $attrs);
+        if (!is_null($content)) {
+            $this->xw->text($content);
+        }
+        $this->elementEnd($tag);
+    }
+
+    /**
+     * output a start tag for an element
+     *
+     * Mostly used for when an element has content that's
+     * not a simple string.
+     *
+     * @param string $tag   Element type or tagname
+     * @param array  $attrs Array of element attributes
+     *
+     * @return void
+     */
+
+    function elementStart($tag, $attrs=null)
+    {
+        $this->xw->startElement($tag);
+        if (is_array($attrs)) {
+            foreach ($attrs as $name => $value) {
+                $this->xw->writeAttribute($name, $value);
+            }
+        } else if (is_string($attrs)) {
+            $this->xw->writeAttribute('class', $attrs);
+        }
+    }
+
+    /**
+     * output an end tag for an element
+     *
+     * Used in conjunction with elementStart(). $tag param
+     * should match the elementStart() param.
+     *
+     * For HTML 4 compatibility, this method will force
+     * a full end element (</tag>) even if the element is
+     * empty, except for a handful of exception tagnames.
+     * This is a hack.
+     *
+     * @param string $tag Element type or tagname.
+     *
+     * @return void
+     */
+
+    function elementEnd($tag)
+    {
+        static $empty_tag = array('base', 'meta', 'link', 'hr',
+                                  'br', 'param', 'img', 'area',
+                                  'input', 'col');
+        // XXX: check namespace
+        if (in_array($tag, $empty_tag)) {
+            $this->xw->endElement();
+        } else {
+            $this->xw->fullEndElement();
+        }
+    }
+
+    /**
+     * output plain text
+     *
+     * Text will be escaped. If you need it not to be,
+     * use raw() instead.
+     *
+     * @param string $txt Text to output.
+     *
+     * @return void
+     */
+
+    function text($txt)
+    {
+        $this->xw->text($txt);
+    }
+
+    /**
+     * output raw xml
+     *
+     * This will spit out its argument verbatim -- no escaping is
+     * done.
+     *
+     * @param string $xml XML to output.
+     *
+     * @return void
+     */
+
+    function raw($xml)
+    {
+        $this->xw->writeRaw($xml);
+    }
+}

From 81745625aa820b8a826412a3cc6ec11dff027c6d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 11:02:34 -0500
Subject: [PATCH 002/256] Remove XML-generating function from lib/util.php

---
 lib/util.php | 71 ----------------------------------------------------
 1 file changed, 71 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index fbe04c6c4a..dc26a705b2 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -79,65 +79,6 @@ function common_user_error($msg, $code=400)
     common_show_footer();
 }
 
-$xw = null;
-
-// Start an HTML element
-function common_element_start($tag, $attrs=null)
-{
-    global $xw;
-    $xw->startElement($tag);
-    if (is_array($attrs)) {
-        foreach ($attrs as $name => $value) {
-            $xw->writeAttribute($name, $value);
-        }
-    } else if (is_string($attrs)) {
-        $xw->writeAttribute('class', $attrs);
-    }
-}
-
-function common_element_end($tag)
-{
-    static $empty_tag = array('base', 'meta', 'link', 'hr',
-                              'br', 'param', 'img', 'area',
-                              'input', 'col');
-    global $xw;
-    // XXX: check namespace
-    if (in_array($tag, $empty_tag)) {
-        $xw->endElement();
-    } else {
-        $xw->fullEndElement();
-    }
-}
-
-function common_element($tag, $attrs=null, $content=null)
-{
-    common_element_start($tag, $attrs);
-    global $xw;
-    if (!is_null($content)) {
-        $xw->text($content);
-    }
-    common_element_end($tag);
-}
-
-function common_start_xml($doc=null, $public=null, $system=null, $indent=true)
-{
-    global $xw;
-    $xw = new XMLWriter();
-    $xw->openURI('php://output');
-    $xw->setIndent($indent);
-    $xw->startDocument('1.0', 'UTF-8');
-    if ($doc) {
-        $xw->writeDTD($doc, $public, $system);
-    }
-}
-
-function common_end_xml()
-{
-    global $xw;
-    $xw->endDocument();
-    $xw->flush();
-}
-
 function common_init_locale($language=null)
 {
     if(!$language) {
@@ -319,18 +260,6 @@ function common_show_footer()
     common_end_xml();
 }
 
-function common_text($txt)
-{
-    global $xw;
-    $xw->text($txt);
-}
-
-function common_raw($xml)
-{
-    global $xw;
-    $xw->writeRaw($xml);
-}
-
 function common_nav_menu()
 {
     $user = common_current_user();

From bbb32dd2f6567bbbfc16db542f631dcc688020fe Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 11:44:09 -0500
Subject: [PATCH 003/256] Extract HTML outputting code to a class HTMLOutputter

Moved the common_* methods for low-level HTML output to its own
class, HTMLOutputter in lib/htmloutputter.php.
---
 lib/htmloutputter.php | 353 ++++++++++++++++++++++++++++++++++++++++++
 lib/util.php          | 151 +-----------------
 2 files changed, 354 insertions(+), 150 deletions(-)
 create mode 100644 lib/htmloutputter.php

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
new file mode 100644
index 0000000000..b3b2a5ae42
--- /dev/null
+++ b/lib/htmloutputter.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Low-level generator for HTML
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Output
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/xmloutputter.php';
+
+define('PAGE_TYPE_PREFS',
+       'text/html,application/xhtml+xml,'.
+       'application/xml;q=0.3,text/xml;q=0.2');
+
+/**
+ * Low-level generator for HTML
+ *
+ * Abstracts some of the code necessary for HTML generation. Especially
+ * has methods for generating HTML form elements. Note that these have
+ * been created kind of haphazardly, not with an eye to making a general
+ * HTML-creation class.
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      Action
+ * @see      HTMLOutputter
+ */
+
+class HTMLOutputter extends XMLOutputter
+{
+    /**
+     * Constructor
+     *
+     * Just wraps the XMLOutputter constructor.
+     *
+     * @param string  $output URI to output to, default = stdout
+     * @param boolean $indent Whether to indent output, default true
+     */
+
+    function __construct($output='php://output', $indent=true)
+    {
+        parent::__construct($output, $indent);
+    }
+
+    /**
+     * Start an HTML document
+     *
+     * If $type isn't specified, will attempt to do content negotiation.
+     *
+     * Attempts to do content negotiation for language, also.
+     *
+     * @param string $type MIME type to use; default is to do negotation.
+     *
+     * @todo extract content negotiation code to an HTTP module or class.
+     *
+     * @return void
+     */
+
+    function startHTML($type=null)
+    {
+        if (!$type) {
+            $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ?
+              $_SERVER['HTTP_ACCEPT'] : null;
+
+            // XXX: allow content negotiation for RDF, RSS, or XRDS
+
+            $cp = common_accept_to_prefs($httpaccept);
+            $sp = common_accept_to_prefs(PAGE_TYPE_PREFS);
+
+            $type = common_negotiate_type($cp, $sp);
+
+            if (!$type) {
+                common_user_error(_('This page is not available in a '.
+                                    'media type you accept'), 406);
+                exit(0);
+            }
+        }
+
+        header('Content-Type: '.$type);
+
+        $this->startXML('html',
+                        '-//W3C//DTD XHTML 1.0 Strict//EN',
+                        'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
+
+        // FIXME: correct language for interface
+
+        $language = common_language();
+
+        $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
+                                          'xml:lang' => $language,
+                                          'lang' => $language));
+    }
+
+    /**
+     * Output an HTML text input element
+     *
+     * Despite the name, it is specifically for outputting a
+     * text input element, not other <input> elements. It outputs
+     * a cluster of elements, including a <label> and an associated
+     * instructions span.
+     *
+     * @param string $id           element ID, must be unique on page
+     * @param string $label        text of label for the element
+     * @param string $value        value of the element, default null
+     * @param string $instructions instructions for valid input
+     *
+     * @todo add a $name parameter
+     * @todo add a $maxLength parameter
+     * @todo add a $size parameter
+     *
+     * @return void
+     */
+
+    function input($id, $label, $value=null, $instructions=null)
+    {
+        $this->elementStart('p');
+        $this->element('label', array('for' => $id), $label);
+        $attrs = array('name' => $id,
+                       'type' => 'text',
+                       'class' => 'input_text',
+                       'id' => $id);
+        if ($value) {
+            $attrs['value'] = htmlspecialchars($value);
+        }
+        $this->element('input', $attrs);
+        if ($instructions) {
+            $this->element('span', 'input_instructions', $instructions);
+        }
+        $this->elementEnd('p');
+    }
+
+    /**
+     * output an HTML checkbox and associated elements
+     *
+     * Note that the value is default 'true' (the string), which can
+     * be used by Action::boolean()
+     *
+     * @param string $id           element ID, must be unique on page
+     * @param string $label        text of label for the element
+     * @param string $checked      if the box is checked, default false
+     * @param string $instructions instructions for valid input
+     * @param string $value        value of the checkbox, default 'true'
+     * @param string $disabled     show the checkbox disabled, default false
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     */
+
+    function checkbox($id, $label, $checked=false, $instructions=null,
+                      $value='true', $disabled=false)
+    {
+        $this->elementStart('p');
+        $attrs = array('name' => $id,
+                       'type' => 'checkbox',
+                       'class' => 'checkbox',
+                       'id' => $id);
+        if ($value) {
+            $attrs['value'] = htmlspecialchars($value);
+        }
+        if ($checked) {
+            $attrs['checked'] = 'checked';
+        }
+        if ($disabled) {
+            $attrs['disabled'] = 'true';
+        }
+        $this->element('input', $attrs);
+        $this->text(' ');
+        $this->element('label', array('class' => 'checkbox_label',
+                                      'for' => $id),
+                       $label);
+        $this->text(' ');
+        if ($instructions) {
+            $this->element('span', 'input_instructions', $instructions);
+        }
+        $this->elementEnd('p');
+    }
+
+    /**
+     * output an HTML combobox/select and associated elements
+     *
+     * $content is an array of key-value pairs for the dropdown, where
+     * the key is the option value attribute and the value is the option
+     * text. (Careful on the overuse of 'value' here.)
+     *
+     * @param string $id           element ID, must be unique on page
+     * @param string $label        text of label for the element
+     * @param array  $content      options array, value => text
+     * @param string $instructions instructions for valid input
+     * @param string $blank_select whether to have a blank entry, default false
+     * @param string $selected     selected value, default null
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     */
+
+    function dropdown($id, $label, $content, $instructions=null,
+                      $blank_select=false, $selected=null)
+    {
+        $this->elementStart('p');
+        $this->element('label', array('for' => $id), $label);
+        $this->elementStart('select', array('id' => $id, 'name' => $id));
+        if ($blank_select) {
+            $this->element('option', array('value' => ''));
+        }
+        foreach ($content as $value => $option) {
+            if ($value == $selected) {
+                $this->element('option', array('value' => $value,
+                                               'selected' => $value),
+                               $option);
+            } else {
+                $this->element('option', array('value' => $value), $option);
+            }
+        }
+        $this->elementEnd('select');
+        if ($instructions) {
+            $this->element('span', 'input_instructions', $instructions);
+        }
+        $this->elementEnd('p');
+    }
+
+    /**
+     * output an HTML hidden element
+     *
+     * $id is re-used as name
+     *
+     * @param string $id    element ID, must be unique on page
+     * @param string $value hidden element value, default null
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     */
+
+    function hidden($id, $value)
+    {
+        $this->element('input', array('name' => $id,
+                                      'type' => 'hidden',
+                                      'id' => $id,
+                                      'value' => $value));
+    }
+
+    /**
+     * output an HTML password input and associated elements
+     *
+     * @param string $id           element ID, must be unique on page
+     * @param string $label        text of label for the element
+     * @param string $instructions instructions for valid input
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     */
+
+    function password($id, $label, $instructions=null)
+    {
+        $this->elementStart('p');
+        $this->element('label', array('for' => $id), $label);
+        $attrs = array('name' => $id,
+                       'type' => 'password',
+                       'class' => 'password',
+                       'id' => $id);
+        $this->element('input', $attrs);
+        if ($instructions) {
+            $this->element('span', 'input_instructions', $instructions);
+        }
+        $this->elementEnd('p');
+    }
+
+    /**
+     * output an HTML submit input and associated elements
+     *
+     * @param string $id    element ID, must be unique on page
+     * @param string $label text of the button
+     * @param string $cls   class of the button, default 'submit'
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     */
+
+    function submit($id, $label, $cls='submit')
+    {
+        $this->elementStart('p');
+        $this->element('input', array('type' => 'submit',
+                                      'id' => $id,
+                                      'name' => $id,
+                                      'class' => $cls,
+                                      'value' => $label));
+        $this->elementEnd('p');
+    }
+
+    /**
+     * output an HTML textarea and associated elements
+     *
+     * @param string $id           element ID, must be unique on page
+     * @param string $label        text of label for the element
+     * @param string $content      content of the textarea, default none
+     * @param string $instructions instructions for valid input
+     *
+     * @return void
+     *
+     * @todo add a $name parameter
+     * @todo add a $cols parameter
+     * @todo add a $rows parameter
+     */
+
+    function textarea($id, $label, $content=null, $instructions=null)
+    {
+        $this->elementStart('p');
+        $this->element('label', array('for' => $id), $label);
+        $this->element('textarea', array('rows' => 3,
+                                         'cols' => 40,
+                                         'name' => $id,
+                                         'id' => $id),
+                       ($content) ? $content : '');
+        if ($instructions) {
+            $this->element('span', 'input_instructions', $instructions);
+        }
+        $this->elementEnd('p');
+    }
+}
diff --git a/lib/util.php b/lib/util.php
index dc26a705b2..9142576081 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -17,7 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* XXX: break up into separate modules (HTTP, HTML, user, files) */
+/* XXX: break up into separate modules (HTTP, user, files) */
 
 // Show a server error
 
@@ -108,8 +108,6 @@ function common_init_language()
     }
 }
 
-define('PAGE_TYPE_PREFS', 'text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2');
-
 function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
 {
 
@@ -194,38 +192,6 @@ function common_show_header($pagetitle, $callable=null, $data=null, $headercall=
     common_element_start('div', array('id' => 'content'));
 }
 
-function common_start_html($type=null, $indent=true)
-{
-
-    if (!$type) {
-        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
-
-        // XXX: allow content negotiation for RDF, RSS, or XRDS
-
-        $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
-                                      common_accept_to_prefs(PAGE_TYPE_PREFS));
-
-        if (!$type) {
-            common_user_error(_('This page is not available in a media type you accept'), 406);
-            exit(0);
-        }
-    }
-
-    header('Content-Type: '.$type);
-
-    common_start_xml('html',
-                     '-//W3C//DTD XHTML 1.0 Strict//EN',
-                     'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd', $indent);
-
-    // FIXME: correct language for interface
-
-    $language = common_language();
-
-    common_element_start('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
-                                       'xml:lang' => $language,
-                                       'lang' => $language));
-}
-
 function common_show_footer()
 {
     global $xw, $config;
@@ -321,121 +287,6 @@ function common_menu_item($url, $text, $title=null, $is_selected=false)
     common_element_end('li');
 }
 
-function common_input($id, $label, $value=null,$instructions=null)
-{
-    common_element_start('p');
-    common_element('label', array('for' => $id), $label);
-    $attrs = array('name' => $id,
-                   'type' => 'text',
-                   'class' => 'input_text',
-                   'id' => $id);
-    if ($value) {
-        $attrs['value'] = htmlspecialchars($value);
-    }
-    common_element('input', $attrs);
-    if ($instructions) {
-        common_element('span', 'input_instructions', $instructions);
-    }
-    common_element_end('p');
-}
-
-function common_checkbox($id, $label, $checked=false, $instructions=null, $value='true', $disabled=false)
-{
-    common_element_start('p');
-    $attrs = array('name' => $id,
-                   'type' => 'checkbox',
-                   'class' => 'checkbox',
-                   'id' => $id);
-    if ($value) {
-        $attrs['value'] = htmlspecialchars($value);
-    }
-    if ($checked) {
-        $attrs['checked'] = 'checked';
-    }
-    if ($disabled) {
-        $attrs['disabled'] = 'true';
-    }
-    common_element('input', $attrs);
-    common_text(' ');
-    common_element('label', array('class' => 'checkbox_label', 'for' => $id), $label);
-    common_text(' ');
-    if ($instructions) {
-        common_element('span', 'input_instructions', $instructions);
-    }
-    common_element_end('p');
-}
-
-function common_dropdown($id, $label, $content, $instructions=null, $blank_select=false, $selected=null)
-{
-    common_element_start('p');
-    common_element('label', array('for' => $id), $label);
-    common_element_start('select', array('id' => $id, 'name' => $id));
-    if ($blank_select) {
-        common_element('option', array('value' => ''));
-    }
-    foreach ($content as $value => $option) {
-        if ($value == $selected) {
-            common_element('option', array('value' => $value, 'selected' => $value), $option);
-        } else {
-            common_element('option', array('value' => $value), $option);
-        }
-    }
-    common_element_end('select');
-    if ($instructions) {
-        common_element('span', 'input_instructions', $instructions);
-    }
-    common_element_end('p');
-}
-function common_hidden($id, $value)
-{
-    common_element('input', array('name' => $id,
-                                  'type' => 'hidden',
-                                  'id' => $id,
-                                  'value' => $value));
-}
-
-function common_password($id, $label, $instructions=null)
-{
-    common_element_start('p');
-    common_element('label', array('for' => $id), $label);
-    $attrs = array('name' => $id,
-                   'type' => 'password',
-                   'class' => 'password',
-                   'id' => $id);
-    common_element('input', $attrs);
-    if ($instructions) {
-        common_element('span', 'input_instructions', $instructions);
-    }
-    common_element_end('p');
-}
-
-function common_submit($id, $label, $cls='submit')
-{
-    global $xw;
-    common_element_start('p');
-    common_element('input', array('type' => 'submit',
-                                  'id' => $id,
-                                  'name' => $id,
-                                  'class' => $cls,
-                                  'value' => $label));
-    common_element_end('p');
-}
-
-function common_textarea($id, $label, $content=null, $instructions=null)
-{
-    common_element_start('p');
-    common_element('label', array('for' => $id), $label);
-    common_element('textarea', array('rows' => 3,
-                                     'cols' => 40,
-                                     'name' => $id,
-                                     'id' => $id),
-                   ($content) ? $content : '');
-    if ($instructions) {
-        common_element('span', 'input_instructions', $instructions);
-    }
-    common_element_end('p');
-}
-
 function common_timezone()
 {
     if (common_logged_in()) {

From 10fcbe9da3456d7f7c07bd1192051602bd8b0762 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 11:47:01 -0500
Subject: [PATCH 004/256] Make XMLOutputter work with phpcs

A couple of small changes to comply with code standards.

Also, note that the second param of element() and elementStart() can
be a string.
---
 lib/xmloutputter.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 9a7d12e4c9..5bbd35627e 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -63,8 +63,8 @@ class XMLOutputter
      *
      * Initializes the wrapped XMLWriter.
      *
-     * @param $output URL for outputting, defaults to stdout
-     * @param $indent Whether to indent output, default true
+     * @param string  $output URL for outputting, defaults to stdout
+     * @param boolean $indent Whether to indent output, default true
      */
 
     function __construct($output='php://output', $indent=true)
@@ -119,6 +119,9 @@ class XMLOutputter
      * raw output, use elementStart() and elementEnd() with a call
      * to raw() in the middle.
      *
+     * If $attrs is a string instead of an array, it will be treated
+     * as the class attribute of the element.
+     *
      * @param string $tag     Element type or tagname
      * @param array  $attrs   Array of element attributes, as
      *                        key-value pairs
@@ -142,6 +145,9 @@ class XMLOutputter
      * Mostly used for when an element has content that's
      * not a simple string.
      *
+     * If $attrs is a string instead of an array, it will be treated
+     * as the class attribute of the element.
+     *
      * @param string $tag   Element type or tagname
      * @param array  $attrs Array of element attributes
      *

From 2e5b34269308e7f771f5c44b5fdc46ceb4df1a21 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 13:38:58 -0500
Subject: [PATCH 005/256] Change related classes doc for HTMLOutputter

---
 lib/htmloutputter.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index b3b2a5ae42..143612b8fd 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -52,8 +52,9 @@ define('PAGE_TYPE_PREFS',
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
+ *
  * @see      Action
- * @see      HTMLOutputter
+ * @see      XMLOutputter
  */
 
 class HTMLOutputter extends XMLOutputter

From 93e249de2a28775e3a40e63324371fec359fb93b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 13:41:39 -0500
Subject: [PATCH 006/256] Move page-generation code from lib/util.php to Action
 class

We moved the page generation code from lib/util.php to the action class.

We also broke up the page generation code into a big recipe, where
each element of the page has a corresponding method in the Action
class. Action classes can override parts of the recipe to make their
custom output, and leave the rest up to the parent class.

NOTE: this change BREAKS pretty much everything. lib/action.php probably
does not compile, and everything that uses it needs to be fixed to use
the new framework. Stay tuned for more fun!
---
 lib/action.php | 405 ++++++++++++++++++++++++++++++++++++++++++++++++-
 lib/util.php   | 179 ----------------------
 2 files changed, 400 insertions(+), 184 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 486b403878..59cc173e71 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -1,9 +1,12 @@
 <?php
 /**
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Base class for all actions (~views)
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,15 +18,41 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
 if (!defined('LACONICA')) {
     exit(1);
 }
 
-class Action // lawsuit
-{
+/**
+ * Base class for all actions
+ *
+ * This is the base class for all actions in the package. An action is
+ * more or less a "view" in an MVC framework.
+ *
+ * Actions are responsible for extracting and validating parameters; using
+ * model classes to read and write to the database; and doing ouput.
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
 
+class Action extends HTMLOutputter // lawsuit
+{
     var $args;
 
     function Action()
@@ -38,6 +67,296 @@ class Action // lawsuit
         return true;
     }
 
+    function showPage()
+    {
+        $this->startHTML();
+        $this->showHead();
+        $this->showBody();
+        $this->endHTML();
+    }
+
+    function showHead()
+    {
+        // XXX: attributes (profile?)
+        $this->startElement('head');
+        $this->showTitle();
+        $this->showStylesheets();
+        $this->showScripts();
+        $this->showOpenSearch();
+        $this->showFeeds();
+        $this->showDescription();
+        $this->extraHead();
+        $this->elementElement('head');
+    }
+
+    function showTitle()
+    {
+        $this->element('title', null,
+                       sprintf(_("%s - %s"),
+                               $this->title(),
+                               common_config('site', 'name')));
+    }
+
+    // SHOULD overload
+
+    function title()
+    {
+        return _("Untitled page");
+    }
+
+    function showStylesheets()
+    {
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
+                                     'media' => 'screen, projection, tv'));
+        foreach (array(6,7) as $ver) {
+            if (file_exists(theme_file('ie'.$ver.'.css'))) {
+                // Yes, IE people should be put in jail.
+                $xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
+                                  'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+            }
+        }
+    }
+
+    function showScripts()
+    {
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/jquery.min.js')),
+                       ' ');
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/jquery.form.js')),
+                       ' ');
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/xbImportNode.js')),
+                       ' ');
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
+                       ' ');
+    }
+
+    function showOpenSearch()
+    {
+        common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+                                     'href' =>  common_local_url('opensearch', array('type' => 'people')),
+                                     'title' => common_config('site', 'name').' People Search'));
+
+        common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+                                     'href' =>  common_local_url('opensearch', array('type' => 'notice')),
+                                     'title' => common_config('site', 'name').' Notice Search'));
+    }
+
+    // MAY overload
+
+    function showFeeds()
+    {
+        // does nothing by default
+    }
+
+    // SHOULD overload
+
+    function showDescription()
+    {
+        // does nothing by default
+    }
+
+    // MAY overload
+
+    function extraHead()
+    {
+        // does nothing by default
+    }
+
+    function showBody()
+    {
+        // output body
+        // output wrap element
+        $this->showHeader();
+        $this->showCore();
+        $this->showFooter();
+    }
+
+    function showHeader()
+    {
+        // start header div stuff
+        $this->showLogo();
+        $this->showPrimaryNav();
+        $this->showSiteNotice();
+        $this->showNoticeForm();
+        // end header div stuff
+    }
+
+    function showLogo()
+    {
+        // show the logo here
+    }
+
+    function showPrimaryNav()
+    {
+        $user = common_current_user();
+        common_element_start('ul', array('id' => 'nav'));
+        if ($user) {
+            common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+                             _('Home'));
+        }
+        common_menu_item(common_local_url('peoplesearch'), _('Search'));
+        if ($user) {
+            common_menu_item(common_local_url('profilesettings'),
+                             _('Settings'));
+            common_menu_item(common_local_url('invite'),
+                             _('Invite'));
+            common_menu_item(common_local_url('logout'),
+                             _('Logout'));
+        } else {
+            common_menu_item(common_local_url('login'), _('Login'));
+            if (!common_config('site', 'closed')) {
+                common_menu_item(common_local_url('register'), _('Register'));
+            }
+            common_menu_item(common_local_url('openidlogin'), _('OpenID'));
+        }
+        common_menu_item(common_local_url('doc', array('title' => 'help')),
+                         _('Help'));
+        common_element_end('ul');
+    }
+
+    function showSiteNotice()
+    {
+        // show the site notice here
+    }
+
+    // MAY overload if no notice form needed... or direct message box????
+
+    function showNoticeForm()
+    {
+        // show the notice form here
+    }
+
+    function showCore()
+    {
+        // start core div
+        $this->showLocalNav();
+        $this->showContentBlock();
+        $this->showAside();
+        // end core div
+    }
+
+    // SHOULD overload
+
+    function showLocalNav()
+    {
+    }
+
+    function showContentBlock()
+    {
+        $this->showPageTitle();
+        $this->showPageNotice();
+        $this->showContent();
+    }
+
+    function showPageTitle() {
+        $this->element('h1', NULL, $this->title());
+    }
+
+    // SHOULD overload (unless there's not a notice)
+
+    function showPageNotice()
+    {
+        // output page notice div
+    }
+
+    // MUST overload
+
+    function showContent()
+    {
+        // show the actual content (forms, lists, whatever)
+    }
+
+    function showAside()
+    {
+        $this->showExportData();
+        $this->showSections();
+    }
+
+    // MAY overload if there are feeds
+
+    function showExportData()
+    {
+        // is there structure to this?
+        // list of (visible!) feed links
+        // can we reuse list of feeds from showFeeds() ?
+    }
+
+    // SHOULD overload
+
+    function showSections() {
+        // for each section, show it
+    }
+
+    function showFooter()
+    {
+        // start footer div
+        $this->showSecondaryNav();
+        $this->showLicenses();
+    }
+
+    function showSecondaryNav()
+    {
+        common_element_start('ul', array('id' => 'nav_sub'));
+        common_menu_item(common_local_url('doc', array('title' => 'help')),
+                         _('Help'));
+        common_menu_item(common_local_url('doc', array('title' => 'about')),
+                         _('About'));
+        common_menu_item(common_local_url('doc', array('title' => 'faq')),
+                         _('FAQ'));
+        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
+                         _('Privacy'));
+        common_menu_item(common_local_url('doc', array('title' => 'source')),
+                         _('Source'));
+        common_menu_item(common_local_url('doc', array('title' => 'contact')),
+                         _('Contact'));
+        common_element_end('ul');
+    }
+
+    function showLicenses()
+    {
+        // start license dl
+        $this->showLaconicaLicense();
+        $this->showContentLicense();
+        // end license dl
+    }
+
+    function showLaconicaLicense()
+    {
+        common_element_start('div', 'laconica');
+        if (common_config('site', 'broughtby')) {
+            $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
+        } else {
+            $instr = _('**%%site.name%%** is a microblogging service. ');
+        }
+        $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
+        $output = common_markup_to_html($instr);
+        common_raw($output);
+        common_element_end('div');
+        // do it
+    }
+
+    function showContentLicense()
+    {
+        common_element_start('div', array('id' => 'footer'));
+        common_element('img', array('id' => 'cc',
+                                    'src' => $config['license']['image'],
+                                    'alt' => $config['license']['title']));
+        common_element_start('p');
+        common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+        common_element('a', array('class' => 'license',
+                                  'rel' => 'license',
+                                  'href' => $config['license']['url']),
+                       $config['license']['title']);
+        common_text(_('. Contributors should be attributed by full name or nickname.'));
+        common_element_end('p');
+        common_element_end('div');
+    }
+
     // For comparison with If-Last-Modified
     // If not applicable, return null
 
@@ -158,4 +477,80 @@ class Action // lawsuit
         }
         common_element_end('ul');
     }
+
+    function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
+    {
+        global $config, $xw;
+        global $action; /* XXX: kind of cheating here. */
+
+        common_start_html();
+
+        common_element_start('head');
+
+        if ($callable) {
+            if ($data) {
+                call_user_func($callable, $data);
+            } else {
+                call_user_func($callable);
+            }
+        }
+        common_element_end('head');
+        common_element_start('body', $action);
+        common_element_start('div', array('id' => 'wrap'));
+        common_element_start('div', array('id' => 'header'));
+        common_nav_menu();
+        if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+            || file_exists(theme_file('logo.png')))
+        {
+            common_element_start('a', array('href' => common_local_url('public')));
+            common_element('img', array('src' => isset($config['site']['logo']) ?
+                                        ($config['site']['logo']) : theme_path('logo.png'),
+                                        'alt' => $config['site']['name'],
+                                        'id' => 'logo'));
+            common_element_end('a');
+        } else {
+            common_element_start('p', array('id' => 'branding'));
+            common_element('a', array('href' => common_local_url('public')),
+                           $config['site']['name']);
+            common_element_end('p');
+        }
+
+        common_element('h1', 'pagetitle', $pagetitle);
+
+        if ($headercall) {
+            if ($data) {
+                call_user_func($headercall, $data);
+            } else {
+                call_user_func($headercall);
+            }
+        }
+        common_element_end('div');
+        common_element_start('div', array('id' => 'content'));
+    }
+
+    function common_show_footer()
+    {
+        global $xw, $config;
+        common_element_end('div'); // content div
+        common_foot_menu();
+        common_element_end('div');
+        common_element_end('body');
+        common_element_end('html');
+        common_end_xml();
+    }
+
+    function common_menu_item($url, $text, $title=null, $is_selected=false)
+    {
+        $lattrs = array();
+        if ($is_selected) {
+            $lattrs['class'] = 'current';
+        }
+        common_element_start('li', $lattrs);
+        $attrs['href'] = $url;
+        if ($title) {
+            $attrs['title'] = $title;
+        }
+        common_element('a', $attrs, $text);
+        common_element_end('li');
+    }
 }
diff --git a/lib/util.php b/lib/util.php
index 9142576081..009a0457ce 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -108,185 +108,6 @@ function common_init_language()
     }
 }
 
-function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
-{
-
-    global $config, $xw;
-    global $action; /* XXX: kind of cheating here. */
-
-    common_start_html();
-
-    common_element_start('head');
-    common_element('title', null,
-                   $pagetitle . " - " . $config['site']['name']);
-    common_element('link', array('rel' => 'stylesheet',
-                                 'type' => 'text/css',
-                                 'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
-                                 'media' => 'screen, projection, tv'));
-    foreach (array(6,7) as $ver) {
-        if (file_exists(theme_file('ie'.$ver.'.css'))) {
-            // Yes, IE people should be put in jail.
-            $xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                              'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
-        }
-    }
-
-    common_element('script', array('type' => 'text/javascript',
-                                   'src' => common_path('js/jquery.min.js')),
-                   ' ');
-    common_element('script', array('type' => 'text/javascript',
-                                   'src' => common_path('js/jquery.form.js')),
-                   ' ');
-    common_element('script', array('type' => 'text/javascript',
-                                   'src' => common_path('js/xbImportNode.js')),
-                   ' ');
-    common_element('script', array('type' => 'text/javascript',
-                                   'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
-                   ' ');
-    common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
-                                 'href' =>  common_local_url('opensearch', array('type' => 'people')),
-                                 'title' => common_config('site', 'name').' People Search'));
-
-    common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
-                                 'href' =>  common_local_url('opensearch', array('type' => 'notice')),
-                                 'title' => common_config('site', 'name').' Notice Search'));
-
-    if ($callable) {
-        if ($data) {
-            call_user_func($callable, $data);
-        } else {
-            call_user_func($callable);
-        }
-    }
-    common_element_end('head');
-    common_element_start('body', $action);
-    common_element_start('div', array('id' => 'wrap'));
-    common_element_start('div', array('id' => 'header'));
-    common_nav_menu();
-    if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
-        || file_exists(theme_file('logo.png')))
-    {
-        common_element_start('a', array('href' => common_local_url('public')));
-        common_element('img', array('src' => isset($config['site']['logo']) ?
-                                    ($config['site']['logo']) : theme_path('logo.png'),
-                                    'alt' => $config['site']['name'],
-                                    'id' => 'logo'));
-        common_element_end('a');
-    } else {
-        common_element_start('p', array('id' => 'branding'));
-        common_element('a', array('href' => common_local_url('public')),
-                       $config['site']['name']);
-        common_element_end('p');
-    }
-
-    common_element('h1', 'pagetitle', $pagetitle);
-
-    if ($headercall) {
-        if ($data) {
-            call_user_func($headercall, $data);
-        } else {
-            call_user_func($headercall);
-        }
-    }
-    common_element_end('div');
-    common_element_start('div', array('id' => 'content'));
-}
-
-function common_show_footer()
-{
-    global $xw, $config;
-    common_element_end('div'); // content div
-    common_foot_menu();
-    common_element_start('div', array('id' => 'footer'));
-    common_element_start('div', 'laconica');
-    if (common_config('site', 'broughtby')) {
-        $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
-    } else {
-        $instr = _('**%%site.name%%** is a microblogging service. ');
-    }
-    $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
-    $output = common_markup_to_html($instr);
-    common_raw($output);
-    common_element_end('div');
-    common_element('img', array('id' => 'cc',
-                                'src' => $config['license']['image'],
-                                'alt' => $config['license']['title']));
-    common_element_start('p');
-    common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
-    common_element('a', array('class' => 'license',
-                              'rel' => 'license',
-                              'href' => $config['license']['url']),
-                   $config['license']['title']);
-    common_text(_('. Contributors should be attributed by full name or nickname.'));
-    common_element_end('p');
-    common_element_end('div');
-    common_element_end('div');
-    common_element_end('body');
-    common_element_end('html');
-    common_end_xml();
-}
-
-function common_nav_menu()
-{
-    $user = common_current_user();
-    common_element_start('ul', array('id' => 'nav'));
-    if ($user) {
-        common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
-                         _('Home'));
-    }
-    common_menu_item(common_local_url('peoplesearch'), _('Search'));
-    if ($user) {
-        common_menu_item(common_local_url('profilesettings'),
-                         _('Settings'));
-        common_menu_item(common_local_url('invite'),
-                         _('Invite'));
-        common_menu_item(common_local_url('logout'),
-                         _('Logout'));
-    } else {
-        common_menu_item(common_local_url('login'), _('Login'));
-        if (!common_config('site', 'closed')) {
-            common_menu_item(common_local_url('register'), _('Register'));
-        }
-        common_menu_item(common_local_url('openidlogin'), _('OpenID'));
-    }
-    common_menu_item(common_local_url('doc', array('title' => 'help')),
-                     _('Help'));
-    common_element_end('ul');
-}
-
-function common_foot_menu()
-{
-    common_element_start('ul', array('id' => 'nav_sub'));
-    common_menu_item(common_local_url('doc', array('title' => 'help')),
-                     _('Help'));
-    common_menu_item(common_local_url('doc', array('title' => 'about')),
-                     _('About'));
-    common_menu_item(common_local_url('doc', array('title' => 'faq')),
-                     _('FAQ'));
-    common_menu_item(common_local_url('doc', array('title' => 'privacy')),
-                     _('Privacy'));
-    common_menu_item(common_local_url('doc', array('title' => 'source')),
-                     _('Source'));
-    common_menu_item(common_local_url('doc', array('title' => 'contact')),
-                     _('Contact'));
-    common_element_end('ul');
-}
-
-function common_menu_item($url, $text, $title=null, $is_selected=false)
-{
-    $lattrs = array();
-    if ($is_selected) {
-        $lattrs['class'] = 'current';
-    }
-    common_element_start('li', $lattrs);
-    $attrs['href'] = $url;
-    if ($title) {
-        $attrs['title'] = $title;
-    }
-    common_element('a', $attrs, $text);
-    common_element_end('li');
-}
-
 function common_timezone()
 {
     if (common_logged_in()) {

From 0093b035c12bf21c88f57e4f0931b0abce214f43 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 23:48:05 -0500
Subject: [PATCH 007/256] Modify public stream to use new UI framework

I modified public.php to use the new UI framework. Since the Action
class isn't functional yet, I don't know if it works.

I took some of the functionality, like the public tabs nav and the
feeds list, and made them widgets.

I also moved the navigation from common_navigation() to a method of
Action.
---
 actions/public.php     | 199 ++++++++++++++++++++++++++++++-----------
 lib/action.php         |  34 +++++++
 lib/feedlist.php       | 156 ++++++++++++++++++++++++++++++++
 lib/personal.php       | 110 ++---------------------
 lib/publicgroupnav.php |  83 +++++++++++++++++
 lib/stream.php         |  26 ------
 lib/util.php           |  35 --------
 7 files changed, 424 insertions(+), 219 deletions(-)
 create mode 100644 lib/feedlist.php
 create mode 100644 lib/publicgroupnav.php

diff --git a/actions/public.php b/actions/public.php
index 039e885e6b..e00f8efbaf 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Action for displaying the public stream
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,81 +18,146 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
+/**
+ * Action for displaying the public stream
+ *
+ * @category Public
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      PublicrssAction
+ * @see      PublicxrdsAction
+ */
 
-class PublicAction extends StreamAction
+class PublicAction extends Action
 {
+    /**
+     * page of the stream we're on; default = 1
+     */
+
+    var $page = null;
+
+    /**
+     * Read and validate arguments
+     *
+     * @param array $args URL parameters
+     *
+     * @return boolean success value
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        return true;
+    }
+
+    /**
+     * handle request
+     *
+     * Show the public stream, using recipe method showPage()
+     *
+     * @param array $args arguments, mostly unused
+     *
+     * @return void
+     */
 
     function handle($args)
     {
         parent::handle($args);
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
         header('X-XRDS-Location: '. common_local_url('publicxrds'));
 
-        common_show_header(_('Public timeline'),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
-
-        # XXX: Public sidebar here?
-
-        $this->show_notices($page);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_top()
+    /**
+     * Title of the page
+     *
+     * @return page title, including page number if over 1
+     */
+
+    function title()
     {
-        if (common_logged_in()) {
-            common_notice_form('public');
+        if ($this->page > 1) {
+            return sprintf(_('Public timeline, page %d'), $this->page);
         } else {
-            $instr = $this->get_instructions();
-            $output = common_markup_to_html($instr);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+            return _('Public timeline');
         }
-
-        $this->public_views_menu();
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'publicrss'),
-                                     1=>array('href'=>common_local_url('publicatom'),
-                                              'type' => 'atom',
-                                              'version' => 'Atom 1.0',
-                                              'item' => 'publicatom')));
     }
 
-    function get_instructions()
-    {
-        return _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' .
-                 'based on the Free Software [Laconica](http://laconi.ca/) tool. ' .
-                 '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ([Read more](%%doc.help%%))');
-    }
+    /**
+     * Output <head> elements for RSS and Atom feeds
+     *
+     * @return void
+     */
 
-    function show_header()
+    function showFeeds()
     {
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('publicrss'),
                                      'type' => 'application/rss+xml',
                                      'title' => _('Public Stream Feed')));
-        # for client side of OpenID authentication
-        common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+    }
+
+    /**
+     * Extra head elements
+     *
+     * We include a <meta> element linking to the publicxrds page, for OpenID
+     * client-side authentication.
+     *
+     * @return void
+     */
+
+    function extraHead()
+    {
+        // for client side of OpenID authentication
+        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('publicxrds')));
     }
 
-    function show_notices($page)
-    {
+    /**
+     * Show tabset for this page
+     *
+     * Uses the PublicGroupNav widget
+     *
+     * @return void
+     * @see PublicGroupNav
+     */
 
-        $cnt = 0;
-        $notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
+    function showLocalNav()
+    {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
+    }
+
+    /**
+     * Fill the content area
+     *
+     * Shows a list of the notices in the public stream, with some pagination
+     * controls.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $notice = Notice::publicStream(($this->page-1)*NOTICES_PER_PAGE,
                                        NOTICES_PER_PAGE + 1);
 
         if (!$notice) {
@@ -97,9 +165,32 @@ class PublicAction extends StreamAction
             return;
         }
 
-        $cnt = $this->show_notice_list($notice);
+        $nl = new NoticeList($notice);
 
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'public');
+        $cnt = $nl->show();
+
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'public');
+    }
+
+    /**
+     * Makes a list of exported feeds for this page
+     *
+     * @return void
+     *
+     * @todo I18N
+     */
+
+    function showExportData()
+    {
+        $fl = new FeedList($this);
+        $fl->show(array(0 => array('href' => common_local_url('publicrss'),
+                                   'type' => 'rss',
+                                   'version' => 'RSS 1.0',
+                                   'item' => 'publicrss'),
+                        1 => array('href' => common_local_url('publicatom'),
+                                   'type' => 'atom',
+                                   'version' => 'Atom 1.0',
+                                   'item' => 'publicatom')));
     }
 }
diff --git a/lib/action.php b/lib/action.php
index 59cc173e71..95178c65ed 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -553,4 +553,38 @@ class Action extends HTMLOutputter // lawsuit
         common_element('a', $attrs, $text);
         common_element_end('li');
     }
+
+    // Does a little before-after block for next/prev page
+
+    function pagination($have_before, $have_after, $page, $action, $args=null)
+    {
+        if ($have_before || $have_after) {
+            $this->elementStart('div', array('id' => 'pagination'));
+            $this->elementStart('ul', array('id' => 'nav_pagination'));
+        }
+
+        if ($have_before) {
+            $pargs = array('page' => $page-1);
+            $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+
+            $this->elementStart('li', 'before');
+            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
+                           _('« After'));
+            $this->elementEnd('li');
+        }
+
+        if ($have_after) {
+            $pargs = array('page' => $page+1);
+            $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+            $this->elementStart('li', 'after');
+            $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
+                           _('Before »'));
+            $this->elementEnd('li');
+        }
+
+        if ($have_before || $have_after) {
+            $this->elementEnd('ul');
+            $this->elementEnd('div');
+        }
+    }
 }
diff --git a/lib/feedlist.php b/lib/feedlist.php
new file mode 100644
index 0000000000..0ff88cb25a
--- /dev/null
+++ b/lib/feedlist.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Widget for showing a list of feeds
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Widget for showing a list of feeds
+ *
+ * Typically used for Action::showExportList()
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Action::showExportList()
+ */
+
+class FeedList
+{
+    var $out = null;
+
+    function __construct($out=null)
+    {
+        $this->out = $out;
+    }
+
+    function show($feeds)
+    {
+        $this->out->elementStart('div', array('class' => 'feeds'));
+        $this->out->element('p', null, 'Feeds:');
+        $this->out->elementStart('ul', array('class' => 'xoxo'));
+
+        foreach ($feeds as $key => $value) {
+            $this->feedItem($feeds[$key]);
+        }
+
+        $this->out->elementEnd('ul');
+        $this->out->elementEnd('div');
+    }
+
+    function feedItem($feed)
+    {
+        $nickname = $this->trimmed('nickname');
+
+        switch($feed['item']) {
+         case 'notices': default:
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "$nickname's ".$feed['version']." notice feed";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'allrss':
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = $feed['version']." feed for $nickname and friends";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'repliesrss':
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = $feed['version']." feed for replies to $nickname";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'publicrss':
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "Public timeline ".$feed['version']." feed";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'publicatom':
+            $feed_classname = "atom";
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "Public timeline ".$feed['version']." feed";
+            $feed['textContent'] = "Atom";
+            break;
+
+         case 'tagrss':
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = $feed['version']." feed for this tag";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'favoritedrss':
+            $feed_classname = $feed['type'];
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "Favorited ".$feed['version']." feed";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'foaf':
+            $feed_classname = "foaf";
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "$nickname's FOAF file";
+            $feed['textContent'] = "FOAF";
+            break;
+
+         case 'favoritesrss':
+            $feed_classname = "favorites";
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "Feed for favorites of $nickname";
+            $feed['textContent'] = "RSS";
+            break;
+
+         case 'usertimeline':
+            $feed_classname = "atom";
+            $feed_mimetype = "application/".$feed['type']."+xml";
+            $feed_title = "$nickname's ".$feed['version']." notice feed";
+            $feed['textContent'] = "Atom";
+            break;
+        }
+        $this->out->elementStart('li');
+        $this->out->element('a', array('href' => $feed['href'],
+                                  'class' => $feed_classname,
+                                  'type' => $feed_mimetype,
+                                  'title' => $feed_title),
+                       $feed['textContent']);
+        $this->out->elementEnd('li');
+    }
+}
diff --git a/lib/personal.php b/lib/personal.php
index 02b01fece4..4e56c95664 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -21,12 +21,12 @@ if (!defined('LACONICA')) { exit(1); }
 
 class PersonalAction extends Action
 {
-    
+
     function is_readonly()
     {
         return true;
     }
-    
+
     function handle($args)
     {
         parent::handle($args);
@@ -69,11 +69,11 @@ class PersonalAction extends Action
                          _('Favorites'),
                          sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
                          $action == 'showfavorites');
-        
+
         $cur = common_current_user();
-        
+
         if ($cur && $cur->id == $user->id) {
-            
+
             common_menu_item(common_local_url('inbox', array('nickname' =>
                                                                      $nickname)),
                              _('Inbox'),
@@ -85,108 +85,10 @@ class PersonalAction extends Action
                              _('Your sent messages'),
                              $action == 'outbox');
         }
-        
+
         common_element_end('ul');
     }
 
-    function show_feeds_list($feeds)
-    {
-        common_element_start('div', array('class' => 'feeds'));
-        common_element('p', null, 'Feeds:');
-        common_element_start('ul', array('class' => 'xoxo'));
-
-        foreach ($feeds as $key => $value) {
-            $this->common_feed_item($feeds[$key]);
-        }
-        common_element_end('ul');
-        common_element_end('div');
-    }
-
-    function common_feed_item($feed)
-    {
-        $nickname = $this->trimmed('nickname');
-
-        switch($feed['item']) {
-            case 'notices': default:
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's ".$feed['version']." notice feed";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'allrss':
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = $feed['version']." feed for $nickname and friends";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'repliesrss':
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = $feed['version']." feed for replies to $nickname";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'publicrss':
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "Public timeline ".$feed['version']." feed";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'publicatom':
-                $feed_classname = "atom";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "Public timeline ".$feed['version']." feed";
-                $feed['textContent'] = "Atom";
-                break;
-
-            case 'tagrss':
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = $feed['version']." feed for this tag";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'favoritedrss':
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "Favorited ".$feed['version']." feed";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'foaf':
-                $feed_classname = "foaf";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's FOAF file";
-                $feed['textContent'] = "FOAF";
-                break;
-
-            case 'favoritesrss':
-                $feed_classname = "favorites";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "Feed for favorites of $nickname";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'usertimeline':
-                $feed_classname = "atom";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's ".$feed['version']." notice feed";
-                $feed['textContent'] = "Atom";
-                break;
-        }
-        common_element_start('li');
-        common_element('a', array('href' => $feed['href'],
-                                  'class' => $feed_classname,
-                                  'type' => $feed_mimetype,
-                                  'title' => $feed_title),
-                            $feed['textContent']);
-        common_element_end('li');
-    }
-
-    
     function source_link($source)
     {
         $source_name = _($source);
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
new file mode 100644
index 0000000000..d21d0a458f
--- /dev/null
+++ b/lib/publicgroupnav.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for all actions (~views)
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for all actions
+ *
+ * This is the base class for all actions in the package. An action is
+ * more or less a "view" in an MVC framework.
+ *
+ * Actions are responsible for extracting and validating parameters; using
+ * model classes to read and write to the database; and doing ouput.
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class PublicGroupNav
+{
+    var $action = null;
+
+    function __construct($action=null)
+    {
+        $this->action = $action;
+    }
+
+    function show()
+    {
+        $this->action->elementStart('ul', array('id' => 'nav_views'));
+
+        common_menu_item(common_local_url('public'), _('Public'),
+            _('Public timeline'), $this->action == 'public');
+
+        common_menu_item(common_local_url('tag'), _('Recent tags'),
+            _('Recent tags'), $this->action == 'tag');
+
+        if (count(common_config('nickname', 'featured')) > 0) {
+            common_menu_item(common_local_url('featured'), _('Featured'),
+                _('Featured users'), $this->action == 'featured');
+        }
+
+        common_menu_item(common_local_url('favorited'), _('Popular'),
+            _("Popular notices"), $this->action == 'favorited');
+
+        common_element_end('ul');
+    }
+}
diff --git a/lib/stream.php b/lib/stream.php
index 73758adee6..0cb9e0bf4f 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -24,32 +24,6 @@ require_once(INSTALLDIR.'/lib/noticelist.php');
 
 class StreamAction extends PersonalAction
 {
-
-    function public_views_menu()
-    {
-
-        $action = $this->trimmed('action');
-
-        common_element_start('ul', array('id' => 'nav_views'));
-
-        common_menu_item(common_local_url('public'), _('Public'),
-            _('Public timeline'), $action == 'public');
-
-        common_menu_item(common_local_url('tag'), _('Recent tags'),
-            _('Recent tags'), $action == 'tag');
-
-        if (count(common_config('nickname', 'featured')) > 0) {
-            common_menu_item(common_local_url('featured'), _('Featured'),
-                _('Featured users'), $action == 'featured');
-        }
-
-        common_menu_item(common_local_url('favorited'), _('Popular'),
-            _("Popular notices"), $action == 'favorited');
-
-        common_element_end('ul');
-
-    }
-
     function show_notice_list($notice)
     {
         $nl = new NoticeList($notice);
diff --git a/lib/util.php b/lib/util.php
index 009a0457ce..a1e325204a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1459,41 +1459,6 @@ function common_valid_tag($tag)
     return false;
 }
 
-// Does a little before-after block for next/prev page
-
-function common_pagination($have_before, $have_after, $page, $action, $args=null)
-{
-
-    if ($have_before || $have_after) {
-        common_element_start('div', array('id' => 'pagination'));
-        common_element_start('ul', array('id' => 'nav_pagination'));
-    }
-
-    if ($have_before) {
-        $pargs = array('page' => $page-1);
-        $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
-
-        common_element_start('li', 'before');
-        common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
-                       _('« After'));
-        common_element_end('li');
-    }
-
-    if ($have_after) {
-        $pargs = array('page' => $page+1);
-        $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
-        common_element_start('li', 'after');
-        common_element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
-                       _('Before »'));
-        common_element_end('li');
-    }
-
-    if ($have_before || $have_after) {
-        common_element_end('ul');
-        common_element_end('div');
-    }
-}
-
 /* Following functions are copied from MediaWiki GlobalFunctions.php
  * and written by Evan Prodromou. */
 

From 4826fde988dcb8b59b0545e05f36987c7396150f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 23:54:55 -0500
Subject: [PATCH 008/256] Add a base class for UI widgets

---
 lib/widget.php | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 lib/widget.php

diff --git a/lib/widget.php b/lib/widget.php
new file mode 100644
index 0000000000..e69cc8b744
--- /dev/null
+++ b/lib/widget.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for UI widgets
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for UI widgets
+ *
+ * A widget is a cluster of HTML elements that provide some functionality that's used on different
+ * parts of the site. Examples would be profile lists, notice lists, and common forms.
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class Widget
+{
+    /**
+     * HTMLOutputter to use for output
+     */
+
+    var $out = null;
+
+    /**
+     * Prepare the widget for use
+     *
+     * @param HTMLOutputter $out output helper, defaults to null
+     */
+
+    function __construct($out=null)
+    {
+        $this->out = $out;
+    }
+
+    /**
+     * Show the widget
+     *
+     * Emit the HTML for the widget, using the configured outputter.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+    }
+}

From 100e11a2b7127265fd4615aa992248a7f60d3bcc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Tue, 13 Jan 2009 23:56:10 -0500
Subject: [PATCH 009/256] Fix extralong lines in widget.php

---
 lib/widget.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/widget.php b/lib/widget.php
index e69cc8b744..c70505c44d 100644
--- a/lib/widget.php
+++ b/lib/widget.php
@@ -35,8 +35,9 @@ if (!defined('LACONICA')) {
 /**
  * Base class for UI widgets
  *
- * A widget is a cluster of HTML elements that provide some functionality that's used on different
- * parts of the site. Examples would be profile lists, notice lists, and common forms.
+ * A widget is a cluster of HTML elements that provide some functionality
+ * that's used on different parts of the site. Examples would be profile
+ * lists, notice lists, navigation menus (tabsets) and common forms.
  *
  * @category Widget
  * @package  Laconica

From 699e99c9907cebb7cea6bf65daa335ff692a5fed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Wed, 14 Jan 2009 00:09:39 -0500
Subject: [PATCH 010/256] Form class, superclass for form widgets

---
 lib/form.php | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 139 insertions(+)
 create mode 100644 lib/form.php

diff --git a/lib/form.php b/lib/form.php
new file mode 100644
index 0000000000..ba1790faa4
--- /dev/null
+++ b/lib/form.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for forms
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Base class for forms
+ *
+ * We have a lot of common forms (subscribe, fave, delete) and this superclass
+ * lets us abstract out the basic features of the form.
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class Form extends Widget
+{
+    /**
+     * Show the form
+     *
+     * Uses a recipe to output the form.
+     *
+     * @return void
+     * @see Widget::show()
+     */
+
+    function show()
+    {
+        $this->out->elementStart('form',
+                                 array('id' => $this->id(),
+                                       'method' => 'POST',
+                                       'action' => $this->action()));
+        $this->sessionToken();
+        $this->formData();
+        $this->formActions();
+        $this->out->elementEnd('form');
+    }
+
+    /**
+     * Include a session token for CSRF protection
+     *
+     * @return void
+     */
+
+    function sessionToken()
+    {
+        $this->out->hidden('token', common_session_token());
+    }
+
+    /**
+     * Visible or invisible data elements
+     *
+     * Display the form fields that make up the data of the form.
+     * Sub-classes should overload this to show their data.
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+    }
+
+    /**
+     * Buttons for form actions
+     *
+     * Submit and cancel buttons (or whatever)
+     * Sub-classes should overload this to show their own buttons.
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+    }
+
+    /**
+     * ID of the form
+     *
+     * Should be unique on the page. Sub-classes should overload this
+     * to show their own IDs.
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return null;
+    }
+
+    /**
+     * Action of the form.
+     *
+     * URL to post to. Should be overloaded by subclasses to give
+     * somewhere to post to.
+     *
+     * @return string URL to post to
+     */
+
+    function action()
+    {
+    }
+}

From ab158502b0257c3cd578395ed6f30510ea3c78db Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Wed, 14 Jan 2009 00:29:52 -0500
Subject: [PATCH 011/256] Move notice form to its own class

---
 lib/noticeform.php | 144 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 144 insertions(+)
 create mode 100644 lib/noticeform.php

diff --git a/lib/noticeform.php b/lib/noticeform.php
new file mode 100644
index 0000000000..c222568744
--- /dev/null
+++ b/lib/noticeform.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for posting a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Form for posting a notice
+ *
+ * Frequently-used form for posting a notice
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class NoticeForm extends Form
+{
+    /**
+     * Current action, used for returning to this page.
+     */
+
+    var $action = null;
+
+    /**
+     * Pre-filled content of the form
+     */
+
+    var $content = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param string        $action  action to return to, if any
+     * @param string        $content content to pre-fill
+     */
+
+    function __construct($out=null, $action=null, $content=null)
+    {
+        parent::__construct($out);
+
+        $this->action  = $action;
+        $this->content = $content;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'status_form';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newnotice');
+    }
+
+    /**
+     * Data elements
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $user = common_current_user();
+
+        $this->out->element('label', array('for' => 'status_textarea',
+                                           'id' => 'status_label'),
+                            sprintf(_('What\'s up, %s?'), $user->nickname));
+        // XXX: vary by defined max size
+        $this->out->element('span', array('id' => 'counter',
+                                          'class' => 'counter'),
+                            '140');
+        $this->out->element('textarea', array('id' => 'status_textarea',
+                                              'cols' => 60,
+                                              'rows' => 3,
+                                              'name' => 'status_textarea'),
+                            ($this->content) ? $this->content : '');
+        if ($this->action) {
+            $this->out->hidden('returnto', $this->action);
+        }
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->element('input', array('id' => 'status_submit',
+                                           'name' => 'status_submit',
+                                           'type' => 'submit',
+                                           'value' => _('Send')));
+    }
+}
\ No newline at end of file

From e1907c9cb5324f7349de814c09728a64be589f3a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Wed, 14 Jan 2009 01:04:09 -0500
Subject: [PATCH 012/256] Add a name parameter to a couple of the form elements

---
 lib/htmloutputter.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 143612b8fd..095f4d4786 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -258,15 +258,14 @@ class HTMLOutputter extends XMLOutputter
      *
      * @param string $id    element ID, must be unique on page
      * @param string $value hidden element value, default null
+     * @param string $name  name, if different than ID
      *
      * @return void
-     *
-     * @todo add a $name parameter
      */
 
-    function hidden($id, $value)
+    function hidden($id, $value, $name=null)
     {
-        $this->element('input', array('name' => $id,
+        $this->element('input', array('name' => ($name) ? $name : $id,
                                       'type' => 'hidden',
                                       'id' => $id,
                                       'value' => $value));
@@ -305,18 +304,19 @@ class HTMLOutputter extends XMLOutputter
      * @param string $id    element ID, must be unique on page
      * @param string $label text of the button
      * @param string $cls   class of the button, default 'submit'
+     * @param string $name  name, if different than ID
      *
      * @return void
      *
      * @todo add a $name parameter
      */
 
-    function submit($id, $label, $cls='submit')
+    function submit($id, $label, $cls='submit', $name=null)
     {
         $this->elementStart('p');
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
-                                      'name' => $id,
+                                      'name' => ($name) ? $name : $id,
                                       'class' => $cls,
                                       'value' => $label));
         $this->elementEnd('p');

From 19ae54775b0c7e210462363cc4bfc72bdeb8103f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Wed, 14 Jan 2009 01:04:49 -0500
Subject: [PATCH 013/256] Move favor and disfavor form to their own classes

---
 lib/disfavorform.php | 130 +++++++++++++++++++++++++++++++++++++++++++
 lib/favorform.php    | 130 +++++++++++++++++++++++++++++++++++++++++++
 lib/util.php         |  89 -----------------------------
 3 files changed, 260 insertions(+), 89 deletions(-)
 create mode 100644 lib/disfavorform.php
 create mode 100644 lib/favorform.php

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
new file mode 100644
index 0000000000..25f99f43c1
--- /dev/null
+++ b/lib/disfavorform.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for disfavoring a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for disfavoring a notice
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      FavorForm
+ */
+
+class DisfavorForm extends Form
+{
+    /**
+     * Notice to disfavor
+     */
+
+    var $notice = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out    output channel
+     * @param Notice        $notice notice to disfavor
+     */
+
+    function __construct($out=null, $notice=null)
+    {
+        parent::__construct($out);
+
+        $this->notice = $notice;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'disfavor-' . $this->notice->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        common_local_url('disfavor');
+    }
+
+    /**
+     * Include a session token for CSRF protection
+     *
+     * @return void
+     */
+
+    function sessionToken()
+    {
+        $this->out->hidden('token-' . $this->notice->id,
+                           common_session_token());
+    }
+
+    /**
+     * Data elements
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('notice-n'.$this->notice->id,
+                           $this->notice->id,
+                           'notice');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('disfavor-submit-' . $this->notice->id,
+                           _('Disfavor favorite'));
+    }
+}
\ No newline at end of file
diff --git a/lib/favorform.php b/lib/favorform.php
new file mode 100644
index 0000000000..c67e186974
--- /dev/null
+++ b/lib/favorform.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for favoring a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for favoring a notice
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      DisfavorForm
+ */
+
+class FavorForm extends Form
+{
+    /**
+     * Notice to favor
+     */
+
+    var $notice = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out    output channel
+     * @param Notice        $notice notice to favor
+     */
+
+    function __construct($out=null, $notice=null)
+    {
+        parent::__construct($out);
+
+        $this->notice = $notice;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'favor-' . $this->notice->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        common_local_url('favor');
+    }
+
+    /**
+     * Include a session token for CSRF protection
+     *
+     * @return void
+     */
+
+    function sessionToken()
+    {
+        $this->out->hidden('token-' . $this->notice->id,
+                           common_session_token());
+    }
+
+    /**
+     * Data elements
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('notice-n'.$this->notice->id,
+                           $this->notice->id,
+                           'notice');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('favor-submit-' . $this->notice->id,
+                           _('Make a favorite'));
+    }
+}
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index a1e325204a..13117f8b19 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1295,39 +1295,6 @@ function common_profile_url($nickname)
     return common_local_url('showstream', array('nickname' => $nickname));
 }
 
-// Don't call if nobody's logged in
-
-function common_notice_form($action=null, $content=null)
-{
-    $user = common_current_user();
-    assert(!is_null($user));
-    common_element_start('form', array('id' => 'status_form',
-                                       'method' => 'post',
-                                       'action' => common_local_url('newnotice')));
-    common_element_start('p');
-    common_element('label', array('for' => 'status_textarea',
-                                  'id' => 'status_label'),
-                   sprintf(_('What\'s up, %s?'), $user->nickname));
-    common_element('span', array('id' => 'counter', 'class' => 'counter'), '140');
-    common_element('textarea', array('id' => 'status_textarea',
-                                     'cols' => 60,
-                                     'rows' => 3,
-                                     'name' => 'status_textarea'),
-                   ($content) ? $content : '');
-    common_hidden('token', common_session_token());
-    if ($action) {
-        common_hidden('returnto', $action);
-    }
-    // set by JavaScript
-    common_hidden('inreplyto', 'false');
-    common_element('input', array('id' => 'status_submit',
-                                  'name' => 'status_submit',
-                                  'type' => 'submit',
-                                  'value' => _('Send')));
-    common_element_end('p');
-    common_element_end('form');
-}
-
 // Should make up a reasonable root URL
 
 function common_root_url()
@@ -1671,62 +1638,6 @@ function common_session_token()
     return $_SESSION['token'];
 }
 
-function common_disfavor_form($notice)
-{
-    common_element_start('form', array('id' => 'disfavor-' . $notice->id,
-                                       'method' => 'post',
-                                       'class' => 'disfavor',
-                                       'action' => common_local_url('disfavor')));
-
-    common_element('input', array('type' => 'hidden',
-                                  'name' => 'token-'. $notice->id,
-                                  'id' => 'token-'. $notice->id,
-                                  'class' => 'token',
-                                  'value' => common_session_token()));
-
-    common_element('input', array('type' => 'hidden',
-                                  'name' => 'notice',
-                                  'id' => 'notice-n'. $notice->id,
-                                  'class' => 'notice',
-                                  'value' => $notice->id));
-
-    common_element('input', array('type' => 'submit',
-                                  'id' => 'disfavor-submit-' . $notice->id,
-                                  'name' => 'disfavor-submit-' . $notice->id,
-                                  'class' => 'disfavor',
-                                  'value' => 'Disfavor favorite',
-                                  'title' => 'Remove this message from favorites'));
-    common_element_end('form');
-}
-
-function common_favor_form($notice)
-{
-    common_element_start('form', array('id' => 'favor-' . $notice->id,
-                                       'method' => 'post',
-                                       'class' => 'favor',
-                                       'action' => common_local_url('favor')));
-
-    common_element('input', array('type' => 'hidden',
-                                  'name' => 'token-'. $notice->id,
-                                  'id' => 'token-'. $notice->id,
-                                  'class' => 'token',
-                                  'value' => common_session_token()));
-
-    common_element('input', array('type' => 'hidden',
-                                  'name' => 'notice',
-                                  'id' => 'notice-n'. $notice->id,
-                                  'class' => 'notice',
-                                  'value' => $notice->id));
-
-    common_element('input', array('type' => 'submit',
-                                  'id' => 'favor-submit-' . $notice->id,
-                                  'name' => 'favor-submit-' . $notice->id,
-                                  'class' => 'favor',
-                                  'value' => 'Add to favorites',
-                                  'title' => 'Add this message to favorites'));
-    common_element_end('form');
-}
-
 function common_nudge_form($profile)
 {
     common_element_start('form', array('id' => 'nudge', 'method' => 'post',

From a42fef1621a69cefe0cfa7b9ee75df61b09a1526 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <git@evanprodromou.name>
Date: Wed, 14 Jan 2009 01:17:17 -0500
Subject: [PATCH 014/256] Move nudge form to its own class

---
 lib/nudgeform.php | 105 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/util.php      |  10 -----
 2 files changed, 105 insertions(+), 10 deletions(-)
 create mode 100644 lib/nudgeform.php

diff --git a/lib/nudgeform.php b/lib/nudgeform.php
new file mode 100644
index 0000000000..27ad443161
--- /dev/null
+++ b/lib/nudgeform.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for nudging a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for nudging a user
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      DisfavorForm
+ */
+
+class NudgeForm extends Form
+{
+    /**
+     * Profile of user to nudge
+     */
+
+    var $profile = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to nudge
+     */
+
+    function __construct($out=null, $profile=null)
+    {
+        parent::__construct($out);
+
+        $this->notice = $profile;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'nudge';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('nudge',
+                                array('nickname' => $this->profile->nickname));
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Send a nudge'));
+    }
+}
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 13117f8b19..9dd0ba84d8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1638,16 +1638,6 @@ function common_session_token()
     return $_SESSION['token'];
 }
 
-function common_nudge_form($profile)
-{
-    common_element_start('form', array('id' => 'nudge', 'method' => 'post',
-                                       'action' => common_local_url('nudge', array('nickname' => $profile->nickname))));
-    common_hidden('token', common_session_token());
-    common_element('input', array('type' => 'submit',
-                                  'class' => 'submit',
-                                  'value' => _('Send a nudge')));
-    common_element_end('form');
-}
 function common_nudge_response()
 {
     common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));

From ea1bd9668bfcd03955abe20be9df75ce950940b5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 01:22:20 -0500
Subject: [PATCH 015/256] Incorrectly set notice attribute, fixed

---
 lib/nudgeform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nudgeform.php b/lib/nudgeform.php
index 27ad443161..7d04e11e46 100644
--- a/lib/nudgeform.php
+++ b/lib/nudgeform.php
@@ -66,7 +66,7 @@ class NudgeForm extends Form
     {
         parent::__construct($out);
 
-        $this->notice = $profile;
+        $this->profile = $profile;
     }
 
     /**

From 3c283332b6f851fda537f3c81efe2677a3da6118 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 06:34:22 +0000
Subject: [PATCH 016/256] Updated showLogo().

---
 lib/action.php | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 95178c65ed..d7ffa41d47 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -188,7 +188,21 @@ class Action extends HTMLOutputter // lawsuit
 
     function showLogo()
     {
-        // show the logo here
+        $this->element_start('address', array('id' => 'site_contact',
+                                              'class' => 'vcard'));
+        $this->element_start('a', array('class' => 'url home bookmark',
+                                        'href' => common_local_url('public')));
+        if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
+            || file_exists(theme_file('logo.png')))
+        {
+            $this->element('img', array('class' => 'logo photo',
+                                        'src' => isset($config['site']['logo']) ?
+                                        ($config['site']['logo']) : theme_path('logo.png'),
+                                        'alt' => $config['site']['name']);
+        }
+        $this->element('span', array('class' => 'fn org'), $config['site']['name']));
+        $this->element_end('a');
+        $this->element_end('address');
     }
 
     function showPrimaryNav()
@@ -499,21 +513,7 @@ class Action extends HTMLOutputter // lawsuit
         common_element_start('div', array('id' => 'wrap'));
         common_element_start('div', array('id' => 'header'));
         common_nav_menu();
-        if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
-            || file_exists(theme_file('logo.png')))
-        {
-            common_element_start('a', array('href' => common_local_url('public')));
-            common_element('img', array('src' => isset($config['site']['logo']) ?
-                                        ($config['site']['logo']) : theme_path('logo.png'),
-                                        'alt' => $config['site']['name'],
-                                        'id' => 'logo'));
-            common_element_end('a');
-        } else {
-            common_element_start('p', array('id' => 'branding'));
-            common_element('a', array('href' => common_local_url('public')),
-                           $config['site']['name']);
-            common_element_end('p');
-        }
+
 
         common_element('h1', 'pagetitle', $pagetitle);
 

From 03e65d589ad4f951c008b040d0bd4d019dfc2b3d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 01:38:00 -0500
Subject: [PATCH 017/256] Move subscribe and unsubscribe forms to their own
 classes

---
 lib/subscribeform.php   | 117 ++++++++++++++++++++++++++++++++++++++++
 lib/unsubscribeform.php | 117 ++++++++++++++++++++++++++++++++++++++++
 lib/util.php            |  34 ------------
 3 files changed, 234 insertions(+), 34 deletions(-)
 create mode 100644 lib/subscribeform.php
 create mode 100644 lib/unsubscribeform.php

diff --git a/lib/subscribeform.php b/lib/subscribeform.php
new file mode 100644
index 0000000000..fccc3d3012
--- /dev/null
+++ b/lib/subscribeform.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for subscribing to a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for subscribing to a user
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      UnsubscribeForm
+ */
+
+class SubscribeForm extends Form
+{
+    /**
+     * Profile of user to nudge
+     */
+
+    var $profile = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to nudge
+     */
+
+    function __construct($out=null, $profile=null)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'subscribe-' . $this->profile->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('subscribe');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('subscribeto-' . $this->profile->id,
+                           $this->profile->id,
+                           'subscribeto');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Subscribe'));
+    }
+}
\ No newline at end of file
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
new file mode 100644
index 0000000000..1d4c08a713
--- /dev/null
+++ b/lib/unsubscribeform.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for unsubscribing from a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for unsubscribing from a user
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      SubscribeForm
+ */
+
+class UnsubscribeForm extends Form
+{
+    /**
+     * Profile of user to nudge
+     */
+
+    var $profile = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to nudge
+     */
+
+    function __construct($out=null, $profile=null)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'unsubscribe-' . $this->profile->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('unsubscribe');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('unsubscribeto-' . $this->profile->id,
+                           $this->profile->id,
+                           'unsubscribeto');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Unsubscribe'));
+    }
+}
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 9dd0ba84d8..811c7cdb07 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1643,40 +1643,6 @@ function common_nudge_response()
     common_element('p', array('id' => 'nudge_response'), _('Nudge sent!'));
 }
 
-function common_subscribe_form($profile)
-{
-    common_element_start('form', array('id' => 'subscribe-' . $profile->id,
-                                       'method' => 'post',
-                                       'class' => 'subscribe',
-                                       'action' => common_local_url('subscribe')));
-    common_hidden('token', common_session_token());
-    common_element('input', array('id' => 'subscribeto-' . $profile->id,
-                                  'name' => 'subscribeto',
-                                  'type' => 'hidden',
-                                  'value' => $profile->id));
-    common_element('input', array('type' => 'submit',
-                                  'class' => 'submit',
-                                  'value' => _('Subscribe')));
-    common_element_end('form');
-}
-
-function common_unsubscribe_form($profile)
-{
-    common_element_start('form', array('id' => 'unsubscribe-' . $profile->id,
-                                       'method' => 'post',
-                                       'class' => 'unsubscribe',
-                                       'action' => common_local_url('unsubscribe')));
-    common_hidden('token', common_session_token());
-    common_element('input', array('id' => 'unsubscribeto-' . $profile->id,
-                                  'name' => 'unsubscribeto',
-                                  'type' => 'hidden',
-                                  'value' => $profile->id));
-    common_element('input', array('type' => 'submit',
-                                  'class' => 'submit',
-                                  'value' => _('Unsubscribe')));
-    common_element_end('form');
-}
-
 // XXX: Refactor this code
 function common_profile_new_message_nudge ($cur, $profile)
 {

From 73272e8ad306a37a2f954f0b757a444d1fc30432 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 01:49:03 -0500
Subject: [PATCH 018/256] Fix require in noticeform.php so it gets the notice
 form

---
 lib/noticeform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index c222568744..0e46e0e58f 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/widget.php';
+require_once INSTALLDIR.'/lib/form.php';
 
 /**
  * Form for posting a notice

From 0f7e8585cdf1a18d0fe9f1b2e3290a579f202296 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 01:59:30 -0500
Subject: [PATCH 019/256] Update lib/action.php to use the right XMLOutputter
 functions

Global search and replace for common_element_*
---
 lib/action.php | 81 +++++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index d7ffa41d47..55d3b82219 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -106,7 +106,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showStylesheets()
     {
-        common_element('link', array('rel' => 'stylesheet',
+        $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
@@ -121,27 +121,27 @@ class Action extends HTMLOutputter // lawsuit
 
     function showScripts()
     {
-        common_element('script', array('type' => 'text/javascript',
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => common_path('js/jquery.min.js')),
                        ' ');
-        common_element('script', array('type' => 'text/javascript',
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => common_path('js/jquery.form.js')),
                        ' ');
-        common_element('script', array('type' => 'text/javascript',
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => common_path('js/xbImportNode.js')),
                        ' ');
-        common_element('script', array('type' => 'text/javascript',
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => common_path('js/util.js?version='.LACONICA_VERSION)),
                        ' ');
     }
 
     function showOpenSearch()
     {
-        common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+        $this->element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
                                      'href' =>  common_local_url('opensearch', array('type' => 'people')),
                                      'title' => common_config('site', 'name').' People Search'));
 
-        common_element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
+        $this->element('link', array('rel' => 'search', 'type' => 'application/opensearchdescription+xml',
                                      'href' =>  common_local_url('opensearch', array('type' => 'notice')),
                                      'title' => common_config('site', 'name').' Notice Search'));
     }
@@ -188,9 +188,9 @@ class Action extends HTMLOutputter // lawsuit
 
     function showLogo()
     {
-        $this->element_start('address', array('id' => 'site_contact',
+        $this->elementStart('address', array('id' => 'site_contact',
                                               'class' => 'vcard'));
-        $this->element_start('a', array('class' => 'url home bookmark',
+        $this->elementStart('a', array('class' => 'url home bookmark',
                                         'href' => common_local_url('public')));
         if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
             || file_exists(theme_file('logo.png')))
@@ -201,14 +201,14 @@ class Action extends HTMLOutputter // lawsuit
                                         'alt' => $config['site']['name']);
         }
         $this->element('span', array('class' => 'fn org'), $config['site']['name']));
-        $this->element_end('a');
-        $this->element_end('address');
+        $this->elementEnd('a');
+        $this->elementEnd('address');
     }
 
     function showPrimaryNav()
     {
         $user = common_current_user();
-        common_element_start('ul', array('id' => 'nav'));
+        $this->elementStart('ul', array('id' => 'nav'));
         if ($user) {
             common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
                              _('Home'));
@@ -230,7 +230,7 @@ class Action extends HTMLOutputter // lawsuit
         }
         common_menu_item(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
-        common_element_end('ul');
+        $this->elementEnd('ul');
     }
 
     function showSiteNotice()
@@ -315,7 +315,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showSecondaryNav()
     {
-        common_element_start('ul', array('id' => 'nav_sub'));
+        $this->elementStart('ul', array('id' => 'nav_sub'));
         common_menu_item(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         common_menu_item(common_local_url('doc', array('title' => 'about')),
@@ -328,7 +328,7 @@ class Action extends HTMLOutputter // lawsuit
                          _('Source'));
         common_menu_item(common_local_url('doc', array('title' => 'contact')),
                          _('Contact'));
-        common_element_end('ul');
+        $this->elementEnd('ul');
     }
 
     function showLicenses()
@@ -341,7 +341,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showLaconicaLicense()
     {
-        common_element_start('div', 'laconica');
+        $this->elementStart('div', 'laconica');
         if (common_config('site', 'broughtby')) {
             $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
         } else {
@@ -350,25 +350,25 @@ class Action extends HTMLOutputter // lawsuit
         $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
         $output = common_markup_to_html($instr);
         common_raw($output);
-        common_element_end('div');
+        $this->elementEnd('div');
         // do it
     }
 
     function showContentLicense()
     {
-        common_element_start('div', array('id' => 'footer'));
-        common_element('img', array('id' => 'cc',
+        $this->elementStart('div', array('id' => 'footer'));
+        $this->element('img', array('id' => 'cc',
                                     'src' => $config['license']['image'],
                                     'alt' => $config['license']['title']));
-        common_element_start('p');
+        $this->elementStart('p');
         common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
-        common_element('a', array('class' => 'license',
+        $this->element('a', array('class' => 'license',
                                   'rel' => 'license',
                                   'href' => $config['license']['url']),
                        $config['license']['title']);
         common_text(_('. Contributors should be attributed by full name or nickname.'));
-        common_element_end('p');
-        common_element_end('div');
+        $this->elementEnd('p');
+        $this->elementEnd('div');
     }
 
     // For comparison with If-Last-Modified
@@ -481,7 +481,7 @@ class Action extends HTMLOutputter // lawsuit
     function nav_menu($menu)
     {
         $action = $this->trimmed('action');
-        common_element_start('ul', array('id' => 'nav_views'));
+        $this->elementStart('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
             common_menu_item(common_local_url($menuaction,
                                               isset($menudesc[2]) ? $menudesc[2] : null),
@@ -489,7 +489,7 @@ class Action extends HTMLOutputter // lawsuit
                              $menudesc[1],
                              $action == $menuaction);
         }
-        common_element_end('ul');
+        $this->elementEnd('ul');
     }
 
     function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
@@ -499,7 +499,7 @@ class Action extends HTMLOutputter // lawsuit
 
         common_start_html();
 
-        common_element_start('head');
+        $this->elementStart('head');
 
         if ($callable) {
             if ($data) {
@@ -508,14 +508,13 @@ class Action extends HTMLOutputter // lawsuit
                 call_user_func($callable);
             }
         }
-        common_element_end('head');
-        common_element_start('body', $action);
-        common_element_start('div', array('id' => 'wrap'));
-        common_element_start('div', array('id' => 'header'));
+        $this->elementEnd('head');
+        $this->elementStart('body', $action);
+        $this->elementStart('div', array('id' => 'wrap'));
+        $this->elementStart('div', array('id' => 'header'));
         common_nav_menu();
 
-
-        common_element('h1', 'pagetitle', $pagetitle);
+        $this->element('h1', 'pagetitle', $pagetitle);
 
         if ($headercall) {
             if ($data) {
@@ -524,18 +523,18 @@ class Action extends HTMLOutputter // lawsuit
                 call_user_func($headercall);
             }
         }
-        common_element_end('div');
-        common_element_start('div', array('id' => 'content'));
+        $this->elementEnd('div');
+        $this->elementStart('div', array('id' => 'content'));
     }
 
     function common_show_footer()
     {
         global $xw, $config;
-        common_element_end('div'); // content div
+        $this->elementEnd('div'); // content div
         common_foot_menu();
-        common_element_end('div');
-        common_element_end('body');
-        common_element_end('html');
+        $this->elementEnd('div');
+        $this->elementEnd('body');
+        $this->elementEnd('html');
         common_end_xml();
     }
 
@@ -545,13 +544,13 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        common_element_start('li', $lattrs);
+        $this->elementStart('li', $lattrs);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;
         }
-        common_element('a', $attrs, $text);
-        common_element_end('li');
+        $this->element('a', $attrs, $text);
+        $this->elementEnd('li');
     }
 
     // Does a little before-after block for next/prev page

From 21d87778ae76fd73eded304d213bdeb47b5052ee Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 02:13:22 -0500
Subject: [PATCH 020/256] Move message form to its own module

---
 lib/messageform.php | 152 ++++++++++++++++++++++++++++++++++++++++++++
 lib/util.php        |  41 ------------
 2 files changed, 152 insertions(+), 41 deletions(-)
 create mode 100644 lib/messageform.php

diff --git a/lib/messageform.php b/lib/messageform.php
new file mode 100644
index 0000000000..eca39cc064
--- /dev/null
+++ b/lib/messageform.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for posting a direct message
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for posting a direct message
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class MessageForm extends Form
+{
+    /**
+     * User to send a direct message to
+     */
+
+    var $to = null;
+
+    /**
+     * Pre-filled content of the form
+     */
+
+    var $content = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param User          $to      user to send a message to
+     * @param string        $content content to pre-fill
+     */
+
+    function __construct($out=null, $to=null, $content=null)
+    {
+        parent::__construct($out);
+
+        $this->to      = $to;
+        $this->content = $content;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'message_form';
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('newmessage');
+    }
+
+    /**
+     * Data elements
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $user = common_current_user();
+
+        $mutual_users = $user->mutuallySubscribedUsers();
+
+        $mutual = array();
+
+        while ($mutual_users->fetch()) {
+            if ($mutual_users->id != $user->id) {
+                $mutual[$mutual_users->id] = $mutual_users->nickname;
+            }
+        }
+
+        $mutual_users->free();
+        unset($mutual_users);
+
+        $this->out->dropdown('to', _('To'), $mutual, null, false,
+                             $this->to->id);
+
+        $this->out->elementStart('p');
+
+        $this->out->element('textarea', array('id' => 'message_content',
+                                              'cols' => 60,
+                                              'rows' => 3,
+                                              'name' => 'content'),
+                            ($this->content) ? $this->content : '');
+
+        $this->out->elementEnd('p');
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->element('input', array('id' => 'message_send',
+                                           'name' => 'message_send',
+                                           'type' => 'submit',
+                                           'value' => _('Send')));
+    }
+}
\ No newline at end of file
diff --git a/lib/util.php b/lib/util.php
index 811c7cdb07..f9ba73d6f0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1674,47 +1674,6 @@ function common_keyize($str)
     return $str;
 }
 
-function common_message_form($content, $user, $to)
-{
-
-    common_element_start('form', array('id' => 'message_form',
-                                       'method' => 'post',
-                                       'action' => common_local_url('newmessage')));
-
-    $mutual_users = $user->mutuallySubscribedUsers();
-
-    $mutual = array();
-
-    while ($mutual_users->fetch()) {
-        if ($mutual_users->id != $user->id) {
-            $mutual[$mutual_users->id] = $mutual_users->nickname;
-        }
-    }
-
-    $mutual_users->free();
-    unset($mutual_users);
-
-    common_dropdown('to', _('To'), $mutual, null, false, $to->id);
-
-    common_element_start('p');
-
-    common_element('textarea', array('id' => 'message_content',
-                                     'cols' => 60,
-                                     'rows' => 3,
-                                     'name' => 'content'),
-                   ($content) ? $content : '');
-
-    common_element('input', array('id' => 'message_send',
-                                  'name' => 'message_send',
-                                  'type' => 'submit',
-                                  'value' => _('Send')));
-
-    common_hidden('token', common_session_token());
-
-    common_element_end('p');
-    common_element_end('form');
-}
-
 function common_memcache()
 {
     static $cache = null;

From 353f64f47f07116151f500f37738f11d8c376c33 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 02:26:42 -0500
Subject: [PATCH 021/256] Fix comments on profile

Incorrectly said this was for nudging, not subbing/unsubbing
---
 lib/subscribeform.php   | 4 ++--
 lib/unsubscribeform.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index fccc3d3012..996729a281 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -50,7 +50,7 @@ require_once INSTALLDIR.'/lib/form.php';
 class SubscribeForm extends Form
 {
     /**
-     * Profile of user to nudge
+     * Profile of user to subscribe to
      */
 
     var $profile = null;
@@ -59,7 +59,7 @@ class SubscribeForm extends Form
      * Constructor
      *
      * @param HTMLOutputter $out     output channel
-     * @param Profile       $profile profile of user to nudge
+     * @param Profile       $profile profile of user to subscribe to
      */
 
     function __construct($out=null, $profile=null)
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index 1d4c08a713..a724bb3122 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -50,7 +50,7 @@ require_once INSTALLDIR.'/lib/form.php';
 class UnsubscribeForm extends Form
 {
     /**
-     * Profile of user to nudge
+     * Profile of user to unsubscribe from
      */
 
     var $profile = null;
@@ -59,7 +59,7 @@ class UnsubscribeForm extends Form
      * Constructor
      *
      * @param HTMLOutputter $out     output channel
-     * @param Profile       $profile profile of user to nudge
+     * @param Profile       $profile profile of user to unsub from
      */
 
     function __construct($out=null, $profile=null)

From 5c69c75f466a867c9ba3225f0a8e36e733255337 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 02:33:19 -0500
Subject: [PATCH 022/256] Move block and unblock forms to their own widgets

---
 lib/blockform.php   | 130 ++++++++++++++++++++++++++++++++++++++++++++
 lib/unblockform.php | 130 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 260 insertions(+)
 create mode 100644 lib/blockform.php
 create mode 100644 lib/unblockform.php

diff --git a/lib/blockform.php b/lib/blockform.php
new file mode 100644
index 0000000000..51e43f8b59
--- /dev/null
+++ b/lib/blockform.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for blocking a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for blocking a user
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      UnblockForm
+ */
+
+class BlockForm extends Form
+{
+    /**
+     * Profile of user to block
+     */
+
+    var $profile = null;
+
+    /**
+     * Return-to args
+     */
+
+    var $args = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to block
+     * @param array         $args    return-to args
+     */
+
+    function __construct($out=null, $profile=null, $args=null)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+        $this->args    = $args;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'block-' . $this->profile->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('block');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('blockto-' . $this->profile->id,
+                           $this->profile->id,
+                           'blockto');
+        if ($this->args) {
+            foreach ($this->args as $k => $v) {
+                $this->out->hidden('returnto-' . $k, $v);
+            }
+        }
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Block'));
+    }
+}
\ No newline at end of file
diff --git a/lib/unblockform.php b/lib/unblockform.php
new file mode 100644
index 0000000000..4cb9ae4f5d
--- /dev/null
+++ b/lib/unblockform.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Form for unblocking a user
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Form
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/form.php';
+
+/**
+ * Form for unblocking a user
+ *
+ * @category Form
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      BlockForm
+ */
+
+class UnblockForm extends Form
+{
+    /**
+     * Profile of user to unblock
+     */
+
+    var $profile = null;
+
+    /**
+     * Return-to args
+     */
+
+    var $args = null;
+
+    /**
+     * Constructor
+     *
+     * @param HTMLOutputter $out     output channel
+     * @param Profile       $profile profile of user to unblock
+     * @param array         $args    return-to args
+     */
+
+    function __construct($out=null, $profile=null, $args=null)
+    {
+        parent::__construct($out);
+
+        $this->profile = $profile;
+        $this->args    = $args;
+    }
+
+    /**
+     * ID of the form
+     *
+     * @return int ID of the form
+     */
+
+    function id()
+    {
+        return 'unblock-' . $this->profile->id;
+    }
+
+    /**
+     * Action of the form
+     *
+     * @return string URL of the action
+     */
+
+    function action()
+    {
+        return common_local_url('unblock');
+    }
+
+    /**
+     * Data elements of the form
+     *
+     * @return void
+     */
+
+    function formData()
+    {
+        $this->out->hidden('unblockto-' . $this->profile->id,
+                           $this->profile->id,
+                           'unblockto');
+        if ($this->args) {
+            foreach ($this->args as $k => $v) {
+                $this->out->hidden('returnto-' . $k, $v);
+            }
+        }
+    }
+
+    /**
+     * Action elements
+     *
+     * @return void
+     */
+
+    function formActions()
+    {
+        $this->out->submit('submit', _('Unblock'));
+    }
+}
\ No newline at end of file

From 3b19d00ae9ca565ed1d6fa4d7df22efed8c7d6a5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 02:34:55 -0500
Subject: [PATCH 023/256] Remove block form functions from lib/util.php

---
 lib/util.php | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index f9ba73d6f0..8c6cddbd9e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1700,39 +1700,3 @@ function common_compatible_license($from, $to)
     // XXX: better compatibility check needed here!
     return ($from == $to);
 }
-
-/* These are almost identical, so we use a helper function */
-
-function common_block_form($profile, $args=null)
-{
-    common_blocking_form('block', _('Block'), $profile, $args);
-}
-
-function common_unblock_form($profile, $args=null)
-{
-    common_blocking_form('unblock', _('Unblock'), $profile, $args);
-}
-
-function common_blocking_form($type, $label, $profile, $args=null)
-{
-    common_element_start('form', array('id' => $type . '-' . $profile->id,
-                                       'method' => 'post',
-                                       'class' => $type,
-                                       'action' => common_local_url($type)));
-    common_hidden('token', common_session_token());
-    common_element('input', array('id' => $type . 'to-' . $profile->id,
-                                  'name' => $type . 'to',
-                                  'type' => 'hidden',
-                                  'value' => $profile->id));
-    common_element('input', array('type' => 'submit',
-                                  'class' => 'submit',
-                                  'name' => $type,
-                                  'value' => $label));
-    if ($args) {
-        foreach ($args as $k => $v) {
-            common_hidden('returnto-' . $k, $v);
-        }
-    }
-    common_element_end('form');
-    return;
-}

From 24d8814bc59276d5f10b57086973911d413fa305 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 08:44:23 +0000
Subject: [PATCH 024/256] Updated: showHeader() -- incomplete showPrimaryNav()
 -- should be updated when common_menu_item() is redone/fixed showSiteNotice()
 showLocalNav() -- needs a revisit for common_menu_item() showContentBlock --
 needs a revisit for basic pages showPageNotice() showContent() -- inner
 should be opened for content showFooter() showLicenses()
 showLaconicaLicense() showContentLicense() common_menu_item() -- Added @id
 for list-items. Revisit. pagination()

Needs attention for common_menu_item() and then they can be removed:
nav_menu
common_show_header()
---
 lib/action.php | 125 +++++++++++++++++++++++++++++++++----------------
 1 file changed, 85 insertions(+), 40 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 55d3b82219..96d2a87985 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -178,12 +178,23 @@ class Action extends HTMLOutputter // lawsuit
 
     function showHeader()
     {
-        // start header div stuff
+        $this->elementStart('div', array('id' => 'header'));
         $this->showLogo();
+
+//        common_element('h1', 'pagetitle', $pagetitle);
+
+        if ($headercall) {
+            if ($data) {
+                call_user_func($headercall, $data);
+            } else {
+                call_user_func($headercall);
+            }
+        }
+        //common_nav_menu();
         $this->showPrimaryNav();
         $this->showSiteNotice();
         $this->showNoticeForm();
-        // end header div stuff
+        $this->elementEnd('div');
     }
 
     function showLogo()
@@ -198,15 +209,17 @@ class Action extends HTMLOutputter // lawsuit
             $this->element('img', array('class' => 'logo photo',
                                         'src' => isset($config['site']['logo']) ?
                                         ($config['site']['logo']) : theme_path('logo.png'),
-                                        'alt' => $config['site']['name']);
+                                        'alt' => $config['site']['name']));
         }
-        $this->element('span', array('class' => 'fn org'), $config['site']['name']));
+        $this->element('span', array('class' => 'fn org'), $config['site']['name']);
         $this->elementEnd('a');
         $this->elementEnd('address');
     }
 
     function showPrimaryNav()
     {
+        $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
+        $this->element('dt', null, _('Primary site navigation')); 
         $user = common_current_user();
         $this->elementStart('ul', array('id' => 'nav'));
         if ($user) {
@@ -231,11 +244,19 @@ class Action extends HTMLOutputter // lawsuit
         common_menu_item(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->elementEnd('ul');
+        $this->elementEnd('dl');
     }
 
+
+    // Revist. Should probably do an hAtom pattern here
     function showSiteNotice()
     {
-        // show the site notice here
+        $this->elementStart('dl', array('id' => 'site_notice',
+                                        'class' => 'system_notice'));
+        $this->element('dt', null, _('Site notice'));
+        $this->elementStart('dd', null);
+        // Output a bunch of paragraphs here
+        $this->elementEnd('dd');
     }
 
     // MAY overload if no notice form needed... or direct message box????
@@ -254,17 +275,35 @@ class Action extends HTMLOutputter // lawsuit
         // end core div
     }
 
-    // SHOULD overload
+    // SHOULD overload (perhaps this should be a MUST because sometimes it is not used) 
 
-    function showLocalNav()
+    function showLocalNav($menu)
     {
+        $action = $this->trimmed('action');
+        
+        $this->elementStart('dl', array('id' => 'site_nav_local_views'));
+        $this->element('dt', null, _('Local views')); 
+        $this->elementStart('ul', array('id' => 'nav'));
+        foreach ($menu as $menuaction => $menudesc) {
+            common_menu_item(common_local_url($menuaction,
+                                              isset($menudesc[2]) ? $menudesc[2] : null),
+                             $menudesc[0],
+                             $menudesc[1],
+                             $action == $menuaction);
+        }
+        $this->elementEnd('ul');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     function showContentBlock()
     {
+        $this->elementStart('div', array('id' => 'content',
+                                         (is_null("basic single content page e.g., about")) ? null : 'class' => 'hentry'));
         $this->showPageTitle();
         $this->showPageNotice();
         $this->showContent();
+        $this->elementEnd('div');
     }
 
     function showPageTitle() {
@@ -275,7 +314,12 @@ class Action extends HTMLOutputter // lawsuit
 
     function showPageNotice()
     {
-        // output page notice div
+        $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');
     }
 
     // MUST overload
@@ -283,6 +327,9 @@ class Action extends HTMLOutputter // lawsuit
     function showContent()
     {
         // show the actual content (forms, lists, whatever)
+        $this->elementStart('div', array('id' => 'content_inner',
+                                         (is_null("basic single content page e.g., about")) ? null : 'class' => 'entry-content'));
+        $this->elementEnd('div');
     }
 
     function showAside()
@@ -308,9 +355,10 @@ class Action extends HTMLOutputter // lawsuit
 
     function showFooter()
     {
-        // start footer div
+        $this->elementStart('div', array('id' => 'footer'));
         $this->showSecondaryNav();
         $this->showLicenses();
+        $this->elementEnd('div');
     }
 
     function showSecondaryNav()
@@ -333,15 +381,16 @@ class Action extends HTMLOutputter // lawsuit
 
     function showLicenses()
     {
-        // start license dl
+        $this->elementStart('dl', array('id' => 'licenses'));
         $this->showLaconicaLicense();
         $this->showContentLicense();
-        // end license dl
+        $this->elementEnd('dl');
     }
 
     function showLaconicaLicense()
     {
-        $this->elementStart('div', 'laconica');
+        $this->element('dt', array('id' => 'site_laconica_license'), _('Laconica software license')); 
+        $this->elementStart('dd', null);
         if (common_config('site', 'broughtby')) {
             $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
         } else {
@@ -350,25 +399,26 @@ class Action extends HTMLOutputter // lawsuit
         $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
         $output = common_markup_to_html($instr);
         common_raw($output);
-        $this->elementEnd('div');
+        $this->elementEnd('dd');
         // do it
     }
 
     function showContentLicense()
     {
-        $this->elementStart('div', array('id' => 'footer'));
-        $this->element('img', array('id' => 'cc',
-                                    'src' => $config['license']['image'],
-                                    'alt' => $config['license']['title']));
+        $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license')); 
+        $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
         common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
         $this->element('a', array('class' => 'license',
-                                  'rel' => 'license',
+                                  'rel' => 'external license',
                                   'href' => $config['license']['url']),
                        $config['license']['title']);
         common_text(_('. Contributors should be attributed by full name or nickname.'));
         $this->elementEnd('p');
-        $this->elementEnd('div');
+        $this->element('img', array('id' => 'license_cc',
+                                    'src' => $config['license']['image'],
+                                    'alt' => $config['license']['title']));
+        $this->elementEnd('dd');
     }
 
     // For comparison with If-Last-Modified
@@ -511,19 +561,6 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('head');
         $this->elementStart('body', $action);
         $this->elementStart('div', array('id' => 'wrap'));
-        $this->elementStart('div', array('id' => 'header'));
-        common_nav_menu();
-
-        $this->element('h1', 'pagetitle', $pagetitle);
-
-        if ($headercall) {
-            if ($data) {
-                call_user_func($headercall, $data);
-            } else {
-                call_user_func($headercall);
-            }
-        }
-        $this->elementEnd('div');
         $this->elementStart('div', array('id' => 'content'));
     }
 
@@ -538,13 +575,16 @@ class Action extends HTMLOutputter // lawsuit
         common_end_xml();
     }
 
-    function common_menu_item($url, $text, $title=null, $is_selected=false)
+
+    // Added @id to li for some control. We might want to move this to htmloutputter.php
+    function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
     {
         $lattrs = array();
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        $this->elementStart('li', $lattrs);
+        
+        $this->elementStart('li', (is_null($id)) ? null : array('id' => $id),  $lattrs);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;
@@ -558,31 +598,36 @@ class Action extends HTMLOutputter // lawsuit
     function pagination($have_before, $have_after, $page, $action, $args=null)
     {
         if ($have_before || $have_after) {
-            $this->elementStart('div', array('id' => 'pagination'));
-            $this->elementStart('ul', array('id' => 'nav_pagination'));
+            $this->elementStart('div', array('class' => 'pagination'));
+            $this->elementStart('dl', null);
+            $this->element('dt', null, _('Pagination')); 
+            $this->elementStart('dd', null);
+            $this->elementStart('ul', array('class' => 'nav'));
         }
 
         if ($have_before) {
             $pargs = array('page' => $page-1);
             $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
 
-            $this->elementStart('li', 'before');
+            $this->elementStart('li', array('class' => 'nav_prev'));
             $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'prev'),
-                           _('« After'));
+                           _('After'));
             $this->elementEnd('li');
         }
 
         if ($have_after) {
             $pargs = array('page' => $page+1);
             $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
-            $this->elementStart('li', 'after');
+            $this->elementStart('li', array('class' => 'nav_next'));
             $this->element('a', array('href' => common_local_url($action, $newargs), 'rel' => 'next'),
-                           _('Before »'));
+                           _('Before'));
             $this->elementEnd('li');
         }
 
         if ($have_before || $have_after) {
             $this->elementEnd('ul');
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
             $this->elementEnd('div');
         }
     }

From a6c9e3cea0e376034ff1f27342a90dde4affb0c7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 11:45:07 -0500
Subject: [PATCH 025/256] Update jQuery libraries to 1.3

---
 js/jquery.js     | 3218 ++++++++++++++++++++++++++++------------------
 js/jquery.min.js |   43 +-
 2 files changed, 1970 insertions(+), 1291 deletions(-)

diff --git a/js/jquery.js b/js/jquery.js
index 88e661eec8..fc06ace272 100644
--- a/js/jquery.js
+++ b/js/jquery.js
@@ -1,34 +1,36 @@
-(function(){
-/*
- * jQuery 1.2.6 - New Wave Javascript
+/*!
+ * jQuery JavaScript Library v1.3
+ * http://jquery.com/
  *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
  *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
+ * Date: 2009-01-13 12:50:31 -0500 (Tue, 13 Jan 2009)
+ * Revision: 6104
  */
+(function(){
 
-// Map over jQuery in case of overwrite
-var _jQuery = window.jQuery,
-// Map over the $ in case of overwrite
-	_$ = window.$;
+var 
+	// Will speed up references to window, and allows munging its name.
+	window = this,
+	// Will speed up references to undefined, and allows munging its name.
+	undefined,
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+	// Map over the $ in case of overwrite
+	_$ = window.$,
 
-var jQuery = window.jQuery = window.$ = function( selector, context ) {
-	// The jQuery object is actually just the init constructor 'enhanced'
-	return new jQuery.fn.init( selector, context );
-};
+	jQuery = window.jQuery = window.$ = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context );
+	},
 
-// A simple way to check for HTML strings or ID strings
-// (both of which we optimize for)
-var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,
-
-// Is it a simple selector
-	isSimple = /^.[^:#\[\.]*$/,
-
-// Will speed up references to undefined, and allows munging its name.
-	undefined;
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,
+	// Is it a simple selector
+	isSimple = /^.[^:#\[\.,]*$/;
 
 jQuery.fn = jQuery.prototype = {
 	init: function( selector, context ) {
@@ -39,10 +41,11 @@ jQuery.fn = jQuery.prototype = {
 		if ( selector.nodeType ) {
 			this[0] = selector;
 			this.length = 1;
+			this.context = selector;
 			return this;
 		}
 		// Handle HTML strings
-		if ( typeof selector == "string" ) {
+		if ( typeof selector === "string" ) {
 			// Are we dealing with HTML string or an ID?
 			var match = quickExpr.exec( selector );
 
@@ -65,7 +68,10 @@ jQuery.fn = jQuery.prototype = {
 							return jQuery().find( selector );
 
 						// Otherwise, we inject the element directly into the jQuery object
-						return jQuery( elem );
+						var ret = jQuery( elem );
+						ret.context = document;
+						ret.selector = selector;
+						return ret;
 					}
 					selector = [];
 				}
@@ -78,26 +84,32 @@ jQuery.fn = jQuery.prototype = {
 		// HANDLE: $(function)
 		// Shortcut for document ready
 		} else if ( jQuery.isFunction( selector ) )
-			return jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector );
+			return jQuery( document ).ready( selector );
+
+		// Make sure that old selector state is passed along
+		if ( selector.selector && selector.context ) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
 
 		return this.setArray(jQuery.makeArray(selector));
 	},
 
+	// Start with an empty selector
+	selector: "",
+
 	// The current version of jQuery being used
-	jquery: "1.2.6",
+	jquery: "1.3",
 
 	// The number of elements contained in the matched element set
 	size: function() {
 		return this.length;
 	},
 
-	// The number of elements contained in the matched element set
-	length: 0,
-
 	// Get the Nth element in the matched element set OR
 	// Get the whole matched element set as a clean array
 	get: function( num ) {
-		return num == undefined ?
+		return num === undefined ?
 
 			// Return a 'clean' array
 			jQuery.makeArray( this ) :
@@ -108,13 +120,20 @@ jQuery.fn = jQuery.prototype = {
 
 	// Take an array of elements and push it onto the stack
 	// (returning the new matched element set)
-	pushStack: function( elems ) {
+	pushStack: function( elems, name, selector ) {
 		// Build a new jQuery matched element set
 		var ret = jQuery( elems );
 
 		// Add the old object onto the stack (as a reference)
 		ret.prevObject = this;
 
+		ret.context = this.context;
+
+		if ( name === "find" )
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		else if ( name )
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+
 		// Return the newly-formed element set
 		return ret;
 	},
@@ -141,8 +160,6 @@ jQuery.fn = jQuery.prototype = {
 	// Determine the position of an element within
 	// the matched set of elements
 	index: function( elem ) {
-		var ret = -1;
-
 		// Locate the position of the desired element
 		return jQuery.inArray(
 			// If it receives a jQuery object, the first element is used
@@ -154,7 +171,7 @@ jQuery.fn = jQuery.prototype = {
 		var options = name;
 
 		// Look for the case where we're accessing a style value
-		if ( name.constructor == String )
+		if ( typeof name === "string" )
 			if ( value === undefined )
 				return this[0] && jQuery[ type || "attr" ]( this[0], name );
 
@@ -184,7 +201,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	text: function( text ) {
-		if ( typeof text != "object" && text != null )
+		if ( typeof text !== "object" && text != null )
 			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
 
 		var ret = "";
@@ -202,20 +219,22 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	wrapAll: function( html ) {
-		if ( this[0] )
+		if ( this[0] ) {
 			// The elements to wrap the target around
-			jQuery( html, this[0].ownerDocument )
-				.clone()
-				.insertBefore( this[0] )
-				.map(function(){
-					var elem = this;
+			var wrap = jQuery( html, this[0].ownerDocument ).clone();
 
-					while ( elem.firstChild )
-						elem = elem.firstChild;
+			if ( this[0].parentNode )
+				wrap.insertBefore( this[0] );
 
-					return elem;
-				})
-				.append(this);
+			wrap.map(function(){
+				var elem = this;
+
+				while ( elem.firstChild )
+					elem = elem.firstChild;
+
+				return elem;
+			}).append(this);
+		}
 
 		return this;
 	},
@@ -233,27 +252,27 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	append: function() {
-		return this.domManip(arguments, true, false, function(elem){
+		return this.domManip(arguments, true, function(elem){
 			if (this.nodeType == 1)
 				this.appendChild( elem );
 		});
 	},
 
 	prepend: function() {
-		return this.domManip(arguments, true, true, function(elem){
+		return this.domManip(arguments, true, function(elem){
 			if (this.nodeType == 1)
 				this.insertBefore( elem, this.firstChild );
 		});
 	},
 
 	before: function() {
-		return this.domManip(arguments, false, false, function(elem){
+		return this.domManip(arguments, false, function(elem){
 			this.parentNode.insertBefore( elem, this );
 		});
 	},
 
 	after: function() {
-		return this.domManip(arguments, false, true, function(elem){
+		return this.domManip(arguments, false, function(elem){
 			this.parentNode.insertBefore( elem, this.nextSibling );
 		});
 	},
@@ -262,20 +281,31 @@ jQuery.fn = jQuery.prototype = {
 		return this.prevObject || jQuery( [] );
 	},
 
-	find: function( selector ) {
-		var elems = jQuery.map(this, function(elem){
-			return jQuery.find( selector, elem );
-		});
+	// For internal use only.
+	// Behaves like an Array's .push method, not like a jQuery method.
+	push: [].push,
 
-		return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ?
-			jQuery.unique( elems ) :
-			elems );
+	find: function( selector ) {
+		if ( this.length === 1 && !/,/.test(selector) ) {
+			var ret = this.pushStack( [], "find", selector );
+			ret.length = 0;
+			jQuery.find( selector, this[0], ret );
+			return ret;
+		} else {
+			var elems = jQuery.map(this, function(elem){
+				return jQuery.find( selector, elem );
+			});
+
+			return this.pushStack( /[^+>] [^+>]/.test( selector ) ?
+				jQuery.unique( elems ) :
+				elems, "find", selector );
+		}
 	},
 
 	clone: function( events ) {
 		// Do the clone
 		var ret = this.map(function(){
-			if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) {
+			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
 				// IE copies events bound via attachEvent when
 				// using cloneNode. Calling detachEvent on the
 				// clone will also remove the events from the orignal
@@ -296,7 +326,7 @@ jQuery.fn = jQuery.prototype = {
 		// removeData doesn't work here, IE removes it from the original as well
 		// this is primarily for IE but the data expando shouldn't be copied over in any browser
 		var clone = ret.find("*").andSelf().each(function(){
-			if ( this[ expando ] != undefined )
+			if ( this[ expando ] !== undefined )
 				this[ expando ] = null;
 		});
 
@@ -323,14 +353,29 @@ jQuery.fn = jQuery.prototype = {
 				return selector.call( elem, i );
 			}) ||
 
-			jQuery.multiFilter( selector, this ) );
+			jQuery.multiFilter( selector, jQuery.grep(this, function(elem){
+				return elem.nodeType === 1;
+			}) ), "filter", selector );
+	},
+
+	closest: function( selector ) {
+		var pos = jQuery.expr.match.POS.test( selector ) ? jQuery(selector) : null;
+
+		return this.map(function(){
+			var cur = this;
+			while ( cur && cur.ownerDocument ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery(cur).is(selector) )
+					return cur;
+				cur = cur.parentNode;
+			}
+		});
 	},
 
 	not: function( selector ) {
-		if ( selector.constructor == String )
+		if ( typeof selector === "string" )
 			// test special case where just one selector is passed in
 			if ( isSimple.test( selector ) )
-				return this.pushStack( jQuery.multiFilter( selector, this, true ) );
+				return this.pushStack( jQuery.multiFilter( selector, this, true ), "not", selector );
 			else
 				selector = jQuery.multiFilter( selector, this );
 
@@ -343,7 +388,7 @@ jQuery.fn = jQuery.prototype = {
 	add: function( selector ) {
 		return this.pushStack( jQuery.unique( jQuery.merge(
 			this.get(),
-			typeof selector == 'string' ?
+			typeof selector === "string" ?
 				jQuery( selector ) :
 				jQuery.makeArray( selector )
 		)));
@@ -354,15 +399,17 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	hasClass: function( selector ) {
-		return this.is( "." + selector );
+		return !!selector && this.is( "." + selector );
 	},
 
 	val: function( value ) {
-		if ( value == undefined ) {
-
-			if ( this.length ) {
-				var elem = this[0];
+		if ( value === undefined ) {			
+			var elem = this[0];
 
+			if ( elem ) {
+				if( jQuery.nodeName( elem, 'option' ) )
+					return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+				
 				// We need to handle select boxes special
 				if ( jQuery.nodeName( elem, "select" ) ) {
 					var index = elem.selectedIndex,
@@ -380,7 +427,7 @@ jQuery.fn = jQuery.prototype = {
 
 						if ( option.selected ) {
 							// Get the specifc value for the option
-							value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+							value = jQuery(option).val();
 
 							// We don't need an array for one selects
 							if ( one )
@@ -391,25 +438,25 @@ jQuery.fn = jQuery.prototype = {
 						}
 					}
 
-					return values;
+					return values;				
+				}
 
 				// Everything else, we just grab the value
-				} else
-					return (this[0].value || "").replace(/\r/g, "");
+				return (elem.value || "").replace(/\r/g, "");
 
 			}
 
 			return undefined;
 		}
 
-		if( value.constructor == Number )
+		if ( typeof value === "number" )
 			value += '';
 
 		return this.each(function(){
 			if ( this.nodeType != 1 )
 				return;
 
-			if ( value.constructor == Array && /radio|checkbox/.test( this.type ) )
+			if ( jQuery.isArray(value) && /radio|checkbox/.test( this.type ) )
 				this.checked = (jQuery.inArray(this.value, value) >= 0 ||
 					jQuery.inArray(this.name, value) >= 0);
 
@@ -430,7 +477,7 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	html: function( value ) {
-		return value == undefined ?
+		return value === undefined ?
 			(this[0] ?
 				this[0].innerHTML :
 				null) :
@@ -442,11 +489,12 @@ jQuery.fn = jQuery.prototype = {
 	},
 
 	eq: function( i ) {
-		return this.slice( i, i + 1 );
+		return this.slice( i, +i + 1 );
 	},
 
 	slice: function() {
-		return this.pushStack( Array.prototype.slice.apply( this, arguments ) );
+		return this.pushStack( Array.prototype.slice.apply( this, arguments ),
+			"slice", Array.prototype.slice.call(arguments).join(",") );
 	},
 
 	map: function( callback ) {
@@ -459,69 +507,29 @@ jQuery.fn = jQuery.prototype = {
 		return this.add( this.prevObject );
 	},
 
-	data: function( key, value ){
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
+	domManip: function( args, table, callback ) {
+		if ( this[0] ) {
+			var fragment = (this[0].ownerDocument || this[0]).createDocumentFragment(),
+				scripts = jQuery.clean( args, (this[0].ownerDocument || this[0]), fragment ),
+				first = fragment.firstChild,
+				extra = this.length > 1 ? fragment.cloneNode(true) : fragment;
 
-		if ( value === undefined ) {
-			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+			if ( first )
+				for ( var i = 0, l = this.length; i < l; i++ )
+					callback.call( root(this[i], first), i > 0 ? extra.cloneNode(true) : fragment );
+			
+			if ( scripts )
+				jQuery.each( scripts, evalScript );
+		}
 
-			if ( data === undefined && this.length )
-				data = jQuery.data( this[0], key );
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-		} else
-			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
-				jQuery.data( this, key, value );
-			});
-	},
-
-	removeData: function( key ){
-		return this.each(function(){
-			jQuery.removeData( this, key );
-		});
-	},
-
-	domManip: function( args, table, reverse, callback ) {
-		var clone = this.length > 1, elems;
-
-		return this.each(function(){
-			if ( !elems ) {
-				elems = jQuery.clean( args, this.ownerDocument );
-
-				if ( reverse )
-					elems.reverse();
-			}
-
-			var obj = this;
-
-			if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) )
-				obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") );
-
-			var scripts = jQuery( [] );
-
-			jQuery.each(elems, function(){
-				var elem = clone ?
-					jQuery( this ).clone( true )[0] :
-					this;
-
-				// execute all scripts after the elements have been injected
-				if ( jQuery.nodeName( elem, "script" ) )
-					scripts = scripts.add( elem );
-				else {
-					// Remove any inner scripts for later evaluation
-					if ( elem.nodeType == 1 )
-						scripts = scripts.add( jQuery( "script", elem ).remove() );
-
-					// Inject the elements into the document
-					callback.call( obj, elem );
-				}
-			});
-
-			scripts.each( evalScript );
-		});
+		return this;
+		
+		function root( elem, cur ) {
+			return table && jQuery.nodeName(elem, "table") && jQuery.nodeName(cur, "tr") ?
+				(elem.getElementsByTagName("tbody")[0] ||
+				elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+				elem;
+		}
 	}
 };
 
@@ -552,7 +560,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 	var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options;
 
 	// Handle a deep copy situation
-	if ( target.constructor == Boolean ) {
+	if ( typeof target === "boolean" ) {
 		deep = target;
 		target = arguments[1] || {};
 		// skip the boolean and the target
@@ -560,7 +568,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 	}
 
 	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target != "object" && typeof target != "function" )
+	if ( typeof target !== "object" && !jQuery.isFunction(target) )
 		target = {};
 
 	// extend jQuery itself if only one argument is passed
@@ -581,7 +589,7 @@ jQuery.extend = jQuery.fn.extend = function() {
 					continue;
 
 				// Recurse if we're merging object values
-				if ( deep && copy && typeof copy == "object" && !copy.nodeType )
+				if ( deep && copy && typeof copy === "object" && !copy.nodeType )
 					target[ name ] = jQuery.extend( deep, 
 						// Never move original objects, clone them
 						src || ( copy.length != null ? [ ] : { } )
@@ -597,11 +605,11 @@ jQuery.extend = jQuery.fn.extend = function() {
 	return target;
 };
 
-var expando = "jQuery" + now(), uuid = 0, windowData = {},
-	// exclude the following css properties to add px
-	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
+// exclude the following css properties to add px
+var	exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
 	// cache defaultView
-	defaultView = document.defaultView || {};
+	defaultView = document.defaultView || {},
+	toString = Object.prototype.toString;
 
 jQuery.extend({
 	noConflict: function( deep ) {
@@ -613,10 +621,15 @@ jQuery.extend({
 		return jQuery;
 	},
 
-	// See test/unit/core.js for details concerning this function.
-	isFunction: function( fn ) {
-		return !!fn && typeof fn != "string" && !fn.nodeName &&
-			fn.constructor != Array && /^[\s[]?function/.test( fn + "" );
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return toString.call(obj) === "[object Function]";
+	},
+
+	isArray: function( obj ) {
+		return toString.call(obj) === "[object Array]";
 	},
 
 	// check if an element is in a (or is an) XML document
@@ -636,10 +649,10 @@ jQuery.extend({
 				script = document.createElement("script");
 
 			script.type = "text/javascript";
-			if ( jQuery.browser.msie )
-				script.text = data;
-			else
+			if ( jQuery.support.scriptEval )
 				script.appendChild( document.createTextNode( data ) );
+			else
+				script.text = data;
 
 			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
 			// This arises when a base node is used (#2709).
@@ -652,80 +665,12 @@ jQuery.extend({
 		return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase();
 	},
 
-	cache: {},
-
-	data: function( elem, name, data ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// Compute a unique ID for the element
-		if ( !id )
-			id = elem[ expando ] = ++uuid;
-
-		// Only generate the data cache if we're
-		// trying to access or manipulate it
-		if ( name && !jQuery.cache[ id ] )
-			jQuery.cache[ id ] = {};
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined )
-			jQuery.cache[ id ][ name ] = data;
-
-		// Return the named cache data, or the ID for the element
-		return name ?
-			jQuery.cache[ id ][ name ] :
-			id;
-	},
-
-	removeData: function( elem, name ) {
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var id = elem[ expando ];
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( jQuery.cache[ id ] ) {
-				// Remove the section of cache data
-				delete jQuery.cache[ id ][ name ];
-
-				// If we've removed all the data, remove the element's cache
-				name = "";
-
-				for ( name in jQuery.cache[ id ] )
-					break;
-
-				if ( !name )
-					jQuery.removeData( elem );
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			// Clean up the element expando
-			try {
-				delete elem[ expando ];
-			} catch(e){
-				// IE has trouble directly removing the expando
-				// but it's ok with using removeAttribute
-				if ( elem.removeAttribute )
-					elem.removeAttribute( expando );
-			}
-
-			// Completely remove the data cache
-			delete jQuery.cache[ id ];
-		}
-	},
-
 	// args is for internal usage only
 	each: function( object, callback, args ) {
 		var name, i = 0, length = object.length;
 
 		if ( args ) {
-			if ( length == undefined ) {
+			if ( length === undefined ) {
 				for ( name in object )
 					if ( callback.apply( object[ name ], args ) === false )
 						break;
@@ -736,7 +681,7 @@ jQuery.extend({
 
 		// A special, fast, case for the most common use of each
 		} else {
-			if ( length == undefined ) {
+			if ( length === undefined ) {
 				for ( name in object )
 					if ( callback.call( object[ name ], name, object[ name ] ) === false )
 						break;
@@ -754,7 +699,7 @@ jQuery.extend({
 			value = value.call( elem, i );
 
 		// Handle passing in a number to a CSS property
-		return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ?
+		return typeof value === "number" && type == "curCSS" && !exclude.test( name ) ?
 			value + "px" :
 			value;
 	},
@@ -771,7 +716,7 @@ jQuery.extend({
 		// internal only, use removeClass("class")
 		remove: function( elem, classNames ) {
 			if (elem.nodeType == 1)
-				elem.className = classNames != undefined ?
+				elem.className = classNames !== undefined ?
 					jQuery.grep(elem.className.split(/\s+/), function(className){
 						return !jQuery.className.has( classNames, className );
 					}).join(" ") :
@@ -828,30 +773,14 @@ jQuery.extend({
 	curCSS: function( elem, name, force ) {
 		var ret, style = elem.style;
 
-		// A helper method for determining if an element's values are broken
-		function color( elem ) {
-			if ( !jQuery.browser.safari )
-				return false;
-
-			// defaultView is cached
-			var ret = defaultView.getComputedStyle( elem, null );
-			return !ret || ret.getPropertyValue("color") == "";
-		}
-
 		// We need to handle opacity special in IE
-		if ( name == "opacity" && jQuery.browser.msie ) {
+		if ( name == "opacity" && !jQuery.support.opacity ) {
 			ret = jQuery.attr( style, "opacity" );
 
 			return ret == "" ?
 				"1" :
 				ret;
 		}
-		// Opera sometimes will give the wrong display answer, this fixes it, see #2037
-		if ( jQuery.browser.opera && name == "display" ) {
-			var save = style.outline;
-			style.outline = "0 solid black";
-			style.outline = save;
-		}
 
 		// Make sure we're using the right name for getting the float value
 		if ( name.match( /float/i ) )
@@ -870,38 +799,9 @@ jQuery.extend({
 
 			var computedStyle = defaultView.getComputedStyle( elem, null );
 
-			if ( computedStyle && !color( elem ) )
+			if ( computedStyle )
 				ret = computedStyle.getPropertyValue( name );
 
-			// If the element isn't reporting its values properly in Safari
-			// then some display: none elements are involved
-			else {
-				var swap = [], stack = [], a = elem, i = 0;
-
-				// Locate all of the parent display: none elements
-				for ( ; a && color(a); a = a.parentNode )
-					stack.unshift(a);
-
-				// Go through and make them visible, but in reverse
-				// (It would be better if we knew the exact display type that they had)
-				for ( ; i < stack.length; i++ )
-					if ( color( stack[ i ] ) ) {
-						swap[ i ] = stack[ i ].style.display;
-						stack[ i ].style.display = "block";
-					}
-
-				// Since we flip the display style, we have to handle that
-				// one special, otherwise get the value
-				ret = name == "display" && swap[ stack.length - 1 ] != null ?
-					"none" :
-					( computedStyle && computedStyle.getPropertyValue( name ) ) || "";
-
-				// Finally, revert the display styles back
-				for ( i = 0; i < swap.length; i++ )
-					if ( swap[ i ] != null )
-						stack[ i ].style.display = swap[ i ];
-			}
-
 			// We should always get a number back from opacity
 			if ( name == "opacity" && ret == "" )
 				ret = "1";
@@ -936,22 +836,32 @@ jQuery.extend({
 		return ret;
 	},
 
-	clean: function( elems, context ) {
-		var ret = [];
+	clean: function( elems, context, fragment ) {
 		context = context || document;
+
 		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if (typeof context.createElement == 'undefined')
+		if ( typeof context.createElement === "undefined" )
 			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
 
+		// If a single string is passed in and it's a single tag
+		// just do a createElement and skip the rest
+		if ( !fragment && elems.length === 1 && typeof elems[0] === "string" ) {
+			var match = /^<(\w+)\s*\/?>$/.exec(elems[0]);
+			if ( match )
+				return [ context.createElement( match[1] ) ];
+		}
+
+		var ret = [], scripts = [], div = context.createElement("div");
+
 		jQuery.each(elems, function(i, elem){
+			if ( typeof elem === "number" )
+				elem += '';
+
 			if ( !elem )
 				return;
 
-			if ( elem.constructor == Number )
-				elem += '';
-
 			// Convert html string into DOM nodes
-			if ( typeof elem == "string" ) {
+			if ( typeof elem === "string" ) {
 				// Fix "XHTML"-style tags in all browsers
 				elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){
 					return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ?
@@ -960,7 +870,7 @@ jQuery.extend({
 				});
 
 				// Trim whitespace, otherwise indexOf won't work as expected
-				var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div");
+				var tags = jQuery.trim( elem ).toLowerCase();
 
 				var wrap =
 					// option or optgroup
@@ -984,7 +894,7 @@ jQuery.extend({
 					[ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] ||
 
 					// IE can't serialize <link> and <script> tags normally
-					jQuery.browser.msie &&
+					!jQuery.support.htmlSerialize &&
 					[ 1, "div<div>", "</div>" ] ||
 
 					[ 0, "", "" ];
@@ -997,7 +907,7 @@ jQuery.extend({
 					div = div.lastChild;
 
 				// Remove IE's autoinserted <tbody> from table fragments
-				if ( jQuery.browser.msie ) {
+				if ( !jQuery.support.tbody ) {
 
 					// String was a <table>, *may* have spurious <tbody>
 					var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ?
@@ -1012,26 +922,36 @@ jQuery.extend({
 						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length )
 							tbody[ j ].parentNode.removeChild( tbody[ j ] );
 
-					// IE completely kills leading whitespace when innerHTML is used
-					if ( /^\s/.test( elem ) )
-						div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
-
-				}
+					}
 
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && /^\s/.test( elem ) )
+					div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild );
+				
 				elem = jQuery.makeArray( div.childNodes );
 			}
 
-			if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) )
-				return;
-
-			if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options )
+			if ( elem.nodeType )
 				ret.push( elem );
-
 			else
 				ret = jQuery.merge( ret, elem );
 
 		});
 
+		if ( fragment ) {
+			for ( var i = 0; ret[i]; i++ ) {
+				if ( jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+				} else {
+					if ( ret[i].nodeType === 1 )
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					fragment.appendChild( ret[i] );
+				}
+			}
+			
+			return scripts;
+		}
+
 		return ret;
 	},
 
@@ -1042,8 +962,7 @@ jQuery.extend({
 
 		var notxml = !jQuery.isXMLDoc( elem ),
 			// Whether we are setting (or getting)
-			set = value !== undefined,
-			msie = jQuery.browser.msie;
+			set = value !== undefined;
 
 		// Try to normalize/fix the name
 		name = notxml && jQuery.props[ name ] || name;
@@ -1057,7 +976,7 @@ jQuery.extend({
 
 			// Safari mis-reports the default selected property of a hidden option
 			// Accessing the parent's selectedIndex property fixes it
-			if ( name == "selected" && jQuery.browser.safari )
+			if ( name == "selected" && elem.parentNode )
 				elem.parentNode.selectedIndex;
 
 			// If applicable, access the attribute via the DOM 0 way
@@ -1074,17 +993,28 @@ jQuery.extend({
 				if( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) )
 					return elem.getAttributeNode( name ).nodeValue;
 
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				if ( name == "tabIndex" ) {
+					var attributeNode = elem.getAttributeNode( "tabIndex" );
+					return attributeNode && attributeNode.specified
+						? attributeNode.value
+						: elem.nodeName.match(/^(a|area|button|input|object|select|textarea)$/i)
+							? 0
+							: undefined;
+				}
+
 				return elem[ name ];
 			}
 
-			if ( msie && notxml &&  name == "style" )
+			if ( !jQuery.support.style && notxml &&  name == "style" )
 				return jQuery.attr( elem.style, "cssText", value );
 
 			if ( set )
 				// convert the value to a string (all browsers do this but IE) see #1070
 				elem.setAttribute( name, "" + value );
 
-			var attr = msie && notxml && special
+			var attr = !jQuery.support.hrefNormalized && notxml && special
 					// Some attributes require a special call on IE
 					? elem.getAttribute( name, 2 )
 					: elem.getAttribute( name );
@@ -1096,7 +1026,7 @@ jQuery.extend({
 		// elem is actually elem.style ... set the style
 
 		// IE uses filters for opacity
-		if ( msie && name == "opacity" ) {
+		if ( !jQuery.support.opacity && name == "opacity" ) {
 			if ( set ) {
 				// IE has trouble with opacity if it does not have layout
 				// Force it by setting the zoom level
@@ -1131,8 +1061,8 @@ jQuery.extend({
 
 		if( array != null ){
 			var i = array.length;
-			//the window, strings and functions also have 'length'
-			if( i == null || array.split || array.setInterval || array.call )
+			// The window, strings (and functions) also have 'length'
+			if( i == null || typeof array === "string" || jQuery.isFunction(array) || array.setInterval )
 				ret[0] = array;
 			else
 				while( i )
@@ -1157,13 +1087,13 @@ jQuery.extend({
 		var i = 0, elem, pos = first.length;
 		// Also, we need to make sure that the correct elements are being returned
 		// (IE returns comment nodes in a '*' query)
-		if ( jQuery.browser.msie ) {
-			while ( elem = second[ i++ ] )
+		if ( !jQuery.support.getAll ) {
+			while ( (elem = second[ i++ ]) != null )
 				if ( elem.nodeType != 8 )
 					first[ pos++ ] = elem;
 
 		} else
-			while ( elem = second[ i++ ] )
+			while ( (elem = second[ i++ ]) != null )
 				first[ pos++ ] = elem;
 
 		return first;
@@ -1218,37 +1148,21 @@ jQuery.extend({
 	}
 });
 
+// Use of jQuery.browser is deprecated.
+// It's included for backwards compatibility and plugins,
+// although they should work to migrate away.
+
 var userAgent = navigator.userAgent.toLowerCase();
 
 // Figure out what browser is being used
 jQuery.browser = {
-	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1],
+	version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
 	safari: /webkit/.test( userAgent ),
 	opera: /opera/.test( userAgent ),
 	msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ),
 	mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent )
 };
 
-var styleFloat = jQuery.browser.msie ?
-	"styleFloat" :
-	"cssFloat";
-
-jQuery.extend({
-	// Check to see if the W3C box model is being used
-	boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat",
-
-	props: {
-		"for": "htmlFor",
-		"class": "className",
-		"float": styleFloat,
-		cssFloat: styleFloat,
-		styleFloat: styleFloat,
-		readonly: "readOnly",
-		maxlength: "maxLength",
-		cellspacing: "cellSpacing"
-	}
-});
-
 jQuery.each({
 	parent: function(elem){return elem.parentNode;},
 	parents: function(elem){return jQuery.dir(elem,"parentNode");},
@@ -1266,7 +1180,7 @@ jQuery.each({
 		if ( selector && typeof selector == "string" )
 			ret = jQuery.multiFilter( selector, ret );
 
-		return this.pushStack( jQuery.unique( ret ) );
+		return this.pushStack( jQuery.unique( ret ), name, selector );
 	};
 });
 
@@ -1302,14 +1216,16 @@ jQuery.each({
 		jQuery.className.remove( this, classNames );
 	},
 
-	toggleClass: function( classNames ) {
-		jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames );
+	toggleClass: function( classNames, state ) {
+		if( typeof state !== "boolean" )
+			state = !jQuery.className.has( this, classNames );
+		jQuery.className[ state ? "add" : "remove" ]( this, classNames );
 	},
 
 	remove: function( selector ) {
-		if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) {
+		if ( !selector || jQuery.filter( selector, [ this ] ).length ) {
 			// Prevent memory leaks
-			jQuery( "*", this ).add(this).each(function(){
+			jQuery( "*", this ).add([this]).each(function(){
 				jQuery.event.remove(this);
 				jQuery.removeData(this);
 			});
@@ -1332,489 +1248,1063 @@ jQuery.each({
 	};
 });
 
-jQuery.each([ "Height", "Width" ], function(i, name){
-	var type = name.toLowerCase();
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		return this[0] == window ?
-			// Opera reports document.body.client[Width/Height] properly in both quirks and standards
-			jQuery.browser.opera && document.body[ "client" + name ] ||
-
-			// Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths)
-			jQuery.browser.safari && window[ "inner" + name ] ||
-
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] :
-
-			// Get document width or height
-			this[0] == document ?
-				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-				Math.max(
-					Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]),
-					Math.max(document.body["offset" + name], document.documentElement["offset" + name])
-				) :
-
-				// Get or set width or height on the element
-				size == undefined ?
-					// Get width or height on the element
-					(this.length ? jQuery.css( this[0], type ) : null) :
-
-					// Set the width or height on the element (default to pixels if value is unitless)
-					this.css( type, size.constructor == String ? size : size + "px" );
-	};
-});
-
 // Helper function used by the dimensions and offset modules
 function num(elem, prop) {
 	return elem[0] && parseInt( jQuery.curCSS(elem[0], prop, true), 10 ) || 0;
-}var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ?
-		"(?:[\\w*_-]|\\\\.)" :
-		"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",
-	quickChild = new RegExp("^>\\s*(" + chars + "+)"),
-	quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"),
-	quickClass = new RegExp("^([#.]?)(" + chars + "*)");
+}
+var expando = "jQuery" + now(), uuid = 0, windowData = {};
+
+jQuery.extend({
+	cache: {},
+
+	data: function( elem, name, data ) {
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ];
+
+		// Compute a unique ID for the element
+		if ( !id )
+			id = elem[ expando ] = ++uuid;
+
+		// Only generate the data cache if we're
+		// trying to access or manipulate it
+		if ( name && !jQuery.cache[ id ] )
+			jQuery.cache[ id ] = {};
+
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined )
+			jQuery.cache[ id ][ name ] = data;
+
+		// Return the named cache data, or the ID for the element
+		return name ?
+			jQuery.cache[ id ][ name ] :
+			id;
+	},
+
+	removeData: function( elem, name ) {
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var id = elem[ expando ];
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( jQuery.cache[ id ] ) {
+				// Remove the section of cache data
+				delete jQuery.cache[ id ][ name ];
+
+				// If we've removed all the data, remove the element's cache
+				name = "";
+
+				for ( name in jQuery.cache[ id ] )
+					break;
+
+				if ( !name )
+					jQuery.removeData( elem );
+			}
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			// Clean up the element expando
+			try {
+				delete elem[ expando ];
+			} catch(e){
+				// IE has trouble directly removing the expando
+				// but it's ok with using removeAttribute
+				if ( elem.removeAttribute )
+					elem.removeAttribute( expando );
+			}
+
+			// Completely remove the data cache
+			delete jQuery.cache[ id ];
+		}
+	},
+	queue: function( elem, type, data ) {
+		if ( elem ){
+	
+			type = (type || "fx") + "queue";
+	
+			var q = jQuery.data( elem, type );
+	
+			if ( !q || jQuery.isArray(data) )
+				q = jQuery.data( elem, type, jQuery.makeArray(data) );
+			else if( data )
+				q.push( data );
+	
+		}
+		return q;
+	},
+
+	dequeue: function( elem, type ){
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
+		
+		if( !type || type === "fx" )
+			fn = queue[0];
+			
+		if( fn !== undefined )
+			fn.call(elem);
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ){
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			if ( data === undefined && this.length )
+				data = jQuery.data( this[0], key );
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+		} else
+			return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){
+				jQuery.data( this, key, value );
+			});
+	},
+
+	removeData: function( key ){
+		return this.each(function(){
+			jQuery.removeData( this, key );
+		});
+	},
+	queue: function(type, data){
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined )
+			return jQuery.queue( this[0], type );
+
+		return this.each(function(){
+			var queue = jQuery.queue( this, type, data );
+			
+			 if( type == "fx" && queue.length == 1 )
+				queue[0].call(this);
+		});
+	},
+	dequeue: function(type){
+		return this.each(function(){
+			jQuery.dequeue( this, type );
+		});
+	}
+});/*!
+ * Sizzle CSS Selector Engine - v0.9.1
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
 
-jQuery.extend({
-	expr: {
-		"": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},
-		"#": function(a,i,m){return a.getAttribute("id")==m[2];},
-		":": {
-			// Position Checks
-			lt: function(a,i,m){return i<m[3]-0;},
-			gt: function(a,i,m){return i>m[3]-0;},
-			nth: function(a,i,m){return m[3]-0==i;},
-			eq: function(a,i,m){return m[3]-0==i;},
-			first: function(a,i){return i==0;},
-			last: function(a,i,m,r){return i==r.length-1;},
-			even: function(a,i){return i%2==0;},
-			odd: function(a,i){return i%2;},
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,
+	done = 0,
+	toString = Object.prototype.toString;
 
-			// Child Checks
-			"first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},
-			"last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},
-			"only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},
+var Sizzle = function(selector, context, results, seed) {
+	results = results || [];
+	context = context || document;
 
-			// Parent Checks
-			parent: function(a){return a.firstChild;},
-			empty: function(a){return !a.firstChild;},
+	if ( context.nodeType !== 1 && context.nodeType !== 9 )
+		return [];
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
 
-			// Text Check
-			contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},
-
-			// Visibility
-			visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},
-			hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},
-
-			// Form attributes
-			enabled: function(a){return !a.disabled;},
-			disabled: function(a){return a.disabled;},
-			checked: function(a){return a.checked;},
-			selected: function(a){return a.selected||jQuery.attr(a,"selected");},
-
-			// Form elements
-			text: function(a){return "text"==a.type;},
-			radio: function(a){return "radio"==a.type;},
-			checkbox: function(a){return "checkbox"==a.type;},
-			file: function(a){return "file"==a.type;},
-			password: function(a){return "password"==a.type;},
-			submit: function(a){return "submit"==a.type;},
-			image: function(a){return "image"==a.type;},
-			reset: function(a){return "reset"==a.type;},
-			button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");},
-			input: function(a){return /input|select|textarea|button/i.test(a.nodeName);},
-
-			// :has()
-			has: function(a,i,m){return jQuery.find(m[3],a).length;},
-
-			// :header
-			header: function(a){return /h\d/i.test(a.nodeName);},
-
-			// :animated
-			animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}
+	var parts = [], m, set, checkSet, check, mode, extra, prune = true;
+	
+	// Reset the position of the chunker regexp (start from head)
+	chunker.lastIndex = 0;
+	
+	while ( (m = chunker.exec(selector)) !== null ) {
+		parts.push( m[1] );
+		
+		if ( m[2] ) {
+			extra = RegExp.rightContext;
+			break;
 		}
-	},
+	}
 
-	// The regular expressions that power the parsing engine
-	parse: [
-		// Match: [@value='test'], [@foo]
-		/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,
+	if ( parts.length > 1 && Expr.match.POS.exec( selector ) ) {
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			var later = "", match;
 
-		// Match: :contains('foo')
-		/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,
+			// Position selectors must be done after the filter
+			while ( (match = Expr.match.POS.exec( selector )) ) {
+				later += match[0];
+				selector = selector.replace( Expr.match.POS, "" );
+			}
 
-		// Match: :even, :last-child, #id, .class
-		new RegExp("^([:.#]*)(" + chars + "+)")
-	],
+			set = Sizzle.filter( later, Sizzle( /\s$/.test(selector) ? selector + "*" : selector, context ) );
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
 
-	multiFilter: function( expr, elems, not ) {
-		var old, cur = [];
+			while ( parts.length ) {
+				var tmpSet = [];
 
-		while ( expr && expr != old ) {
-			old = expr;
-			var f = jQuery.filter( expr, elems, not );
-			expr = f.t.replace(/^\s*,\s*/, "" );
-			cur = not ? elems = f.r : jQuery.merge( cur, f.r );
+				selector = parts.shift();
+				if ( Expr.relative[ selector ] )
+					selector += parts.shift();
+
+				for ( var i = 0, l = set.length; i < l; i++ ) {
+					Sizzle( selector, set[i], tmpSet );
+				}
+
+				set = tmpSet;
+			}
+		}
+	} else {
+		var ret = seed ?
+			{ expr: parts.pop(), set: makeArray(seed) } :
+			Sizzle.find( parts.pop(), parts.length === 1 && context.parentNode ? context.parentNode : context );
+		set = Sizzle.filter( ret.expr, ret.set );
+
+		if ( parts.length > 0 ) {
+			checkSet = makeArray(set);
+		} else {
+			prune = false;
 		}
 
-		return cur;
-	},
+		while ( parts.length ) {
+			var cur = parts.pop(), pop = cur;
 
-	find: function( t, context ) {
-		// Quickly handle non-string expressions
-		if ( typeof t != "string" )
-			return [ t ];
-
-		// check to make sure context is a DOM element or a document
-		if ( context && context.nodeType != 1 && context.nodeType != 9)
-			return [ ];
-
-		// Set the correct context (if none is provided)
-		context = context || document;
-
-		// Initialize the search
-		var ret = [context], done = [], last, nodeName;
-
-		// Continue while a selector expression exists, and while
-		// we're no longer looping upon ourselves
-		while ( t && last != t ) {
-			var r = [];
-			last = t;
-
-			t = jQuery.trim(t);
-
-			var foundToken = false,
-
-			// An attempt at speeding up child selectors that
-			// point to a specific element tag
-				re = quickChild,
-
-				m = re.exec(t);
-
-			if ( m ) {
-				nodeName = m[1].toUpperCase();
-
-				// Perform our own iteration and filter
-				for ( var i = 0; ret[i]; i++ )
-					for ( var c = ret[i].firstChild; c; c = c.nextSibling )
-						if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) )
-							r.push( c );
-
-				ret = r;
-				t = t.replace( re, "" );
-				if ( t.indexOf(" ") == 0 ) continue;
-				foundToken = true;
+			if ( !Expr.relative[ cur ] ) {
+				cur = "";
 			} else {
-				re = /^([>+~])\s*(\w*)/i;
+				pop = parts.pop();
+			}
 
-				if ( (m = re.exec(t)) != null ) {
-					r = [];
+			if ( pop == null ) {
+				pop = context;
+			}
 
-					var merge = {};
-					nodeName = m[2].toUpperCase();
-					m = m[1];
+			Expr.relative[ cur ]( checkSet, pop, isXML(context) );
+		}
+	}
 
-					for ( var j = 0, rl = ret.length; j < rl; j++ ) {
-						var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild;
-						for ( ; n; n = n.nextSibling )
-							if ( n.nodeType == 1 ) {
-								var id = jQuery.data(n);
+	if ( !checkSet ) {
+		checkSet = set;
+	}
 
-								if ( m == "~" && merge[id] ) break;
+	if ( !checkSet ) {
+		throw "Syntax error, unrecognized expression: " + (cur || selector);
+	}
 
-								if (!nodeName || n.nodeName.toUpperCase() == nodeName ) {
-									if ( m == "~" ) merge[id] = true;
-									r.push( n );
-								}
-
-								if ( m == "+" ) break;
-							}
-					}
-
-					ret = r;
-
-					// And remove the token
-					t = jQuery.trim( t.replace( re, "" ) );
-					foundToken = true;
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+		} else if ( context.nodeType === 1 ) {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && contains(context, checkSet[i])) ) {
+					results.push( set[i] );
 				}
 			}
-
-			// See if there's still an expression, and that we haven't already
-			// matched a token
-			if ( t && !foundToken ) {
-				// Handle multiple expressions
-				if ( !t.indexOf(",") ) {
-					// Clean the result set
-					if ( context == ret[0] ) ret.shift();
-
-					// Merge the result sets
-					done = jQuery.merge( done, ret );
-
-					// Reset the context
-					r = ret = [context];
-
-					// Touch up the selector string
-					t = " " + t.substr(1,t.length);
-
-				} else {
-					// Optimize for the case nodeName#idName
-					var re2 = quickID;
-					var m = re2.exec(t);
-
-					// Re-organize the results, so that they're consistent
-					if ( m ) {
-						m = [ 0, m[2], m[3], m[1] ];
-
-					} else {
-						// Otherwise, do a traditional filter check for
-						// ID, class, and element selectors
-						re2 = quickClass;
-						m = re2.exec(t);
-					}
-
-					m[2] = m[2].replace(/\\/g, "");
-
-					var elem = ret[ret.length-1];
-
-					// Try to do a global search by ID, where we can
-					if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) {
-						// Optimization for HTML document case
-						var oid = elem.getElementById(m[2]);
-
-						// Do a quick check for the existence of the actual ID attribute
-						// to avoid selecting by the name attribute in IE
-						// also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form
-						if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] )
-							oid = jQuery('[@id="'+m[2]+'"]', elem)[0];
-
-						// Do a quick check for node name (where applicable) so
-						// that div#foo searches will be really fast
-						ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : [];
-					} else {
-						// We need to find all descendant elements
-						for ( var i = 0; ret[i]; i++ ) {
-							// Grab the tag name being searched for
-							var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2];
-
-							// Handle IE7 being really dumb about <object>s
-							if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" )
-								tag = "param";
-
-							r = jQuery.merge( r, ret[i].getElementsByTagName( tag ));
-						}
-
-						// It's faster to filter by class and be done with it
-						if ( m[1] == "." )
-							r = jQuery.classFilter( r, m[2] );
-
-						// Same with ID filtering
-						if ( m[1] == "#" ) {
-							var tmp = [];
-
-							// Try to find the element with the ID
-							for ( var i = 0; r[i]; i++ )
-								if ( r[i].getAttribute("id") == m[2] ) {
-									tmp = [ r[i] ];
-									break;
-								}
-
-							r = tmp;
-						}
-
-						ret = r;
-					}
-
-					t = t.replace( re2, "" );
+		} else {
+			for ( var i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
 				}
-
-			}
-
-			// If a selector string still exists
-			if ( t ) {
-				// Attempt to filter it
-				var val = jQuery.filter(t,r);
-				ret = r = val.r;
-				t = jQuery.trim(val.t);
 			}
 		}
+	} else {
+		makeArray( checkSet, results );
+	}
 
-		// An error occurred with the selector;
-		// just return an empty set instead
-		if ( t )
-			ret = [];
+	if ( extra ) {
+		Sizzle( extra, context, results, seed );
+	}
 
-		// Remove the root context
-		if ( ret && context == ret[0] )
-			ret.shift();
+	return results;
+};
 
-		// And combine the results
-		done = jQuery.merge( done, ret );
+Sizzle.matches = function(expr, set){
+	return Sizzle(expr, null, null, set);
+};
 
-		return done;
-	},
+Sizzle.find = function(expr, context){
+	var set, match;
 
-	classFilter: function(r,m,not){
-		m = " " + m + " ";
-		var tmp = [];
-		for ( var i = 0; r[i]; i++ ) {
-			var pass = (" " + r[i].className + " ").indexOf( m ) >= 0;
-			if ( !not && pass || not && !pass )
-				tmp.push( r[i] );
-		}
-		return tmp;
-	},
+	if ( !expr ) {
+		return [];
+	}
 
-	filter: function(t,r,not) {
-		var last;
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var type = Expr.order[i], match;
+		
+		if ( (match = Expr.match[ type ].exec( expr )) ) {
+			var left = RegExp.leftContext;
 
-		// Look for common filter expressions
-		while ( t && t != last ) {
-			last = t;
-
-			var p = jQuery.parse, m;
-
-			for ( var i = 0; p[i]; i++ ) {
-				m = p[i].exec( t );
-
-				if ( m ) {
-					// Remove what we just matched
-					t = t.substring( m[0].length );
-
-					m[2] = m[2].replace(/\\/g, "");
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context );
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
 					break;
 				}
 			}
+		}
+	}
 
-			if ( !m )
-				break;
+	if ( !set ) {
+		set = context.getElementsByTagName("*");
+	}
 
-			// :not() is a special case that can be optimized by
-			// keeping it out of the expression list
-			if ( m[1] == ":" && m[2] == "not" )
-				// optimize if only one selector found (most common case)
-				r = isSimple.test( m[3] ) ?
-					jQuery.filter(m[3], r, true).r :
-					jQuery( r ).not( m[3] );
+	return {set: set, expr: expr};
+};
 
-			// We can get a big speed boost by filtering by class here
-			else if ( m[1] == "." )
-				r = jQuery.classFilter(r, m[2], not);
+Sizzle.filter = function(expr, set, inplace, not){
+	var old = expr, result = [], curLoop = set, match, anyFound;
 
-			else if ( m[1] == "[" ) {
-				var tmp = [], type = m[3];
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.match[ type ].exec( expr )) != null ) {
+				var filter = Expr.filter[ type ], goodArray = null, goodPos = 0, found, item;
+				anyFound = false;
 
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ];
-
-					if ( z == null || /href|src|selected/.test(m[2]) )
-						z = jQuery.attr(a,m[2]) || '';
-
-					if ( (type == "" && !!z ||
-						 type == "=" && z == m[5] ||
-						 type == "!=" && z != m[5] ||
-						 type == "^=" && z && !z.indexOf(m[5]) ||
-						 type == "$=" && z.substr(z.length - m[5].length) == m[5] ||
-						 (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not )
-							tmp.push( a );
+				if ( curLoop == result ) {
+					result = [];
 				}
 
-				r = tmp;
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not );
 
-			// We can get a speed boost by handling nth-child here
-			} else if ( m[1] == ":" && m[2] == "nth-child" ) {
-				var merge = {}, tmp = [],
-					// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-					test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-						m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" ||
-						!/\D/.test(m[3]) && "0n+" + m[3] || m[3]),
-					// calculate the numbers (first)n+(last) including if they are negative
-					first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0;
+					if ( !match ) {
+						anyFound = found = true;
+					} else if ( match === true ) {
+						continue;
+					} else if ( match[0] === true ) {
+						goodArray = [];
+						var last = null, elem;
+						for ( var i = 0; (elem = curLoop[i]) !== undefined; i++ ) {
+							if ( elem && last !== elem ) {
+								goodArray.push( elem );
+								last = elem;
+							}
+						}
+					}
+				}
 
-				// loop through all the elements left in the jQuery object
-				for ( var i = 0, rl = r.length; i < rl; i++ ) {
-					var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode);
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) !== undefined; i++ ) {
+						if ( item ) {
+							if ( goodArray && item != goodArray[goodPos] ) {
+								goodPos++;
+							}
+	
+							found = filter( item, match, goodPos, goodArray );
+							var pass = not ^ !!found;
 
-					if ( !merge[id] ) {
-						var c = 1;
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+								} else {
+									curLoop[i] = false;
+								}
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
 
-						for ( var n = parentNode.firstChild; n; n = n.nextSibling )
-							if ( n.nodeType == 1 )
-								n.nodeIndex = c++;
-
-						merge[id] = true;
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
 					}
 
-					var add = false;
+					expr = expr.replace( Expr.match[ type ], "" );
 
-					if ( first == 0 ) {
-						if ( node.nodeIndex == last )
-							add = true;
-					} else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 )
-						add = true;
+					if ( !anyFound ) {
+						return [];
+					}
 
-					if ( add ^ not )
-						tmp.push( node );
+					break;
 				}
-
-				r = tmp;
-
-			// Otherwise, find the expression to execute
-			} else {
-				var fn = jQuery.expr[ m[1] ];
-				if ( typeof fn == "object" )
-					fn = fn[ m[2] ];
-
-				if ( typeof fn == "string" )
-					fn = eval("false||function(a,i){return " + fn + ";}");
-
-				// Execute it against the current filter
-				r = jQuery.grep( r, function(elem, i){
-					return fn(elem, i, m, r);
-				}, not );
 			}
 		}
 
-		// Return an array of filtered elements (r)
-		// and the modified expression string (t)
-		return { r: r, t: t };
-	},
+		expr = expr.replace(/\s*,\s*/, "");
 
-	dir: function( elem, dir ){
-		var matched = [],
-			cur = elem[dir];
-		while ( cur && cur != document ) {
-			if ( cur.nodeType == 1 )
-				matched.push( cur );
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function(cur,result,dir,elem){
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] )
-			if ( cur.nodeType == 1 && ++num == result )
+		// Improper expression
+		if ( expr == old ) {
+			if ( anyFound == null ) {
+				throw "Syntax error, unrecognized expression: " + expr;
+			} else {
 				break;
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType == 1 && n != elem )
-				r.push( n );
+			}
 		}
 
-		return r;
+		old = expr;
 	}
-});
+
+	return curLoop;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/
+	},
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+	attrHandle: {
+		href: function(elem){
+			return elem.getAttribute("href");
+		}
+	},
+	relative: {
+		"+": function(checkSet, part){
+			for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+				var elem = checkSet[i];
+				if ( elem ) {
+					var cur = elem.previousSibling;
+					while ( cur && cur.nodeType !== 1 ) {
+						cur = cur.previousSibling;
+					}
+					checkSet[i] = typeof part === "string" ?
+						cur || false :
+						cur === part;
+				}
+			}
+
+			if ( typeof part === "string" ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+		">": function(checkSet, part, isXML){
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = isXML ? part : part.toUpperCase();
+
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName === part ? parent : false;
+					}
+				}
+			} else {
+				for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+					var elem = checkSet[i];
+					if ( elem ) {
+						checkSet[i] = typeof part === "string" ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( typeof part === "string" ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+		"": function(checkSet, part, isXML){
+			var doneName = "done" + (done++), checkFn = dirCheck;
+
+			if ( !part.match(/\W/) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("parentNode", part, doneName, checkSet, nodeCheck, isXML);
+		},
+		"~": function(checkSet, part, isXML){
+			var doneName = "done" + (done++), checkFn = dirCheck;
+
+			if ( typeof part === "string" && !part.match(/\W/) ) {
+				var nodeCheck = part = isXML ? part : part.toUpperCase();
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn("previousSibling", part, doneName, checkSet, nodeCheck, isXML);
+		}
+	},
+	find: {
+		ID: function(match, context){
+			if ( context.getElementById ) {
+				var m = context.getElementById(match[1]);
+				return m ? [m] : [];
+			}
+		},
+		NAME: function(match, context){
+			return context.getElementsByName ? context.getElementsByName(match[1]) : null;
+		},
+		TAG: function(match, context){
+			return context.getElementsByTagName(match[1]);
+		}
+	},
+	preFilter: {
+		CLASS: function(match, curLoop, inplace, result, not){
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			for ( var i = 0; curLoop[i]; i++ ) {
+				if ( not ^ (" " + curLoop[i].className + " ").indexOf(match) >= 0 ) {
+					if ( !inplace )
+						result.push( curLoop[i] );
+				} else if ( inplace ) {
+					curLoop[i] = false;
+				}
+			}
+
+			return false;
+		},
+		ID: function(match){
+			return match[1].replace(/\\/g, "");
+		},
+		TAG: function(match, curLoop){
+			for ( var i = 0; !curLoop[i]; i++ ){}
+			return isXML(curLoop[i]) ? match[1] : match[1].toUpperCase();
+		},
+		CHILD: function(match){
+			if ( match[1] == "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] == "even" && "2n" || match[2] == "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = "done" + (done++);
+
+			return match;
+		},
+		ATTR: function(match){
+			var name = match[1];
+			
+			if ( Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+		PSEUDO: function(match, curLoop, inplace, result, not){
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( match[3].match(chunker).length > 1 ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+					return false;
+				}
+			} else if ( Expr.match.POS.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+		POS: function(match){
+			match.unshift( true );
+			return match;
+		}
+	},
+	filters: {
+		enabled: function(elem){
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+		disabled: function(elem){
+			return elem.disabled === true;
+		},
+		checked: function(elem){
+			return elem.checked === true;
+		},
+		selected: function(elem){
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			return elem.selected === true;
+		},
+		parent: function(elem){
+			return !!elem.firstChild;
+		},
+		empty: function(elem){
+			return !elem.firstChild;
+		},
+		has: function(elem, i, match){
+			return !!Sizzle( match[3], elem ).length;
+		},
+		header: function(elem){
+			return /h\d/i.test( elem.nodeName );
+		},
+		text: function(elem){
+			return "text" === elem.type;
+		},
+		radio: function(elem){
+			return "radio" === elem.type;
+		},
+		checkbox: function(elem){
+			return "checkbox" === elem.type;
+		},
+		file: function(elem){
+			return "file" === elem.type;
+		},
+		password: function(elem){
+			return "password" === elem.type;
+		},
+		submit: function(elem){
+			return "submit" === elem.type;
+		},
+		image: function(elem){
+			return "image" === elem.type;
+		},
+		reset: function(elem){
+			return "reset" === elem.type;
+		},
+		button: function(elem){
+			return "button" === elem.type || elem.nodeName.toUpperCase() === "BUTTON";
+		},
+		input: function(elem){
+			return /input|select|textarea|button/i.test(elem.nodeName);
+		}
+	},
+	setFilters: {
+		first: function(elem, i){
+			return i === 0;
+		},
+		last: function(elem, i, match, array){
+			return i === array.length - 1;
+		},
+		even: function(elem, i){
+			return i % 2 === 0;
+		},
+		odd: function(elem, i){
+			return i % 2 === 1;
+		},
+		lt: function(elem, i, match){
+			return i < match[3] - 0;
+		},
+		gt: function(elem, i, match){
+			return i > match[3] - 0;
+		},
+		nth: function(elem, i, match){
+			return match[3] - 0 == i;
+		},
+		eq: function(elem, i, match){
+			return match[3] - 0 == i;
+		}
+	},
+	filter: {
+		CHILD: function(elem, match){
+			var type = match[1], parent = elem.parentNode;
+
+			var doneName = "child" + parent.childNodes.length;
+			
+			if ( parent && (!parent[ doneName ] || !elem.nodeIndex) ) {
+				var count = 1;
+
+				for ( var node = parent.firstChild; node; node = node.nextSibling ) {
+					if ( node.nodeType == 1 ) {
+						node.nodeIndex = count++;
+					}
+				}
+
+				parent[ doneName ] = count - 1;
+			}
+
+			if ( type == "first" ) {
+				return elem.nodeIndex == 1;
+			} else if ( type == "last" ) {
+				return elem.nodeIndex == parent[ doneName ];
+			} else if ( type == "only" ) {
+				return parent[ doneName ] == 1;
+			} else if ( type == "nth" ) {
+				var add = false, first = match[2], last = match[3];
+
+				if ( first == 1 && last == 0 ) {
+					return true;
+				}
+
+				if ( first == 0 ) {
+					if ( elem.nodeIndex == last ) {
+						add = true;
+					}
+				} else if ( (elem.nodeIndex - last) % first == 0 && (elem.nodeIndex - last) / first >= 0 ) {
+					add = true;
+				}
+
+				return add;
+			}
+		},
+		PSEUDO: function(elem, match, i, array){
+			var name = match[1], filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || "").indexOf(match[3]) >= 0;
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var i = 0, l = not.length; i < l; i++ ) {
+					if ( not[i] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+		},
+		ID: function(elem, match){
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+		TAG: function(elem, match){
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName === match;
+		},
+		CLASS: function(elem, match){
+			return match.test( elem.className );
+		},
+		ATTR: function(elem, match){
+			var result = Expr.attrHandle[ match[1] ] ? Expr.attrHandle[ match[1] ]( elem ) : elem[ match[1] ] || elem.getAttribute( match[1] ), value = result + "", type = match[2], check = match[4];
+			return result == null ?
+				false :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!match[4] ?
+				result :
+				type === "!=" ?
+				value != check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+		POS: function(elem, match, i, array){
+			var name = match[2], filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = RegExp( Expr.match[ type ].source + /(?![^\[]*\])(?![^\(]*\))/.source );
+}
+
+var makeArray = function(array, results) {
+	array = Array.prototype.slice.call( array );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes );
+
+// Provide a fallback method if it does not work
+} catch(e){
+	makeArray = function(array, results) {
+		var ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var i = 0, l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+			} else {
+				for ( var i = 0; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("form"),
+		id = "script" + (new Date).getTime();
+	form.innerHTML = "<input name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	var root = document.documentElement;
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( !!document.getElementById( id ) ) {
+		Expr.find.ID = function(match, context){
+			if ( context.getElementById ) {
+				var m = context.getElementById(match[1]);
+				return m ? m.id === match[1] || m.getAttributeNode && m.getAttributeNode("id").nodeValue === match[1] ? [m] : undefined : [];
+			}
+		};
+
+		Expr.filter.ID = function(elem, match){
+			var node = elem.getAttributeNode && elem.getAttributeNode("id");
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function(match, context){
+			var results = context.getElementsByTagName(match[1]);
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+	if ( div.firstChild.getAttribute("href") !== "#" ) {
+		Expr.attrHandle.href = function(elem){
+			return elem.getAttribute("href", 2);
+		};
+	}
+})();
+
+if ( document.querySelectorAll ) (function(){
+	var oldSizzle = Sizzle;
+	
+	Sizzle = function(query, context, extra, seed){
+		context = context || document;
+
+		if ( !seed && context.nodeType === 9 ) {
+			try {
+				return makeArray( context.querySelectorAll(query), extra );
+			} catch(e){}
+		}
+		
+		return oldSizzle(query, context, extra, seed);
+	};
+
+	Sizzle.find = oldSizzle.find;
+	Sizzle.filter = oldSizzle.filter;
+	Sizzle.selectors = oldSizzle.selectors;
+	Sizzle.matches = oldSizzle.matches;
+})();
+
+if ( document.documentElement.getElementsByClassName ) {
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function(match, context) {
+		return context.getElementsByClassName(match[1]);
+	};
+}
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem && elem.nodeType ) {
+				var done = elem[doneName];
+				if ( done ) {
+					match = checkSet[ done ];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML )
+					elem[doneName] = i;
+
+				if ( elem.nodeName === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+		if ( elem ) {
+			elem = elem[dir];
+			var match = false;
+
+			while ( elem && elem.nodeType ) {
+				if ( elem[doneName] ) {
+					match = checkSet[ elem[doneName] ];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML )
+						elem[doneName] = i;
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+var contains = document.compareDocumentPosition ?  function(a, b){
+	return a.compareDocumentPosition(b) & 16;
+} : function(a, b){
+	return a !== b && (a.contains ? a.contains(b) : true);
+};
+
+var isXML = function(elem){
+	return elem.documentElement && !elem.body ||
+		elem.tagName && elem.ownerDocument && !elem.ownerDocument.body;
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.filter = Sizzle.filter;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+
+Sizzle.selectors.filters.hidden = function(elem){
+	return "hidden" === elem.type ||
+		jQuery.css(elem, "display") === "none" ||
+		jQuery.css(elem, "visibility") === "hidden";
+};
+
+Sizzle.selectors.filters.visible = function(elem){
+	return "hidden" !== elem.type &&
+		jQuery.css(elem, "display") !== "none" &&
+		jQuery.css(elem, "visibility") !== "hidden";
+};
+
+Sizzle.selectors.filters.animated = function(elem){
+	return jQuery.grep(jQuery.timers, function(fn){
+		return elem === fn.elem;
+	}).length;
+};
+
+jQuery.multiFilter = function( expr, elems, not ) {
+	if ( not ) {
+		expr = ":not(" + expr + ")";
+	}
+
+	return Sizzle.matches(expr, elems);
+};
+
+jQuery.dir = function( elem, dir ){
+	var matched = [], cur = elem[dir];
+	while ( cur && cur != document ) {
+		if ( cur.nodeType == 1 )
+			matched.push( cur );
+		cur = cur[dir];
+	}
+	return matched;
+};
+
+jQuery.nth = function(cur, result, dir, elem){
+	result = result || 1;
+	var num = 0;
+
+	for ( ; cur; cur = cur[dir] )
+		if ( cur.nodeType == 1 && ++num == result )
+			break;
+
+	return cur;
+};
+
+jQuery.sibling = function(n, elem){
+	var r = [];
+
+	for ( ; n; n = n.nextSibling ) {
+		if ( n.nodeType == 1 && n != elem )
+			r.push( n );
+	}
+
+	return r;
+};
+
+return;
+
+window.Sizzle = Sizzle;
+
+})();
 /*
  * A number of helper functions used for managing events.
- * Many of the ideas behind this code orignated from
+ * Many of the ideas behind this code originated from
  * Dean Edwards' addEvent library.
  */
 jQuery.event = {
@@ -1827,7 +2317,7 @@ jQuery.event = {
 
 		// For whatever reason, IE has trouble passing the window object
 		// around, causing it to be cloned in the process
-		if ( jQuery.browser.msie && elem.setInterval )
+		if ( elem.setInterval && elem != window )
 			elem = window;
 
 		// Make sure that the function being executed has a unique ID
@@ -1835,15 +2325,12 @@ jQuery.event = {
 			handler.guid = this.guid++;
 
 		// if data is passed, bind to handler
-		if( data != undefined ) {
+		if ( data !== undefined ) {
 			// Create temporary function pointer to original handler
 			var fn = handler;
 
 			// Create unique handler function, wrapped around original handler
-			handler = this.proxy( fn, function() {
-				// Pass arguments and context to original handler
-				return fn.apply(this, arguments);
-			});
+			handler = this.proxy( fn );
 
 			// Store data in unique handler
 			handler.data = data;
@@ -1854,8 +2341,9 @@ jQuery.event = {
 			handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){
 				// Handle the second event of a trigger and when
 				// an event is called after a page has unloaded
-				if ( typeof jQuery != "undefined" && !jQuery.event.triggered )
-					return jQuery.event.handle.apply(arguments.callee.elem, arguments);
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply(arguments.callee.elem, arguments) :
+					undefined;
 			});
 		// Add elem as a property of the handle function
 		// This is to prevent a memory leak with non-native
@@ -1866,12 +2354,15 @@ jQuery.event = {
 		// jQuery(...).bind("mouseover mouseout", fn);
 		jQuery.each(types.split(/\s+/), function(index, type) {
 			// Namespaced event handlers
-			var parts = type.split(".");
-			type = parts[0];
-			handler.type = parts[1];
+			var namespaces = type.split(".");
+			type = namespaces.shift();
+			handler.type = namespaces.slice().sort().join(".");
 
 			// Get the current list of functions bound to this event
 			var handlers = events[type];
+			
+			if ( jQuery.event.specialAll[type] )
+				jQuery.event.specialAll[type].setup.call(elem, data, namespaces);
 
 			// Init the event handler queue
 			if (!handlers) {
@@ -1880,7 +2371,7 @@ jQuery.event = {
 				// Check for a special event handler
 				// Only use addEventListener/attachEvent if the special
 				// events handler returns false
-				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) {
+				if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem, data, namespaces) === false ) {
 					// Bind the global event handler to the element
 					if (elem.addEventListener)
 						elem.addEventListener(type, handle, false);
@@ -1913,7 +2404,7 @@ jQuery.event = {
 
 		if ( events ) {
 			// Unbind all events for the element
-			if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") )
+			if ( types === undefined || (typeof types === "string" && types.charAt(0) == ".") )
 				for ( var type in events )
 					this.remove( elem, type + (types || "") );
 			else {
@@ -1927,8 +2418,9 @@ jQuery.event = {
 				// jQuery(...).unbind("mouseover mouseout", fn);
 				jQuery.each(types.split(/\s+/), function(index, type){
 					// Namespaced event handlers
-					var parts = type.split(".");
-					type = parts[0];
+					var namespaces = type.split(".");
+					type = namespaces.shift();
+					var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
 
 					if ( events[type] ) {
 						// remove the given handler for the given type
@@ -1937,15 +2429,18 @@ jQuery.event = {
 
 						// remove all handlers for the given type
 						else
-							for ( handler in events[type] )
+							for ( var handle in events[type] )
 								// Handle the removal of namespaced events
-								if ( !parts[1] || events[type][handler].type == parts[1] )
-									delete events[type][handler];
+								if ( namespace.test(events[type][handle].type) )
+									delete events[type][handle];
+									
+						if ( jQuery.event.specialAll[type] )
+							jQuery.event.specialAll[type].teardown.call(elem, namespaces);
 
 						// remove generic event handler if no more handlers exist
 						for ( ret in events[type] ) break;
 						if ( !ret ) {
-							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) {
+							if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem, namespaces) === false ) {
 								if (elem.removeEventListener)
 									elem.removeEventListener(type, jQuery.data(elem, "handle"), false);
 								else if (elem.detachEvent)
@@ -1969,97 +2464,95 @@ jQuery.event = {
 		}
 	},
 
-	trigger: function(type, data, elem, donative, extra) {
-		// Clone the incoming data, if any
-		data = jQuery.makeArray(data);
+	// bubbling is internal
+	trigger: function( event, data, elem, bubbling ) {
+		// Event object or event type
+		var type = event.type || event;
 
-		if ( type.indexOf("!") >= 0 ) {
-			type = type.slice(0, -1);
-			var exclusive = true;
-		}
+		if( !bubbling ){
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[expando] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
 
-		// Handle a global trigger
-		if ( !elem ) {
-			// Only trigger if we've ever bound an event for it
-			if ( this.global[type] )
-				jQuery("*").add([window, document]).trigger(type, data);
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+				// Only trigger if we've ever bound an event for it
+				if ( this.global[type] )
+					jQuery.each( jQuery.cache, function(){
+						if ( this.events && this.events[type] )
+							jQuery.event.trigger( event, data, this.handle.elem );
+					});
+			}
+
+			// Handle triggering a single element
 
-		// Handle triggering a single element
-		} else {
 			// don't do events on text and comment nodes
-			if ( elem.nodeType == 3 || elem.nodeType == 8 )
+			if ( !elem || elem.nodeType == 3 || elem.nodeType == 8 )
 				return undefined;
-
-			var val, ret, fn = jQuery.isFunction( elem[ type ] || null ),
-				// Check to see if we need to provide a fake event, or not
-				event = !data[0] || !data[0].preventDefault;
-
-			// Pass along a fake event
-			if ( event ) {
-				data.unshift({
-					type: type,
-					target: elem,
-					preventDefault: function(){},
-					stopPropagation: function(){},
-					timeStamp: now()
-				});
-				data[0][expando] = true; // no need to fix fake event
-			}
-
-			// Enforce the right trigger type
-			data[0].type = type;
-			if ( exclusive )
-				data[0].exclusive = true;
-
-			// Trigger the event, it is assumed that "handle" is a function
-			var handle = jQuery.data(elem, "handle");
-			if ( handle )
-				val = handle.apply( elem, data );
-
-			// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
-			if ( (!fn || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
-				val = false;
-
-			// Extra functions don't get the custom event object
-			if ( event )
-				data.shift();
-
-			// Handle triggering of extra function
-			if ( extra && jQuery.isFunction( extra ) ) {
-				// call the extra function and tack the current return value on the end for possible inspection
-				ret = extra.apply( elem, val == null ? data : data.concat( val ) );
-				// if anything is returned, give it precedence and have it overwrite the previous value
-				if (ret !== undefined)
-					val = ret;
-			}
-
-			// Trigger the native events (except for clicks on links)
-			if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
-				this.triggered = true;
-				try {
-					elem[ type ]();
-				// prevent IE from throwing an error for some hidden elements
-				} catch (e) {}
-			}
-
-			this.triggered = false;
+			
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+			
+			// Clone the incoming data, if any
+			data = jQuery.makeArray(data);
+			data.unshift( event );
 		}
 
-		return val;
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = jQuery.data(elem, "handle");
+		if ( handle )
+			handle.apply( elem, data );
+
+		// Handle triggering native .onfoo handlers (and on links since we don't call .click() for links)
+		if ( (!elem[type] || (jQuery.nodeName(elem, 'a') && type == "click")) && elem["on"+type] && elem["on"+type].apply( elem, data ) === false )
+			event.result = false;
+
+		// Trigger the native events (except for clicks on links)
+		if ( !bubbling && elem[type] && !event.isDefaultPrevented() && !(jQuery.nodeName(elem, 'a') && type == "click") ) {
+			this.triggered = true;
+			try {
+				elem[ type ]();
+			// prevent IE from throwing an error for some hidden elements
+			} catch (e) {}
+		}
+
+		this.triggered = false;
+
+		if ( !event.isPropagationStopped() ) {
+			var parent = elem.parentNode || elem.ownerDocument;
+			if ( parent )
+				jQuery.event.trigger(event, data, parent, true);
+		}
 	},
 
 	handle: function(event) {
 		// returned undefined or false
-		var val, ret, namespace, all, handlers;
+		var all, handlers;
 
 		event = arguments[0] = jQuery.event.fix( event || window.event );
 
 		// Namespaced event handlers
-		namespace = event.type.split(".");
-		event.type = namespace[0];
-		namespace = namespace[1];
+		var namespaces = event.type.split(".");
+		event.type = namespaces.shift();
+
 		// Cache this now, all = true means, any handler
-		all = !namespace && !event.exclusive;
+		all = !namespaces.length && !event.exclusive;
+		
+		var namespace = RegExp("(^|\\.)" + namespaces.slice().sort().join(".*\\.") + "(\\.|$)");
 
 		handlers = ( jQuery.data(this, "events") || {} )[event.type];
 
@@ -2067,61 +2560,44 @@ jQuery.event = {
 			var handler = handlers[j];
 
 			// Filter the functions by class
-			if ( all || handler.type == namespace ) {
+			if ( all || namespace.test(handler.type) ) {
 				// Pass in a reference to the handler function itself
 				// So that we can later remove it
 				event.handler = handler;
 				event.data = handler.data;
 
-				ret = handler.apply( this, arguments );
+				var ret = handler.apply(this, arguments);
 
-				if ( val !== false )
-					val = ret;
-
-				if ( ret === false ) {
-					event.preventDefault();
-					event.stopPropagation();
+				if( ret !== undefined ){
+					event.result = ret;
+					if ( ret === false ) {
+						event.preventDefault();
+						event.stopPropagation();
+					}
 				}
+
+				if( event.isImmediatePropagationStopped() )
+					break;
+
 			}
 		}
-
-		return val;
 	},
 
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
 	fix: function(event) {
-		if ( event[expando] == true )
+		if ( event[expando] )
 			return event;
 
 		// store a copy of the original event object
 		// and "clone" to set read-only properties
 		var originalEvent = event;
-		event = { originalEvent: originalEvent };
-		var props = "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");
-		for ( var i=props.length; i; i-- )
-			event[ props[i] ] = originalEvent[ props[i] ];
+		event = jQuery.Event( originalEvent );
 
-		// Mark it as fixed
-		event[expando] = true;
-
-		// add preventDefault and stopPropagation since
-		// they will not work on the clone
-		event.preventDefault = function() {
-			// if preventDefault exists run it on the original event
-			if (originalEvent.preventDefault)
-				originalEvent.preventDefault();
-			// otherwise set the returnValue property of the original event to false (IE)
-			originalEvent.returnValue = false;
-		};
-		event.stopPropagation = function() {
-			// if stopPropagation exists run it on the original event
-			if (originalEvent.stopPropagation)
-				originalEvent.stopPropagation();
-			// otherwise set the cancelBubble property of the original event to true (IE)
-			originalEvent.cancelBubble = true;
-		};
-
-		// Fix timeStamp
-		event.timeStamp = event.timeStamp || now();
+		for ( var i = this.props.length, prop; i; ){
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
 
 		// Fix target property, if necessary
 		if ( !event.target )
@@ -2159,6 +2635,7 @@ jQuery.event = {
 	},
 
 	proxy: function( fn, proxy ){
+		proxy = proxy || function(){ return fn.apply(this, arguments); };
 		// Set the guid of unique handler to the same of original handler, so it can be removed
 		proxy.guid = fn.guid = fn.guid || proxy.guid || this.guid++;
 		// So proxy can be declared as an argument
@@ -2167,61 +2644,129 @@ jQuery.event = {
 
 	special: {
 		ready: {
-			setup: function() {
-				// Make sure the ready event is setup
-				bindReady();
-				return;
+			// Make sure the ready event is setup
+			setup: bindReady,
+			teardown: function() {}
+		}
+	},
+	
+	specialAll: {
+		live: {
+			setup: function( selector, namespaces ){
+				jQuery.event.add( this, namespaces[0], liveHandler );
 			},
-
-			teardown: function() { return; }
-		},
-
-		mouseenter: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseenter
-				event.type = "mouseenter";
-				return jQuery.event.handle.apply(this, arguments);
-			}
-		},
-
-		mouseleave: {
-			setup: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			teardown: function() {
-				if ( jQuery.browser.msie ) return false;
-				jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler);
-				return true;
-			},
-
-			handler: function(event) {
-				// If we actually just moused on to a sub-element, ignore it
-				if ( withinElement(event, this) ) return true;
-				// Execute the right handlers by setting the event type to mouseleave
-				event.type = "mouseleave";
-				return jQuery.event.handle.apply(this, arguments);
+			teardown:  function( namespaces ){
+				if ( namespaces.length ) {
+					var remove = 0, name = RegExp("(^|\\.)" + namespaces[0] + "(\\.|$)");
+					
+					jQuery.each( (jQuery.data(this, "events").live || {}), function(){
+						if ( name.test(this.type) )
+							remove++;
+					});
+					
+					if ( remove < 1 )
+						jQuery.event.remove( this, namespaces[0], liveHandler );
+				}
 			}
 		}
 	}
 };
 
+jQuery.Event = function( src ){
+	// Allow instantiation without the 'new' keyword
+	if( !this.preventDefault )
+		return new jQuery.Event(src);
+	
+	// Event object
+	if( src && src.type ){
+		this.originalEvent = src;
+		this.type = src.type;
+		this.timeStamp = src.timeStamp;
+	// Event type
+	}else
+		this.type = src;
+
+	if( !this.timeStamp )
+		this.timeStamp = now();
+	
+	// Mark it as fixed
+	this[expando] = true;
+};
+
+function returnFalse(){
+	return false;
+}
+function returnTrue(){
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if( !e )
+			return;
+		// if preventDefault exists run it on the original event
+		if (e.preventDefault)
+			e.preventDefault();
+		// otherwise set the returnValue property of the original event to false (IE)
+		e.returnValue = false;
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if( !e )
+			return;
+		// if stopPropagation exists run it on the original event
+		if (e.stopPropagation)
+			e.stopPropagation();
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation:function(){
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function(event) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+	// Traverse up the tree
+	while ( parent && parent != this )
+		try { parent = parent.parentNode; }
+		catch(e) { parent = this; }
+	
+	if( parent != this ){
+		// set the correct event type
+		event.type = event.data;
+		// handle event if we actually just moused on to a non sub-element
+		jQuery.event.handle.apply( this, arguments );
+	}
+};
+	
+jQuery.each({ 
+	mouseover: 'mouseenter', 
+	mouseout: 'mouseleave'
+}, function( orig, fix ){
+	jQuery.event.special[ fix ] = {
+		setup: function(){
+			jQuery.event.add( this, orig, withinElement, fix );
+		},
+		teardown: function(){
+			jQuery.event.remove( this, orig, withinElement );
+		}
+	};			   
+});
+
 jQuery.fn.extend({
 	bind: function( type, data, fn ) {
 		return type == "unload" ? this.one(type, data, fn) : this.each(function(){
@@ -2245,14 +2790,20 @@ jQuery.fn.extend({
 		});
 	},
 
-	trigger: function( type, data, fn ) {
+	trigger: function( type, data ) {
 		return this.each(function(){
-			jQuery.event.trigger( type, data, this, true, fn );
+			jQuery.event.trigger( type, data, this );
 		});
 	},
 
-	triggerHandler: function( type, data, fn ) {
-		return this[0] && jQuery.event.trigger( type, data, this[0], false, fn );
+	triggerHandler: function( type, data ) {
+		if( this[0] ){
+			var event = jQuery.Event(type);
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}		
 	},
 
 	toggle: function( fn ) {
@@ -2276,7 +2827,7 @@ jQuery.fn.extend({
 	},
 
 	hover: function(fnOver, fnOut) {
-		return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut);
+		return this.mouseenter(fnOver).mouseleave(fnOut);
 	},
 
 	ready: function(fn) {
@@ -2291,12 +2842,52 @@ jQuery.fn.extend({
 		// Otherwise, remember the function for later
 		else
 			// Add the function to the wait list
-			jQuery.readyList.push( function() { return fn.call(this, jQuery); } );
+			jQuery.readyList.push( fn );
 
 		return this;
+	},
+	
+	live: function( type, fn ){
+		var proxy = jQuery.event.proxy( fn );
+		proxy.guid += this.selector + type;
+
+		jQuery(document).bind( liveConvert(type, this.selector), this.selector, proxy );
+
+		return this;
+	},
+	
+	die: function( type, fn ){
+		jQuery(document).unbind( liveConvert(type, this.selector), fn ? { guid: fn.guid + this.selector + type } : null );
+		return this;
 	}
 });
 
+function liveHandler( event ){
+	var check = RegExp("(^|\\.)" + event.type + "(\\.|$)"),
+		stop = true,
+		elems = [];
+
+	jQuery.each(jQuery.data(this, "events").live || [], function(i, fn){
+		if ( check.test(fn.type) ) {
+			var elem = jQuery(event.target).closest(fn.data)[0];
+			if ( elem )
+				elems.push({ elem: elem, fn: fn });
+		}
+	});
+
+	jQuery.each(elems, function(){
+		if ( !event.isImmediatePropagationStopped() &&
+			this.fn.call(this.elem, event, this.fn.data) === false )
+				stop = false;
+	});
+
+	return stop;
+}
+
+function liveConvert(type, selector){
+	return ["live", type, selector.replace(/\./g, "`").replace(/ /g, "|")].join(".");
+}
+
 jQuery.extend({
 	isReady: false,
 	readyList: [],
@@ -2311,7 +2902,7 @@ jQuery.extend({
 			if ( jQuery.readyList ) {
 				// Execute all of them
 				jQuery.each( jQuery.readyList, function(){
-					this.call( document );
+					this.call( document, jQuery );
 				});
 
 				// Reset the list of functions
@@ -2330,53 +2921,39 @@ function bindReady(){
 	if ( readyBound ) return;
 	readyBound = true;
 
-	// Mozilla, Opera (see further below for it) and webkit nightlies currently support this event
-	if ( document.addEventListener && !jQuery.browser.opera)
+	// Mozilla, Opera and webkit nightlies currently support this event
+	if ( document.addEventListener ) {
 		// Use the handy event callback
-		document.addEventListener( "DOMContentLoaded", jQuery.ready, false );
-
-	// If IE is used and is not in a frame
-	// Continually check to see if the document is ready
-	if ( jQuery.browser.msie && window == top ) (function(){
-		if (jQuery.isReady) return;
-		try {
-			// If IE is used, use the trick by Diego Perini
-			// http://javascript.nwbox.com/IEContentLoaded/
-			document.documentElement.doScroll("left");
-		} catch( error ) {
-			setTimeout( arguments.callee, 0 );
-			return;
-		}
-		// and execute any waiting functions
-		jQuery.ready();
-	})();
-
-	if ( jQuery.browser.opera )
-		document.addEventListener( "DOMContentLoaded", function () {
-			if (jQuery.isReady) return;
-			for (var i = 0; i < document.styleSheets.length; i++)
-				if (document.styleSheets[i].disabled) {
-					setTimeout( arguments.callee, 0 );
-					return;
-				}
-			// and execute any waiting functions
+		document.addEventListener( "DOMContentLoaded", function(){
+			document.removeEventListener( "DOMContentLoaded", arguments.callee, false );
 			jQuery.ready();
-		}, false);
+		}, false );
 
-	if ( jQuery.browser.safari ) {
-		var numStyles;
-		(function(){
-			if (jQuery.isReady) return;
-			if ( document.readyState != "loaded" && document.readyState != "complete" ) {
-				setTimeout( arguments.callee, 0 );
-				return;
-			}
-			if ( numStyles === undefined )
-				numStyles = jQuery("style, link[rel=stylesheet]").length;
-			if ( document.styleSheets.length != numStyles ) {
+	// If IE event model is used
+	} else if ( document.attachEvent ) {
+		// ensure firing before onload,
+		// maybe late but safe also for iframes
+		document.attachEvent("onreadystatechange", function(){
+			if ( document.readyState === "complete" ) {
+				document.detachEvent( "onreadystatechange", arguments.callee );
+				jQuery.ready();
+			}
+		});
+
+		// If IE and not an iframe
+		// continually check to see if the document is ready
+		if ( document.documentElement.doScroll && !window.frameElement ) (function(){
+			if ( jQuery.isReady ) return;
+
+			try {
+				// If IE is used, use the trick by Diego Perini
+				// http://javascript.nwbox.com/IEContentLoaded/
+				document.documentElement.doScroll("left");
+			} catch( error ) {
 				setTimeout( arguments.callee, 0 );
 				return;
 			}
+
 			// and execute any waiting functions
 			jQuery.ready();
 		})();
@@ -2387,8 +2964,8 @@ function bindReady(){
 }
 
 jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
-	"mousedown,mouseup,mousemove,mouseover,mouseout,change,select," +
-	"submit,keydown,keypress,keyup,error").split(","), function(i, name){
+	"mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave," +
+	"change,select,submit,keydown,keypress,keyup,error").split(","), function(i, name){
 
 	// Handle event binding
 	jQuery.fn[name] = function(fn){
@@ -2396,29 +2973,134 @@ jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," +
 	};
 });
 
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function(event, elem) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-	// Traverse up the tree
-	while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; }
-	// Return true if we actually just moused on to a sub-element
-	return parent == elem;
-};
-
 // Prevent memory leaks in IE
 // And prevent errors on refresh with events like mouseover in other browsers
 // Window isn't included so as not to unbind existing unload events
-jQuery(window).bind("unload", function() {
-	jQuery("*").add(document).unbind();
-});
+jQuery( window ).bind( 'unload', function(){ 
+	for ( var id in jQuery.cache )
+		// Skip the window
+		if ( id != 1 && jQuery.cache[ id ].handle )
+			jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+}); 
+(function(){
+
+	jQuery.support = {};
+
+	var root = document.documentElement,
+		script = document.createElement("script"),
+		div = document.createElement("div"),
+		id = "script" + (new Date).getTime();
+
+	div.style.display = "none";
+	div.innerHTML = '   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType == 3,
+		
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+		
+		// Make sure that you can get all elements in an <object> element
+		// IE 7 always returns no results
+		objectAll: !!div.getElementsByTagName("object")[0]
+			.getElementsByTagName("*").length,
+		
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+		
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+		
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+		
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		opacity: a.style.opacity === "0.5",
+		
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Will be defined later
+		scriptEval: false,
+		noCloneEvent: true,
+		boxModel: null
+	};
+	
+	script.type = "text/javascript";
+	try {
+		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+	} catch(e){}
+
+	root.insertBefore( script, root.firstChild );
+	
+	// Make sure that the execution of code works by injecting a script
+	// tag with appendChild/createTextNode
+	// (IE doesn't support this, fails, and uses .text instead)
+	if ( window[ id ] ) {
+		jQuery.support.scriptEval = true;
+		delete window[ id ];
+	}
+
+	root.removeChild( script );
+
+	if ( div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function(){
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", arguments.callee);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function(){
+		var div = document.createElement("div");
+		div.style.width = "1px";
+		div.style.paddingLeft = "1px";
+
+		document.body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+		document.body.removeChild( div );
+	});
+})();
+
+var styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat";
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	"float": styleFloat,
+	cssFloat: styleFloat,
+	styleFloat: styleFloat,
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	tabindex: "tabIndex"
+};
 jQuery.fn.extend({
 	// Keep a copy of the old load
 	_load: jQuery.fn.load,
 
 	load: function( url, params, callback ) {
-		if ( typeof url != 'string' )
+		if ( typeof url !== "string" )
 			return this._load( url );
 
 		var off = url.indexOf(" ");
@@ -2427,8 +3109,6 @@ jQuery.fn.extend({
 			url = url.slice(0, off);
 		}
 
-		callback = callback || function(){};
-
 		// Default to a GET request
 		var type = "GET";
 
@@ -2441,7 +3121,7 @@ jQuery.fn.extend({
 				params = null;
 
 			// Otherwise, build a param string
-			} else {
+			} else if( typeof params === "object" ) {
 				params = jQuery.param( params );
 				type = "POST";
 			}
@@ -2471,7 +3151,8 @@ jQuery.fn.extend({
 						// If not, just inject the full result
 						res.responseText );
 
-				self.each( callback, [res.responseText, status, res] );
+				if( callback )
+					self.each( callback, [res.responseText, status, res] );
 			}
 		});
 		return this;
@@ -2482,8 +3163,7 @@ jQuery.fn.extend({
 	},
 	serializeArray: function() {
 		return this.map(function(){
-			return jQuery.nodeName(this, "form") ?
-				jQuery.makeArray(this.elements) : this;
+			return this.elements ? jQuery.makeArray(this.elements) : this;
 		})
 		.filter(function(){
 			return this.name && !this.disabled &&
@@ -2493,7 +3173,7 @@ jQuery.fn.extend({
 		.map(function(i, elem){
 			var val = jQuery(this).val();
 			return val == null ? null :
-				val.constructor == Array ?
+				jQuery.isArray(val) ?
 					jQuery.map( val, function(val, i){
 						return {name: elem.name, value: val};
 					}) :
@@ -2512,6 +3192,7 @@ jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".sp
 var jsc = now();
 
 jQuery.extend({
+  
 	get: function( url, data, callback, type ) {
 		// shift arguments if data argument was ommited
 		if ( jQuery.isFunction( data ) ) {
@@ -2559,13 +3240,21 @@ jQuery.extend({
 		url: location.href,
 		global: true,
 		type: "GET",
-		timeout: 0,
 		contentType: "application/x-www-form-urlencoded",
 		processData: true,
 		async: true,
+		/*
+		timeout: 0,
 		data: null,
 		username: null,
 		password: null,
+		*/
+		// Create the request object; Microsoft failed to properly
+		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
+		// This function can be overriden by calling jQuery.ajaxSetup
+		xhr:function(){
+			return window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+		},
 		accepts: {
 			xml: "application/xml, text/xml",
 			html: "text/html",
@@ -2588,7 +3277,7 @@ jQuery.extend({
 			type = s.type.toUpperCase();
 
 		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data != "string" )
+		if ( s.data && s.processData && typeof s.data !== "string" )
 			s.data = jQuery.param(s.data);
 
 		// Handle JSONP Parameter Callbacks
@@ -2651,12 +3340,13 @@ jQuery.extend({
 			jQuery.event.trigger( "ajaxStart" );
 
 		// Matches an absolute URL, and saves the domain
-		var remote = /^(?:\w+:)?\/\/([^\/?#]+)/;
+		var parts = /^(\w+:)?\/\/([^\/?#]+)/.exec( s.url );
 
 		// If we're requesting a remote document
 		// and trying to load JSON or Script with a GET
-		if ( s.dataType == "script" && type == "GET"
-				&& remote.test(s.url) && remote.exec(s.url)[1] != location.host ){
+		if ( s.dataType == "script" && type == "GET" && parts
+			&& ( parts[1] && parts[1] != location.protocol || parts[2] != location.host )){
+
 			var head = document.getElementsByTagName("head")[0];
 			var script = document.createElement("script");
 			script.src = s.url;
@@ -2687,9 +3377,8 @@ jQuery.extend({
 
 		var requestDone = false;
 
-		// Create the request object; Microsoft failed to properly
-		// implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available
-		var xhr = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest();
+		// Create the request object
+		var xhr = s.xhr();
 
 		// Open the socket
 		// Passing null username, generates a login popup on Opera (#2865)
@@ -2718,10 +3407,11 @@ jQuery.extend({
 				s.accepts._default );
 		} catch(e){}
 
-		// Allow custom headers/mimetypes
+		// Allow custom headers/mimetypes and early abort
 		if ( s.beforeSend && s.beforeSend(xhr, s) === false ) {
-			// cleanup active request counter
-			s.global && jQuery.active--;
+			// Handle the global AJAX counter
+			if ( s.global && ! --jQuery.active )
+				jQuery.event.trigger( "ajaxStop" );
 			// close opended socket
 			xhr.abort();
 			return false;
@@ -2732,8 +3422,18 @@ jQuery.extend({
 
 		// Wait for a response to come back
 		var onreadystatechange = function(isTimeout){
+			// The request was aborted, clear the interval and decrement jQuery.active
+			if (xhr.readyState == 0) {
+				if (ival) {
+					// clear poll interval
+					clearInterval(ival);
+					ival = null;
+					// Handle the global AJAX counter
+					if ( s.global && ! --jQuery.active )
+						jQuery.event.trigger( "ajaxStop" );
+				}
 			// The transfer is complete and the data is available, or the request timed out
-			if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
+			} else if ( !requestDone && xhr && (xhr.readyState == 4 || isTimeout == "timeout") ) {
 				requestDone = true;
 
 				// clear poll interval
@@ -2742,16 +3442,16 @@ jQuery.extend({
 					ival = null;
 				}
 
-				status = isTimeout == "timeout" && "timeout" ||
-					!jQuery.httpSuccess( xhr ) && "error" ||
-					s.ifModified && jQuery.httpNotModified( xhr, s.url ) && "notmodified" ||
+				status = isTimeout == "timeout" ? "timeout" :
+					!jQuery.httpSuccess( xhr ) ? "error" :
+					s.ifModified && jQuery.httpNotModified( xhr, s.url ) ? "notmodified" :
 					"success";
 
 				if ( status == "success" ) {
 					// Watch for, and catch, XML document parse errors
 					try {
 						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s.dataFilter );
+						data = jQuery.httpData( xhr, s.dataType, s );
 					} catch(e) {
 						status = "parsererror";
 					}
@@ -2792,11 +3492,12 @@ jQuery.extend({
 				setTimeout(function(){
 					// Check to see if the request is still happening
 					if ( xhr ) {
-						// Cancel the request
-						xhr.abort();
-
 						if( !requestDone )
 							onreadystatechange( "timeout" );
+
+						// Cancel the request
+						if ( xhr )
+							xhr.abort();
 					}
 				}, s.timeout);
 		}
@@ -2857,8 +3558,7 @@ jQuery.extend({
 		try {
 			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
 			return !xhr.status && location.protocol == "file:" ||
-				( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223 ||
-				jQuery.browser.safari && xhr.status == undefined;
+				( xhr.status >= 200 && xhr.status < 300 ) || xhr.status == 304 || xhr.status == 1223;
 		} catch(e){}
 		return false;
 	},
@@ -2869,13 +3569,12 @@ jQuery.extend({
 			var xhrRes = xhr.getResponseHeader("Last-Modified");
 
 			// Firefox always returns 200. check Last-Modified date
-			return xhr.status == 304 || xhrRes == jQuery.lastModified[url] ||
-				jQuery.browser.safari && xhr.status == undefined;
+			return xhr.status == 304 || xhrRes == jQuery.lastModified[url];
 		} catch(e){}
 		return false;
 	},
 
-	httpData: function( xhr, type, filter ) {
+	httpData: function( xhr, type, s ) {
 		var ct = xhr.getResponseHeader("content-type"),
 			xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0,
 			data = xml ? xhr.responseXML : xhr.responseText;
@@ -2884,31 +3583,40 @@ jQuery.extend({
 			throw "parsererror";
 			
 		// Allow a pre-filtering function to sanitize the response
-		if( filter )
-			data = filter( data, type );
+		// s != null is checked to keep backwards compatibility
+		if( s && s.dataFilter )
+			data = s.dataFilter( data, type );
 
-		// If the type is "script", eval it in global context
-		if ( type == "script" )
-			jQuery.globalEval( data );
+		// The filter can actually parse the response
+		if( typeof data === "string" ){
 
-		// Get the JavaScript object, if JSON is used.
-		if ( type == "json" )
-			data = eval("(" + data + ")");
+			// If the type is "script", eval it in global context
+			if ( type == "script" )
+				jQuery.globalEval( data );
 
+			// Get the JavaScript object, if JSON is used.
+			if ( type == "json" )
+				data = window["eval"]("(" + data + ")");
+		}
+		
 		return data;
 	},
 
 	// Serialize an array of form elements or a set of
 	// key/values into a query string
 	param: function( a ) {
-		var s = [];
+		var s = [ ];
+
+		function add( key, value ){
+			s[ s.length ] = encodeURIComponent(key) + '=' + encodeURIComponent(value);
+		};
 
 		// If an array was passed in, assume that it is an array
 		// of form elements
-		if ( a.constructor == Array || a.jquery )
+		if ( jQuery.isArray(a) || a.jquery )
 			// Serialize the form elements
 			jQuery.each( a, function(){
-				s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) );
+				add( this.name, this.value );
 			});
 
 		// Otherwise, assume that it's an object of key/value pairs
@@ -2916,83 +3624,99 @@ jQuery.extend({
 			// Serialize the key/values
 			for ( var j in a )
 				// If the value is an array then the key names need to be repeated
-				if ( a[j] && a[j].constructor == Array )
+				if ( jQuery.isArray(a[j]) )
 					jQuery.each( a[j], function(){
-						s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) );
+						add( j, this );
 					});
 				else
-					s.push( encodeURIComponent(j) + "=" + encodeURIComponent( jQuery.isFunction(a[j]) ? a[j]() : a[j] ) );
+					add( j, jQuery.isFunction(a[j]) ? a[j]() : a[j] );
 
 		// Return the resulting serialization
 		return s.join("&").replace(/%20/g, "+");
 	}
 
 });
+var elemdisplay = {},
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+function genFx( type, num ){
+	var obj = {};
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function(){
+		obj[ this ] = type;
+	});
+	return obj;
+}
+
 jQuery.fn.extend({
 	show: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "show", width: "show", opacity: "show"
-			}, speed, callback) :
-
-			this.filter(":hidden").each(function(){
-				this.style.display = this.oldblock || "";
-				if ( jQuery.css(this,"display") == "none" ) {
-					var elem = jQuery("<" + this.tagName + " />").appendTo("body");
-					this.style.display = elem.css("display");
-					// handle an edge condition where css is - div { display:none; } or similar
-					if (this.style.display == "none")
-						this.style.display = "block";
-					elem.remove();
+		if ( speed ) {
+			return this.animate( genFx("show", 3), speed, callback);
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ){
+				var old = jQuery.data(this[i], "olddisplay");
+				
+				this[i].style.display = old || "";
+				
+				if ( jQuery.css(this[i], "display") === "none" ) {
+					var tagName = this[i].tagName, display;
+					
+					if ( elemdisplay[ tagName ] ) {
+						display = elemdisplay[ tagName ];
+					} else {
+						var elem = jQuery("<" + tagName + " />").appendTo("body");
+						
+						display = elem.css("display");
+						if ( display === "none" )
+							display = "block";
+						
+						elem.remove();
+						
+						elemdisplay[ tagName ] = display;
+					}
+					
+					this[i].style.display = jQuery.data(this[i], "olddisplay", display);
 				}
-			}).end();
+			}
+			
+			return this;
+		}
 	},
 
 	hide: function(speed,callback){
-		return speed ?
-			this.animate({
-				height: "hide", width: "hide", opacity: "hide"
-			}, speed, callback) :
-
-			this.filter(":visible").each(function(){
-				this.oldblock = this.oldblock || jQuery.css(this,"display");
-				this.style.display = "none";
-			}).end();
+		if ( speed ) {
+			return this.animate( genFx("hide", 3), speed, callback);
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ){
+				var old = jQuery.data(this[i], "olddisplay");
+				if ( !old && old !== "none" )
+					jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+				this[i].style.display = "none";
+			}
+			return this;
+		}
 	},
 
 	// Save the old toggle function
 	_toggle: jQuery.fn.toggle,
 
 	toggle: function( fn, fn2 ){
+		var bool = typeof fn === "boolean";
+
 		return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ?
 			this._toggle.apply( this, arguments ) :
-			fn ?
-				this.animate({
-					height: "toggle", width: "toggle", opacity: "toggle"
-				}, fn, fn2) :
+			fn == null || bool ?
 				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-				});
-	},
-
-	slideDown: function(speed,callback){
-		return this.animate({height: "show"}, speed, callback);
-	},
-
-	slideUp: function(speed,callback){
-		return this.animate({height: "hide"}, speed, callback);
-	},
-
-	slideToggle: function(speed, callback){
-		return this.animate({height: "toggle"}, speed, callback);
-	},
-
-	fadeIn: function(speed, callback){
-		return this.animate({opacity: "show"}, speed, callback);
-	},
-
-	fadeOut: function(speed, callback){
-		return this.animate({opacity: "hide"}, speed, callback);
+					var state = bool ? fn : jQuery(this).is(":hidden");
+					jQuery(this)[ state ? "show" : "hide" ]();
+				}) :
+				this.animate(genFx("toggle", 3), fn, fn2);
 	},
 
 	fadeTo: function(speed,to,callback){
@@ -3003,17 +3727,16 @@ jQuery.fn.extend({
 		var optall = jQuery.speed(speed, easing, callback);
 
 		return this[ optall.queue === false ? "each" : "queue" ](function(){
-			if ( this.nodeType != 1)
-				return false;
-
+		
 			var opt = jQuery.extend({}, optall), p,
-				hidden = jQuery(this).is(":hidden"), self = this;
-
+				hidden = this.nodeType == 1 && jQuery(this).is(":hidden"),
+				self = this;
+	
 			for ( p in prop ) {
 				if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden )
 					return opt.complete.call(this);
 
-				if ( p == "height" || p == "width" ) {
+				if ( ( p == "height" || p == "width" ) && this.style ) {
 					// Store display property
 					opt.display = jQuery.css(this, "display");
 
@@ -3062,27 +3785,6 @@ jQuery.fn.extend({
 		});
 	},
 
-	queue: function(type, fn){
-		if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) {
-			fn = type;
-			type = "fx";
-		}
-
-		if ( !type || (typeof type == "string" && !fn) )
-			return queue( this[0], type );
-
-		return this.each(function(){
-			if ( fn.constructor == Array )
-				queue(this, type, fn);
-			else {
-				queue(this, type).push( fn );
-
-				if ( queue(this, type).length == 1 )
-					fn.call(this);
-			}
-		});
-	},
-
 	stop: function(clearQueue, gotoEnd){
 		var timers = jQuery.timers;
 
@@ -3109,46 +3811,31 @@ jQuery.fn.extend({
 
 });
 
-var queue = function( elem, type, array ) {
-	if ( elem ){
-
-		type = type || "fx";
-
-		var q = jQuery.data( elem, type + "queue" );
-
-		if ( !q || array )
-			q = jQuery.data( elem, type + "queue", jQuery.makeArray(array) );
-
-	}
-	return q;
-};
-
-jQuery.fn.dequeue = function(type){
-	type = type || "fx";
-
-	return this.each(function(){
-		var q = queue(this, type);
-
-		q.shift();
-
-		if ( q.length )
-			q[0].call( this );
-	});
-};
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" }
+}, function( name, props ){
+	jQuery.fn[ name ] = function( speed, callback ){
+		return this.animate( props, speed, callback );
+	};
+});
 
 jQuery.extend({
 
 	speed: function(speed, easing, fn) {
-		var opt = speed && speed.constructor == Object ? speed : {
+		var opt = typeof speed === "object" ? speed : {
 			complete: fn || !fn && easing ||
 				jQuery.isFunction( speed ) && speed,
 			duration: speed,
-			easing: fn && easing || easing && easing.constructor != Function && easing
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
 		};
 
-		opt.duration = (opt.duration && opt.duration.constructor == Number ?
-			opt.duration :
-			jQuery.fx.speeds[opt.duration]) || jQuery.fx.speeds.def;
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			jQuery.fx.speeds[opt.duration] || jQuery.fx.speeds._default;
 
 		// Queueing
 		opt.old = opt.complete;
@@ -3195,13 +3882,13 @@ jQuery.fx.prototype = {
 		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
 
 		// Set display property to block for height/width animations
-		if ( this.prop == "height" || this.prop == "width" )
+		if ( ( this.prop == "height" || this.prop == "width" ) && this.elem.style )
 			this.elem.style.display = "block";
 	},
 
 	// Get the current size
 	cur: function(force){
-		if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null )
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) )
 			return this.elem[ this.prop ];
 
 		var r = parseFloat(jQuery.css(this.elem, this.prop, force));
@@ -3216,7 +3903,6 @@ jQuery.fx.prototype = {
 		this.unit = unit || this.unit || "px";
 		this.now = this.start;
 		this.pos = this.state = 0;
-		this.update();
 
 		var self = this;
 		function t(gotoEnd){
@@ -3227,7 +3913,7 @@ jQuery.fx.prototype = {
 
 		jQuery.timers.push(t);
 
-		if ( jQuery.timerId == null ) {
+		if ( t() && jQuery.timerId == null ) {
 			jQuery.timerId = setInterval(function(){
 				var timers = jQuery.timers;
 
@@ -3250,12 +3936,9 @@ jQuery.fx.prototype = {
 		this.options.show = true;
 
 		// Begin the animation
-		this.custom(0, this.cur());
-
 		// Make sure that we start at a small width/height to avoid any
 		// flash of content
-		if ( this.prop == "width" || this.prop == "height" )
-			this.elem.style[this.prop] = "1px";
+		this.custom(this.prop == "width" || this.prop == "height" ? 1 : 0, this.cur());
 
 		// Start by showing the element
 		jQuery(this.elem).show();
@@ -3275,7 +3958,7 @@ jQuery.fx.prototype = {
 	step: function(gotoEnd){
 		var t = now();
 
-		if ( gotoEnd || t > this.options.duration + this.startTime ) {
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
 			this.now = this.end;
 			this.pos = this.state = 1;
 			this.update();
@@ -3300,7 +3983,7 @@ jQuery.fx.prototype = {
 
 				// Hide the element if the "hide" operation was done
 				if ( this.options.hide )
-					this.elem.style.display = "none";
+					jQuery(this.elem).hide();
 
 				// Reset the properties, if the item has been hidden or shown
 				if ( this.options.hide || this.options.show )
@@ -3335,124 +4018,106 @@ jQuery.extend( jQuery.fx, {
 		slow: 600,
  		fast: 200,
  		// Default speed
- 		def: 400
+ 		_default: 400
 	},
 	step: {
-		scrollLeft: function(fx){
-			fx.elem.scrollLeft = fx.now;
-		},
-
-		scrollTop: function(fx){
-			fx.elem.scrollTop = fx.now;
-		},
 
 		opacity: function(fx){
 			jQuery.attr(fx.elem.style, "opacity", fx.now);
 		},
 
 		_default: function(fx){
-			fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null )
+				fx.elem.style[ fx.prop ] = fx.now + fx.unit;
+			else
+				fx.elem[ fx.prop ] = fx.now;
 		}
 	}
 });
-// The Offset Method
-// Originally By Brandon Aaron, part of the Dimension Plugin
-// http://jquery.com/plugins/project/dimensions
-jQuery.fn.offset = function() {
-	var left = 0, top = 0, elem = this[0], results;
+if ( document.documentElement["getBoundingClientRect"] )
+	jQuery.fn.offset = function() {
+		if ( !this[0] ) return { top: 0, left: 0 };
+		if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+		var box  = this[0].getBoundingClientRect(), doc = this[0].ownerDocument, body = doc.body, docElem = doc.documentElement,
+			clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			top  = box.top  + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop  || body.scrollTop ) - clientTop,
+			left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+		return { top: top, left: left };
+	};
+else 
+	jQuery.fn.offset = function() {
+		if ( !this[0] ) return { top: 0, left: 0 };
+		if ( this[0] === this[0].ownerDocument.body ) return jQuery.offset.bodyOffset( this[0] );
+		jQuery.offset.initialized || jQuery.offset.initialize();
 
-	if ( elem ) with ( jQuery.browser ) {
-		var parent       = elem.parentNode,
-		    offsetChild  = elem,
-		    offsetParent = elem.offsetParent,
-		    doc          = elem.ownerDocument,
-		    safari2      = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent),
-		    css          = jQuery.curCSS,
-		    fixed        = css(elem, "position") == "fixed";
+		var elem = this[0], offsetParent = elem.offsetParent, prevOffsetParent = elem,
+			doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
+			body = doc.body, defaultView = doc.defaultView,
+			prevComputedStyle = defaultView.getComputedStyle(elem, null),
+			top = elem.offsetTop, left = elem.offsetLeft;
 
-		// Use getBoundingClientRect if available
-		if ( elem.getBoundingClientRect ) {
-			var box = elem.getBoundingClientRect();
-
-			// Add the document scroll offsets
-			add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-				box.top  + Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
-
-			// IE adds the HTML element's border, by default it is medium which is 2px
-			// IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; }
-			// IE 7 standards mode, the border is always 2px
-			// This border/offset is typically represented by the clientLeft and clientTop properties
-			// However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS
-			// Therefore this method will be off by 2px in IE while in quirksmode
-			add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop );
-
-		// Otherwise loop through the offsetParents and parentNodes
-		} else {
-
-			// Initial element offsets
-			add( elem.offsetLeft, elem.offsetTop );
-
-			// Get parent offsets
-			while ( offsetParent ) {
-				// Add offsetParent offsets
-				add( offsetParent.offsetLeft, offsetParent.offsetTop );
-
-				// Mozilla and Safari > 2 does not include the border on offset parents
-				// However Mozilla adds the border for table or table cells
-				if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 )
-					border( offsetParent );
-
-				// Add the document scroll offsets if position is fixed on any offsetParent
-				if ( !fixed && css(offsetParent, "position") == "fixed" )
-					fixed = true;
-
-				// Set offsetChild to previous offsetParent unless it is the body element
-				offsetChild  = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent;
-				// Get next offsetParent
-				offsetParent = offsetParent.offsetParent;
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			computedStyle = defaultView.getComputedStyle(elem, null);
+			top -= elem.scrollTop, left -= elem.scrollLeft;
+			if ( elem === offsetParent ) {
+				top += elem.offsetTop, left += elem.offsetLeft;
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
+					top  += parseInt( computedStyle.borderTopWidth,  10) || 0,
+					left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+				prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
 			}
-
-			// Get parent scroll offsets
-			while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) {
-				// Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug
-				if ( !/^inline|table.*$/i.test(css(parent, "display")) )
-					// Subtract parent scroll offsets
-					add( -parent.scrollLeft, -parent.scrollTop );
-
-				// Mozilla does not add the border for a parent that has overflow != visible
-				if ( mozilla && css(parent, "overflow") != "visible" )
-					border( parent );
-
-				// Get next parent
-				parent = parent.parentNode;
-			}
-
-			// Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild
-			// Mozilla doubles body offsets with a non-absolutely positioned offsetChild
-			if ( (safari2 && (fixed || css(offsetChild, "position") == "absolute")) ||
-				(mozilla && css(offsetChild, "position") != "absolute") )
-					add( -doc.body.offsetLeft, -doc.body.offsetTop );
-
-			// Add the document scroll offsets if position is fixed
-			if ( fixed )
-				add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft),
-					Math.max(doc.documentElement.scrollTop,  doc.body.scrollTop));
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
+				top  += parseInt( computedStyle.borderTopWidth,  10) || 0,
+				left += parseInt( computedStyle.borderLeftWidth, 10) || 0;
+			prevComputedStyle = computedStyle;
 		}
 
-		// Return an object with top and left properties
-		results = { top: top, left: left };
-	}
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" )
+			top  += body.offsetTop,
+			left += body.offsetLeft;
 
-	function border(elem) {
-		add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) );
-	}
+		if ( prevComputedStyle.position === "fixed" )
+			top  += Math.max(docElem.scrollTop, body.scrollTop),
+			left += Math.max(docElem.scrollLeft, body.scrollLeft);
 
-	function add(l, t) {
-		left += parseInt(l, 10) || 0;
-		top += parseInt(t, 10) || 0;
-	}
+		return { top: top, left: left };
+	};
 
-	return results;
+jQuery.offset = {
+	initialize: function() {
+		if ( this.initialized ) return;
+		var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, rules, prop, bodyMarginTop = body.style.marginTop,
+			html = '<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"cellpadding="0"cellspacing="0"><tr><td></td></tr></table>';
+
+		rules = { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' };
+		for ( prop in rules ) container.style[prop] = rules[prop];
+
+		container.innerHTML = html;
+		body.insertBefore(container, body.firstChild);
+		innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		body.style.marginTop = '1px';
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop === 0);
+		body.style.marginTop = bodyMarginTop;
+
+		body.removeChild(container);
+		this.initialized = true;
+	},
+
+	bodyOffset: function(body) {
+		jQuery.offset.initialized || jQuery.offset.initialize();
+		var top = body.offsetTop, left = body.offsetLeft;
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
+			top  += parseInt( jQuery.curCSS(body, 'marginTop',  true), 10 ) || 0,
+			left += parseInt( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0;
+		return { top: top, left: left };
+	}
 };
 
 
@@ -3471,11 +4136,11 @@ jQuery.fn.extend({
 			// Subtract element margins
 			// note: when an element has margin: auto the offsetLeft and marginLeft 
 			// are the same in Safari causing offset.left to incorrectly be 0
-			offset.top  -= num( this, 'marginTop' );
+			offset.top  -= num( this, 'marginTop'  );
 			offset.left -= num( this, 'marginLeft' );
 
 			// Add offsetParent borders
-			parentOffset.top  += num( offsetParent, 'borderTopWidth' );
+			parentOffset.top  += num( offsetParent, 'borderTopWidth'  );
 			parentOffset.left += num( offsetParent, 'borderLeftWidth' );
 
 			// Subtract the two offsets
@@ -3489,7 +4154,7 @@ jQuery.fn.extend({
 	},
 
 	offsetParent: function() {
-		var offsetParent = this[0].offsetParent;
+		var offsetParent = this[0].offsetParent || document.body;
 		while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
 			offsetParent = offsetParent.offsetParent;
 		return jQuery(offsetParent);
@@ -3502,9 +4167,9 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
 	var method = 'scroll' + name;
 	
 	jQuery.fn[ method ] = function(val) {
-		if (!this[0]) return;
+		if (!this[0]) return null;
 
-		return val != undefined ?
+		return val !== undefined ?
 
 			// Set the scroll offset
 			this.each(function() {
@@ -3545,5 +4210,32 @@ jQuery.each([ "Height", "Width" ], function(i, name){
 			(margin ?
 				num(this, "margin" + tl) + num(this, "margin" + br) : 0);
 	};
+	
+	var type = name.toLowerCase();
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		return this[0] == window ?
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] ||
+			document.body[ "client" + name ] :
+
+			// Get document width or height
+			this[0] == document ?
+				// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+				Math.max(
+					document.documentElement["client" + name],
+					document.body["scroll" + name], document.documentElement["scroll" + name],
+					document.body["offset" + name], document.documentElement["offset" + name]
+				) :
+
+				// Get or set width or height on the element
+				size === undefined ?
+					// Get width or height on the element
+					(this.length ? jQuery.css( this[0], type ) : null) :
+
+					// Set the width or height on the element (default to pixels if value is unitless)
+					this.css( type, typeof size === "string" ? size : size + "px" );
+	};
 
 });})();
diff --git a/js/jquery.min.js b/js/jquery.min.js
index 82b98e1d76..396646c842 100644
--- a/js/jquery.min.js
+++ b/js/jquery.min.js
@@ -1,32 +1,19 @@
 /*
- * jQuery 1.2.6 - New Wave Javascript
+ * jQuery JavaScript Library v1.3
+ * http://jquery.com/
  *
- * Copyright (c) 2008 John Resig (jquery.com)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
  *
- * $Date: 2008-05-24 14:22:17 -0400 (Sat, 24 May 2008) $
- * $Rev: 5685 $
+ * Date: 2009-01-13 12:50:31 -0500 (Tue, 13 Jan 2009)
+ * Revision: 6104
  */
-(function(){var _jQuery=window.jQuery,_$=window.$;var jQuery=window.jQuery=window.$=function(selector,context){return new jQuery.fn.init(selector,context);};var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/,isSimple=/^.[^:#\[\.]*$/,undefined;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem){if(elem.id!=match[3])return jQuery().find(selector);return jQuery(elem);}selector=[];}}else
-return jQuery(context).find(selector);}else if(jQuery.isFunction(selector))return jQuery(document)[jQuery.fn.ready?"ready":"load"](selector);return this.setArray(jQuery.makeArray(selector));},jquery:"1.2.6",size:function(){return this.length;},length:0,get:function(num){return num==undefined?jQuery.makeArray(this):this[num];},pushStack:function(elems){var ret=jQuery(elems);ret.prevObject=this;return ret;},setArray:function(elems){this.length=0;Array.prototype.push.apply(this,elems);return this;},each:function(callback,args){return jQuery.each(this,callback,args);},index:function(elem){var ret=-1;return jQuery.inArray(elem&&elem.jquery?elem[0]:elem,this);},attr:function(name,value,type){var options=name;if(name.constructor==String)if(value===undefined)return this[0]&&jQuery[type||"attr"](this[0],name);else{options={};options[name]=value;}return this.each(function(i){for(name in options)jQuery.attr(type?this.style:this,name,jQuery.prop(this,options[name],type,i,name));});},css:function(key,value){if((key=='width'||key=='height')&&parseFloat(value)<0)value=undefined;return this.attr(key,value,"curCSS");},text:function(text){if(typeof text!="object"&&text!=null)return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(text));var ret="";jQuery.each(text||this,function(){jQuery.each(this.childNodes,function(){if(this.nodeType!=8)ret+=this.nodeType!=1?this.nodeValue:jQuery.fn.text([this]);});});return ret;},wrapAll:function(html){if(this[0])jQuery(html,this[0].ownerDocument).clone().insertBefore(this[0]).map(function(){var elem=this;while(elem.firstChild)elem=elem.firstChild;return elem;}).append(this);return this;},wrapInner:function(html){return this.each(function(){jQuery(this).contents().wrapAll(html);});},wrap:function(html){return this.each(function(){jQuery(this).wrapAll(html);});},append:function(){return this.domManip(arguments,true,false,function(elem){if(this.nodeType==1)this.appendChild(elem);});},prepend:function(){return this.domManip(arguments,true,true,function(elem){if(this.nodeType==1)this.insertBefore(elem,this.firstChild);});},before:function(){return this.domManip(arguments,false,false,function(elem){this.parentNode.insertBefore(elem,this);});},after:function(){return this.domManip(arguments,false,true,function(elem){this.parentNode.insertBefore(elem,this.nextSibling);});},end:function(){return this.prevObject||jQuery([]);},find:function(selector){var elems=jQuery.map(this,function(elem){return jQuery.find(selector,elem);});return this.pushStack(/[^+>] [^+>]/.test(selector)||selector.indexOf("..")>-1?jQuery.unique(elems):elems);},clone:function(events){var ret=this.map(function(){if(jQuery.browser.msie&&!jQuery.isXMLDoc(this)){var clone=this.cloneNode(true),container=document.createElement("div");container.appendChild(clone);return jQuery.clean([container.innerHTML])[0];}else
-return this.cloneNode(true);});var clone=ret.find("*").andSelf().each(function(){if(this[expando]!=undefined)this[expando]=null;});if(events===true)this.find("*").andSelf().each(function(i){if(this.nodeType==3)return;var events=jQuery.data(this,"events");for(var type in events)for(var handler in events[type])jQuery.event.add(clone[i],type,events[type][handler],events[type][handler].data);});return ret;},filter:function(selector){return this.pushStack(jQuery.isFunction(selector)&&jQuery.grep(this,function(elem,i){return selector.call(elem,i);})||jQuery.multiFilter(selector,this));},not:function(selector){if(selector.constructor==String)if(isSimple.test(selector))return this.pushStack(jQuery.multiFilter(selector,this,true));else
-selector=jQuery.multiFilter(selector,this);var isArrayLike=selector.length&&selector[selector.length-1]!==undefined&&!selector.nodeType;return this.filter(function(){return isArrayLike?jQuery.inArray(this,selector)<0:this!=selector;});},add:function(selector){return this.pushStack(jQuery.unique(jQuery.merge(this.get(),typeof selector=='string'?jQuery(selector):jQuery.makeArray(selector))));},is:function(selector){return!!selector&&jQuery.multiFilter(selector,this).length>0;},hasClass:function(selector){return this.is("."+selector);},val:function(value){if(value==undefined){if(this.length){var elem=this[0];if(jQuery.nodeName(elem,"select")){var index=elem.selectedIndex,values=[],options=elem.options,one=elem.type=="select-one";if(index<0)return null;for(var i=one?index:0,max=one?index+1:options.length;i<max;i++){var option=options[i];if(option.selected){value=jQuery.browser.msie&&!option.attributes.value.specified?option.text:option.value;if(one)return value;values.push(value);}}return values;}else
-return(this[0].value||"").replace(/\r/g,"");}return undefined;}if(value.constructor==Number)value+='';return this.each(function(){if(this.nodeType!=1)return;if(value.constructor==Array&&/radio|checkbox/.test(this.type))this.checked=(jQuery.inArray(this.value,value)>=0||jQuery.inArray(this.name,value)>=0);else if(jQuery.nodeName(this,"select")){var values=jQuery.makeArray(value);jQuery("option",this).each(function(){this.selected=(jQuery.inArray(this.value,values)>=0||jQuery.inArray(this.text,values)>=0);});if(!values.length)this.selectedIndex=-1;}else
-this.value=value;});},html:function(value){return value==undefined?(this[0]?this[0].innerHTML:null):this.empty().append(value);},replaceWith:function(value){return this.after(value).remove();},eq:function(i){return this.slice(i,i+1);},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments));},map:function(callback){return this.pushStack(jQuery.map(this,function(elem,i){return callback.call(elem,i,elem);}));},andSelf:function(){return this.add(this.prevObject);},data:function(key,value){var parts=key.split(".");parts[1]=parts[1]?"."+parts[1]:"";if(value===undefined){var data=this.triggerHandler("getData"+parts[1]+"!",[parts[0]]);if(data===undefined&&this.length)data=jQuery.data(this[0],key);return data===undefined&&parts[1]?this.data(parts[0]):data;}else
-return this.trigger("setData"+parts[1]+"!",[parts[0],value]).each(function(){jQuery.data(this,key,value);});},removeData:function(key){return this.each(function(){jQuery.removeData(this,key);});},domManip:function(args,table,reverse,callback){var clone=this.length>1,elems;return this.each(function(){if(!elems){elems=jQuery.clean(args,this.ownerDocument);if(reverse)elems.reverse();}var obj=this;if(table&&jQuery.nodeName(this,"table")&&jQuery.nodeName(elems[0],"tr"))obj=this.getElementsByTagName("tbody")[0]||this.appendChild(this.ownerDocument.createElement("tbody"));var scripts=jQuery([]);jQuery.each(elems,function(){var elem=clone?jQuery(this).clone(true)[0]:this;if(jQuery.nodeName(elem,"script"))scripts=scripts.add(elem);else{if(elem.nodeType==1)scripts=scripts.add(jQuery("script",elem).remove());callback.call(obj,elem);}});scripts.each(evalScript);});}};jQuery.fn.init.prototype=jQuery.fn;function evalScript(i,elem){if(elem.src)jQuery.ajax({url:elem.src,async:false,dataType:"script"});else
-jQuery.globalEval(elem.text||elem.textContent||elem.innerHTML||"");if(elem.parentNode)elem.parentNode.removeChild(elem);}function now(){return+new Date;}jQuery.extend=jQuery.fn.extend=function(){var target=arguments[0]||{},i=1,length=arguments.length,deep=false,options;if(target.constructor==Boolean){deep=target;target=arguments[1]||{};i=2;}if(typeof target!="object"&&typeof target!="function")target={};if(length==i){target=this;--i;}for(;i<length;i++)if((options=arguments[i])!=null)for(var name in options){var src=target[name],copy=options[name];if(target===copy)continue;if(deep&&copy&&typeof copy=="object"&&!copy.nodeType)target[name]=jQuery.extend(deep,src||(copy.length!=null?[]:{}),copy);else if(copy!==undefined)target[name]=copy;}return target;};var expando="jQuery"+now(),uuid=0,windowData={},exclude=/z-?index|font-?weight|opacity|zoom|line-?height/i,defaultView=document.defaultView||{};jQuery.extend({noConflict:function(deep){window.$=_$;if(deep)window.jQuery=_jQuery;return jQuery;},isFunction:function(fn){return!!fn&&typeof fn!="string"&&!fn.nodeName&&fn.constructor!=Array&&/^[\s[]?function/.test(fn+"");},isXMLDoc:function(elem){return elem.documentElement&&!elem.body||elem.tagName&&elem.ownerDocument&&!elem.ownerDocument.body;},globalEval:function(data){data=jQuery.trim(data);if(data){var head=document.getElementsByTagName("head")[0]||document.documentElement,script=document.createElement("script");script.type="text/javascript";if(jQuery.browser.msie)script.text=data;else
-script.appendChild(document.createTextNode(data));head.insertBefore(script,head.firstChild);head.removeChild(script);}},nodeName:function(elem,name){return elem.nodeName&&elem.nodeName.toUpperCase()==name.toUpperCase();},cache:{},data:function(elem,name,data){elem=elem==window?windowData:elem;var id=elem[expando];if(!id)id=elem[expando]=++uuid;if(name&&!jQuery.cache[id])jQuery.cache[id]={};if(data!==undefined)jQuery.cache[id][name]=data;return name?jQuery.cache[id][name]:id;},removeData:function(elem,name){elem=elem==window?windowData:elem;var id=elem[expando];if(name){if(jQuery.cache[id]){delete jQuery.cache[id][name];name="";for(name in jQuery.cache[id])break;if(!name)jQuery.removeData(elem);}}else{try{delete elem[expando];}catch(e){if(elem.removeAttribute)elem.removeAttribute(expando);}delete jQuery.cache[id];}},each:function(object,callback,args){var name,i=0,length=object.length;if(args){if(length==undefined){for(name in object)if(callback.apply(object[name],args)===false)break;}else
-for(;i<length;)if(callback.apply(object[i++],args)===false)break;}else{if(length==undefined){for(name in object)if(callback.call(object[name],name,object[name])===false)break;}else
-for(var value=object[0];i<length&&callback.call(value,i,value)!==false;value=object[++i]){}}return object;},prop:function(elem,value,type,i,name){if(jQuery.isFunction(value))value=value.call(elem,i);return value&&value.constructor==Number&&type=="curCSS"&&!exclude.test(name)?value+"px":value;},className:{add:function(elem,classNames){jQuery.each((classNames||"").split(/\s+/),function(i,className){if(elem.nodeType==1&&!jQuery.className.has(elem.className,className))elem.className+=(elem.className?" ":"")+className;});},remove:function(elem,classNames){if(elem.nodeType==1)elem.className=classNames!=undefined?jQuery.grep(elem.className.split(/\s+/),function(className){return!jQuery.className.has(classNames,className);}).join(" "):"";},has:function(elem,className){return jQuery.inArray(className,(elem.className||elem).toString().split(/\s+/))>-1;}},swap:function(elem,options,callback){var old={};for(var name in options){old[name]=elem.style[name];elem.style[name]=options[name];}callback.call(elem);for(var name in options)elem.style[name]=old[name];},css:function(elem,name,force){if(name=="width"||name=="height"){var val,props={position:"absolute",visibility:"hidden",display:"block"},which=name=="width"?["Left","Right"]:["Top","Bottom"];function getWH(){val=name=="width"?elem.offsetWidth:elem.offsetHeight;var padding=0,border=0;jQuery.each(which,function(){padding+=parseFloat(jQuery.curCSS(elem,"padding"+this,true))||0;border+=parseFloat(jQuery.curCSS(elem,"border"+this+"Width",true))||0;});val-=Math.round(padding+border);}if(jQuery(elem).is(":visible"))getWH();else
-jQuery.swap(elem,props,getWH);return Math.max(0,val);}return jQuery.curCSS(elem,name,force);},curCSS:function(elem,name,force){var ret,style=elem.style;function color(elem){if(!jQuery.browser.safari)return false;var ret=defaultView.getComputedStyle(elem,null);return!ret||ret.getPropertyValue("color")=="";}if(name=="opacity"&&jQuery.browser.msie){ret=jQuery.attr(style,"opacity");return ret==""?"1":ret;}if(jQuery.browser.opera&&name=="display"){var save=style.outline;style.outline="0 solid black";style.outline=save;}if(name.match(/float/i))name=styleFloat;if(!force&&style&&style[name])ret=style[name];else if(defaultView.getComputedStyle){if(name.match(/float/i))name="float";name=name.replace(/([A-Z])/g,"-$1").toLowerCase();var computedStyle=defaultView.getComputedStyle(elem,null);if(computedStyle&&!color(elem))ret=computedStyle.getPropertyValue(name);else{var swap=[],stack=[],a=elem,i=0;for(;a&&color(a);a=a.parentNode)stack.unshift(a);for(;i<stack.length;i++)if(color(stack[i])){swap[i]=stack[i].style.display;stack[i].style.display="block";}ret=name=="display"&&swap[stack.length-1]!=null?"none":(computedStyle&&computedStyle.getPropertyValue(name))||"";for(i=0;i<swap.length;i++)if(swap[i]!=null)stack[i].style.display=swap[i];}if(name=="opacity"&&ret=="")ret="1";}else if(elem.currentStyle){var camelCase=name.replace(/\-(\w)/g,function(all,letter){return letter.toUpperCase();});ret=elem.currentStyle[name]||elem.currentStyle[camelCase];if(!/^\d+(px)?$/i.test(ret)&&/^\d/.test(ret)){var left=style.left,rsLeft=elem.runtimeStyle.left;elem.runtimeStyle.left=elem.currentStyle.left;style.left=ret||0;ret=style.pixelLeft+"px";style.left=left;elem.runtimeStyle.left=rsLeft;}}return ret;},clean:function(elems,context){var ret=[];context=context||document;if(typeof context.createElement=='undefined')context=context.ownerDocument||context[0]&&context[0].ownerDocument||document;jQuery.each(elems,function(i,elem){if(!elem)return;if(elem.constructor==Number)elem+='';if(typeof elem=="string"){elem=elem.replace(/(<(\w+)[^>]*?)\/>/g,function(all,front,tag){return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?all:front+"></"+tag+">";});var tags=jQuery.trim(elem).toLowerCase(),div=context.createElement("div");var wrap=!tags.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!tags.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||tags.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!tags.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!tags.indexOf("<td")||!tags.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!tags.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||jQuery.browser.msie&&[1,"div<div>","</div>"]||[0,"",""];div.innerHTML=wrap[1]+elem+wrap[2];while(wrap[0]--)div=div.lastChild;if(jQuery.browser.msie){var tbody=!tags.indexOf("<table")&&tags.indexOf("<tbody")<0?div.firstChild&&div.firstChild.childNodes:wrap[1]=="<table>"&&tags.indexOf("<tbody")<0?div.childNodes:[];for(var j=tbody.length-1;j>=0;--j)if(jQuery.nodeName(tbody[j],"tbody")&&!tbody[j].childNodes.length)tbody[j].parentNode.removeChild(tbody[j]);if(/^\s/.test(elem))div.insertBefore(context.createTextNode(elem.match(/^\s*/)[0]),div.firstChild);}elem=jQuery.makeArray(div.childNodes);}if(elem.length===0&&(!jQuery.nodeName(elem,"form")&&!jQuery.nodeName(elem,"select")))return;if(elem[0]==undefined||jQuery.nodeName(elem,"form")||elem.options)ret.push(elem);else
-ret=jQuery.merge(ret,elem);});return ret;},attr:function(elem,name,value){if(!elem||elem.nodeType==3||elem.nodeType==8)return undefined;var notxml=!jQuery.isXMLDoc(elem),set=value!==undefined,msie=jQuery.browser.msie;name=notxml&&jQuery.props[name]||name;if(elem.tagName){var special=/href|src|style/.test(name);if(name=="selected"&&jQuery.browser.safari)elem.parentNode.selectedIndex;if(name in elem&&notxml&&!special){if(set){if(name=="type"&&jQuery.nodeName(elem,"input")&&elem.parentNode)throw"type property can't be changed";elem[name]=value;}if(jQuery.nodeName(elem,"form")&&elem.getAttributeNode(name))return elem.getAttributeNode(name).nodeValue;return elem[name];}if(msie&&notxml&&name=="style")return jQuery.attr(elem.style,"cssText",value);if(set)elem.setAttribute(name,""+value);var attr=msie&&notxml&&special?elem.getAttribute(name,2):elem.getAttribute(name);return attr===null?undefined:attr;}if(msie&&name=="opacity"){if(set){elem.zoom=1;elem.filter=(elem.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(value)+''=="NaN"?"":"alpha(opacity="+value*100+")");}return elem.filter&&elem.filter.indexOf("opacity=")>=0?(parseFloat(elem.filter.match(/opacity=([^)]*)/)[1])/100)+'':"";}name=name.replace(/-([a-z])/ig,function(all,letter){return letter.toUpperCase();});if(set)elem[name]=value;return elem[name];},trim:function(text){return(text||"").replace(/^\s+|\s+$/g,"");},makeArray:function(array){var ret=[];if(array!=null){var i=array.length;if(i==null||array.split||array.setInterval||array.call)ret[0]=array;else
-while(i)ret[--i]=array[i];}return ret;},inArray:function(elem,array){for(var i=0,length=array.length;i<length;i++)if(array[i]===elem)return i;return-1;},merge:function(first,second){var i=0,elem,pos=first.length;if(jQuery.browser.msie){while(elem=second[i++])if(elem.nodeType!=8)first[pos++]=elem;}else
-while(elem=second[i++])first[pos++]=elem;return first;},unique:function(array){var ret=[],done={};try{for(var i=0,length=array.length;i<length;i++){var id=jQuery.data(array[i]);if(!done[id]){done[id]=true;ret.push(array[i]);}}}catch(e){ret=array;}return ret;},grep:function(elems,callback,inv){var ret=[];for(var i=0,length=elems.length;i<length;i++)if(!inv!=!callback(elems[i],i))ret.push(elems[i]);return ret;},map:function(elems,callback){var ret=[];for(var i=0,length=elems.length;i<length;i++){var value=callback(elems[i],i);if(value!=null)ret[ret.length]=value;}return ret.concat.apply([],ret);}});var userAgent=navigator.userAgent.toLowerCase();jQuery.browser={version:(userAgent.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[])[1],safari:/webkit/.test(userAgent),opera:/opera/.test(userAgent),msie:/msie/.test(userAgent)&&!/opera/.test(userAgent),mozilla:/mozilla/.test(userAgent)&&!/(compatible|webkit)/.test(userAgent)};var styleFloat=jQuery.browser.msie?"styleFloat":"cssFloat";jQuery.extend({boxModel:!jQuery.browser.msie||document.compatMode=="CSS1Compat",props:{"for":"htmlFor","class":"className","float":styleFloat,cssFloat:styleFloat,styleFloat:styleFloat,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing"}});jQuery.each({parent:function(elem){return elem.parentNode;},parents:function(elem){return jQuery.dir(elem,"parentNode");},next:function(elem){return jQuery.nth(elem,2,"nextSibling");},prev:function(elem){return jQuery.nth(elem,2,"previousSibling");},nextAll:function(elem){return jQuery.dir(elem,"nextSibling");},prevAll:function(elem){return jQuery.dir(elem,"previousSibling");},siblings:function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);},children:function(elem){return jQuery.sibling(elem.firstChild);},contents:function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);}},function(name,fn){jQuery.fn[name]=function(selector){var ret=jQuery.map(this,fn);if(selector&&typeof selector=="string")ret=jQuery.multiFilter(selector,ret);return this.pushStack(jQuery.unique(ret));};});jQuery.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(name,original){jQuery.fn[name]=function(){var args=arguments;return this.each(function(){for(var i=0,length=args.length;i<length;i++)jQuery(args[i])[original](this);});};});jQuery.each({removeAttr:function(name){jQuery.attr(this,name,"");if(this.nodeType==1)this.removeAttribute(name);},addClass:function(classNames){jQuery.className.add(this,classNames);},removeClass:function(classNames){jQuery.className.remove(this,classNames);},toggleClass:function(classNames){jQuery.className[jQuery.className.has(this,classNames)?"remove":"add"](this,classNames);},remove:function(selector){if(!selector||jQuery.filter(selector,[this]).r.length){jQuery("*",this).add(this).each(function(){jQuery.event.remove(this);jQuery.removeData(this);});if(this.parentNode)this.parentNode.removeChild(this);}},empty:function(){jQuery(">*",this).remove();while(this.firstChild)this.removeChild(this.firstChild);}},function(name,fn){jQuery.fn[name]=function(){return this.each(fn,arguments);};});jQuery.each(["Height","Width"],function(i,name){var type=name.toLowerCase();jQuery.fn[type]=function(size){return this[0]==window?jQuery.browser.opera&&document.body["client"+name]||jQuery.browser.safari&&window["inner"+name]||document.compatMode=="CSS1Compat"&&document.documentElement["client"+name]||document.body["client"+name]:this[0]==document?Math.max(Math.max(document.body["scroll"+name],document.documentElement["scroll"+name]),Math.max(document.body["offset"+name],document.documentElement["offset"+name])):size==undefined?(this.length?jQuery.css(this[0],type):null):this.css(type,size.constructor==String?size:size+"px");};});function num(elem,prop){return elem[0]&&parseInt(jQuery.curCSS(elem[0],prop,true),10)||0;}var chars=jQuery.browser.safari&&parseInt(jQuery.browser.version)<417?"(?:[\\w*_-]|\\\\.)":"(?:[\\w\u0128-\uFFFF*_-]|\\\\.)",quickChild=new RegExp("^>\\s*("+chars+"+)"),quickID=new RegExp("^("+chars+"+)(#)("+chars+"+)"),quickClass=new RegExp("^([#.]?)("+chars+"*)");jQuery.extend({expr:{"":function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);},"#":function(a,i,m){return a.getAttribute("id")==m[2];},":":{lt:function(a,i,m){return i<m[3]-0;},gt:function(a,i,m){return i>m[3]-0;},nth:function(a,i,m){return m[3]-0==i;},eq:function(a,i,m){return m[3]-0==i;},first:function(a,i){return i==0;},last:function(a,i,m,r){return i==r.length-1;},even:function(a,i){return i%2==0;},odd:function(a,i){return i%2;},"first-child":function(a){return a.parentNode.getElementsByTagName("*")[0]==a;},"last-child":function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;},"only-child":function(a){return!jQuery.nth(a.parentNode.lastChild,2,"previousSibling");},parent:function(a){return a.firstChild;},empty:function(a){return!a.firstChild;},contains:function(a,i,m){return(a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;},visible:function(a){return"hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";},hidden:function(a){return"hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";},enabled:function(a){return!a.disabled;},disabled:function(a){return a.disabled;},checked:function(a){return a.checked;},selected:function(a){return a.selected||jQuery.attr(a,"selected");},text:function(a){return"text"==a.type;},radio:function(a){return"radio"==a.type;},checkbox:function(a){return"checkbox"==a.type;},file:function(a){return"file"==a.type;},password:function(a){return"password"==a.type;},submit:function(a){return"submit"==a.type;},image:function(a){return"image"==a.type;},reset:function(a){return"reset"==a.type;},button:function(a){return"button"==a.type||jQuery.nodeName(a,"button");},input:function(a){return/input|select|textarea|button/i.test(a.nodeName);},has:function(a,i,m){return jQuery.find(m[3],a).length;},header:function(a){return/h\d/i.test(a.nodeName);},animated:function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;}}},parse:[/^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/,/^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/,new RegExp("^([:.#]*)("+chars+"+)")],multiFilter:function(expr,elems,not){var old,cur=[];while(expr&&expr!=old){old=expr;var f=jQuery.filter(expr,elems,not);expr=f.t.replace(/^\s*,\s*/,"");cur=not?elems=f.r:jQuery.merge(cur,f.r);}return cur;},find:function(t,context){if(typeof t!="string")return[t];if(context&&context.nodeType!=1&&context.nodeType!=9)return[];context=context||document;var ret=[context],done=[],last,nodeName;while(t&&last!=t){var r=[];last=t;t=jQuery.trim(t);var foundToken=false,re=quickChild,m=re.exec(t);if(m){nodeName=m[1].toUpperCase();for(var i=0;ret[i];i++)for(var c=ret[i].firstChild;c;c=c.nextSibling)if(c.nodeType==1&&(nodeName=="*"||c.nodeName.toUpperCase()==nodeName))r.push(c);ret=r;t=t.replace(re,"");if(t.indexOf(" ")==0)continue;foundToken=true;}else{re=/^([>+~])\s*(\w*)/i;if((m=re.exec(t))!=null){r=[];var merge={};nodeName=m[2].toUpperCase();m=m[1];for(var j=0,rl=ret.length;j<rl;j++){var n=m=="~"||m=="+"?ret[j].nextSibling:ret[j].firstChild;for(;n;n=n.nextSibling)if(n.nodeType==1){var id=jQuery.data(n);if(m=="~"&&merge[id])break;if(!nodeName||n.nodeName.toUpperCase()==nodeName){if(m=="~")merge[id]=true;r.push(n);}if(m=="+")break;}}ret=r;t=jQuery.trim(t.replace(re,""));foundToken=true;}}if(t&&!foundToken){if(!t.indexOf(",")){if(context==ret[0])ret.shift();done=jQuery.merge(done,ret);r=ret=[context];t=" "+t.substr(1,t.length);}else{var re2=quickID;var m=re2.exec(t);if(m){m=[0,m[2],m[3],m[1]];}else{re2=quickClass;m=re2.exec(t);}m[2]=m[2].replace(/\\/g,"");var elem=ret[ret.length-1];if(m[1]=="#"&&elem&&elem.getElementById&&!jQuery.isXMLDoc(elem)){var oid=elem.getElementById(m[2]);if((jQuery.browser.msie||jQuery.browser.opera)&&oid&&typeof oid.id=="string"&&oid.id!=m[2])oid=jQuery('[@id="'+m[2]+'"]',elem)[0];ret=r=oid&&(!m[3]||jQuery.nodeName(oid,m[3]))?[oid]:[];}else{for(var i=0;ret[i];i++){var tag=m[1]=="#"&&m[3]?m[3]:m[1]!=""||m[0]==""?"*":m[2];if(tag=="*"&&ret[i].nodeName.toLowerCase()=="object")tag="param";r=jQuery.merge(r,ret[i].getElementsByTagName(tag));}if(m[1]==".")r=jQuery.classFilter(r,m[2]);if(m[1]=="#"){var tmp=[];for(var i=0;r[i];i++)if(r[i].getAttribute("id")==m[2]){tmp=[r[i]];break;}r=tmp;}ret=r;}t=t.replace(re2,"");}}if(t){var val=jQuery.filter(t,r);ret=r=val.r;t=jQuery.trim(val.t);}}if(t)ret=[];if(ret&&context==ret[0])ret.shift();done=jQuery.merge(done,ret);return done;},classFilter:function(r,m,not){m=" "+m+" ";var tmp=[];for(var i=0;r[i];i++){var pass=(" "+r[i].className+" ").indexOf(m)>=0;if(!not&&pass||not&&!pass)tmp.push(r[i]);}return tmp;},filter:function(t,r,not){var last;while(t&&t!=last){last=t;var p=jQuery.parse,m;for(var i=0;p[i];i++){m=p[i].exec(t);if(m){t=t.substring(m[0].length);m[2]=m[2].replace(/\\/g,"");break;}}if(!m)break;if(m[1]==":"&&m[2]=="not")r=isSimple.test(m[3])?jQuery.filter(m[3],r,true).r:jQuery(r).not(m[3]);else if(m[1]==".")r=jQuery.classFilter(r,m[2],not);else if(m[1]=="["){var tmp=[],type=m[3];for(var i=0,rl=r.length;i<rl;i++){var a=r[i],z=a[jQuery.props[m[2]]||m[2]];if(z==null||/href|src|selected/.test(m[2]))z=jQuery.attr(a,m[2])||'';if((type==""&&!!z||type=="="&&z==m[5]||type=="!="&&z!=m[5]||type=="^="&&z&&!z.indexOf(m[5])||type=="$="&&z.substr(z.length-m[5].length)==m[5]||(type=="*="||type=="~=")&&z.indexOf(m[5])>=0)^not)tmp.push(a);}r=tmp;}else if(m[1]==":"&&m[2]=="nth-child"){var merge={},tmp=[],test=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(m[3]=="even"&&"2n"||m[3]=="odd"&&"2n+1"||!/\D/.test(m[3])&&"0n+"+m[3]||m[3]),first=(test[1]+(test[2]||1))-0,last=test[3]-0;for(var i=0,rl=r.length;i<rl;i++){var node=r[i],parentNode=node.parentNode,id=jQuery.data(parentNode);if(!merge[id]){var c=1;for(var n=parentNode.firstChild;n;n=n.nextSibling)if(n.nodeType==1)n.nodeIndex=c++;merge[id]=true;}var add=false;if(first==0){if(node.nodeIndex==last)add=true;}else if((node.nodeIndex-last)%first==0&&(node.nodeIndex-last)/first>=0)add=true;if(add^not)tmp.push(node);}r=tmp;}else{var fn=jQuery.expr[m[1]];if(typeof fn=="object")fn=fn[m[2]];if(typeof fn=="string")fn=eval("false||function(a,i){return "+fn+";}");r=jQuery.grep(r,function(elem,i){return fn(elem,i,m,r);},not);}}return{r:r,t:t};},dir:function(elem,dir){var matched=[],cur=elem[dir];while(cur&&cur!=document){if(cur.nodeType==1)matched.push(cur);cur=cur[dir];}return matched;},nth:function(cur,result,dir,elem){result=result||1;var num=0;for(;cur;cur=cur[dir])if(cur.nodeType==1&&++num==result)break;return cur;},sibling:function(n,elem){var r=[];for(;n;n=n.nextSibling){if(n.nodeType==1&&n!=elem)r.push(n);}return r;}});jQuery.event={add:function(elem,types,handler,data){if(elem.nodeType==3||elem.nodeType==8)return;if(jQuery.browser.msie&&elem.setInterval)elem=window;if(!handler.guid)handler.guid=this.guid++;if(data!=undefined){var fn=handler;handler=this.proxy(fn,function(){return fn.apply(this,arguments);});handler.data=data;}var events=jQuery.data(elem,"events")||jQuery.data(elem,"events",{}),handle=jQuery.data(elem,"handle")||jQuery.data(elem,"handle",function(){if(typeof jQuery!="undefined"&&!jQuery.event.triggered)return jQuery.event.handle.apply(arguments.callee.elem,arguments);});handle.elem=elem;jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];handler.type=parts[1];var handlers=events[type];if(!handlers){handlers=events[type]={};if(!jQuery.event.special[type]||jQuery.event.special[type].setup.call(elem)===false){if(elem.addEventListener)elem.addEventListener(type,handle,false);else if(elem.attachEvent)elem.attachEvent("on"+type,handle);}}handlers[handler.guid]=handler;jQuery.event.global[type]=true;});elem=null;},guid:1,global:{},remove:function(elem,types,handler){if(elem.nodeType==3||elem.nodeType==8)return;var events=jQuery.data(elem,"events"),ret,index;if(events){if(types==undefined||(typeof types=="string"&&types.charAt(0)=="."))for(var type in events)this.remove(elem,type+(types||""));else{if(types.type){handler=types.handler;types=types.type;}jQuery.each(types.split(/\s+/),function(index,type){var parts=type.split(".");type=parts[0];if(events[type]){if(handler)delete events[type][handler.guid];else
-for(handler in events[type])if(!parts[1]||events[type][handler].type==parts[1])delete events[type][handler];for(ret in events[type])break;if(!ret){if(!jQuery.event.special[type]||jQuery.event.special[type].teardown.call(elem)===false){if(elem.removeEventListener)elem.removeEventListener(type,jQuery.data(elem,"handle"),false);else if(elem.detachEvent)elem.detachEvent("on"+type,jQuery.data(elem,"handle"));}ret=null;delete events[type];}}});}for(ret in events)break;if(!ret){var handle=jQuery.data(elem,"handle");if(handle)handle.elem=null;jQuery.removeData(elem,"events");jQuery.removeData(elem,"handle");}}},trigger:function(type,data,elem,donative,extra){data=jQuery.makeArray(data);if(type.indexOf("!")>=0){type=type.slice(0,-1);var exclusive=true;}if(!elem){if(this.global[type])jQuery("*").add([window,document]).trigger(type,data);}else{if(elem.nodeType==3||elem.nodeType==8)return undefined;var val,ret,fn=jQuery.isFunction(elem[type]||null),event=!data[0]||!data[0].preventDefault;if(event){data.unshift({type:type,target:elem,preventDefault:function(){},stopPropagation:function(){},timeStamp:now()});data[0][expando]=true;}data[0].type=type;if(exclusive)data[0].exclusive=true;var handle=jQuery.data(elem,"handle");if(handle)val=handle.apply(elem,data);if((!fn||(jQuery.nodeName(elem,'a')&&type=="click"))&&elem["on"+type]&&elem["on"+type].apply(elem,data)===false)val=false;if(event)data.shift();if(extra&&jQuery.isFunction(extra)){ret=extra.apply(elem,val==null?data:data.concat(val));if(ret!==undefined)val=ret;}if(fn&&donative!==false&&val!==false&&!(jQuery.nodeName(elem,'a')&&type=="click")){this.triggered=true;try{elem[type]();}catch(e){}}this.triggered=false;}return val;},handle:function(event){var val,ret,namespace,all,handlers;event=arguments[0]=jQuery.event.fix(event||window.event);namespace=event.type.split(".");event.type=namespace[0];namespace=namespace[1];all=!namespace&&!event.exclusive;handlers=(jQuery.data(this,"events")||{})[event.type];for(var j in handlers){var handler=handlers[j];if(all||handler.type==namespace){event.handler=handler;event.data=handler.data;ret=handler.apply(this,arguments);if(val!==false)val=ret;if(ret===false){event.preventDefault();event.stopPropagation();}}}return val;},fix:function(event){if(event[expando]==true)return event;var originalEvent=event;event={originalEvent:originalEvent};var props="altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target timeStamp toElement type view wheelDelta which".split(" ");for(var i=props.length;i;i--)event[props[i]]=originalEvent[props[i]];event[expando]=true;event.preventDefault=function(){if(originalEvent.preventDefault)originalEvent.preventDefault();originalEvent.returnValue=false;};event.stopPropagation=function(){if(originalEvent.stopPropagation)originalEvent.stopPropagation();originalEvent.cancelBubble=true;};event.timeStamp=event.timeStamp||now();if(!event.target)event.target=event.srcElement||document;if(event.target.nodeType==3)event.target=event.target.parentNode;if(!event.relatedTarget&&event.fromElement)event.relatedTarget=event.fromElement==event.target?event.toElement:event.fromElement;if(event.pageX==null&&event.clientX!=null){var doc=document.documentElement,body=document.body;event.pageX=event.clientX+(doc&&doc.scrollLeft||body&&body.scrollLeft||0)-(doc.clientLeft||0);event.pageY=event.clientY+(doc&&doc.scrollTop||body&&body.scrollTop||0)-(doc.clientTop||0);}if(!event.which&&((event.charCode||event.charCode===0)?event.charCode:event.keyCode))event.which=event.charCode||event.keyCode;if(!event.metaKey&&event.ctrlKey)event.metaKey=event.ctrlKey;if(!event.which&&event.button)event.which=(event.button&1?1:(event.button&2?3:(event.button&4?2:0)));return event;},proxy:function(fn,proxy){proxy.guid=fn.guid=fn.guid||proxy.guid||this.guid++;return proxy;},special:{ready:{setup:function(){bindReady();return;},teardown:function(){return;}},mouseenter:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseover",jQuery.event.special.mouseenter.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseover",jQuery.event.special.mouseenter.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseenter";return jQuery.event.handle.apply(this,arguments);}},mouseleave:{setup:function(){if(jQuery.browser.msie)return false;jQuery(this).bind("mouseout",jQuery.event.special.mouseleave.handler);return true;},teardown:function(){if(jQuery.browser.msie)return false;jQuery(this).unbind("mouseout",jQuery.event.special.mouseleave.handler);return true;},handler:function(event){if(withinElement(event,this))return true;event.type="mouseleave";return jQuery.event.handle.apply(this,arguments);}}}};jQuery.fn.extend({bind:function(type,data,fn){return type=="unload"?this.one(type,data,fn):this.each(function(){jQuery.event.add(this,type,fn||data,fn&&data);});},one:function(type,data,fn){var one=jQuery.event.proxy(fn||data,function(event){jQuery(this).unbind(event,one);return(fn||data).apply(this,arguments);});return this.each(function(){jQuery.event.add(this,type,one,fn&&data);});},unbind:function(type,fn){return this.each(function(){jQuery.event.remove(this,type,fn);});},trigger:function(type,data,fn){return this.each(function(){jQuery.event.trigger(type,data,this,true,fn);});},triggerHandler:function(type,data,fn){return this[0]&&jQuery.event.trigger(type,data,this[0],false,fn);},toggle:function(fn){var args=arguments,i=1;while(i<args.length)jQuery.event.proxy(fn,args[i++]);return this.click(jQuery.event.proxy(fn,function(event){this.lastToggle=(this.lastToggle||0)%i;event.preventDefault();return args[this.lastToggle++].apply(this,arguments)||false;}));},hover:function(fnOver,fnOut){return this.bind('mouseenter',fnOver).bind('mouseleave',fnOut);},ready:function(fn){bindReady();if(jQuery.isReady)fn.call(document,jQuery);else
-jQuery.readyList.push(function(){return fn.call(this,jQuery);});return this;}});jQuery.extend({isReady:false,readyList:[],ready:function(){if(!jQuery.isReady){jQuery.isReady=true;if(jQuery.readyList){jQuery.each(jQuery.readyList,function(){this.call(document);});jQuery.readyList=null;}jQuery(document).triggerHandler("ready");}}});var readyBound=false;function bindReady(){if(readyBound)return;readyBound=true;if(document.addEventListener&&!jQuery.browser.opera)document.addEventListener("DOMContentLoaded",jQuery.ready,false);if(jQuery.browser.msie&&window==top)(function(){if(jQuery.isReady)return;try{document.documentElement.doScroll("left");}catch(error){setTimeout(arguments.callee,0);return;}jQuery.ready();})();if(jQuery.browser.opera)document.addEventListener("DOMContentLoaded",function(){if(jQuery.isReady)return;for(var i=0;i<document.styleSheets.length;i++)if(document.styleSheets[i].disabled){setTimeout(arguments.callee,0);return;}jQuery.ready();},false);if(jQuery.browser.safari){var numStyles;(function(){if(jQuery.isReady)return;if(document.readyState!="loaded"&&document.readyState!="complete"){setTimeout(arguments.callee,0);return;}if(numStyles===undefined)numStyles=jQuery("style, link[rel=stylesheet]").length;if(document.styleSheets.length!=numStyles){setTimeout(arguments.callee,0);return;}jQuery.ready();})();}jQuery.event.add(window,"load",jQuery.ready);}jQuery.each(("blur,focus,load,resize,scroll,unload,click,dblclick,"+"mousedown,mouseup,mousemove,mouseover,mouseout,change,select,"+"submit,keydown,keypress,keyup,error").split(","),function(i,name){jQuery.fn[name]=function(fn){return fn?this.bind(name,fn):this.trigger(name);};});var withinElement=function(event,elem){var parent=event.relatedTarget;while(parent&&parent!=elem)try{parent=parent.parentNode;}catch(error){parent=elem;}return parent==elem;};jQuery(window).bind("unload",function(){jQuery("*").add(document).unbind();});jQuery.fn.extend({_load:jQuery.fn.load,load:function(url,params,callback){if(typeof url!='string')return this._load(url);var off=url.indexOf(" ");if(off>=0){var selector=url.slice(off,url.length);url=url.slice(0,off);}callback=callback||function(){};var type="GET";if(params)if(jQuery.isFunction(params)){callback=params;params=null;}else{params=jQuery.param(params);type="POST";}var self=this;jQuery.ajax({url:url,type:type,dataType:"html",data:params,complete:function(res,status){if(status=="success"||status=="notmodified")self.html(selector?jQuery("<div/>").append(res.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(selector):res.responseText);self.each(callback,[res.responseText,status,res]);}});return this;},serialize:function(){return jQuery.param(this.serializeArray());},serializeArray:function(){return this.map(function(){return jQuery.nodeName(this,"form")?jQuery.makeArray(this.elements):this;}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type));}).map(function(i,elem){var val=jQuery(this).val();return val==null?null:val.constructor==Array?jQuery.map(val,function(val,i){return{name:elem.name,value:val};}):{name:elem.name,value:val};}).get();}});jQuery.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(i,o){jQuery.fn[o]=function(f){return this.bind(o,f);};});var jsc=now();jQuery.extend({get:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data=null;}return jQuery.ajax({type:"GET",url:url,data:data,success:callback,dataType:type});},getScript:function(url,callback){return jQuery.get(url,null,callback,"script");},getJSON:function(url,data,callback){return jQuery.get(url,data,callback,"json");},post:function(url,data,callback,type){if(jQuery.isFunction(data)){callback=data;data={};}return jQuery.ajax({type:"POST",url:url,data:data,success:callback,dataType:type});},ajaxSetup:function(settings){jQuery.extend(jQuery.ajaxSettings,settings);},ajaxSettings:{url:location.href,global:true,type:"GET",timeout:0,contentType:"application/x-www-form-urlencoded",processData:true,async:true,data:null,username:null,password:null,accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(s){s=jQuery.extend(true,s,jQuery.extend(true,{},jQuery.ajaxSettings,s));var jsonp,jsre=/=\?(&|$)/g,status,data,type=s.type.toUpperCase();if(s.data&&s.processData&&typeof s.data!="string")s.data=jQuery.param(s.data);if(s.dataType=="jsonp"){if(type=="GET"){if(!s.url.match(jsre))s.url+=(s.url.match(/\?/)?"&":"?")+(s.jsonp||"callback")+"=?";}else if(!s.data||!s.data.match(jsre))s.data=(s.data?s.data+"&":"")+(s.jsonp||"callback")+"=?";s.dataType="json";}if(s.dataType=="json"&&(s.data&&s.data.match(jsre)||s.url.match(jsre))){jsonp="jsonp"+jsc++;if(s.data)s.data=(s.data+"").replace(jsre,"="+jsonp+"$1");s.url=s.url.replace(jsre,"="+jsonp+"$1");s.dataType="script";window[jsonp]=function(tmp){data=tmp;success();complete();window[jsonp]=undefined;try{delete window[jsonp];}catch(e){}if(head)head.removeChild(script);};}if(s.dataType=="script"&&s.cache==null)s.cache=false;if(s.cache===false&&type=="GET"){var ts=now();var ret=s.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+ts+"$2");s.url=ret+((ret==s.url)?(s.url.match(/\?/)?"&":"?")+"_="+ts:"");}if(s.data&&type=="GET"){s.url+=(s.url.match(/\?/)?"&":"?")+s.data;s.data=null;}if(s.global&&!jQuery.active++)jQuery.event.trigger("ajaxStart");var remote=/^(?:\w+:)?\/\/([^\/?#]+)/;if(s.dataType=="script"&&type=="GET"&&remote.test(s.url)&&remote.exec(s.url)[1]!=location.host){var head=document.getElementsByTagName("head")[0];var script=document.createElement("script");script.src=s.url;if(s.scriptCharset)script.charset=s.scriptCharset;if(!jsonp){var done=false;script.onload=script.onreadystatechange=function(){if(!done&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){done=true;success();complete();head.removeChild(script);}};}head.appendChild(script);return undefined;}var requestDone=false;var xhr=window.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest();if(s.username)xhr.open(type,s.url,s.async,s.username,s.password);else
-xhr.open(type,s.url,s.async);try{if(s.data)xhr.setRequestHeader("Content-Type",s.contentType);if(s.ifModified)xhr.setRequestHeader("If-Modified-Since",jQuery.lastModified[s.url]||"Thu, 01 Jan 1970 00:00:00 GMT");xhr.setRequestHeader("X-Requested-With","XMLHttpRequest");xhr.setRequestHeader("Accept",s.dataType&&s.accepts[s.dataType]?s.accepts[s.dataType]+", */*":s.accepts._default);}catch(e){}if(s.beforeSend&&s.beforeSend(xhr,s)===false){s.global&&jQuery.active--;xhr.abort();return false;}if(s.global)jQuery.event.trigger("ajaxSend",[xhr,s]);var onreadystatechange=function(isTimeout){if(!requestDone&&xhr&&(xhr.readyState==4||isTimeout=="timeout")){requestDone=true;if(ival){clearInterval(ival);ival=null;}status=isTimeout=="timeout"&&"timeout"||!jQuery.httpSuccess(xhr)&&"error"||s.ifModified&&jQuery.httpNotModified(xhr,s.url)&&"notmodified"||"success";if(status=="success"){try{data=jQuery.httpData(xhr,s.dataType,s.dataFilter);}catch(e){status="parsererror";}}if(status=="success"){var modRes;try{modRes=xhr.getResponseHeader("Last-Modified");}catch(e){}if(s.ifModified&&modRes)jQuery.lastModified[s.url]=modRes;if(!jsonp)success();}else
-jQuery.handleError(s,xhr,status);complete();if(s.async)xhr=null;}};if(s.async){var ival=setInterval(onreadystatechange,13);if(s.timeout>0)setTimeout(function(){if(xhr){xhr.abort();if(!requestDone)onreadystatechange("timeout");}},s.timeout);}try{xhr.send(s.data);}catch(e){jQuery.handleError(s,xhr,null,e);}if(!s.async)onreadystatechange();function success(){if(s.success)s.success(data,status);if(s.global)jQuery.event.trigger("ajaxSuccess",[xhr,s]);}function complete(){if(s.complete)s.complete(xhr,status);if(s.global)jQuery.event.trigger("ajaxComplete",[xhr,s]);if(s.global&&!--jQuery.active)jQuery.event.trigger("ajaxStop");}return xhr;},handleError:function(s,xhr,status,e){if(s.error)s.error(xhr,status,e);if(s.global)jQuery.event.trigger("ajaxError",[xhr,s,e]);},active:0,httpSuccess:function(xhr){try{return!xhr.status&&location.protocol=="file:"||(xhr.status>=200&&xhr.status<300)||xhr.status==304||xhr.status==1223||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpNotModified:function(xhr,url){try{var xhrRes=xhr.getResponseHeader("Last-Modified");return xhr.status==304||xhrRes==jQuery.lastModified[url]||jQuery.browser.safari&&xhr.status==undefined;}catch(e){}return false;},httpData:function(xhr,type,filter){var ct=xhr.getResponseHeader("content-type"),xml=type=="xml"||!type&&ct&&ct.indexOf("xml")>=0,data=xml?xhr.responseXML:xhr.responseText;if(xml&&data.documentElement.tagName=="parsererror")throw"parsererror";if(filter)data=filter(data,type);if(type=="script")jQuery.globalEval(data);if(type=="json")data=eval("("+data+")");return data;},param:function(a){var s=[];if(a.constructor==Array||a.jquery)jQuery.each(a,function(){s.push(encodeURIComponent(this.name)+"="+encodeURIComponent(this.value));});else
-for(var j in a)if(a[j]&&a[j].constructor==Array)jQuery.each(a[j],function(){s.push(encodeURIComponent(j)+"="+encodeURIComponent(this));});else
-s.push(encodeURIComponent(j)+"="+encodeURIComponent(jQuery.isFunction(a[j])?a[j]():a[j]));return s.join("&").replace(/%20/g,"+");}});jQuery.fn.extend({show:function(speed,callback){return speed?this.animate({height:"show",width:"show",opacity:"show"},speed,callback):this.filter(":hidden").each(function(){this.style.display=this.oldblock||"";if(jQuery.css(this,"display")=="none"){var elem=jQuery("<"+this.tagName+" />").appendTo("body");this.style.display=elem.css("display");if(this.style.display=="none")this.style.display="block";elem.remove();}}).end();},hide:function(speed,callback){return speed?this.animate({height:"hide",width:"hide",opacity:"hide"},speed,callback):this.filter(":visible").each(function(){this.oldblock=this.oldblock||jQuery.css(this,"display");this.style.display="none";}).end();},_toggle:jQuery.fn.toggle,toggle:function(fn,fn2){return jQuery.isFunction(fn)&&jQuery.isFunction(fn2)?this._toggle.apply(this,arguments):fn?this.animate({height:"toggle",width:"toggle",opacity:"toggle"},fn,fn2):this.each(function(){jQuery(this)[jQuery(this).is(":hidden")?"show":"hide"]();});},slideDown:function(speed,callback){return this.animate({height:"show"},speed,callback);},slideUp:function(speed,callback){return this.animate({height:"hide"},speed,callback);},slideToggle:function(speed,callback){return this.animate({height:"toggle"},speed,callback);},fadeIn:function(speed,callback){return this.animate({opacity:"show"},speed,callback);},fadeOut:function(speed,callback){return this.animate({opacity:"hide"},speed,callback);},fadeTo:function(speed,to,callback){return this.animate({opacity:to},speed,callback);},animate:function(prop,speed,easing,callback){var optall=jQuery.speed(speed,easing,callback);return this[optall.queue===false?"each":"queue"](function(){if(this.nodeType!=1)return false;var opt=jQuery.extend({},optall),p,hidden=jQuery(this).is(":hidden"),self=this;for(p in prop){if(prop[p]=="hide"&&hidden||prop[p]=="show"&&!hidden)return opt.complete.call(this);if(p=="height"||p=="width"){opt.display=jQuery.css(this,"display");opt.overflow=this.style.overflow;}}if(opt.overflow!=null)this.style.overflow="hidden";opt.curAnim=jQuery.extend({},prop);jQuery.each(prop,function(name,val){var e=new jQuery.fx(self,opt,name);if(/toggle|show|hide/.test(val))e[val=="toggle"?hidden?"show":"hide":val](prop);else{var parts=val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),start=e.cur(true)||0;if(parts){var end=parseFloat(parts[2]),unit=parts[3]||"px";if(unit!="px"){self.style[name]=(end||1)+unit;start=((end||1)/e.cur(true))*start;self.style[name]=start+unit;}if(parts[1])end=((parts[1]=="-="?-1:1)*end)+start;e.custom(start,end,unit);}else
-e.custom(start,val,"");}});return true;});},queue:function(type,fn){if(jQuery.isFunction(type)||(type&&type.constructor==Array)){fn=type;type="fx";}if(!type||(typeof type=="string"&&!fn))return queue(this[0],type);return this.each(function(){if(fn.constructor==Array)queue(this,type,fn);else{queue(this,type).push(fn);if(queue(this,type).length==1)fn.call(this);}});},stop:function(clearQueue,gotoEnd){var timers=jQuery.timers;if(clearQueue)this.queue([]);this.each(function(){for(var i=timers.length-1;i>=0;i--)if(timers[i].elem==this){if(gotoEnd)timers[i](true);timers.splice(i,1);}});if(!gotoEnd)this.dequeue();return this;}});var queue=function(elem,type,array){if(elem){type=type||"fx";var q=jQuery.data(elem,type+"queue");if(!q||array)q=jQuery.data(elem,type+"queue",jQuery.makeArray(array));}return q;};jQuery.fn.dequeue=function(type){type=type||"fx";return this.each(function(){var q=queue(this,type);q.shift();if(q.length)q[0].call(this);});};jQuery.extend({speed:function(speed,easing,fn){var opt=speed&&speed.constructor==Object?speed:{complete:fn||!fn&&easing||jQuery.isFunction(speed)&&speed,duration:speed,easing:fn&&easing||easing&&easing.constructor!=Function&&easing};opt.duration=(opt.duration&&opt.duration.constructor==Number?opt.duration:jQuery.fx.speeds[opt.duration])||jQuery.fx.speeds.def;opt.old=opt.complete;opt.complete=function(){if(opt.queue!==false)jQuery(this).dequeue();if(jQuery.isFunction(opt.old))opt.old.call(this);};return opt;},easing:{linear:function(p,n,firstNum,diff){return firstNum+diff*p;},swing:function(p,n,firstNum,diff){return((-Math.cos(p*Math.PI)/2)+0.5)*diff+firstNum;}},timers:[],timerId:null,fx:function(elem,options,prop){this.options=options;this.elem=elem;this.prop=prop;if(!options.orig)options.orig={};}});jQuery.fx.prototype={update:function(){if(this.options.step)this.options.step.call(this.elem,this.now,this);(jQuery.fx.step[this.prop]||jQuery.fx.step._default)(this);if(this.prop=="height"||this.prop=="width")this.elem.style.display="block";},cur:function(force){if(this.elem[this.prop]!=null&&this.elem.style[this.prop]==null)return this.elem[this.prop];var r=parseFloat(jQuery.css(this.elem,this.prop,force));return r&&r>-10000?r:parseFloat(jQuery.curCSS(this.elem,this.prop))||0;},custom:function(from,to,unit){this.startTime=now();this.start=from;this.end=to;this.unit=unit||this.unit||"px";this.now=this.start;this.pos=this.state=0;this.update();var self=this;function t(gotoEnd){return self.step(gotoEnd);}t.elem=this.elem;jQuery.timers.push(t);if(jQuery.timerId==null){jQuery.timerId=setInterval(function(){var timers=jQuery.timers;for(var i=0;i<timers.length;i++)if(!timers[i]())timers.splice(i--,1);if(!timers.length){clearInterval(jQuery.timerId);jQuery.timerId=null;}},13);}},show:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.show=true;this.custom(0,this.cur());if(this.prop=="width"||this.prop=="height")this.elem.style[this.prop]="1px";jQuery(this.elem).show();},hide:function(){this.options.orig[this.prop]=jQuery.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0);},step:function(gotoEnd){var t=now();if(gotoEnd||t>this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var done=true;for(var i in this.options.curAnim)if(this.options.curAnim[i]!==true)done=false;if(done){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(jQuery.css(this.elem,"display")=="none")this.elem.style.display="block";}if(this.options.hide)this.elem.style.display="none";if(this.options.hide||this.options.show)for(var p in this.options.curAnim)jQuery.attr(this.elem.style,p,this.options.orig[p]);}if(done)this.options.complete.call(this.elem);return false;}else{var n=t-this.startTime;this.state=n/this.options.duration;this.pos=jQuery.easing[this.options.easing||(jQuery.easing.swing?"swing":"linear")](this.state,n,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update();}return true;}};jQuery.extend(jQuery.fx,{speeds:{slow:600,fast:200,def:400},step:{scrollLeft:function(fx){fx.elem.scrollLeft=fx.now;},scrollTop:function(fx){fx.elem.scrollTop=fx.now;},opacity:function(fx){jQuery.attr(fx.elem.style,"opacity",fx.now);},_default:function(fx){fx.elem.style[fx.prop]=fx.now+fx.unit;}}});jQuery.fn.offset=function(){var left=0,top=0,elem=this[0],results;if(elem)with(jQuery.browser){var parent=elem.parentNode,offsetChild=elem,offsetParent=elem.offsetParent,doc=elem.ownerDocument,safari2=safari&&parseInt(version)<522&&!/adobeair/i.test(userAgent),css=jQuery.curCSS,fixed=css(elem,"position")=="fixed";if(elem.getBoundingClientRect){var box=elem.getBoundingClientRect();add(box.left+Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),box.top+Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));add(-doc.documentElement.clientLeft,-doc.documentElement.clientTop);}else{add(elem.offsetLeft,elem.offsetTop);while(offsetParent){add(offsetParent.offsetLeft,offsetParent.offsetTop);if(mozilla&&!/^t(able|d|h)$/i.test(offsetParent.tagName)||safari&&!safari2)border(offsetParent);if(!fixed&&css(offsetParent,"position")=="fixed")fixed=true;offsetChild=/^body$/i.test(offsetParent.tagName)?offsetChild:offsetParent;offsetParent=offsetParent.offsetParent;}while(parent&&parent.tagName&&!/^body|html$/i.test(parent.tagName)){if(!/^inline|table.*$/i.test(css(parent,"display")))add(-parent.scrollLeft,-parent.scrollTop);if(mozilla&&css(parent,"overflow")!="visible")border(parent);parent=parent.parentNode;}if((safari2&&(fixed||css(offsetChild,"position")=="absolute"))||(mozilla&&css(offsetChild,"position")!="absolute"))add(-doc.body.offsetLeft,-doc.body.offsetTop);if(fixed)add(Math.max(doc.documentElement.scrollLeft,doc.body.scrollLeft),Math.max(doc.documentElement.scrollTop,doc.body.scrollTop));}results={top:top,left:left};}function border(elem){add(jQuery.curCSS(elem,"borderLeftWidth",true),jQuery.curCSS(elem,"borderTopWidth",true));}function add(l,t){left+=parseInt(l,10)||0;top+=parseInt(t,10)||0;}return results;};jQuery.fn.extend({position:function(){var left=0,top=0,results;if(this[0]){var offsetParent=this.offsetParent(),offset=this.offset(),parentOffset=/^body|html$/i.test(offsetParent[0].tagName)?{top:0,left:0}:offsetParent.offset();offset.top-=num(this,'marginTop');offset.left-=num(this,'marginLeft');parentOffset.top+=num(offsetParent,'borderTopWidth');parentOffset.left+=num(offsetParent,'borderLeftWidth');results={top:offset.top-parentOffset.top,left:offset.left-parentOffset.left};}return results;},offsetParent:function(){var offsetParent=this[0].offsetParent;while(offsetParent&&(!/^body|html$/i.test(offsetParent.tagName)&&jQuery.css(offsetParent,'position')=='static'))offsetParent=offsetParent.offsetParent;return jQuery(offsetParent);}});jQuery.each(['Left','Top'],function(i,name){var method='scroll'+name;jQuery.fn[method]=function(val){if(!this[0])return;return val!=undefined?this.each(function(){this==window||this==document?window.scrollTo(!i?val:jQuery(window).scrollLeft(),i?val:jQuery(window).scrollTop()):this[method]=val;}):this[0]==window||this[0]==document?self[i?'pageYOffset':'pageXOffset']||jQuery.boxModel&&document.documentElement[method]||document.body[method]:this[0][method];};});jQuery.each(["Height","Width"],function(i,name){var tl=i?"Left":"Top",br=i?"Right":"Bottom";jQuery.fn["inner"+name]=function(){return this[name.toLowerCase()]()+num(this,"padding"+tl)+num(this,"padding"+br);};jQuery.fn["outer"+name]=function(margin){return this["inner"+name]()+num(this,"border"+tl+"Width")+num(this,"border"+br+"Width")+(margin?num(this,"margin"+tl)+num(this,"margin"+br):0);};});})();
\ No newline at end of file
+(function(){var l=this,g,x=l.jQuery,o=l.$,n=l.jQuery=l.$=function(D,E){return new n.fn.init(D,E)},C=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;n.fn=n.prototype={init:function(D,G){D=D||document;if(D.nodeType){this[0]=D;this.length=1;this.context=D;return this}if(typeof D==="string"){var F=C.exec(D);if(F&&(F[1]||!G)){if(F[1]){D=n.clean([F[1]],G)}else{var H=document.getElementById(F[3]);if(H){if(H.id!=F[3]){return n().find(D)}var E=n(H);E.context=document;E.selector=D;return E}D=[]}}else{return n(G).find(D)}}else{if(n.isFunction(D)){return n(document).ready(D)}}if(D.selector&&D.context){this.selector=D.selector;this.context=D.context}return this.setArray(n.makeArray(D))},selector:"",jquery:"1.3",size:function(){return this.length},get:function(D){return D===g?n.makeArray(this):this[D]},pushStack:function(E,G,D){var F=n(E);F.prevObject=this;F.context=this.context;if(G==="find"){F.selector=this.selector+(this.selector?" ":"")+D}else{if(G){F.selector=this.selector+"."+G+"("+D+")"}}return F},setArray:function(D){this.length=0;Array.prototype.push.apply(this,D);return this},each:function(E,D){return n.each(this,E,D)},index:function(D){return n.inArray(D&&D.jquery?D[0]:D,this)},attr:function(E,G,F){var D=E;if(typeof E==="string"){if(G===g){return this[0]&&n[F||"attr"](this[0],E)}else{D={};D[E]=G}}return this.each(function(H){for(E in D){n.attr(F?this.style:this,E,n.prop(this,D[E],F,H,E))}})},css:function(D,E){if((D=="width"||D=="height")&&parseFloat(E)<0){E=g}return this.attr(D,E,"curCSS")},text:function(E){if(typeof E!=="object"&&E!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(E))}var D="";n.each(E||this,function(){n.each(this.childNodes,function(){if(this.nodeType!=8){D+=this.nodeType!=1?this.nodeValue:n.fn.text([this])}})});return D},wrapAll:function(D){if(this[0]){var E=n(D,this[0].ownerDocument).clone();if(this[0].parentNode){E.insertBefore(this[0])}E.map(function(){var F=this;while(F.firstChild){F=F.firstChild}return F}).append(this)}return this},wrapInner:function(D){return this.each(function(){n(this).contents().wrapAll(D)})},wrap:function(D){return this.each(function(){n(this).wrapAll(D)})},append:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.appendChild(D)}})},prepend:function(){return this.domManip(arguments,true,function(D){if(this.nodeType==1){this.insertBefore(D,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this)})},after:function(){return this.domManip(arguments,false,function(D){this.parentNode.insertBefore(D,this.nextSibling)})},end:function(){return this.prevObject||n([])},push:[].push,find:function(D){if(this.length===1&&!/,/.test(D)){var F=this.pushStack([],"find",D);F.length=0;n.find(D,this[0],F);return F}else{var E=n.map(this,function(G){return n.find(D,G)});return this.pushStack(/[^+>] [^+>]/.test(D)?n.unique(E):E,"find",D)}},clone:function(E){var D=this.map(function(){if(!n.support.noCloneEvent&&!n.isXMLDoc(this)){var H=this.cloneNode(true),G=document.createElement("div");G.appendChild(H);return n.clean([G.innerHTML])[0]}else{return this.cloneNode(true)}});var F=D.find("*").andSelf().each(function(){if(this[h]!==g){this[h]=null}});if(E===true){this.find("*").andSelf().each(function(H){if(this.nodeType==3){return}var G=n.data(this,"events");for(var J in G){for(var I in G[J]){n.event.add(F[H],J,G[J][I],G[J][I].data)}}})}return D},filter:function(D){return this.pushStack(n.isFunction(D)&&n.grep(this,function(F,E){return D.call(F,E)})||n.multiFilter(D,n.grep(this,function(E){return E.nodeType===1})),"filter",D)},closest:function(D){var E=n.expr.match.POS.test(D)?n(D):null;return this.map(function(){var F=this;while(F&&F.ownerDocument){if(E?E.index(F)>-1:n(F).is(D)){return F}F=F.parentNode}})},not:function(D){if(typeof D==="string"){if(f.test(D)){return this.pushStack(n.multiFilter(D,this,true),"not",D)}else{D=n.multiFilter(D,this)}}var E=D.length&&D[D.length-1]!==g&&!D.nodeType;return this.filter(function(){return E?n.inArray(this,D)<0:this!=D})},add:function(D){return this.pushStack(n.unique(n.merge(this.get(),typeof D==="string"?n(D):n.makeArray(D))))},is:function(D){return !!D&&n.multiFilter(D,this).length>0},hasClass:function(D){return !!D&&this.is("."+D)},val:function(J){if(J===g){var D=this[0];if(D){if(n.nodeName(D,"option")){return(D.attributes.value||{}).specified?D.value:D.text}if(n.nodeName(D,"select")){var H=D.selectedIndex,K=[],L=D.options,G=D.type=="select-one";if(H<0){return null}for(var E=G?H:0,I=G?H+1:L.length;E<I;E++){var F=L[E];if(F.selected){J=n(F).val();if(G){return J}K.push(J)}}return K}return(D.value||"").replace(/\r/g,"")}return g}if(typeof J==="number"){J+=""}return this.each(function(){if(this.nodeType!=1){return}if(n.isArray(J)&&/radio|checkbox/.test(this.type)){this.checked=(n.inArray(this.value,J)>=0||n.inArray(this.name,J)>=0)}else{if(n.nodeName(this,"select")){var M=n.makeArray(J);n("option",this).each(function(){this.selected=(n.inArray(this.value,M)>=0||n.inArray(this.text,M)>=0)});if(!M.length){this.selectedIndex=-1}}else{this.value=J}}})},html:function(D){return D===g?(this[0]?this[0].innerHTML:null):this.empty().append(D)},replaceWith:function(D){return this.after(D).remove()},eq:function(D){return this.slice(D,+D+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(D){return this.pushStack(n.map(this,function(F,E){return D.call(F,E,F)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=n.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild,D=this.length>1?I.cloneNode(true):I;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),G>0?D.cloneNode(true):I)}}if(F){n.each(F,y)}}return this;function K(N,O){return M&&n.nodeName(N,"table")&&n.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};n.fn.init.prototype=n.fn;function y(D,E){if(E.src){n.ajax({url:E.src,async:false,dataType:"script"})}else{n.globalEval(E.text||E.textContent||E.innerHTML||"")}if(E.parentNode){E.parentNode.removeChild(E)}}function e(){return +new Date}n.extend=n.fn.extend=function(){var I=arguments[0]||{},G=1,H=arguments.length,D=false,F;if(typeof I==="boolean"){D=I;I=arguments[1]||{};G=2}if(typeof I!=="object"&&!n.isFunction(I)){I={}}if(H==G){I=this;--G}for(;G<H;G++){if((F=arguments[G])!=null){for(var E in F){var J=I[E],K=F[E];if(I===K){continue}if(D&&K&&typeof K==="object"&&!K.nodeType){I[E]=n.extend(D,J||(K.length!=null?[]:{}),K)}else{if(K!==g){I[E]=K}}}}}return I};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,p=document.defaultView||{},r=Object.prototype.toString;n.extend({noConflict:function(D){l.$=o;if(D){l.jQuery=x}return n},isFunction:function(D){return r.call(D)==="[object Function]"},isArray:function(D){return r.call(D)==="[object Array]"},isXMLDoc:function(D){return D.documentElement&&!D.body||D.tagName&&D.ownerDocument&&!D.ownerDocument.body},globalEval:function(F){F=n.trim(F);if(F){var E=document.getElementsByTagName("head")[0]||document.documentElement,D=document.createElement("script");D.type="text/javascript";if(n.support.scriptEval){D.appendChild(document.createTextNode(F))}else{D.text=F}E.insertBefore(D,E.firstChild);E.removeChild(D)}},nodeName:function(E,D){return E.nodeName&&E.nodeName.toUpperCase()==D.toUpperCase()},each:function(F,J,E){var D,G=0,H=F.length;if(E){if(H===g){for(D in F){if(J.apply(F[D],E)===false){break}}}else{for(;G<H;){if(J.apply(F[G++],E)===false){break}}}}else{if(H===g){for(D in F){if(J.call(F[D],D,F[D])===false){break}}}else{for(var I=F[0];G<H&&J.call(I,G,I)!==false;I=F[++G]){}}}return F},prop:function(G,H,F,E,D){if(n.isFunction(H)){H=H.call(G,E)}return typeof H==="number"&&F=="curCSS"&&!b.test(D)?H+"px":H},className:{add:function(D,E){n.each((E||"").split(/\s+/),function(F,G){if(D.nodeType==1&&!n.className.has(D.className,G)){D.className+=(D.className?" ":"")+G}})},remove:function(D,E){if(D.nodeType==1){D.className=E!==g?n.grep(D.className.split(/\s+/),function(F){return !n.className.has(E,F)}).join(" "):""}},has:function(E,D){return n.inArray(D,(E.className||E).toString().split(/\s+/))>-1}},swap:function(G,F,H){var D={};for(var E in F){D[E]=G.style[E];G.style[E]=F[E]}H.call(G);for(var E in F){G.style[E]=D[E]}},css:function(F,D,H){if(D=="width"||D=="height"){var J,E={position:"absolute",visibility:"hidden",display:"block"},I=D=="width"?["Left","Right"]:["Top","Bottom"];function G(){J=D=="width"?F.offsetWidth:F.offsetHeight;var L=0,K=0;n.each(I,function(){L+=parseFloat(n.curCSS(F,"padding"+this,true))||0;K+=parseFloat(n.curCSS(F,"border"+this+"Width",true))||0});J-=Math.round(L+K)}if(n(F).is(":visible")){G()}else{n.swap(F,E,G)}return Math.max(0,J)}return n.curCSS(F,D,H)},curCSS:function(H,E,F){var K,D=H.style;if(E=="opacity"&&!n.support.opacity){K=n.attr(D,"opacity");return K==""?"1":K}if(E.match(/float/i)){E=v}if(!F&&D&&D[E]){K=D[E]}else{if(p.getComputedStyle){if(E.match(/float/i)){E="float"}E=E.replace(/([A-Z])/g,"-$1").toLowerCase();var L=p.getComputedStyle(H,null);if(L){K=L.getPropertyValue(E)}if(E=="opacity"&&K==""){K="1"}}else{if(H.currentStyle){var I=E.replace(/\-(\w)/g,function(M,N){return N.toUpperCase()});K=H.currentStyle[E]||H.currentStyle[I];if(!/^\d+(px)?$/i.test(K)&&/^\d/.test(K)){var G=D.left,J=H.runtimeStyle.left;H.runtimeStyle.left=H.currentStyle.left;D.left=K||0;K=D.pixelLeft+"px";D.left=G;H.runtimeStyle.left=J}}}}return K},clean:function(E,J,H){J=J||document;if(typeof J.createElement==="undefined"){J=J.ownerDocument||J[0]&&J[0].ownerDocument||document}if(!H&&E.length===1&&typeof E[0]==="string"){var G=/^<(\w+)\s*\/?>$/.exec(E[0]);if(G){return[J.createElement(G[1])]}}var F=[],D=[],K=J.createElement("div");n.each(E,function(O,Q){if(typeof Q==="number"){Q+=""}if(!Q){return}if(typeof Q==="string"){Q=Q.replace(/(<(\w+)[^>]*?)\/>/g,function(S,T,R){return R.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?S:T+"></"+R+">"});var N=n.trim(Q).toLowerCase();var P=!N.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!N.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||N.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!N.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!N.indexOf("<td")||!N.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!N.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!n.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];K.innerHTML=P[1]+Q+P[2];while(P[0]--){K=K.lastChild}if(!n.support.tbody){var M=!N.indexOf("<table")&&N.indexOf("<tbody")<0?K.firstChild&&K.firstChild.childNodes:P[1]=="<table>"&&N.indexOf("<tbody")<0?K.childNodes:[];for(var L=M.length-1;L>=0;--L){if(n.nodeName(M[L],"tbody")&&!M[L].childNodes.length){M[L].parentNode.removeChild(M[L])}}}if(!n.support.leadingWhitespace&&/^\s/.test(Q)){K.insertBefore(J.createTextNode(Q.match(/^\s*/)[0]),K.firstChild)}Q=n.makeArray(K.childNodes)}if(Q.nodeType){F.push(Q)}else{F=n.merge(F,Q)}});if(H){for(var I=0;F[I];I++){if(n.nodeName(F[I],"script")&&(!F[I].type||F[I].type.toLowerCase()==="text/javascript")){D.push(F[I].parentNode?F[I].parentNode.removeChild(F[I]):F[I])}else{if(F[I].nodeType===1){F.splice.apply(F,[I+1,0].concat(n.makeArray(F[I].getElementsByTagName("script"))))}H.appendChild(F[I])}}return D}return F},attr:function(I,F,J){if(!I||I.nodeType==3||I.nodeType==8){return g}var G=!n.isXMLDoc(I),K=J!==g;F=G&&n.props[F]||F;if(I.tagName){var E=/href|src|style/.test(F);if(F=="selected"&&I.parentNode){I.parentNode.selectedIndex}if(F in I&&G&&!E){if(K){if(F=="type"&&n.nodeName(I,"input")&&I.parentNode){throw"type property can't be changed"}I[F]=J}if(n.nodeName(I,"form")&&I.getAttributeNode(F)){return I.getAttributeNode(F).nodeValue}if(F=="tabIndex"){var H=I.getAttributeNode("tabIndex");return H&&H.specified?H.value:I.nodeName.match(/^(a|area|button|input|object|select|textarea)$/i)?0:g}return I[F]}if(!n.support.style&&G&&F=="style"){return n.attr(I.style,"cssText",J)}if(K){I.setAttribute(F,""+J)}var D=!n.support.hrefNormalized&&G&&E?I.getAttribute(F,2):I.getAttribute(F);return D===null?g:D}if(!n.support.opacity&&F=="opacity"){if(K){I.zoom=1;I.filter=(I.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(J)+""=="NaN"?"":"alpha(opacity="+J*100+")")}return I.filter&&I.filter.indexOf("opacity=")>=0?(parseFloat(I.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}F=F.replace(/-([a-z])/ig,function(L,M){return M.toUpperCase()});if(K){I[F]=J}return I[F]},trim:function(D){return(D||"").replace(/^\s+|\s+$/g,"")},makeArray:function(F){var D=[];if(F!=null){var E=F.length;if(E==null||typeof F==="string"||n.isFunction(F)||F.setInterval){D[0]=F}else{while(E){D[--E]=F[E]}}}return D},inArray:function(F,G){for(var D=0,E=G.length;D<E;D++){if(G[D]===F){return D}}return -1},merge:function(G,D){var E=0,F,H=G.length;if(!n.support.getAll){while((F=D[E++])!=null){if(F.nodeType!=8){G[H++]=F}}}else{while((F=D[E++])!=null){G[H++]=F}}return G},unique:function(J){var E=[],D={};try{for(var F=0,G=J.length;F<G;F++){var I=n.data(J[F]);if(!D[I]){D[I]=true;E.push(J[F])}}}catch(H){E=J}return E},grep:function(E,I,D){var F=[];for(var G=0,H=E.length;G<H;G++){if(!D!=!I(E[G],G)){F.push(E[G])}}return F},map:function(D,I){var E=[];for(var F=0,G=D.length;F<G;F++){var H=I(D[F],F);if(H!=null){E[E.length]=H}}return E.concat.apply([],E)}});var B=navigator.userAgent.toLowerCase();n.browser={version:(B.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(B),opera:/opera/.test(B),msie:/msie/.test(B)&&!/opera/.test(B),mozilla:/mozilla/.test(B)&&!/(compatible|webkit)/.test(B)};n.each({parent:function(D){return D.parentNode},parents:function(D){return n.dir(D,"parentNode")},next:function(D){return n.nth(D,2,"nextSibling")},prev:function(D){return n.nth(D,2,"previousSibling")},nextAll:function(D){return n.dir(D,"nextSibling")},prevAll:function(D){return n.dir(D,"previousSibling")},siblings:function(D){return n.sibling(D.parentNode.firstChild,D)},children:function(D){return n.sibling(D.firstChild)},contents:function(D){return n.nodeName(D,"iframe")?D.contentDocument||D.contentWindow.document:n.makeArray(D.childNodes)}},function(D,E){n.fn[D]=function(F){var G=n.map(this,E);if(F&&typeof F=="string"){G=n.multiFilter(F,G)}return this.pushStack(n.unique(G),D,F)}});n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(D,E){n.fn[D]=function(){var F=arguments;return this.each(function(){for(var G=0,H=F.length;G<H;G++){n(F[G])[E](this)}})}});n.each({removeAttr:function(D){n.attr(this,D,"");if(this.nodeType==1){this.removeAttribute(D)}},addClass:function(D){n.className.add(this,D)},removeClass:function(D){n.className.remove(this,D)},toggleClass:function(E,D){if(typeof D!=="boolean"){D=!n.className.has(this,E)}n.className[D?"add":"remove"](this,E)},remove:function(D){if(!D||n.filter(D,[this]).length){n("*",this).add([this]).each(function(){n.event.remove(this);n.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){n(">*",this).remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(D,E){n.fn[D]=function(){return this.each(E,arguments)}});function j(D,E){return D[0]&&parseInt(n.curCSS(D[0],E,true),10)||0}var h="jQuery"+e(),u=0,z={};n.extend({cache:{},data:function(E,D,F){E=E==l?z:E;var G=E[h];if(!G){G=E[h]=++u}if(D&&!n.cache[G]){n.cache[G]={}}if(F!==g){n.cache[G][D]=F}return D?n.cache[G][D]:G},removeData:function(E,D){E=E==l?z:E;var G=E[h];if(D){if(n.cache[G]){delete n.cache[G][D];D="";for(D in n.cache[G]){break}if(!D){n.removeData(E)}}}else{try{delete E[h]}catch(F){if(E.removeAttribute){E.removeAttribute(h)}}delete n.cache[G]}},queue:function(E,D,G){if(E){D=(D||"fx")+"queue";var F=n.data(E,D);if(!F||n.isArray(G)){F=n.data(E,D,n.makeArray(G))}else{if(G){F.push(G)}}}return F},dequeue:function(G,F){var D=n.queue(G,F),E=D.shift();if(!F||F==="fx"){E=D[0]}if(E!==g){E.call(G)}}});n.fn.extend({data:function(D,F){var G=D.split(".");G[1]=G[1]?"."+G[1]:"";if(F===g){var E=this.triggerHandler("getData"+G[1]+"!",[G[0]]);if(E===g&&this.length){E=n.data(this[0],D)}return E===g&&G[1]?this.data(G[0]):E}else{return this.trigger("setData"+G[1]+"!",[G[0],F]).each(function(){n.data(this,D,F)})}},removeData:function(D){return this.each(function(){n.removeData(this,D)})},queue:function(D,E){if(typeof D!=="string"){E=D;D="fx"}if(E===g){return n.queue(this[0],D)}return this.each(function(){var F=n.queue(this,D,E);if(D=="fx"&&F.length==1){F[0].call(this)}})},dequeue:function(D){return this.each(function(){n.dequeue(this,D)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.1
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var N=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|[^[\]]+)+\]|\\.|[^ >+~,(\[]+)+|[>+~])(\s*,\s*)?/g,I=0,F=Object.prototype.toString;var E=function(ae,S,aa,V){aa=aa||[];S=S||document;if(S.nodeType!==1&&S.nodeType!==9){return[]}if(!ae||typeof ae!=="string"){return aa}var ab=[],ac,Y,ah,ag,Z,R,Q=true;N.lastIndex=0;while((ac=N.exec(ae))!==null){ab.push(ac[1]);if(ac[2]){R=RegExp.rightContext;break}}if(ab.length>1&&G.match.POS.exec(ae)){if(ab.length===2&&G.relative[ab[0]]){var U="",X;while((X=G.match.POS.exec(ae))){U+=X[0];ae=ae.replace(G.match.POS,"")}Y=E.filter(U,E(/\s$/.test(ae)?ae+"*":ae,S))}else{Y=G.relative[ab[0]]?[S]:E(ab.shift(),S);while(ab.length){var P=[];ae=ab.shift();if(G.relative[ae]){ae+=ab.shift()}for(var af=0,ad=Y.length;af<ad;af++){E(ae,Y[af],P)}Y=P}}}else{var ai=V?{expr:ab.pop(),set:D(V)}:E.find(ab.pop(),ab.length===1&&S.parentNode?S.parentNode:S);Y=E.filter(ai.expr,ai.set);if(ab.length>0){ah=D(Y)}else{Q=false}while(ab.length){var T=ab.pop(),W=T;if(!G.relative[T]){T=""}else{W=ab.pop()}if(W==null){W=S}G.relative[T](ah,W,M(S))}}if(!ah){ah=Y}if(!ah){throw"Syntax error, unrecognized expression: "+(T||ae)}if(F.call(ah)==="[object Array]"){if(!Q){aa.push.apply(aa,ah)}else{if(S.nodeType===1){for(var af=0;ah[af]!=null;af++){if(ah[af]&&(ah[af]===true||ah[af].nodeType===1&&H(S,ah[af]))){aa.push(Y[af])}}}else{for(var af=0;ah[af]!=null;af++){if(ah[af]&&ah[af].nodeType===1){aa.push(Y[af])}}}}}else{D(ah,aa)}if(R){E(R,S,aa,V)}return aa};E.matches=function(P,Q){return E(P,null,null,Q)};E.find=function(V,S){var W,Q;if(!V){return[]}for(var R=0,P=G.order.length;R<P;R++){var T=G.order[R],Q;if((Q=G.match[T].exec(V))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){Q[1]=(Q[1]||"").replace(/\\/g,"");W=G.find[T](Q,S);if(W!=null){V=V.replace(G.match[T],"");break}}}}if(!W){W=S.getElementsByTagName("*")}return{set:W,expr:V}};E.filter=function(S,ac,ad,T){var Q=S,Y=[],ah=ac,V,ab;while(S&&ac.length){for(var U in G.filter){if((V=G.match[U].exec(S))!=null){var Z=G.filter[U],R=null,X=0,aa,ag;ab=false;if(ah==Y){Y=[]}if(G.preFilter[U]){V=G.preFilter[U](V,ah,ad,Y,T);if(!V){ab=aa=true}else{if(V===true){continue}else{if(V[0]===true){R=[];var W=null,af;for(var ae=0;(af=ah[ae])!==g;ae++){if(af&&W!==af){R.push(af);W=af}}}}}}if(V){for(var ae=0;(ag=ah[ae])!==g;ae++){if(ag){if(R&&ag!=R[X]){X++}aa=Z(ag,V,X,R);var P=T^!!aa;if(ad&&aa!=null){if(P){ab=true}else{ah[ae]=false}}else{if(P){Y.push(ag);ab=true}}}}}if(aa!==g){if(!ad){ah=Y}S=S.replace(G.match[U],"");if(!ab){return[]}break}}}S=S.replace(/\s*,\s*/,"");if(S==Q){if(ab==null){throw"Syntax error, unrecognized expression: "+S}else{break}}Q=S}return ah};var G=E.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(P){return P.getAttribute("href")}},relative:{"+":function(T,Q){for(var R=0,P=T.length;R<P;R++){var S=T[R];if(S){var U=S.previousSibling;while(U&&U.nodeType!==1){U=U.previousSibling}T[R]=typeof Q==="string"?U||false:U===Q}}if(typeof Q==="string"){E.filter(Q,T,true)}},">":function(U,Q,V){if(typeof Q==="string"&&!/\W/.test(Q)){Q=V?Q:Q.toUpperCase();for(var R=0,P=U.length;R<P;R++){var T=U[R];if(T){var S=T.parentNode;U[R]=S.nodeName===Q?S:false}}}else{for(var R=0,P=U.length;R<P;R++){var T=U[R];if(T){U[R]=typeof Q==="string"?T.parentNode:T.parentNode===Q}}if(typeof Q==="string"){E.filter(Q,U,true)}}},"":function(S,Q,U){var R="done"+(I++),P=O;if(!Q.match(/\W/)){var T=Q=U?Q:Q.toUpperCase();P=L}P("parentNode",Q,R,S,T,U)},"~":function(S,Q,U){var R="done"+(I++),P=O;if(typeof Q==="string"&&!Q.match(/\W/)){var T=Q=U?Q:Q.toUpperCase();P=L}P("previousSibling",Q,R,S,T,U)}},find:{ID:function(Q,R){if(R.getElementById){var P=R.getElementById(Q[1]);return P?[P]:[]}},NAME:function(P,Q){return Q.getElementsByName?Q.getElementsByName(P[1]):null},TAG:function(P,Q){return Q.getElementsByTagName(P[1])}},preFilter:{CLASS:function(S,Q,R,P,U){S=" "+S[1].replace(/\\/g,"")+" ";for(var T=0;Q[T];T++){if(U^(" "+Q[T].className+" ").indexOf(S)>=0){if(!R){P.push(Q[T])}}else{if(R){Q[T]=false}}}return false},ID:function(P){return P[1].replace(/\\/g,"")},TAG:function(Q,P){for(var R=0;!P[R];R++){}return M(P[R])?Q[1]:Q[1].toUpperCase()},CHILD:function(P){if(P[1]=="nth"){var Q=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(P[2]=="even"&&"2n"||P[2]=="odd"&&"2n+1"||!/\D/.test(P[2])&&"0n+"+P[2]||P[2]);P[2]=(Q[1]+(Q[2]||1))-0;P[3]=Q[3]-0}P[0]="done"+(I++);return P},ATTR:function(Q){var P=Q[1];if(G.attrMap[P]){Q[1]=G.attrMap[P]}if(Q[2]==="~="){Q[4]=" "+Q[4]+" "}return Q},PSEUDO:function(T,Q,R,P,U){if(T[1]==="not"){if(T[3].match(N).length>1){T[3]=E(T[3],null,null,Q)}else{var S=E.filter(T[3],Q,R,true^U);if(!R){P.push.apply(P,S)}return false}}else{if(G.match.POS.test(T[0])){return true}}return T},POS:function(P){P.unshift(true);return P}},filters:{enabled:function(P){return P.disabled===false&&P.type!=="hidden"},disabled:function(P){return P.disabled===true},checked:function(P){return P.checked===true},selected:function(P){P.parentNode.selectedIndex;return P.selected===true},parent:function(P){return !!P.firstChild},empty:function(P){return !P.firstChild},has:function(R,Q,P){return !!E(P[3],R).length},header:function(P){return/h\d/i.test(P.nodeName)},text:function(P){return"text"===P.type},radio:function(P){return"radio"===P.type},checkbox:function(P){return"checkbox"===P.type},file:function(P){return"file"===P.type},password:function(P){return"password"===P.type},submit:function(P){return"submit"===P.type},image:function(P){return"image"===P.type},reset:function(P){return"reset"===P.type},button:function(P){return"button"===P.type||P.nodeName.toUpperCase()==="BUTTON"},input:function(P){return/input|select|textarea|button/i.test(P.nodeName)}},setFilters:{first:function(Q,P){return P===0},last:function(R,Q,P,S){return Q===S.length-1},even:function(Q,P){return P%2===0},odd:function(Q,P){return P%2===1},lt:function(R,Q,P){return Q<P[3]-0},gt:function(R,Q,P){return Q>P[3]-0},nth:function(R,Q,P){return P[3]-0==Q},eq:function(R,Q,P){return P[3]-0==Q}},filter:{CHILD:function(P,S){var V=S[1],W=P.parentNode;var U="child"+W.childNodes.length;if(W&&(!W[U]||!P.nodeIndex)){var T=1;for(var Q=W.firstChild;Q;Q=Q.nextSibling){if(Q.nodeType==1){Q.nodeIndex=T++}}W[U]=T-1}if(V=="first"){return P.nodeIndex==1}else{if(V=="last"){return P.nodeIndex==W[U]}else{if(V=="only"){return W[U]==1}else{if(V=="nth"){var Y=false,R=S[2],X=S[3];if(R==1&&X==0){return true}if(R==0){if(P.nodeIndex==X){Y=true}}else{if((P.nodeIndex-X)%R==0&&(P.nodeIndex-X)/R>=0){Y=true}}return Y}}}}},PSEUDO:function(V,R,S,W){var Q=R[1],T=G.filters[Q];if(T){return T(V,S,R,W)}else{if(Q==="contains"){return(V.textContent||V.innerText||"").indexOf(R[3])>=0}else{if(Q==="not"){var U=R[3];for(var S=0,P=U.length;S<P;S++){if(U[S]===V){return false}}return true}}}},ID:function(Q,P){return Q.nodeType===1&&Q.getAttribute("id")===P},TAG:function(Q,P){return(P==="*"&&Q.nodeType===1)||Q.nodeName===P},CLASS:function(Q,P){return P.test(Q.className)},ATTR:function(T,R){var P=G.attrHandle[R[1]]?G.attrHandle[R[1]](T):T[R[1]]||T.getAttribute(R[1]),U=P+"",S=R[2],Q=R[4];return P==null?false:S==="="?U===Q:S==="*="?U.indexOf(Q)>=0:S==="~="?(" "+U+" ").indexOf(Q)>=0:!R[4]?P:S==="!="?U!=Q:S==="^="?U.indexOf(Q)===0:S==="$="?U.substr(U.length-Q.length)===Q:S==="|="?U===Q||U.substr(0,Q.length+1)===Q+"-":false},POS:function(T,Q,R,U){var P=Q[2],S=G.setFilters[P];if(S){return S(T,R,Q,U)}}}};for(var K in G.match){G.match[K]=RegExp(G.match[K].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var D=function(Q,P){Q=Array.prototype.slice.call(Q);if(P){P.push.apply(P,Q);return P}return Q};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(J){D=function(T,S){var Q=S||[];if(F.call(T)==="[object Array]"){Array.prototype.push.apply(Q,T)}else{if(typeof T.length==="number"){for(var R=0,P=T.length;R<P;R++){Q.push(T[R])}}else{for(var R=0;T[R];R++){Q.push(T[R])}}}return Q}}(function(){var Q=document.createElement("form"),R="script"+(new Date).getTime();Q.innerHTML="<input name='"+R+"'/>";var P=document.documentElement;P.insertBefore(Q,P.firstChild);if(!!document.getElementById(R)){G.find.ID=function(T,U){if(U.getElementById){var S=U.getElementById(T[1]);return S?S.id===T[1]||S.getAttributeNode&&S.getAttributeNode("id").nodeValue===T[1]?[S]:g:[]}};G.filter.ID=function(U,S){var T=U.getAttributeNode&&U.getAttributeNode("id");return U.nodeType===1&&T&&T.nodeValue===S}}P.removeChild(Q)})();(function(){var P=document.createElement("div");P.appendChild(document.createComment(""));if(P.getElementsByTagName("*").length>0){G.find.TAG=function(Q,U){var T=U.getElementsByTagName(Q[1]);if(Q[1]==="*"){var S=[];for(var R=0;T[R];R++){if(T[R].nodeType===1){S.push(T[R])}}T=S}return T}}P.innerHTML="<a href='#'></a>";if(P.firstChild.getAttribute("href")!=="#"){G.attrHandle.href=function(Q){return Q.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var P=E;E=function(T,S,Q,R){S=S||document;if(!R&&S.nodeType===9){try{return D(S.querySelectorAll(T),Q)}catch(U){}}return P(T,S,Q,R)};E.find=P.find;E.filter=P.filter;E.selectors=P.selectors;E.matches=P.matches})()}if(document.documentElement.getElementsByClassName){G.order.splice(1,0,"CLASS");G.find.CLASS=function(P,Q){return Q.getElementsByClassName(P[1])}}function L(Q,W,V,Z,X,Y){for(var T=0,R=Z.length;T<R;T++){var P=Z[T];if(P){P=P[Q];var U=false;while(P&&P.nodeType){var S=P[V];if(S){U=Z[S];break}if(P.nodeType===1&&!Y){P[V]=T}if(P.nodeName===W){U=P;break}P=P[Q]}Z[T]=U}}}function O(Q,V,U,Y,W,X){for(var S=0,R=Y.length;S<R;S++){var P=Y[S];if(P){P=P[Q];var T=false;while(P&&P.nodeType){if(P[U]){T=Y[P[U]];break}if(P.nodeType===1){if(!X){P[U]=S}if(typeof V!=="string"){if(P===V){T=true;break}}else{if(E.filter(V,[P]).length>0){T=P;break}}}P=P[Q]}Y[S]=T}}}var H=document.compareDocumentPosition?function(Q,P){return Q.compareDocumentPosition(P)&16}:function(Q,P){return Q!==P&&(Q.contains?Q.contains(P):true)};var M=function(P){return P.documentElement&&!P.body||P.tagName&&P.ownerDocument&&!P.ownerDocument.body};n.find=E;n.filter=E.filter;n.expr=E.selectors;n.expr[":"]=n.expr.filters;E.selectors.filters.hidden=function(P){return"hidden"===P.type||n.css(P,"display")==="none"||n.css(P,"visibility")==="hidden"};E.selectors.filters.visible=function(P){return"hidden"!==P.type&&n.css(P,"display")!=="none"&&n.css(P,"visibility")!=="hidden"};E.selectors.filters.animated=function(P){return n.grep(n.timers,function(Q){return P===Q.elem}).length};n.multiFilter=function(R,P,Q){if(Q){R=":not("+R+")"}return E.matches(R,P)};n.dir=function(R,Q){var P=[],S=R[Q];while(S&&S!=document){if(S.nodeType==1){P.push(S)}S=S[Q]}return P};n.nth=function(T,P,R,S){P=P||1;var Q=0;for(;T;T=T[R]){if(T.nodeType==1&&++Q==P){break}}return T};n.sibling=function(R,Q){var P=[];for(;R;R=R.nextSibling){if(R.nodeType==1&&R!=Q){P.push(R)}}return P};return;l.Sizzle=E})();n.event={add:function(H,E,G,J){if(H.nodeType==3||H.nodeType==8){return}if(H.setInterval&&H!=l){H=l}if(!G.guid){G.guid=this.guid++}if(J!==g){var F=G;G=this.proxy(F);G.data=J}var D=n.data(H,"events")||n.data(H,"events",{}),I=n.data(H,"handle")||n.data(H,"handle",function(){return typeof n!=="undefined"&&!n.event.triggered?n.event.handle.apply(arguments.callee.elem,arguments):g});I.elem=H;n.each(E.split(/\s+/),function(L,M){var N=M.split(".");M=N.shift();G.type=N.slice().sort().join(".");var K=D[M];if(n.event.specialAll[M]){n.event.specialAll[M].setup.call(H,J,N)}if(!K){K=D[M]={};if(!n.event.special[M]||n.event.special[M].setup.call(H,J,N)===false){if(H.addEventListener){H.addEventListener(M,I,false)}else{if(H.attachEvent){H.attachEvent("on"+M,I)}}}}K[G.guid]=G;n.event.global[M]=true});H=null},guid:1,global:{},remove:function(J,G,I){if(J.nodeType==3||J.nodeType==8){return}var F=n.data(J,"events"),E,D;if(F){if(G===g||(typeof G==="string"&&G.charAt(0)==".")){for(var H in F){this.remove(J,H+(G||""))}}else{if(G.type){I=G.handler;G=G.type}n.each(G.split(/\s+/),function(L,N){var P=N.split(".");N=P.shift();var M=RegExp("(^|\\.)"+P.slice().sort().join(".*\\.")+"(\\.|$)");if(F[N]){if(I){delete F[N][I.guid]}else{for(var O in F[N]){if(M.test(F[N][O].type)){delete F[N][O]}}}if(n.event.specialAll[N]){n.event.specialAll[N].teardown.call(J,P)}for(E in F[N]){break}if(!E){if(!n.event.special[N]||n.event.special[N].teardown.call(J,P)===false){if(J.removeEventListener){J.removeEventListener(N,n.data(J,"handle"),false)}else{if(J.detachEvent){J.detachEvent("on"+N,n.data(J,"handle"))}}}E=null;delete F[N]}}})}for(E in F){break}if(!E){var K=n.data(J,"handle");if(K){K.elem=null}n.removeData(J,"events");n.removeData(J,"handle")}}},trigger:function(H,J,G,D){var F=H.type||H;if(!D){H=typeof H==="object"?H[h]?H:n.extend(n.Event(F),H):n.Event(F);if(F.indexOf("!")>=0){H.type=F=F.slice(0,-1);H.exclusive=true}if(!G){H.stopPropagation();if(this.global[F]){n.each(n.cache,function(){if(this.events&&this.events[F]){n.event.trigger(H,J,this.handle.elem)}})}}if(!G||G.nodeType==3||G.nodeType==8){return g}H.result=g;H.target=G;J=n.makeArray(J);J.unshift(H)}H.currentTarget=G;var I=n.data(G,"handle");if(I){I.apply(G,J)}if((!G[F]||(n.nodeName(G,"a")&&F=="click"))&&G["on"+F]&&G["on"+F].apply(G,J)===false){H.result=false}if(!D&&G[F]&&!H.isDefaultPrevented()&&!(n.nodeName(G,"a")&&F=="click")){this.triggered=true;try{G[F]()}catch(K){}}this.triggered=false;if(!H.isPropagationStopped()){var E=G.parentNode||G.ownerDocument;if(E){n.event.trigger(H,J,E,true)}}},handle:function(J){var I,D;J=arguments[0]=n.event.fix(J||l.event);var K=J.type.split(".");J.type=K.shift();I=!K.length&&!J.exclusive;var H=RegExp("(^|\\.)"+K.slice().sort().join(".*\\.")+"(\\.|$)");D=(n.data(this,"events")||{})[J.type];for(var F in D){var G=D[F];if(I||H.test(G.type)){J.handler=G;J.data=G.data;var E=G.apply(this,arguments);if(E!==g){J.result=E;if(E===false){J.preventDefault();J.stopPropagation()}}if(J.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(G){if(G[h]){return G}var E=G;G=n.Event(E);for(var F=this.props.length,I;F;){I=this.props[--F];G[I]=E[I]}if(!G.target){G.target=G.srcElement||document}if(G.target.nodeType==3){G.target=G.target.parentNode}if(!G.relatedTarget&&G.fromElement){G.relatedTarget=G.fromElement==G.target?G.toElement:G.fromElement}if(G.pageX==null&&G.clientX!=null){var H=document.documentElement,D=document.body;G.pageX=G.clientX+(H&&H.scrollLeft||D&&D.scrollLeft||0)-(H.clientLeft||0);G.pageY=G.clientY+(H&&H.scrollTop||D&&D.scrollTop||0)-(H.clientTop||0)}if(!G.which&&((G.charCode||G.charCode===0)?G.charCode:G.keyCode)){G.which=G.charCode||G.keyCode}if(!G.metaKey&&G.ctrlKey){G.metaKey=G.ctrlKey}if(!G.which&&G.button){G.which=(G.button&1?1:(G.button&2?3:(G.button&4?2:0)))}return G},proxy:function(E,D){D=D||function(){return E.apply(this,arguments)};D.guid=E.guid=E.guid||D.guid||this.guid++;return D},special:{ready:{setup:A,teardown:function(){}}},specialAll:{live:{setup:function(D,E){n.event.add(this,E[0],c)},teardown:function(F){if(F.length){var D=0,E=RegExp("(^|\\.)"+F[0]+"(\\.|$)");n.each((n.data(this,"events").live||{}),function(){if(E.test(this.type)){D++}});if(D<1){n.event.remove(this,F[0],c)}}}}}};n.Event=function(D){if(!this.preventDefault){return new n.Event(D)}if(D&&D.type){this.originalEvent=D;this.type=D.type;this.timeStamp=D.timeStamp}else{this.type=D}if(!this.timeStamp){this.timeStamp=e()}this[h]=true};function k(){return false}function t(){return true}n.Event.prototype={preventDefault:function(){this.isDefaultPrevented=t;var D=this.originalEvent;if(!D){return}if(D.preventDefault){D.preventDefault()}D.returnValue=false},stopPropagation:function(){this.isPropagationStopped=t;var D=this.originalEvent;if(!D){return}if(D.stopPropagation){D.stopPropagation()}D.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=t;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(E){var D=E.relatedTarget;while(D&&D!=this){try{D=D.parentNode}catch(F){D=this}}if(D!=this){E.type=E.data;n.event.handle.apply(this,arguments)}};n.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(E,D){n.event.special[D]={setup:function(){n.event.add(this,E,a,D)},teardown:function(){n.event.remove(this,E,a)}}});n.fn.extend({bind:function(E,F,D){return E=="unload"?this.one(E,F,D):this.each(function(){n.event.add(this,E,D||F,D&&F)})},one:function(F,G,E){var D=n.event.proxy(E||G,function(H){n(this).unbind(H,D);return(E||G).apply(this,arguments)});return this.each(function(){n.event.add(this,F,D,E&&G)})},unbind:function(E,D){return this.each(function(){n.event.remove(this,E,D)})},trigger:function(D,E){return this.each(function(){n.event.trigger(D,E,this)})},triggerHandler:function(D,F){if(this[0]){var E=n.Event(D);E.preventDefault();E.stopPropagation();n.event.trigger(E,F,this[0]);return E.result}},toggle:function(F){var D=arguments,E=1;while(E<D.length){n.event.proxy(F,D[E++])}return this.click(n.event.proxy(F,function(G){this.lastToggle=(this.lastToggle||0)%E;G.preventDefault();return D[this.lastToggle++].apply(this,arguments)||false}))},hover:function(D,E){return this.mouseenter(D).mouseleave(E)},ready:function(D){A();if(n.isReady){D.call(document,n)}else{n.readyList.push(D)}return this},live:function(F,E){var D=n.event.proxy(E);D.guid+=this.selector+F;n(document).bind(i(F,this.selector),this.selector,D);return this},die:function(E,D){n(document).unbind(i(E,this.selector),D?{guid:D.guid+this.selector+E}:null);return this}});function c(G){var D=RegExp("(^|\\.)"+G.type+"(\\.|$)"),F=true,E=[];n.each(n.data(this,"events").live||[],function(H,I){if(D.test(I.type)){var J=n(G.target).closest(I.data)[0];if(J){E.push({elem:J,fn:I})}}});n.each(E,function(){if(!G.isImmediatePropagationStopped()&&this.fn.call(this.elem,G,this.fn.data)===false){F=false}});return F}function i(E,D){return["live",E,D.replace(/\./g,"`").replace(/ /g,"|")].join(".")}n.extend({isReady:false,readyList:[],ready:function(){if(!n.isReady){n.isReady=true;if(n.readyList){n.each(n.readyList,function(){this.call(document,n)});n.readyList=null}n(document).triggerHandler("ready")}}});var w=false;function A(){if(w){return}w=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);n.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);n.ready()}});if(document.documentElement.doScroll&&!l.frameElement){(function(){if(n.isReady){return}try{document.documentElement.doScroll("left")}catch(D){setTimeout(arguments.callee,0);return}n.ready()})()}}}n.event.add(l,"load",n.ready)}n.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(E,D){n.fn[D]=function(F){return F?this.bind(D,F):this.trigger(D)}});n(l).bind("unload",function(){for(var D in n.cache){if(D!=1&&n.cache[D].handle){n.event.remove(n.cache[D].handle.elem)}}});(function(){n.support={};var E=document.documentElement,F=document.createElement("script"),J=document.createElement("div"),I="script"+(new Date).getTime();J.style.display="none";J.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var G=J.getElementsByTagName("*"),D=J.getElementsByTagName("a")[0];if(!G||!G.length||!D){return}n.support={leadingWhitespace:J.firstChild.nodeType==3,tbody:!J.getElementsByTagName("tbody").length,objectAll:!!J.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!J.getElementsByTagName("link").length,style:/red/.test(D.getAttribute("style")),hrefNormalized:D.getAttribute("href")==="/a",opacity:D.style.opacity==="0.5",cssFloat:!!D.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};F.type="text/javascript";try{F.appendChild(document.createTextNode("window."+I+"=1;"))}catch(H){}E.insertBefore(F,E.firstChild);if(l[I]){n.support.scriptEval=true;delete l[I]}E.removeChild(F);if(J.attachEvent&&J.fireEvent){J.attachEvent("onclick",function(){n.support.noCloneEvent=false;J.detachEvent("onclick",arguments.callee)});J.cloneNode(true).fireEvent("onclick")}n(function(){var K=document.createElement("div");K.style.width="1px";K.style.paddingLeft="1px";document.body.appendChild(K);n.boxModel=n.support.boxModel=K.offsetWidth===2;document.body.removeChild(K)})})();var v=n.support.cssFloat?"cssFloat":"styleFloat";n.props={"for":"htmlFor","class":"className","float":v,cssFloat:v,styleFloat:v,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};n.fn.extend({_load:n.fn.load,load:function(F,I,J){if(typeof F!=="string"){return this._load(F)}var H=F.indexOf(" ");if(H>=0){var D=F.slice(H,F.length);F=F.slice(0,H)}var G="GET";if(I){if(n.isFunction(I)){J=I;I=null}else{if(typeof I==="object"){I=n.param(I);G="POST"}}}var E=this;n.ajax({url:F,type:G,dataType:"html",data:I,complete:function(L,K){if(K=="success"||K=="notmodified"){E.html(D?n("<div/>").append(L.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(D):L.responseText)}if(J){E.each(J,[L.responseText,K,L])}}});return this},serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?n.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password/i.test(this.type))}).map(function(D,E){var F=n(this).val();return F==null?null:n.isArray(F)?n.map(F,function(H,G){return{name:E.name,value:H}}):{name:E.name,value:F}}).get()}});n.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(D,E){n.fn[E]=function(F){return this.bind(E,F)}});var q=e();n.extend({get:function(D,F,G,E){if(n.isFunction(F)){G=F;F=null}return n.ajax({type:"GET",url:D,data:F,success:G,dataType:E})},getScript:function(D,E){return n.get(D,null,E,"script")},getJSON:function(D,E,F){return n.get(D,E,F,"json")},post:function(D,F,G,E){if(n.isFunction(F)){G=F;F={}}return n.ajax({type:"POST",url:D,data:F,success:G,dataType:E})},ajaxSetup:function(D){n.extend(n.ajaxSettings,D)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(L){L=n.extend(true,L,n.extend(true,{},n.ajaxSettings,L));var V,E=/=\?(&|$)/g,Q,U,F=L.type.toUpperCase();if(L.data&&L.processData&&typeof L.data!=="string"){L.data=n.param(L.data)}if(L.dataType=="jsonp"){if(F=="GET"){if(!L.url.match(E)){L.url+=(L.url.match(/\?/)?"&":"?")+(L.jsonp||"callback")+"=?"}}else{if(!L.data||!L.data.match(E)){L.data=(L.data?L.data+"&":"")+(L.jsonp||"callback")+"=?"}}L.dataType="json"}if(L.dataType=="json"&&(L.data&&L.data.match(E)||L.url.match(E))){V="jsonp"+q++;if(L.data){L.data=(L.data+"").replace(E,"="+V+"$1")}L.url=L.url.replace(E,"="+V+"$1");L.dataType="script";l[V]=function(W){U=W;H();K();l[V]=g;try{delete l[V]}catch(X){}if(G){G.removeChild(S)}}}if(L.dataType=="script"&&L.cache==null){L.cache=false}if(L.cache===false&&F=="GET"){var D=e();var T=L.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+D+"$2");L.url=T+((T==L.url)?(L.url.match(/\?/)?"&":"?")+"_="+D:"")}if(L.data&&F=="GET"){L.url+=(L.url.match(/\?/)?"&":"?")+L.data;L.data=null}if(L.global&&!n.active++){n.event.trigger("ajaxStart")}var P=/^(\w+:)?\/\/([^\/?#]+)/.exec(L.url);if(L.dataType=="script"&&F=="GET"&&P&&(P[1]&&P[1]!=location.protocol||P[2]!=location.host)){var G=document.getElementsByTagName("head")[0];var S=document.createElement("script");S.src=L.url;if(L.scriptCharset){S.charset=L.scriptCharset}if(!V){var N=false;S.onload=S.onreadystatechange=function(){if(!N&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){N=true;H();K();G.removeChild(S)}}}G.appendChild(S);return g}var J=false;var I=L.xhr();if(L.username){I.open(F,L.url,L.async,L.username,L.password)}else{I.open(F,L.url,L.async)}try{if(L.data){I.setRequestHeader("Content-Type",L.contentType)}if(L.ifModified){I.setRequestHeader("If-Modified-Since",n.lastModified[L.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}I.setRequestHeader("X-Requested-With","XMLHttpRequest");I.setRequestHeader("Accept",L.dataType&&L.accepts[L.dataType]?L.accepts[L.dataType]+", */*":L.accepts._default)}catch(R){}if(L.beforeSend&&L.beforeSend(I,L)===false){if(L.global&&!--n.active){n.event.trigger("ajaxStop")}I.abort();return false}if(L.global){n.event.trigger("ajaxSend",[I,L])}var M=function(W){if(I.readyState==0){if(O){clearInterval(O);O=null;if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}}else{if(!J&&I&&(I.readyState==4||W=="timeout")){J=true;if(O){clearInterval(O);O=null}Q=W=="timeout"?"timeout":!n.httpSuccess(I)?"error":L.ifModified&&n.httpNotModified(I,L.url)?"notmodified":"success";if(Q=="success"){try{U=n.httpData(I,L.dataType,L)}catch(Y){Q="parsererror"}}if(Q=="success"){var X;try{X=I.getResponseHeader("Last-Modified")}catch(Y){}if(L.ifModified&&X){n.lastModified[L.url]=X}if(!V){H()}}else{n.handleError(L,I,Q)}K();if(L.async){I=null}}}};if(L.async){var O=setInterval(M,13);if(L.timeout>0){setTimeout(function(){if(I){if(!J){M("timeout")}if(I){I.abort()}}},L.timeout)}}try{I.send(L.data)}catch(R){n.handleError(L,I,null,R)}if(!L.async){M()}function H(){if(L.success){L.success(U,Q)}if(L.global){n.event.trigger("ajaxSuccess",[I,L])}}function K(){if(L.complete){L.complete(I,Q)}if(L.global){n.event.trigger("ajaxComplete",[I,L])}if(L.global&&!--n.active){n.event.trigger("ajaxStop")}}return I},handleError:function(E,G,D,F){if(E.error){E.error(G,D,F)}if(E.global){n.event.trigger("ajaxError",[G,E,F])}},active:0,httpSuccess:function(E){try{return !E.status&&location.protocol=="file:"||(E.status>=200&&E.status<300)||E.status==304||E.status==1223}catch(D){}return false},httpNotModified:function(F,D){try{var G=F.getResponseHeader("Last-Modified");return F.status==304||G==n.lastModified[D]}catch(E){}return false},httpData:function(I,G,F){var E=I.getResponseHeader("content-type"),D=G=="xml"||!G&&E&&E.indexOf("xml")>=0,H=D?I.responseXML:I.responseText;if(D&&H.documentElement.tagName=="parsererror"){throw"parsererror"}if(F&&F.dataFilter){H=F.dataFilter(H,G)}if(typeof H==="string"){if(G=="script"){n.globalEval(H)}if(G=="json"){H=l["eval"]("("+H+")")}}return H},param:function(D){var F=[];function G(H,I){F[F.length]=encodeURIComponent(H)+"="+encodeURIComponent(I)}if(n.isArray(D)||D.jquery){n.each(D,function(){G(this.name,this.value)})}else{for(var E in D){if(n.isArray(D[E])){n.each(D[E],function(){G(E,this)})}else{G(E,n.isFunction(D[E])?D[E]():D[E])}}}return F.join("&").replace(/%20/g,"+")}});var m={},d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function s(E,D){var F={};n.each(d.concat.apply([],d.slice(0,D)),function(){F[this]=E});return F}n.fn.extend({show:function(I,K){if(I){return this.animate(s("show",3),I,K)}else{for(var G=0,E=this.length;G<E;G++){var D=n.data(this[G],"olddisplay");this[G].style.display=D||"";if(n.css(this[G],"display")==="none"){var F=this[G].tagName,J;if(m[F]){J=m[F]}else{var H=n("<"+F+" />").appendTo("body");J=H.css("display");if(J==="none"){J="block"}H.remove();m[F]=J}this[G].style.display=n.data(this[G],"olddisplay",J)}}return this}},hide:function(G,H){if(G){return this.animate(s("hide",3),G,H)}else{for(var F=0,E=this.length;F<E;F++){var D=n.data(this[F],"olddisplay");if(!D&&D!=="none"){n.data(this[F],"olddisplay",n.css(this[F],"display"))}this[F].style.display="none"}return this}},_toggle:n.fn.toggle,toggle:function(F,E){var D=typeof F==="boolean";return n.isFunction(F)&&n.isFunction(E)?this._toggle.apply(this,arguments):F==null||D?this.each(function(){var G=D?F:n(this).is(":hidden");n(this)[G?"show":"hide"]()}):this.animate(s("toggle",3),F,E)},fadeTo:function(D,F,E){return this.animate({opacity:F},D,E)},animate:function(H,E,G,F){var D=n.speed(E,G,F);return this[D.queue===false?"each":"queue"](function(){var J=n.extend({},D),L,K=this.nodeType==1&&n(this).is(":hidden"),I=this;for(L in H){if(H[L]=="hide"&&K||H[L]=="show"&&!K){return J.complete.call(this)}if((L=="height"||L=="width")&&this.style){J.display=n.css(this,"display");J.overflow=this.style.overflow}}if(J.overflow!=null){this.style.overflow="hidden"}J.curAnim=n.extend({},H);n.each(H,function(N,R){var Q=new n.fx(I,J,N);if(/toggle|show|hide/.test(R)){Q[R=="toggle"?K?"show":"hide":R](H)}else{var P=R.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),S=Q.cur(true)||0;if(P){var M=parseFloat(P[2]),O=P[3]||"px";if(O!="px"){I.style[N]=(M||1)+O;S=((M||1)/Q.cur(true))*S;I.style[N]=S+O}if(P[1]){M=((P[1]=="-="?-1:1)*M)+S}Q.custom(S,M,O)}else{Q.custom(S,R,"")}}});return true})},stop:function(E,D){var F=n.timers;if(E){this.queue([])}this.each(function(){for(var G=F.length-1;G>=0;G--){if(F[G].elem==this){if(D){F[G](true)}F.splice(G,1)}}});if(!D){this.dequeue()}return this}});n.each({slideDown:s("show",1),slideUp:s("hide",1),slideToggle:s("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(D,E){n.fn[D]=function(F,G){return this.animate(E,F,G)}});n.extend({speed:function(F,G,E){var D=typeof F==="object"?F:{complete:E||!E&&G||n.isFunction(F)&&F,duration:F,easing:E&&G||G&&!n.isFunction(G)&&G};D.duration=n.fx.off?0:typeof D.duration==="number"?D.duration:n.fx.speeds[D.duration]||n.fx.speeds._default;D.old=D.complete;D.complete=function(){if(D.queue!==false){n(this).dequeue()}if(n.isFunction(D.old)){D.old.call(this)}};return D},easing:{linear:function(F,G,D,E){return D+E*F},swing:function(F,G,D,E){return((-Math.cos(F*Math.PI)/2)+0.5)*E+D}},timers:[],timerId:null,fx:function(E,D,F){this.options=D;this.elem=E;this.prop=F;if(!D.orig){D.orig={}}}});n.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(n.fx.step[this.prop]||n.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(E){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var D=parseFloat(n.css(this.elem,this.prop,E));return D&&D>-10000?D:parseFloat(n.curCSS(this.elem,this.prop))||0},custom:function(H,G,F){this.startTime=e();this.start=H;this.end=G;this.unit=F||this.unit||"px";this.now=this.start;this.pos=this.state=0;var D=this;function E(I){return D.step(I)}E.elem=this.elem;n.timers.push(E);if(E()&&n.timerId==null){n.timerId=setInterval(function(){var J=n.timers;for(var I=0;I<J.length;I++){if(!J[I]()){J.splice(I--,1)}}if(!J.length){clearInterval(n.timerId);n.timerId=null}},13)}},show:function(){this.options.orig[this.prop]=n.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());n(this.elem).show()},hide:function(){this.options.orig[this.prop]=n.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(G){var F=e();if(G||F>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var D=true;for(var E in this.options.curAnim){if(this.options.curAnim[E]!==true){D=false}}if(D){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(n.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){n(this.elem).hide()}if(this.options.hide||this.options.show){for(var H in this.options.curAnim){n.attr(this.elem.style,H,this.options.orig[H])}}}if(D){this.options.complete.call(this.elem)}return false}else{var I=F-this.startTime;this.state=I/this.options.duration;this.pos=n.easing[this.options.easing||(n.easing.swing?"swing":"linear")](this.state,I,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};n.extend(n.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(D){n.attr(D.elem.style,"opacity",D.now)},_default:function(D){if(D.elem.style&&D.elem.style[D.prop]!=null){D.elem.style[D.prop]=D.now+D.unit}else{D.elem[D.prop]=D.now}}}});if(document.documentElement.getBoundingClientRect){n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}var F=this[0].getBoundingClientRect(),I=this[0].ownerDocument,E=I.body,D=I.documentElement,K=D.clientTop||E.clientTop||0,J=D.clientLeft||E.clientLeft||0,H=F.top+(self.pageYOffset||n.boxModel&&D.scrollTop||E.scrollTop)-K,G=F.left+(self.pageXOffset||n.boxModel&&D.scrollLeft||E.scrollLeft)-J;return{top:H,left:G}}}else{n.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return n.offset.bodyOffset(this[0])}n.offset.initialized||n.offset.initialize();var I=this[0],F=I.offsetParent,E=I,N=I.ownerDocument,L,G=N.documentElement,J=N.body,K=N.defaultView,D=K.getComputedStyle(I,null),M=I.offsetTop,H=I.offsetLeft;while((I=I.parentNode)&&I!==J&&I!==G){L=K.getComputedStyle(I,null);M-=I.scrollTop,H-=I.scrollLeft;if(I===F){M+=I.offsetTop,H+=I.offsetLeft;if(n.offset.doesNotAddBorder&&!(n.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(I.tagName))){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}E=F,F=I.offsetParent}if(n.offset.subtractsBorderForOverflowNotVisible&&L.overflow!=="visible"){M+=parseInt(L.borderTopWidth,10)||0,H+=parseInt(L.borderLeftWidth,10)||0}D=L}if(D.position==="relative"||D.position==="static"){M+=J.offsetTop,H+=J.offsetLeft}if(D.position==="fixed"){M+=Math.max(G.scrollTop,J.scrollTop),H+=Math.max(G.scrollLeft,J.scrollLeft)}return{top:M,left:H}}}n.offset={initialize:function(){if(this.initialized){return}var K=document.body,E=document.createElement("div"),G,F,M,H,L,D,I=K.style.marginTop,J='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"cellpadding="0"cellspacing="0"><tr><td></td></tr></table>';L={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(D in L){E.style[D]=L[D]}E.innerHTML=J;K.insertBefore(E,K.firstChild);G=E.firstChild,F=G.firstChild,H=G.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(F.offsetTop!==5);this.doesAddBorderForTableAndCells=(H.offsetTop===5);G.style.overflow="hidden",G.style.position="relative";this.subtractsBorderForOverflowNotVisible=(F.offsetTop===-5);K.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(K.offsetTop===0);K.style.marginTop=I;K.removeChild(E);this.initialized=true},bodyOffset:function(D){n.offset.initialized||n.offset.initialize();var F=D.offsetTop,E=D.offsetLeft;if(n.offset.doesNotIncludeMarginInBodyOffset){F+=parseInt(n.curCSS(D,"marginTop",true),10)||0,E+=parseInt(n.curCSS(D,"marginLeft",true),10)||0}return{top:F,left:E}}};n.fn.extend({position:function(){var H=0,G=0,E;if(this[0]){var F=this.offsetParent(),I=this.offset(),D=/^body|html$/i.test(F[0].tagName)?{top:0,left:0}:F.offset();I.top-=j(this,"marginTop");I.left-=j(this,"marginLeft");D.top+=j(F,"borderTopWidth");D.left+=j(F,"borderLeftWidth");E={top:I.top-D.top,left:I.left-D.left}}return E},offsetParent:function(){var D=this[0].offsetParent||document.body;while(D&&(!/^body|html$/i.test(D.tagName)&&n.css(D,"position")=="static")){D=D.offsetParent}return n(D)}});n.each(["Left","Top"],function(E,D){var F="scroll"+D;n.fn[F]=function(G){if(!this[0]){return null}return G!==g?this.each(function(){this==l||this==document?l.scrollTo(!E?G:n(l).scrollLeft(),E?G:n(l).scrollTop()):this[F]=G}):this[0]==l||this[0]==document?self[E?"pageYOffset":"pageXOffset"]||n.boxModel&&document.documentElement[F]||document.body[F]:this[0][F]}});n.each(["Height","Width"],function(G,E){var D=G?"Left":"Top",F=G?"Right":"Bottom";n.fn["inner"+E]=function(){return this[E.toLowerCase()]()+j(this,"padding"+D)+j(this,"padding"+F)};n.fn["outer"+E]=function(I){return this["inner"+E]()+j(this,"border"+D+"Width")+j(this,"border"+F+"Width")+(I?j(this,"margin"+D)+j(this,"margin"+F):0)};var H=E.toLowerCase();n.fn[H]=function(I){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+E]||document.body["client"+E]:this[0]==document?Math.max(document.documentElement["client"+E],document.body["scroll"+E],document.documentElement["scroll"+E],document.body["offset"+E],document.documentElement["offset"+E]):I===g?(this.length?n.css(this[0],H):null):this.css(H,typeof I==="string"?I:I+"px")}})})();
\ No newline at end of file

From efe9d28efa3ce03799e0e0dcd5cca52e3862bfe9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 12:01:53 -0500
Subject: [PATCH 026/256] Add notice form

---
 lib/action.php | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 96d2a87985..bca6a0e3c4 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -32,6 +32,9 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/lib/form.php';
+require_once INSTALLDIR.'/lib/htmloutputter.php';
+
 /**
  * Base class for all actions
  *
@@ -180,17 +183,6 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'header'));
         $this->showLogo();
-
-//        common_element('h1', 'pagetitle', $pagetitle);
-
-        if ($headercall) {
-            if ($data) {
-                call_user_func($headercall, $data);
-            } else {
-                call_user_func($headercall);
-            }
-        }
-        //common_nav_menu();
         $this->showPrimaryNav();
         $this->showSiteNotice();
         $this->showNoticeForm();
@@ -219,7 +211,7 @@ class Action extends HTMLOutputter // lawsuit
     function showPrimaryNav()
     {
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
-        $this->element('dt', null, _('Primary site navigation')); 
+        $this->element('dt', null, _('Primary site navigation'));
         $user = common_current_user();
         $this->elementStart('ul', array('id' => 'nav'));
         if ($user) {
@@ -247,7 +239,6 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('dl');
     }
 
-
     // Revist. Should probably do an hAtom pattern here
     function showSiteNotice()
     {
@@ -263,7 +254,8 @@ class Action extends HTMLOutputter // lawsuit
 
     function showNoticeForm()
     {
-        // show the notice form here
+        $notice_form = new NoticeForm();
+        $notice_form->show();
     }
 
     function showCore()
@@ -275,14 +267,14 @@ class Action extends HTMLOutputter // lawsuit
         // end core div
     }
 
-    // SHOULD overload (perhaps this should be a MUST because sometimes it is not used) 
+    // SHOULD overload (perhaps this should be a MUST because sometimes it is not used)
 
     function showLocalNav($menu)
     {
         $action = $this->trimmed('action');
-        
+
         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
-        $this->element('dt', null, _('Local views')); 
+        $this->element('dt', null, _('Local views'));
         $this->elementStart('ul', array('id' => 'nav'));
         foreach ($menu as $menuaction => $menudesc) {
             common_menu_item(common_local_url($menuaction,
@@ -389,7 +381,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showLaconicaLicense()
     {
-        $this->element('dt', array('id' => 'site_laconica_license'), _('Laconica software license')); 
+        $this->element('dt', array('id' => 'site_laconica_license'), _('Laconica software license'));
         $this->elementStart('dd', null);
         if (common_config('site', 'broughtby')) {
             $instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%). ');
@@ -405,7 +397,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showContentLicense()
     {
-        $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license')); 
+        $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
         $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
         common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
@@ -575,7 +567,6 @@ class Action extends HTMLOutputter // lawsuit
         common_end_xml();
     }
 
-
     // Added @id to li for some control. We might want to move this to htmloutputter.php
     function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
     {
@@ -583,7 +574,7 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        
+
         $this->elementStart('li', (is_null($id)) ? null : array('id' => $id),  $lattrs);
         $attrs['href'] = $url;
         if ($title) {
@@ -600,7 +591,7 @@ class Action extends HTMLOutputter // lawsuit
         if ($have_before || $have_after) {
             $this->elementStart('div', array('class' => 'pagination'));
             $this->elementStart('dl', null);
-            $this->element('dt', null, _('Pagination')); 
+            $this->element('dt', null, _('Pagination'));
             $this->elementStart('dd', null);
             $this->elementStart('ul', array('class' => 'nav'));
         }

From f8b758932442cf468167e7b317d67162b6fac561 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 17:26:23 +0000
Subject: [PATCH 027/256] showBody() -- revisit to add @id and @class to <body>
 showContentBlock() showContent()

added endHTML() to class HTMLOutputter
---
 lib/action.php        | 26 ++++++++------------------
 lib/htmloutputter.php | 13 +++++++++++++
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index bca6a0e3c4..85042871e5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -172,11 +172,13 @@ class Action extends HTMLOutputter // lawsuit
 
     function showBody()
     {
-        // output body
-        // output wrap element
+        $this->elementStart('body');
+        $this->elementStart('wrap');
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
+        $this->elementEnd('wrap');
+        $this->elementEnd('body');
     }
 
     function showHeader()
@@ -260,11 +262,11 @@ class Action extends HTMLOutputter // lawsuit
 
     function showCore()
     {
-        // start core div
+        $this->elementStart('div' array('class' => 'core'));
         $this->showLocalNav();
         $this->showContentBlock();
         $this->showAside();
-        // end core div
+        $this->elementEnd('div');
     }
 
     // SHOULD overload (perhaps this should be a MUST because sometimes it is not used)
@@ -290,8 +292,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showContentBlock()
     {
-        $this->elementStart('div', array('id' => 'content',
-                                         (is_null("basic single content page e.g., about")) ? null : 'class' => 'hentry'));
+        $this->elementStart('div', array('id' => 'content'));
         $this->showPageTitle();
         $this->showPageNotice();
         $this->showContent();
@@ -319,8 +320,7 @@ class Action extends HTMLOutputter // lawsuit
     function showContent()
     {
         // show the actual content (forms, lists, whatever)
-        $this->elementStart('div', array('id' => 'content_inner',
-                                         (is_null("basic single content page e.g., about")) ? null : 'class' => 'entry-content'));
+        $this->elementStart('div', array('id' => 'content_inner'));
         $this->elementEnd('div');
     }
 
@@ -556,16 +556,6 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content'));
     }
 
-    function common_show_footer()
-    {
-        global $xw, $config;
-        $this->elementEnd('div'); // content div
-        common_foot_menu();
-        $this->elementEnd('div');
-        $this->elementEnd('body');
-        $this->elementEnd('html');
-        common_end_xml();
-    }
 
     // Added @id to li for some control. We might want to move this to htmloutputter.php
     function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 095f4d4786..43e4a59a98 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -122,6 +122,19 @@ class HTMLOutputter extends XMLOutputter
                                           'lang' => $language));
     }
 
+
+    /**
+    *  Ends an HTML document
+    *
+    *  @return void
+    */
+    function endHTML()
+    {
+        $this->elementEnd('html');
+        $this->endXML();
+    }
+
+
     /**
      * Output an HTML text input element
      *

From b72322b9e786a0e1fd0eecb2705fee0bf470ac8a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 17:30:03 +0000
Subject: [PATCH 028/256] Parse error fix

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 85042871e5..0419828b3a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -262,7 +262,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showCore()
     {
-        $this->elementStart('div' array('class' => 'core'));
+        $this->elementStart('div', array('class' => 'core'));
         $this->showLocalNav();
         $this->showContentBlock();
         $this->showAside();

From 3ce62aae1b1a0e176db32fac142218f05bc57731 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 13:57:29 -0500
Subject: [PATCH 029/256] Add comment() method, have action use it

---
 lib/action.php       |  5 ++---
 lib/xmloutputter.php | 13 +++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 0419828b3a..8d0fb2634a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -116,8 +116,8 @@ class Action extends HTMLOutputter // lawsuit
         foreach (array(6,7) as $ver) {
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
                 // Yes, IE people should be put in jail.
-                $xw->writeComment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                                  'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+                $this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
+                               'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
             }
         }
     }
@@ -556,7 +556,6 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content'));
     }
 
-
     // Added @id to li for some control. We might want to move this to htmloutputter.php
     function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
     {
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 5bbd35627e..9ca0c91bd6 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -226,4 +226,17 @@ class XMLOutputter
     {
         $this->xw->writeRaw($xml);
     }
+
+    /**
+     * output a comment
+     *
+     * @param string $txt text of the comment
+     *
+     * @return void
+     */
+
+    function comment($txt)
+    {
+        $this->xw->writeComment($txt);
+    }
 }

From 3f642b40c01b72c7f28c65bd8865209d97109608 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 19:17:46 +0000
Subject: [PATCH 030/256] Changed to generic nav class

---
 lib/publicgroupnav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index d21d0a458f..c95d9acba6 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -62,7 +62,7 @@ class PublicGroupNav
 
     function show()
     {
-        $this->action->elementStart('ul', array('id' => 'nav_views'));
+        $this->action->elementStart('ul', array('class' => 'nav'));
 
         common_menu_item(common_local_url('public'), _('Public'),
             _('Public timeline'), $this->action == 'public');

From 7c9f3b61b47b4f82023360379977ecb231739a25 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 14 Jan 2009 17:02:18 -0500
Subject: [PATCH 031/256] Add an optional theme parameter to theme functions

---
 lib/theme.php | 53 ++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 9 deletions(-)

diff --git a/lib/theme.php b/lib/theme.php
index 6f365bd992..95030affed 100644
--- a/lib/theme.php
+++ b/lib/theme.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Utilities for theme files and paths
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,19 +18,51 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Paths
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-function theme_file($relative)
+/**
+ * Gets the full path of a file in a theme dir based on its relative name
+ *
+ * @param string $relative relative path within the theme directory
+ * @param string $theme    name of the theme; defaults to current theme
+ *
+ * @return string File path to the theme file
+ */
+
+function theme_file($relative, $theme=null)
 {
-    $theme = common_config('site', 'theme');
+    if (!$theme) {
+        $theme = common_config('site', 'theme');
+    }
     return INSTALLDIR.'/theme/'.$theme.'/'.$relative;
 }
 
-function theme_path($relative)
+/**
+ * Gets the full URL of a file in a theme dir based on its relative name
+ *
+ * @param string $relative relative path within the theme directory
+ * @param string $theme    name of the theme; defaults to current theme
+ *
+ * @return string URL of the file
+ */
+
+function theme_path($relative, $theme=null)
 {
-    $theme = common_config('site', 'theme');
+    if (!$theme) {
+        $theme = common_config('site', 'theme');
+    }
     $server = common_config('theme', 'server');
     if ($server) {
         return 'http://'.$server.'/'.$theme.'/'.$relative;

From caaf237de8e07cecf9d1bbe20e98ca5c1a957f34 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 22:19:17 +0000
Subject: [PATCH 032/256] Base theme stylesheet includes layout, and typography
 information Identica theme stylesheet includes colour and background
 information

---
 lib/action.php                                |   10 +-
 theme/base/css/display.css                    | 1081 +++++++++++++++++
 theme/base/css/initial_states.css             |    1 +
 theme/base/css/jquery.Jcrop.css               |   45 +
 theme/base/css/thickbox.css                   |  163 +++
 theme/base/images/icons/icon_atom.jpg         |  Bin 0 -> 1117 bytes
 theme/base/images/icons/icon_foaf.gif         |  Bin 0 -> 1144 bytes
 theme/base/images/icons/icon_rss.jpg          |  Bin 0 -> 1166 bytes
 theme/base/images/icons/icon_vcard.gif        |  Bin 0 -> 331 bytes
 .../base/images/illustrations/illu_jcrop.gif  |  Bin 0 -> 329 bytes
 .../illu_progress_loading-01.gif              |  Bin 0 -> 5886 bytes
 theme/identica/css/display.css                |  226 ++++
 theme/identica/images/icons/icon_atom.jpg     |  Bin 0 -> 1117 bytes
 theme/identica/images/icons/icon_foaf.gif     |  Bin 0 -> 1144 bytes
 theme/identica/images/icons/icon_rss.jpg      |  Bin 0 -> 1166 bytes
 theme/identica/images/icons/icon_vcard.gif    |  Bin 0 -> 331 bytes
 .../images/icons/twotone/green/against.gif    |  Bin 0 -> 85 bytes
 .../images/icons/twotone/green/arrow-down.gif |  Bin 0 -> 75 bytes
 .../icons/twotone/green/arrow-downleft.gif    |  Bin 0 -> 75 bytes
 .../icons/twotone/green/arrow-downright.gif   |  Bin 0 -> 75 bytes
 .../images/icons/twotone/green/arrow-left.gif |  Bin 0 -> 73 bytes
 .../icons/twotone/green/arrow-right.gif       |  Bin 0 -> 74 bytes
 .../images/icons/twotone/green/arrow-up.gif   |  Bin 0 -> 74 bytes
 .../icons/twotone/green/arrow-upleft.gif      |  Bin 0 -> 75 bytes
 .../icons/twotone/green/arrow-upright.gif     |  Bin 0 -> 73 bytes
 .../images/icons/twotone/green/back-forth.gif |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/bookmark.gif   |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/bulb.gif       |  Bin 0 -> 83 bytes
 .../images/icons/twotone/green/calendar.gif   |  Bin 0 -> 83 bytes
 .../images/icons/twotone/green/calendar2.gif  |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/camera.gif     |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/cart.gif       |  Bin 0 -> 86 bytes
 .../images/icons/twotone/green/caution.gif    |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/chart.gif      |  Bin 0 -> 81 bytes
 .../images/icons/twotone/green/checkmark.gif  |  Bin 0 -> 76 bytes
 .../images/icons/twotone/green/clipboard.gif  |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/clock.gif      |  Bin 0 -> 81 bytes
 .../icons/twotone/green/closed-folder.gif     |  Bin 0 -> 78 bytes
 .../images/icons/twotone/green/database.gif   |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/diskette.gif   |  Bin 0 -> 85 bytes
 .../images/icons/twotone/green/document.gif   |  Bin 0 -> 81 bytes
 .../icons/twotone/green/double-arrow.gif      |  Bin 0 -> 78 bytes
 .../images/icons/twotone/green/edit.gif       |  Bin 0 -> 75 bytes
 .../images/icons/twotone/green/eject.gif      |  Bin 0 -> 73 bytes
 .../images/icons/twotone/green/exclaim.gif    |  Bin 0 -> 74 bytes
 .../icons/twotone/green/fastforward.gif       |  Bin 0 -> 77 bytes
 .../images/icons/twotone/green/favourite.gif  |  Bin 0 -> 73 bytes
 .../images/icons/twotone/green/flag.gif       |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/graph.gif      |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/grow.gif       |  Bin 0 -> 90 bytes
 .../images/icons/twotone/green/headphones.gif |  Bin 0 -> 78 bytes
 .../images/icons/twotone/green/home.gif       |  Bin 0 -> 81 bytes
 .../images/icons/twotone/green/hourglass.gif  |  Bin 0 -> 85 bytes
 .../images/icons/twotone/green/info.gif       |  Bin 0 -> 73 bytes
 .../images/icons/twotone/green/key.gif        |  Bin 0 -> 76 bytes
 .../images/icons/twotone/green/lock.gif       |  Bin 0 -> 83 bytes
 .../images/icons/twotone/green/mail.gif       |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/move.gif       |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/music.gif      |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/news.gif       |  Bin 0 -> 76 bytes
 .../images/icons/twotone/green/note.gif       |  Bin 0 -> 82 bytes
 .../icons/twotone/green/open-folder.gif       |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/paper-clip.gif |  Bin 0 -> 78 bytes
 .../icons/twotone/green/paper-clip2.gif       |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/pause.gif      |  Bin 0 -> 75 bytes
 .../images/icons/twotone/green/phone.gif      |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/play.gif       |  Bin 0 -> 75 bytes
 .../images/icons/twotone/green/plus.gif       |  Bin 0 -> 74 bytes
 .../images/icons/twotone/green/print.gif      |  Bin 0 -> 85 bytes
 .../icons/twotone/green/question-mark.gif     |  Bin 0 -> 74 bytes
 .../images/icons/twotone/green/quote.gif      |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/refresh.gif    |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/rewind.gif     |  Bin 0 -> 77 bytes
 .../images/icons/twotone/green/search.gif     |  Bin 0 -> 76 bytes
 .../images/icons/twotone/green/shield.gif     |  Bin 0 -> 85 bytes
 .../images/icons/twotone/green/skip-back.gif  |  Bin 0 -> 76 bytes
 .../images/icons/twotone/green/skip.gif       |  Bin 0 -> 78 bytes
 .../images/icons/twotone/green/skull.gif      |  Bin 0 -> 85 bytes
 .../images/icons/twotone/green/statusbar.gif  |  Bin 0 -> 82 bytes
 .../images/icons/twotone/green/stop.gif       |  Bin 0 -> 72 bytes
 .../images/icons/twotone/green/template.gif   |  Bin 0 -> 81 bytes
 .../icons/twotone/green/text-bigger.gif       |  Bin 0 -> 82 bytes
 .../icons/twotone/green/text-smaller.gif      |  Bin 0 -> 80 bytes
 .../images/icons/twotone/green/trash.gif      |  Bin 0 -> 77 bytes
 .../images/icons/twotone/green/two-docs.gif   |  Bin 0 -> 83 bytes
 .../images/icons/twotone/green/twotone.gif    |  Bin 0 -> 2461 bytes
 .../images/icons/twotone/green/undo.gif       |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/user.gif       |  Bin 0 -> 77 bytes
 .../images/icons/twotone/green/vegetable.gif  |  Bin 0 -> 82 bytes
 .../identica/images/icons/twotone/green/x.gif |  Bin 0 -> 79 bytes
 .../images/icons/twotone/green/zoom-in.gif    |  Bin 0 -> 86 bytes
 .../images/icons/twotone/green/zoom-out.gif   |  Bin 0 -> 85 bytes
 theme/identica/logo.png                       |  Bin 818 -> 2059 bytes
 93 files changed, 1525 insertions(+), 1 deletion(-)
 create mode 100644 theme/base/css/display.css
 create mode 100644 theme/base/css/initial_states.css
 create mode 100644 theme/base/css/jquery.Jcrop.css
 create mode 100644 theme/base/css/thickbox.css
 create mode 100644 theme/base/images/icons/icon_atom.jpg
 create mode 100644 theme/base/images/icons/icon_foaf.gif
 create mode 100644 theme/base/images/icons/icon_rss.jpg
 create mode 100644 theme/base/images/icons/icon_vcard.gif
 create mode 100644 theme/base/images/illustrations/illu_jcrop.gif
 create mode 100644 theme/base/images/illustrations/illu_progress_loading-01.gif
 create mode 100644 theme/identica/css/display.css
 create mode 100644 theme/identica/images/icons/icon_atom.jpg
 create mode 100644 theme/identica/images/icons/icon_foaf.gif
 create mode 100644 theme/identica/images/icons/icon_rss.jpg
 create mode 100644 theme/identica/images/icons/icon_vcard.gif
 create mode 100644 theme/identica/images/icons/twotone/green/against.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-down.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-downleft.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-downright.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-left.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-right.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-up.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-upleft.gif
 create mode 100644 theme/identica/images/icons/twotone/green/arrow-upright.gif
 create mode 100644 theme/identica/images/icons/twotone/green/back-forth.gif
 create mode 100644 theme/identica/images/icons/twotone/green/bookmark.gif
 create mode 100644 theme/identica/images/icons/twotone/green/bulb.gif
 create mode 100644 theme/identica/images/icons/twotone/green/calendar.gif
 create mode 100644 theme/identica/images/icons/twotone/green/calendar2.gif
 create mode 100644 theme/identica/images/icons/twotone/green/camera.gif
 create mode 100644 theme/identica/images/icons/twotone/green/cart.gif
 create mode 100644 theme/identica/images/icons/twotone/green/caution.gif
 create mode 100644 theme/identica/images/icons/twotone/green/chart.gif
 create mode 100644 theme/identica/images/icons/twotone/green/checkmark.gif
 create mode 100644 theme/identica/images/icons/twotone/green/clipboard.gif
 create mode 100644 theme/identica/images/icons/twotone/green/clock.gif
 create mode 100644 theme/identica/images/icons/twotone/green/closed-folder.gif
 create mode 100644 theme/identica/images/icons/twotone/green/database.gif
 create mode 100644 theme/identica/images/icons/twotone/green/diskette.gif
 create mode 100644 theme/identica/images/icons/twotone/green/document.gif
 create mode 100644 theme/identica/images/icons/twotone/green/double-arrow.gif
 create mode 100644 theme/identica/images/icons/twotone/green/edit.gif
 create mode 100644 theme/identica/images/icons/twotone/green/eject.gif
 create mode 100644 theme/identica/images/icons/twotone/green/exclaim.gif
 create mode 100644 theme/identica/images/icons/twotone/green/fastforward.gif
 create mode 100644 theme/identica/images/icons/twotone/green/favourite.gif
 create mode 100644 theme/identica/images/icons/twotone/green/flag.gif
 create mode 100644 theme/identica/images/icons/twotone/green/graph.gif
 create mode 100644 theme/identica/images/icons/twotone/green/grow.gif
 create mode 100644 theme/identica/images/icons/twotone/green/headphones.gif
 create mode 100644 theme/identica/images/icons/twotone/green/home.gif
 create mode 100644 theme/identica/images/icons/twotone/green/hourglass.gif
 create mode 100644 theme/identica/images/icons/twotone/green/info.gif
 create mode 100644 theme/identica/images/icons/twotone/green/key.gif
 create mode 100644 theme/identica/images/icons/twotone/green/lock.gif
 create mode 100644 theme/identica/images/icons/twotone/green/mail.gif
 create mode 100644 theme/identica/images/icons/twotone/green/move.gif
 create mode 100644 theme/identica/images/icons/twotone/green/music.gif
 create mode 100644 theme/identica/images/icons/twotone/green/news.gif
 create mode 100644 theme/identica/images/icons/twotone/green/note.gif
 create mode 100644 theme/identica/images/icons/twotone/green/open-folder.gif
 create mode 100644 theme/identica/images/icons/twotone/green/paper-clip.gif
 create mode 100644 theme/identica/images/icons/twotone/green/paper-clip2.gif
 create mode 100644 theme/identica/images/icons/twotone/green/pause.gif
 create mode 100644 theme/identica/images/icons/twotone/green/phone.gif
 create mode 100644 theme/identica/images/icons/twotone/green/play.gif
 create mode 100644 theme/identica/images/icons/twotone/green/plus.gif
 create mode 100644 theme/identica/images/icons/twotone/green/print.gif
 create mode 100644 theme/identica/images/icons/twotone/green/question-mark.gif
 create mode 100644 theme/identica/images/icons/twotone/green/quote.gif
 create mode 100644 theme/identica/images/icons/twotone/green/refresh.gif
 create mode 100644 theme/identica/images/icons/twotone/green/rewind.gif
 create mode 100644 theme/identica/images/icons/twotone/green/search.gif
 create mode 100644 theme/identica/images/icons/twotone/green/shield.gif
 create mode 100644 theme/identica/images/icons/twotone/green/skip-back.gif
 create mode 100644 theme/identica/images/icons/twotone/green/skip.gif
 create mode 100644 theme/identica/images/icons/twotone/green/skull.gif
 create mode 100644 theme/identica/images/icons/twotone/green/statusbar.gif
 create mode 100644 theme/identica/images/icons/twotone/green/stop.gif
 create mode 100644 theme/identica/images/icons/twotone/green/template.gif
 create mode 100644 theme/identica/images/icons/twotone/green/text-bigger.gif
 create mode 100644 theme/identica/images/icons/twotone/green/text-smaller.gif
 create mode 100644 theme/identica/images/icons/twotone/green/trash.gif
 create mode 100644 theme/identica/images/icons/twotone/green/two-docs.gif
 create mode 100644 theme/identica/images/icons/twotone/green/twotone.gif
 create mode 100644 theme/identica/images/icons/twotone/green/undo.gif
 create mode 100644 theme/identica/images/icons/twotone/green/user.gif
 create mode 100644 theme/identica/images/icons/twotone/green/vegetable.gif
 create mode 100644 theme/identica/images/icons/twotone/green/x.gif
 create mode 100644 theme/identica/images/icons/twotone/green/zoom-in.gif
 create mode 100644 theme/identica/images/icons/twotone/green/zoom-out.gif

diff --git a/lib/action.php b/lib/action.php
index 8d0fb2634a..8694bf47c0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -111,7 +111,15 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => theme_path('display.css') . '?version=' . LACONICA_VERSION,
+                                     'href' => theme_path('display.css', 'base') . '?version=' . LACONICA_VERSION,
+                                     'media' => 'screen, projection, tv'));
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => theme_path('thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
+                                     'media' => 'screen, projection, tv'));
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => theme_path('display.css', null) . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
         foreach (array(6,7) as $ver) {
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
new file mode 100644
index 0000000000..5fc24779bb
--- /dev/null
+++ b/theme/base/css/display.css
@@ -0,0 +1,1081 @@
+/* theme: base */
+* { margin:0; padding:0; }
+img { display:block; border:0; }
+a abbr { cursor: pointer; border-bottom:0; }
+table { border-collapse:collapse; }
+ol { list-style-position:inside; }
+html { font-size: 87.5%; background-color:#fff; height:100%; }
+body {
+background-color:#fff;
+color:#000;
+font-family:sans-serif;
+font-size:1em;
+line-height:1.65;
+position:relative;
+margin:0 auto;
+width:1004px;
+width:71.714em;
+max-width:100%;
+}
+h1 {
+font-size:2.1em;
+line-height:1.1;
+margin-bottom:0.25em;
+}
+h2 { font-size:1.3em; }
+h3 { font-size:1.2em; }
+h4 { font-size:1.1em; }
+h5 { font-size:1em; }
+h6 { font-size:0.9em; }
+h1,h2,h3,h4,h5,h6 {
+	text-transform:uppercase;
+	margin-bottom:7px;
+}
+legend { font-weight:bold; }
+input, textarea, select, option {
+padding:4px;
+font-family:sans-serif;
+font-size:1em;
+-moz-border:radius:4px;
+}
+select, option {
+padding-bottom:0;
+}
+fieldset {
+padding:11px;
+}
+input:focus, textarea:focus, select:focus {
+border-width:2px;
+border-style: solid;
+-moz-border:radius:4px;
+}
+caption {
+font-weight:bold;
+}
+.opened { display: block !important;}
+.closed { display: none !important;}
+span.required { font-weight:bold; }
+form ul li {
+list-style-type:none;
+margin:0 0 18px 0;
+}
+form label {
+font-weight:bold;
+/*margin:0 0 11px 0;*/
+}
+form ul li input {
+}
+form .error {
+margin-right:11px;
+}
+form label.submit {
+display:none;
+}
+form .error_message {
+display:block;
+}
+.form_response {
+margin-bottom:18px;
+}
+.form_response dt {
+}
+.form_response dd {
+}
+
+form input.remove,
+form input.submit {
+-moz-border-radius:4px;
+}
+form input.submit {
+}
+
+
+
+
+/* FORM SETTINGS */
+.form_settings fieldset {
+padding:0;
+border:0;
+}
+.form_settings legend {
+display:none;
+}
+.form_settings .form_datas label {
+display:block;
+}
+
+.form_guide {
+font-style:italic;
+}
+
+.form_settings .form_actions label {
+display:none;
+}
+
+.form_settings #settings_autosubscribe label {
+display:inline;
+font-weight:bold;
+}
+
+
+
+/* FORM SETTINGS */
+
+
+
+
+address {
+float:left;
+margin-bottom:18px;
+}
+address .fn,
+address .email {
+display:none;
+}
+
+
+
+#header {
+width:100%;
+position:relative;
+float:left;
+padding-top:18px;
+margin-bottom:29px;
+}
+
+#site_nav_global_primary {
+float:right;
+}
+#site_nav_global_primary ul li {
+display:inline;
+margin-left:11px;
+}
+
+
+.system_notice dt {
+font-weight:bold;
+text-transform:uppercase;
+display:none;
+}
+
+#site_notice {
+position:absolute;
+right:0;
+top:49px;
+float:right;
+width:322px;
+}
+#page_notice {
+clear:both;
+margin-bottom:18px;
+}
+
+
+
+
+#footer {
+float:left;
+width:100%;
+padding-bottom:11px;
+}
+
+
+
+#site_nav_local_views {
+width:100%;
+float:left;
+}
+#site_nav_local_views dt {
+display:none;
+}
+#site_nav_local_views li {
+float:left;
+margin-right:18px;
+list-style-type:none;
+}
+#site_nav_local_views a {
+float:left;
+text-decoration:none;
+padding:4px 11px;
+-moz-border-radius-topleft:4px;
+-moz-border-radius-topright:4px;
+border-width:1px;
+border-style:dashed;
+border-bottom:0;
+}
+#site_nav_local_views .nav {
+float:left;
+width:100%;
+}
+
+
+#site_nav_global_primary dt,
+#site_nav_global_secondary dt {
+display:none;
+}
+/*
+#site_nav_global_primary .current a {
+font-weight:bold;
+border-style:solid;
+}
+*/
+#site_nav_global_secondary {
+margin-bottom:11px;
+}
+
+#site_nav_global_secondary ul li {
+display:inline;
+margin-right:11px;
+}
+#export_data li a {
+padding-left:20px;
+}
+#export_data li a.foaf {
+padding-left:30px;
+}
+#export_data li a.export_vcard {
+padding-left:28px;
+}
+
+
+
+#export_data ul {
+display:inline;
+}
+#export_data li {
+list-style-type:none;
+display:inline;
+margin-left:11px;
+}
+#export_data li:first-child {
+margin-left:0;
+}
+
+
+
+
+#licenses dt {
+font-weight:bold;
+display:none;
+}
+#licenses dd {
+margin-bottom:11px;
+}
+
+
+#site_content_license_cc p {
+float:left;
+margin-left:10%;
+width:90%;
+}
+#site_content_license_cc img {
+float:left;
+margin-left:-100%;
+}
+
+
+#wrap {
+	float:left;
+	margin:0 auto;
+    width:1004px;
+    width:71.714em;
+}
+
+
+#core {
+position:relative;
+width:100%;
+float:left;
+margin-bottom:1em;
+}
+
+#content {
+width:644px;
+padding:18px;
+float:left;
+-moz-border-radius:7px;
+-moz-border-radius-topleft:0;
+}
+
+#content_inner {
+position:relative;
+}
+
+#supplemental_primary {
+width:300px;
+float:left;
+margin-left:2px;
+padding:18px 4px 18px 18px;
+-moz-border-radius:7px;
+}
+
+
+
+
+/*Start: FORM NOTICE*/
+#form_notice {
+width:384px;
+float:left;
+margin-left:86px;
+position:relative;
+line-height:1;
+}
+#form_notice fieldset {
+border:0;
+padding:0;
+}
+#form_notice legend {
+display:none;
+}
+#form_notice textarea {
+-moz-border-radius:4px;
+width:304px;
+height:95px;
+line-height:1.5;
+padding:7px 7px 14px 7px;
+}
+#form_notice label {
+display:block;
+font-size:1.3em;
+margin-bottom:7px;
+}
+#form_notice .form_datas li {
+float:left;
+}
+
+#form_notice #notice_attach_file label,
+#form_notice #notice_submit label {
+display:none;
+}
+
+#form_notice #notice_attachment {
+margin-top:25px;
+margin-left:4px;
+}
+
+#form_notice .form_note {
+position:absolute;
+top:125px;
+right:98px;
+z-index:9;
+}
+
+#form_notice .form_note dt {
+font-weight:bold;
+display:none;
+}
+#notice_text-count {
+font-weight:bold;
+line-height:1.15;
+}
+
+#form_notice #notice_data-attach_view {
+/*position:absolute;*/
+top:25px;
+right:30px;
+margin-left:4px;
+padding:0;
+cursor:pointer;
+width:16px;
+height:16px;
+border:0;
+text-indent:-9999px;
+}
+#form_notice .form_actions {
+position:absolute;
+top:107px;
+right:0;
+}
+#form_notice li {
+margin-bottom:0;
+}
+/*end FORM NOTICE*/
+
+
+
+
+
+/* user_profile */
+#user_profile {
+position:relative;
+width:633px;
+min-height:123px;
+float:left;
+margin-bottom:17px;
+margin-left:0;
+}
+#user_profile dt,
+#user_statistics dt {
+font-weight:bold;
+}
+#user_profile .user_depiction {
+float:left;
+position:absolute;
+top:0;
+left:0;
+width:96px;
+}
+#user_profile .user_fn,
+#user_profile .user_nickname,
+#user_profile .user_location,
+#user_profile .user_url,
+#user_profile .user_note,
+#user_profile .user_tags {
+float:left;
+clear:left;
+margin-left:125px;
+width:322px;
+margin-bottom:4px;
+}
+
+#user_profile .user_fn,
+#user_profile .user_nickname {
+width:auto;
+clear:none;
+}
+#user_profile .user_nickname {
+margin-left:11px;
+}
+#user_profile .user_nickname .nickname {
+font-style:italic;
+font-weight:bold;
+margin-left:4px;
+margin-right:4px;
+}
+
+#user_profile .user_nickname dd:before {
+content: "(";
+}
+#user_profile .user_nickname dd:after {
+content: ")";
+}
+
+#user_profile dt {
+display:none;
+}
+#user_profile h2 {
+display:none;
+}
+/* user_profile */
+
+/*user_actions*/
+#user_actions {
+clear:left;
+float:left;
+position:absolute;
+top:0;
+right:0;
+}
+#user_actions h2 {
+display:none;
+}
+#user_actions ul {
+list-style-type:none;
+}
+#user_actions li {
+border-top-width:1px;
+border-top-style:dotted;
+}
+#user_actions li:first-child {
+border-top:0;
+}
+#user_actions fieldset {
+border:0;
+padding:0;
+}
+#user_actions legend {
+display:none;
+}
+
+#user_actions a,
+#user_actions input.submit {
+display:block;
+text-align:left;
+padding:4px 0 4px 19px;
+}
+#user_actions a {
+text-decoration:none;
+}
+#user_subscribe a,
+#TB_window input.submit,
+#user_actions input.submit {
+border:0;
+cursor:pointer;
+padding-left:16px;
+width:100%;
+font-size:0.9em;
+}
+
+#user_subscribe a {
+width:auto;
+padding-left:20px;
+}
+
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+font-weight:bold;
+}
+
+
+
+#user_send-a-message form {
+clear:left;
+width:322px;
+margin-top:18px;
+}
+
+#user_send-a-message textarea {
+width:96%;
+}
+
+.user_tags ul {
+list-style-type:none;
+}
+.user_tags li {
+display:inline;
+margin-right:1em;
+float:left;
+}
+
+
+
+.aside .section {
+margin-bottom:29px;
+clear:both;
+}
+.aside .section h2 {
+text-transform:uppercase;
+font-size:1em;
+}
+
+#user_statistics dt,
+#user_statistics dd {
+display:inline;
+}
+#user_statistics dt:after {
+content: ":";
+}
+
+
+#user_subscriptions,
+#user_subscriptions-common {
+float:left;
+}
+#user_subscriptions ul.users {
+width:220px;
+float:left;
+}
+#user_subscriptions .users li {
+list-style-type:none;
+float:left;
+margin-right:7px;
+margin-bottom:7px;
+}
+#user_subscriptions .users li .photo {
+width:24px;
+height:24px;
+margin-right:0;
+}
+#user_subscriptions .users li .fn {
+display:none;
+}
+.aside .section .more {
+clear:both;
+}
+
+
+
+
+
+/* NOTICE */
+.notice {
+position:relative;
+padding-top:18px;
+padding-bottom:18px;
+clear:both;
+float:left;
+width:644px;
+width:96.699%;
+width:100%;
+border-top:1px dashed #D1D9E4;
+/*-moz-border-radius:7px;*/
+}
+.notices li {
+list-style-type:none;
+/*margin-bottom:11px;*/
+}
+
+
+/* NOTICES */
+#notices_primary {
+float:left;
+width:644px;
+-moz-border-radius:7px;
+}
+#notices_primary h2 {
+display:none;
+}
+.notice-data a span {
+display:block;
+padding-left:28px;
+}
+
+
+.notice .author {
+float:left;
+width:96px;
+width:199px;
+margin-left:-217px;
+margin-left:-199px;
+}
+.notice .author a {
+}
+.notice .author:after {
+content:":";
+}
+
+.vcard .photo {
+display:inline;
+margin-right:11px;
+margin-right:4px;
+vertical-align:top;
+}
+.vcard .url {
+text-decoration:none;
+}
+.vcard .fn {
+border-bottom-width:1px;
+border-bottom-style:dotted;
+font-style:italic;
+}
+.vcard .fn:hover {
+border-bottom-width:1px;
+border-bottom-style:solid;
+}
+
+
+.notice .entry-title {
+float:left;
+margin-bottom:11px;
+margin-left:217px;
+margin-left:199px;
+}
+.notice p.entry-content {
+float:left;
+width:427px;
+width:100%;
+}
+
+.notice_video p.entry-content,
+.notice_audio p.entry-content,
+.notice_image p.entry-content,
+.notice_location p.entry-content,
+.notice_event p.entry-content,
+.notice_document p.entry-content {
+width:322px;
+width:75.41%;
+}
+#laconicat .notice p.entry-content {
+/*margin-left:199px;*/
+}
+.notice p.entry-content a {
+
+}
+.notice p.entry-content a:hover {
+
+}
+.notice p.entry-content .tag a {
+
+}
+.notice p.entry-content .tag a:hover {
+
+}
+
+
+.notice div.entry-content {
+/*border:1px solid blue;*/
+clear:left;
+float:left;
+margin-left:11px;
+margin-left:0;
+margin-bottom:4px;
+width:199px;
+width:149px;
+}
+.notice div.entry-content,
+.notice .notice-options a,
+.notice .notice-options input {
+font-size:0.9em;
+}
+
+
+#laconicat .notice div.entry-content {
+/*margin-left:0;*/
+}
+
+.notice div.entry-content dl,
+.notice div.entry-content dt,
+.notice div.entry-content dd {
+display:inline;
+}
+.notice div.entry-content .timestamp dt,
+.notice div.entry-content .response dt {
+display:none;
+}
+.notice div.entry-content .timestamp {
+
+}
+.notice div.entry-content .device dt {
+text-transform:lowercase;
+}
+.notice div.entry-content a {
+text-decoration:none;
+border-bottom-width:1px;
+border-bottom-style:dotted;
+}
+.notice div.entry-content a:hover {
+border-bottom-width:1px;
+border-bottom-style:solid;
+}
+
+
+
+.notice-data {
+position:absolute;
+top:18px;
+right:0;
+min-height:50px;
+margin-bottom:4px;
+}
+.notice .entry-content .notice-data dt {
+display:none;
+}
+
+.notice-data a {
+display:block;
+outline:none;
+}
+
+
+
+.notice-options {
+margin-left:18px;
+margin-left:260px;
+margin-left:304px;
+margin-left:18px;
+margin-left:50px;
+float:left;
+}
+.notice-options .reply,
+.notice-options .notice_delete ,
+.notice-options .notice_favorite {
+float:left;
+margin-right:11px;
+}
+.notice-options .reply dt {
+display:none;
+}
+.notice-options .reply a,
+.notice-options form input.submit {
+display:block;
+border:0;
+border-bottom-width:1px;
+border-bottom-style:dotted;
+padding-left:20px;
+
+}
+.notice-options .reply a {
+text-decoration:none;
+}
+.notice-options form input.submit {
+cursor:pointer;
+width:16px;
+width:auto;
+height:16px;
+height:auto;
+padding-top:0;
+padding-right:0;
+padding-bottom:0;
+}
+
+.notice-options .notice_delete legend,
+.notice-options .notice_favorite legend {
+display:none;
+}
+.notice-options .notice_delete fieldset,
+.notice-options .notice_favorite fieldset {
+border:0;
+padding:0;
+}
+
+
+.notice-options form.notice_delete {
+margin-left:2em;
+}
+/*END: NOTICES */
+
+
+
+
+
+.pagination dt {
+font-weight:bold;
+display:none;
+}
+
+.pagination .nav {
+float:left;
+width:100%;
+list-style-type:none;
+}
+
+.pagination .nav_prev {
+float:left;
+}
+.pagination .nav_next {
+float:right;
+}
+
+.pagination a {
+display:block;
+text-decoration:none;
+font-weight:bold;
+padding:7px;
+border:1px dotted #D1D9E4;
+border-bottom:0;
+}
+
+.pagination .nav_prev a {
+-moz-border-radius-topright:4px;
+padding-left:20px;
+border-left:0;
+}
+.pagination .nav_next a {
+-moz-border-radius-topleft:4px;
+padding-right:20px;
+border-right:0;
+}
+
+
+/* END: NOTICE */
+
+
+
+
+
+
+
+/*START: LOAD ALONG WITH JS*/
+.notice .in-reply-to {
+	width:98%;
+	margin-left:2%;
+}
+.notice .in-reply-to li {
+background-color:#F7F9FB;
+}
+.notice .in-reply-to li .in-reply-to li {
+background-color:#E4E9F0;
+}
+.notice .in-reply-to li .in-reply-to li .in-reply-to li {
+background-color:#D1D9E4;
+}
+
+
+
+#user_actions #user_subscribe .form_note,
+#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_actions label {
+display:none;
+}
+#form_user-relationship .form_note,
+#form_user-relationship .form_datas,
+#form_user-relationship .form_actions label {
+display:block;
+}
+
+#user_actions #user-relationship_submit {
+margin-bottom:0;
+}
+#form_user-relationship .form_datas li label {
+margin-right:11px;
+}
+
+#user_relationship_xfn {
+/*z-index:1000;
+position:absolute;
+width:521px;
+height:322px;*/
+display:none;
+}
+#user_relationship_xfn fieldset {
+background-color:#fff;
+}
+
+/*END: LOAD ALONG WITH JS*/
+
+
+
+/* TOP_POSTERS */
+#top-posters caption {
+text-align:left;
+text-transform:uppercase;
+}
+
+#top-posters thead {
+display:none;
+}
+#top-poster_user {
+width:199px;
+}
+#top-poster_number-of-notices {
+width:123px;
+}
+#top-posters tbody td {
+padding-right:11px;
+padding-bottom:4px;
+}
+#top-posters img {
+margin-right:7px;
+height:24px;
+width:24px;
+}
+
+
+
+/* tagcloud */
+#tagcloud ul {
+list-style-type:none;
+}
+#tagcloud ul li {
+display:inline;
+margin-right:7px;
+line-height:1.4;
+}
+
+#tagcloud.section dt {
+text-transform:uppercase;
+font-weight:bold;
+}
+#tagcloud .weight_1 {
+font-size:1em;
+}
+#tagcloud .weight_2 {
+font-size:1.3em;
+}
+#tagcloud .weight_3 {
+font-size:1.6em;
+}
+#tagcloud .weight_4 {
+font-size:1.9em;
+}
+#tagcloud .weight_5 {
+font-size:2.2em;
+}
+
+
+
+#form_settings_photo .form_datas {
+clear:both;
+}
+
+
+
+
+#photo_original,
+#photo_preview {
+float:left;
+}
+#photo_preview,
+#settings_photo_action-crop {
+margin-left:29px;
+}
+#photo_preview_view {
+height:96px;
+width:96px;
+overflow:hidden;
+}
+
+
+
+
+.section .groups,
+#users_featured ul {
+list-style-type:none;
+}
+.section .groups li,
+#users_featured li {
+margin-top:11px;
+float:left;
+width:100%;
+}
+.section .groups li:first-child,
+#users_featured li:first-child {
+margin-top:0;
+}
+
+.section .groups .vcard,
+#users_featured .vcard {
+float:left;
+margin-bottom:-23px;
+}
+
+.section .groups dl,
+#users_featured dl {
+float:left;
+margin-left:63px;
+clear:left;
+}
+.section .groups dt,
+#users_featured dt {
+display:none;
+font-weight:bold;
+}
+
+
+
+#home.logged_out h1 {
+display:none;
+}
+
+#home #intro {
+margin-bottom:29px;
+float:left;
+width:100%;
+}
+
+#home #intro p {
+margin-bottom:18px;
+font-size:1.8em;
+}
+
+#home #intro #guide_steps {
+list-style-type:none;
+}
+#home #intro #guide_steps li {
+float:left;
+margin-left:18px;
+}
+#home #intro #guide_steps li:first-child {
+margin-left:0;
+}
+#home #intro #guide_steps li a {
+display:block;
+float:left;
+width:185px;
+height:109px;
+border-width:1px;
+border-style:dotted;
+text-decoration:none;
+-moz-border-radius:7px;
+padding:7px;
+font-size:1.6em;
+font-weight:bold;
+text-align:center;
+}
+
+
+c
+#testimonials {
+clear:both;
+}
diff --git a/theme/base/css/initial_states.css b/theme/base/css/initial_states.css
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/theme/base/css/initial_states.css
@@ -0,0 +1 @@
+
diff --git a/theme/base/css/jquery.Jcrop.css b/theme/base/css/jquery.Jcrop.css
new file mode 100644
index 0000000000..6c6dfb503e
--- /dev/null
+++ b/theme/base/css/jquery.Jcrop.css
@@ -0,0 +1,45 @@
+/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
+.jcrop-holder
+{
+	text-align: left;
+}
+
+.jcrop-vline, .jcrop-hline
+{
+	font-size: 0;
+	position: absolute;
+	background: #fff url(../images/illustrations/illu_jcrop.gif) top left repeat;
+	/*
+	opacity: .5;
+	*filter:alpha(opacity=50);
+	*/
+}
+.jcrop-vline { height: 100%; width: 1px !important; }
+.jcrop-hline { width: 100%; height: 1px !important; }
+.jcrop-handle {
+	font-size: 1px;
+	width: 7px !important;
+	height: 7px !important;
+	border: 1px #eee solid;
+	background-color: #333;
+	/*width: 9px;
+	height: 9px;*/
+}
+
+.jcrop-tracker {
+	/*background-color: gray;*/
+	width: 100%; height: 100%;
+}
+
+.custom .jcrop-vline,
+.custom .jcrop-hline
+{
+	background: yellow;
+}
+.custom .jcrop-handle
+{
+	border-color: black;
+	background-color: #C7BB00;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
diff --git a/theme/base/css/thickbox.css b/theme/base/css/thickbox.css
new file mode 100644
index 0000000000..d24b9bedff
--- /dev/null
+++ b/theme/base/css/thickbox.css
@@ -0,0 +1,163 @@
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+*{padding: 0; margin: 0;}
+
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+#TB_window {
+	font: 12px Arial, Helvetica, sans-serif;
+	color: #333333;
+}
+
+#TB_secondLine {
+	font: 10px Arial, Helvetica, sans-serif;
+	color:#666666;
+}
+
+#TB_window a:link {color: #666666;}
+#TB_window a:visited {color: #666666;}
+#TB_window a:hover {color: #000;}
+#TB_window a:active {color: #666666;}
+#TB_window a:focus{color: #666666;}
+
+/* ----------------------------------------------------------------------------------------------------------------*/
+/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/
+/* ----------------------------------------------------------------------------------------------------------------*/
+#TB_overlay {
+	position: fixed;
+	z-index:100;
+	top: 0px;
+	left: 0px;
+	height:100%;
+	width:100%;
+}
+
+.TB_overlayMacFFBGHack {background: url(macFFBgHack.png) repeat;}
+.TB_overlayBG {
+	background-color:#000;
+	filter:alpha(opacity=75);
+	-moz-opacity: 0.75;
+	opacity: 0.75;
+}
+
+* html #TB_overlay { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_window {
+	position: fixed;
+	background: #ffffff;
+	z-index: 102;
+	color:#000000;
+	display:none;
+	border: 4px solid #525252;
+	text-align:left;
+	top:50%;
+	left:50%;
+}
+
+* html #TB_window { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_window img#TB_Image {
+	display:block;
+	margin: 15px 0 0 15px;
+	border-right: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	border-top: 1px solid #666;
+	border-left: 1px solid #666;
+}
+
+#TB_caption{
+	height:25px;
+	padding:7px 30px 10px 25px;
+	float:left;
+}
+
+#TB_closeWindow{
+	height:25px;
+	padding:11px 25px 10px 0;
+	float:right;
+}
+
+#TB_closeAjaxWindow{
+	padding:7px 10px 5px 0;
+	margin-bottom:1px;
+	text-align:right;
+	float:right;
+}
+
+#TB_ajaxWindowTitle{
+	float:left;
+	padding:7px 0 5px 10px;
+	margin-bottom:1px;
+}
+
+#TB_title{
+	background-color:#e8e8e8;
+	height:27px;
+}
+
+#TB_ajaxContent{
+	clear:both;
+	padding:2px 15px 15px 15px;
+	overflow:auto;
+	text-align:left;
+	line-height:1.4em;
+}
+
+#TB_ajaxContent.TB_modal{
+	padding:15px;
+}
+
+#TB_ajaxContent p{
+	padding:5px 0px 5px 0px;
+}
+
+#TB_load{
+	position: fixed;
+	display:none;
+	height:13px;
+	width:208px;
+	z-index:103;
+	top: 50%;
+	left: 50%;
+	margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */
+}
+
+* html #TB_load { /* ie6 hack */
+position: absolute;
+margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+}
+
+#TB_HideSelect{
+	z-index:99;
+	position:fixed;
+	top: 0;
+	left: 0;
+	background-color:#fff;
+	border:none;
+	filter:alpha(opacity=0);
+	-moz-opacity: 0;
+	opacity: 0;
+	height:100%;
+	width:100%;
+}
+
+* html #TB_HideSelect { /* ie6 hack */
+     position: absolute;
+     height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+}
+
+#TB_iframeContent{
+	clear:both;
+	border:none;
+	margin-bottom:-1px;
+	margin-top:1px;
+	_margin-bottom:1px;
+}
diff --git a/theme/base/images/icons/icon_atom.jpg b/theme/base/images/icons/icon_atom.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..22853edc43ff04778001d28e5e14e64b32693f05
GIT binary patch
literal 1117
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&k!i+{EEZ-41_o9j<^p0qAQnZ!AUPHw2Fat#
zfz*M-L6`@Kk@dmY*vy2<4F>xE0R}-11_1^EW=25<CP7AKLB{{L8Cn>anV3L`8Hkvf
zSy(w(Sy@<Ex!5__IC!{ud3m^bc=-551o`-d`FVH*B?N^<Ma9I$cm*Y;B*dgd#Kc4y
zf!bJsI#^k`MEQ95_(Vws|Bo;(VqjooWds9Y=z;+w6VNei>>Qk2+yV?tKuefdm_beh
zs;mXdF|Y`-3Mm>ovIz$!vMUve7&T5@$f4}C@t|nX#SbdRNkvVZTw>x9l2WQ_>Kd9_
zCZ=ZQ7M51dF0O9w9-dyoA)#U65s^{JDXD4c8JStdC8cHM6_r)ZEv;?s9i3g1CQq3<
zZTgIvvlcC0vUJ(<6)RV5+Pr1!w(UE1?mBe%$kAiRPn<k;>GGAU*RJ2VdF$b$$4{O<
zd;a3(tB;>PfBE|D`;VW$7#Wx$-T{&r{s9I*BNGb?GYdP&Ka5P}K+G)2!m4P<Cgd2%
zo>(ZXWYowZ;xuvL#)F*7#z7xMlZq~KiK&=8RQ(9@64*z?d8mmjAHh8Y_s{=Z3_Q$?
zz+}TL$Y9U#^*!s4{C`4kQ@{F)F8#NE<^7nNX{$BEX7;OWE|d3v8oxYgwT`W+-_*q-
z+uzjLw=VzM)weYJobTH^U)E+Hs>*NOQoXkN(6;Tf#Fj2Ov+-`EuiCfmW$ej|9|&<u
zJpUO!(Ob~!Qb^WTRn^7s?>k>x-`dJy<I3_-!(>*iwaIS@snEOaP0Pi8o%z1YZ)MKM
zRh|Np+Y=60roJjLZm^p5YSuI*^Cmyt+P{5LF*_nZUCA@@&Al93&$PVvpTfaM*5M!4
zAAY>*^{;80%VnnTYCTgO_i(zRpnz~I%X9Ugp$`rGx_=#0x)>OxdU^ku>!Q7(i@)aR
QKG!^Hc0cZ<-tqr80k4%pzW@LL

literal 0
HcmV?d00001

diff --git a/theme/base/images/icons/icon_foaf.gif b/theme/base/images/icons/icon_foaf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8f78442355bf0d0b509536bca7c57b4eedab04a
GIT binary patch
literal 1144
zcmd^;?N1ta0Dyn!iB*(>T3&i*JrF8R7w1whHElM8C<3ml?j+W9-3dwyO`2L|HqDkn
z5%F#4%5=zqhahRU8WmVVw{A%ro6Wr`PE6ceVj2??L*}%}w$5a?_V3v9;raf2cvR|!
zleHa30UP`^2O^P(TCHAKSg=~He14Hqsif%uZ8F&hVl+)kq!MMLzPTBX#bWfui_Upx
zD&?A({APN6nl_tVpScF^4um#Ch!`OgWH@Z1X>XUc>*oB;p^^I*kHugxqzIz#MkuV+
z27e0fbavY2Z0Yob-EJpWNrkE-kx0z`GV7<3B)Q`M(a*|fwO?ze5|oczl~rJTgzvcP
zz!1czQbk)^OUg=ic0LdYc>Kb`Zg=<I-iJ1ujW!zn{<XMHH!-<vv>9odT3ob5qn5U-
zZT@vXO;3k^3m?hNp^{WgtIf?~Vi*>WTf)DFYicA*OYfDHpIEwZfu=*Xwa2whum5W{
zlO!obgc%u(w8@kv2n>cj-+78r7)Id$weIzL7Z!R>!0^-*v5e!F&8~w3Z(YM%0)Y@I
zE{Nm!F$q#$j-}IMH89-M7w}AdKk~&$^8EQ0k%;<%3Q);-{B4CovDekr^qO&h-@R)#
zADB!U?U`h<e_yZf?Nu|gncO1SN3B;>6#s5A^?%aeE|u=?euQDt>S{El*K_kZ{mxHA
zKZiIhc5pN3^BG3p|I*eU;lW3AS9DcXD27Q~_gwCYuVpe!2=hknj|h-5S$U0@T;=iD
z)k0w^HAb$Gi#YE0tpNaNntta0C!(hi1AsYD`8@ym6W|aH&PB`*h_CXP`B1cFukIl$
zs|1(%WPd!$fVg5p|HQsAS^bi1b0#pP6%J=GW{H{G^{kf%TYUG<8ipXeV7Bse-~cv|
zbFQln4K0m}iaXIuv5tC2w(J<*7GbcULq^Pkw5D#|;fUDp4ksPTyrZ@I+X3#gFQA-x
zk0&Fbfm(V`Kb^8?Lhb_Ijq8^l&o~_g;dlNH1SJ|q-7P$;xu;<b%Dz50+W1&J%F1yM
z&V4)Hu@QLn6sRP)k`?$x-9IO}PY8%vBzR%N`bMLZt-ZXRCTh0CQbnI`h!e@hm(Tjg
zI~4}Goteq}vxp<JK6F>vu8g;$-KF`Z%EK&)8HeT>g)Y#vUAp}MLgmL1PV~(!a7HD+
zI?Nr*lXC$Eu30nL$d)62zg!{*uVkS>^T@WwmwfEeqXVc$01lsS6Nu{>3~=f{5zlh9

literal 0
HcmV?d00001

diff --git a/theme/base/images/icons/icon_rss.jpg b/theme/base/images/icons/icon_rss.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..da23422d0616d0d2925545214c2591b78dd1d6cb
GIT binary patch
literal 1166
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&ktySh4hu5_0|P4%a{)0Q5Q`#VkQ@sTgXGcW
zK<Yr^Aj|{A$ogPxY-Ymb1_S;70D~Y0g8+j7Gov5_lOQ9rAmjhr3@r@IOiUoe3`ES#
zEUX-?tSl_7T<jcd96a2-ygb}IJbe5jf_(hK{5(8@5`w~_qGIA=yn>Qa5@J#!Vq&6<
zKy9o*9jvTeqI^7je4?a+|3?@XF)%Q)GJ*jxbisg;3FsI$b`DN1ZUF`+pe0N!%pj)$
zRn`LK7+3^Zg%k}P*@OcV*_8@Kj2b5{<WP3ncu+Lx;s+Juq@pHHE-`TlNhwt|bq!4|
z6H_yD3rj0!7gslT4^OY)kkGL3h{&kql+?8JjLfX!lG3vBipr|yme#iRj?S)0lc!9b
zHhsp-S&J4gS-Ncbij}K2ZQinV+x8thcO5!><mj>ECr+Nabot8FYu9hwy!G(W<0ns_
zJ%91?)yGetzkL1n{m0K=j10^W?*K^*{{VxZk%@(cnS~wXA4aBfAZ8Y1VO2C_6LJh>
zPb?HxGHT=yahkYr<3Ubk<Dd_sNktdA#8gZks(u7{3G5@{Jk&&%kKi7H`{(~H1|DWc
zV6tHrWUy!Wm3-hI-{n1p4`1&sKR(S)b>6e=l{~ZV&R(<em;s-hT?FI21tsf`70k%8
z_+zut;>P($<#Tc_eT}|Zsr;?yuxz;gdKo>o08iH_ez(7J*Xx$0_w2DP{4nd=rPuyD
z`a)(@-l|)kedxsE9m)%3QmU^v_nh7s>82){>G!efn0MO#wHIGL{c+0jtmNgD(xyum
zefR%$bCwl<_gg!Wm##8d)9z_*-yNvB?~T)ip1kmw&vVT4op{R=4C8OwoLuR)CoA_`
zOx3bo_v7ZyN>|fo)OqB&T-^0={g$N{mw&I*Tx@-;&iYcF!b_?4mOt{Tt77hWuXV3n
z?EbBWV{xfmmW=#VXK{s+mvPsWMca>EoX5{A_C9zP*X`J>JyYMgG3%|L9@=Its<C9H
Q#rfD<KjLR^a{qr503@_mkpKVy

literal 0
HcmV?d00001

diff --git a/theme/base/images/icons/icon_vcard.gif b/theme/base/images/icons/icon_vcard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d52947f3e96c0f74f00a80b430f99695e110e5e
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VHW@n0K^{vi^LV;@6MUi1^D~(*6OmW*GsnCZu9x+db$Rr+7rg(
zj*Y_!l*<dH*({I3D38V)oYE4M$0mWj1fbXqlFb8`$49B%6@|kBiopk&$~vOf5r)11
zjKmX(!4m)f|NZ;sA^8LW0018VEC2ui02crb000HZ;P*XTX`X2Lh#!+!a5BMkO()E#
zS&7{Ilb$dk5Kv|b07p1!5CVioPzX_23qcM*!xb0?o`FHY<w87Y14W~SxG4p&cnzUk
z0BDZ^LFoY8bp;0=2L%*$1P6m?1Bwm+3=j+y5(FLu7ZeN(5&?O683-Jc4;f!+5u*$U
zo{SlH01FQapLq(S3ka466%q^`919Ll0ma4y5eo|#2nrPl3=16(7#I%M*w`Hy${h$2
d$_oG=)f?vL=hf=U>MRc(@bU8V@GBo706UV+d;tIe

literal 0
HcmV?d00001

diff --git a/theme/base/images/illustrations/illu_jcrop.gif b/theme/base/images/illustrations/illu_jcrop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/theme/base/images/illustrations/illu_progress_loading-01.gif b/theme/base/images/illustrations/illu_progress_loading-01.gif
new file mode 100644
index 0000000000000000000000000000000000000000..82290f48334c81272ff5991962951758137a08ba
GIT binary patch
literal 5886
zcmajjXHXMNw+HYfB!MJ=D4~f36H2I3m2PMP3Q|QxK|qw=qzI7`I)vU!XwnHCsVYcE
z=`Hl$dsProxjgTe`_9~X=I-a+ncbP+{LeY7ta@Ku!ejtI184&P&d$zGPEL-Fj`sHU
zHa9m{S63Go7iVW@CnqOIM@NT-hWh&Yy1KgB+uNI)n;RM$>g(&PtE($2Dhdk=&(F^R
z|KGZGj(DV`tD_*NsU$2QNCCXqf9n(sfdh~LzJJdCa}5CGoUI+JZJBOCDz({abl~fE
zw*5kfzVoR6cNi2r#C!ZEH0O<?=na-Gi{TCI{a6Jn2ArW<+UV98bAnZ^;a+`lkM_j)
zfe61h)F=FMYqJVF9VO*kKTUU^ARmOsL)F0GkkGJ*NW$}nvB89}aO%h?t>;NW@rIh|
zlqsqSSs9s#;sV;-@|>77A1W_O_DV`91Pq4Kz`Z(PaO&pn=GOMkuU$ROkc5GuVd!Y*
zcn`UMY<Og<W2T$@p!3@zm^`quJ-N}bwKzFHy*;;wSZ$)>kYq7V07o@rsi~>-ziMLT
zG+?a49zQWzia{TFcs{FKj#dh}e#z5@`O3omC>ELXboP2cR7WT?J@&ao#fn-I;sJ*F
zD;=5p9?%y~V{F{q4^{|Zlt~d?*Ve!iWj&E%8@h^*gN$V29v5mAsN{O(ULD=kFMd^>
zzLGLp)CZ#Qm6Q%3+`@kXtfre9GnE->Ai(oKKDoxtH@hRaB&C1e=IHR>I8;havNP_A
z5Rq#nPVBdI5VpJ;S&et6>VVp>c?LwQ)tZWlq#H^i>)VP@16GREXU98`irCrvkEecY
zkv~S7^T>M0*)Mb{LvE6`M77!t_ZXXI^`uU6W|L`YE-^~uca*s^)=F=9o*rxs>$qx+
zN_$rAd`ahYK<ux!QM!M>2^cpF)HkQ1(Vq|Urh;b~<55D)DL$EUNo=p_A6VQ1A+M~)
zfa$>U0O5Rbu4r3$+|O$+gUQaOR@{dPsf3U1Dln%z0(Y0xq^w4=AKW8UMLXPC9RL7*
zZ3?i~&mg|kvE%&Q2{D=<{q^E0^^<esUTaCLynFqpE!V)v6~>uNwISF-V^g!SN_6Pp
zHm8=*qyzo0O&|aW=mQ}BV^c}pv_6$imk>cA#v4GgKI?F@S#sYw42|o9Jp1uLDt+Ls
z2-H#~>q=LQWTF;nU7xJYKH2KCI4{O5B$T{{EgN}dE+rE|#F+n@O!gj|u;Xxe?Su03
z2tWqC_4M@)#<@OoQ{pg&@m`>d=YYXNQlKHoj2tjT2nB<`FCZcENCi2SLd5c#<U&$$
zes)7<ZCOJ}D<q_%qxP#%MmO&j1TTopWl2R16&g+QLQIW-#=It{mxfmsIA)wz7b|wR
zP&;!+$kC06z3uhGwdLcPBCh=eb`Ox*KnT~Pg}e3~Ah5$a6;KgJ|AR$xpF2>Iz{+w=
zQMis*31e?RPgP7h#4AOzY&hE#R4n&Ii?x5Yq0)?J7KNcBj@<EaVi{D7;GIOB6>XdX
zlWZ;>n^k?`V`54w4oMu!H=JW%u_9}!!vS4^ZMC2#K+@g2!t)G5*y)(xiYlL_px35D
zIhY0lK348EIpV!%r-=F;O(7xbv>oQP6>|(>Opp4COU-9M>Q6ub0PdDCFo(En#x&eN
zGni{g@pt^Yi&Zk-WUSBg%!GQT&imw!)F&}=v0^+<x5$D|Y}u;@=M{@}e^xD7BBD;q
z`0H+^xwo$}$<Tjle`vw+Tn7763=S7Pcd4yE{1SMulji50A@-tk8qoAYBDNv%g<O)l
zbEf?B$Ulip4-t#iNuDS=HmuDES&?Wt&0MSHvc^nzgBNJ})5MYUYUR*7G$U7*+T}`>
zPAeQFDhtKVnUuxMHpDJZ^)IYcqn3l$E3tGu>6%O0JW{Qd&uUAT_CJz)Db-2{$Z4Cq
zibD~-93PZJRMP~xt4_LEY#WADM=C$k2DOim8}|&T7PflIw)ySUdh%=c{&;)e+r`Hd
z>F)2L5sYyl@Pwfv-Z+Q9(~d^Q%E@BrXlV!+zKk$1SUf5lN)jz7MS>v}FnGm>Qbf5(
zWmQ8>Y4OMAhWe&Lk?b!b?Oi<reF8bvwH*Wb-_mJlTm?WN9{USnBJ+zbh}F3T1a50>
z7q@cwX@48D4*Plhd-GIrduvP}Ef)tlzfP@U!q&vPH#vyU*UZF+Z1UXs%zV%z6LOs+
zcaVxUJ2&!|`1z(BM}Lk=9HZd_-+C?1s|j<U@oN*p%WC17xc6HDfpXvCWW}xvT18@f
zAxwxXhF2Ljbn^s2{!Z{}9!QDmAl6pWu2|R2=x(5AiYsQ4g-!+9<Q{WN{NwE%cvF$6
z(P;hEcE){WI!oiLxYJ3wU=(1!1$6VCO}==z;WsWyZynvCeEk?6kv;$*6RY2tqpl;(
zgsomrE#-eNuyfk9J$_qmFK5DCY<topGX3$G>(*3pM}K)5P_O^ZvgjpgCOOIH^P=rz
zrnafS&0I?@i8t47Fuv>lf<z7s6K@<oN!#SQ8@Tt^?sq`X#+b?UfaAMUl(=5<i(fr1
zFN_Yy7t@8kDUajFUqDAXo>^b<WqfZBS<KUQK$<esJJ3kxEvVD@IxScqrMW?0p!CLL
zgIJU4|0SI`w4+4Rsoe>*BgG?Gr8}Rx=$^MeEIq58C~R;2W5b2+Z6DSOmY&y?jM>PP
z<M}3<!=@Y*kezH0(Aj*rp%z#%Z09(|7c@Mm8g%t}|DKY)D$*P2^BCvohUO;ty+DDX
zktn!-bSxrX5DE21rU<4HGkLQFbI@Q&dI365wFFg^onFROK`O5H7mh?wQwoBJ$O|Yf
zNSNbS-qvpCUatP07Q}#c=jgccWZ#(G?C|{Hw`u$$8niqyw7KoEE4+pTnK*t2LG`S=
zTF!p{J)l^!R|4Q)!yhTsLDQ)`DS+I%ol(Y(1pGB^apsDFwjgGi^fR%hNlx(ftsl9H
z65CUG6x0S0@9MFupAv=C1E;DY@_K`~TYu}iSLQtukudD2xOjTG{r48+xE_ranI0(1
zXdp<=)GO5Ob`Ss9G}Bu4s@L#wP|cQT)$3byAkEB|g1BoGrJ2@GcwaOi&Wx&x2Gfn1
zz3FLPvl&oJ?F197n<NOU!ORz#{<YW{vX=Z%?1%+7;iNs_tU@U^=`OO>mCH(!b;p5a
z08~hSk!QD03@!sbLen@ur<E_xxFN6+5qIroT9wTL?55d{<Tq{@1r>U{Gbn>9K(ikm
zl#3h~9C5N=ig9Rs_qtTd=#qk`!ZGs7NvnMZ+uzd@j(?Rvpko)yuH)l~lSKOGS)aBD
z7_OmZBdg=SE=0ln<WZNt8fZIo8VVolRK#>y&|8m4WGI#J|9B<cTiCi#Y@MlWb!V7A
ztkpT9_Unz_v9Y&KIHZTIUx2T-hL*D>J}fBGEjm<G2+j>h_+3QFV-yUQn(l{$5#`e$
znfciyaIqFV2bzbhDu?7{<$RLQFC=|ws^?CtX)4I8sO>-(eMb1ar-sUdK)fzgqvMk>
zZ^Rh)#8kxW$|S;j1HHPvzPz`!bA(!5h*+9K{Bl4}FHo45&3%yp?rDAP3~x@+ME*8G
z&}mIK2Y`4+qxB<9rNt@5hlZ)HG`HKZFPtZ(CdCW@wfOGs!rX<kdt?O3)w<|6^L>e8
z-mBDPnj{HhE4Ayk=DMsy6c5sbcY=`3>S0gZ@AO)^Sd)t$p13pA3PJ#dmLDTD1s}Wz
z02ItQF~<A-)Ao*rvpY$NT!t>53Ov+wZ2P`n_U4VAJGo_<)CMpqJ3n-|`KmS8<a-VP
zfb}6-9lHLtxlA-4pw!z`EWxpF_GW8^%G#coZchrGR~?^D-r4b_JQ8KY#@ifJ84r>^
z<6NCKAuP(yrPRXiqft#MxAk}%PIb2CItemH*OUB$_E1dAyieI6EigfeNusQvXT~9L
zwllbU*O+j+W5Qti)3H?p?*D`9lDN^-b^Q#pv$U8g4>1<DX92|~7EkcZPwN)$-WZL3
za_5#WGQ%>bxARs=rK5^IfwL5Y4H4Pl{I}`^(PH1gYU{*wqe@3$h1OCneK4J4!&MRe
zOI%s;fxPp5H9Bx6x{Qq<VT;a>EsK*Hpw`q|yBo$$v_ZDvLxN=kn=g9|eG|t{-cBCa
zWSp2ev%7lwBK@tsaE^R7fx&OwUGQ#^arcni@_`qa0+Ih<3e19Mf+3k%g+)@Z0>QL0
z!HU9+@@y$mUhU^<UKk>$zNMt8xbj1@av;@3!U%#u{N{thykrE-duU`-05?CiI5){L
zy%f8$xwgE)K0S*=93sE3FU*{+{yF$b=Jm0O!B_#^eoI(9dVeEu^GYSFGhk6VM2eP;
zSzH6(dYAFYJ=IMG-RZ%6^E|!yINDStfqn3^nx(_a*MMt-QOJ6FngYP6Flzi8{}M1u
z?#m8_6qlhH0|2mB*E(B$x{iH!qh!(v^CX*om>t8m-!J2T%OyrE@fg!+W!rCupnGfE
zR%c(5_C1*?Q|=SfK?@c3?d{0gfIk6Qne%2NAR%5!D1e2lrEA=#=314|^y}mlbdU!h
zPIxs%P{lm;bYgjBs1qyXxkN6UD66G>mRl#Xr4z~PvG$je@$TcPPQN{YiFfsV4Ahz{
z;nj44T{SOdcs1301%HU_N_w4#jyn9@;-ar3_x<_h`fhkmBj(Iby8UQuwZ@CP3EK}j
zbXm^OyhBqkWQ~AeVy^iVB)4Wh<htyd@(`|fWUQJdfiVaGs(ocqzV%-d+<$k;WX&tD
zv>)+=b5--vjbtrvx4823+e>fN%<h7hn*;MqAO3V=Q*THW3AUECZ%jCB8__OBbU4W=
z3B3-Yu;rGl9kMQEDRE_H*`=TEb6r+{_x7R;+0gg}ya{r4)U*xrAOySI_lmmr1ZE;~
z0mhFL?w6J!mv!gDOG;*85iyl?2bRyD<A<m!sTBEGkjoD%PED^9_{7&-T?6@c=Rds*
z2z1+GaG0MwW{<o80~@~pvpmT)Z8os7Il7ITSeU`hZE#L6&F-GA{r-trS5UT}3ju2k
zEoU({L9UxDTx*m745li|AZb>unKd+&T&~@;LSp8#I-|*I=U2LzE0($<|LW%XsA_XQ
z3>6@ct56W8`Y2>d{!pjH=F?<22mf_ejVWx&mfsLml615hA!(-FDBnc-jDQv_NKXNy
z(=8#eu15MT`JMYUW~~vr%z{`z9S|~|_VAY6Ov4M7#Wa(*<q~zX79fCTCI%FDYcPv%
zBkpxqSFEi;9^ade#g4RR9s;B!p^fP5w+0bmmsfo(IC=$oC5cA16WW$*H4UtH^=7|#
zzI;wM)wbx}>O#3EWzRYv@&_zy|0i*@_46?BhYPPEpVGD|(a((4@b>fF)l-3jQvCcv
z{o)yqMWo1gDT<tpxw7K9n_g#s(-`}_V`!3MJ)j_!D_4B%_04Jh@SpF*7-qhI9|HR~
zCQ1?!?CEF@G0Z<qV&0sMVk{>G1vWp=_AJoP5UPxA^qrdn6*;Qh%^sB8>DcX5d2bXh
zu<5X$-n2+RVUy$k%$jmfMxgu4ZWTs$Oy{Q?try<h-NDr}$mWr=Rj^z5yH~Q*FkcKT
z+3P}y7ZL_1re(a(07LjQQ%E_aV*UbBCL$Zc$6t;q$jz!KP0IUHTUK4tR^M2Wj^LuE
z%6Nr<@?SV{7#P8fj=NA#an1D3Eudy#LBr&+4VSIyouK(`#BRj*gX7Ir<kHcfzwt%N
zkNiP!Kicgj#-{f7YUHboabThJR!N3-RcZhESqUK1b(b*am@H*)Hm>u(5>W>)zs2)w
zHL}wWPpTzwL2MM8=lkwHp3#jyMe3%J0Av0)*ixKl2lMvu@{j$n91n^pNe|jd``l0N
z0RU<<It)3DPhm_srp&Qn2ClXYrDSHN*$@D5v+qycK(ygyw;%V5Sq1l0Yv280(M!}f
zpY~V;SMkfg&QU5(K+pAf2w;Knq8fpJert*XhFrvTm}#z>BSv#yWY}G&Kb9IUxK2(l
z!4Sz=T3g)J1mqFu!`seMX@O}Bp}gyZ@I7GK*7vWYuax&DJ=8$)<N%c0_@&zceiZy!
zCsVh#-SK{xc=_fWWR!mG2{A?x*)q*ey|w6=@joYOr@a7Kc!2Oj=w=*|owV>{{tXS>
z7+}lu)M-J126vy;?q&^}iM1!NCf1I@E@@H~O-PIlsM7kknVdsATr@pmBo(C~$G6gS
z02;)2O@0&~`#fHDeC1eCZZs;s2N)@A;Z!v}6IRW@+w4GRSlrsuorBjfJ?y*o(0gj>
zt+<hF<g`m2uFAOoM8(U(+1eH57GN7lNs0Fm0z(b>;DN~K1pX*UvM(B(Di$9F6+&eT
z#bhNzlMA>q^N?j+@1IqnYvK};_)_77Ts{!elaGqJg{uwb(1mX6u=pkfLJYkfX+`v!
zOm>eolNV<DQKK`%tH{B{sg1XYt+pmK^sB=@3TS#N1ca7fU)1Bz{9*#NUVoVw^-UfR
z;=Yzyu8D1xLY^C5(|62n3!_3m+79NI`@&3xnyb`te?u%xm{-dceWjk)mEvGg`5fEx
zs?YJZJt-CTJ-`2Quc9z!zbxs4Bci>>Nz$A&<O0N!itfAch8AnB$UScRJ~Lcqu+)oo
zGt~|Yx)B;J+U}aHEX05a-iE7}6$gWU_kH`6xZg|<0AEUx62HF~tZ6JiRVZTdDqBcM
z!z&rKmfD>W8YqkN#cU|#i6j>Ox+Eu4*8Myq{Eq?u*kn+nT<lKCb_n3J$zBJ)qovNG
zc4TY`<MeU)Q`;<Me@v**)yB2myxzvdy7mTqH7hNJjG6PE<Cc8rv)SEQx_<^{*#G$>
z<cKi)uRlW3Z-R8Xl5rz(p#gSlQAxfMi&6g13D;=z3ks#-xtiPo54sFuXV#f`p+-fo
z_c3Q5_#eT*0i8Lb%(<;5c8zN%&S-ltcASTcKRVDy$JH$WkB#sS@{Ns(4-Y|wauJbf
z!I6aMEDkCdG8+w{v_-=zijWtX@<HcAbuC8)ybcWcPyuWD%wEvWQQeXc`_kQ9S2@^;
zE*R(@E$`~?ZJ1ym;)KZ!Qih?bSHJc{IY1ypVE`5N9{a&jKItd=*LRf}Kd#%ER1y?N
z48LRd=j2srlmKSy8jA`(4BTq|Nsj3IzV->Q@k8?r`Isov^UI2=T{#K~skC)fRP-aj
zcrJyQmQ!u>p5&{_zp7xOM(Q%smb6M%g6o4s^>A8#L41?8Ox^e7CM$W~*3!e8F7P`S
zK9!26tqJVBt`?fLxM^Gf`xAacdcbz&)u<6pKM?qA_ms76BOQWg0Le^W#?SMIT$jE7
zyw1!lG*$#k#iqZyl9~L_CjIwBb}$%9+e2Vw!1@$nfpvj1y2o4hJabo7^;(V}>++Tz
z{|NtdydBeFpKnv*Vg9BTu3P)+)3J?9`*6t|c{b*k>-L!PvY`#5^i1^XCnxh<!V5(>
zky})0T&rp6<lxuP3(LBj-UJ`+CQVB;OWswVlUo*SiY9Q5x){6wmOSOytv)`jp#?L>
zJFwUVv-;Dzt2_z1)}rtpHBQH#<-`N0%%UP1TF^VNx2@~Zh_4nbMMxj7zeHTrB&q)a
Dl)1NK

literal 0
HcmV?d00001

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
new file mode 100644
index 0000000000..4659c7f2ae
--- /dev/null
+++ b/theme/identica/css/display.css
@@ -0,0 +1,226 @@
+/* theme: identica */
+html {
+	background-color:#ddd;
+}
+body {
+	font-family: sans-serif;
+	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+	font-size:1em;
+
+}
+input, textarea, select, option {
+	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+input:focus, textarea:focus, select:focus {
+border-color:#B2D0DD;
+}
+form span.required { color:#f00; }
+form .error {
+background-color:#f00;
+color:#fff;
+}
+form .error_message {
+color:#EC008C;
+}
+
+a {
+color:#002E6E;
+}
+
+
+
+#supplemental_primary {
+background-color:#CEE1E9;
+}
+
+
+
+#form_notice label {
+color:#88171A;
+}
+#notice_text-count {
+color:#333;
+}
+#notice_text-count.warning {
+color:#FDFF00;
+background-color:#000;
+}
+#notice_data-text.warning {
+border-color:#FDFF00;
+}
+
+#form_notice #notice_data-attach_view {
+background-image:url(../images/icons/twotone/green/paper-clip.gif);
+background-repeat:no-repeat;
+background-position:0 45%;
+background-color:transparent;
+}
+
+
+#site_nav_local_views a {
+border-color:#fff;
+}
+
+/*
+#site_nav_global_primary .current a {
+font-weight:bold;
+border-color:#ccc;
+border-style:solid;
+}
+*/
+
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+
+
+
+
+#export_data li a {
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+#export_data li a.rss {
+background-image:url(../images/icons/icon_rss.jpg);
+}
+#export_data li a.atom {
+background-image:url(../images/icons/icon_atom.jpg);
+}
+#export_data li a.foaf {
+background-image:url(../images/icons/icon_foaf.gif);
+=}
+#export_data li a.export_vcard {
+background-image:url(../images/icons/icon_vcard.gif);
+}
+
+
+/*user_actions*/
+#user_actions li {
+border-top-color:#eee;
+}
+#user_actions a {
+color:#000;
+}
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
+}
+.form_user_unsubscribe input.submit {
+background-color:#647819;
+color:#fff;
+}
+#user_send-a-message a {
+background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+}
+.form_user_nudge input.submit {
+background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+}
+.form_user_block input.submit {
+background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+}
+
+
+.user_tags .mark_hash {
+color:#555;
+}
+
+
+
+.vcard .fn {
+border-bottom-color:#ccc;
+}
+.vcard .fn:hover {
+border-bottom-color:#555;
+}
+
+
+
+
+/* NOTICES */
+.notice div.entry-content a {
+color:#333;
+border-bottom-color:#ccc;
+}
+.notice div.entry-content a:hover {
+border-bottom-color:#555;
+}
+
+
+.notice-data a span {
+background-color:transparent;
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+.notice_video .notice-data a span {
+background-image:url(../images/icons/twotone/green/camera.gif);
+}
+.notice_audio .notice-data a span {
+background-image:url(../images/icons/twotone/green/music.gif);
+}
+.notice_image .notice-data a span {
+background-image:url(../images/icons/twotone/green/search.gif);
+}
+.notice_event .notice-data a span {
+background-image:url(../images/icons/twotone/green/calendar.gif);
+}
+.notice_location .notice-data a span {
+background-image:url(../images/icons/twotone/green/flag.gif);
+}
+.notice_document .notice-data a span {
+background-image:url(../images/icons/twotone/green/document.gif);
+}
+
+.notice-options .reply a,
+.notice-options form input.submit {
+background-color:transparent;
+color:#333333;
+border-bottom-color:#ccc;
+}
+.notice-options .reply a {
+background:transparent url(../images/icons/twotone/green/undo.gif) no-repeat 0 45%;
+}
+.notice-options form.notice_favorite input.submit {
+background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+}
+.notice-options form.notice_delete input.submit {
+background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+}
+/*END: NOTICES */
+
+
+
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-repeat:no-repeat;
+}
+.pagination .nav_prev a {
+background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-position:0 45%;
+}
+.pagination .nav_next a {
+background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-position:100% 45%;
+}
+
+
+
+#home #intro #guide_steps li a {
+border-color:#ccc;
+color:#fff;
+}
+#home #intro #step_join-now a {
+background-color:#f00;
+}
+#home #intro #step_start-a-group a {
+background-color:#0f0;
+}
+#home #intro #step_create-a-community a {
+background-color:#00f;
+}
+
+
+
+
diff --git a/theme/identica/images/icons/icon_atom.jpg b/theme/identica/images/icons/icon_atom.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..22853edc43ff04778001d28e5e14e64b32693f05
GIT binary patch
literal 1117
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&k!i+{EEZ-41_o9j<^p0qAQnZ!AUPHw2Fat#
zfz*M-L6`@Kk@dmY*vy2<4F>xE0R}-11_1^EW=25<CP7AKLB{{L8Cn>anV3L`8Hkvf
zSy(w(Sy@<Ex!5__IC!{ud3m^bc=-551o`-d`FVH*B?N^<Ma9I$cm*Y;B*dgd#Kc4y
zf!bJsI#^k`MEQ95_(Vws|Bo;(VqjooWds9Y=z;+w6VNei>>Qk2+yV?tKuefdm_beh
zs;mXdF|Y`-3Mm>ovIz$!vMUve7&T5@$f4}C@t|nX#SbdRNkvVZTw>x9l2WQ_>Kd9_
zCZ=ZQ7M51dF0O9w9-dyoA)#U65s^{JDXD4c8JStdC8cHM6_r)ZEv;?s9i3g1CQq3<
zZTgIvvlcC0vUJ(<6)RV5+Pr1!w(UE1?mBe%$kAiRPn<k;>GGAU*RJ2VdF$b$$4{O<
zd;a3(tB;>PfBE|D`;VW$7#Wx$-T{&r{s9I*BNGb?GYdP&Ka5P}K+G)2!m4P<Cgd2%
zo>(ZXWYowZ;xuvL#)F*7#z7xMlZq~KiK&=8RQ(9@64*z?d8mmjAHh8Y_s{=Z3_Q$?
zz+}TL$Y9U#^*!s4{C`4kQ@{F)F8#NE<^7nNX{$BEX7;OWE|d3v8oxYgwT`W+-_*q-
z+uzjLw=VzM)weYJobTH^U)E+Hs>*NOQoXkN(6;Tf#Fj2Ov+-`EuiCfmW$ej|9|&<u
zJpUO!(Ob~!Qb^WTRn^7s?>k>x-`dJy<I3_-!(>*iwaIS@snEOaP0Pi8o%z1YZ)MKM
zRh|Np+Y=60roJjLZm^p5YSuI*^Cmyt+P{5LF*_nZUCA@@&Al93&$PVvpTfaM*5M!4
zAAY>*^{;80%VnnTYCTgO_i(zRpnz~I%X9Ugp$`rGx_=#0x)>OxdU^ku>!Q7(i@)aR
QKG!^Hc0cZ<-tqr80k4%pzW@LL

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/icon_foaf.gif b/theme/identica/images/icons/icon_foaf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8f78442355bf0d0b509536bca7c57b4eedab04a
GIT binary patch
literal 1144
zcmd^;?N1ta0Dyn!iB*(>T3&i*JrF8R7w1whHElM8C<3ml?j+W9-3dwyO`2L|HqDkn
z5%F#4%5=zqhahRU8WmVVw{A%ro6Wr`PE6ceVj2??L*}%}w$5a?_V3v9;raf2cvR|!
zleHa30UP`^2O^P(TCHAKSg=~He14Hqsif%uZ8F&hVl+)kq!MMLzPTBX#bWfui_Upx
zD&?A({APN6nl_tVpScF^4um#Ch!`OgWH@Z1X>XUc>*oB;p^^I*kHugxqzIz#MkuV+
z27e0fbavY2Z0Yob-EJpWNrkE-kx0z`GV7<3B)Q`M(a*|fwO?ze5|oczl~rJTgzvcP
zz!1czQbk)^OUg=ic0LdYc>Kb`Zg=<I-iJ1ujW!zn{<XMHH!-<vv>9odT3ob5qn5U-
zZT@vXO;3k^3m?hNp^{WgtIf?~Vi*>WTf)DFYicA*OYfDHpIEwZfu=*Xwa2whum5W{
zlO!obgc%u(w8@kv2n>cj-+78r7)Id$weIzL7Z!R>!0^-*v5e!F&8~w3Z(YM%0)Y@I
zE{Nm!F$q#$j-}IMH89-M7w}AdKk~&$^8EQ0k%;<%3Q);-{B4CovDekr^qO&h-@R)#
zADB!U?U`h<e_yZf?Nu|gncO1SN3B;>6#s5A^?%aeE|u=?euQDt>S{El*K_kZ{mxHA
zKZiIhc5pN3^BG3p|I*eU;lW3AS9DcXD27Q~_gwCYuVpe!2=hknj|h-5S$U0@T;=iD
z)k0w^HAb$Gi#YE0tpNaNntta0C!(hi1AsYD`8@ym6W|aH&PB`*h_CXP`B1cFukIl$
zs|1(%WPd!$fVg5p|HQsAS^bi1b0#pP6%J=GW{H{G^{kf%TYUG<8ipXeV7Bse-~cv|
zbFQln4K0m}iaXIuv5tC2w(J<*7GbcULq^Pkw5D#|;fUDp4ksPTyrZ@I+X3#gFQA-x
zk0&Fbfm(V`Kb^8?Lhb_Ijq8^l&o~_g;dlNH1SJ|q-7P$;xu;<b%Dz50+W1&J%F1yM
z&V4)Hu@QLn6sRP)k`?$x-9IO}PY8%vBzR%N`bMLZt-ZXRCTh0CQbnI`h!e@hm(Tjg
zI~4}Goteq}vxp<JK6F>vu8g;$-KF`Z%EK&)8HeT>g)Y#vUAp}MLgmL1PV~(!a7HD+
zI?Nr*lXC$Eu30nL$d)62zg!{*uVkS>^T@WwmwfEeqXVc$01lsS6Nu{>3~=f{5zlh9

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/icon_rss.jpg b/theme/identica/images/icons/icon_rss.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..da23422d0616d0d2925545214c2591b78dd1d6cb
GIT binary patch
literal 1166
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&ktySh4hu5_0|P4%a{)0Q5Q`#VkQ@sTgXGcW
zK<Yr^Aj|{A$ogPxY-Ymb1_S;70D~Y0g8+j7Gov5_lOQ9rAmjhr3@r@IOiUoe3`ES#
zEUX-?tSl_7T<jcd96a2-ygb}IJbe5jf_(hK{5(8@5`w~_qGIA=yn>Qa5@J#!Vq&6<
zKy9o*9jvTeqI^7je4?a+|3?@XF)%Q)GJ*jxbisg;3FsI$b`DN1ZUF`+pe0N!%pj)$
zRn`LK7+3^Zg%k}P*@OcV*_8@Kj2b5{<WP3ncu+Lx;s+Juq@pHHE-`TlNhwt|bq!4|
z6H_yD3rj0!7gslT4^OY)kkGL3h{&kql+?8JjLfX!lG3vBipr|yme#iRj?S)0lc!9b
zHhsp-S&J4gS-Ncbij}K2ZQinV+x8thcO5!><mj>ECr+Nabot8FYu9hwy!G(W<0ns_
zJ%91?)yGetzkL1n{m0K=j10^W?*K^*{{VxZk%@(cnS~wXA4aBfAZ8Y1VO2C_6LJh>
zPb?HxGHT=yahkYr<3Ubk<Dd_sNktdA#8gZks(u7{3G5@{Jk&&%kKi7H`{(~H1|DWc
zV6tHrWUy!Wm3-hI-{n1p4`1&sKR(S)b>6e=l{~ZV&R(<em;s-hT?FI21tsf`70k%8
z_+zut;>P($<#Tc_eT}|Zsr;?yuxz;gdKo>o08iH_ez(7J*Xx$0_w2DP{4nd=rPuyD
z`a)(@-l|)kedxsE9m)%3QmU^v_nh7s>82){>G!efn0MO#wHIGL{c+0jtmNgD(xyum
zefR%$bCwl<_gg!Wm##8d)9z_*-yNvB?~T)ip1kmw&vVT4op{R=4C8OwoLuR)CoA_`
zOx3bo_v7ZyN>|fo)OqB&T-^0={g$N{mw&I*Tx@-;&iYcF!b_?4mOt{Tt77hWuXV3n
z?EbBWV{xfmmW=#VXK{s+mvPsWMca>EoX5{A_C9zP*X`J>JyYMgG3%|L9@=Its<C9H
Q#rfD<KjLR^a{qr503@_mkpKVy

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/icon_vcard.gif b/theme/identica/images/icons/icon_vcard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d52947f3e96c0f74f00a80b430f99695e110e5e
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VHW@n0K^{vi^LV;@6MUi1^D~(*6OmW*GsnCZu9x+db$Rr+7rg(
zj*Y_!l*<dH*({I3D38V)oYE4M$0mWj1fbXqlFb8`$49B%6@|kBiopk&$~vOf5r)11
zjKmX(!4m)f|NZ;sA^8LW0018VEC2ui02crb000HZ;P*XTX`X2Lh#!+!a5BMkO()E#
zS&7{Ilb$dk5Kv|b07p1!5CVioPzX_23qcM*!xb0?o`FHY<w87Y14W~SxG4p&cnzUk
z0BDZ^LFoY8bp;0=2L%*$1P6m?1Bwm+3=j+y5(FLu7ZeN(5&?O683-Jc4;f!+5u*$U
zo{SlH01FQapLq(S3ka466%q^`919Ll0ma4y5eo|#2nrPl3=16(7#I%M*w`Hy${h$2
d$_oG=)f?vL=hf=U>MRc(@bU8V@GBo706UV+d;tIe

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/against.gif b/theme/identica/images/icons/twotone/green/against.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca796c8a36ff26f41dcb0bacfd1e4e076c9c095f
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
l<P!HC*U-dym67JAOGD;${_0d*wJzdK*~MOY9z78TYXD`N93}t&

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-down.gif b/theme/identica/images/icons/twotone/green/arrow-down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c709e58774d240056d41deb3aad1fab144060409
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%dgDh
app?ab&iYckZ-Pdd+{~p}M<SdU8LR;~^A+d-

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-downleft.gif b/theme/identica/images/icons/twotone/green/arrow-downleft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4a98035d8298e44ad997172476c2736c62495ec
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
bCqvfz&5Fm*)Xrnc3h-R2b=1d+k--`OUWylq

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-downright.gif b/theme/identica/images/icons/twotone/green/arrow-downright.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e6001a612fd9673f024520ce0a9a295646838e4
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
b!<pc>XBVD&QyasQ6;Qb}>xhpNBZD;nc>)<7

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-left.gif b/theme/identica/images/icons/twotone/green/arrow-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..afed190841f8b88f930d0dfe7030339f8aea296c
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
ZBSY5uGcnueIVwI2eAel8Mn#0d8UQdZ7iIte

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-right.gif b/theme/identica/images/icons/twotone/green/arrow-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee1707ed96a315d287e778dd7650fdad9f5ccc55
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%fEOI
a2ZPj`+FkFTWlpxJyV1Ff%b1gu!5RQfjTe{z

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-up.gif b/theme/identica/images/icons/twotone/green/arrow-up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0f5fbeaa84564e38daa0f772acd229affc82e61
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%dgDh
ZAm^oetS~(`@?iSJ1s%(jk~vu!tN|tM6`cS8

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-upleft.gif b/theme/identica/images/icons/twotone/green/arrow-upleft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e9e6935bd9a3ddfed9b46a5c3f34aeefa2046c6
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%b(0V
b<y4mPG{)xNp?4JfZgwowI#S@o$Y2csUZ)r;

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/arrow-upright.gif b/theme/identica/images/icons/twotone/green/arrow-upright.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c7fecc8a0647d4c3368082d0b506cdf1a6a4b398
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%dgBb
Z<y2Pw)#_VsN@lrCd-l^{NdN<bH2^&U7?}V7

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/back-forth.gif b/theme/identica/images/icons/twotone/green/back-forth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33a9540c83365fba86f9194a89c728bec10322f2
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFaO
fh%svYKKA8jOXodpOjd6S6-ax{?d_u~!e9*mv<Mhb

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/bookmark.gif b/theme/identica/images/icons/twotone/green/bookmark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..23f318ecc89d02300e72853ba1bdba4a1bec44ae
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%g@MU
i<d?;NbY0t9%}YCM6*A_<EMAv1d({OWb01w125SHWcp7g2

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/bulb.gif b/theme/identica/images/icons/twotone/green/bulb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f70652c03a1f1a8a9abdc86046468d2f251c8456
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%b`?Z
jaJF1GFY+#D-f{PdbCu`5@Q8dRwP(&9EgxA9Rt9STE`l2H

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/calendar.gif b/theme/identica/images/icons/twotone/green/calendar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a09b65aca01affa98e89057037bf26b4ed18120f
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%ilO>
k^F{6jZZmF8W=)*Y^I&C3XxFSYH=?w5UKI%DW@WGj09=(E<NyEw

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/calendar2.gif b/theme/identica/images/icons/twotone/green/calendar2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7884b02ddd7750ab293a82354d5f7d66b5b2215b
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFau
f%dIry2}PGb)C#|t8k5p?d&Q*Z+|E4eA`I35;nNzm

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/camera.gif b/theme/identica/images/icons/twotone/green/camera.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a85fbad0e7693c8096fa58729db241f2e5345d2
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fEQa
ff@>L{8Fg<LXx<Z5Q)aiicVyc;X@kiD3=Gx))1w*N

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/cart.gif b/theme/identica/images/icons/twotone/green/cart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47eaa0a2ef6f4cb040e18a453676d93d0baddc3e
GIT binary patch
literal 86
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CX`erV>%W&6v
mLlkSu3C-WUMI9EUAsk73mQhpLRu{hBl$(B@!<d_u!5RQ@qZ;%8

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/caution.gif b/theme/identica/images/icons/twotone/green/caution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3ad2c322baa7e2aaa80133a338ed27fe10ebab04
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P+_f
i=oe+!_PJzT?%AickKN~8*P52GYD0mmJCCjigEasd7#kk|

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/chart.gif b/theme/identica/images/icons/twotone/green/chart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..136d74517d9b0c9db57e402c355e33729c4bf6ca
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%g;PR
h<Px{cvE2Lbd=o?q=O<0dSlSmPcGT$52`5GdYXI~i8g~Ey

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/checkmark.gif b/theme/identica/images/icons/twotone/green/checkmark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..892429d48352cb3abd1fa68f0bc14b643f50c832
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEOI
c?*)cWXRej5sgx2gOstH1^~+##00V<H0E%!KSO5S3

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/clipboard.gif b/theme/identica/images/icons/twotone/green/clipboard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9317bdcd083856423ed6cc5b1c3f377f12ff14f6
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%P+`a
gc){}R;x2QZs@NHpDL?1V&f26IdDKXlo0Y*D0L~K_-T(jq

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/clock.gif b/theme/identica/images/icons/twotone/green/clock.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d1410f9251c5c5df97e71d3f80be5f10eea373a4
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%g;PR
h<Px{cw9vP=YhsO><kBX+Sh47u*ioZHC!81=tO59t8zKMz

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/closed-folder.gif b/theme/identica/images/icons/twotone/green/closed-folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0410fc6e8210d210e28f33b00c54da3950fddd34
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%b(0F
e;?b=Yw(I?y&|r_=C6ZRlk8I03u)&Fu!5RRdLK#;8

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/database.gif b/theme/identica/images/icons/twotone/green/database.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29ce024929f32bf2db1efe1f4cd5c77b09c68eb1
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erV>%dpTp
i@LV_liI8i573MP+IhKSiS<#lZt9Qm9IUaQp25SH%`WtTm

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/diskette.gif b/theme/identica/images/icons/twotone/green/diskette.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e970b0a30c1881cf9a40679a435a9edd8a574587
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB`@dn%
lmW$juVL^}2<#JlosU*#FZ|zFGwlY^>_k~_|A3YHUYXF>E9a{hZ

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/document.gif b/theme/identica/images/icons/twotone/green/document.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9c08f4a3a91cba4925fbfded9759f2d1c5fe52e5
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%ilQ1
h;Ec3>snFYHwO-E|{XLq}Di`HO95p(0!ikZ=8UXm`8j%11

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/double-arrow.gif b/theme/identica/images/icons/twotone/green/double-arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e8648264d54f9a17eb030a5ec2f45c7282df6b1
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%fEOI
e!yK;FytiK7*Hn0sI43gh_K|IRr+u6l8LR=iv>HGF

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/edit.gif b/theme/identica/images/icons/twotone/green/edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c746aca601dfce71bec63cc34bd2cea576a608c6
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fFb#
bLC#BkUBTx**BG_BS(!^$or-W`WUvMRPNf%3

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/eject.gif b/theme/identica/images/icons/twotone/green/eject.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7e0906cfe983cc8cd86af5fb84cd6faa05e7525b
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
ZJ44pmGnPfZzV}6^J-cZzIe>w|8UQMM7X$zR

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/exclaim.gif b/theme/identica/images/icons/twotone/green/exclaim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..588e28c26122f6eb76a68e44d5fdf796be4737ae
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%P+`a
acvef3ue|(E=)-533p|(cHFL5uSOWkrdlpCl

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/fastforward.gif b/theme/identica/images/icons/twotone/green/fastforward.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28e49510317e0f0814ed89e227337c2f0b2765ae
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%fEOI
dLyOkxqXGH9E5u)9B)1e^KDAB9n3I*k8UUVN8B72G

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/favourite.gif b/theme/identica/images/icons/twotone/green/favourite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d93515e3790aa4672656512f416edf2c5c30f2f5
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
Z!yK;F*Ye-L@sv;Xeb%|`jEV?@H2^xX7##or

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/flag.gif b/theme/identica/images/icons/twotone/green/flag.gif
new file mode 100644
index 0000000000000000000000000000000000000000..68c8aee2598d4c470b1c60c36232fea6b52dbef6
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%g@;0
g#a2CkYK(uMX`+Uoh*MBz%DnK`$BZ6xu`*Z#0Jqf`MF0Q*

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/graph.gif b/theme/identica/images/icons/twotone/green/graph.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0c1794b4e7f35194cd5734cfc5de513c6283a4b7
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P-4d
ic(!ZZl9}eU4X0eIltb-SW-NSXe$>d#okvZC!5RPzJ{ji#

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/grow.gif b/theme/identica/images/icons/twotone/green/grow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4118d53bdc16883409cf7276480cffb5d4b3291
GIT binary patch
literal 90
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J611`erV>%dohG
r(<0@g?ab9LGUKnYF6~@)=SyhLQ!m|bU8{L62k$lYsTUAoV6X-NHqIaP

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/headphones.gif b/theme/identica/images/icons/twotone/green/headphones.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5be6c67ddf1a3d7ced982417295971bcf5da2cd4
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%m0{J
e#G`w|<;Y(LWEWZl^{!m-^5@pPBNa}J4Aua|3L8WK

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/home.gif b/theme/identica/images/icons/twotone/green/home.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2a3421efe8e1f15d2c8f8de2ba5dd90e6f7245a
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%P+_f
h=qL5QHEQ?0T7_#pOCGUap1f|+>#(AuC!81=tN{eA95w&|

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/hourglass.gif b/theme/identica/images/icons/twotone/green/hourglass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b62b9480cbb0d8706a7d224020d253166eee5609
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%ebf~
l|J*GGx2X4zZ3Q%nQY8B#W~r^66*)!u{L{mC8Uq*@tO0)l9drNy

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/info.gif b/theme/identica/images/icons/twotone/green/info.gif
new file mode 100644
index 0000000000000000000000000000000000000000..86ef1f8b4a7ba4171b2c27e4a0dbd2374cbbe3b2
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%dgDh
Zpp;d-=xR}K>U{C6XD<z=1u!sJ0{|UQ7JvW%

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/key.gif b/theme/identica/images/icons/twotone/green/key.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ccf357ab28dc96a63117b33dbf511215bd51ae8e
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEQa
c0zUz*zFn`M$=+C2bGdWbD=CA?0SpY*0FeS2<p2Nx

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/lock.gif b/theme/identica/images/icons/twotone/green/lock.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db00706b5db28318af151af4125776bbfc53ff71
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%g;YU
jp-of!iqWUtfsdS1<AdU6OkU=@d()%Ls{+B?tPIuwGj<!G

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/mail.gif b/theme/identica/images/icons/twotone/green/mail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1084c862f62fd5490abc582fcfe7b577d450efff
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%fEQa
if?KZ~c0{bs%Z(FiQZABxslH78RN`eH|DIR|25SH{2phKm

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/move.gif b/theme/identica/images/icons/twotone/green/move.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2c30b1d276505fdf5ae7825a2268baa0381fb9c
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%XuK!
g@Lcysn`xJ08>Q9DWR2z}AKSEW_cpG{oU9Di0P08@NdN!<

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/music.gif b/theme/identica/images/icons/twotone/green/music.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64b51d4e100420e2fca737504aaf22bbea0ecffd
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%m0{p
g3sZ)6Sox>9B@eF#Hg-g`-<qMRb+qWr1y%-Y0P~j{%m4rY

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/news.gif b/theme/identica/images/icons/twotone/green/news.gif
new file mode 100644
index 0000000000000000000000000000000000000000..712c685dc0b02b2bfd262e9007b7a8ce0f81e2e8
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%dgDh
c(B`#%N#&>iH4Co$il<Gzc4}RZstAKM0D!+4mH+?%

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/note.gif b/theme/identica/images/icons/twotone/green/note.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bcc0b149b537374417a9a71e8439d04c6c7a3e27
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%b(1w
i5D+bUH@fOfY*blCaE4aqtOYsV`wYHY_Na?6SOWn2XBp@K

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/open-folder.gif b/theme/identica/images/icons/twotone/green/open-folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d41300a08640d2de03ded235974b78f99b76180b
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%b(0F
e;?b=YR>fZ5aPvz?l804#xaT`=`5tW%25SJKSQoGW

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/paper-clip.gif b/theme/identica/images/icons/twotone/green/paper-clip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1d45f1d1eef9831bc859c5e643387f3d9d593599
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%dgB5
e!q!l5B&N(Z_K{lC`Si?X>9N_n4>&P0SOWl)+8CSw

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/paper-clip2.gif b/theme/identica/images/icons/twotone/green/paper-clip2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8c7805bef4ca86c713bfb88a424952eb3fc14f4
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%P%_P
gBST5zHmiXDF-kXjRV9-`x4Fi%9_L`@W@WGj0MNP^3;+NC

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/pause.gif b/theme/identica/images/icons/twotone/green/pause.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ced0b6440c8fe67e6d530103d8ac1aa4b70453ca
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
b!yKu?3;xB=BLil1-fvm9>WGgMBZD;nY2_H}

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/phone.gif b/theme/identica/images/icons/twotone/green/phone.gif
new file mode 100644
index 0000000000000000000000000000000000000000..69359f7648c04ec6d70f9dea5d3d2cf68c61f1b3
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%lW7|
f@LW{-0f+q8srRn;CUq=ad2Hr`7Y2(17#OSp`+Xe#

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/play.gif b/theme/identica/images/icons/twotone/green/play.gif
new file mode 100644
index 0000000000000000000000000000000000000000..794ec85b6ac815e0ca134bbc0e81872ded44cc8e
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fFa8
bL@rA8T*2p;t_wRNm$oj;IuPN+$Y2csUhNo3

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/plus.gif b/theme/identica/images/icons/twotone/green/plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4407d0b2d5e65816a16edb6989936e37dbfc45d1
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%dgDh
app?bmx8?iu%1dbzlcz3Sb#wzOgEas@*ce~{

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/print.gif b/theme/identica/images/icons/twotone/green/print.gif
new file mode 100644
index 0000000000000000000000000000000000000000..17727d5d7d78a79ac3b4222d642f852d38a90b65
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
lLC#9|+y<rpISG?`Ma$>TPFXZxyDMdl)|PDDpNb+3)&N?q8{z-}

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/question-mark.gif b/theme/identica/images/icons/twotone/green/question-mark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1689efcd0293bfd8c25b47f5a1c0ddfc43d1b722
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%m0{J
a<V2LRZFE~r=|Xp{M-j^e9&@rXSOWk!MHYMj

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/quote.gif b/theme/identica/images/icons/twotone/green/quote.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4ba1f0c03d98b57424a087f4abad901425e9e5cf
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%ilQX
f(nW5mWmVx%YdvR_N{Do1?ArG3wZYl|1_o;Y*+?4Z

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/refresh.gif b/theme/identica/images/icons/twotone/green/refresh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8a8b8144fefab41052feb10e25dbd2a1ba9a2855
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P-g=
i6p>{-@AH?kQ2!UTT#^eskIhQ=KKiN0U}FFSgEasbdmDKG

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/rewind.gif b/theme/identica/images/icons/twotone/green/rewind.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aca3ee35b8aca2e3025e8c51064b6905a6673468
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%fEOI
dV?))#qc?MR+saGy&aG&@a%!7^F()g7H2|NL86N-u

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/search.gif b/theme/identica/images/icons/twotone/green/search.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c36463d0d9843feb92b597f68e902f1bad26b7d6
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%b&~=
c!q)KNOwfJL(147IOVgLWk}{YUz`$S)0CD;l9RL6T

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/shield.gif b/theme/identica/images/icons/twotone/green/shield.gif
new file mode 100644
index 0000000000000000000000000000000000000000..419d5ee4be0c57121049c616e8ef6bf6dc736e3e
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%Xy&L
m=u~<0*$KCf<=zp@TOe*ZbEQ(w>ZOy#&cDmB_R$kzum%90svYG3

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/skip-back.gif b/theme/identica/images/icons/twotone/green/skip-back.gif
new file mode 100644
index 0000000000000000000000000000000000000000..adca7aa3ee2c0cc939c8b7a3ee6ea5eafd52e657
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEOI
cLnGJ6qwDkDRYWg|UBc@3>Xg?R6%ht&0E-nFl>h($

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/skip.gif b/theme/identica/images/icons/twotone/green/skip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ae5417f2f816c60245db5bba38a4a875f047c679
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%fEOI
eg95kqG5_dy6^u7B*jI*JKeBDzX&)y>25SJI+8Iay

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/skull.gif b/theme/identica/images/icons/twotone/green/skull.gif
new file mode 100644
index 0000000000000000000000000000000000000000..033506732767418de878eb41beffb4164c41a1ba
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
m<P!HCo9MKwt?^BXXOD&^tX%hW^U=qzu3qew=g|{kum%8)8Xm6z

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/statusbar.gif b/theme/identica/images/icons/twotone/green/statusbar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47d61b106b5181a730c6abea80a81260cba63b3d
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%g@Y^
i?q;1irR@3Hz`K`w6=p8YTvR7|d)4zd1`7fh7_0#uavWCx

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/stop.gif b/theme/identica/images/icons/twotone/green/stop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e0b108d352c6c88de6cc4795738bbf6dac8cfc12
GIT binary patch
literal 72
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0@R`erVB%fEQe
Yf?FB-XGDwVH{NoYrgqZDiIKq?03@9kF8}}l

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/template.gif b/theme/identica/images/icons/twotone/green/template.gif
new file mode 100644
index 0000000000000000000000000000000000000000..65c0c4a0a5bf328de3a385826ddebbc125f8ad41
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB`@dn%
hmW$jv^EN2=Wk#-Om@YA)GjeKBRn?~BC!81=tN|#_9CH8w

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/text-bigger.gif b/theme/identica/images/icons/twotone/green/text-bigger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45e143b7a487d711da6c9ef5824ef4c88c47db44
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%b(0F
iqF}AfYdZg|rPPm}h|Y;gRqNulkA9Ld*ciaTU=0A~+!;~;

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/text-smaller.gif b/theme/identica/images/icons/twotone/green/text-smaller.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a54d0c1d3648fd15b5b6d92cb96afd22dbba9ff7
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%b(0F
gaw5t(>`O^Ut$#-2(ib%^N~T@nKF;x(i<Q9|0OOw;!~g&Q

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/trash.gif b/theme/identica/images/icons/twotone/green/trash.gif
new file mode 100644
index 0000000000000000000000000000000000000000..78dd64a3d8a2ee60d4696de96c0e5b2945cafe98
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%g;YU
d;ZpSCX%+k4SteZTk*_G5uxqQ-W=>WHYXF^I8F2sr

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/two-docs.gif b/theme/identica/images/icons/twotone/green/two-docs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..97e54b964730d112b13e90e99912f13393179ec2
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB`@exj
k;A~dvj4LnCR!V(WjW1sy>ALD=M%Y@Pq-|#(urgQ!0B6D;9RL6T

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/twotone.gif b/theme/identica/images/icons/twotone/green/twotone.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45aad25c4c49c27a500a05daa7b606df4d52f268
GIT binary patch
literal 2461
zcmV;O31ap~Nk%w1VZs4O0FeLy|NsAAln?*_00000A^8LV00000EC2ui0Kx%C00092
zjE||y?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_q_KoNI&iDQg3<`(DqVb4KDwoWr
z^9hYgr_`$Tip^@b+^+Wv4vWX+viXcotJgh&`wfR5;`H~tPQT;jhJ9S`CjjU-xL1gG
zSeKaB7wES5*XRhz7vT6P8AxfDN!V%li5RLl%4m7HiP>>!$NK0h2z$ypiz<8TT04nL
z%WIqKy9+$rOZ;1mjJj$poZNi;3m~l-OieeP2PeI~EmuwWZ5WO?u2`PUZ0)SM9Ebg<
z&CT7K4qh)V0N^G+AN$6S&Yix1|GL2|2#{Vreg^&RD@gDe!-22vk+WzHV?=fT(4I|d
zhmfMeiSK5Sq^Jww!F3S5J;XDx7Q>YxH`;rt&E>+03iGMddF*6QkNZRp<=B#DNRcUT
zLX($~B`6L8`yIV0w4%FzKo=HOT63gNePn$)+zIul)vNe$j@9`tsm!oiVZtTJHg4Ud
zUA;!7do}G|y?yzf72I_i;gpJvdWe@$Yu2+w&00P@Gw@oIdt%1>x%X>8itkWv<$9NA
zUD6FHR~?BrbWz832vcsI7_sZwOke+nOml5+va~<re#|>EXR`xMKWyxGH))`%L+f5%
zw(RQ6vhiW-hmEmY$ws5kB_6lw?9|+4a+h8nbL89CYj3^=y=UX{?r{(Q?v|c$$AMIx
zL(RS9+*rh!hu?8kIr!jcwNWQhfDs<_ok8JUGoFF5$%oin>#?UCWFbDNSAQqs_uEd<
z!PlCK@ww-sQuA2&m2k)<7voZbsdo`*U<r4aXe$*6;(aEjh+1?Bx>X!nCHjaXfQv2J
zqkU2GXrpcL{pMeHO7a$@Z$nwxWsRIr6;_o9;=~zrB>`8aVcR(+QH8xxxo0xkxn)vo
zbMi@Hn2g1@+l$uucW9kP=GNAdh1v!rlLBs(-<lhk_$YR7O6FCjG)9^yq6U__B9Aye
z#i4$3K3SkHVY+52kS!|OoujxWs%xrJ-byM`?667Zi-A^Wt4+cG;;9ajGG?i2pMY&Q
zpR5ZG8f{_AZmTP|z;+Anx8f=rt|^;p1QxUEdOMn)>9U(HrC6?78NAw-`!2rsj+-yP
z`;zOgrW%~nFTe&DjPSn+v!yS?0q6QKuMsD^FvJHdjIqNP3p}tg6stl@DUp0Eh{%<M
zOmZqEr)=_?D8KA6%pb8#v&_TV>`Bcrd(1}9KL4Bp&Ql33iq10=O^VSs?|d}VOE(Sm
z(^BV*v?*1Oe03$nb|mb&4O?8X#2bU1G1(f2O|sc)i;XtHWwZTu+AE(cm7_$;jknup
z$8F!ldas=~x_k@1cj18lJ$J`Gb}4U8O&(4-<fmau>V9qivp6=~uzC3<ri}I-(R`Xq
z&b8MQ6ZoFBpFa+$FGNy{XyDWS7b$D>KB^g*j_2O4sYTuhsiKEoNvPqY(-%A9c(;?G
zk*Y)3p|pNkdfAwIt{SVP1ig3aQoP4IBc0HG);n6kwK~}D)^&L7eoxwoJoLq;DZD_e
z%WBw;%`>R}mIwYRpAnHqP@8KHR{#R5KS?WlP_l~b$j3PO!7otBnbeq|L_g|5#eogt
z4~n+*s|<orLpBniD(E(u=TXlx2P)u{F0;G#z0iI9dlbD&)2HiUOGw}A%iZRcL-*~F
zf!R7!bE34thNy6a^}&(|BM3wM>4<q6QeuvBvLVO+0nkIpVqKGD_#>5A?oNCWPp2Li
zMl%(rahwWH>RM7ES5-@V*vn85ZTCLWEir;CoE{SuQ^F|{D}^~q;-ZK*B4{BhL4+(8
z2l;Y42o`C6odX}3nrOfBy--TytKtIfNTM`4Lyss5-4Pi#9{j24go@*&h5Ta>GkTDG
z8nnv*4fvc5%F$PtTMb~EvN}J3vWJ_i-Yzfb$xuGhl~#1(a3uITYvE3sshnJjP#3B_
zog|Byyj&4shs-xR(}=u0A_z?=8#ZEajp6Iy5XG6uDtR)2bBrAFzIMFjZS7Sq!3#H0
zGt0X9&7Q;Sqk=LA%ytUYCYvN8mn=9wPI|NdboMfyKIs;e4<&S<3!P}adZkc`;`4zY
z<)}zaT2h264<sq|XxA!Ax|R;Eqcc6JN(rjGoZ>VWJDS?ioJKXE{xoVqCF)RpTC}XW
zOsGj^YSNSnGN)Qis#xP0(5{NrtfBy_E90ulzS^>=8nvloeJWK?cGjhqb*gKvYFp9z
zR<$BEX<L)2MRiKkyY4ivF@5Ps@oH0-n(n43!>BNH)6Z@8b+CekDU7xkP3<-IuX_z_
zP3^i^$M%$x6+tXLeCHWjp3^Cu%V%dI87xd1C7`P%EKJ_#*Qhj-ucl=NDQ%0%{&5Tg
zKpY%sX(vIB<VSkwOw@D^xy*-twn@eRiI4xTMci%{l(4gvq*#R8kWYH)S-1OP@x){-
zmLkP>r&#TG(uv4bx-o?7t0wv^Q_yC54@1nQ?|YLJ(O#<3y%p>oE)TfH^7`(UW8|Wh
z7@6H2N>rKhbr$OCDaL-37jvPd(~;EcD)!RqEk2x{S|+Eui=YRP{ruHvE9Wj>PR_t2
z?CTFRgTzx_hJw42p<FVlL5(($KMyYFd?$>>mxMUST}+BWvlB=TxA%)`EHO@+J0XbP
zFvYcXWepE3UuJqEGV+Y9a_>?j1@jP$$?flMFVNdF*+X;{77dZln?PnExx)dzZyvY%
z<ok6fijtgiHudvfGGAGU^js1D4wor90xJ}hV#ctIFBzg9U(iKq5wLLDT&miUmqT?9
zGHbO%;(N+gjmr@dccsTq^5~aJaEfr5&39odtGdQ;Tr?hGOX~`jIdzhb=&d`eo6v3(
z)7X`>l2r`DTh32~ko_++<6K7jiONpzG?c5ee9#l0(apBT-2mw#yCf=@*ZYL$o<AFG
zU~`#tr3EH`nNy~?Oj$>#jb*+6>Cit9G0?oga--FGUmCM<e{O`Zbz!&4_>Ro5x4pKo
z)9sI8vwPE>p&v>$EHMfDLE{kYva>PE#RXT{vU*({J0V@a2AQjsAFXt>I8IxV+DYc>
z3g&AyCT4?!oaUMZ?9P2|?#0Aq0O*XpY;0Zo^U5YY=0xwg(vOa|%^tO=b7gDQ-FkJn
zW?imS@A}lgPS&l9RqS0&>)5>>cC^z~t88z(+usiNxXXR+bg#SJ?~eDp>wWKh@4Mgs
b4*0+ee(;1Zyx|Xz_{1xI@r+M=0RR9ydkW?<

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/undo.gif b/theme/identica/images/icons/twotone/green/undo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6869b30501187a85f8bcf2fd105aba5707f9f42e
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%g^7z
f=_9pfTfzIf)P=%DGb$GKr>~3WvgT0}VXy`Owage$

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/user.gif b/theme/identica/images/icons/twotone/green/user.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c85460fcd5c48dc10a37be719df04a141b87d29b
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%P+_f
d=oh7bZg-V+q12LIze?MTA6xk!bFwm60|0b<7m5G?

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/vegetable.gif b/theme/identica/images/icons/twotone/green/vegetable.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d421c1bbd4d3359c91d724dd3c86fb14513f873
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P;6*
i>=z(<@AlIRt_tae5-Icif0-_`*ruUlv>||j!5RPr6&c?E

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/x.gif b/theme/identica/images/icons/twotone/green/x.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ffb2efea00c78ee8fd74913cce781c2d08c9ed80
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFbp
f)2@MkTk-Q3o{k(<F`F~*hjhOCZL}zWfx#L8%A6X3

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/zoom-in.gif b/theme/identica/images/icons/twotone/green/zoom-in.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a59a5bb50cb6d51d9eff41a6c5ab3e1d2af5cb48
GIT binary patch
literal 86
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CX`erVB%a~Nd
muJPKy#p>mJ$4OTU(?l0#1$&+62)?5co~QeWubG>b!5RQ|VjD*Q

literal 0
HcmV?d00001

diff --git a/theme/identica/images/icons/twotone/green/zoom-out.gif b/theme/identica/images/icons/twotone/green/zoom-out.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c61f999fd009be1c7bcb21d9f1b1d61b6d021977
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%a~Nd
luJQWA**%e#nVlUILZ8P5vo(dh+&4ibJWbYMYXAd-H2{749CrW!

literal 0
HcmV?d00001

diff --git a/theme/identica/logo.png b/theme/identica/logo.png
index 3b271814d6efb8359231648b514ca87799fff178..4a5b5470e964d5b76269b3d69d8626e15933c089 100644
GIT binary patch
literal 2059
zcmb_d`#aN*0v={9*N=2ixojd-G!a_SXs!uK%oCkqbLqH@77^dgeO*|&B;>ZSC?&px
zBDs`g*f1Hg9b{|Ct(aRJ&pH3Xd7tNf-{*aQe1CcGxVhNN%N&#efk5((4rupXPuV37
zDz&SG$zau80|!}Ov<87jMu%N7CwKD!qAiAaIU<l4;}?YoS>q!7@i50QzaYFj-VYZW
z*@Hg|0!hfaIeXZWNF)>r)z;QlQc?l{00M!Sof{}?c3R)~wXm=-w=`bg9o~$^zU=Vl
z@pygQVi*jzwy-eW*7gVhmRAMstaNH~ZxIY8-q;!#7{Fq&m93tlfq|Nu8t(LKPDx2W
zmAbgPMx|2w#!8Ai1_=a0H<|o~dAo(fe~v<xBM|MZw2JPLf6pz|v%daX6%0*27cQ;1
zxw#EZK6}(UQ0L~>&B-2{ZtNzJx;a^IdgCT)YL<As_XGl8&@nhI>f}!Ig`J&aGdXD0
zwT-PD*F#x`zyn$E3nusTq#!T;*bDy)y_151DkQVN@I^1TpxCUGW|Mble|r5VDhO0q
zZ?!wu&VK>XI_kF@yov5Em;cxN{}tq#DxnAhLEw&PYmZxFbNMm1r!0VU-*%KxHwOhx
z0S_kT^fD#`BgR+g7~W3ylh9M+O`kFo6Xu(F=SD|0Tki+j1;EMrgT)ahJ<{%su`06I
zk%D5KzGgA}*~?6(>|3_1`4#2D<V6(1_-J9GLy)SKlZ&~8u`gJNxq1eDQ>ii(-v_A6
z5u679l}bS1He&Xk_j+o0#ulFen5B&rF-$64Ul?R_Mj-53xKJTPJR<Z_MSobnx^ODt
z%E(O7%e~s2vs*4PxvTIv3>2<+IDe#-creyx4Th22s=j@1UAq<nouwSpg825@5v5hZ
zr;6DLxr|r2qwvQ+FOZ-rD(j>0@H^j!KoDPgg-$dSdFVR~I(yfN3H%n|r4C>`oCDGv
zfX+WyXpzUrbtVv7@JAge_r&?9l}7fomx_D(jL+jbP&y-W57)J(?2{bAm1!G?arTu+
zYf-dWAVtB;B$0D>@Dc&#L95nSe+)-uH5RdMj&AI1|M~fAf;E3pY-~k2DwbjB?!;}L
zY!u?o8Bv0YjlK+PwK0p31|Nn4vesFWYOCA%Z-sj1*#dz84quMfz0r0yhLhPj(Y_cL
zC?wnhB(>XfX`44raP>v1CJaBzYQ3$i%+}>6>Ha>2-Zw22#FOl0y#9QD!f$>%qLA}3
z9%veB6$dnJaSD{|E8Ig!-BSfoN&~6c5*xIBY4%<h);2HnJzF!fpY3$lhv~U;kb$Yq
zBF02Wy_suNi3r{Hod!2gVP_dg5_cN~Wu_rx<8l$tZXwy`n;9p<<veBnCMxtaed(l<
z+$j<2K**!gJTJ|+RlE=ji`l9RMiXj`mrJiyOZXMZ=i{S4@?3owo0FT(^*(t|*f!Z8
z5w=@oBX*C{EoCBmdHmhhefu%rz22g`mYC;DrCLi3CgISGAVrR)wp?x{RjunnFvUfU
zLg&mi=olof8JeO`SwYp68(hl*I=1)N|1kU7gHA(njfYnra38*&R}-*TWASmJ;|}jG
z{`%0RrYb79q-PW?P1>7Mx-gSp6(+98dORzy%lz5#Fev)0H_XUKHqfxip9Z#^UyCSQ
zV08#D>rLD<>mHNX{DWILO_(k=Gkt4&M#{I-?pmgW+_lfjoS@=Nx`h~XMkw}Gw11y_
z_VW&H`<EYGzxEMLI8XT-Nl~QX!j`>~27?!|=WZmJ#an8%)qP~F8j8+!S-&JFM$SCG
z7rU-B++EK}Siepfe)n$Jx&^SkT5@}afHt4s`E2<c`y=$i$Q-(_>j;eevz6|HYl!;G
zeL^jz$iIAH@nn~bgl2W*651s?No^_>M5X6`DgK&%Yv-8YnX1D5D5X$M$vFC%<=DeK
z0POMQn=Wx0;HTMvM>W9-wxls_@Myq^L*vQs{URk_%OrNt-r}Jq$2A+}{8B#XFTbvX
z>UJxuY_<Ry9qzRckC)Nb^mL8#`f?19-)#Y;1KdtSD2ydOENdX8;s&b{n5|K21o>Gx
z`+wH}q}D34?n%(X)Env6pk{*^lpKJ%uAl=bb@UN*D8hXQ_wDaL?(LCtM_OCAl2G6%
zDrX+TM;c7^X5nn!*T{R#>cnGvuMXKziv<OuIz%MW88PjseJ3;3E<|7G99C+a;S)}a
za35Cu{a5>k)QqG)NtfhrQCZ7Lz)w4C7x>fE{fWQ}bFfXhx(axMERtYjkg$Tx8$D6U
zNir?5_j_Ap(Ns$;)1luV6`hXA(5Kmi<=a1V8q%_MKJqBI9>S1K33-b$gdH(W5=z18
z#HW*<mvnK!qU@>t;3v?vGKEhXmZnKsDJg0GKvww}486741m{Z`{Lt9f&?%p|Vg+6N
zC)o{sIXT0oUISRXR+WD2sCh~?U!+5G2$xM7Cfw)mDO>f}Btq-<MI)J;GN!hBBx}ib
z53XoIx!%=B=2{LwBssP{*XAL(+D1F>QE*kQbe>GUtQ4D0eYNinQl(BM_B`Na8XT|0
z(?1E7dPq|i){}kV|9Aq_fl@vBW-XWppe;yEgM4R+lXA_#>1mhXzIe%VeF}*<^+Ls2
uh`*w0<;Sk;5^A|MEVJXIBbg*=HIR~5s_(jn#K!I;fgEjJ&@XMUN&f*IRv6#_

literal 818
zcmV-21I_%2P)<h;3K|Lk000e1NJLTq004df000^Y0{{R3Mwl4(0001BP)t-s88kus
z|MgO5Zo|yTi<+A!K}_!Q>TZCAL|S7tO<2*{)3v|7;O5?us-35^v3-q@V03wyrlwVI
zZ*z=>YlVOzJ4cD5mp@rvH&R$+etIxUQYb@BdX$U+0000000000xJ&Bz0007wNkl<Z
zNQteM>w>Hx2!KsdGuy1$%elV)a~?%htafLbJ^Y!`fKL%bA%xHYtmwt6DB>xxVD%+~
zX&8nb3*yx96kSEb>573&sKNao{D{uR%lO{nBHq@c%Fg5kyf)Eb?&mJzm!>_(zvcox
z2F$CakNs8r)U=~Be<k*(auNS@q8>#{DP4!xGQc|SwF1aeVDc_LIhE}{z$%$(Ej$hL
zP=yqH9vQ%4TG*(!Jh!9;sA`~kXI1Q!=e-kps{l0aELJlx$);`W3%;#!()aPYDQMxC
zf8%=mI&{+LCi8&sOyE9#s^8Of#5WlA9N=D(1y<lNgM`HpJ{M&?CzqTUUGa-u5j&?_
zcEN=J*yv2{@j&_#rVxkThv-gQBw)Q23shX1P5ce%7qbqdX6cKu#ST62)Pp_VR2Q9K
zq$S7Cv_XbXd-g4cKwq-AP&|BvN6dDh3%$pWOtIiG9ukEb6Dvvi2%assN%FVHOA0T;
z^E@4%!+Z7(#rl?g91nG(Lge@Hs>kbz`+EdGt18>K@tK}n?(yLme9RB%j_s-7*M^3P
z=y7;@_POrFMh;Q?F}yy<1KSjhvgRI-Tg`=+@46DYE^j}@vtvv6_qUgq*LT|QtPj?Q
z!pp452}cd3tRr7C!maizyw@H6_7dfnplfHgF80W+#RBWN$M5qzt&y6`q{@@%3_p^A
zV))mD{}7Z?Sqvf6M)}|2@y$ev<^3}5d*B&f%t!oN!vF2P#$#06-3~9dvJDLdGBShI
zAy4tNNRI#g5%E7zFO)5qv31{Nt;X>Rr1WyZD+O`j+UsNtODt0lHn*PkZowx^K5=bh
w!vjg*QSs01_LDs56};LYn@LE{9NxV89}6`S_nFs3yZ`_I07*qoM6N<$f`d_*H~;_u


From 523588da33fc9d1de023118241f3f599f56411d3 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 23:25:32 +0000
Subject: [PATCH 033/256] Added Jcrop jQuery plugin

---
 js/jquery.Jcrop.go.js   | 41 +++++++++++++++++++++++++++++++++++++++++
 js/jquery.Jcrop.pack.js |  8 ++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 js/jquery.Jcrop.go.js
 create mode 100644 js/jquery.Jcrop.pack.js

diff --git a/js/jquery.Jcrop.go.js b/js/jquery.Jcrop.go.js
new file mode 100644
index 0000000000..e5d5873545
--- /dev/null
+++ b/js/jquery.Jcrop.go.js
@@ -0,0 +1,41 @@
+		$(function(){
+			jQuery("#photo_original img").Jcrop({
+				onChange: showPreview,
+				setSelect: [ 0, 0, $("#photo_original img").attr("width"), $("#photo_original img").attr("height") ],
+				onSelect: updateCoords,
+				aspectRatio: 1,
+				boxWidth: 480,
+				boxHeight: 480,
+				bgColor: '#000',
+				bgOpacity: .4
+			});
+		});
+
+		function showPreview(coords) {
+			var rx = 96 / coords.w;
+			var ry = 96 / coords.h;
+
+			var img_width = $("#photo_original img").attr("width");
+			var img_height = $("#photo_original img").attr("height");
+
+			$('#photo_preview img').css({
+				width: Math.round(rx *img_width) + 'px',
+				height: Math.round(ry * img_height) + 'px',
+				marginLeft: '-' + Math.round(rx * coords.x) + 'px',
+				marginTop: '-' + Math.round(ry * coords.y) + 'px'
+			});
+		};
+
+		function updateCoords(c) {
+			$('#photo_crop_x').val(c.x);
+			$('#photo_crop_y').val(c.y);
+			$('#photo_crop_w').val(c.w);
+			$('#photo_crop_h').val(c.h);
+		};
+
+		function checkCoords() {
+			if (parseInt($('#photo_crop_w').val())) return true;
+			alert('Please select a crop region then press submit.');
+			return false;
+		};
+
diff --git a/js/jquery.Jcrop.pack.js b/js/jquery.Jcrop.pack.js
new file mode 100644
index 0000000000..aa82e8abec
--- /dev/null
+++ b/js/jquery.Jcrop.pack.js
@@ -0,0 +1,8 @@
+/**
+ * Jcrop v.0.9.5 (packed)
+ * (c) 2008 Kelly Hallman and DeepLiquid.com
+ * More information: http://deepliquid.com/content/Jcrop.html
+ * Released under MIT License - this header must remain with code
+ */
+
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$.1n=7(G,F){d G=G,F=F;g(1p(G)!==\'2d\')G=$(G)[0];g(1p(F)!==\'2d\')F={};g(!(\'2x\'1a F))F.2x=$.3d.3e?K:M;g(!(\'2c\'1a F))F.2c=$.3d.3e?K:M;d 4f={2x:K,3W:\'4C\',1f:4D,3T:\'4Y\',3x:.6,3O:.4,3P:.5,53:5,3N:9,3D:5,51:14,25:0,2c:M,3I:M,3B:M,30:M,3A:M,49:0,4p:0,4k:8,3V:20,3X:3,2f:K,3n:[0,0],2z:[0,0],2O:[0,0],2D:7(){},2G:7(){}};d j=4f;21(F);d $I=$(G).B({16:\'1b\'});47($I,j.49,j.4p);d S=$I.W(),L=$I.U(),$12=$(\'<12 />\').W(S).U(L).1f(1L(\'4F\')).B({16:\'4H\',4B:j.3T});g(j.1f)$12.1f(j.1f);$I.54($12);d $34=$(\'<I />\').3Y(\'2N\',$I.3Y(\'2N\')).B(\'16\',\'1b\').W(S).U(L);d $2C=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:59,16:\'1b\',4o:\'4g\'}).1P($34);d $2g=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:5b});d $28=$(\'<12 />\').B({16:\'1b\',1l:55}).3U($I).1P($2C,$2g);d 23=j.4k;d $1S=$(\'<12 />\').1f(1L(\'3v\')).W(S+(23*2)).U(L+(23*2)).B({16:\'1b\',R:D(-23),P:D(-23),1l:3R,1z:0}).3q(48);d 1I,1Q;d 2u=2Q(G),1q,1B,3i,58,3h,1O;g(\'36\'1a j){1I=j.36[0]/S;1Q=j.36[1]/L}d E=7(){d A=0,u=0,q=0,m=0,Z,Y;7 1A(z){d z=2T(z);q=A=z[0];m=u=z[1]};7 1y(z){d z=2T(z);Z=z[0]-q;Y=z[1]-m;q=z[0];m=z[1]};7 3f(){k[Z,Y]};7 2b(2y){d Z=2y[0],Y=2y[1];g(0>A+Z)Z-=Z+A;g(0>u+Y)Y-=Y+u;g(L<m+Y)Y+=L-(m+Y);g(S<q+Z)Z+=S-(q+Z);A+=Z;q+=Z;u+=Y;m+=Y};7 2K(T){d c=Q();1E(T){C\'1s\':k[c.q,c.y];C\'11\':k[c.x,c.y];C\'2e\':k[c.q,c.m];C\'1M\':k[c.x,c.m]}};7 Q(){g(!j.25&&!1B)k 3F();d 1k=j.25?j.25:1B,5c=j.2O,4u=j.2z,1V=q-A,1Z=m-u,3c=N.17(1V),3j=N.17(1Z),3M=3c/3j,15,13;g(3M<1k){13=m;w=3j*1k;15=1V<0?A-w:w+A;g(15<0){15=0;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}1g g(15>S){15=S;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}}1g{15=q;h=3c/1k;13=1Z<0?u-h:u+h;g(13<0){13=0;w=N.17((13-u)*1k);15=1V<0?A-w:w+A}1g g(13>L){13=L;w=N.17(13-u)*1k;15=1V<0?A-w:w+A}}k 4E=3g(1F(A,u,15,13))};7 2T(p){g(p[0]<0)p[0]=0;g(p[1]<0)p[1]=0;g(p[0]>S)p[0]=S;g(p[1]>L)p[1]=L;k[p[0],p[1]]};7 1F(A,u,q,m){d 2R=A,3r=q,3o=u,3l=m;g(q<A){2R=q;3r=A}g(m<u){3o=m;3l=u}k[N.1K(2R),N.1K(3o),N.1K(3r),N.1K(3l)]};7 3F(){d 1U=q-A;d 22=m-u;g(2q&&(N.17(1U)>2q))q=(1U>0)?(A+2q):(A-2q);g(2n&&(N.17(22)>2n))m=(22>0)?(u+2n):(u-2n);g(2i&&(N.17(22)<2i))m=(22>0)?(u+2i):(u-2i);g(2m&&(N.17(1U)<2m))q=(1U>0)?(A+2m):(A-2m);g(A<0){q-=A;A-=A}g(u<0){m-=u;u-=u}g(q<0){A-=q;q-=q}g(m<0){u-=m;m-=m}g(q>S){d X=q-S;A-=X;q-=X}g(m>L){d X=m-L;u-=X;m-=X}g(A>S){d X=A-L;m-=X;u-=X}g(u>L){d X=u-L;m-=X;u-=X}k 3g(1F(A,u,q,m))};7 3g(a){k{x:a[0],y:a[1],q:a[2],m:a[3],w:a[2]-a[0],h:a[3]-a[1]}};k{1F:1F,1A:1A,1y:1y,3f:3f,2b:2b,2K:2K,Q:Q}}();d J=7(){d 4v,4z,4y,1R,2U=4x;d 2F={};d H={};d 2E=K;d 1i=j.3D;g(j.30){2F={R:1Y(\'3C\').B(\'R\',$.3d.3e?D(-1):D(0)),3Q:1Y(\'3C\'),P:1Y(\'3z\'),3L:1Y(\'3z\')}}g(j.3A){H.t=1W(\'n\');H.b=1W(\'s\');H.r=1W(\'e\');H.l=1W(\'w\')}j.3B&&2Y([\'n\',\'s\',\'e\',\'w\']);j.3I&&2Y([\'1M\',\'11\',\'1s\',\'2e\']);7 1Y(1u){d 1J=$(\'<12 />\').B({16:\'1b\',1z:j.3O}).1f(1L(1u));$2C.1P(1J);k 1J};7 2W(T,3y){d 1J=$(\'<12 />\').3q(3b(T)).B({3p:T+\'-2A\',16:\'1b\',1l:3y});$2g.1P(1J);k 1J};7 3J(T){k 2W(T,2U++).B({R:D(-1i+1),P:D(-1i+1),1z:j.3P}).1f(1L(\'H\'))};7 1W(T){d s=j.3N,o=1i,h=s,w=s,t=o,l=o;1E(T){C\'n\':C\'s\':w=1t(V);O;C\'e\':C\'w\':h=1t(V);O}k 2W(T,2U++).W(w).U(h).B({R:D(-t+1),P:D(-l+1)})};7 2Y(2J){4U(i 1a 2J)H[2J[i]]=3J(2J[i])};7 31(c){d 3a=N.1K((c.h/2)-1i),35=N.1K((c.w/2)-1i),4V=4W=-1i+1,2a=c.w-1i,1X=c.h-1i,x,y;\'e\'1a H&&H.e.B({R:D(3a),P:D(2a)})&&H.w.B({R:D(3a)})&&H.s.B({R:D(1X),P:D(35)})&&H.n.B({P:D(35)});\'1s\'1a H&&H.1s.B({P:D(2a)})&&H.2e.B({R:D(1X),P:D(2a)})&&H.1M.B({R:D(1X)});\'b\'1a H&&H.b.B({R:D(1X)})&&H.r.B({P:D(2a)})};7 3K(x,y){$34.B({R:D(-y),P:D(-x)});$28.B({R:D(y),P:D(x)})};7 2A(w,h){$28.W(w).U(h)};7 3s(){d p=E.Q();E.1A([p.x,p.y]);E.1y([p.q,p.m])};7 2I(){g(1R)k 1e()};7 1e(){d c=E.Q();2A(c.w,c.h);3K(c.x,c.y);j.30&&2F[\'3L\'].B({P:D(c.w-1)})&&2F[\'3Q\'].B({R:D(c.h-1)});2E&&31(c);1R||1w();j.2D(2H(c))};7 1w(){$28.1w();$I.B(\'1z\',j.3x);1R=M};7 1r(){1o();$28.1v();$I.B(\'1z\',1);1R=K};7 1v(){1r();$I.B(\'1z\',1);1R=K};7 2t(){2E=M;31(E.Q());$2g.1w()};7 1o(){2E=K;$2g.1v()};7 2o(v){(3h=v)?1o():2t()};7 1h(){d c=E.Q();2o(K);3s()};1o();$2C.1P($(\'<12 />\').1f(1L(\'3v\')).3q(3b(\'1N\')).B({3p:\'1N\',16:\'1b\',1l:4M,1z:0}));k{2I:2I,1e:1e,1r:1r,1w:1w,1v:1v,2t:2t,1o:1o,2o:2o,1h:1h}}();d 1j=7(){d 2w=7(){},2v=7(){},2L=j.2x;g(!2L){$1S.3k(2B).2S(26).4N(26)}7 4j(){g(2L){$(3t).3k(2B).2S(26)}$1S.B({1l:4G})}7 4i(){g(2L){$(3t).3H(\'3k\',2B).3H(\'2S\',26)}$1S.B({1l:3R})}7 2B(e){2w(2r(e))};7 26(e){e.2j();e.2k();g(1q){1q=K;2v(2r(e));j.2G(2H(E.Q()));4i();2w=7(){};2v=7(){}}k K};7 1G(1N,1h){1q=M;2w=1N;2v=1h;4j();k K};7 1x(t){$1S.B(\'3p\',t)};$I.4s($1S);k{1G:1G,1x:1x}}();d 33=7(){d $24=$(\'<4w 1u="4L" />\').B({16:\'1b\',P:\'-4O\'}).57(43).56(2f).5a(41),$3S=$(\'<12 />\').B({16:\'1b\',4o:\'4g\'}).1P($24);7 2l(){g(j.2c){$24.1w();$24.4Z()}};7 41(e){$24.1v()};7 2f(e){g(!j.2f)k;d 42=1O,1C;1O=e.4Q?M:K;g(42!=1O){g(1O&&1q){1C=E.Q();1B=1C.w/1C.h}1g 1B=0;J.1e()}e.2k();e.2j();k K};7 29(e,x,y){E.2b([x,y]);J.2I();e.2j();e.2k()};7 43(e){g(e.4T)k M;2f(e);d 2h=1O?10:1;1E(e.5d){C 37:29(e,-2h,0);O;C 39:29(e,2h,0);O;C 38:29(e,0,-2h);O;C 40:29(e,0,2h);O;C 27:J.1r();O;C 9:k M}k K};g(j.2c)$3S.3U($I);k{2l:2l}}();7 D(n){k\'\'+1m(n)+\'D\'};7 1t(n){k\'\'+1m(n)+\'%\'};7 1L(44){k j.3W+\'-\'+44};7 2Q(G){d z=$(G).2y();k[z.P,z.R]};7 2r(e){k[(e.4q-2u[0]),(e.4r-2u[1])]};7 46(1u){g(1u!=3i){1j.1x(1u);3i=1u}};7 4a(19,z){2u=2Q(G);1j.1x(19==\'1N\'?19:19+\'-2A\');g(19==\'1N\')k 1j.1G(4e(z),2P);d 1C=E.Q();E.1A(E.2K(4b(19)));1j.1G(45(19,1C),2P)};7 45(19,f){k 7(z){g(!j.25&&!1B)1E(19){C\'e\':z[1]=f.m;O;C\'w\':z[1]=f.m;O;C\'n\':z[0]=f.q;O;C\'s\':z[0]=f.q;O}1g 1E(19){C\'e\':z[1]=f.y+1;O;C\'w\':z[1]=f.y+1;O;C\'n\':z[0]=f.x+1;O;C\'s\':z[0]=f.x+1;O}E.1y(z);J.1e()}};7 4e(z){d 2M=z;33.2l();k 7(z){E.2b([z[0]-2M[0],z[1]-2M[1]]);2M=z;J.1e()}};7 4b(T){1E(T){C\'n\':k\'1M\';C\'s\':k\'11\';C\'e\':k\'11\';C\'w\':k\'1s\';C\'1s\':k\'1M\';C\'11\':k\'2e\';C\'2e\':k\'11\';C\'1M\':k\'1s\'}};7 3b(T){k 7(e){1q=M;4a(T,2r(e));e.2k();e.2j();k K}};7 47($G,w,h){d 11=$G.W(),1H=$G.U();g((11>w)&&w>0){11=w;1H=(w/$G.W())*$G.U()}g((1H>h)&&h>0){1H=h;11=(h/$G.U())*$G.W()}1I=$G.W()/11;1Q=$G.U()/1H;$G.W(11).U(1H)};7 2H(c){k{x:1m(c.x*1I),y:1m(c.y*1Q),q:1m(c.q*1I),m:1m(c.m*1Q),w:1m(c.w*1I),h:1m(c.h*1Q)}};7 2P(z){d c=E.Q();g(c.w>j.3n[0]&&c.h>j.3n[1]){J.2t();J.1h()}1g{J.1r()}1j.1x(\'2X\')};7 48(e){1q=M;2u=2Q(G);J.1r();J.1o();46(\'2X\');E.1A(2r(e));1j.1G(4c,2P);33.2l();e.2k();e.2j();k K};7 4c(z){E.1y(z);J.1e()};7 2Z(a){d A=a[0],u=a[1],q=a[2],m=a[3];g(3h)k;d 2s=E.1F(A,u,q,m);d c=E.Q();d 18=2p=[c.x,c.y,c.q,c.m];d 3w=j.3V;d x=18[0];d y=18[1];d q=18[2];d m=18[3];d 3Z=2s[0]-2p[0];d 4m=2s[1]-2p[1];d 4n=2s[2]-2p[2];d 4l=2s[3]-2p[3];d 1c=0;d 4h=j.3X;J.2o(M);d 3u=7(){k 7(){1c+=(V-1c)/4h;18[0]=x+((1c/V)*3Z);18[1]=y+((1c/V)*4m);18[2]=q+((1c/V)*4n);18[3]=m+((1c/V)*4l);g(1c<V)32();1g J.1h();g(1c>=4K.8)1c=V;1d(18)}}();7 32(){4I.4t(3u,3w)};32()};7 1d(l){E.1A([l[0],l[1]]);E.1y([l[2],l[3]]);J.1e()};7 21(F){g(1p(F)!=\'2d\')F={};j=$.4X(j,F);g(1p(j.2D)!==\'7\')j.2D=7(){};g(1p(j.2G)!==\'7\')j.2G=7(){}};7 3m(){k 2H(E.Q())};7 2V(){k E.Q()};7 3E(F){21(F);g(\'1d\'1a F){1d(F.1d);J.1h()}};g(1p(F)!=\'2d\')F={};g(\'1d\'1a F){1d(F.1d);J.1h()}d 2q=j.2z[0]||0;d 2n=j.2z[1]||0;d 2m=j.2O[0]||0;d 2i=j.2O[1]||0;1j.1x(\'2X\');k{2Z:2Z,1d:1d,21:3E,3m:3m,2V:2V}};$.5e.1n=7(j){7 3G(1D){d 4d=j.4R||1D.2N;d I=4P 4S();d 1D=1D;I.50=7(){$(1D).1v().4A(I);1D.1n=$.1n(I,j)};I.2N=4d};g(1p(j)!==\'2d\')j={};1T.4J(7(){g(\'1n\'1a 1T){g(j==\'52\')k 1T.1n;1g 1T.1n.21(j)}1g 3G(1T)});k 1T};',62,325,'|||||||function||||||var|||if|||options|return||y2||||x2||||y1|||||pos|x1|css|case|px|Coords|opt|obj|handle|img|Selection|false|boundy|true|Math|break|left|getFixed|top|boundx|ord|height|100|width|delta|oy|ox||nw|div|yy||xx|position|abs|animat|mode|in|absolute|pcent|setSelect|update|addClass|else|done|hhs|Tracker|aspect|zIndex|parseInt|Jcrop|disableHandles|typeof|btndown|release|ne|pct|type|hide|show|setCursor|setCurrent|opacity|setPressed|aspectLock|fc|from|switch|flipCoords|activateHandlers|nh|xscale|jq|round|cssClass|sw|move|shift_down|append|yscale|awake|trk|this|xsize|rw|insertDragbar|south|insertBorder|rh||setOptions|ysize|bound|keymgr|aspectRatio|trackUp||sel|doNudge|east|moveOffset|keySupport|object|se|watchShift|hdl_holder|nudge|ymin|preventDefault|stopPropagation|watchKeys|xmin|ylimit|animMode|initcr|xlimit|mouseAbs|animto|enableHandles|docOffset|onDone|onMove|trackDocument|offset|maxSize|resize|trackMove|img_holder|onChange|seehandles|borders|onSelect|unscale|updateVisible|li|getCorner|trackDoc|lloc|src|minSize|doneSelect|getPos|xa|mouseup|rebound|hdep|tellScaled|dragDiv|crosshair|createHandles|animateTo|drawBorders|moveHandles|animateStart|KeyManager|img2|midhoriz|trueSize||||midvert|createDragger|rwa|browser|msie|getOffset|makeObj|animating|lastcurs|rha|mousemove|yb|tellSelect|minSelect|ya|cursor|mousedown|xb|refresh|document|animator|tracker|interv|bgOpacity|zi|vline|dragEdges|sideHandles|hline|handleOffset|setOptionsNew|getRect|attachWhenDone|unbind|cornerHandles|insertHandle|moveto|right|real_ratio|handleSize|borderOpacity|handleOpacity|bottom|290|keywrap|bgColor|insertBefore|animationDelay|baseClass|swingSpeed|attr|ix1||onBlur|init_shift|parseKey|cl|dragmodeHandler|myCursor|presize|newSelection|boxWidth|startDragMode|oppLockCorner|selectDrag|loadsrc|createMover|defaults|hidden|velocity|toBack|toFront|boundary|iy2|iy1|ix2|overflow|boxHeight|pageX|pageY|before|setTimeout|max|start|input|370|dragmode|end|after|backgroundColor|jcrop|null|last|holder|450|relative|window|each|99|radio|360|mouseout|30px|new|shiftKey|useImg|Image|ctrlKey|for|north|west|extend|black|focus|onload|edgeMargin|api|handlePad|wrap|300|keyup|keydown|dimmed|310|blur|320|min|keyCode|fn'.split('|'),0,{}))

From eb53e96942e2237515f6746354e972596feb673d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 14 Jan 2009 23:50:18 +0000
Subject: [PATCH 034/256] Removed the jquery form extension and xbImportNode.
 These will be replaced by jquery's built in load() later.

---
 js/jcrop/Jcrop.gif            | Bin 329 -> 0 bytes
 js/jcrop/jquery.Jcrop.css     |  45 ---
 js/jcrop/jquery.Jcrop.go.js   |  41 ---
 js/jcrop/jquery.Jcrop.pack.js |   8 -
 js/jquery.form.js             | 632 ----------------------------------
 js/xbImportNode.js            |  46 ---
 6 files changed, 772 deletions(-)
 delete mode 100644 js/jcrop/Jcrop.gif
 delete mode 100644 js/jcrop/jquery.Jcrop.css
 delete mode 100644 js/jcrop/jquery.Jcrop.go.js
 delete mode 100644 js/jcrop/jquery.Jcrop.pack.js
 delete mode 100644 js/jquery.form.js
 delete mode 100644 js/xbImportNode.js

diff --git a/js/jcrop/Jcrop.gif b/js/jcrop/Jcrop.gif
deleted file mode 100644
index 72ea7ccb5321d5384d70437cfaac73011237901e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

diff --git a/js/jcrop/jquery.Jcrop.css b/js/jcrop/jquery.Jcrop.css
deleted file mode 100644
index b95178a726..0000000000
--- a/js/jcrop/jquery.Jcrop.css
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Fixes issue here http://code.google.com/p/jcrop/issues/detail?id=1 */
-.jcrop-holder
-{
-	text-align: left;
-}
-
-.jcrop-vline, .jcrop-hline
-{
-	font-size: 0;
-	position: absolute;
-	background: white url('Jcrop.gif') top left repeat;
-	/*
-	opacity: .5;
-	*filter:alpha(opacity=50);
-	*/
-}
-.jcrop-vline { height: 100%; width: 1px !important; }
-.jcrop-hline { width: 100%; height: 1px !important; }
-.jcrop-handle {
-	font-size: 1px;
-	width: 7px !important;
-	height: 7px !important;
-	border: 1px #eee solid;
-	background-color: #333;
-	*width: 9px;
-	*height: 9px;
-}
-
-.jcrop-tracker {
-	*background-color: gray;
-	width: 100%; height: 100%;
-}
-
-.custom .jcrop-vline,
-.custom .jcrop-hline
-{
-	background: yellow;
-}
-.custom .jcrop-handle
-{
-	border-color: black;
-	background-color: #C7BB00;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
deleted file mode 100644
index 7c5b5e4e66..0000000000
--- a/js/jcrop/jquery.Jcrop.go.js
+++ /dev/null
@@ -1,41 +0,0 @@
-		$(function(){
-			jQuery("#avatar_original img.avatar").Jcrop({ onChange: showPreview,
-													      setSelect: [ 0, 0, $("#avatar_original img.avatar").attr("width"), $("#avatar_original img.avatar").attr("height") ],
-														  onSelect: updateCoords,
-													      aspectRatio: 1,
-														  boxWidth: 480,
-														  boxHeight: 480,
-														  bgColor: '#000',
-														  bgOpacity: .4
-												});
-		});
-
-		function showPreview(coords) {
-			var rx = 96 / coords.w;
-			var ry = 96 / coords.h;
-
-			var img_width = $("#avatar_original img.avatar").attr("width");
-			var img_height = $("#avatar_original img.avatar").attr("height");
-
-
-			$('#avatar_preview img.avatar').css({
-				width: Math.round(rx *img_width) + 'px',
-				height: Math.round(ry * img_height) + 'px',
-				marginLeft: '-' + Math.round(rx * coords.x) + 'px',
-				marginTop: '-' + Math.round(ry * coords.y) + 'px'
-			});
-		};
-
-		function updateCoords(c) {
-			$('#avatar_crop_x').val(c.x);
-			$('#avatar_crop_y').val(c.y);
-			$('#avatar_crop_w').val(c.w);
-			$('#avatar_crop_h').val(c.h);
-		};
-
-		function checkCoords() {
-			if (parseInt($('#avatar_crop_w').val())) return true;
-			alert('Please select a crop region then press submit.');
-			return false;
-		};
-
diff --git a/js/jcrop/jquery.Jcrop.pack.js b/js/jcrop/jquery.Jcrop.pack.js
deleted file mode 100644
index aa82e8abec..0000000000
--- a/js/jcrop/jquery.Jcrop.pack.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * Jcrop v.0.9.5 (packed)
- * (c) 2008 Kelly Hallman and DeepLiquid.com
- * More information: http://deepliquid.com/content/Jcrop.html
- * Released under MIT License - this header must remain with code
- */
-
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('$.1n=7(G,F){d G=G,F=F;g(1p(G)!==\'2d\')G=$(G)[0];g(1p(F)!==\'2d\')F={};g(!(\'2x\'1a F))F.2x=$.3d.3e?K:M;g(!(\'2c\'1a F))F.2c=$.3d.3e?K:M;d 4f={2x:K,3W:\'4C\',1f:4D,3T:\'4Y\',3x:.6,3O:.4,3P:.5,53:5,3N:9,3D:5,51:14,25:0,2c:M,3I:M,3B:M,30:M,3A:M,49:0,4p:0,4k:8,3V:20,3X:3,2f:K,3n:[0,0],2z:[0,0],2O:[0,0],2D:7(){},2G:7(){}};d j=4f;21(F);d $I=$(G).B({16:\'1b\'});47($I,j.49,j.4p);d S=$I.W(),L=$I.U(),$12=$(\'<12 />\').W(S).U(L).1f(1L(\'4F\')).B({16:\'4H\',4B:j.3T});g(j.1f)$12.1f(j.1f);$I.54($12);d $34=$(\'<I />\').3Y(\'2N\',$I.3Y(\'2N\')).B(\'16\',\'1b\').W(S).U(L);d $2C=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:59,16:\'1b\',4o:\'4g\'}).1P($34);d $2g=$(\'<12 />\').W(1t(V)).U(1t(V)).B({1l:5b});d $28=$(\'<12 />\').B({16:\'1b\',1l:55}).3U($I).1P($2C,$2g);d 23=j.4k;d $1S=$(\'<12 />\').1f(1L(\'3v\')).W(S+(23*2)).U(L+(23*2)).B({16:\'1b\',R:D(-23),P:D(-23),1l:3R,1z:0}).3q(48);d 1I,1Q;d 2u=2Q(G),1q,1B,3i,58,3h,1O;g(\'36\'1a j){1I=j.36[0]/S;1Q=j.36[1]/L}d E=7(){d A=0,u=0,q=0,m=0,Z,Y;7 1A(z){d z=2T(z);q=A=z[0];m=u=z[1]};7 1y(z){d z=2T(z);Z=z[0]-q;Y=z[1]-m;q=z[0];m=z[1]};7 3f(){k[Z,Y]};7 2b(2y){d Z=2y[0],Y=2y[1];g(0>A+Z)Z-=Z+A;g(0>u+Y)Y-=Y+u;g(L<m+Y)Y+=L-(m+Y);g(S<q+Z)Z+=S-(q+Z);A+=Z;q+=Z;u+=Y;m+=Y};7 2K(T){d c=Q();1E(T){C\'1s\':k[c.q,c.y];C\'11\':k[c.x,c.y];C\'2e\':k[c.q,c.m];C\'1M\':k[c.x,c.m]}};7 Q(){g(!j.25&&!1B)k 3F();d 1k=j.25?j.25:1B,5c=j.2O,4u=j.2z,1V=q-A,1Z=m-u,3c=N.17(1V),3j=N.17(1Z),3M=3c/3j,15,13;g(3M<1k){13=m;w=3j*1k;15=1V<0?A-w:w+A;g(15<0){15=0;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}1g g(15>S){15=S;h=N.17((15-A)/1k);13=1Z<0?u-h:h+u}}1g{15=q;h=3c/1k;13=1Z<0?u-h:u+h;g(13<0){13=0;w=N.17((13-u)*1k);15=1V<0?A-w:w+A}1g g(13>L){13=L;w=N.17(13-u)*1k;15=1V<0?A-w:w+A}}k 4E=3g(1F(A,u,15,13))};7 2T(p){g(p[0]<0)p[0]=0;g(p[1]<0)p[1]=0;g(p[0]>S)p[0]=S;g(p[1]>L)p[1]=L;k[p[0],p[1]]};7 1F(A,u,q,m){d 2R=A,3r=q,3o=u,3l=m;g(q<A){2R=q;3r=A}g(m<u){3o=m;3l=u}k[N.1K(2R),N.1K(3o),N.1K(3r),N.1K(3l)]};7 3F(){d 1U=q-A;d 22=m-u;g(2q&&(N.17(1U)>2q))q=(1U>0)?(A+2q):(A-2q);g(2n&&(N.17(22)>2n))m=(22>0)?(u+2n):(u-2n);g(2i&&(N.17(22)<2i))m=(22>0)?(u+2i):(u-2i);g(2m&&(N.17(1U)<2m))q=(1U>0)?(A+2m):(A-2m);g(A<0){q-=A;A-=A}g(u<0){m-=u;u-=u}g(q<0){A-=q;q-=q}g(m<0){u-=m;m-=m}g(q>S){d X=q-S;A-=X;q-=X}g(m>L){d X=m-L;u-=X;m-=X}g(A>S){d X=A-L;m-=X;u-=X}g(u>L){d X=u-L;m-=X;u-=X}k 3g(1F(A,u,q,m))};7 3g(a){k{x:a[0],y:a[1],q:a[2],m:a[3],w:a[2]-a[0],h:a[3]-a[1]}};k{1F:1F,1A:1A,1y:1y,3f:3f,2b:2b,2K:2K,Q:Q}}();d J=7(){d 4v,4z,4y,1R,2U=4x;d 2F={};d H={};d 2E=K;d 1i=j.3D;g(j.30){2F={R:1Y(\'3C\').B(\'R\',$.3d.3e?D(-1):D(0)),3Q:1Y(\'3C\'),P:1Y(\'3z\'),3L:1Y(\'3z\')}}g(j.3A){H.t=1W(\'n\');H.b=1W(\'s\');H.r=1W(\'e\');H.l=1W(\'w\')}j.3B&&2Y([\'n\',\'s\',\'e\',\'w\']);j.3I&&2Y([\'1M\',\'11\',\'1s\',\'2e\']);7 1Y(1u){d 1J=$(\'<12 />\').B({16:\'1b\',1z:j.3O}).1f(1L(1u));$2C.1P(1J);k 1J};7 2W(T,3y){d 1J=$(\'<12 />\').3q(3b(T)).B({3p:T+\'-2A\',16:\'1b\',1l:3y});$2g.1P(1J);k 1J};7 3J(T){k 2W(T,2U++).B({R:D(-1i+1),P:D(-1i+1),1z:j.3P}).1f(1L(\'H\'))};7 1W(T){d s=j.3N,o=1i,h=s,w=s,t=o,l=o;1E(T){C\'n\':C\'s\':w=1t(V);O;C\'e\':C\'w\':h=1t(V);O}k 2W(T,2U++).W(w).U(h).B({R:D(-t+1),P:D(-l+1)})};7 2Y(2J){4U(i 1a 2J)H[2J[i]]=3J(2J[i])};7 31(c){d 3a=N.1K((c.h/2)-1i),35=N.1K((c.w/2)-1i),4V=4W=-1i+1,2a=c.w-1i,1X=c.h-1i,x,y;\'e\'1a H&&H.e.B({R:D(3a),P:D(2a)})&&H.w.B({R:D(3a)})&&H.s.B({R:D(1X),P:D(35)})&&H.n.B({P:D(35)});\'1s\'1a H&&H.1s.B({P:D(2a)})&&H.2e.B({R:D(1X),P:D(2a)})&&H.1M.B({R:D(1X)});\'b\'1a H&&H.b.B({R:D(1X)})&&H.r.B({P:D(2a)})};7 3K(x,y){$34.B({R:D(-y),P:D(-x)});$28.B({R:D(y),P:D(x)})};7 2A(w,h){$28.W(w).U(h)};7 3s(){d p=E.Q();E.1A([p.x,p.y]);E.1y([p.q,p.m])};7 2I(){g(1R)k 1e()};7 1e(){d c=E.Q();2A(c.w,c.h);3K(c.x,c.y);j.30&&2F[\'3L\'].B({P:D(c.w-1)})&&2F[\'3Q\'].B({R:D(c.h-1)});2E&&31(c);1R||1w();j.2D(2H(c))};7 1w(){$28.1w();$I.B(\'1z\',j.3x);1R=M};7 1r(){1o();$28.1v();$I.B(\'1z\',1);1R=K};7 1v(){1r();$I.B(\'1z\',1);1R=K};7 2t(){2E=M;31(E.Q());$2g.1w()};7 1o(){2E=K;$2g.1v()};7 2o(v){(3h=v)?1o():2t()};7 1h(){d c=E.Q();2o(K);3s()};1o();$2C.1P($(\'<12 />\').1f(1L(\'3v\')).3q(3b(\'1N\')).B({3p:\'1N\',16:\'1b\',1l:4M,1z:0}));k{2I:2I,1e:1e,1r:1r,1w:1w,1v:1v,2t:2t,1o:1o,2o:2o,1h:1h}}();d 1j=7(){d 2w=7(){},2v=7(){},2L=j.2x;g(!2L){$1S.3k(2B).2S(26).4N(26)}7 4j(){g(2L){$(3t).3k(2B).2S(26)}$1S.B({1l:4G})}7 4i(){g(2L){$(3t).3H(\'3k\',2B).3H(\'2S\',26)}$1S.B({1l:3R})}7 2B(e){2w(2r(e))};7 26(e){e.2j();e.2k();g(1q){1q=K;2v(2r(e));j.2G(2H(E.Q()));4i();2w=7(){};2v=7(){}}k K};7 1G(1N,1h){1q=M;2w=1N;2v=1h;4j();k K};7 1x(t){$1S.B(\'3p\',t)};$I.4s($1S);k{1G:1G,1x:1x}}();d 33=7(){d $24=$(\'<4w 1u="4L" />\').B({16:\'1b\',P:\'-4O\'}).57(43).56(2f).5a(41),$3S=$(\'<12 />\').B({16:\'1b\',4o:\'4g\'}).1P($24);7 2l(){g(j.2c){$24.1w();$24.4Z()}};7 41(e){$24.1v()};7 2f(e){g(!j.2f)k;d 42=1O,1C;1O=e.4Q?M:K;g(42!=1O){g(1O&&1q){1C=E.Q();1B=1C.w/1C.h}1g 1B=0;J.1e()}e.2k();e.2j();k K};7 29(e,x,y){E.2b([x,y]);J.2I();e.2j();e.2k()};7 43(e){g(e.4T)k M;2f(e);d 2h=1O?10:1;1E(e.5d){C 37:29(e,-2h,0);O;C 39:29(e,2h,0);O;C 38:29(e,0,-2h);O;C 40:29(e,0,2h);O;C 27:J.1r();O;C 9:k M}k K};g(j.2c)$3S.3U($I);k{2l:2l}}();7 D(n){k\'\'+1m(n)+\'D\'};7 1t(n){k\'\'+1m(n)+\'%\'};7 1L(44){k j.3W+\'-\'+44};7 2Q(G){d z=$(G).2y();k[z.P,z.R]};7 2r(e){k[(e.4q-2u[0]),(e.4r-2u[1])]};7 46(1u){g(1u!=3i){1j.1x(1u);3i=1u}};7 4a(19,z){2u=2Q(G);1j.1x(19==\'1N\'?19:19+\'-2A\');g(19==\'1N\')k 1j.1G(4e(z),2P);d 1C=E.Q();E.1A(E.2K(4b(19)));1j.1G(45(19,1C),2P)};7 45(19,f){k 7(z){g(!j.25&&!1B)1E(19){C\'e\':z[1]=f.m;O;C\'w\':z[1]=f.m;O;C\'n\':z[0]=f.q;O;C\'s\':z[0]=f.q;O}1g 1E(19){C\'e\':z[1]=f.y+1;O;C\'w\':z[1]=f.y+1;O;C\'n\':z[0]=f.x+1;O;C\'s\':z[0]=f.x+1;O}E.1y(z);J.1e()}};7 4e(z){d 2M=z;33.2l();k 7(z){E.2b([z[0]-2M[0],z[1]-2M[1]]);2M=z;J.1e()}};7 4b(T){1E(T){C\'n\':k\'1M\';C\'s\':k\'11\';C\'e\':k\'11\';C\'w\':k\'1s\';C\'1s\':k\'1M\';C\'11\':k\'2e\';C\'2e\':k\'11\';C\'1M\':k\'1s\'}};7 3b(T){k 7(e){1q=M;4a(T,2r(e));e.2k();e.2j();k K}};7 47($G,w,h){d 11=$G.W(),1H=$G.U();g((11>w)&&w>0){11=w;1H=(w/$G.W())*$G.U()}g((1H>h)&&h>0){1H=h;11=(h/$G.U())*$G.W()}1I=$G.W()/11;1Q=$G.U()/1H;$G.W(11).U(1H)};7 2H(c){k{x:1m(c.x*1I),y:1m(c.y*1Q),q:1m(c.q*1I),m:1m(c.m*1Q),w:1m(c.w*1I),h:1m(c.h*1Q)}};7 2P(z){d c=E.Q();g(c.w>j.3n[0]&&c.h>j.3n[1]){J.2t();J.1h()}1g{J.1r()}1j.1x(\'2X\')};7 48(e){1q=M;2u=2Q(G);J.1r();J.1o();46(\'2X\');E.1A(2r(e));1j.1G(4c,2P);33.2l();e.2k();e.2j();k K};7 4c(z){E.1y(z);J.1e()};7 2Z(a){d A=a[0],u=a[1],q=a[2],m=a[3];g(3h)k;d 2s=E.1F(A,u,q,m);d c=E.Q();d 18=2p=[c.x,c.y,c.q,c.m];d 3w=j.3V;d x=18[0];d y=18[1];d q=18[2];d m=18[3];d 3Z=2s[0]-2p[0];d 4m=2s[1]-2p[1];d 4n=2s[2]-2p[2];d 4l=2s[3]-2p[3];d 1c=0;d 4h=j.3X;J.2o(M);d 3u=7(){k 7(){1c+=(V-1c)/4h;18[0]=x+((1c/V)*3Z);18[1]=y+((1c/V)*4m);18[2]=q+((1c/V)*4n);18[3]=m+((1c/V)*4l);g(1c<V)32();1g J.1h();g(1c>=4K.8)1c=V;1d(18)}}();7 32(){4I.4t(3u,3w)};32()};7 1d(l){E.1A([l[0],l[1]]);E.1y([l[2],l[3]]);J.1e()};7 21(F){g(1p(F)!=\'2d\')F={};j=$.4X(j,F);g(1p(j.2D)!==\'7\')j.2D=7(){};g(1p(j.2G)!==\'7\')j.2G=7(){}};7 3m(){k 2H(E.Q())};7 2V(){k E.Q()};7 3E(F){21(F);g(\'1d\'1a F){1d(F.1d);J.1h()}};g(1p(F)!=\'2d\')F={};g(\'1d\'1a F){1d(F.1d);J.1h()}d 2q=j.2z[0]||0;d 2n=j.2z[1]||0;d 2m=j.2O[0]||0;d 2i=j.2O[1]||0;1j.1x(\'2X\');k{2Z:2Z,1d:1d,21:3E,3m:3m,2V:2V}};$.5e.1n=7(j){7 3G(1D){d 4d=j.4R||1D.2N;d I=4P 4S();d 1D=1D;I.50=7(){$(1D).1v().4A(I);1D.1n=$.1n(I,j)};I.2N=4d};g(1p(j)!==\'2d\')j={};1T.4J(7(){g(\'1n\'1a 1T){g(j==\'52\')k 1T.1n;1g 1T.1n.21(j)}1g 3G(1T)});k 1T};',62,325,'|||||||function||||||var|||if|||options|return||y2||||x2||||y1|||||pos|x1|css|case|px|Coords|opt|obj|handle|img|Selection|false|boundy|true|Math|break|left|getFixed|top|boundx|ord|height|100|width|delta|oy|ox||nw|div|yy||xx|position|abs|animat|mode|in|absolute|pcent|setSelect|update|addClass|else|done|hhs|Tracker|aspect|zIndex|parseInt|Jcrop|disableHandles|typeof|btndown|release|ne|pct|type|hide|show|setCursor|setCurrent|opacity|setPressed|aspectLock|fc|from|switch|flipCoords|activateHandlers|nh|xscale|jq|round|cssClass|sw|move|shift_down|append|yscale|awake|trk|this|xsize|rw|insertDragbar|south|insertBorder|rh||setOptions|ysize|bound|keymgr|aspectRatio|trackUp||sel|doNudge|east|moveOffset|keySupport|object|se|watchShift|hdl_holder|nudge|ymin|preventDefault|stopPropagation|watchKeys|xmin|ylimit|animMode|initcr|xlimit|mouseAbs|animto|enableHandles|docOffset|onDone|onMove|trackDocument|offset|maxSize|resize|trackMove|img_holder|onChange|seehandles|borders|onSelect|unscale|updateVisible|li|getCorner|trackDoc|lloc|src|minSize|doneSelect|getPos|xa|mouseup|rebound|hdep|tellScaled|dragDiv|crosshair|createHandles|animateTo|drawBorders|moveHandles|animateStart|KeyManager|img2|midhoriz|trueSize||||midvert|createDragger|rwa|browser|msie|getOffset|makeObj|animating|lastcurs|rha|mousemove|yb|tellSelect|minSelect|ya|cursor|mousedown|xb|refresh|document|animator|tracker|interv|bgOpacity|zi|vline|dragEdges|sideHandles|hline|handleOffset|setOptionsNew|getRect|attachWhenDone|unbind|cornerHandles|insertHandle|moveto|right|real_ratio|handleSize|borderOpacity|handleOpacity|bottom|290|keywrap|bgColor|insertBefore|animationDelay|baseClass|swingSpeed|attr|ix1||onBlur|init_shift|parseKey|cl|dragmodeHandler|myCursor|presize|newSelection|boxWidth|startDragMode|oppLockCorner|selectDrag|loadsrc|createMover|defaults|hidden|velocity|toBack|toFront|boundary|iy2|iy1|ix2|overflow|boxHeight|pageX|pageY|before|setTimeout|max|start|input|370|dragmode|end|after|backgroundColor|jcrop|null|last|holder|450|relative|window|each|99|radio|360|mouseout|30px|new|shiftKey|useImg|Image|ctrlKey|for|north|west|extend|black|focus|onload|edgeMargin|api|handlePad|wrap|300|keyup|keydown|dimmed|310|blur|320|min|keyCode|fn'.split('|'),0,{}))
diff --git a/js/jquery.form.js b/js/jquery.form.js
deleted file mode 100644
index cb8b5a6609..0000000000
--- a/js/jquery.form.js
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * jQuery Form Plugin
- * version: 2.17 (06-NOV-2008)
- * @requires jQuery v1.2.2 or later
- *
- * Examples and documentation at: http://malsup.com/jquery/form/
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id$
- */
-;(function($) {
-
-/*
-    Usage Note:  
-    -----------
-    Do not use both ajaxSubmit and ajaxForm on the same form.  These
-    functions are intended to be exclusive.  Use ajaxSubmit if you want
-    to bind your own submit handler to the form.  For example,
-
-    $(document).ready(function() {
-        $('#myForm').bind('submit', function() {
-            $(this).ajaxSubmit({
-                target: '#output'
-            });
-            return false; // <-- important!
-        });
-    });
-
-    Use ajaxForm when you want the plugin to manage all the event binding
-    for you.  For example,
-
-    $(document).ready(function() {
-        $('#myForm').ajaxForm({
-            target: '#output'
-        });
-    });
-        
-    When using ajaxForm, the ajaxSubmit function will be invoked for you
-    at the appropriate time.  
-*/
-
-/**
- * ajaxSubmit() provides a mechanism for immediately submitting 
- * an HTML form using AJAX.
- */
-$.fn.ajaxSubmit = function(options) {
-    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
-    if (!this.length) {
-        log('ajaxSubmit: skipping submit process - no element selected');
-        return this;
-    }
-
-    if (typeof options == 'function')
-        options = { success: options };
-
-    options = $.extend({
-        url:  this.attr('action') || window.location.toString(),
-        type: this.attr('method') || 'GET'
-    }, options || {});
-
-    // hook for manipulating the form data before it is extracted;
-    // convenient for use with rich editors like tinyMCE or FCKEditor
-    var veto = {};
-    this.trigger('form-pre-serialize', [this, options, veto]);
-    if (veto.veto) {
-        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
-        return this;
-    }
-
-    // provide opportunity to alter form data before it is serialized
-    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
-        log('ajaxSubmit: submit aborted via beforeSerialize callback');
-        return this;
-    }    
-   
-    var a = this.formToArray(options.semantic);
-    if (options.data) {
-        options.extraData = options.data;
-        for (var n in options.data) {
-          if(options.data[n] instanceof Array) {
-            for (var k in options.data[n])
-              a.push( { name: n, value: options.data[n][k] } )
-          }  
-          else
-             a.push( { name: n, value: options.data[n] } );
-        }
-    }
-
-    // give pre-submit callback an opportunity to abort the submit
-    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
-        log('ajaxSubmit: submit aborted via beforeSubmit callback');
-        return this;
-    }    
-
-    // fire vetoable 'validate' event
-    this.trigger('form-submit-validate', [a, this, options, veto]);
-    if (veto.veto) {
-        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
-        return this;
-    }    
-
-    var q = $.param(a);
-
-    if (options.type.toUpperCase() == 'GET') {
-        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
-        options.data = null;  // data is null for 'get'
-    }
-    else
-        options.data = q; // data is the query string for 'post'
-
-    var $form = this, callbacks = [];
-    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
-    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
-
-    // perform a load on the target only if dataType is not provided
-    if (!options.dataType && options.target) {
-        var oldSuccess = options.success || function(){};
-        callbacks.push(function(data) {
-            $(options.target).html(data).each(oldSuccess, arguments);
-        });
-    }
-    else if (options.success)
-        callbacks.push(options.success);
-
-    options.success = function(data, status) {
-        for (var i=0, max=callbacks.length; i < max; i++)
-            callbacks[i].apply(options, [data, status, $form]);
-    };
-
-    // are there files to upload?
-    var files = $('input:file', this).fieldValue();
-    var found = false;
-    for (var j=0; j < files.length; j++)
-        if (files[j])
-            found = true;
-
-    // options.iframe allows user to force iframe mode
-   if (options.iframe || found) { 
-       // hack to fix Safari hang (thanks to Tim Molendijk for this)
-       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
-       if ($.browser.safari && options.closeKeepAlive)
-           $.get(options.closeKeepAlive, fileUpload);
-       else
-           fileUpload();
-       }
-   else
-       $.ajax(options);
-
-    // fire 'notify' event
-    this.trigger('form-submit-notify', [this, options]);
-    return this;
-
-
-    // private function for handling file uploads (hat tip to YAHOO!)
-    function fileUpload() {
-        var form = $form[0];
-        
-        if ($(':input[@name=submit]', form).length) {
-            alert('Error: Form elements must not be named "submit".');
-            return;
-        }
-        
-        var opts = $.extend({}, $.ajaxSettings, options);
-		var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
-
-        var id = 'jqFormIO' + (new Date().getTime());
-        var $io = $('<iframe id="' + id + '" name="' + id + '" />');
-        var io = $io[0];
-
-        if ($.browser.msie || $.browser.opera) 
-            io.src = 'javascript:false;document.write("");';
-        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
-
-        var xhr = { // mock object
-            aborted: 0,
-            responseText: null,
-            responseXML: null,
-            status: 0,
-            statusText: 'n/a',
-            getAllResponseHeaders: function() {},
-            getResponseHeader: function() {},
-            setRequestHeader: function() {},
-            abort: function() { 
-                this.aborted = 1; 
-                $io.attr('src','about:blank'); // abort op in progress
-            }
-        };
-
-        var g = opts.global;
-        // trigger ajax global events so that activity/block indicators work like normal
-        if (g && ! $.active++) $.event.trigger("ajaxStart");
-        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
-
-		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
-			s.global && jQuery.active--;
-			return;
-        }
-        if (xhr.aborted)
-            return;
-        
-        var cbInvoked = 0;
-        var timedOut = 0;
-
-        // add submitting element to data if we know it
-        var sub = form.clk;
-        if (sub) {
-            var n = sub.name;
-            if (n && !sub.disabled) {
-                options.extraData = options.extraData || {};
-                options.extraData[n] = sub.value;
-                if (sub.type == "image") {
-                    options.extraData[name+'.x'] = form.clk_x;
-                    options.extraData[name+'.y'] = form.clk_y;
-                }
-            }
-        }
-
-        // take a breath so that pending repaints get some cpu time before the upload starts
-        setTimeout(function() {
-            // make sure form attrs are set
-            var t = $form.attr('target'), a = $form.attr('action');
-            $form.attr({
-                target:   id,
-                method:   'POST',
-                action:   opts.url
-            });
-            
-            // ie borks in some cases when setting encoding
-            if (! options.skipEncodingOverride) {
-                $form.attr({
-                    encoding: 'multipart/form-data',
-                    enctype:  'multipart/form-data'
-                });
-            }
-
-            // support timout
-            if (opts.timeout)
-                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
-
-            // add "extra" data to form if provided in options
-            var extraInputs = [];
-            try {
-                if (options.extraData)
-                    for (var n in options.extraData)
-                        extraInputs.push(
-                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
-                                .appendTo(form)[0]);
-            
-                // add iframe to doc and submit the form
-                $io.appendTo('body');
-                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
-                form.submit();
-            }
-            finally {
-                // reset attrs and remove "extra" input elements
-                $form.attr('action', a);
-                t ? $form.attr('target', t) : $form.removeAttr('target');
-                $(extraInputs).remove();
-            }
-        }, 10);
-
-        function cb() {
-            if (cbInvoked++) return;
-            
-            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
-
-            var operaHack = 0;
-            var ok = true;
-            try {
-                if (timedOut) throw 'timeout';
-                // extract the server response from the iframe
-                var data, doc;
-
-                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
-                
-                if (doc.body == null && !operaHack && $.browser.opera) {
-                    // In Opera 9.2.x the iframe DOM is not always traversable when
-                    // the onload callback fires so we give Opera 100ms to right itself
-                    operaHack = 1;
-                    cbInvoked--;
-                    setTimeout(cb, 100);
-                    return;
-                }
-                
-                xhr.responseText = doc.body ? doc.body.innerHTML : null;
-                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
-                xhr.getResponseHeader = function(header){
-                    var headers = {'content-type': opts.dataType};
-                    return headers[header];
-                };
-
-                if (opts.dataType == 'json' || opts.dataType == 'script') {
-                    var ta = doc.getElementsByTagName('textarea')[0];
-                    xhr.responseText = ta ? ta.value : xhr.responseText;
-                }
-                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
-                    xhr.responseXML = toXml(xhr.responseText);
-                }
-                data = $.httpData(xhr, opts.dataType);
-            }
-            catch(e){
-                ok = false;
-                $.handleError(opts, xhr, 'error', e);
-            }
-
-            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
-            if (ok) {
-                opts.success(data, 'success');
-                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
-            }
-            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
-            if (g && ! --$.active) $.event.trigger("ajaxStop");
-            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
-
-            // clean up
-            setTimeout(function() {
-                $io.remove();
-                xhr.responseXML = null;
-            }, 100);
-        };
-
-        function toXml(s, doc) {
-            if (window.ActiveXObject) {
-                doc = new ActiveXObject('Microsoft.XMLDOM');
-                doc.async = 'false';
-                doc.loadXML(s);
-            }
-            else
-                doc = (new DOMParser()).parseFromString(s, 'text/xml');
-            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
-        };
-    };
-};
-
-/**
- * ajaxForm() provides a mechanism for fully automating form submission.
- *
- * The advantages of using this method instead of ajaxSubmit() are:
- *
- * 1: This method will include coordinates for <input type="image" /> elements (if the element
- *    is used to submit the form).
- * 2. This method will include the submit element's name/value data (for the element that was
- *    used to submit the form).
- * 3. This method binds the submit() method to the form for you.
- *
- * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
- * passes the options argument along after properly binding events for submit elements and
- * the form itself.
- */ 
-$.fn.ajaxForm = function(options) {
-    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
-        $(this).ajaxSubmit(options);
-        return false;
-    }).each(function() {
-        // store options in hash
-        $(":submit,input:image", this).bind('click.form-plugin',function(e) {
-            var form = this.form;
-            form.clk = this;
-            if (this.type == 'image') {
-                if (e.offsetX != undefined) {
-                    form.clk_x = e.offsetX;
-                    form.clk_y = e.offsetY;
-                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
-                    var offset = $(this).offset();
-                    form.clk_x = e.pageX - offset.left;
-                    form.clk_y = e.pageY - offset.top;
-                } else {
-                    form.clk_x = e.pageX - this.offsetLeft;
-                    form.clk_y = e.pageY - this.offsetTop;
-                }
-            }
-            // clear form vars
-            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
-        });
-    });
-};
-
-// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
-$.fn.ajaxFormUnbind = function() {
-    this.unbind('submit.form-plugin');
-    return this.each(function() {
-        $(":submit,input:image", this).unbind('click.form-plugin');
-    });
-
-};
-
-/**
- * formToArray() gathers form element data into an array of objects that can
- * be passed to any of the following ajax functions: $.get, $.post, or load.
- * Each object in the array has both a 'name' and 'value' property.  An example of
- * an array for a simple login form might be:
- *
- * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
- *
- * It is this array that is passed to pre-submit callback functions provided to the
- * ajaxSubmit() and ajaxForm() methods.
- */
-$.fn.formToArray = function(semantic) {
-    var a = [];
-    if (this.length == 0) return a;
-
-    var form = this[0];
-    var els = semantic ? form.getElementsByTagName('*') : form.elements;
-    if (!els) return a;
-    for(var i=0, max=els.length; i < max; i++) {
-        var el = els[i];
-        var n = el.name;
-        if (!n) continue;
-
-        if (semantic && form.clk && el.type == "image") {
-            // handle image inputs on the fly when semantic == true
-            if(!el.disabled && form.clk == el)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-            continue;
-        }
-
-        var v = $.fieldValue(el, true);
-        if (v && v.constructor == Array) {
-            for(var j=0, jmax=v.length; j < jmax; j++)
-                a.push({name: n, value: v[j]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: n, value: v});
-    }
-
-    if (!semantic && form.clk) {
-        // input type=='image' are not found in elements array! handle them here
-        var inputs = form.getElementsByTagName("input");
-        for(var i=0, max=inputs.length; i < max; i++) {
-            var input = inputs[i];
-            var n = input.name;
-            if(n && !input.disabled && input.type == "image" && form.clk == input)
-                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
-        }
-    }
-    return a;
-};
-
-/**
- * Serializes form data into a 'submittable' string. This method will return a string
- * in the format: name1=value1&amp;name2=value2
- */
-$.fn.formSerialize = function(semantic) {
-    //hand off to jQuery.param for proper encoding
-    return $.param(this.formToArray(semantic));
-};
-
-/**
- * Serializes all field elements in the jQuery object into a query string.
- * This method will return a string in the format: name1=value1&amp;name2=value2
- */
-$.fn.fieldSerialize = function(successful) {
-    var a = [];
-    this.each(function() {
-        var n = this.name;
-        if (!n) return;
-        var v = $.fieldValue(this, successful);
-        if (v && v.constructor == Array) {
-            for (var i=0,max=v.length; i < max; i++)
-                a.push({name: n, value: v[i]});
-        }
-        else if (v !== null && typeof v != 'undefined')
-            a.push({name: this.name, value: v});
-    });
-    //hand off to jQuery.param for proper encoding
-    return $.param(a);
-};
-
-/**
- * Returns the value(s) of the element in the matched set.  For example, consider the following form:
- *
- *  <form><fieldset>
- *      <input name="A" type="text" />
- *      <input name="A" type="text" />
- *      <input name="B" type="checkbox" value="B1" />
- *      <input name="B" type="checkbox" value="B2"/>
- *      <input name="C" type="radio" value="C1" />
- *      <input name="C" type="radio" value="C2" />
- *  </fieldset></form>
- *
- *  var v = $(':text').fieldValue();
- *  // if no values are entered into the text inputs
- *  v == ['','']
- *  // if values entered into the text inputs are 'foo' and 'bar'
- *  v == ['foo','bar']
- *
- *  var v = $(':checkbox').fieldValue();
- *  // if neither checkbox is checked
- *  v === undefined
- *  // if both checkboxes are checked
- *  v == ['B1', 'B2']
- *
- *  var v = $(':radio').fieldValue();
- *  // if neither radio is checked
- *  v === undefined
- *  // if first radio is checked
- *  v == ['C1']
- *
- * The successful argument controls whether or not the field element must be 'successful'
- * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
- * The default value of the successful argument is true.  If this value is false the value(s)
- * for each element is returned.
- *
- * Note: This method *always* returns an array.  If no valid value can be determined the
- *       array will be empty, otherwise it will contain one or more values.
- */
-$.fn.fieldValue = function(successful) {
-    for (var val=[], i=0, max=this.length; i < max; i++) {
-        var el = this[i];
-        var v = $.fieldValue(el, successful);
-        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
-            continue;
-        v.constructor == Array ? $.merge(val, v) : val.push(v);
-    }
-    return val;
-};
-
-/**
- * Returns the value of the field element.
- */
-$.fieldValue = function(el, successful) {
-    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
-    if (typeof successful == 'undefined') successful = true;
-
-    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
-        (t == 'checkbox' || t == 'radio') && !el.checked ||
-        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
-        tag == 'select' && el.selectedIndex == -1))
-            return null;
-
-    if (tag == 'select') {
-        var index = el.selectedIndex;
-        if (index < 0) return null;
-        var a = [], ops = el.options;
-        var one = (t == 'select-one');
-        var max = (one ? index+1 : ops.length);
-        for(var i=(one ? index : 0); i < max; i++) {
-            var op = ops[i];
-            if (op.selected) {
-                // extra pain for IE...
-                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
-                if (one) return v;
-                a.push(v);
-            }
-        }
-        return a;
-    }
-    return el.value;
-};
-
-/**
- * Clears the form data.  Takes the following actions on the form's input fields:
- *  - input text fields will have their 'value' property set to the empty string
- *  - select elements will have their 'selectedIndex' property set to -1
- *  - checkbox and radio inputs will have their 'checked' property set to false
- *  - inputs of type submit, button, reset, and hidden will *not* be effected
- *  - button elements will *not* be effected
- */
-$.fn.clearForm = function() {
-    return this.each(function() {
-        $('input,select,textarea', this).clearFields();
-    });
-};
-
-/**
- * Clears the selected form elements.
- */
-$.fn.clearFields = $.fn.clearInputs = function() {
-    return this.each(function() {
-        var t = this.type, tag = this.tagName.toLowerCase();
-        if (t == 'text' || t == 'password' || tag == 'textarea')
-            this.value = '';
-        else if (t == 'checkbox' || t == 'radio')
-            this.checked = false;
-        else if (tag == 'select')
-            this.selectedIndex = -1;
-    });
-};
-
-/**
- * Resets the form data.  Causes all form elements to be reset to their original value.
- */
-$.fn.resetForm = function() {
-    return this.each(function() {
-        // guard against an input with the name of 'reset'
-        // note that IE reports the reset function as an 'object'
-        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
-            this.reset();
-    });
-};
-
-/**
- * Enables or disables any matching elements.
- */
-$.fn.enable = function(b) { 
-    if (b == undefined) b = true;
-    return this.each(function() { 
-        this.disabled = !b 
-    });
-};
-
-/**
- * Checks/unchecks any matching checkboxes or radio buttons and
- * selects/deselects and matching option elements.
- */
-$.fn.selected = function(select) {
-    if (select == undefined) select = true;
-    return this.each(function() { 
-        var t = this.type;
-        if (t == 'checkbox' || t == 'radio')
-            this.checked = select;
-        else if (this.tagName.toLowerCase() == 'option') {
-            var $sel = $(this).parent('select');
-            if (select && $sel[0] && $sel[0].type == 'select-one') {
-                // deselect all other options
-                $sel.find('option').selected(false);
-            }
-            this.selected = select;
-        }
-    });
-};
-
-// helper fn for console logging
-// set $.fn.ajaxSubmit.debug to true to enable debug logging
-function log() {
-    if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
-        window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
-};
-
-})(jQuery);
diff --git a/js/xbImportNode.js b/js/xbImportNode.js
deleted file mode 100644
index 1da6bae69a..0000000000
--- a/js/xbImportNode.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/* is this stuff defined? */
-if (!document.ELEMENT_NODE) {
-	document.ELEMENT_NODE = 1;
-	document.ATTRIBUTE_NODE = 2;
-	document.TEXT_NODE = 3;
-	document.CDATA_SECTION_NODE = 4;
-	document.ENTITY_REFERENCE_NODE = 5;
-	document.ENTITY_NODE = 6;
-	document.PROCESSING_INSTRUCTION_NODE = 7;
-	document.COMMENT_NODE = 8;
-	document.DOCUMENT_NODE = 9;
-	document.DOCUMENT_TYPE_NODE = 10;
-	document.DOCUMENT_FRAGMENT_NODE = 11;
-	document.NOTATION_NODE = 12;
-}
-
-document._importNode = function(node, allChildren) {
-	/* find the node type to import */
-	switch (node.nodeType) {
-		case document.ELEMENT_NODE:
-			/* create a new element */
-			var newNode = document.createElement(node.nodeName);
-			/* does the node have any attributes to add? */
-			if (node.attributes && node.attributes.length > 0)
-				/* add all of the attributes */
-				for (var i = 0, il = node.attributes.length; i < il;) {
-					if (node.attributes[i].nodeName == 'class') {
-						newNode.className = node.getAttribute(node.attributes[i++].nodeName);
-					} else {
-						newNode.setAttribute(node.attributes[i].nodeName, node.getAttribute(node.attributes[i++].nodeName));
-					}
-				}
-			/* are we going after children too, and does the node have any? */
-			if (allChildren && node.childNodes && node.childNodes.length > 0)
-				/* recursively get all of the child nodes */
-				for (var i = 0, il = node.childNodes.length; i < il;)
-					newNode.appendChild(document._importNode(node.childNodes[i++], allChildren));
-			return newNode;
-			break;
-		case document.TEXT_NODE:
-		case document.CDATA_SECTION_NODE:
-		case document.COMMENT_NODE:
-			return document.createTextNode(node.nodeValue);
-			break;
-	}
-};

From 442dcfde0e998e7bc2936a28805629951208ce38 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:03:06 +0000
Subject: [PATCH 035/256] showAuthor() minor update. Using a single anchor to
 wrap both avatar and nickname instead of two anchors.

---
 lib/noticelist.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 71db067d08..45d4abb293 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -191,7 +191,8 @@ class NoticeListItem
     function showStart()
     {
         // XXX: RDFa
-        common_element_start('li', array('class' => 'notice_single hentry',
+        // TODO: add notice_type class e.g., notice_video, notice_image
+        common_element_start('li', array('class' => 'hentry notice',
                                          'id' => 'notice-' . $this->notice->id));
     }
 
@@ -224,8 +225,11 @@ class NoticeListItem
     function showAuthor()
     {
         common_element_start('span', 'vcard author');
+        common_element_start('a', array('href' => $this->profile->profileurl),
+                                        'class' => 'url');
         $this->showAvatar();
         $this->showNickname();
+        common_element_end('a');
         common_element_end('span');
     }
 
@@ -241,18 +245,17 @@ class NoticeListItem
     function showAvatar()
     {
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-        common_element_start('a', array('href' => $this->profile->profileurl));
+
         common_element('img', array('src' => ($avatar) ?
                                     common_avatar_display_url($avatar) :
                                     common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar stream photo',
+                                    'class' => 'avatar photo',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ?
                                     $this->profile->fullname :
                                     $this->profile->nickname));
-        common_element_end('a');
     }
 
     /**
@@ -265,8 +268,7 @@ class NoticeListItem
 
     function showNickname()
     {
-        common_element('a', array('href' => $this->profile->profileurl,
-                                  'class' => 'nickname fn url'),
+        common_element('span', array('class' => 'nickname fn'),
                        $this->profile->nickname);
     }
 

From 46b1e2fcec9ff084496a4ac11a65c1673f92e1f0 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:21:59 +0000
Subject: [PATCH 036/256] showReplyTo() update

---
 lib/noticelist.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 45d4abb293..0fe967da38 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -389,11 +389,15 @@ class NoticeListItem
         if ($this->notice->reply_to) {
             $replyurl = common_local_url('shownotice',
                                          array('notice' => $this->notice->reply_to));
-            common_text(' (');
-            common_element('a', array('class' => 'inreplyto',
+            $this->elementStart('dl', 'response');
+            $this->element('dt', null, _('To'));
+            $this->elementStart('dd');
+            $this->element('a', array('class' => 'inreplyto',
                                       'href' => $replyurl),
-                           _('in reply to...'));
-            common_text(')');
+                                      'rel' => 'in-reply-to',
+                           _('in reply to'));
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
     }
 

From 35645308dc76527f6c0087887e693869f53f7f0b Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:30:06 +0000
Subject: [PATCH 037/256] Updated: showNoticeSource() showReplyTo()

---
 lib/noticelist.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 0fe967da38..b4ea4d41cd 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -225,8 +225,8 @@ class NoticeListItem
     function showAuthor()
     {
         common_element_start('span', 'vcard author');
-        common_element_start('a', array('href' => $this->profile->profileurl),
-                                        'class' => 'url');
+        common_element_start('a', array('href' => $this->profile->profileurl,
+                                        'class' => 'url'));
         $this->showAvatar();
         $this->showNickname();
         common_element_end('a');
@@ -352,7 +352,8 @@ class NoticeListItem
     function showNoticeSource()
     {
         if ($this->notice->source) {
-            common_element('span', null, _(' from '));
+            $this->elementStart('dl', 'device');
+            $this->element('dt', null, _('From'));
             $source_name = _($this->notice->source);
             switch ($this->notice->source) {
             case 'web':
@@ -360,18 +361,22 @@ class NoticeListItem
             case 'mail':
             case 'omb':
             case 'api':
-                common_element('span', 'noticesource', $source_name);
+                $this->element('dd', 'noticesource', $source_name);
                 break;
             default:
                 $ns = Notice_source::staticGet($this->notice->source);
                 if ($ns) {
-                    common_element('a', array('href' => $ns->url),
+                    $this->elementStart('dd', null);
+                    $this->element('a', array('href' => $ns->url,
+                                              'rel' => 'external'),
                                    $ns->name);
+                    $this->elementEnd('dd');
                 } else {
-                    common_element('span', 'noticesource', $source_name);
+                    $this->element('dd', 'noticesource', $source_name);
                 }
                 break;
             }
+            $this->elementEnd('dl');
         }
     }
 
@@ -393,8 +398,8 @@ class NoticeListItem
             $this->element('dt', null, _('To'));
             $this->elementStart('dd');
             $this->element('a', array('class' => 'inreplyto',
-                                      'href' => $replyurl),
-                                      'rel' => 'in-reply-to',
+                                      'href' => $replyurl,
+                                      'rel' => 'in-reply-to'),
                            _('in reply to'));
             $this->elementEnd('dd');
             $this->elementEnd('dl');

From c50a6bc52351454a77a99f3005a8f6fd404bb3a5 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:36:17 +0000
Subject: [PATCH 038/256] Updated: showNoticeLink()

---
 lib/noticelist.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index b4ea4d41cd..26aa7ed33e 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -330,14 +330,18 @@ class NoticeListItem
             preg_match('/^http/', $this->notice->uri)) {
             $noticeurl = $this->notice->uri;
         }
-        common_element_start('a', array('class' => 'permalink',
-                                        'rel' => 'bookmark',
+        $this->elementStart('dl', 'timestamp');
+        $this->element('dt', _('Published')); 
+        $this->elementStart('dd', null);
+        $this->element('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
         $dt = common_date_iso8601($this->notice->created);
-        common_element('abbr', array('class' => 'published',
+        $this->element('abbr', array('class' => 'published',
                                      'title' => $dt),
                        common_date_string($this->notice->created));
-        common_element_end('a');
+        $this->elementEnd('a');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     /**
@@ -397,8 +401,7 @@ class NoticeListItem
             $this->elementStart('dl', 'response');
             $this->element('dt', null, _('To'));
             $this->elementStart('dd');
-            $this->element('a', array('class' => 'inreplyto',
-                                      'href' => $replyurl,
+            $this->element('a', array('href' => $replyurl,
                                       'rel' => 'in-reply-to'),
                            _('in reply to'));
             $this->elementEnd('dd');

From 1b66ac64b79326a55ca987e8bcc35d552c9a0be9 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:54:16 +0000
Subject: [PATCH 039/256] Refactored show() into showNotice(),
 showNoticeInfo(), showNoticeOptions(). Kept the existing naming convention
 for the rest of the methods the same for now.

---
 lib/noticelist.php | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 26aa7ed33e..fe5a6eb8a7 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -169,17 +169,36 @@ class NoticeListItem
     function show()
     {
         $this->showStart();
-        $this->showFaveForm();
+        $this->showNotice();
+        $this->showNoticeInfo();
+        $this->showNoticeOptions();
+        $this->showEnd();
+    }
+
+    function showNotice()
+    {
+        $this->elementStart('div', 'entry-title');
         $this->showAuthor();
-        $this->showContent();
-        $this->startTimeSection();
+        $this->showNoticeContent();
+        $this->elementEnd('div');
+    }
+
+    function showNoticeInfo()
+    {
+        $this->elementStart('div', 'entry-content');
         $this->showNoticeLink();
         $this->showNoticeSource();
         $this->showReplyTo();
+        $this->elementEnd('div');
+    }
+
+    function showNoticeOptions()
+    {
+        $this->elementStart('div', 'notice-options');
+        $this->showFaveForm();
         $this->showReplyLink();
         $this->showDeleteLink();
-        $this->endTimeSection();
-        $this->showEnd();
+        $this->elementEnd('div');
     }
 
     /**

From 901b2acc9f3a9718e3707d69743c26178aff9e8a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 00:57:01 +0000
Subject: [PATCH 040/256] Resaved.

---
 lib/noticelist.php | 43 +++++++++----------------------------------
 1 file changed, 9 insertions(+), 34 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index fe5a6eb8a7..be3128b4b6 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -179,7 +179,7 @@ class NoticeListItem
     {
         $this->elementStart('div', 'entry-title');
         $this->showAuthor();
-        $this->showNoticeContent();
+        $this->showContent();
         $this->elementEnd('div');
     }
 
@@ -201,6 +201,7 @@ class NoticeListItem
         $this->elementEnd('div');
     }
 
+
     /**
      * start a single notice.
      *
@@ -243,13 +244,13 @@ class NoticeListItem
 
     function showAuthor()
     {
-        common_element_start('span', 'vcard author');
-        common_element_start('a', array('href' => $this->profile->profileurl,
+        $this->elementStart('span', 'vcard author');
+        $this->elementStart('a', array('href' => $this->profile->profileurl,
                                         'class' => 'url'));
         $this->showAvatar();
         $this->showNickname();
-        common_element_end('a');
-        common_element_end('span');
+        $this->elementEnd('a');
+        $this->elementEnd('span');
     }
 
     /**
@@ -265,7 +266,7 @@ class NoticeListItem
     {
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
 
-        common_element('img', array('src' => ($avatar) ?
+        $this->element('img', array('src' => ($avatar) ?
                                     common_avatar_display_url($avatar) :
                                     common_default_avatar(AVATAR_STREAM_SIZE),
                                     'class' => 'avatar photo',
@@ -287,7 +288,7 @@ class NoticeListItem
 
     function showNickname()
     {
-        common_element('span', array('class' => 'nickname fn'),
+        $this->element('span', array('class' => 'nickname fn'),
                        $this->profile->nickname);
     }
 
@@ -304,7 +305,7 @@ class NoticeListItem
     function showContent()
     {
         // FIXME: URL, image, video, audio
-        common_element_start('p', array('class' => 'content entry-title'));
+        common_element_start('p', array('class' => 'entry-content'));
         if ($this->notice->rendered) {
             common_raw($this->notice->rendered);
         } else {
@@ -316,21 +317,6 @@ class NoticeListItem
         common_element_end('p');
     }
 
-    /**
-     * show the "time" section of a notice
-     *
-     * This is the greyed-out section that appears beneath the content, including
-     * links to delete or reply to the notice. Probably should be called something
-     * else.
-     *
-     * @return void
-     */
-
-    function startTimeSection()
-    {
-        common_element_start('p', 'time');
-    }
-
     /**
      * show the link to the main page for the notice
      *
@@ -474,17 +460,6 @@ class NoticeListItem
         }
     }
 
-    /**
-     * end the time section
-     *
-     * @return void
-     */
-
-    function endTimeSection()
-    {
-        common_element_end('p');
-    }
-
     /**
      * finish the notice
      *

From 47f694582c8bb668ad711182bc7124fe2db0f339 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 03:32:07 +0000
Subject: [PATCH 041/256] Updated formData(), formActions(), show()

Added formLegend()
---
 lib/form.php       | 17 +++++++++++++++
 lib/noticeform.php | 53 +++++++++++++++++++++++++++++++++++-----------
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/lib/form.php b/lib/form.php
index ba1790faa4..5c75bb65fa 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -67,9 +67,12 @@ class Form extends Widget
                                  array('id' => $this->id(),
                                        'method' => 'POST',
                                        'action' => $this->action()));
+        $this->out->elementStart('fieldset');
+        $this->formLegend();
         $this->sessionToken();
         $this->formData();
         $this->formActions();
+        $this->out->elementEnd('fieldset');
         $this->out->elementEnd('form');
     }
 
@@ -84,6 +87,20 @@ class Form extends Widget
         $this->out->hidden('token', common_session_token());
     }
 
+
+    /**
+     * Name of the form
+     *
+     * Sub-classes should overload this with the name of their form.
+     *
+     * @return void
+     */
+
+    function formLegend()
+    {
+    }
+
+
     /**
      * Visible or invisible data elements
      *
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0e46e0e58f..0a4f486db2 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -87,7 +87,7 @@ class NoticeForm extends Form
 
     function id()
     {
-        return 'status_form';
+        return 'form_notice';
     }
 
     /**
@@ -101,6 +101,18 @@ class NoticeForm extends Form
         return common_local_url('newnotice');
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Send a notice'));
+    }
+
+
     /**
      * Data elements
      *
@@ -111,21 +123,33 @@ class NoticeForm extends Form
     {
         $user = common_current_user();
 
-        $this->out->element('label', array('for' => 'status_textarea',
-                                           'id' => 'status_label'),
+        $this->out->elementStart('ul', 'form_datas');
+        $this->out->elementStart('li', array('id' => 'notice_text'));
+        $this->out->element('label', array('for' => 'notice_data-text'),
                             sprintf(_('What\'s up, %s?'), $user->nickname));
         // XXX: vary by defined max size
-        $this->out->element('span', array('id' => 'counter',
-                                          'class' => 'counter'),
-                            '140');
-        $this->out->element('textarea', array('id' => 'status_textarea',
-                                              'cols' => 60,
-                                              'rows' => 3,
+        $this->out->element('textarea', array('id' => 'notice_data-text',
+                                              'cols' => 35,
+                                              'rows' => 4,
                                               'name' => 'status_textarea'),
                             ($this->content) ? $this->content : '');
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
+
+        $this->out->elementStart('dl', 'form_note');
+        $this->out->element('dt', null, _('Available characters'));
+        $this->out->element('dd', array('id' => 'notice_text-count'),
+                            '140');
+        $this->out->elementEnd('dl');
+
         if ($this->action) {
-            $this->out->hidden('returnto', $this->action);
+        // FIXME: or VERIFY that notice_return-to doesn't break anything. Changed from 'returnto'
+            $this->out->hidden('notice_return-to', $this->action);
         }
+
+        // FIXME: Does this need to be checked like returnto?
+        $this->out->hidden('notice_in-reply-to', $this->action);
+
     }
 
     /**
@@ -136,9 +160,14 @@ class NoticeForm extends Form
 
     function formActions()
     {
-        $this->out->element('input', array('id' => 'status_submit',
+        $this->out->elementStart('ul', 'form_actions');
+        $this->out->elementStart('li', array('id' => 'notice_submit'));
+        $this->out->element('input', array('id' => 'notice_action-submit',
+                                           'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
                                            'value' => _('Send')));
+        $this->out->elementEnd('li');
+        $this->out->elementEnd('ul');
     }
-}
\ No newline at end of file
+}

From ff901332d2a64766472921d3d3742dc913540508 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:21:47 -0500
Subject: [PATCH 042/256] Fix the constructor for Action

Also, fix the startXML() method
---
 lib/action.php        | 15 ++++++++++++++-
 lib/htmloutputter.php |  2 --
 lib/xmloutputter.php  |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 8694bf47c0..4aff4264d9 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -58,8 +58,21 @@ class Action extends HTMLOutputter // lawsuit
 {
     var $args;
 
-    function Action()
+    /**
+     * Constructor
+     *
+     * Just wraps the HTMLOutputter constructor.
+     *
+     * @param string  $output URI to output to, default = stdout
+     * @param boolean $indent Whether to indent output, default true
+     *
+     * @see XMLOutputter::__construct
+     * @see HTMLOutputter::__construct
+     */
+
+    function __construct($output='php://output', $indent=true)
     {
+        parent::__construct($output, $indent);
     }
 
     // For initializing members of the class
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 43e4a59a98..75a995bef1 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -122,7 +122,6 @@ class HTMLOutputter extends XMLOutputter
                                           'lang' => $language));
     }
 
-
     /**
     *  Ends an HTML document
     *
@@ -134,7 +133,6 @@ class HTMLOutputter extends XMLOutputter
         $this->endXML();
     }
 
-
     /**
      * Output an HTML text input element
      *
diff --git a/lib/xmloutputter.php b/lib/xmloutputter.php
index 9ca0c91bd6..64935da408 100644
--- a/lib/xmloutputter.php
+++ b/lib/xmloutputter.php
@@ -72,7 +72,6 @@ class XMLOutputter
         $this->xw = new XMLWriter();
         $this->xw->openURI($output);
         $this->xw->setIndent($indent);
-        $this->xw->startDocument('1.0', 'UTF-8');
     }
 
     /**
@@ -87,6 +86,7 @@ class XMLOutputter
 
     function startXML($doc=null, $public=null, $system=null)
     {
+        $this->xw->startDocument('1.0', 'UTF-8');
         if ($doc) {
             $this->xw->writeDTD($doc, $public, $system);
         }

From c6d22e4cea3c875fd5ea1e10483fc28060887b4b Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 19:22:03 +0000
Subject: [PATCH 043/256] Extended formData()'s hidden to use a specific @id
 and @name

---
 lib/noticeform.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 0a4f486db2..9bc5e0d6a3 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -143,12 +143,10 @@ class NoticeForm extends Form
         $this->out->elementEnd('dl');
 
         if ($this->action) {
-        // FIXME: or VERIFY that notice_return-to doesn't break anything. Changed from 'returnto'
-            $this->out->hidden('notice_return-to', $this->action);
+            $this->out->hidden('notice_return-to', $this->action, 'returnto');
         }
 
-        // FIXME: Does this need to be checked like returnto?
-        $this->out->hidden('notice_in-reply-to', $this->action);
+        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
 
     }
 

From 8ff6dc8e32678adc1b1df5fd59fa831aec08f12a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:23:28 -0500
Subject: [PATCH 044/256] startElement() -> elementStart() in Action

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 4aff4264d9..cab51e9ea8 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -94,7 +94,7 @@ class Action extends HTMLOutputter // lawsuit
     function showHead()
     {
         // XXX: attributes (profile?)
-        $this->startElement('head');
+        $this->elementStart('head');
         $this->showTitle();
         $this->showStylesheets();
         $this->showScripts();

From 4a2aebe5cfab4a4b0388f98b296eac66be6e3396 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 19:24:07 +0000
Subject: [PATCH 045/256] Minor: Including formData()'s inreplyto in action
 check

---
 lib/noticeform.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 9bc5e0d6a3..84817639a7 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -144,10 +144,8 @@ class NoticeForm extends Form
 
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');
+            $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
         }
-
-        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
-
     }
 
     /**

From 6a8be40a8cdce09cd994adc4ba3877cf15436128 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:24:54 -0500
Subject: [PATCH 046/256] elementElement() -> elementEnd() in Action

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index cab51e9ea8..30a3c8a031 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -102,7 +102,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->showFeeds();
         $this->showDescription();
         $this->extraHead();
-        $this->elementElement('head');
+        $this->elementEnd('head');
     }
 
     function showTitle()

From 565cbfbe7771f9491147bca13cec0d9cb5af7a64 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:28:26 -0500
Subject: [PATCH 047/256] Hit dataobject.ini

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index fb5d478fe8..0c0fde8010 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ _darcs/*
 config.php
 .htaccess
 *.tmproj
+dataobject.ini

From 3bb7ea79c023cc7260e456b6e1f17526494e5424 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 15 Jan 2009 11:29:45 -0800
Subject: [PATCH 048/256] Twitter bridge: verify creds was taking user ID from
 the status instead of the user object, and failing if user hadn't ever posted
 on Twitter.

---
 actions/twittersettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9e7e4cae89..62262e0211 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -354,7 +354,7 @@ class TwittersettingsAction extends SettingsAction
             return false;
         }
 
-         $twitter_id = $user->status->id;
+         $twitter_id = $user->id;
 
         if ($twitter_id) {
             return $twitter_id;

From 34d859c4a6708db0887983a7a9a2cf4c3e96f9cc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:31:03 -0500
Subject: [PATCH 049/256] Add a menuItem method to Action

---
 lib/action.php | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 30a3c8a031..7c919497ff 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -238,25 +238,25 @@ class Action extends HTMLOutputter // lawsuit
         $user = common_current_user();
         $this->elementStart('ul', array('id' => 'nav'));
         if ($user) {
-            common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
+            $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
                              _('Home'));
         }
-        common_menu_item(common_local_url('peoplesearch'), _('Search'));
+        $this->menuItem(common_local_url('peoplesearch'), _('Search'));
         if ($user) {
-            common_menu_item(common_local_url('profilesettings'),
+            $this->menuItem(common_local_url('profilesettings'),
                              _('Settings'));
-            common_menu_item(common_local_url('invite'),
+            $this->menuItem(common_local_url('invite'),
                              _('Invite'));
-            common_menu_item(common_local_url('logout'),
+            $this->menuItem(common_local_url('logout'),
                              _('Logout'));
         } else {
-            common_menu_item(common_local_url('login'), _('Login'));
+            $this->menuItem(common_local_url('login'), _('Login'));
             if (!common_config('site', 'closed')) {
-                common_menu_item(common_local_url('register'), _('Register'));
+                $this->menuItem(common_local_url('register'), _('Register'));
             }
-            common_menu_item(common_local_url('openidlogin'), _('OpenID'));
+            $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
         }
-        common_menu_item(common_local_url('doc', array('title' => 'help')),
+        $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->elementEnd('ul');
         $this->elementEnd('dl');
@@ -300,7 +300,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', null, _('Local views'));
         $this->elementStart('ul', array('id' => 'nav'));
         foreach ($menu as $menuaction => $menudesc) {
-            common_menu_item(common_local_url($menuaction,
+            $this->menuItem(common_local_url($menuaction,
                                               isset($menudesc[2]) ? $menudesc[2] : null),
                              $menudesc[0],
                              $menudesc[1],
@@ -377,17 +377,17 @@ class Action extends HTMLOutputter // lawsuit
     function showSecondaryNav()
     {
         $this->elementStart('ul', array('id' => 'nav_sub'));
-        common_menu_item(common_local_url('doc', array('title' => 'help')),
+        $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
-        common_menu_item(common_local_url('doc', array('title' => 'about')),
+        $this->menuItem(common_local_url('doc', array('title' => 'about')),
                          _('About'));
-        common_menu_item(common_local_url('doc', array('title' => 'faq')),
+        $this->menuItem(common_local_url('doc', array('title' => 'faq')),
                          _('FAQ'));
-        common_menu_item(common_local_url('doc', array('title' => 'privacy')),
+        $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
                          _('Privacy'));
-        common_menu_item(common_local_url('doc', array('title' => 'source')),
+        $this->menuItem(common_local_url('doc', array('title' => 'source')),
                          _('Source'));
-        common_menu_item(common_local_url('doc', array('title' => 'contact')),
+        $this->menuItem(common_local_url('doc', array('title' => 'contact')),
                          _('Contact'));
         $this->elementEnd('ul');
     }
@@ -546,7 +546,7 @@ class Action extends HTMLOutputter // lawsuit
         $action = $this->trimmed('action');
         $this->elementStart('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
-            common_menu_item(common_local_url($menuaction,
+            $this->menuItem(common_local_url($menuaction,
                                               isset($menudesc[2]) ? $menudesc[2] : null),
                              $menudesc[0],
                              $menudesc[1],
@@ -578,7 +578,8 @@ class Action extends HTMLOutputter // lawsuit
     }
 
     // Added @id to li for some control. We might want to move this to htmloutputter.php
-    function common_menu_item($id=null, $url, $text, $title=null, $is_selected=false)
+
+    function menuItem($id=null, $url, $text, $title=null, $is_selected=false)
     {
         $lattrs = array();
         if ($is_selected) {

From 51730719acd183631ca8e335cb5fb8887fd5ac46 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:31:18 -0500
Subject: [PATCH 050/256] Use menuItem(), extend Widget, and document

---
 lib/publicgroupnav.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index c95d9acba6..c858824963 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -32,6 +32,8 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/lib/widget.php';
+
 /**
  * Base class for all actions
  *
@@ -55,29 +57,42 @@ class PublicGroupNav
 {
     var $action = null;
 
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
     function __construct($action=null)
     {
+        parent::__construct($action);
         $this->action = $action;
     }
 
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
     function show()
     {
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        common_menu_item(common_local_url('public'), _('Public'),
+        $this->menuItem(common_local_url('public'), _('Public'),
             _('Public timeline'), $this->action == 'public');
 
-        common_menu_item(common_local_url('tag'), _('Recent tags'),
+        $this->menuItem(common_local_url('tag'), _('Recent tags'),
             _('Recent tags'), $this->action == 'tag');
 
         if (count(common_config('nickname', 'featured')) > 0) {
-            common_menu_item(common_local_url('featured'), _('Featured'),
+            $this->menuItem(common_local_url('featured'), _('Featured'),
                 _('Featured users'), $this->action == 'featured');
         }
 
-        common_menu_item(common_local_url('favorited'), _('Popular'),
+        $this->menuItem(common_local_url('favorited'), _('Popular'),
             _("Popular notices"), $this->action == 'favorited');
 
-        common_element_end('ul');
+        $this->action->elementEnd('ul');
     }
 }

From d8f9628a17d5739182fdab92bf9e5202310d89f5 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 19:33:45 +0000
Subject: [PATCH 051/256] Using a specific path for CSS files.

---
 lib/action.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 30a3c8a031..cc00699c4f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -124,15 +124,15 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => theme_path('display.css', 'base') . '?version=' . LACONICA_VERSION,
+                                     'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => theme_path('thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
+                                     'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => theme_path('display.css', null) . '?version=' . LACONICA_VERSION,
+                                     'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
         foreach (array(6,7) as $ver) {
             if (file_exists(theme_file('ie'.$ver.'.css'))) {

From 7e316abe92d6cabfe626e0fbe747e783e9752085 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:45:08 -0500
Subject: [PATCH 052/256] Move optional id param to end of function, where
 optional params actually go.

---
 lib/action.php | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 7c919497ff..634b3bfa36 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -290,25 +290,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementEnd('div');
     }
 
-    // SHOULD overload (perhaps this should be a MUST because sometimes it is not used)
+    // SHOULD overload
 
-    function showLocalNav($menu)
+    function showLocalNav()
     {
-        $action = $this->trimmed('action');
-
-        $this->elementStart('dl', array('id' => 'site_nav_local_views'));
-        $this->element('dt', null, _('Local views'));
-        $this->elementStart('ul', array('id' => 'nav'));
-        foreach ($menu as $menuaction => $menudesc) {
-            $this->menuItem(common_local_url($menuaction,
-                                              isset($menudesc[2]) ? $menudesc[2] : null),
-                             $menudesc[0],
-                             $menudesc[1],
-                             $action == $menuaction);
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
+        // does nothing by default
     }
 
     function showContentBlock()
@@ -577,9 +563,10 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content'));
     }
 
-    // Added @id to li for some control. We might want to move this to htmloutputter.php
+    // Added @id to li for some control.
+    // XXX: We might want to move this to htmloutputter.php
 
-    function menuItem($id=null, $url, $text, $title=null, $is_selected=false)
+    function menuItem($url, $text, $id=null, $title=null, $is_selected=false)
     {
         $lattrs = array();
         if ($is_selected) {

From 73c1390eb1b14e829b33e60bd370622fce32bec0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:56:40 -0500
Subject: [PATCH 053/256] Fix notice form in action

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 634b3bfa36..dd48cbc870 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/form.php';
+require_once INSTALLDIR.'/lib/noticeform.php';
 require_once INSTALLDIR.'/lib/htmloutputter.php';
 
 /**

From edf84cca041be956d8a8ac02d4542e9d835e42c9 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 20:10:20 +0000
Subject: [PATCH 054/256] showSiteNotice() was missing closing dl tag

---
 lib/action.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/action.php b/lib/action.php
index 9ba9f36fc0..5f6c600b13 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -271,6 +271,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dd', null);
         // Output a bunch of paragraphs here
         $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     // MAY overload if no notice form needed... or direct message box????

From 21c396202eaff538abb2f032c2a8686d880b89f9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 15:11:55 -0500
Subject: [PATCH 055/256] Add arg to NoticeForm constructor

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index dd48cbc870..4f0b0def1e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -277,7 +277,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showNoticeForm()
     {
-        $notice_form = new NoticeForm();
+        $notice_form = new NoticeForm($this);
         $notice_form->show();
     }
 

From b32a47807e7ed2dba86d76fe37d780e345f2b89a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:13:11 +0000
Subject: [PATCH 056/256] Include PublicGroupNav in publicaction

---
 actions/public.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/public.php b/actions/public.php
index e00f8efbaf..b13678bf0c 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -31,6 +31,8 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
+
 /**
  * Action for displaying the public stream
  *

From 1915a07fdadb57a675131a048c9829583f53cc79 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:14:32 +0000
Subject: [PATCH 057/256] Fix a couple of errors in PublicGroupNav

---
 lib/publicgroupnav.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index c858824963..abda8663e3 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -53,7 +53,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @see      HTMLOutputter
  */
 
-class PublicGroupNav
+class PublicGroupNav extends Widget
 {
     var $action = null;
 
@@ -79,18 +79,18 @@ class PublicGroupNav
     {
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        $this->menuItem(common_local_url('public'), _('Public'),
+        $this->out->menuItem(common_local_url('public'), _('Public'),
             _('Public timeline'), $this->action == 'public');
 
-        $this->menuItem(common_local_url('tag'), _('Recent tags'),
+        $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
             _('Recent tags'), $this->action == 'tag');
 
         if (count(common_config('nickname', 'featured')) > 0) {
-            $this->menuItem(common_local_url('featured'), _('Featured'),
+            $this->out->menuItem(common_local_url('featured'), _('Featured'),
                 _('Featured users'), $this->action == 'featured');
         }
 
-        $this->menuItem(common_local_url('favorited'), _('Popular'),
+        $this->out->menuItem(common_local_url('favorited'), _('Popular'),
             _("Popular notices"), $this->action == 'favorited');
 
         $this->action->elementEnd('ul');

From 7bb074898f0be7e606eeb9844adcba001c571b38 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 20:15:11 +0000
Subject: [PATCH 058/256] Up to date

---
 theme/base/css/display.css     | 3 ++-
 theme/identica/css/display.css | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5fc24779bb..8b2e2f801e 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -127,6 +127,7 @@ font-weight:bold;
 address {
 float:left;
 margin-bottom:18px;
+margin-left:18px;
 }
 address .fn,
 address .email {
@@ -316,7 +317,7 @@ padding:18px 4px 18px 18px;
 #form_notice {
 width:384px;
 float:left;
-margin-left:86px;
+margin-left:68px;
 position:relative;
 line-height:1;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 4659c7f2ae..f6a4747c74 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -83,16 +83,16 @@ background-repeat:no-repeat;
 background-position:0 45%;
 }
 #export_data li a.rss {
-background-image:url(../images/icons/icon_rss.jpg);
+background-image:url(../../base/images/icons/icon_rss.jpg);
 }
 #export_data li a.atom {
-background-image:url(../images/icons/icon_atom.jpg);
+background-image:url(../../base/images/icons/icon_atom.jpg);
 }
 #export_data li a.foaf {
-background-image:url(../images/icons/icon_foaf.gif);
+background-image:url(../../base/images/icons/icon_foaf.gif);
 =}
 #export_data li a.export_vcard {
-background-image:url(../images/icons/icon_vcard.gif);
+background-image:url(../../base/images/icons/icon_vcard.gif);
 }
 
 

From 082db2ad7d6005859bdb70b1b37d3945c49f03bd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:19:32 +0000
Subject: [PATCH 059/256] A little further with notice lists

---
 actions/public.php |   3 +-
 lib/noticelist.php | 108 +++++++++++++++++++++++----------------------
 2 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/actions/public.php b/actions/public.php
index b13678bf0c..76e922dff1 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -32,6 +32,7 @@ if (!defined('LACONICA')) {
 }
 
 require_once INSTALLDIR.'/lib/publicgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
 
 /**
  * Action for displaying the public stream
@@ -167,7 +168,7 @@ class PublicAction extends Action
             return;
         }
 
-        $nl = new NoticeList($notice);
+        $nl = new NoticeList($notice, $this);
 
         $cnt = $nl->show();
 
diff --git a/lib/noticelist.php b/lib/noticelist.php
index be3128b4b6..fb3e66f9fb 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -50,7 +50,7 @@ if (!defined('LACONICA')) {
  * @see      ProfileNoticeList
  */
 
-class NoticeList
+class NoticeList extends Widget
 {
     /** the current stream of notices being displayed. */
 
@@ -62,8 +62,9 @@ class NoticeList
      * @param Notice $notice stream of notices from DB_DataObject
      */
 
-    function __construct($notice)
+    function __construct($notice, $out=null)
     {
+	parent::__construct($out);
         $this->notice = $notice;
     }
 
@@ -78,7 +79,7 @@ class NoticeList
 
     function show()
     {
-        common_element_start('ul', array('id' => 'notices'));
+        $this->out->elementStart('ul', array('id' => 'notices'));
 
         $cnt = 0;
 
@@ -93,7 +94,7 @@ class NoticeList
             $item->show();
         }
 
-        common_element_end('ul');
+        $this->out->elementEnd('ul');
 
         return $cnt;
     }
@@ -111,7 +112,7 @@ class NoticeList
 
     function newListItem($notice)
     {
-        return new NoticeListItem($notice);
+        return new NoticeListItem($notice, $this->out);
     }
 }
 
@@ -133,7 +134,7 @@ class NoticeList
  * @see      ProfileNoticeListItem
  */
 
-class NoticeListItem
+class NoticeListItem extends Widget
 {
     /** The notice this item will show. */
 
@@ -151,8 +152,9 @@ class NoticeListItem
      * @param Notice $notice The notice we'll display
      */
 
-    function __construct($notice)
+    function __construct($notice, $out=null)
     {
+	parent::__construct($out);
         $this->notice  = $notice;
         $this->profile = $notice->getProfile();
     }
@@ -177,28 +179,28 @@ class NoticeListItem
 
     function showNotice()
     {
-        $this->elementStart('div', 'entry-title');
+        $this->out->elementStart('div', 'entry-title');
         $this->showAuthor();
         $this->showContent();
-        $this->elementEnd('div');
+        $this->out->elementEnd('div');
     }
 
     function showNoticeInfo()
     {
-        $this->elementStart('div', 'entry-content');
+        $this->out->elementStart('div', 'entry-content');
         $this->showNoticeLink();
         $this->showNoticeSource();
         $this->showReplyTo();
-        $this->elementEnd('div');
+        $this->out->elementEnd('div');
     }
 
     function showNoticeOptions()
     {
-        $this->elementStart('div', 'notice-options');
+        $this->out->elementStart('div', 'notice-options');
         $this->showFaveForm();
         $this->showReplyLink();
         $this->showDeleteLink();
-        $this->elementEnd('div');
+        $this->out->elementEnd('div');
     }
 
 
@@ -212,7 +214,7 @@ class NoticeListItem
     {
         // XXX: RDFa
         // TODO: add notice_type class e.g., notice_video, notice_image
-        common_element_start('li', array('class' => 'hentry notice',
+        $this->out->elementStart('li', array('class' => 'hentry notice',
                                          'id' => 'notice-' . $this->notice->id));
     }
 
@@ -244,13 +246,13 @@ class NoticeListItem
 
     function showAuthor()
     {
-        $this->elementStart('span', 'vcard author');
-        $this->elementStart('a', array('href' => $this->profile->profileurl,
+        $this->out->elementStart('span', 'vcard author');
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
                                         'class' => 'url'));
         $this->showAvatar();
         $this->showNickname();
-        $this->elementEnd('a');
-        $this->elementEnd('span');
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('span');
     }
 
     /**
@@ -266,7 +268,7 @@ class NoticeListItem
     {
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
 
-        $this->element('img', array('src' => ($avatar) ?
+        $this->out->element('img', array('src' => ($avatar) ?
                                     common_avatar_display_url($avatar) :
                                     common_default_avatar(AVATAR_STREAM_SIZE),
                                     'class' => 'avatar photo',
@@ -288,7 +290,7 @@ class NoticeListItem
 
     function showNickname()
     {
-        $this->element('span', array('class' => 'nickname fn'),
+        $this->out->element('span', array('class' => 'nickname fn'),
                        $this->profile->nickname);
     }
 
@@ -305,16 +307,16 @@ class NoticeListItem
     function showContent()
     {
         // FIXME: URL, image, video, audio
-        common_element_start('p', array('class' => 'entry-content'));
+        $this->out->elementStart('p', array('class' => 'entry-content'));
         if ($this->notice->rendered) {
-            common_raw($this->notice->rendered);
+            $this->out->raw($this->notice->rendered);
         } else {
             // XXX: may be some uncooked notices in the DB,
             // we cook them right now. This should probably disappear in future
             // versions (>> 0.4.x)
-            common_raw(common_render_content($this->notice->content, $this->notice));
+            $this->out->raw(common_render_content($this->notice->content, $this->notice));
         }
-        common_element_end('p');
+        $this->out->elementEnd('p');
     }
 
     /**
@@ -335,18 +337,18 @@ class NoticeListItem
             preg_match('/^http/', $this->notice->uri)) {
             $noticeurl = $this->notice->uri;
         }
-        $this->elementStart('dl', 'timestamp');
-        $this->element('dt', _('Published')); 
-        $this->elementStart('dd', null);
-        $this->element('a', array('rel' => 'bookmark',
+        $this->out->elementStart('dl', 'timestamp');
+        $this->out->element('dt', _('Published')); 
+        $this->out->elementStart('dd', null);
+        $this->out->element('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
         $dt = common_date_iso8601($this->notice->created);
-        $this->element('abbr', array('class' => 'published',
+        $this->out->element('abbr', array('class' => 'published',
                                      'title' => $dt),
                        common_date_string($this->notice->created));
-        $this->elementEnd('a');
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
+        $this->out->elementEnd('a');
+        $this->out->elementEnd('dd');
+        $this->out->elementEnd('dl');
     }
 
     /**
@@ -361,8 +363,8 @@ class NoticeListItem
     function showNoticeSource()
     {
         if ($this->notice->source) {
-            $this->elementStart('dl', 'device');
-            $this->element('dt', null, _('From'));
+            $this->out->elementStart('dl', 'device');
+            $this->out->element('dt', null, _('From'));
             $source_name = _($this->notice->source);
             switch ($this->notice->source) {
             case 'web':
@@ -370,22 +372,22 @@ class NoticeListItem
             case 'mail':
             case 'omb':
             case 'api':
-                $this->element('dd', 'noticesource', $source_name);
+                $this->out->element('dd', 'noticesource', $source_name);
                 break;
             default:
                 $ns = Notice_source::staticGet($this->notice->source);
                 if ($ns) {
-                    $this->elementStart('dd', null);
-                    $this->element('a', array('href' => $ns->url,
+                    $this->out->elementStart('dd', null);
+                    $this->out->element('a', array('href' => $ns->url,
                                               'rel' => 'external'),
                                    $ns->name);
-                    $this->elementEnd('dd');
+                    $this->out->elementEnd('dd');
                 } else {
-                    $this->element('dd', 'noticesource', $source_name);
+                    $this->out->element('dd', 'noticesource', $source_name);
                 }
                 break;
             }
-            $this->elementEnd('dl');
+            $this->out->elementEnd('dl');
         }
     }
 
@@ -403,14 +405,14 @@ class NoticeListItem
         if ($this->notice->reply_to) {
             $replyurl = common_local_url('shownotice',
                                          array('notice' => $this->notice->reply_to));
-            $this->elementStart('dl', 'response');
-            $this->element('dt', null, _('To'));
-            $this->elementStart('dd');
-            $this->element('a', array('href' => $replyurl,
+            $this->out->elementStart('dl', 'response');
+            $this->out->element('dt', null, _('To'));
+            $this->out->elementStart('dd');
+            $this->out->element('a', array('href' => $replyurl,
                                       'rel' => 'in-reply-to'),
                            _('in reply to'));
-            $this->elementEnd('dd');
-            $this->elementEnd('dl');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
     }
 
@@ -431,13 +433,13 @@ class NoticeListItem
         $reply_js =
           'return doreply("'.$this->profile->nickname.'",'.$this->notice->id.');';
 
-        common_element_start('a',
+        $this->out->elementStart('a',
                              array('href' => $reply_url,
                                    'onclick' => $reply_js,
                                    'title' => _('reply'),
                                    'class' => 'replybutton'));
-        common_raw(' &#8594;');
-        common_element_end('a');
+        $this->out->raw(' &#8594;');
+        $this->out->elementEnd('a');
     }
 
     /**
@@ -452,11 +454,11 @@ class NoticeListItem
         if ($user && $this->notice->profile_id == $user->id) {
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));
-            common_element_start('a', array('class' => 'deletenotice',
+            $this->out->elementStart('a', array('class' => 'deletenotice',
                                             'href' => $deleteurl,
                                             'title' => _('delete')));
-            common_raw(' &#215;');
-            common_element_end('a');
+            $this->out->raw(' &#215;');
+            $this->out->elementEnd('a');
         }
     }
 
@@ -470,6 +472,6 @@ class NoticeListItem
 
     function showEnd()
     {
-        common_element_end('li');
+        $this->out->elementEnd('li');
     }
 }

From 186783f45bccf604c295bf0bfafd02637d10b473 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 20:20:03 +0000
Subject: [PATCH 060/256] Missing end dl tag for showPageNotice()

---
 lib/action.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/action.php b/lib/action.php
index 4b9db46525..4d2aa02e2c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -321,6 +321,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dd', null);
         // Output a bunch of paragraphs here
         $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     // MUST overload

From 37350e873d7d0d3350c4286a0c7d028ffe49825a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:22:14 +0000
Subject: [PATCH 061/256] Make the feedlist work -- kinda

---
 actions/public.php |  1 +
 lib/feedlist.php   | 13 +++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/actions/public.php b/actions/public.php
index 76e922dff1..62071ecccd 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -33,6 +33,7 @@ if (!defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/publicgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
 /**
  * Action for displaying the public stream
diff --git a/lib/feedlist.php b/lib/feedlist.php
index 0ff88cb25a..9bc77ca15c 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -47,13 +47,14 @@ if (!defined('LACONICA')) {
  * @see      Action::showExportList()
  */
 
-class FeedList
+class FeedList extends Widget
 {
-    var $out = null;
-
-    function __construct($out=null)
+    var $action = null;
+    
+    function __construct($action=null)
     {
-        $this->out = $out;
+	parent::__construct($action);
+	$this->action = $action;
     }
 
     function show($feeds)
@@ -72,7 +73,7 @@ class FeedList
 
     function feedItem($feed)
     {
-        $nickname = $this->trimmed('nickname');
+        $nickname = $this->action->trimmed('nickname');
 
         switch($feed['item']) {
          case 'notices': default:

From c08eadc774c2231e6b434ba067e2d7115404606f Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 20:24:41 +0000
Subject: [PATCH 062/256] HTML update to showSecondaryNav()

---
 lib/action.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 4d2aa02e2c..52eee6d6ab 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -364,7 +364,10 @@ class Action extends HTMLOutputter // lawsuit
 
     function showSecondaryNav()
     {
-        $this->elementStart('ul', array('id' => 'nav_sub'));
+        $this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
+        $this->element('dt', null, _('Secondary site navigation'));
+        $this->elementStart('dd', null);
+        $this->elementStart('ul', array('id' => 'nav'));
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->menuItem(common_local_url('doc', array('title' => 'about')),
@@ -378,6 +381,8 @@ class Action extends HTMLOutputter // lawsuit
         $this->menuItem(common_local_url('doc', array('title' => 'contact')),
                          _('Contact'));
         $this->elementEnd('ul');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     function showLicenses()

From 62ed9d3e7314d23866d009ff17b4bee6f5929e8e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:24:54 +0000
Subject: [PATCH 063/256] Fix called to text and raw in action.php

---
 lib/action.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 4f0b0def1e..fd9d276ac6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -397,7 +397,7 @@ class Action extends HTMLOutputter // lawsuit
         }
         $instr .= sprintf(_('It runs the [Laconica](http://laconi.ca/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), LACONICA_VERSION);
         $output = common_markup_to_html($instr);
-        common_raw($output);
+        $this->raw($output);
         $this->elementEnd('dd');
         // do it
     }
@@ -407,12 +407,12 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
         $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
-        common_text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+        $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => $config['license']['url']),
                        $config['license']['title']);
-        common_text(_('. Contributors should be attributed by full name or nickname.'));
+        $this->text(_('. Contributors should be attributed by full name or nickname.'));
         $this->elementEnd('p');
         $this->element('img', array('id' => 'license_cc',
                                     'src' => $config['license']['image'],

From 443e4a48c7b778dea499e88df14ba1b18ea533db Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:27:33 +0000
Subject: [PATCH 064/256] Fix site notice

---
 lib/action.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index fd9d276ac6..097b0d92e7 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -265,14 +265,16 @@ class Action extends HTMLOutputter // lawsuit
     // Revist. Should probably do an hAtom pattern here
     function showSiteNotice()
     {
-        $this->elementStart('dl', array('id' => 'site_notice',
-                                        'class' => 'system_notice'));
-        $this->element('dt', null, _('Site notice'));
-        $this->elementStart('dd', null);
-        // Output a bunch of paragraphs here
-        $this->elementEnd('dd');
+	$text = common_config('site', 'notice');
+	if ($text) {
+	    $this->elementStart('dl', array('id' => 'site_notice',
+					    'class' => 'system_notice'));
+	    $this->element('dt', null, _('Site notice'));
+	    $this->element('dd', null, $text);
+	    $this->elementEnd('dl');
+	}
     }
-
+    
     // MAY overload if no notice form needed... or direct message box????
 
     function showNoticeForm()

From c42b88308683fccfc7710a39a363d98270ade39b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:31:17 +0000
Subject: [PATCH 065/256] Fix dd in action

I think these definition lists are ridiculous, and I particularly
resent having to debug them.
---
 lib/action.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/action.php b/lib/action.php
index 097b0d92e7..057b4a19a0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -235,6 +235,7 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
         $this->element('dt', null, _('Primary site navigation'));
+	$this->elementStart('dd');
         $user = common_current_user();
         $this->elementStart('ul', array('id' => 'nav'));
         if ($user) {
@@ -259,6 +260,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->elementEnd('ul');
+	$this->elementEnd('dd');	
         $this->elementEnd('dl');
     }
 

From 1fc03ba63aaa50a1ed4ade38ed449e79bee70ecd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 20:58:46 +0000
Subject: [PATCH 066/256] Form action must be 'post' not 'POST'

---
 lib/form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form.php b/lib/form.php
index bd68fb0c5f..011d4bfc9b 100644
--- a/lib/form.php
+++ b/lib/form.php
@@ -66,7 +66,7 @@ class Form extends Widget
         $this->out->elementStart('form',
                                  array('id' => $this->id(),
 				       'class' => $this->formClass(),
-                                       'method' => 'POST',
+                                       'method' => 'post',
                                        'action' => $this->action()));
         $this->out->elementStart('fieldset');
         $this->formLegend();

From 9bed97a36c62fed7b3f44f0cf8870dd31a55e378 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 21:19:23 +0000
Subject: [PATCH 067/256] Move ID param to end of menuItem and fix bad 'wrap'
 element

---
 lib/action.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 4a164d8b01..a8b5e70b13 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -194,11 +194,11 @@ class Action extends HTMLOutputter // lawsuit
     function showBody()
     {
         $this->elementStart('body');
-        $this->elementStart('wrap');
+        $this->elementStart('div', 'wrap');
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
-        $this->elementEnd('wrap');
+        $this->elementEnd('div', 'wrap');
         $this->elementEnd('body');
     }
 
@@ -576,7 +576,7 @@ class Action extends HTMLOutputter // lawsuit
     // Added @id to li for some control.
     // XXX: We might want to move this to htmloutputter.php
 
-    function menuItem($url, $text, $id=null, $title=null, $is_selected=false)
+    function menuItem($url, $text, $title=null, $is_selected=false, $id=null)
     {
         $lattrs = array();
         if ($is_selected) {

From c52d49f2fab9f08714ac6c3f950f23ee8497412f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 21:19:44 +0000
Subject: [PATCH 068/256] Fix some formatting in list items

---
 lib/noticelist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 0fc6d513f4..ad3af43914 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -342,7 +342,7 @@ class NoticeListItem extends Widget
         $this->out->elementStart('dl', 'timestamp');
         $this->out->element('dt', _('Published')); 
         $this->out->elementStart('dd', null);
-        $this->out->element('a', array('rel' => 'bookmark',
+        $this->out->elementStart('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
         $dt = common_date_iso8601($this->notice->created);
         $this->out->element('abbr', array('class' => 'published',

From 621c58a292884cadadbee9ad760e0c0c603f0a75 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:21:55 +0000
Subject: [PATCH 069/256] Updated show()'s site_nav_local_views'

---
 lib/publicgroupnav.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index abda8663e3..ee087d8a86 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -77,22 +77,27 @@ class PublicGroupNav extends Widget
 
     function show()
     {
+        $this->action->elementStart('dl', array('id' => 'site_nav_local_views'));
+        $this->action->element('dt', null, _('Local views'));
+        $this->action->elementStart('dd', null);
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        $this->out->menuItem(common_local_url('public'), _('Public'),
+        $this->out->menuItem(common_local_url('public'), _('Public'), 'nav_timeline_public',
             _('Public timeline'), $this->action == 'public');
 
-        $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
+        $this->out->menuItem(common_local_url('tag'), _('Recent tags'), 'nav_recent-tags',
             _('Recent tags'), $this->action == 'tag');
 
         if (count(common_config('nickname', 'featured')) > 0) {
-            $this->out->menuItem(common_local_url('featured'), _('Featured'),
+            $this->out->menuItem(common_local_url('featured'), _('Featured'), 'nav_featured',
                 _('Featured users'), $this->action == 'featured');
         }
 
-        $this->out->menuItem(common_local_url('favorited'), _('Popular'),
+        $this->out->menuItem(common_local_url('favorited'), _('Popular'), 'nav_timeline_favorited',
             _("Popular notices"), $this->action == 'favorited');
 
         $this->action->elementEnd('ul');
+        $this->action->elementEnd('dd');
+        $this->action->elementEnd('dl')
     }
 }

From e6211290422b8d42da11c4ee2e5530d5ef63a72e Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:23:41 +0000
Subject: [PATCH 070/256] Minor

---
 lib/publicgroupnav.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index ee087d8a86..458614338e 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -98,6 +98,6 @@ class PublicGroupNav extends Widget
 
         $this->action->elementEnd('ul');
         $this->action->elementEnd('dd');
-        $this->action->elementEnd('dl')
+        $this->action->elementEnd('dl');
     }
 }

From 60fa833908da5476e7c2e971fb60c85d7fa134e8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:30:23 +0000
Subject: [PATCH 071/256] changed to class nav from id

---
 lib/action.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index a8b5e70b13..dd84977f0d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -237,7 +237,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', null, _('Primary site navigation'));
 	$this->elementStart('dd');
         $user = common_current_user();
-        $this->elementStart('ul', array('id' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
                              _('Home'));
@@ -370,7 +370,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
         $this->element('dt', null, _('Secondary site navigation'));
         $this->elementStart('dd', null);
-        $this->elementStart('ul', array('id' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->menuItem(common_local_url('doc', array('title' => 'about')),

From 8521cc6219d014e37779e80b09e6b63c81af952d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:33:01 +0000
Subject: [PATCH 072/256] Using id param properly

---
 lib/publicgroupnav.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 458614338e..1e5ed73596 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -82,19 +82,19 @@ class PublicGroupNav extends Widget
         $this->action->elementStart('dd', null);
         $this->action->elementStart('ul', array('class' => 'nav'));
 
-        $this->out->menuItem(common_local_url('public'), _('Public'), 'nav_timeline_public',
-            _('Public timeline'), $this->action == 'public');
+        $this->out->menuItem(common_local_url('public'), _('Public'),
+            _('Public timeline'), $this->action == 'public', 'nav_timeline_public');
 
-        $this->out->menuItem(common_local_url('tag'), _('Recent tags'), 'nav_recent-tags',
-            _('Recent tags'), $this->action == 'tag');
+        $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
+            _('Recent tags'), $this->action == 'tag', 'nav_recent-tags');
 
         if (count(common_config('nickname', 'featured')) > 0) {
-            $this->out->menuItem(common_local_url('featured'), _('Featured'), 'nav_featured',
-                _('Featured users'), $this->action == 'featured');
+            $this->out->menuItem(common_local_url('featured'), _('Featured'),
+                _('Featured users'), $this->action == 'featured', 'nav_featured');
         }
 
-        $this->out->menuItem(common_local_url('favorited'), _('Popular'), 'nav_timeline_favorited',
-            _("Popular notices"), $this->action == 'favorited');
+        $this->out->menuItem(common_local_url('favorited'), _('Popular'),
+            _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
 
         $this->action->elementEnd('ul');
         $this->action->elementEnd('dd');

From 2a5da870cb00d5b207cdcacea977fe3178903be3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 21:33:45 +0000
Subject: [PATCH 073/256] Change multiple id=nav to class=nav

---
 lib/action.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index a8b5e70b13..dd84977f0d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -237,7 +237,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', null, _('Primary site navigation'));
 	$this->elementStart('dd');
         $user = common_current_user();
-        $this->elementStart('ul', array('id' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
                              _('Home'));
@@ -370,7 +370,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dl', array('id' => 'site_nav_global_secondary'));
         $this->element('dt', null, _('Secondary site navigation'));
         $this->elementStart('dd', null);
-        $this->elementStart('ul', array('id' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
                          _('Help'));
         $this->menuItem(common_local_url('doc', array('title' => 'about')),

From 4f3f23c61ae58de766c1fbc6dde5d979fda72764 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:34:33 +0000
Subject: [PATCH 074/256] core uses id

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index dd84977f0d..3efb65a65e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -287,7 +287,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showCore()
     {
-        $this->elementStart('div', array('class' => 'core'));
+        $this->elementStart('div', array('id' => 'core'));
         $this->showLocalNav();
         $this->showContentBlock();
         $this->showAside();

From 2c84f077a2a41cb9c71ef79a33083b6084a0556b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 21:39:48 +0000
Subject: [PATCH 075/256] Add aside div

---
 lib/action.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/action.php b/lib/action.php
index dd84977f0d..d5eb6de2d5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -338,8 +338,10 @@ class Action extends HTMLOutputter // lawsuit
 
     function showAside()
     {
+	$this->elementStart('div', 'aside');
         $this->showExportData();
         $this->showSections();
+	$this->elementEnd('div');
     }
 
     // MAY overload if there are feeds

From cf809f6464ee41ccbb654d226f328457fc2e5299 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 21:58:07 +0000
Subject: [PATCH 076/256] feed show() id and class

---
 lib/feedlist.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/feedlist.php b/lib/feedlist.php
index 9bc77ca15c..47d909e969 100644
--- a/lib/feedlist.php
+++ b/lib/feedlist.php
@@ -59,8 +59,9 @@ class FeedList extends Widget
 
     function show($feeds)
     {
-        $this->out->elementStart('div', array('class' => 'feeds'));
-        $this->out->element('p', null, 'Feeds:');
+        $this->out->elementStart('div', array('id' => 'export_data',
+                                              'class' => 'section'));
+        $this->out->element('h2', null, _('Export data'));
         $this->out->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $key => $value) {

From 18dc498a6a7308bb9b5f41bdb33fca4addf8d80b Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 22:00:48 +0000
Subject: [PATCH 077/256] Added aside_primary id

---
 lib/action.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 76962482f5..773b0dce9c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -338,10 +338,11 @@ class Action extends HTMLOutputter // lawsuit
 
     function showAside()
     {
-	$this->elementStart('div', 'aside');
+        $this->elementStart('div', array('id' => 'aside_primary',
+                                         'class' => 'aside'));
         $this->showExportData();
         $this->showSections();
-	$this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     // MAY overload if there are feeds

From 07e84976c2f4038f36570d969c4be63b134cf60d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 22:02:58 +0000
Subject: [PATCH 078/256] Changed from supplemental_primary to aside_primary

---
 theme/base/css/display.css     | 2 +-
 theme/identica/css/display.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8b2e2f801e..8685bdc872 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -302,7 +302,7 @@ float:left;
 position:relative;
 }
 
-#supplemental_primary {
+#aside_primary {
 width:300px;
 float:left;
 margin-left:2px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index f6a4747c74..4f2ba46526 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -29,7 +29,7 @@ color:#002E6E;
 
 
 
-#supplemental_primary {
+#aside_primary {
 background-color:#CEE1E9;
 }
 

From 4cee28ace9ece31acc89277903a8924a0747ac95 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:17:18 +0000
Subject: [PATCH 079/256] section for export data

---
 actions/public.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/public.php b/actions/public.php
index 62071ecccd..5a11cece18 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -187,6 +187,7 @@ class PublicAction extends Action
 
     function showExportData()
     {
+	$this->elementStart('div', array('id' => 'exportdata', 'class' => 'section'));
         $fl = new FeedList($this);
         $fl->show(array(0 => array('href' => common_local_url('publicrss'),
                                    'type' => 'rss',
@@ -196,5 +197,6 @@ class PublicAction extends Action
                                    'type' => 'atom',
                                    'version' => 'Atom 1.0',
                                    'item' => 'publicatom')));
+	$this->elementEnd('div');
     }
 }

From a72ae0f4df7e9bbbd4864e21f784ea0da53dfcac Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:17:48 +0000
Subject: [PATCH 080/256] Move wrapper for content

---
 lib/action.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 76962482f5..76cf419cb3 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -306,8 +306,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('div', array('id' => 'content'));
         $this->showPageTitle();
         $this->showPageNotice();
+        $this->elementStart('div', array('id' => 'content_inner'));
+        // show the actual content (forms, lists, whatever)
         $this->showContent();
         $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     function showPageTitle() {
@@ -331,9 +334,6 @@ class Action extends HTMLOutputter // lawsuit
 
     function showContent()
     {
-        // show the actual content (forms, lists, whatever)
-        $this->elementStart('div', array('id' => 'content_inner'));
-        $this->elementEnd('div');
     }
 
     function showAside()

From 8b3459812764d05044bcdfb18627f80c34dc239d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 22:19:40 +0000
Subject: [PATCH 081/256] Changed to class

---
 lib/noticelist.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index ad3af43914..7f63089b30 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -79,7 +79,8 @@ class NoticeList extends Widget
 
     function show()
     {
-        $this->out->elementStart('ul', array('id' => 'notices'));
+        $this->out->element('h2', null, _('Notices'));
+        $this->out->elementStart('ul', array('class' => 'notices'));
 
         $cnt = 0;
 

From 10a4d9ea1e7a930354c8005fb1f418f12d33013b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:23:40 +0000
Subject: [PATCH 082/256] Revert "section for export data"

This reverts commit 4cee28ace9ece31acc89277903a8924a0747ac95.
---
 actions/public.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/actions/public.php b/actions/public.php
index 5a11cece18..62071ecccd 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -187,7 +187,6 @@ class PublicAction extends Action
 
     function showExportData()
     {
-	$this->elementStart('div', array('id' => 'exportdata', 'class' => 'section'));
         $fl = new FeedList($this);
         $fl->show(array(0 => array('href' => common_local_url('publicrss'),
                                    'type' => 'rss',
@@ -197,6 +196,5 @@ class PublicAction extends Action
                                    'type' => 'atom',
                                    'version' => 'Atom 1.0',
                                    'item' => 'publicatom')));
-	$this->elementEnd('div');
     }
 }

From d012bdabde712fbb600408d4a834cba399d4015d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:25:26 +0000
Subject: [PATCH 083/256] Show NoticeForm only if logged in

---
 lib/action.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index d106ba3666..9df39e9a82 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -208,7 +208,11 @@ class Action extends HTMLOutputter // lawsuit
         $this->showLogo();
         $this->showPrimaryNav();
         $this->showSiteNotice();
-        $this->showNoticeForm();
+	if (common_logged_in()) {
+	    $this->showNoticeForm();
+	} else {
+	    $this->showAnonymousMessage();
+	}
         $this->elementEnd('div');
     }
 
@@ -285,6 +289,11 @@ class Action extends HTMLOutputter // lawsuit
         $notice_form->show();
     }
 
+    function showAnonymousMessage()
+    {
+	// needs to be defined by the class
+    }
+    
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));

From 7ce054b1ed0f4af923aa4e041005d514a7358056 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 22:31:32 +0000
Subject: [PATCH 084/256] Wrapper for notices

---
 lib/noticelist.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 7f63089b30..eb5416ee45 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -79,6 +79,7 @@ class NoticeList extends Widget
 
     function show()
     {
+        $this->out->elementStart('div', array('id' =>'notices_primary'));
         $this->out->element('h2', null, _('Notices'));
         $this->out->elementStart('ul', array('class' => 'notices'));
 
@@ -96,6 +97,7 @@ class NoticeList extends Widget
         }
 
         $this->out->elementEnd('ul');
+        $this->out->elementEnd('div');
 
         return $cnt;
     }

From 2b2fb276219f87cdc0430d91ac3695e098ae48f4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:40:56 +0000
Subject: [PATCH 085/256] Fix use of $config in licenses

---
 lib/action.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 9df39e9a82..d5060758e0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -432,13 +432,13 @@ class Action extends HTMLOutputter // lawsuit
         $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
-                                  'href' => $config['license']['url']),
-                       $config['license']['title']);
+                                  'href' => common_config('license', 'url')),
+                       common_config('license', 'title'));
         $this->text(_('. Contributors should be attributed by full name or nickname.'));
         $this->elementEnd('p');
         $this->element('img', array('id' => 'license_cc',
-                                    'src' => $config['license']['image'],
-                                    'alt' => $config['license']['title']));
+                                    'src' => common_config('license', 'image'),
+                                    'alt' => common_config('license', 'title')));
         $this->elementEnd('dd');
     }
 

From eaa81d25fa7bd954132ce7f901fae69b0d46ec1a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 22:57:15 +0000
Subject: [PATCH 086/256] Convert all actions to use new UI functions

I did a massive search-and-replace to get all the action subclasses to
use the new output function (common_element() -> $this->element(), etc.)

There's still a lot to do, but it's a first step
---
 actions/all.php                    |   2 +-
 actions/api.php                    |   8 +-
 actions/block.php                  |  16 +--
 actions/confirmaddress.php         |   2 +-
 actions/deletenotice.php           |  18 ++--
 actions/deleteprofile.php          |  40 ++++----
 actions/disfavor.php               |  12 +--
 actions/doc.php                    |   2 +-
 actions/emailsettings.php          |  72 ++++++-------
 actions/facebookhome.php           |   2 +-
 actions/facebookinvite.php         |  38 +++----
 actions/facebooksettings.php       |  38 +++----
 actions/favor.php                  |  12 +--
 actions/favorited.php              |  10 +-
 actions/featured.php               |   6 +-
 actions/finishaddopenid.php        |   2 +-
 actions/finishopenidlogin.php      |  42 ++++----
 actions/foaf.php                   |  72 ++++++-------
 actions/imsettings.php             |  48 ++++-----
 actions/invite.php                 |  46 ++++-----
 actions/login.php                  |  54 ++++++----
 actions/newmessage.php             |   2 +-
 actions/newnotice.php              |  28 +++---
 actions/noticesearch.php           |  48 ++++-----
 actions/nudge.php                  |  12 +--
 actions/openidlogin.php            |  20 ++--
 actions/openidsettings.php         |  48 ++++-----
 actions/opensearch.php             |  22 ++--
 actions/othersettings.php          |  40 ++++----
 actions/peoplesearch.php           |   2 +-
 actions/peopletag.php              |  10 +-
 actions/profilesettings.php        |  90 ++++++++---------
 actions/publicxrds.php             |  24 ++---
 actions/recoverpassword.php        |  36 +++----
 actions/register.php               |  58 +++++------
 actions/remotesubscribe.php        |  20 ++--
 actions/replies.php                |   2 +-
 actions/showfavorites.php          |   2 +-
 actions/shownotice.php             |   8 +-
 actions/showstream.php             | 156 ++++++++++++++---------------
 actions/smssettings.php            |  86 ++++++++--------
 actions/subscribe.php              |  12 +--
 actions/subscriptions.php          |  14 +--
 actions/tag.php                    |  16 +--
 actions/tagother.php               |  54 +++++-----
 actions/twitapidirect_messages.php |  28 +++---
 actions/twitapifriendships.php     |   2 +-
 actions/twitapihelp.php            |   2 +-
 actions/twitapilaconica.php        |  12 +--
 actions/twitapistatuses.php        |   4 +-
 actions/twittersettings.php        |  64 ++++++------
 actions/unsubscribe.php            |  12 +--
 actions/userauthorization.php      |  44 ++++----
 actions/xrds.php                   |  36 +++----
 lib/action.php                     |  23 +++--
 55 files changed, 799 insertions(+), 780 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 526ac5f408..a8a74fb337 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -57,7 +57,7 @@ class AllAction extends StreamAction
 
     function show_header($user)
     {
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('allrss', array('nickname' =>
                                                                                $user->nickname)),
                                      'type' => 'application/rss+xml',
diff --git a/actions/api.php b/actions/api.php
index 7a07598315..9cbf9a4681 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -159,10 +159,10 @@ class ApiAction extends Action
         if ($this->content_type == 'xml') {
             header('Content-Type: application/xml; charset=utf-8');
             common_start_xml();
-            common_element_start('hash');
-            common_element('error', null, $msg);
-            common_element('request', null, $_SERVER['REQUEST_URI']);
-            common_element_end('hash');
+            $this->elementStart('hash');
+            $this->element('error', null, $msg);
+            $this->element('request', null, $_SERVER['REQUEST_URI']);
+            $this->elementEnd('hash');
             common_end_xml();
         } else if ($this->content_type == 'json')  {
             header('Content-Type: application/json; charset=utf-8');
diff --git a/actions/block.php b/actions/block.php
index c1ff7c0446..f8f6f24fdb 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -81,34 +81,34 @@ class BlockAction extends Action
 
         common_show_header(_('Block user'));
 
-        common_element('p', null,
+        $this->element('p', null,
                        _('Are you sure you want to block this user? '.
                          'Afterwards, they will be unsubscribed from you, '.
                          'unable to subscribe to you in the future, and '.
                          'you will not be notified of any @-replies from them.'));
 
-        common_element_start('form', array('id' => 'block-' . $id,
+        $this->elementStart('form', array('id' => 'block-' . $id,
                                            'method' => 'post',
                                            'class' => 'block',
                                            'action' => common_local_url('block')));
 
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_element('input', array('id' => 'blockto-' . $id,
+        $this->element('input', array('id' => 'blockto-' . $id,
                                       'name' => 'blockto',
                                       'type' => 'hidden',
                                       'value' => $id));
 
         foreach ($this->args as $k => $v) {
             if (substr($k, 0, 9) == 'returnto-') {
-                common_hidden($k, $v);
+                $this->hidden($k, $v);
             }
         }
 
-        common_submit('no', _('No'));
-        common_submit('yes', _('Yes'));
+        $this->submit('no', _('No'));
+        $this->submit('yes', _('Yes'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
         common_show_footer();
     }
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 1d5c53ff2e..31a1577684 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -90,7 +90,7 @@ class ConfirmaddressAction extends Action
         $cur->query('COMMIT');
 
         common_show_header(_('Confirm Address'));
-        common_element('p', null,
+        $this->element('p', null,
                        sprintf(_('The address "%s" has been confirmed for your account.'), $cur->$type));
         common_show_footer();
     }
diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index e9b4b32549..bae0eac1b4 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -51,24 +51,24 @@ class DeletenoticeAction extends DeleteAction
 
         common_show_header($this->get_title(), array($this, 'show_header'), $error,
                            array($this, 'show_top'));
-        common_element_start('form', array('id' => 'notice_delete_form',
+        $this->elementStart('form', array('id' => 'notice_delete_form',
                                    'method' => 'post',
                                    'action' => common_local_url('deletenotice')));
-        common_hidden('token', common_session_token());
-        common_hidden('notice', $this->trimmed('notice'));
-        common_element_start('p');
-        common_element('span', array('id' => 'confirmation_text'), _('Are you sure you want to delete this notice?'));
+        $this->hidden('token', common_session_token());
+        $this->hidden('notice', $this->trimmed('notice'));
+        $this->elementStart('p');
+        $this->element('span', array('id' => 'confirmation_text'), _('Are you sure you want to delete this notice?'));
 
-        common_element('input', array('id' => 'submit_no',
+        $this->element('input', array('id' => 'submit_no',
                           'name' => 'submit',
                           'type' => 'submit',
                           'value' => _('No')));
-        common_element('input', array('id' => 'submit_yes',
+        $this->element('input', array('id' => 'submit_yes',
                           'name' => 'submit',
                           'type' => 'submit',
                           'value' => _('Yes')));
-        common_element_end('p');
-        common_element_end('form');
+        $this->elementEnd('p');
+        $this->elementEnd('form');
         common_show_footer();
     }
 
diff --git a/actions/deleteprofile.php b/actions/deleteprofile.php
index e12fe131a7..ef4687d5fa 100644
--- a/actions/deleteprofile.php
+++ b/actions/deleteprofile.php
@@ -49,15 +49,15 @@ class DeleteprofileAction extends Action
 
     function show_feeds_list($feeds)
     {
-        common_element_start('div', array('class' => 'feedsdel'));
-        common_element('p', null, 'Feeds:');
-        common_element_start('ul', array('class' => 'xoxo'));
+        $this->elementStart('div', array('class' => 'feedsdel'));
+        $this->element('p', null, 'Feeds:');
+        $this->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $key => $value) {
             $this->common_feed_item($feeds[$key]);
         }
-        common_element_end('ul');
-        common_element_end('div');
+        $this->elementEnd('ul');
+        $this->elementEnd('div');
     }
 
     //TODO move to common.php (and retrace its origin)
@@ -81,19 +81,19 @@ class DeleteprofileAction extends Action
                 $feed['textContent'] = "FOAF";
                 break;
         }
-        common_element_start('li');
-        common_element('a', array('href' => $feed['href'],
+        $this->elementStart('li');
+        $this->element('a', array('href' => $feed['href'],
                                   'class' => $feed_classname,
                                   'type' => $feed_mimetype,
                                   'title' => $feed_title),
                             $feed['textContent']);
-        common_element_end('li');
+        $this->elementEnd('li');
     }
 
     function show_form($msg=null, $success=false)
     {
         $this->form_header(_('Delete my account'), $msg, $success);
-        common_element('h2', null, _('Delete my account confirmation'));
+        $this->element('h2', null, _('Delete my account confirmation'));
         $this->show_confirm_delete_form();
         common_show_footer();
     }
@@ -105,13 +105,13 @@ class DeleteprofileAction extends Action
         $notices->profile_id = $user->id;
         $notice_count = (int) $notices->count();
 
-        common_element_start('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'POST',
                                            'id' => 'delete',
                                            'action' =>
                                            common_local_url('deleteprofile')));
 
-        common_hidden('token', common_session_token());
-        common_element('p', null, "Last chance to copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
+        $this->hidden('token', common_session_token());
+        $this->element('p', null, "Last chance to copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
 
         $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
                                               'type' => 'rss',
@@ -122,10 +122,10 @@ class DeleteprofileAction extends Action
                                               'version' => 'FOAF',
                                               'item' => 'foaf')));
 
-        common_checkbox('confirmation', _('Check if you are sure you want to delete your account.'));
+        $this->checkbox('confirmation', _('Check if you are sure you want to delete your account.'));
 
-        common_submit('deleteaccount', _('Delete my account'));
-        common_element_end('form');
+        $this->submit('deleteaccount', _('Delete my account'));
+        $this->elementEnd('form');
     }
 
     function handle_post()
@@ -238,9 +238,9 @@ class DeleteprofileAction extends Action
         } else {
             $inst = $this->get_instructions();
             $output = common_markup_to_html($inst);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
         }
         $this->settings_menu();
     }
@@ -272,7 +272,7 @@ class DeleteprofileAction extends Action
                       _('Other options')));
 
         $action = $this->trimmed('action');
-        common_element_start('ul', array('id' => 'nav_views'));
+        $this->elementStart('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
             if ($menuaction == 'imsettings' &&
                 !common_config('xmpp', 'enabled')) {
@@ -283,7 +283,7 @@ class DeleteprofileAction extends Action
                     $menudesc[1],
                     $action == $menuaction);
         }
-        common_element_end('ul');
+        $this->elementEnd('ul');
     }
 }
 
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 74aae86cc7..9a27f34b16 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -70,13 +70,13 @@ class DisfavorAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Add to favorites'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Add to favorites'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             common_favor_form($notice);
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             common_redirect(common_local_url('showfavorites',
                                              array('nickname' => $user->nickname)));
diff --git a/actions/doc.php b/actions/doc.php
index 856025e665..98da312672 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -34,7 +34,7 @@ class DocAction extends Action
         $c = file_get_contents($filename);
         $output = common_markup_to_html($c);
         common_show_header(_(ucfirst($title)));
-        common_raw($output);
+        $this->raw($output);
         common_show_footer();
     }
 }
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 3fa8ce2968..39f186bff0 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -33,83 +33,83 @@ class EmailsettingsAction extends SettingsAction
     {
         $user = common_current_user();
         $this->form_header(_('Email Settings'), $msg, $success);
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'emailsettings',
                                            'action' =>
                                            common_local_url('emailsettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_element('h2', null, _('Address'));
+        $this->element('h2', null, _('Address'));
 
         if ($user->email) {
-            common_element_start('p');
-            common_element('span', 'address confirmed', $user->email);
-            common_element('span', 'input_instructions',
+            $this->elementStart('p');
+            $this->element('span', 'address confirmed', $user->email);
+            $this->element('span', 'input_instructions',
                            _('Current confirmed email address.'));
-            common_hidden('email', $user->email);
-            common_element_end('p');
-            common_submit('remove', _('Remove'));
+            $this->hidden('email', $user->email);
+            $this->elementEnd('p');
+            $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->get_confirmation();
             if ($confirm) {
-                common_element_start('p');
-                common_element('span', 'address unconfirmed', $confirm->address);
-                common_element('span', 'input_instructions',
+                $this->elementStart('p');
+                $this->element('span', 'address unconfirmed', $confirm->address);
+                $this->element('span', 'input_instructions',
                                _('Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions.'));
-                common_hidden('email', $confirm->address);
-                common_element_end('p');
-                common_submit('cancel', _('Cancel'));
+                $this->hidden('email', $confirm->address);
+                $this->elementEnd('p');
+                $this->submit('cancel', _('Cancel'));
             } else {
-                common_input('email', _('Email Address'),
+                $this->input('email', _('Email Address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
                              _('Email address, like "UserName@example.org"'));
-                common_submit('add', _('Add'));
+                $this->submit('add', _('Add'));
             }
         }
 
         if ($user->email) {
-            common_element('h2', null, _('Incoming email'));
+            $this->element('h2', null, _('Incoming email'));
             
             if ($user->incomingemail) {
-                common_element_start('p');
-                common_element('span', 'address', $user->incomingemail);
-                common_element('span', 'input_instructions',
+                $this->elementStart('p');
+                $this->element('span', 'address', $user->incomingemail);
+                $this->element('span', 'input_instructions',
                                _('Send email to this address to post new notices.'));
-                common_element_end('p');
-                common_submit('removeincoming', _('Remove'));
+                $this->elementEnd('p');
+                $this->submit('removeincoming', _('Remove'));
             }
             
-            common_element_start('p');
-            common_element('span', 'input_instructions',
+            $this->elementStart('p');
+            $this->element('span', 'input_instructions',
                            _('Make a new email address for posting to; cancels the old one.'));
-            common_element_end('p');
-            common_submit('newincoming', _('New'));
+            $this->elementEnd('p');
+            $this->submit('newincoming', _('New'));
         }
         
-        common_element('h2', null, _('Preferences'));
+        $this->element('h2', null, _('Preferences'));
 
-        common_checkbox('emailnotifysub',
+        $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
                         $user->emailnotifysub);
-        common_checkbox('emailnotifyfav',
+        $this->checkbox('emailnotifyfav',
                         _('Send me email when someone adds my notice as a favorite.'),
                         $user->emailnotifyfav);
-        common_checkbox('emailnotifymsg',
+        $this->checkbox('emailnotifymsg',
                         _('Send me email when someone sends me a private message.'),
                         $user->emailnotifymsg);
-        common_checkbox('emailnotifynudge',
+        $this->checkbox('emailnotifynudge',
                         _('Allow friends to nudge me and send me an email.'),
                         $user->emailnotifynudge);
-        common_checkbox('emailpost',
+        $this->checkbox('emailpost',
                         _('I want to post notices by email.'),
                         $user->emailpost);
-        common_checkbox('emailmicroid',
+        $this->checkbox('emailmicroid',
                         _('Publish a MicroID for my email address.'),
                         $user->emailmicroid);
 
-        common_submit('save', _('Save'));
+        $this->submit('save', _('Save'));
         
-        common_element_end('form');
+        $this->elementEnd('form');
         common_show_footer();
     }
 
diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index f72f08a345..d2ac7617d1 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -105,7 +105,7 @@ class FacebookhomeAction extends FacebookAction
         $this->show_header('Home');
 
         if ($msg) {
-            common_element('fb:success', array('message' => $msg));
+            $this->element('fb:success', array('message' => $msg));
         }
 
         echo $this->show_notices($user);
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index fe0c5e4934..103d5a5686 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -43,22 +43,22 @@ class FacebookinviteAction extends FacebookAction
 
         $this->show_header('Invite');
 
-        common_element('h2', null, _('Thanks for inviting your friends to use Identi.ca!'));
-        common_element('p', null, _('Invitations have been sent to the following users:'));
+        $this->element('h2', null, _('Thanks for inviting your friends to use Identi.ca!'));
+        $this->element('p', null, _('Invitations have been sent to the following users:'));
 
         $friend_ids = $_POST['ids']; // Hmm... $this->arg('ids') doesn't seem to work
 
-        common_element_start("ul");
+        $this->elementStart("ul");
 
         foreach ($friend_ids as $friend) {
-            common_element_start('li');
-            common_element('fb:profile-pic', array('uid' => $friend));
-            common_element('fb:name', array('uid' => $friend,
+            $this->elementStart('li');
+            $this->element('fb:profile-pic', array('uid' => $friend));
+            $this->element('fb:name', array('uid' => $friend,
                                             'capitalize' => 'true'));
-            common_element_end('li');
+            $this->elementEnd('li');
         }
 
-        common_element_end("ul");
+        $this->elementEnd("ul");
 
         $this->show_footer();
     }
@@ -77,32 +77,32 @@ class FacebookinviteAction extends FacebookAction
         $content = _('You have been invited to Identi.ca!') .
             htmlentities('<fb:req-choice url="http://apps.facebook.com/identica_app/" label="Add"/>');
 
-        common_element_start('fb:request-form', array('action' => 'invite.php',
+        $this->elementStart('fb:request-form', array('action' => 'invite.php',
                                                       'method' => 'post',
                                                       'invite' => 'true',
                                                       'type' => 'Identi.ca',
                                                       'content' => $content));
-        common_hidden('invite', 'true');
+        $this->hidden('invite', 'true');
         $actiontext = 'Invite your friends to use Identi.ca.';
-        common_element('fb:multi-friend-selector', array('showborder' => 'false',
+        $this->element('fb:multi-friend-selector', array('showborder' => 'false',
                                                                'actiontext' => $actiontext,
                                                                'exclude_ids' => implode(',', $exclude_ids),
                                                                'bypass' => 'cancel'));
 
-        common_element_end('fb:request-form');
+        $this->elementEnd('fb:request-form');
 
-        common_element('h2', null, _('Friends already using Identi.ca:'));
-        common_element_start("ul");
+        $this->element('h2', null, _('Friends already using Identi.ca:'));
+        $this->elementStart("ul");
 
         foreach ($exclude_ids as $friend) {
-            common_element_start('li');
-            common_element('fb:profile-pic', array('uid' => $friend));
-            common_element('fb:name', array('uid' => $friend,
+            $this->elementStart('li');
+            $this->element('fb:profile-pic', array('uid' => $friend));
+            $this->element('fb:name', array('uid' => $friend,
                                             'capitalize' => 'true'));
-            common_element_end('li');
+            $this->elementEnd('li');
         }
 
-        common_element_end("ul");
+        $this->elementEnd("ul");
 
         $this->show_footer();
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index ab04ad82b5..8b071353a7 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -68,43 +68,43 @@ class FacebooksettingsAction extends FacebookAction
 
         $this->show_header('Settings', $msg, $success);
 
-        common_element_start('fb:if-section-not-added', array('section' => 'profile'));
-        common_element('h2', null, _('Add an Identi.ca box to my profile'));
-        common_element_start('p');
-        common_element('fb:add-section-button', array('section' => 'profile'));
-        common_element_end('p');
+        $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
+        $this->element('h2', null, _('Add an Identi.ca box to my profile'));
+        $this->elementStart('p');
+        $this->element('fb:add-section-button', array('section' => 'profile'));
+        $this->elementEnd('p');
 
-        common_element_end('fb:if-section-not-added');
-        common_element_start('p');
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update'));
-        common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
-        common_element_end('fb:prompt-permission');
-        common_element_end('p');
+        $this->elementEnd('fb:if-section-not-added');
+        $this->elementStart('p');
+        $this->elementStart('fb:prompt-permission', array('perms' => 'status_update'));
+        $this->element('h2', null, _('Allow Identi.ca to update my Facebook status'));
+        $this->elementEnd('fb:prompt-permission');
+        $this->elementEnd('p');
 
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
-            common_element_start('form', array('method' => 'post',
+            $this->elementStart('form', array('method' => 'post',
                                                'id' => 'facebook_settings'));
 
-            common_element('h2', null, _('Sync preferences'));
+            $this->element('h2', null, _('Sync preferences'));
 
-            common_checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
+            $this->checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
                                 ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
 
-            common_checkbox('replysync', _('Send local "@" replies to Facebook.'),
+            $this->checkbox('replysync', _('Send local "@" replies to Facebook.'),
                              ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
-            // function common_input($id, $label, $value=null,$instructions=null)
+            // function $this->input($id, $label, $value=null,$instructions=null)
 
             $prefix = $facebook->api_client->data_getUserPreference(1);
             
 
-            common_input('prefix', _('Prefix'),
+            $this->input('prefix', _('Prefix'),
                          ($prefix) ? $prefix : null,
                          _('A string to prefix notices with.'));
-            common_submit('save', _('Save'));
+            $this->submit('save', _('Save'));
 
-            common_element_end('form');
+            $this->elementEnd('form');
 
         }
 
diff --git a/actions/favor.php b/actions/favor.php
index 8103f8181b..1dfef9bbb3 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -69,13 +69,13 @@ class FavorAction extends Action
         
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Disfavor favorite'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Disfavor favorite'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             common_disfavor_form($notice);
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             common_redirect(common_local_url('showfavorites',
                                              array('nickname' => $user->nickname)));
diff --git a/actions/favorited.php b/actions/favorited.php
index 71a9e026e5..9369057322 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -43,9 +43,9 @@ class FavoritedAction extends StreamAction
     {
         $instr = $this->get_instructions();
         $output = common_markup_to_html($instr);
-        common_element_start('div', 'instructions');
-        common_raw($output);
-        common_element_end('div');
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
         $this->public_views_menu();
     }
 
@@ -81,7 +81,7 @@ class FavoritedAction extends StreamAction
         $notice = new Notice;
         $notice->query(sprintf($qry, common_config('popular', 'dropoff')));
 
-        common_element_start('ul', array('id' => 'notices'));
+        $this->elementStart('ul', array('id' => 'notices'));
 
         $cnt = 0;
 
@@ -96,7 +96,7 @@ class FavoritedAction extends StreamAction
             $item->show();
         }
 
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
         common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                           $page, 'favorited');
diff --git a/actions/featured.php b/actions/featured.php
index 2bf8b0b815..0356226914 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -44,9 +44,9 @@ class FeaturedAction extends StreamAction
     {
         $instr = $this->get_instructions();
         $output = common_markup_to_html($instr);
-        common_element_start('div', 'instructions');
-        common_raw($output);
-        common_element_end('div');
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
         $this->public_views_menu();
     }
 
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 0ce1680aa6..7de631712a 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -101,7 +101,7 @@ class FinishaddopenidAction extends Action
     function message($msg)
     {
         common_show_header(_('OpenID Login'));
-        common_element('p', null, $msg);
+        $this->element('p', null, $msg);
         common_show_footer();
     }
 }
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index bdb8516a32..112429002c 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -57,10 +57,10 @@ class FinishopenidloginAction extends Action
     function show_top($error=null)
     {
         if ($error) {
-            common_element('div', array('class' => 'error'), $error);
+            $this->element('div', array('class' => 'error'), $error);
         } else {
             global $config;
-            common_element('div', 'instructions',
+            $this->element('div', 'instructions',
                            sprintf(_('This is the first time you\'ve logged into %s so we must connect your OpenID to a local account. You can either create a new account, or connect with your existing account, if you have one.'), $config['site']['name']));
         }
     }
@@ -70,36 +70,36 @@ class FinishopenidloginAction extends Action
         common_show_header(_('OpenID Account Setup'), null, $error,
                            array($this, 'show_top'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'account_connect',
                                            'action' => common_local_url('finishopenidlogin')));
-        common_hidden('token', common_session_token());
-        common_element('h2', null,
+        $this->hidden('token', common_session_token());
+        $this->element('h2', null,
                        _('Create new account'));
-        common_element('p', null,
+        $this->element('p', null,
                        _('Create a new user with this nickname.'));
-        common_input('newname', _('New nickname'),
+        $this->input('newname', _('New nickname'),
                      ($username) ? $username : '',
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        common_element_start('p');
-        common_element('input', array('type' => 'checkbox',
+        $this->elementStart('p');
+        $this->element('input', array('type' => 'checkbox',
                                       'id' => 'license',
                                       'name' => 'license',
                                       'value' => 'true'));
-        common_text(_('My text and files are available under '));
-        common_element('a', array(href => common_config('license', 'url')),
+        $this->text(_('My text and files are available under '));
+        $this->element('a', array(href => common_config('license', 'url')),
                        common_config('license', 'title'));
-        common_text(_(' except this private data: password, email address, IM address, phone number.'));
-        common_element_end('p');
-        common_submit('create', _('Create'));
-        common_element('h2', null,
+        $this->text(_(' except this private data: password, email address, IM address, phone number.'));
+        $this->elementEnd('p');
+        $this->submit('create', _('Create'));
+        $this->element('h2', null,
                        _('Connect existing account'));
-        common_element('p', null,
+        $this->element('p', null,
                        _('If you already have an account, login with your username and password to connect it to your OpenID.'));
-        common_input('nickname', _('Existing nickname'));
-        common_password('password', _('Password'));
-        common_submit('connect', _('Connect'));
-        common_element_end('form');
+        $this->input('nickname', _('Existing nickname'));
+        $this->password('password', _('Password'));
+        $this->submit('connect', _('Connect'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -154,7 +154,7 @@ class FinishopenidloginAction extends Action
     function message($msg)
     {
         common_show_header(_('OpenID Login'));
-        common_element('p', null, $msg);
+        $this->element('p', null, $msg);
         common_show_footer();
     }
 
diff --git a/actions/foaf.php b/actions/foaf.php
index 30e98960c1..6f73ce505e 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -54,7 +54,7 @@ class FoafAction extends Action
         header('Content-Type: application/rdf+xml');
 
         common_start_xml();
-        common_element_start('rdf:RDF', array('xmlns:rdf' =>
+        $this->elementStart('rdf:RDF', array('xmlns:rdf' =>
                                               'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
                                               'xmlns:rdfs' =>
                                               'http://www.w3.org/2000/01/rdf-schema#',
@@ -67,25 +67,25 @@ class FoafAction extends Action
         $this->show_ppd('', $user->uri);
 
         # XXX: might not be a person
-        common_element_start('Person', array('rdf:about' =>
+        $this->elementStart('Person', array('rdf:about' =>
                                              $user->uri));
-        common_element('mbox_sha1sum', null, sha1('mailto:' . $user->email));
+        $this->element('mbox_sha1sum', null, sha1('mailto:' . $user->email));
         if ($profile->fullname) {
-            common_element('name', null, $profile->fullname);
+            $this->element('name', null, $profile->fullname);
         }
         if ($profile->homepage) {
-            common_element('homepage', array('rdf:resource' => $profile->homepage));
+            $this->element('homepage', array('rdf:resource' => $profile->homepage));
         }
         if ($profile->bio) {
-            common_element('rdfs:comment', null, $profile->bio);
+            $this->element('rdfs:comment', null, $profile->bio);
         }
         # XXX: more structured location data
         if ($profile->location) {
-            common_element_start('based_near');
-            common_element_start('geo:SpatialThing');
-            common_element('name', null, $profile->location);
-            common_element_end('geo:SpatialThing');
-            common_element_end('based_near');
+            $this->elementStart('based_near');
+            $this->elementStart('geo:SpatialThing');
+            $this->element('name', null, $profile->location);
+            $this->elementEnd('geo:SpatialThing');
+            $this->elementEnd('based_near');
         }
 
         $this->show_microblogging_account($profile, common_root_url());
@@ -93,18 +93,18 @@ class FoafAction extends Action
         $avatar = $profile->getOriginalAvatar();
 
         if ($avatar) {
-            common_element_start('img');
-            common_element_start('Image', array('rdf:about' => $avatar->url));
+            $this->elementStart('img');
+            $this->elementStart('Image', array('rdf:about' => $avatar->url));
             foreach (array(AVATAR_PROFILE_SIZE, AVATAR_STREAM_SIZE, AVATAR_MINI_SIZE) as $size) {
                 $scaled = $profile->getAvatar($size);
                 if (!$scaled->original) { # sometimes the original has one of our scaled sizes
-                    common_element_start('thumbnail');
-                    common_element('Image', array('rdf:about' => $scaled->url));
-                    common_element_end('thumbnail');
+                    $this->elementStart('thumbnail');
+                    $this->element('Image', array('rdf:about' => $scaled->url));
+                    $this->elementEnd('thumbnail');
                 }
             }
-            common_element_end('Image');
-            common_element_end('img');
+            $this->elementEnd('Image');
+            $this->elementEnd('img');
         }
 
         # Get people user is subscribed to
@@ -126,7 +126,7 @@ class FoafAction extends Action
                     common_debug('Got a bad subscription: '.print_r($sub,true));
                     continue;
                 }
-                common_element('knows', array('rdf:resource' => $other->uri));
+                $this->element('knows', array('rdf:resource' => $other->uri));
                 $person[$other->uri] = array(LISTENEE, $other);
             }
         }
@@ -156,7 +156,7 @@ class FoafAction extends Action
             }
         }
 
-        common_element_end('Person');
+        $this->elementEnd('Person');
 
         foreach ($person as $uri => $p) {
             $foaf_url = null;
@@ -164,44 +164,44 @@ class FoafAction extends Action
                 $foaf_url = common_local_url('foaf', array('nickname' => $p[1]->nickname));
             }
             $profile = Profile::staticGet($p[1]->id);
-            common_element_start('Person', array('rdf:about' => $uri));
+            $this->elementStart('Person', array('rdf:about' => $uri));
             if ($p[0] == LISTENER || $p[0] == BOTH) {
-                common_element('knows', array('rdf:resource' => $user->uri));
+                $this->element('knows', array('rdf:resource' => $user->uri));
             }
             $this->show_microblogging_account($profile, ($p[1] instanceof User) ?
                                               common_root_url() : null);
             if ($foaf_url) {
-                common_element('rdfs:seeAlso', array('rdf:resource' => $foaf_url));
+                $this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url));
             }
-            common_element_end('Person');
+            $this->elementEnd('Person');
             if ($foaf_url) {
                 $this->show_ppd($foaf_url, $uri);
             }
         }
 
-        common_element_end('rdf:RDF');
+        $this->elementEnd('rdf:RDF');
     }
 
     function show_ppd($foaf_url, $person_uri)
     {
-        common_element_start('PersonalProfileDocument', array('rdf:about' => $foaf_url));
-        common_element('maker', array('rdf:resource' => $person_uri));
-        common_element('primaryTopic', array('rdf:resource' => $person_uri));
-        common_element_end('PersonalProfileDocument');
+        $this->elementStart('PersonalProfileDocument', array('rdf:about' => $foaf_url));
+        $this->element('maker', array('rdf:resource' => $person_uri));
+        $this->element('primaryTopic', array('rdf:resource' => $person_uri));
+        $this->elementEnd('PersonalProfileDocument');
     }
 
     function show_microblogging_account($profile, $service=null)
     {
         # Their account
-        common_element_start('holdsAccount');
-        common_element_start('OnlineAccount');
+        $this->elementStart('holdsAccount');
+        $this->elementStart('OnlineAccount');
         if ($service) {
-            common_element('accountServiceHomepage', array('rdf:resource' =>
+            $this->element('accountServiceHomepage', array('rdf:resource' =>
                                                            $service));
         }
-        common_element('accountName', null, $profile->nickname);
-        common_element('homepage', array('rdf:resource' => $profile->profileurl));
-        common_element_end('OnlineAccount');
-        common_element_end('holdsAccount');
+        $this->element('accountName', null, $profile->nickname);
+        $this->element('homepage', array('rdf:resource' => $profile->profileurl));
+        $this->elementEnd('OnlineAccount');
+        $this->elementEnd('holdsAccount');
     }
 }
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 8ecf200ec9..693f49efa2 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -34,57 +34,57 @@ class ImsettingsAction extends SettingsAction
     {
         $user = common_current_user();
         $this->form_header(_('IM Settings'), $msg, $success);
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'imsettings',
                                            'action' =>
                                            common_local_url('imsettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_element('h2', null, _('Address'));
+        $this->element('h2', null, _('Address'));
 
         if ($user->jabber) {
-            common_element_start('p');
-            common_element('span', 'address confirmed', $user->jabber);
-            common_element('span', 'input_instructions',
+            $this->elementStart('p');
+            $this->element('span', 'address confirmed', $user->jabber);
+            $this->element('span', 'input_instructions',
                            _('Current confirmed Jabber/GTalk address.'));
-            common_hidden('jabber', $user->jabber);
-            common_element_end('p');
-            common_submit('remove', _('Remove'));
+            $this->hidden('jabber', $user->jabber);
+            $this->elementEnd('p');
+            $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->get_confirmation();
             if ($confirm) {
-                common_element_start('p');
-                common_element('span', 'address unconfirmed', $confirm->address);
-                common_element('span', 'input_instructions',
+                $this->elementStart('p');
+                $this->element('span', 'address unconfirmed', $confirm->address);
+                $this->element('span', 'input_instructions',
                                 sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
-                common_hidden('jabber', $confirm->address);
-                common_element_end('p');
-                common_submit('cancel', _('Cancel'));
+                $this->hidden('jabber', $confirm->address);
+                $this->elementEnd('p');
+                $this->submit('cancel', _('Cancel'));
             } else {
-                common_input('jabber', _('IM Address'),
+                $this->input('jabber', _('IM Address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
                          sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
-                common_submit('add', _('Add'));
+                $this->submit('add', _('Add'));
             }
         }
 
-        common_element('h2', null, _('Preferences'));
+        $this->element('h2', null, _('Preferences'));
 
-        common_checkbox('jabbernotify',
+        $this->checkbox('jabbernotify',
                         _('Send me notices through Jabber/GTalk.'),
                         $user->jabbernotify);
-        common_checkbox('updatefrompresence',
+        $this->checkbox('updatefrompresence',
                         _('Post a notice when my Jabber/GTalk status changes.'),
                         $user->updatefrompresence);
-        common_checkbox('jabberreplies',
+        $this->checkbox('jabberreplies',
                         _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
                         $user->jabberreplies);
-        common_checkbox('jabbermicroid',
+        $this->checkbox('jabbermicroid',
                         _('Publish a MicroID for my Jabber/GTalk address.'),
                         $user->jabbermicroid);
-        common_submit('save', _('Save'));
+        $this->submit('save', _('Save'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
         common_show_footer();
     }
 
diff --git a/actions/invite.php b/actions/invite.php
index 80e022a3df..15233602e2 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -89,29 +89,29 @@ class InviteAction extends Action
 
         common_show_header(_('Invitation(s) sent'));
         if ($already) {
-            common_element('p', null, _('You are already subscribed to these users:'));
-            common_element_start('ul');
+            $this->element('p', null, _('You are already subscribed to these users:'));
+            $this->elementStart('ul');
             foreach ($already as $other) {
-                common_element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
             }
-            common_element_end('ul');
+            $this->elementEnd('ul');
         }
         if ($subbed) {
-            common_element('p', null, _('These people are already users and you were automatically subscribed to them:'));
-            common_element_start('ul');
+            $this->element('p', null, _('These people are already users and you were automatically subscribed to them:'));
+            $this->elementStart('ul');
             foreach ($subbed as $other) {
-                common_element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
+                $this->element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
             }
-            common_element_end('ul');
+            $this->elementEnd('ul');
         }
         if ($sent) {
-            common_element('p', null, _('Invitation(s) sent to the following people:'));
-            common_element_start('ul');
+            $this->element('p', null, _('Invitation(s) sent to the following people:'));
+            $this->elementStart('ul');
             foreach ($sent as $other) {
-                common_element('li', null, $other);
+                $this->element('li', null, $other);
             }
-            common_element_end('ul');
-            common_element('p', null, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
+            $this->elementEnd('ul');
+            $this->element('p', null, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
         }
         common_show_footer();
     }
@@ -119,12 +119,12 @@ class InviteAction extends Action
     function show_top($error=null)
     {
         if ($error) {
-            common_element('p', 'error', $error);
+            $this->element('p', 'error', $error);
         } else {
-            common_element_start('div', 'instructions');
-            common_element('p', null,
+            $this->elementStart('div', 'instructions');
+            $this->element('p', null,
                            _('Use this form to invite your friends and colleagues to use this service.'));
-            common_element_end('div');
+            $this->elementEnd('div');
         }
     }
 
@@ -135,22 +135,22 @@ class InviteAction extends Action
 
         common_show_header(_('Invite new users'), null, $error, array($this, 'show_top'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'invite',
                                            'action' => common_local_url('invite')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_textarea('addresses', _('Email addresses'),
+        $this->textarea('addresses', _('Email addresses'),
                         $this->trimmed('addresses'),
                         _('Addresses of friends to invite (one per line)'));
 
-        common_textarea('personal', _('Personal message'),
+        $this->textarea('personal', _('Personal message'),
                         $this->trimmed('personal'),
                         _('Optionally add a personal message to the invitation.'));
 
-        common_submit('send', _('Send'));
+        $this->submit('send', _('Send'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
         common_show_footer();
     }
diff --git a/actions/login.php b/actions/login.php
index 8600d44fd3..fd98e656db 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -106,22 +106,45 @@ class LoginAction extends Action
 
     function show_form($error=null)
     {
-        common_show_header(_('Login'), null, $error, array($this, 'show_top'));
-        common_element_start('form', array('method' => 'post',
+	$this->error = $error;
+	$this->showPage();
+    }
+
+    function title()
+    {
+	return _('Login');
+    }
+
+    function showPageNotice()
+    {
+        if ($this->error) {
+            $this->element('p', 'error', $this->error);
+        } else {
+            $instr = $this->get_instructions();
+            $output = common_markup_to_html($instr);
+	    $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
+        }
+    }
+    
+    function showContent()
+    {      
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'login',
                                            'action' => common_local_url('login')));
-        common_input('nickname', _('Nickname'));
-        common_password('password', _('Password'));
-        common_checkbox('rememberme', _('Remember me'), false,
+        $this->input('nickname', _('Nickname'));
+        $this->password('password', _('Password'));
+        $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
                            'not for shared computers!'));
-        common_submit('submit', _('Login'));
-        common_hidden('token', common_session_token());
-        common_element_end('form');
-        common_element_start('p');
-        common_element('a', array('href' => common_local_url('recoverpassword')),
+        $this->submit('submit', _('Login'));
+        $this->hidden('token', common_session_token());
+        $this->elementEnd('form');
+        $this->elementStart('p');
+        $this->element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
-        common_element_end('p');
+        $this->elementEnd('p');
         common_show_footer();
     }
 
@@ -146,14 +169,5 @@ class LoginAction extends Action
 
     function show_top($error=null)
     {
-        if ($error) {
-            common_element('p', 'error', $error);
-        } else {
-            $instr = $this->get_instructions();
-            $output = common_markup_to_html($instr);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
-        }
     }
 }
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 27fa9d5182..6221b67e9d 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -127,7 +127,7 @@ class NewmessageAction extends Action
                            array($this, 'show_top'));
         
         if ($msg) {
-            common_element('p', array('id'=>'error'), $msg);
+            $this->element('p', array('id'=>'error'), $msg);
         }
         
         common_show_footer();
diff --git a/actions/newnotice.php b/actions/newnotice.php
index c412e893de..89792d95ac 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -92,13 +92,13 @@ class NewnoticeAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Notice posted'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Notice posted'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             $this->show_notice($notice);
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             $returnto = $this->trimmed('returnto');
 
@@ -116,13 +116,13 @@ class NewnoticeAction extends Action
     function ajax_error_msg($msg)
     {
         common_start_html('text/xml;charset=utf-8', true);
-        common_element_start('head');
-        common_element('title', null, _('Ajax Error'));
-        common_element_end('head');
-        common_element_start('body');
-        common_element('p', array('id' => 'error'), $msg);
-        common_element_end('body');
-        common_element_end('html');
+        $this->elementStart('head');
+        $this->element('title', null, _('Ajax Error'));
+        $this->elementEnd('head');
+        $this->elementStart('body');
+        $this->element('p', array('id' => 'error'), $msg);
+        $this->elementEnd('body');
+        $this->elementEnd('html');
     }
 
     function show_top($content=null)
@@ -147,7 +147,7 @@ class NewnoticeAction extends Action
         common_show_header(_('New notice'), null, $content,
                            array($this, 'show_top'));
         if ($msg) {
-            common_element('p', array('id' => 'error'), $msg);
+            $this->element('p', array('id' => 'error'), $msg);
         }
         common_show_footer();
     }
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index b36fc8ad20..d998b9da8f 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -58,7 +58,7 @@ class NoticesearchAction extends SearchAction
         }
         if ($cnt > 0) {
             $terms = preg_split('/[\s,]+/', $q);
-            common_element_start('ul', array('id' => 'notices'));
+            $this->elementStart('ul', array('id' => 'notices'));
             for ($i = 0; $i < min($cnt, NOTICES_PER_PAGE); $i++) {
                 if ($notice->fetch()) {
                     $this->show_notice($notice, $terms);
@@ -67,9 +67,9 @@ class NoticesearchAction extends SearchAction
                     break;
                 }
             }
-            common_element_end('ul');
+            $this->elementEnd('ul');
         } else {
-            common_element('p', 'error', _('No results'));
+            $this->element('p', 'error', _('No results'));
         }
 
         common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
@@ -82,7 +82,7 @@ class NoticesearchAction extends SearchAction
             $q = $arr[0];
         }
         if ($q) {
-            common_element('link', array('rel' => 'alternate',
+            $this->element('link', array('rel' => 'alternate',
                                          'href' => common_local_url('noticesearchrss',
                                                                     array('q' => $q)),
                                          'type' => 'application/rss+xml',
@@ -101,58 +101,58 @@ class NoticesearchAction extends SearchAction
             return;
         }
         # XXX: RDFa
-        common_element_start('li', array('class' => 'notice_single',
+        $this->elementStart('li', array('class' => 'notice_single',
                                           'id' => 'notice-' . $notice->id));
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-        common_element_start('a', array('href' => $profile->profileurl));
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+        $this->elementStart('a', array('href' => $profile->profileurl));
+        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
                                     'class' => 'avatar stream',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($profile->fullname) ? $profile->fullname :
                                     $profile->nickname));
-        common_element_end('a');
-        common_element('a', array('href' => $profile->profileurl,
+        $this->elementEnd('a');
+        $this->element('a', array('href' => $profile->profileurl,
                                   'class' => 'nickname'),
                        $profile->nickname);
         # FIXME: URL, image, video, audio
-        common_element_start('p', array('class' => 'content'));
+        $this->elementStart('p', array('class' => 'content'));
         if ($notice->rendered) {
-            common_raw($this->highlight($notice->rendered, $terms));
+            $this->raw($this->highlight($notice->rendered, $terms));
         } else {
             # XXX: may be some uncooked notices in the DB,
             # we cook them right now. This should probably disappear in future
             # versions (>> 0.4.x)
-            common_raw($this->highlight(common_render_content($notice->content, $notice), $terms));
+            $this->raw($this->highlight(common_render_content($notice->content, $notice), $terms));
         }
-        common_element_end('p');
+        $this->elementEnd('p');
         $noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-        common_element_start('p', 'time');
-        common_element('a', array('class' => 'permalink',
+        $this->elementStart('p', 'time');
+        $this->element('a', array('class' => 'permalink',
                                   'href' => $noticeurl,
                                   'title' => common_exact_date($notice->created)),
                        common_date_string($notice->created));
         if ($notice->reply_to) {
             $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
-            common_text(' (');
-            common_element('a', array('class' => 'inreplyto',
+            $this->text(' (');
+            $this->element('a', array('class' => 'inreplyto',
                                       'href' => $replyurl),
                            _('in reply to...'));
-            common_text(')');
+            $this->text(')');
         }
-        common_element_start('a',
+        $this->elementStart('a',
                              array('href' => common_local_url('newnotice',
                                                               array('replyto' => $profile->nickname)),
                                    'onclick' => 'doreply("'.$profile->nickname.'"); return false',
                                    'title' => _('reply'),
                                    'class' => 'replybutton'));
-        common_hidden('posttoken', common_session_token());
+        $this->hidden('posttoken', common_session_token());
         
-        common_raw('&rarr;');
-        common_element_end('a');
-        common_element_end('p');
-        common_element_end('li');
+        $this->raw('&rarr;');
+        $this->elementEnd('a');
+        $this->elementEnd('p');
+        $this->elementEnd('li');
     }
 
     function highlight($text, $terms)
diff --git a/actions/nudge.php b/actions/nudge.php
index a6480a5827..de930e4628 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -59,13 +59,13 @@ class NudgeAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Nudge sent'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Nudge sent'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             common_nudge_response();
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             // display a confirmation to the user
             common_redirect(common_local_url('showstream',
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 09679e372e..82791af349 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -66,13 +66,13 @@ class OpenidloginAction extends Action
     function show_top($error=null)
     {
         if ($error) {
-            common_element('div', array('class' => 'error'), $error);
+            $this->element('div', array('class' => 'error'), $error);
         } else {
             $instr = $this->get_instructions();
             $output = common_markup_to_html($instr);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
         }
     }
 
@@ -80,18 +80,18 @@ class OpenidloginAction extends Action
     {
         common_show_header(_('OpenID Login'), null, $error, array($this, 'show_top'));
         $formaction = common_local_url('openidlogin');
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'openidlogin',
                                            'action' => $formaction));
-        common_hidden('token', common_session_token());
-        common_input('openid_url', _('OpenID URL'),
+        $this->hidden('token', common_session_token());
+        $this->input('openid_url', _('OpenID URL'),
                      $openid_url,
                      _('Your OpenID URL'));
-        common_checkbox('rememberme', _('Remember me'), false,
+        $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
                            'not for shared computers!'));
-        common_submit('submit', _('Login'));
-        common_element_end('form');
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 }
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 039236048a..9265b5ea62 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -39,28 +39,28 @@ class OpenidsettingsAction extends SettingsAction
 
         $this->form_header(_('OpenID settings'), $msg, $success);
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'openidadd',
                                            'action' =>
                                            common_local_url('openidsettings')));
-        common_hidden('token', common_session_token());
-        common_element('h2', null, _('Add OpenID'));
-        common_element('p', null,
+        $this->hidden('token', common_session_token());
+        $this->element('h2', null, _('Add OpenID'));
+        $this->element('p', null,
                        _('If you want to add an OpenID to your account, ' .
                           'enter it in the box below and click "Add".'));
-        common_element_start('p');
-        common_element('label', array('for' => 'openid_url'),
+        $this->elementStart('p');
+        $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
-        common_element('input', array('name' => 'openid_url',
+        $this->element('input', array('name' => 'openid_url',
                                       'type' => 'text',
                                       'id' => 'openid_url'));
-        common_element('input', array('type' => 'submit',
+        $this->element('input', array('type' => 'submit',
                                       'id' => 'add',
                                       'name' => 'add',
                                       'class' => 'submit',
                                       'value' => _('Add')));
-        common_element_end('p');
-        common_element_end('form');
+        $this->elementEnd('p');
+        $this->elementEnd('form');
 
         $oid = new User_openid();
         $oid->user_id = $user->id;
@@ -69,48 +69,48 @@ class OpenidsettingsAction extends SettingsAction
 
         if ($cnt > 0) {
 
-            common_element('h2', null, _('Remove OpenID'));
+            $this->element('h2', null, _('Remove OpenID'));
 
             if ($cnt == 1 && !$user->password) {
 
-                common_element('p', null,
+                $this->element('p', null,
                                _('Removing your only OpenID would make it impossible to log in! ' .
                                   'If you need to remove it, add another OpenID first.'));
 
                 if ($oid->fetch()) {
-                    common_element_start('p');
-                    common_element('a', array('href' => $oid->canonical),
+                    $this->elementStart('p');
+                    $this->element('a', array('href' => $oid->canonical),
                                    $oid->display);
-                    common_element_end('p');
+                    $this->elementEnd('p');
                 }
 
             } else {
 
-                common_element('p', null,
+                $this->element('p', null,
                                _('You can remove an OpenID from your account '.
                                   'by clicking the button marked "Remove".'));
                 $idx = 0;
 
                 while ($oid->fetch()) {
-                    common_element_start('form', array('method' => 'POST',
+                    $this->elementStart('form', array('method' => 'POST',
                                                        'id' => 'openiddelete' . $idx,
                                                        'action' =>
                                                        common_local_url('openidsettings')));
-                    common_element_start('p');
-                    common_hidden('token', common_session_token());
-                    common_element('a', array('href' => $oid->canonical),
+                    $this->elementStart('p');
+                    $this->hidden('token', common_session_token());
+                    $this->element('a', array('href' => $oid->canonical),
                                    $oid->display);
-                    common_element('input', array('type' => 'hidden',
+                    $this->element('input', array('type' => 'hidden',
                                                   'id' => 'openid_url'.$idx,
                                                   'name' => 'openid_url',
                                                   'value' => $oid->canonical));
-                    common_element('input', array('type' => 'submit',
+                    $this->element('input', array('type' => 'submit',
                                                   'id' => 'remove'.$idx,
                                                   'name' => 'remove',
                                                   'class' => 'submit',
                                                   'value' => _('Remove')));
-                    common_element_end('p');
-                    common_element_end('form');
+                    $this->elementEnd('p');
+                    $this->elementEnd('form');
                     $idx++;
                 }
             }
diff --git a/actions/opensearch.php b/actions/opensearch.php
index 96691fa6f3..6e6e794e96 100644
--- a/actions/opensearch.php
+++ b/actions/opensearch.php
@@ -41,21 +41,21 @@ class OpensearchAction extends Action
         header('Content-Type: text/html');
 
         common_start_xml();
-        common_element_start('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
+        $this->elementStart('OpenSearchDescription', array('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/'));
 
         $short_name =  common_config('site', 'name').' '.$short_name;
-        common_element('ShortName', null, $short_name);
-        common_element('Contact', null, common_config('site', 'email'));
-        common_element('Url', array('type' => 'text/html', 'method' => 'get',
+        $this->element('ShortName', null, $short_name);
+        $this->element('Contact', null, common_config('site', 'email'));
+        $this->element('Url', array('type' => 'text/html', 'method' => 'get',
                        'template' => str_replace('---', '{searchTerms}', common_local_url($type, array('q' => '---')))));
-        common_element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
-        common_element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
-        common_element('AdultContent', null, 'false');
-        common_element('Language', null, common_language());
-        common_element('OutputEncoding', null, 'UTF-8');
-        common_element('InputEncoding', null, 'UTF-8');
+        $this->element('Image', array('height' => 16, 'width' => 16, 'type' => 'image/vnd.microsoft.icon'), common_path('favicon.ico'));
+        $this->element('Image', array('height' => 50, 'width' => 50, 'type' => 'image/png'), theme_path('logo.png'));
+        $this->element('AdultContent', null, 'false');
+        $this->element('Language', null, common_language());
+        $this->element('OutputEncoding', null, 'UTF-8');
+        $this->element('InputEncoding', null, 'UTF-8');
 
-        common_element_end('OpenSearchDescription');
+        $this->elementEnd('OpenSearchDescription');
         common_end_xml();
     }
 }
diff --git a/actions/othersettings.php b/actions/othersettings.php
index c2f08934c0..97cbd0094e 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -35,12 +35,12 @@ class OthersettingsAction extends SettingsAction
 
         $this->form_header(_('Other Settings'), $msg, $success);
 
-        common_element('h2', null, _('URL Auto-shortening'));
-        common_element_start('form', array('method' => 'post',
+        $this->element('h2', null, _('URL Auto-shortening'));
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'othersettings',
                                            'action' =>
                                            common_local_url('othersettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
         $services = array(
             '' => 'None',
@@ -54,13 +54,13 @@ class OthersettingsAction extends SettingsAction
             'metamark.net' => 'metamark.net'
         );
 
-        common_dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
+        $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
 
-        common_submit('save', _('Save'));
+        $this->submit('save', _('Save'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
-//        common_element('h2', null, _('Delete my account'));
+//        $this->element('h2', null, _('Delete my account'));
 //        $this->show_delete_form();
 
         common_show_footer();
@@ -68,15 +68,15 @@ class OthersettingsAction extends SettingsAction
 
     function show_feeds_list($feeds)
     {
-        common_element_start('div', array('class' => 'feedsdel'));
-        common_element('p', null, 'Feeds:');
-        common_element_start('ul', array('class' => 'xoxo'));
+        $this->elementStart('div', array('class' => 'feedsdel'));
+        $this->element('p', null, 'Feeds:');
+        $this->elementStart('ul', array('class' => 'xoxo'));
 
         foreach ($feeds as $key => $value) {
             $this->common_feed_item($feeds[$key]);
         }
-        common_element_end('ul');
-        common_element_end('div');
+        $this->elementEnd('ul');
+        $this->elementEnd('div');
     }
 
     //TODO move to common.php (and retrace its origin)
@@ -100,13 +100,13 @@ class OthersettingsAction extends SettingsAction
                 $feed['textContent'] = "FOAF";
                 break;
         }
-        common_element_start('li');
-        common_element('a', array('href' => $feed['href'],
+        $this->elementStart('li');
+        $this->element('a', array('href' => $feed['href'],
                                   'class' => $feed_classname,
                                   'type' => $feed_mimetype,
                                   'title' => $feed_title),
                             $feed['textContent']);
-        common_element_end('li');
+        $this->elementEnd('li');
     }
 
 //    function show_delete_form() {
@@ -115,13 +115,13 @@ class OthersettingsAction extends SettingsAction
 //      $notices->profile_id = $user->id;
 //      $notice_count = (int) $notices->count();
 //
-//        common_element_start('form', array('method' => 'POST',
+//        $this->elementStart('form', array('method' => 'POST',
 //                                           'id' => 'delete',
 //                                           'action' =>
 //                                           common_local_url('deleteprofile')));
 //
-//        common_hidden('token', common_session_token());
-//      common_element('p', null, "You can copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
+//        $this->hidden('token', common_session_token());
+//      $this->element('p', null, "You can copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
 //
 //        $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
 //                                              'type' => 'rss',
@@ -132,8 +132,8 @@ class OthersettingsAction extends SettingsAction
 //                                              'version' => 'FOAF',
 //                                              'item' => 'foaf')));
 //
-//        common_submit('deleteaccount', _('Delete my account'));
-//        common_element_end('form');
+//        $this->submit('deleteaccount', _('Delete my account'));
+//        $this->elementEnd('form');
 //    }
 
     function handle_post()
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 0d0fae4e5c..2b13b08128 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -60,7 +60,7 @@ class PeoplesearchAction extends SearchAction
             $results = new PeopleSearchResults($profile, $terms);
             $results->show_list();
         } else {
-            common_element('p', 'error', _('No results'));
+            $this->element('p', 'error', _('No results'));
         }
 
         $profile->free();
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 13a0b7a413..2680638d7c 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -90,11 +90,11 @@ class PeopletagAction extends Action
     {
         $instr = sprintf(_('These are users who have tagged themselves "%s" ' .
                            'to show a common interest, characteristic, hobby or job.'), $tag);
-        common_element_start('div', 'instructions');
-        common_element_start('p');
-        common_text($instr);
-        common_element_end('p');
-        common_element_end('div');
+        $this->elementStart('div', 'instructions');
+        $this->elementStart('p');
+        $this->text($instr);
+        $this->elementEnd('p');
+        $this->elementEnd('div');
     }
 
     function get_title()
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index d861919b92..ef45fc1d9f 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -34,11 +34,11 @@ class ProfilesettingsAction extends SettingsAction
     {
         $this->form_header(_('Profile settings'), $msg, $success);
         $this->show_settings_form();
-        common_element('h2', null, _('Avatar'));
+        $this->element('h2', null, _('Avatar'));
         $this->show_avatar_form();
-        common_element('h2', null, _('Change password'));
+        $this->element('h2', null, _('Change password'));
         $this->show_password_form();
-//        common_element('h2', null, _('Delete my account'));
+//        $this->element('h2', null, _('Delete my account'));
 //        $this->show_delete_form();
         common_show_footer();
     }
@@ -74,46 +74,46 @@ class ProfilesettingsAction extends SettingsAction
         $user = common_current_user();
         $profile = $user->getProfile();
 
-        common_element_start('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'POST',
                                            'id' => 'profilesettings',
                                            'action' => common_local_url('profilesettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
         
         # too much common patterns here... abstractable?
         
-        common_input('nickname', _('Nickname'),
+        $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
-        common_input('fullname', _('Full name'),
+        $this->input('fullname', _('Full name'),
                      ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
-        common_input('homepage', _('Homepage'),
+        $this->input('homepage', _('Homepage'),
                      ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
                      _('URL of your homepage, blog, or profile on another site'));
-        common_textarea('bio', _('Bio'),
+        $this->textarea('bio', _('Bio'),
                         ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
                         _('Describe yourself and your interests in 140 chars'));
-        common_input('location', _('Location'),
+        $this->input('location', _('Location'),
                      ($this->arg('location')) ? $this->arg('location') : $profile->location,
                      _('Where you are, like "City, State (or Region), Country"'));
-        common_input('tags', _('Tags'),
+        $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
                      _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
 
         $language = common_language();
-        common_dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
+        $this->dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
         $timezone = common_timezone();
         $timezones = array();
         foreach(DateTimeZone::listIdentifiers() as $k => $v) {
             $timezones[$v] = $v;
         }
-        common_dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
+        $this->dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
 
-        common_checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
+        $this->checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
                         ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
 
-        common_submit('save', _('Save'));
+        $this->submit('save', _('Save'));
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
     }
 
@@ -132,62 +132,62 @@ class ProfilesettingsAction extends SettingsAction
         $original = $profile->getOriginalAvatar();
 
 
-        common_element_start('form', array('enctype' => 'multipart/form-data',
+        $this->elementStart('form', array('enctype' => 'multipart/form-data',
                                            'method' => 'POST',
                                            'id' => 'avatar',
                                            'action' =>
                                            common_local_url('profilesettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
         if ($original) {
-            common_element_start('div', array('id'=>'avatar_original', 'class'=>'avatar_view'));
-            common_element('h3', null, _("Original:"));
-            common_element_start('div', array('id'=>'avatar_original_view'));
-            common_element('img', array('src' => $original->url,
+            $this->elementStart('div', array('id'=>'avatar_original', 'class'=>'avatar_view'));
+            $this->element('h3', null, _("Original:"));
+            $this->elementStart('div', array('id'=>'avatar_original_view'));
+            $this->element('img', array('src' => $original->url,
                                         'class' => 'avatar original',
                                         'width' => $original->width,
                                         'height' => $original->height,
                                         'alt' => $user->nickname));
-            common_element_end('div');
-            common_element_end('div');
+            $this->elementEnd('div');
+            $this->elementEnd('div');
         }
 
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
         if ($avatar) {
-            common_element_start('div', array('id'=>'avatar_preview', 'class'=>'avatar_view'));
-            common_element('h3', null, _("Preview:"));
-            common_element_start('div', array('id'=>'avatar_preview_view'));
-            common_element('img', array('src' => $original->url,//$avatar->url,
+            $this->elementStart('div', array('id'=>'avatar_preview', 'class'=>'avatar_view'));
+            $this->element('h3', null, _("Preview:"));
+            $this->elementStart('div', array('id'=>'avatar_preview_view'));
+            $this->element('img', array('src' => $original->url,//$avatar->url,
                                         'class' => 'avatar profile',
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $user->nickname));
-            common_element_end('div');
-            common_element_end('div');
+            $this->elementEnd('div');
+            $this->elementEnd('div');
 
             foreach(array('avatar_crop_x', 'avatar_crop_y', 'avatar_crop_w', 'avatar_crop_h') as $crop_info) {
-                common_element('input', array('name' => $crop_info,
+                $this->element('input', array('name' => $crop_info,
                                               'type' => 'hidden',
                                               'id' => $crop_info));
             }
-            common_submit('crop', _('Crop'));
+            $this->submit('crop', _('Crop'));
         }
 
-        common_element('input', array('name' => 'MAX_FILE_SIZE',
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
                                       'type' => 'hidden',
                                       'id' => 'MAX_FILE_SIZE',
                                       'value' => MAX_AVATAR_SIZE));
 
-        common_element_start('p');
+        $this->elementStart('p');
 
-        common_element('input', array('name' => 'avatarfile',
+        $this->element('input', array('name' => 'avatarfile',
                                       'type' => 'file',
                                       'id' => 'avatarfile'));
-        common_element_end('p');
+        $this->elementEnd('p');
 
-        common_submit('upload', _('Upload'));
-        common_element_end('form');
+        $this->submit('upload', _('Upload'));
+        $this->elementEnd('form');
 
     }
 
@@ -195,23 +195,23 @@ class ProfilesettingsAction extends SettingsAction
     {
 
         $user = common_current_user();
-        common_element_start('form', array('method' => 'POST',
+        $this->elementStart('form', array('method' => 'POST',
                                            'id' => 'password',
                                            'action' =>
                                            common_local_url('profilesettings')));
 
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
         # Users who logged in with OpenID won't have a pwd
         if ($user->password) {
-            common_password('oldpassword', _('Old password'));
+            $this->password('oldpassword', _('Old password'));
         }
-        common_password('newpassword', _('New password'),
+        $this->password('newpassword', _('New password'),
                         _('6 or more characters'));
-        common_password('confirm', _('Confirm'),
+        $this->password('confirm', _('Confirm'),
                         _('same as password above'));
-        common_submit('changepass', _('Change'));
-        common_element_end('form');
+        $this->submit('changepass', _('Change'));
+        $this->elementEnd('form');
     }
 
     function save_profile()
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index 3d731d79fa..f66e34533a 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -39,45 +39,45 @@ class PublicxrdsAction extends Action
         header('Content-Type: application/xrds+xml');
 
         common_start_xml();
-        common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
+        $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
 
-        common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
 
-        common_element('Type', null, 'xri://$xrds*simple');
+        $this->element('Type', null, 'xri://$xrds*simple');
 
         foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) {
             $this->show_service(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
                                 common_local_url($finish));
         }
 
-        common_element_end('XRD');
+        $this->elementEnd('XRD');
 
-        common_element_end('XRDS');
+        $this->elementEnd('XRDS');
         common_end_xml();
     }
 
     function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
     {
-        common_element_start('Service');
+        $this->elementStart('Service');
         if ($uri) {
-            common_element('URI', null, $uri);
+            $this->element('URI', null, $uri);
         }
-        common_element('Type', null, $type);
+        $this->element('Type', null, $type);
         if ($params) {
             foreach ($params as $param) {
-                common_element('Type', null, $param);
+                $this->element('Type', null, $param);
             }
         }
         if ($sigs) {
             foreach ($sigs as $sig) {
-                common_element('Type', null, $sig);
+                $this->element('Type', null, $sig);
             }
         }
         if ($localId) {
-            common_element('LocalID', null, $localId);
+            $this->element('LocalID', null, $localId);
         }
-        common_element_end('Service');
+        $this->elementEnd('Service');
     }
 }
\ No newline at end of file
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index bb6ef81d60..3e6ecfb1f9 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -141,24 +141,24 @@ class RecoverpasswordAction extends Action
     function show_top($msg=null)
     {
         if ($msg) {
-            common_element('div', 'error', $msg);
+            $this->element('div', 'error', $msg);
         } else {
-            common_element_start('div', 'instructions');
-            common_element('p', null, 
+            $this->elementStart('div', 'instructions');
+            $this->element('p', null, 
                            _('If you\'ve forgotten or lost your' .
                               ' password, you can get a new one sent to' .
                               ' the email address you have stored ' .
                               ' in your account.'));
-            common_element_end('div');
+            $this->elementEnd('div');
         }
     }
 
     function show_password_top($msg=null)
     {
         if ($msg) {
-            common_element('div', 'error', $msg);
+            $this->element('div', 'error', $msg);
         } else {
-            common_element('div', 'instructions',
+            $this->element('div', 'instructions',
                            _('You\'ve been identified. Enter a ' .
                               ' new password below. '));
         }
@@ -170,15 +170,15 @@ class RecoverpasswordAction extends Action
         common_show_header(_('Recover password'), null,
         $msg, array($this, 'show_top'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'recoverpassword',
                                            'action' => common_local_url('recoverpassword')));
-        common_input('nicknameoremail', _('Nickname or email'),
+        $this->input('nicknameoremail', _('Nickname or email'),
                      $this->trimmed('nicknameoremail'),
                      _('Your nickname on this server, ' .
                         'or your registered email address.'));
-        common_submit('recover', _('Recover'));
-        common_element_end('form');
+        $this->submit('recover', _('Recover'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -188,16 +188,16 @@ class RecoverpasswordAction extends Action
         common_show_header(_('Reset password'), null,
         $msg, array($this, 'show_password_top'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'recoverpassword',
                                            'action' => common_local_url('recoverpassword')));
-        common_hidden('token', common_session_token());
-        common_password('newpassword', _('New password'),
+        $this->hidden('token', common_session_token());
+        $this->password('newpassword', _('New password'),
                         _('6 or more characters, and don\'t forget it!'));
-        common_password('confirm', _('Confirm'),
+        $this->password('confirm', _('Confirm'),
                         _('Same as password above'));
-        common_submit('reset', _('Reset'));
-        common_element_end('form');
+        $this->submit('reset', _('Reset'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -278,7 +278,7 @@ class RecoverpasswordAction extends Action
         mail_to_user($user, _('Password recovery requested'), $body, $confirm->address);
 
         common_show_header(_('Password recovery requested'));
-        common_element('p', null,
+        $this->element('p', null,
                        _('Instructions for recovering your password ' .
                           'have been sent to the email address registered to your ' .
                           'account.'));
@@ -336,7 +336,7 @@ class RecoverpasswordAction extends Action
         common_real_login(true);
 
         common_show_header(_('Password saved.'));
-        common_element('p', null, _('New password successfully saved. ' .
+        $this->element('p', null, _('New password successfully saved. ' .
                                      'You are now logged in.'));
         common_show_footer();
     }
diff --git a/actions/register.php b/actions/register.php
index c479816ef5..bac1796876 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -155,16 +155,16 @@ class RegisterAction extends Action
     function show_top($error=null)
     {
         if ($error) {
-            common_element('p', 'error', $error);
+            $this->element('p', 'error', $error);
         } else {
             $instr = common_markup_to_html(_('With this form you can create a new account. ' .
                                              'You can then post notices and link up to friends and colleagues. '.
                                              '(Have an [OpenID](http://openid.net/)? ' .
                                              'Try our [OpenID registration](%%action.openidlogin%%)!)'));
 
-            common_element_start('div', 'instructions');
-            common_raw($instr);
-            common_element_end('div');
+            $this->elementStart('div', 'instructions');
+            $this->raw($instr);
+            $this->elementEnd('div');
         }
     }
 
@@ -184,45 +184,45 @@ class RegisterAction extends Action
         }
 
         common_show_header(_('Register'), null, $error, array($this, 'show_top'));
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'login',
                                            'action' => common_local_url('register')));
 
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
         if ($code) {
-            common_hidden('code', $code);
+            $this->hidden('code', $code);
         }
 
-        common_input('nickname', _('Nickname'), $this->trimmed('nickname'),
+        $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
                      _('1-64 lowercase letters or numbers, no punctuation or spaces. Required.'));
-        common_password('password', _('Password'),
+        $this->password('password', _('Password'),
                         _('6 or more characters. Required.'));
-        common_password('confirm', _('Confirm'),
+        $this->password('confirm', _('Confirm'),
                         _('Same as password above. Required.'));
         if ($invite && $invite->address_type == 'email') {
-            common_input('email', _('Email'), $invite->address,
+            $this->input('email', _('Email'), $invite->address,
                      _('Used only for updates, announcements, and password recovery'));
         } else {
-            common_input('email', _('Email'), $this->trimmed('email'),
+            $this->input('email', _('Email'), $this->trimmed('email'),
                          _('Used only for updates, announcements, and password recovery'));
         }
-        common_input('fullname', _('Full name'),
+        $this->input('fullname', _('Full name'),
                      $this->trimmed('fullname'),
                       _('Longer name, preferably your "real" name'));
-        common_input('homepage', _('Homepage'),
+        $this->input('homepage', _('Homepage'),
                      $this->trimmed('homepage'),
                      _('URL of your homepage, blog, or profile on another site'));
-        common_textarea('bio', _('Bio'),
+        $this->textarea('bio', _('Bio'),
                         $this->trimmed('bio'),
                          _('Describe yourself and your interests in 140 chars'));
-        common_input('location', _('Location'),
+        $this->input('location', _('Location'),
                      $this->trimmed('location'),
                      _('Where you are, like "City, State (or Region), Country"'));
-        common_checkbox('rememberme', _('Remember me'),
+        $this->checkbox('rememberme', _('Remember me'),
                         $this->boolean('rememberme'),
                         _('Automatically login in the future; not for shared computers!'));
-        common_element_start('p');
+        $this->elementStart('p');
         $attrs = array('type' => 'checkbox',
                        'id' => 'license',
                        'name' => 'license',
@@ -230,14 +230,14 @@ class RegisterAction extends Action
         if ($this->boolean('license')) {
             $attrs['checked'] = 'checked';
         }
-        common_element('input', $attrs);
-        common_text(_('My text and files are available under '));
-        common_element('a', array('href' => $config['license']['url']),
+        $this->element('input', $attrs);
+        $this->text(_('My text and files are available under '));
+        $this->element('a', array('href' => $config['license']['url']),
                        $config['license']['title']);
-        common_text(_(' except this private data: password, email address, IM address, phone number.'));
-        common_element_end('p');
-        common_submit('submit', _('Register'));
-        common_element_end('form');
+        $this->text(_(' except this private data: password, email address, IM address, phone number.'));
+        $this->elementEnd('p');
+        $this->submit('submit', _('Register'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -245,7 +245,7 @@ class RegisterAction extends Action
     {
         $nickname = $this->arg('nickname');
         common_show_header(_('Registration successful'));
-        common_element_start('div', 'success');
+        $this->elementStart('div', 'success');
         $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...'. "\n\n" .
                            '* Go to [your profile](%s) and post your first message.' .  "\n" .
                            '* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send notices through instant messages.' . "\n" .
@@ -254,14 +254,14 @@ class RegisterAction extends Action
                            '* Read over the [online docs](%%%%doc.help%%%%) for features you may have missed. ' . "\n\n" .
                            'Thanks for signing up and we hope you enjoy using this service.'),
                          $nickname, common_local_url('showstream', array('nickname' => $nickname)));
-        common_raw(common_markup_to_html($instr));
+        $this->raw(common_markup_to_html($instr));
         $have_email = $this->trimmed('email');
         if ($have_email) {
             $emailinstr = _('(You should receive a message by email momentarily, with ' .
                             'instructions on how to confirm your email address.)');
-            common_raw(common_markup_to_html($emailinstr));
+            $this->raw(common_markup_to_html($emailinstr));
         }
-        common_element_end('div');
+        $this->elementEnd('div');
         common_show_footer();
     }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index a9494772eb..b9e29d645d 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -61,13 +61,13 @@ class RemotesubscribeAction extends Action
     function show_top($err=null)
     {
         if ($err) {
-            common_element('div', 'error', $err);
+            $this->element('div', 'error', $err);
         } else {
             $instructions = $this->get_instructions();
             $output = common_markup_to_html($instructions);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('p');
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('p');
         }
     }
 
@@ -79,15 +79,15 @@ class RemotesubscribeAction extends Action
                            array($this, 'show_top'));
         # id = remotesubscribe conflicts with the
         # button on profile page
-        common_element_start('form', array('id' => 'remsub', 'method' => 'post',
+        $this->elementStart('form', array('id' => 'remsub', 'method' => 'post',
                                            'action' => common_local_url('remotesubscribe')));
-        common_hidden('token', common_session_token());
-        common_input('nickname', _('User nickname'), $nickname,
+        $this->hidden('token', common_session_token());
+        $this->input('nickname', _('User nickname'), $nickname,
                      _('Nickname of the user you want to follow'));
-        common_input('profile_url', _('Profile URL'), $profile,
+        $this->input('profile_url', _('Profile URL'), $profile,
                      _('URL of your profile on another compatible microblogging service'));
-        common_submit('submit', _('Subscribe'));
-        common_element_end('form');
+        $this->submit('submit', _('Subscribe'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
diff --git a/actions/replies.php b/actions/replies.php
index eceeb4d650..8785508884 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -62,7 +62,7 @@ class RepliesAction extends StreamAction
 
     function show_header($user)
     {
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('repliesrss', array('nickname' =>
                                                                                     $user->nickname)),
                                      'type' => 'application/rss+xml',
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index f4344833d9..1dec3ba5ba 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -57,7 +57,7 @@ class ShowfavoritesAction extends StreamAction
 
     function show_header($user)
     {
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('favoritesrss', array('nickname' =>
                                                                                       $user->nickname)),
                                      'type' => 'application/rss+xml',
diff --git a/actions/shownotice.php b/actions/shownotice.php
index 2df09cb3fc..c519af0ba3 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -81,10 +81,10 @@ class ShownoticeAction extends StreamAction
                            array($this, 'show_header'), null,
                            array($this, 'show_top'));
 
-        common_element_start('ul', array('id' => 'notices'));
+        $this->elementStart('ul', array('id' => 'notices'));
         $nli = new NoticeListItem($this->notice);
         $nli->show();
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
         common_show_footer();
     }
@@ -99,12 +99,12 @@ class ShownoticeAction extends StreamAction
         }
 
         if ($user->emailmicroid && $user->email && $this->notice->uri) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($this->notice->uri))));
         }
 
         if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($this->notice->uri))));
         }
     }
diff --git a/actions/showstream.php b/actions/showstream.php
index e4e5d96d15..9a59f7ae45 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -106,53 +106,53 @@ class ShowstreamAction extends StreamAction
     function show_header($user)
     {
         # Feeds
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.rss',
                                                                       'argument' => $user->nickname)),
                                      'type' => 'application/rss+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
-        common_element('link', array('rel' => 'alternate feed',
+        $this->element('link', array('rel' => 'alternate feed',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.atom',
                                                                       'argument' => $user->nickname)),
                                      'type' => 'application/atom+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
-        common_element('link', array('rel' => 'alternate',
+        $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('userrss', array('nickname' =>
                                                                                $user->nickname)),
                                      'type' => 'application/rdf+xml',
                                      'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
         # FOAF
-        common_element('link', array('rel' => 'meta',
+        $this->element('link', array('rel' => 'meta',
                                      'href' => common_local_url('foaf', array('nickname' =>
                                                                               $user->nickname)),
                                      'type' => 'application/rdf+xml',
                                      'title' => 'FOAF'));
         # for remote subscriptions etc.
-        common_element('meta', array('http-equiv' => 'X-XRDS-Location',
+        $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('xrds', array('nickname' =>
                                                                                $user->nickname))));
         $profile = $user->getProfile();
         if ($profile->bio) {
-            common_element('meta', array('name' => 'description',
+            $this->element('meta', array('name' => 'description',
                                          'content' => $profile->bio));
         }
 
         if ($user->emailmicroid && $user->email && $profile->profileurl) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl))));
         }
         if ($user->jabbermicroid && $user->jabber && $profile->profileurl) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl))));
         }
 
         # See https://wiki.mozilla.org/Microsummaries
 
-        common_element('link', array('rel' => 'microsummary',
+        $this->element('link', array('rel' => 'microsummary',
                                      'href' => common_local_url('microsummary',
                                                                 array('nickname' => $profile->nickname))));
     }
@@ -165,7 +165,7 @@ class ShowstreamAction extends StreamAction
     function show_profile($profile)
     {
 
-        common_element_start('div', array('id' => 'profile', 'class' => 'vcard'));
+        $this->elementStart('div', array('id' => 'profile', 'class' => 'vcard'));
 
         $this->show_personal($profile);
 
@@ -175,23 +175,23 @@ class ShowstreamAction extends StreamAction
 
         $this->show_subscriptions($profile);
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_personal($profile)
     {
 
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        common_element_start('div', array('id' => 'profile_avatar'));
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->elementStart('div', array('id' => 'profile_avatar'));
+        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
                                     'class' => 'avatar profile photo',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $profile->nickname));
 
-        common_element_start('ul', array('id' => 'profile_actions'));
+        $this->elementStart('ul', array('id' => 'profile_actions'));
 
-        common_element_start('li', array('id' => 'profile_subscribe'));
+        $this->elementStart('li', array('id' => 'profile_subscribe'));
         $cur = common_current_user();
         if ($cur) {
             if ($cur->id != $profile->id) {
@@ -204,14 +204,14 @@ class ShowstreamAction extends StreamAction
         } else {
             $this->show_remote_subscribe_link($profile);
         }
-        common_element_end('li');
+        $this->elementEnd('li');
 
         $user = User::staticGet('id', $profile->id);
         common_profile_new_message_nudge($cur, $user, $profile);
 
         if ($cur && $cur->id != $profile->id) {
             $blocked = $cur->hasBlocked($profile);
-            common_element_start('li', array('id' => 'profile_block'));
+            $this->elementStart('li', array('id' => 'profile_block'));
             if ($blocked) {
                 common_unblock_form($profile, array('action' => 'showstream',
                                                     'nickname' => $profile->nickname));
@@ -219,62 +219,62 @@ class ShowstreamAction extends StreamAction
                 common_block_form($profile, array('action' => 'showstream',
                                                   'nickname' => $profile->nickname));
             }
-            common_element_end('li');
+            $this->elementEnd('li');
         }
 
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
-        common_element_end('div');
+        $this->elementEnd('div');
 
-        common_element_start('div', array('id' => 'profile_information'));
+        $this->elementStart('div', array('id' => 'profile_information'));
 
         if ($profile->fullname) {
-            common_element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
+            $this->element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
         } else {
-            common_element('h1', array('class' => 'fn nickname'), $profile->nickname);
+            $this->element('h1', array('class' => 'fn nickname'), $profile->nickname);
         }
 
         if ($profile->location) {
-            common_element('p', 'location', $profile->location);
+            $this->element('p', 'location', $profile->location);
         }
         if ($profile->bio) {
-            common_element('p', 'description note', $profile->bio);
+            $this->element('p', 'description note', $profile->bio);
         }
         if ($profile->homepage) {
-            common_element_start('p', 'website');
-            common_element('a', array('href' => $profile->homepage,
+            $this->elementStart('p', 'website');
+            $this->element('a', array('href' => $profile->homepage,
                                       'rel' => 'me', 'class' => 'url'),
                            $profile->homepage);
-            common_element_end('p');
+            $this->elementEnd('p');
         }
 
         $this->show_statistics($profile);
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_remote_subscribe_link($profile)
     {
         $url = common_local_url('remotesubscribe',
                                 array('nickname' => $profile->nickname));
-        common_element('a', array('href' => $url,
+        $this->element('a', array('href' => $url,
                                   'id' => 'remotesubscribe'),
                        _('Subscribe'));
     }
 
     function show_unsubscribe_form($profile)
     {
-        common_element_start('form', array('id' => 'unsubscribe', 'method' => 'post',
+        $this->elementStart('form', array('id' => 'unsubscribe', 'method' => 'post',
                                            'action' => common_local_url('unsubscribe')));
-        common_hidden('token', common_session_token());
-        common_element('input', array('id' => 'unsubscribeto',
+        $this->hidden('token', common_session_token());
+        $this->element('input', array('id' => 'unsubscribeto',
                                       'name' => 'unsubscribeto',
                                       'type' => 'hidden',
                                       'value' => $profile->nickname));
-        common_element('input', array('type' => 'submit',
+        $this->element('input', array('type' => 'submit',
                                       'class' => 'submit',
                                       'value' => _('Unsubscribe')));
-        common_element_end('form');
+        $this->elementEnd('form');
     }
 
     function show_subscriptions($profile)
@@ -293,13 +293,13 @@ class ShowstreamAction extends StreamAction
 
         $subs_count = $subs->find();
 
-        common_element_start('div', array('id' => 'subscriptions'));
+        $this->elementStart('div', array('id' => 'subscriptions'));
 
-        common_element('h2', null, _('Subscriptions'));
+        $this->element('h2', null, _('Subscriptions'));
 
         if ($subs_count > 0) {
 
-            common_element_start('ul', array('id' => 'subscriptions_avatars'));
+            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
 
             for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
 
@@ -315,39 +315,39 @@ class ShowstreamAction extends StreamAction
                     continue;
                 }
 
-                common_element_start('li', 'vcard');
-                common_element_start('a', array('title' => ($other->fullname) ?
+                $this->elementStart('li', 'vcard');
+                $this->elementStart('a', array('title' => ($other->fullname) ?
                                                 $other->fullname :
                                                 $other->nickname,
                                                 'href' => $other->profileurl,
                                                 'rel' => 'contact',
                                                  'class' => 'subscription fn url'));
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-                common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+                $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
                                             'class' => 'avatar mini photo',
                                             'alt' =>  ($other->fullname) ?
                                             $other->fullname :
                                             $other->nickname));
-                common_element_end('a');
-                common_element_end('li');
+                $this->elementEnd('a');
+                $this->elementEnd('li');
             }
 
-            common_element_end('ul');
+            $this->elementEnd('ul');
         }
 
         if ($subs_count > SUBSCRIPTIONS) {
-            common_element_start('p', array('id' => 'subscriptions_viewall'));
+            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
 
-            common_element('a', array('href' => common_local_url('subscriptions',
+            $this->element('a', array('href' => common_local_url('subscriptions',
                                                                  array('nickname' => $profile->nickname)),
                                       'class' => 'moresubscriptions'),
                            _('All subscriptions'));
-            common_element_end('p');
+            $this->elementEnd('p');
         }
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_statistics($profile)
@@ -366,49 +366,49 @@ class ShowstreamAction extends StreamAction
         $notices->profile_id = $profile->id;
         $notice_count = (int) $notices->count();
 
-        common_element_start('div', 'statistics');
-        common_element('h2', 'statistics', _('Statistics'));
+        $this->elementStart('div', 'statistics');
+        $this->element('h2', 'statistics', _('Statistics'));
 
         # Other stats...?
-        common_element_start('dl', 'statistics');
-        common_element('dt', 'membersince', _('Member since'));
-        common_element('dd', 'membersince', date('j M Y',
+        $this->elementStart('dl', 'statistics');
+        $this->element('dt', 'membersince', _('Member since'));
+        $this->element('dd', 'membersince', date('j M Y',
                                                  strtotime($profile->created)));
 
-        common_element_start('dt', 'subscriptions');
-        common_element('a', array('href' => common_local_url('subscriptions',
+        $this->elementStart('dt', 'subscriptions');
+        $this->element('a', array('href' => common_local_url('subscriptions',
                                                              array('nickname' => $profile->nickname))),
                        _('Subscriptions'));
-        common_element_end('dt');
-        common_element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
-        common_element_start('dt', 'subscribers');
-        common_element('a', array('href' => common_local_url('subscribers',
+        $this->elementEnd('dt');
+        $this->element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
+        $this->elementStart('dt', 'subscribers');
+        $this->element('a', array('href' => common_local_url('subscribers',
                                                              array('nickname' => $profile->nickname))),
                        _('Subscribers'));
-        common_element_end('dt');
-        common_element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
-        common_element('dt', 'notices', _('Notices'));
-        common_element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
+        $this->elementEnd('dt');
+        $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
+        $this->element('dt', 'notices', _('Notices'));
+        $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
         # XXX: link these to something
-        common_element('dt', 'tags', _('Tags'));
-        common_element_start('dd', 'tags');
+        $this->element('dt', 'tags', _('Tags'));
+        $this->elementStart('dd', 'tags');
         $tags = Profile_tag::getTags($profile->id, $profile->id);
 
-        common_element_start('ul', 'tags xoxo');
+        $this->elementStart('ul', 'tags xoxo');
         foreach ($tags as $tag) {
-            common_element_start('li');
-            common_element('a', array('rel' => 'bookmark tag',
+            $this->elementStart('li');
+            $this->element('a', array('rel' => 'bookmark tag',
                                       'href' => common_local_url('peopletag',
                                                                  array('tag' => $tag))),
                            $tag);
-            common_element_end('li');
+            $this->elementEnd('li');
         }
-        common_element_end('ul');
-        common_element_end('dd');
+        $this->elementEnd('ul');
+        $this->elementEnd('dd');
 
-        common_element_end('dl');
+        $this->elementEnd('dl');
 
-        common_element_end('div');
+        $this->elementEnd('div');
     }
 
     function show_notices($user)
@@ -428,22 +428,22 @@ class ShowstreamAction extends StreamAction
     function show_last_notice($profile)
     {
 
-        common_element('h2', null, _('Currently'));
+        $this->element('h2', null, _('Currently'));
 
         $notice = $profile->getCurrentNotice();
 
         if ($notice) {
             # FIXME: URL, image, video, audio
-            common_element_start('p', array('class' => 'notice_current'));
+            $this->elementStart('p', array('class' => 'notice_current'));
             if ($notice->rendered) {
-                common_raw($notice->rendered);
+                $this->raw($notice->rendered);
             } else {
                 # XXX: may be some uncooked notices in the DB,
                 # we cook them right now. This can probably disappear in future
                 # versions (>> 0.4.x)
-                common_raw(common_render_content($notice->content, $notice));
+                $this->raw(common_render_content($notice->content, $notice));
             }
-            common_element_end('p');
+            $this->elementEnd('p');
         }
     }
 }
diff --git a/actions/smssettings.php b/actions/smssettings.php
index fad71135cc..1be45d1cec 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -34,75 +34,75 @@ class SmssettingsAction extends EmailsettingsAction
     {
         $user = common_current_user();
         $this->form_header(_('SMS Settings'), $msg, $success);
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'smssettings',
                                            'action' =>
                                            common_local_url('smssettings')));
-        common_hidden('token', common_session_token());
-        common_element('h2', null, _('Address'));
+        $this->hidden('token', common_session_token());
+        $this->element('h2', null, _('Address'));
 
         if ($user->sms) {
-            common_element_start('p');
+            $this->elementStart('p');
             $carrier = $user->getCarrier();
-            common_element('span', 'address confirmed', $user->sms . ' (' . $carrier->name . ')');
-            common_element('span', 'input_instructions',
+            $this->element('span', 'address confirmed', $user->sms . ' (' . $carrier->name . ')');
+            $this->element('span', 'input_instructions',
                            _('Current confirmed SMS-enabled phone number.'));
-            common_hidden('sms', $user->sms);
-            common_hidden('carrier', $user->carrier);
-            common_element_end('p');
-            common_submit('remove', _('Remove'));
+            $this->hidden('sms', $user->sms);
+            $this->hidden('carrier', $user->carrier);
+            $this->elementEnd('p');
+            $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->get_confirmation();
             if ($confirm) {
                 $carrier = Sms_carrier::staticGet($confirm->address_extra);
-                common_element_start('p');
-                common_element('span', 'address unconfirmed', $confirm->address . ' (' . $carrier->name . ')');
-                common_element('span', 'input_instructions',
+                $this->elementStart('p');
+                $this->element('span', 'address unconfirmed', $confirm->address . ' (' . $carrier->name . ')');
+                $this->element('span', 'input_instructions',
                                _('Awaiting confirmation on this phone number.'));
-                common_hidden('sms', $confirm->address);
-                common_hidden('carrier', $confirm->address_extra);
-                common_element_end('p');
-                common_submit('cancel', _('Cancel'));
-                common_input('code', _('Confirmation code'), null,
+                $this->hidden('sms', $confirm->address);
+                $this->hidden('carrier', $confirm->address_extra);
+                $this->elementEnd('p');
+                $this->submit('cancel', _('Cancel'));
+                $this->input('code', _('Confirmation code'), null,
                              _('Enter the code you received on your phone.'));
-                common_submit('confirm', _('Confirm'));
+                $this->submit('confirm', _('Confirm'));
             } else {
-                common_input('sms', _('SMS Phone number'),
+                $this->input('sms', _('SMS Phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
                              _('Phone number, no punctuation or spaces, with area code'));
                 $this->carrier_select();
-                common_submit('add', _('Add'));
+                $this->submit('add', _('Add'));
             }
         }
 
         if ($user->sms) {
-            common_element('h2', null, _('Incoming email'));
+            $this->element('h2', null, _('Incoming email'));
             
             if ($user->incomingemail) {
-                common_element_start('p');
-                common_element('span', 'address', $user->incomingemail);
-                common_element('span', 'input_instructions',
+                $this->elementStart('p');
+                $this->element('span', 'address', $user->incomingemail);
+                $this->element('span', 'input_instructions',
                                _('Send email to this address to post new notices.'));
-                common_element_end('p');
-                common_submit('removeincoming', _('Remove'));
+                $this->elementEnd('p');
+                $this->submit('removeincoming', _('Remove'));
             }
             
-            common_element_start('p');
-            common_element('span', 'input_instructions',
+            $this->elementStart('p');
+            $this->element('span', 'input_instructions',
                            _('Make a new email address for posting to; cancels the old one.'));
-            common_element_end('p');
-            common_submit('newincoming', _('New'));
+            $this->elementEnd('p');
+            $this->submit('newincoming', _('New'));
         }
         
-        common_element('h2', null, _('Preferences'));
+        $this->element('h2', null, _('Preferences'));
         
-        common_checkbox('smsnotify',
+        $this->checkbox('smsnotify',
                         _('Send me notices through SMS; I understand I may incur exorbitant charges from my carrier.'),
                         $user->smsnotify);
             
-        common_submit('save', _('Save'));
+        $this->submit('save', _('Save'));
         
-        common_element_end('form');
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -307,19 +307,19 @@ class SmssettingsAction extends EmailsettingsAction
         $carrier = new Sms_carrier();
         $cnt = $carrier->find();
 
-        common_element_start('p');
-        common_element('label', array('for' => 'carrier'));
-        common_element_start('select', array('name' => 'carrier',
+        $this->elementStart('p');
+        $this->element('label', array('for' => 'carrier'));
+        $this->elementStart('select', array('name' => 'carrier',
                                              'id' => 'carrier'));
-        common_element('option', array('value' => 0),
+        $this->element('option', array('value' => 0),
                        _('Select a carrier'));
         while ($carrier->fetch()) {
-            common_element('option', array('value' => $carrier->id),
+            $this->element('option', array('value' => $carrier->id),
                            $carrier->name);
         }
-        common_element_end('select');
-        common_element_end('p');
-        common_element('span', 'input_instructions',
+        $this->elementEnd('select');
+        $this->elementEnd('p');
+        $this->element('span', 'input_instructions',
                        sprintf(_('Mobile carrier for your phone. '.
                                  'If you know a carrier that accepts ' . 
                                  'SMS over email but isn\'t listed here, ' .
diff --git a/actions/subscribe.php b/actions/subscribe.php
index f33d1d2077..99f9acc241 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -65,13 +65,13 @@ class SubscribeAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Subscribed'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Subscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             common_unsubscribe_form($other->getProfile());
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             common_redirect(common_local_url('subscriptions', array('nickname' =>
                                                                 $user->nickname)));
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index afe8fb2609..7a87a144f7 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -72,16 +72,16 @@ class SubscriptionsList extends ProfileList
             return;
         }
 
-        common_element_start('form', array('id' => 'subedit-' . $profile->id,
+        $this->elementStart('form', array('id' => 'subedit-' . $profile->id,
                                            'method' => 'post',
                                            'class' => 'subedit',
                                            'action' => common_local_url('subedit')));
-        common_hidden('token', common_session_token());
-        common_hidden('profile', $profile->id);
-        common_checkbox('jabber', _('Jabber'), $sub->jabber);
-        common_checkbox('sms', _('SMS'), $sub->sms);
-        common_submit('save', _('Save'));
-        common_element_end('form');
+        $this->hidden('token', common_session_token());
+        $this->hidden('profile', $profile->id);
+        $this->checkbox('jabber', _('Jabber'), $sub->jabber);
+        $this->checkbox('sms', _('SMS'), $sub->sms);
+        $this->submit('save', _('Save'));
+        $this->elementEnd('form');
         return;
     }
 }
diff --git a/actions/tag.php b/actions/tag.php
index 8a3f90c16a..3096b75b39 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -51,7 +51,7 @@ class TagAction extends StreamAction
     function show_header($tag = false)
     {
         if ($tag) {
-            common_element('link', array('rel' => 'alternate',
+            $this->element('link', array('rel' => 'alternate',
                                          'href' => common_local_url('tagrss', array('tag' => $tag)),
                                          'type' => 'application/rss+xml',
                                          'title' => sprintf(_('Feed for tag %s'), $tag)));
@@ -68,9 +68,9 @@ class TagAction extends StreamAction
         if (!$tag) {
             $instr = $this->get_instructions();
             $output = common_markup_to_html($instr);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEnd('div');
             $this->public_views_menu();
         }
         else {
@@ -110,7 +110,7 @@ class TagAction extends StreamAction
         $cnt = $tags->find();
 
         if ($cnt > 0) {
-            common_element_start('p', 'tagcloud');
+            $this->elementStart('p', 'tagcloud');
 
             $tw = array();
             $sum = 0;
@@ -125,7 +125,7 @@ class TagAction extends StreamAction
                 $this->show_tag($tag, $weight, $weight/$sum);
             }
 
-            common_element_end('p');
+            $this->elementEnd('p');
         }
     }
 
@@ -149,10 +149,10 @@ class TagAction extends StreamAction
             $cls = 'smallest';
         }
 
-        common_element('a', array('class' => "$cls weight-$weight relative-$relative",
+        $this->element('a', array('class' => "$cls weight-$weight relative-$relative",
                                   'href' => common_local_url('tag', array('tag' => $tag))),
                        $tag);
-        common_text(' ');
+        $this->text(' ');
     }
 
     function show_notices($tag)
diff --git a/actions/tagother.php b/actions/tagother.php
index ff6788cc62..f0105ec8b7 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -61,7 +61,7 @@ class TagotherAction extends Action
 
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
 
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
+        $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
                                     'class' => 'avatar stream',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
@@ -69,39 +69,39 @@ class TagotherAction extends Action
                                     ($profile->fullname) ? $profile->fullname :
                                     $profile->nickname));
 
-        common_element('a', array('href' => $profile->profileurl,
+        $this->element('a', array('href' => $profile->profileurl,
                                   'class' => 'external profile nickname'),
                        $profile->nickname);
 
         if ($profile->fullname) {
-            common_element_start('div', 'fullname');
+            $this->elementStart('div', 'fullname');
             if ($profile->homepage) {
-                common_element('a', array('href' => $profile->homepage),
+                $this->element('a', array('href' => $profile->homepage),
                                $profile->fullname);
             } else {
-                common_text($profile->fullname);
+                $this->text($profile->fullname);
             }
-            common_element_end('div');
+            $this->elementEnd('div');
         }
         if ($profile->location) {
-            common_element('div', 'location', $profile->location);
+            $this->element('div', 'location', $profile->location);
         }
         if ($profile->bio) {
-            common_element('div', 'bio', $profile->bio);
+            $this->element('div', 'bio', $profile->bio);
         }
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'tag_user',
                                            'name' => 'tagother',
                                            'action' => $this->self_url()));
-        common_hidden('token', common_session_token());
-        common_hidden('id', $profile->id);
-        common_input('tags', _('Tags'),
+        $this->hidden('token', common_session_token());
+        $this->hidden('id', $profile->id);
+        $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', Profile_tag::getTags($user->id, $profile->id)),
                      _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated'));
 
-        common_submit('save', _('Save'));
-        common_element_end('form');
+        $this->submit('save', _('Save'));
+        $this->elementEnd('form');
         common_show_footer();
 
     }
@@ -162,20 +162,20 @@ class TagotherAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml');
-            common_element_start('head');
-            common_element('title', null, _('Tags'));
-            common_element_end('head');
-            common_element_start('body');
-            common_element_start('p', 'subtags');
+            $this->elementStart('head');
+            $this->element('title', null, _('Tags'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
+            $this->elementStart('p', 'subtags');
             foreach ($tags as $tag) {
-                common_element('a', array('href' => common_local_url($action,
+                $this->element('a', array('href' => common_local_url($action,
                                                                      array('nickname' => $user->nickname,
                                                                            'tag' => $tag))),
                                $tag);
             }
-            common_element_end('p');
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('p');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             common_redirect(common_local_url($action, array('nickname' =>
                                                             $user->nickname)));
@@ -186,12 +186,12 @@ class TagotherAction extends Action
     {
         list($profile, $error) = $arr;
         if ($error) {
-            common_element('p', 'error', $error);
+            $this->element('p', 'error', $error);
         } else {
-            common_element_start('div', 'instructions');
-            common_element('p', null,
+            $this->elementStart('div', 'instructions');
+            $this->element('p', null,
                            _('Use this form to add tags to your subscribers or subscriptions.'));
-            common_element_end('div');
+            $this->elementEnd('div');
         }
     }
 }
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index e0731f66fb..36d2a7e09d 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -188,7 +188,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
     {
 
         $this->init_document('xml');
-        common_element_start('direct-messages', array('type' => 'array'));
+        $this->elementStart('direct-messages', array('type' => 'array'));
 
         if (is_array($messages)) {
             foreach ($message as $m) {
@@ -202,7 +202,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
             }
         }
 
-        common_element_end('direct-messages');
+        $this->elementEnd('direct-messages');
         $this->end_document('xml');
 
     }
@@ -236,13 +236,13 @@ class Twitapidirect_messagesAction extends TwitterapiAction
 
         $this->init_document('rss');
 
-        common_element_start('channel');
-        common_element('title', null, $title);
+        $this->elementStart('channel');
+        $this->element('title', null, $title);
 
-        common_element('link', null, $link);
-        common_element('description', null, $subtitle);
-        common_element('language', null, 'en-us');
-        common_element('ttl', null, '40');
+        $this->element('link', null, $link);
+        $this->element('description', null, $subtitle);
+        $this->element('language', null, 'en-us');
+        $this->element('ttl', null, '40');
 
         if (is_array($message)) {
             foreach ($message as $m) {
@@ -256,7 +256,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
             }
         }
 
-        common_element_end('channel');
+        $this->elementEnd('channel');
         $this->end_twitter_rss();
 
     }
@@ -266,12 +266,12 @@ class Twitapidirect_messagesAction extends TwitterapiAction
 
         $this->init_document('atom');
 
-        common_element('title', null, $title);
+        $this->element('title', null, $title);
         $siteserver = common_config('site', 'server');
-        common_element('id', null, "tag:$siteserver,2008:DirectMessage");
-        common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
-        common_element('updated', null, common_date_iso8601(strftime('%c')));
-        common_element('subtitle', null, $subtitle);
+        $this->element('id', null, "tag:$siteserver,2008:DirectMessage");
+        $this->element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
+        $this->element('updated', null, common_date_iso8601(strftime('%c')));
+        $this->element('subtitle', null, $subtitle);
 
         if (is_array($message)) {
             foreach ($message as $m) {
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index ba4afe441e..458ff48a54 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -142,7 +142,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            common_element('friends', null, $result);
+            $this->element('friends', null, $result);
             $this->end_document('xml');
             break;
          case 'json':
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 1b84cb11bb..531c6e9d31 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -34,7 +34,7 @@ class TwitapihelpAction extends TwitterapiAction
 
         if ($apidata['content-type'] == 'xml') {
             $this->init_document('xml');
-            common_element('ok', null, 'true');
+            $this->element('ok', null, 'true');
             $this->end_document('xml');
         } elseif ($apidata['content-type'] == 'json') {
             $this->init_document('json');
diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php
index 722423faec..34c8f88fc4 100644
--- a/actions/twitapilaconica.php
+++ b/actions/twitapilaconica.php
@@ -70,7 +70,7 @@ class TwitapilaconicaAction extends TwitterapiAction
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            common_element('version', null, LACONICA_VERSION);
+            $this->element('version', null, LACONICA_VERSION);
             $this->end_document('xml');
             break;
          case 'json':
@@ -115,10 +115,10 @@ class TwitapilaconicaAction extends TwitterapiAction
         switch ($apidata['content-type']) {
          case 'xml':
             $this->init_document('xml');
-            common_element_start('config');
+            $this->elementStart('config');
             // XXX: check that all sections and settings are legal XML elements
             foreach ($keys as $section => $settings) {
-                common_element_start($section);
+                $this->elementStart($section);
                 foreach ($settings as $setting) {
                     $value = common_config($section, $setting);
                     if (is_array($value)) {
@@ -128,11 +128,11 @@ class TwitapilaconicaAction extends TwitterapiAction
                     } else if ($value === true) {
                         $value = 'true';
                     }
-                    common_element($setting, null, $value);
+                    $this->element($setting, null, $value);
                 }
-                common_element_end($section);
+                $this->elementEnd($section);
             }
-            common_element_end('config');
+            $this->elementEnd('config');
             $this->end_document('xml');
             break;
          case 'json':
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index e629d5cc41..8d175ecab8 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -538,11 +538,11 @@ class TwitapistatusesAction extends TwitterapiAction
     {
         switch ($type) {
          case 'xml':
-            common_element_start('users', array('type' => 'array'));
+            $this->elementStart('users', array('type' => 'array'));
             foreach ($profiles as $profile) {
                 $this->show_profile($profile);
             }
-            common_element_end('users');
+            $this->elementEnd('users');
             break;
          case 'json':
             $arrays = array();
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9e7e4cae89..6636880375 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -44,52 +44,52 @@ class TwittersettingsAction extends SettingsAction
         }
 
         $this->form_header(_('Twitter settings'), $msg, $success);
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'twittersettings',
                                            'action' =>
                                            common_local_url('twittersettings')));
-        common_hidden('token', common_session_token());
+        $this->hidden('token', common_session_token());
 
-        common_element('h2', null, _('Twitter Account'));
+        $this->element('h2', null, _('Twitter Account'));
 
         if ($fuser) {
-            common_element_start('p');
+            $this->elementStart('p');
 
-            common_element('span', 'twitter_user', $fuser->nickname);
-            common_element('a', array('href' => $fuser->uri),  $fuser->uri);
-            common_element('span', 'input_instructions',
+            $this->element('span', 'twitter_user', $fuser->nickname);
+            $this->element('a', array('href' => $fuser->uri),  $fuser->uri);
+            $this->element('span', 'input_instructions',
                            _('Current verified Twitter account.'));
-            common_hidden('flink_foreign_id', $flink->foreign_id);
-            common_element_end('p');
-            common_submit('remove', _('Remove'));
+            $this->hidden('flink_foreign_id', $flink->foreign_id);
+            $this->elementEnd('p');
+            $this->submit('remove', _('Remove'));
         } else {
-            common_input('twitter_username', _('Twitter user name'),
+            $this->input('twitter_username', _('Twitter user name'),
                          ($this->arg('twitter_username')) ? $this->arg('twitter_username') : $profile->nickname,
                          _('No spaces, please.')); // hey, it's what Twitter says
 
-            common_password('twitter_password', _('Twitter password'));
+            $this->password('twitter_password', _('Twitter password'));
         }
 
-        common_element('h2', null, _('Preferences'));
+        $this->element('h2', null, _('Preferences'));
 
-        common_checkbox('noticesync', _('Automatically send my notices to Twitter.'),
+        $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'),
                         ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
 
-        common_checkbox('replysync', _('Send local "@" replies to Twitter.'),
+        $this->checkbox('replysync', _('Send local "@" replies to Twitter.'),
                         ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
-        common_checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
+        $this->checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
                         ($flink) ? ($flink->friendsync & FOREIGN_FRIEND_RECV) : false);
 
         if ($flink) {
-            common_submit('save', _('Save'));
+            $this->submit('save', _('Save'));
         } else {
-            common_submit('add', _('Add'));
+            $this->submit('add', _('Add'));
         }
 
         $this->show_twitter_subscriptions();
 
-        common_element_end('form');
+        $this->elementEnd('form');
 
         common_show_footer();
     }
@@ -131,9 +131,9 @@ class TwittersettingsAction extends SettingsAction
 
         if ($friends_count > 0) {
 
-            common_element('h3', null, _('Twitter Friends'));
-            common_element_start('div', array('id' => 'subscriptions'));
-            common_element_start('ul', array('id' => 'subscriptions_avatars'));
+            $this->element('h3', null, _('Twitter Friends'));
+            $this->elementStart('div', array('id' => 'subscriptions'));
+            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
 
             for ($i = 0; $i < min($friends_count, SUBSCRIPTIONS); $i++) {
 
@@ -144,28 +144,28 @@ class TwittersettingsAction extends SettingsAction
                     continue;
                 }
 
-                common_element_start('li');
-                common_element_start('a', array('title' => ($other->fullname) ?
+                $this->elementStart('li');
+                $this->elementStart('a', array('title' => ($other->fullname) ?
                                                 $other->fullname :
                                                 $other->nickname,
                                                 'href' => $other->profileurl,
                                                 'rel' => 'contact',
                                                 'class' => 'subscription'));
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-                common_element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+                $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
                                             'class' => 'avatar mini',
                                             'alt' =>  ($other->fullname) ?
                                             $other->fullname :
                                             $other->nickname));
-                common_element_end('a');
-                common_element_end('li');
+                $this->elementEnd('a');
+                $this->elementEnd('li');
 
             }
 
-            common_element_end('ul');
-            common_element_end('div');
+            $this->elementEnd('ul');
+            $this->elementEnd('div');
 
         }
 
@@ -173,13 +173,13 @@ class TwittersettingsAction extends SettingsAction
 
         /*
         if ($subs_count > SUBSCRIPTIONS) {
-            common_element_start('p', array('id' => 'subscriptions_viewall'));
+            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
 
-            common_element('a', array('href' => common_local_url('subscriptions',
+            $this->element('a', array('href' => common_local_url('subscriptions',
                                                                  array('nickname' => $profile->nickname)),
                                       'class' => 'moresubscriptions'),
                            _('All subscriptions'));
-            common_element_end('p');
+            $this->elementEnd('p');
         }
         */
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 1c2e136359..455c5e28e8 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -67,13 +67,13 @@ class UnsubscribeAction extends Action
 
         if ($this->boolean('ajax')) {
             common_start_html('text/xml;charset=utf-8', true);
-            common_element_start('head');
-            common_element('title', null, _('Unsubscribed'));
-            common_element_end('head');
-            common_element_start('body');
+            $this->elementStart('head');
+            $this->element('title', null, _('Unsubscribed'));
+            $this->elementEnd('head');
+            $this->elementStart('body');
             common_subscribe_form($other);
-            common_element_end('body');
-            common_element_end('html');
+            $this->elementEnd('body');
+            $this->elementEnd('html');
         } else {
             common_redirect(common_local_url('subscriptions', array('nickname' =>
                                                                     $user->nickname)));
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 05efbc16c7..196fae9ad4 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -84,51 +84,51 @@ class UserauthorizationAction extends Action
         $avatar = $req->get_parameter('omb_listenee_avatar');
 
         common_show_header(_('Authorize subscription'));
-        common_element('p', null, _('Please check these details to make sure '.
+        $this->element('p', null, _('Please check these details to make sure '.
                                      'that you want to subscribe to this user\'s notices. '.
                                      'If you didn\'t just ask to subscribe to someone\'s notices, '.
                                      'click "Cancel".'));
-        common_element_start('div', 'profile');
+        $this->elementStart('div', 'profile');
         if ($avatar) {
-            common_element('img', array('src' => $avatar,
+            $this->element('img', array('src' => $avatar,
                                         'class' => 'avatar profile',
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $nickname));
         }
-        common_element('a', array('href' => $profile,
+        $this->element('a', array('href' => $profile,
                                   'class' => 'external profile nickname'),
                        $nickname);
         if ($fullname) {
-            common_element_start('div', 'fullname');
+            $this->elementStart('div', 'fullname');
             if ($homepage) {
-                common_element('a', array('href' => $homepage),
+                $this->element('a', array('href' => $homepage),
                                $fullname);
             } else {
-                common_text($fullname);
+                $this->text($fullname);
             }
-            common_element_end('div');
+            $this->elementEnd('div');
         }
         if ($location) {
-            common_element('div', 'location', $location);
+            $this->element('div', 'location', $location);
         }
         if ($bio) {
-            common_element('div', 'bio', $bio);
+            $this->element('div', 'bio', $bio);
         }
-        common_element_start('div', 'license');
-        common_element('a', array('href' => $license,
+        $this->elementStart('div', 'license');
+        $this->element('a', array('href' => $license,
                                   'class' => 'license'),
                        $license);
-        common_element_end('div');
-        common_element_end('div');
-        common_element_start('form', array('method' => 'post',
+        $this->elementEnd('div');
+        $this->elementEnd('div');
+        $this->elementStart('form', array('method' => 'post',
                                            'id' => 'userauthorization',
                                            'name' => 'userauthorization',
                                            'action' => common_local_url('userauthorization')));
-        common_hidden('token', common_session_token());
-        common_submit('accept', _('Accept'));
-        common_submit('reject', _('Reject'));
-        common_element_end('form');
+        $this->hidden('token', common_session_token());
+        $this->submit('accept', _('Accept'));
+        $this->submit('reject', _('Reject'));
+        $this->elementEnd('form');
         common_show_footer();
     }
 
@@ -328,18 +328,18 @@ class UserauthorizationAction extends Action
     function show_accept_message($tok)
     {
         common_show_header(_('Subscription authorized'));
-        common_element('p', null,
+        $this->element('p', null,
                        _('The subscription has been authorized, but no '.
                           'callback URL was passed. Check with the site\'s instructions for '.
                           'details on how to authorize the subscription. Your subscription token is:'));
-        common_element('blockquote', 'token', $tok);
+        $this->element('blockquote', 'token', $tok);
         common_show_footer();
     }
 
     function show_reject_message($tok)
     {
         common_show_header(_('Subscription rejected'));
-        common_element('p', null,
+        $this->element('p', null,
                        _('The subscription has been rejected, but no '.
                           'callback URL was passed. Check with the site\'s instructions for '.
                           'details on how to fully reject the subscription.'));
diff --git a/actions/xrds.php b/actions/xrds.php
index 7edc6aa39c..9c51f1dd21 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -47,14 +47,14 @@ class XrdsAction extends Action
         header('Content-Type: application/xrds+xml');
 
         common_start_xml();
-        common_element_start('XRDS', array('xmlns' => 'xri://$xrds'));
+        $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
 
-        common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xml:id' => 'oauth',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
 
-        common_element('Type', null, 'xri://$xrds*simple');
+        $this->element('Type', null, 'xri://$xrds*simple');
 
         $this->show_service(OAUTH_ENDPOINT_REQUEST,
                             common_local_url('requesttoken'),
@@ -77,16 +77,16 @@ class XrdsAction extends Action
                             array(OAUTH_AUTH_HEADER, OAUTH_POST_BODY),
                             array(OAUTH_HMAC_SHA1));
 
-        common_element_end('XRD');
+        $this->elementEnd('XRD');
 
         # XXX: decide whether to include user's ID/nickname in postNotice URL
 
-        common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xml:id' => 'omb',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
 
-        common_element('Type', null, 'xri://$xrds*simple');
+        $this->element('Type', null, 'xri://$xrds*simple');
 
         $this->show_service(OMB_ENDPOINT_POSTNOTICE,
                             common_local_url('postnotice'));
@@ -94,44 +94,44 @@ class XrdsAction extends Action
         $this->show_service(OMB_ENDPOINT_UPDATEPROFILE,
                             common_local_url('updateprofile'));
 
-        common_element_end('XRD');
+        $this->elementEnd('XRD');
 
-        common_element_start('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
+        $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'version' => '2.0'));
 
-        common_element('Type', null, 'xri://$xrds*simple');
+        $this->element('Type', null, 'xri://$xrds*simple');
 
         $this->show_service(OAUTH_DISCOVERY,
                             '#oauth');
         $this->show_service(OMB_NAMESPACE,
                             '#omb');
 
-        common_element_end('XRD');
+        $this->elementEnd('XRD');
 
-        common_element_end('XRDS');
+        $this->elementEnd('XRDS');
         common_end_xml();
     }
 
     function show_service($type, $uri, $params=null, $sigs=null, $localId=null)
     {
-        common_element_start('Service');
+        $this->elementStart('Service');
         if ($uri) {
-            common_element('URI', null, $uri);
+            $this->element('URI', null, $uri);
         }
-        common_element('Type', null, $type);
+        $this->element('Type', null, $type);
         if ($params) {
             foreach ($params as $param) {
-                common_element('Type', null, $param);
+                $this->element('Type', null, $param);
             }
         }
         if ($sigs) {
             foreach ($sigs as $sig) {
-                common_element('Type', null, $sig);
+                $this->element('Type', null, $sig);
             }
         }
         if ($localId) {
-            common_element('LocalID', null, $localId);
+            $this->element('LocalID', null, $localId);
         }
-        common_element_end('Service');
+        $this->elementEnd('Service');
     }
 }
\ No newline at end of file
diff --git a/lib/action.php b/lib/action.php
index d5060758e0..d02a1b7097 100644
--- 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,24 @@ 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()

From bb58bf8caf66b237d2bc383bebe0af15da5c5b41 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:02:48 +0000
Subject: [PATCH 087/256] Minor parse error

---
 lib/action.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index d02a1b7097..bd37a84422 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -336,7 +336,6 @@ class Action extends HTMLOutputter // lawsuit
 	$this->elementEnd('dd');
 	$this->elementEnd('dl');
 	}
-    }
 
     // SHOULD overload (unless there's not a notice)
 

From 4b0cf99e56f965e10eeb8b8b19e7b405bda49eaf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:03:38 +0000
Subject: [PATCH 088/256] Convert use of common_server_error and
 common_user_error to methods on Action

---
 actions/accesstoken.php            |  2 +-
 actions/all.php                    |  4 +--
 actions/allrss.php                 |  2 +-
 actions/api.php                    |  4 +--
 actions/avatarbynickname.php       | 10 +++----
 actions/block.php                  | 12 ++++----
 actions/confirmaddress.php         | 14 +++++-----
 actions/deleteprofile.php          |  2 +-
 actions/disfavor.php               |  8 +++---
 actions/doc.php                    |  2 +-
 actions/emailsettings.php          | 12 ++++----
 actions/facebookremove.php         |  2 +-
 actions/favor.php                  |  8 +++---
 actions/favoritesrss.php           |  2 +-
 actions/finishaddopenid.php        |  2 +-
 actions/finishopenidlogin.php      | 12 ++++----
 actions/finishremotesubscribe.php  | 34 +++++++++++------------
 actions/foaf.php                   |  4 +--
 actions/imsettings.php             |  8 +++---
 actions/invite.php                 |  2 +-
 actions/login.php                  |  8 +++---
 actions/logout.php                 |  2 +-
 actions/microsummary.php           |  4 +--
 actions/newmessage.php             | 10 +++----
 actions/newnotice.php              |  4 +--
 actions/noticesearch.php           |  2 +-
 actions/nudge.php                  |  6 ++--
 actions/openidlogin.php            |  2 +-
 actions/othersettings.php          |  2 +-
 actions/peopletag.php              |  2 +-
 actions/postnotice.php             | 14 +++++-----
 actions/profilesettings.php        | 12 ++++----
 actions/public.php                 |  2 +-
 actions/recoverpassword.php        | 26 +++++++++---------
 actions/register.php               | 10 +++----
 actions/remotesubscribe.php        |  4 +--
 actions/replies.php                |  4 +--
 actions/repliesrss.php             |  2 +-
 actions/requesttoken.php           |  2 +-
 actions/showfavorites.php          |  6 ++--
 actions/showmessage.php            |  4 +--
 actions/shownotice.php             |  6 ++--
 actions/showstream.php             |  4 +--
 actions/smssettings.php            |  8 +++---
 actions/subedit.php                | 12 ++++----
 actions/subscribe.php              |  8 +++---
 actions/tagother.php               | 12 ++++----
 actions/tagrss.php                 |  2 +-
 actions/twitapiaccount.php         | 16 +++++------
 actions/twitapiblocks.php          |  8 +++---
 actions/twitapidirect_messages.php | 18 ++++++------
 actions/twitapifavorites.php       | 20 +++++++-------
 actions/twitapifriendships.php     | 16 +++++------
 actions/twitapihelp.php            |  4 +--
 actions/twitapilaconica.php        |  6 ++--
 actions/twitapinotifications.php   |  4 +--
 actions/twitapistatuses.php        | 44 +++++++++++++++---------------
 actions/twitapiusers.php           |  4 +--
 actions/twittersettings.php        |  2 +-
 actions/unblock.php                | 10 +++----
 actions/unsubscribe.php            | 10 +++----
 actions/updateprofile.php          | 36 ++++++++++++------------
 actions/userauthorization.php      | 12 ++++----
 actions/userbyid.php               |  4 +--
 actions/userrss.php                |  4 +--
 actions/xrds.php                   |  2 +-
 lib/action.php                     |  4 +--
 67 files changed, 275 insertions(+), 275 deletions(-)

diff --git a/actions/accesstoken.php b/actions/accesstoken.php
index 072ce27eb5..ad03b70190 100644
--- a/actions/accesstoken.php
+++ b/actions/accesstoken.php
@@ -38,7 +38,7 @@ class AccesstokenAction extends Action
             common_debug('printing the access token', __FILE__);
             print $token;
         } catch (OAuthException $e) {
-            common_server_error($e->getMessage());
+            $this->serverError($e->getMessage());
         }
     }
 }
diff --git a/actions/all.php b/actions/all.php
index a8a74fb337..4ad7f12aee 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -33,14 +33,14 @@ class AllAction extends StreamAction
         $user = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            $this->client_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return;
         }
 
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
diff --git a/actions/allrss.php b/actions/allrss.php
index 660afb9e2d..56818d605c 100644
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -34,7 +34,7 @@ class AllrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
diff --git a/actions/api.php b/actions/api.php
index 9cbf9a4681..64971774de 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -103,10 +103,10 @@ class ApiAction extends Action
 
                 call_user_func(array($action_obj, $this->api_method), $_REQUEST, $apidata);
             } else {
-                common_user_error("API method not found!", $code=404);
+                $this->clientError("API method not found!", $code=404);
             }
         } else {
-            common_user_error("API method not found!", $code=404);
+            $this->clientError("API method not found!", $code=404);
         }
     }
 
diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 666f386f66..d2d078b61f 100644
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -26,28 +26,28 @@ class AvatarbynicknameAction extends Action
         parent::handle($args);
         $nickname = $this->trimmed('nickname');
         if (!$nickname) {
-            $this->client_error(_('No nickname.'));
+            $this->clientError(_('No nickname.'));
             return;
         }
         $size = $this->trimmed('size');
         if (!$size) {
-            $this->client_error(_('No size.'));
+            $this->clientError(_('No size.'));
             return;
         }
         $size = strtolower($size);
         if (!in_array($size, array('original', '96', '48', '24'))) {
-            $this->client_error(_('Invalid size.'));
+            $this->clientError(_('Invalid size.'));
             return;
         }
 
         $user = User::staticGet('nickname', $nickname);
         if (!$user) {
-            $this->client_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return;
         }
         $profile = $user->getProfile();
         if (!$profile) {
-            $this->client_error(_('User has no profile.'));
+            $this->clientError(_('User has no profile.'));
             return;
         }
         if ($size == 'original') {
diff --git a/actions/block.php b/actions/block.php
index f8f6f24fdb..738cbfbf71 100644
--- a/actions/block.php
+++ b/actions/block.php
@@ -30,28 +30,28 @@ class BlockAction extends Action
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         $id = $this->trimmed('blockto');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
+            $this->clientError(_('No profile specified.'));
             return false;
         }
 
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
+            $this->clientError(_('No profile with that ID.'));
             return false;
         }
 
@@ -119,14 +119,14 @@ class BlockAction extends Action
         $cur = common_current_user();
 
         if ($cur->hasBlocked($this->profile)) {
-            $this->client_error(_('You have already blocked this user.'));
+            $this->clientError(_('You have already blocked this user.'));
             return;
         }
 
         $result = $cur->block($this->profile);
 
         if (!$result) {
-            $this->server_error(_('Failed to save block information.'));
+            $this->serverError(_('Failed to save block information.'));
             return;
         }
 
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 31a1577684..53410fbe63 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -32,26 +32,26 @@ class ConfirmaddressAction extends Action
         }
         $code = $this->trimmed('code');
         if (!$code) {
-            $this->client_error(_('No confirmation code.'));
+            $this->clientError(_('No confirmation code.'));
             return;
         }
         $confirm = Confirm_address::staticGet('code', $code);
         if (!$confirm) {
-            $this->client_error(_('Confirmation code not found.'));
+            $this->clientError(_('Confirmation code not found.'));
             return;
         }
         $cur = common_current_user();
         if ($cur->id != $confirm->user_id) {
-            $this->client_error(_('That confirmation code is not for you!'));
+            $this->clientError(_('That confirmation code is not for you!'));
             return;
         }
         $type = $confirm->address_type;
         if (!in_array($type, array('email', 'jabber', 'sms'))) {
-            $this->server_error(sprintf(_('Unrecognized address type %s'), $type));
+            $this->serverError(sprintf(_('Unrecognized address type %s'), $type));
             return;
         }
         if ($cur->$type == $confirm->address) {
-            $this->client_error(_('That address has already been confirmed.'));
+            $this->clientError(_('That address has already been confirmed.'));
             return;
         }
 
@@ -71,7 +71,7 @@ class ConfirmaddressAction extends Action
 
         if (!$result) {
             common_log_db_error($cur, 'UPDATE', __FILE__);
-            $this->server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
@@ -83,7 +83,7 @@ class ConfirmaddressAction extends Action
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
diff --git a/actions/deleteprofile.php b/actions/deleteprofile.php
index ef4687d5fa..cc236f8474 100644
--- a/actions/deleteprofile.php
+++ b/actions/deleteprofile.php
@@ -24,7 +24,7 @@ class DeleteprofileAction extends Action
     function handle($args)
     {
         parent::handle($args);
-        $this->server_error(_('Code not yet ready.'));
+        $this->serverError(_('Code not yet ready.'));
         return;
         if ('POST' === $_SERVER['REQUEST_METHOD']) {
             $this->handle_post();
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 9a27f34b16..fc36f7c75f 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -28,7 +28,7 @@ class DisfavorAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         }
 
@@ -46,7 +46,7 @@ class DisfavorAction extends Action
         $token = $this->trimmed('token-'.$notice->id);
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_("There was a problem with your session token. Try again, please."));
+            $this->clientError(_("There was a problem with your session token. Try again, please."));
             return;
         }
 
@@ -54,7 +54,7 @@ class DisfavorAction extends Action
         $fave->user_id = $this->id;
         $fave->notice_id = $notice->id;
         if (!$fave->find(true)) {
-            $this->client_error(_('This notice is not a favorite!'));
+            $this->clientError(_('This notice is not a favorite!'));
             return;
         }
 
@@ -62,7 +62,7 @@ class DisfavorAction extends Action
 
         if (!$result) {
             common_log_db_error($fave, 'DELETE', __FILE__);
-            $this->server_error(_('Could not delete favorite.'));
+            $this->serverError(_('Could not delete favorite.'));
             return;
         }
         
diff --git a/actions/doc.php b/actions/doc.php
index 98da312672..3d14b25b8a 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -28,7 +28,7 @@ class DocAction extends Action
         $title = $this->trimmed('title');
         $filename = INSTALLDIR.'/doc/'.$title;
         if (!file_exists($filename)) {
-            common_user_error(_('No such document.'));
+            $this->clientError(_('No such document.'));
             return;
         }
         $c = file_get_contents($filename);
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 39f186bff0..6210c07b42 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -182,7 +182,7 @@ class EmailsettingsAction extends SettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
@@ -232,7 +232,7 @@ class EmailsettingsAction extends SettingsAction
 
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
-            common_server_error(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Couldn\'t insert confirmation code.'));
             return;
         }
 
@@ -260,7 +260,7 @@ class EmailsettingsAction extends SettingsAction
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
@@ -286,7 +286,7 @@ class EmailsettingsAction extends SettingsAction
         $result = $user->updateKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
         $user->query('COMMIT');
@@ -308,7 +308,7 @@ class EmailsettingsAction extends SettingsAction
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->server_error(_("Couldn't update user record."));
+            $this->serverError(_("Couldn't update user record."));
         }
         
         $this->show_form(_('Incoming email address removed.'), true);
@@ -323,7 +323,7 @@ class EmailsettingsAction extends SettingsAction
         
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            $this->server_error(_("Couldn't update user record."));
+            $this->serverError(_("Couldn't update user record."));
         }
 
         $this->show_form(_('New incoming email address added.'), true);
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index a200fefbfe..d0a0dd9519 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -53,7 +53,7 @@ class FacebookremoveAction extends FacebookAction
 
             if (!$result) {
                 common_log_db_error($flink, 'DELETE', __FILE__);
-                common_server_error(_('Couldn\'t remove Facebook user.'));
+                $this->serverError(_('Couldn\'t remove Facebook user.'));
                 return;
             }
 
diff --git a/actions/favor.php b/actions/favor.php
index 1dfef9bbb3..8d751a7a97 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -29,7 +29,7 @@ class FavorAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         }
 
@@ -48,19 +48,19 @@ class FavorAction extends Action
 
         $token = $this->trimmed('token-'.$notice->id);
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_("There was a problem with your session token. Try again, please."));
+            $this->clientError(_("There was a problem with your session token. Try again, please."));
             return;
         }
 
         if ($user->hasFave($notice)) {
-            $this->client_error(_('This notice is already a favorite!'));
+            $this->clientError(_('This notice is already a favorite!'));
             return;
         }
 
         $fave = Fave::addNew($user, $notice);
 
         if (!$fave) {
-            $this->server_error(_('Could not create favorite.'));
+            $this->serverError(_('Could not create favorite.'));
             return;
         }
 
diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index 8c7ce52bf1..3f4ffc63a0 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -34,7 +34,7 @@ class FavoritesrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 7de631712a..708e8d4bfb 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -28,7 +28,7 @@ class FinishaddopenidAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
         } else {
             $this->try_login();
         }
diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php
index 112429002c..bc33ac330b 100644
--- a/actions/finishopenidlogin.php
+++ b/actions/finishopenidlogin.php
@@ -28,7 +28,7 @@ class FinishopenidloginAction extends Action
     {
         parent::handle($args);
         if (common_logged_in()) {
-            common_user_error(_('Already logged in.'));
+            $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
@@ -179,7 +179,7 @@ class FinishopenidloginAction extends Action
         # FIXME: save invite code before redirect, and check here
 
         if (common_config('site', 'closed') || common_config('site', 'inviteonly')) {
-            common_user_error(_('Registration not allowed.'));
+            $this->clientError(_('Registration not allowed.'));
             return;
         }
 
@@ -205,7 +205,7 @@ class FinishopenidloginAction extends Action
         list($display, $canonical, $sreg) = $this->get_saved_values();
 
         if (!$display || !$canonical) {
-            common_server_error(_('Stored OpenID not found.'));
+            $this->serverError(_('Stored OpenID not found.'));
             return;
         }
 
@@ -214,7 +214,7 @@ class FinishopenidloginAction extends Action
         $other = oid_get_user($canonical);
 
         if ($other) {
-            common_server_error(_('Creating new account for OpenID that already has a user.'));
+            $this->serverError(_('Creating new account for OpenID that already has a user.'));
             return;
         }
 
@@ -274,14 +274,14 @@ class FinishopenidloginAction extends Action
         list($display, $canonical, $sreg) = $this->get_saved_values();
 
         if (!$display || !$canonical) {
-            common_server_error(_('Stored OpenID not found.'));
+            $this->serverError(_('Stored OpenID not found.'));
             return;
         }
 
         $result = oid_link_user($user->id, $canonical, $display);
 
         if (!$result) {
-            common_server_error(_('Error connecting user to OpenID.'));
+            $this->serverError(_('Error connecting user to OpenID.'));
             return;
         }
 
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index cee3a18187..f9094a50ca 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -30,14 +30,14 @@ class FinishremotesubscribeAction extends Action
         parent::handle($args);
 
         if (common_logged_in()) {
-            common_user_error(_('You can use the local subscription!'));
+            $this->clientError(_('You can use the local subscription!'));
             return;
         }
 
         $omb = $_SESSION['oauth_authorization_request'];
 
         if (!$omb) {
-            common_user_error(_('Not expecting this response!'));
+            $this->clientError(_('Not expecting this response!'));
             return;
         }
 
@@ -51,38 +51,38 @@ class FinishremotesubscribeAction extends Action
         # I think this is the success metric
 
         if ($token != $omb['token']) {
-            common_user_error(_('Not authorized.'));
+            $this->clientError(_('Not authorized.'));
             return;
         }
 
         $version = $req->get_parameter('omb_version');
 
         if ($version != OMB_VERSION_01) {
-            common_user_error(_('Unknown version of OMB protocol.'));
+            $this->clientError(_('Unknown version of OMB protocol.'));
             return;
         }
 
         $nickname = $req->get_parameter('omb_listener_nickname');
 
         if (!$nickname) {
-            common_user_error(_('No nickname provided by remote server.'));
+            $this->clientError(_('No nickname provided by remote server.'));
             return;
         }
 
         $profile_url = $req->get_parameter('omb_listener_profile');
 
         if (!$profile_url) {
-            common_user_error(_('No profile URL returned by server.'));
+            $this->clientError(_('No profile URL returned by server.'));
             return;
         }
 
         if (!Validate::uri($profile_url, array('allowed_schemes' => array('http', 'https')))) {
-            common_user_error(_('Invalid profile URL returned by server.'));
+            $this->clientError(_('Invalid profile URL returned by server.'));
             return;
         }
 
         if ($profile_url == common_local_url('showstream', array('nickname' => $nickname))) {
-            common_user_error(_('You can use the local subscription!'));
+            $this->clientError(_('You can use the local subscription!'));
             return;
         }
 
@@ -91,14 +91,14 @@ class FinishremotesubscribeAction extends Action
         $user = User::staticGet('nickname', $omb['listenee']);
 
         if (!$user) {
-            common_user_error(_('User being listened to doesn\'t exist.'));
+            $this->clientError(_('User being listened to doesn\'t exist.'));
             return;
         }
 
         $other = User::staticGet('uri', $omb['listener']);
 
         if ($other) {
-            common_user_error(_('You can use the local subscription!'));
+            $this->clientError(_('You can use the local subscription!'));
             return;
         }
 
@@ -111,7 +111,7 @@ class FinishremotesubscribeAction extends Action
         list($newtok, $newsecret) = $this->access_token($omb);
 
         if (!$newtok || !$newsecret) {
-            common_user_error(_('Couldn\'t convert request tokens to access tokens.'));
+            $this->clientError(_('Couldn\'t convert request tokens to access tokens.'));
             return;
         }
 
@@ -155,7 +155,7 @@ class FinishremotesubscribeAction extends Action
             $profile->created = DB_DataObject_Cast::dateTime(); # current time
             $id = $profile->insert();
             if (!$id) {
-                common_server_error(_('Error inserting new profile'));
+                $this->serverError(_('Error inserting new profile'));
                 return;
             }
             $remote->id = $id;
@@ -163,7 +163,7 @@ class FinishremotesubscribeAction extends Action
 
         if ($avatar_url) {
             if (!$this->add_avatar($profile, $avatar_url)) {
-                common_server_error(_('Error inserting avatar'));
+                $this->serverError(_('Error inserting avatar'));
                 return;
             }
         }
@@ -173,19 +173,19 @@ class FinishremotesubscribeAction extends Action
 
         if ($exists) {
             if (!$remote->update($orig_remote)) {
-                common_server_error(_('Error updating remote profile'));
+                $this->serverError(_('Error updating remote profile'));
                 return;
             }
         } else {
             $remote->created = DB_DataObject_Cast::dateTime(); # current time
             if (!$remote->insert()) {
-                common_server_error(_('Error inserting remote profile'));
+                $this->serverError(_('Error inserting remote profile'));
                 return;
             }
         }
 
         if ($user->hasBlocked($profile)) {
-            $this->client_error(_('That user has blocked you from subscribing.'));
+            $this->clientError(_('That user has blocked you from subscribing.'));
             return;
         }
 
@@ -215,7 +215,7 @@ class FinishremotesubscribeAction extends Action
 
         if (!$result) {
             common_log_db_error($sub, ($sub_exists) ? 'UPDATE' : 'INSERT', __FILE__);
-            common_user_error(_('Couldn\'t insert new subscription.'));
+            $this->clientError(_('Couldn\'t insert new subscription.'));
             return;
         }
 
diff --git a/actions/foaf.php b/actions/foaf.php
index 6f73ce505e..a0f8a1ff39 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -40,14 +40,14 @@ class FoafAction extends Action
         $user = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            common_user_error(_('No such user.'), 404);
+            $this->clientError(_('No such user.'), 404);
             return;
         }
 
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'), 500);
+            $this->serverError(_('User has no profile.'), 500);
             return;
         }
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 693f49efa2..14df3451a8 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -149,7 +149,7 @@ class ImsettingsAction extends SettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
@@ -199,7 +199,7 @@ class ImsettingsAction extends SettingsAction
 
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
-            common_server_error(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Couldn\'t insert confirmation code.'));
             return;
         }
 
@@ -231,7 +231,7 @@ class ImsettingsAction extends SettingsAction
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
@@ -257,7 +257,7 @@ class ImsettingsAction extends SettingsAction
         $result = $user->updateKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
         $user->query('COMMIT');
diff --git a/actions/invite.php b/actions/invite.php
index 15233602e2..879264deb9 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -31,7 +31,7 @@ class InviteAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            $this->client_error(sprintf(_('You must be logged in to invite other users to use %s'),
+            $this->clientError(sprintf(_('You must be logged in to invite other users to use %s'),
                                         common_config('site', 'name')));
             return;
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
diff --git a/actions/login.php b/actions/login.php
index fd98e656db..060d16ad61 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -31,7 +31,7 @@ class LoginAction extends Action
     {
         parent::handle($args);
         if (common_is_real_login()) {
-            common_user_error(_('Already logged in.'));
+            $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->check_login();
         } else {
@@ -46,7 +46,7 @@ class LoginAction extends Action
         # CSRF protection - token set in common_notice_form()
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
@@ -55,7 +55,7 @@ class LoginAction extends Action
         if (common_check_user($nickname, $password)) {
             # success!
             if (!common_set_user($nickname)) {
-                common_server_error(_('Error setting user.'));
+                $this->serverError(_('Error setting user.'));
                 return;
             }
             common_real_login(true);
@@ -81,7 +81,7 @@ class LoginAction extends Action
 
         # success!
         if (!common_set_user($user)) {
-            common_server_error(_('Error setting user.'));
+            $this->serverError(_('Error setting user.'));
             return;
         }
 
diff --git a/actions/logout.php b/actions/logout.php
index 201378730d..3001f3613e 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -33,7 +33,7 @@ class LogoutAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
         } else {
             common_set_user(null);
             common_real_login(false); # not logged in
diff --git a/actions/microsummary.php b/actions/microsummary.php
index 13ddc4e3ed..b46c5bee53 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -31,14 +31,14 @@ class MicrosummaryAction extends Action
         $user = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            $this->client_error(_('No such user'), 404);
+            $this->clientError(_('No such user'), 404);
             return;
         }
         
         $notice = $user->getCurrentNotice();
         
         if (!$notice) {
-            $this->client_error(_('No current status'), 404);
+            $this->clientError(_('No current status'), 404);
         }
         
         header('Content-Type: text/plain');
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 6221b67e9d..510a5f8f37 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -27,7 +27,7 @@ class NewmessageAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'), 403);
+            $this->clientError(_('Not logged in.'), 403);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->save_new_message();
         } else {
@@ -71,10 +71,10 @@ class NewmessageAction extends Action
             $this->show_form(_('No recipient specified.'));
             return;
         } else if (!$user->mutuallySubscribed($other)) {
-            $this->client_error(_('You can\'t send a message to this user.'), 404);
+            $this->clientError(_('You can\'t send a message to this user.'), 404);
             return;
         } else if ($user->id == $other->id) {
-            $this->client_error(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'), 403);
+            $this->clientError(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'), 403);
             return;
         }
         
@@ -113,12 +113,12 @@ class NewmessageAction extends Action
         $other = User::staticGet('id', $to);
 
         if (!$other) {
-            $this->client_error(_('No such user'), 404);
+            $this->clientError(_('No such user'), 404);
             return;
         }
 
         if (!$user->mutuallySubscribed($other)) {
-            $this->client_error(_('You can\'t send a message to this user.'), 404);
+            $this->clientError(_('You can\'t send a message to this user.'), 404);
             return;
         }
         
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 89792d95ac..cb02854a1d 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -29,13 +29,13 @@ class NewnoticeAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
             # CSRF protection - token set in common_notice_form()
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
-                $this->client_error(_('There was a problem with your session token. Try again, please.'));
+                $this->clientError(_('There was a problem with your session token. Try again, please.'));
                 return;
             }
 
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index d998b9da8f..336e39bd3a 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -97,7 +97,7 @@ class NoticesearchAction extends SearchAction
         $profile = $notice->getProfile();
         if (!$profile) {
             common_log_db_error($notice, 'SELECT', __FILE__);
-            $this->server_error(_('Notice without matching profile'));
+            $this->serverError(_('Notice without matching profile'));
             return;
         }
         # XXX: RDFa
diff --git a/actions/nudge.php b/actions/nudge.php
index de930e4628..49223d4315 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -29,7 +29,7 @@ class NudgeAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         }
 
@@ -46,12 +46,12 @@ class NudgeAction extends Action
         $token = $this->trimmed('token');
         
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         if (!$other->email || !$other->emailnotifynudge) {
-            $this->client_error(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
+            $this->clientError(_('This user doesn\'t allow nudges or hasn\'t confirmed or set his email yet.'));
             return;
         }
 
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 82791af349..d1989e0dea 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -28,7 +28,7 @@ class OpenidloginAction extends Action
     {
         parent::handle($args);
         if (common_logged_in()) {
-            common_user_error(_('Already logged in.'));
+            $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $openid_url = $this->trimmed('openid_url');
 
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 97cbd0094e..51f6f8197d 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -177,7 +177,7 @@ class OthersettingsAction extends SettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
diff --git a/actions/peopletag.php b/actions/peopletag.php
index 2680638d7c..7bcfcb93e3 100644
--- a/actions/peopletag.php
+++ b/actions/peopletag.php
@@ -32,7 +32,7 @@ class PeopletagAction extends Action
         $tag = $this->trimmed('tag');
         
         if (!common_valid_profile_tag($tag)) {
-            $this->client_error(sprintf(_('Not a valid people tag: %s'), $tag));
+            $this->clientError(sprintf(_('Not a valid people tag: %s'), $tag));
             return;
         }
 
diff --git a/actions/postnotice.php b/actions/postnotice.php
index dec62a678f..0b47352964 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -36,7 +36,7 @@ class PostnoticeAction extends Action
                 print "omb_version=".OMB_VERSION_01;
             }
         } catch (OAuthException $e) {
-            common_server_error($e->getMessage());
+            $this->serverError($e->getMessage());
             return;
         }
     }
@@ -45,36 +45,36 @@ class PostnoticeAction extends Action
     {
         $version = $req->get_parameter('omb_version');
         if ($version != OMB_VERSION_01) {
-            common_user_error(_('Unsupported OMB version'), 400);
+            $this->clientError(_('Unsupported OMB version'), 400);
             return false;
         }
         # First, check to see
         $listenee =  $req->get_parameter('omb_listenee');
         $remote_profile = Remote_profile::staticGet('uri', $listenee);
         if (!$remote_profile) {
-            common_user_error(_('Profile unknown'), 403);
+            $this->clientError(_('Profile unknown'), 403);
             return false;
         }
         $sub = Subscription::staticGet('token', $token->key);
         if (!$sub) {
-            common_user_error(_('No such subscription'), 403);
+            $this->clientError(_('No such subscription'), 403);
             return false;
         }
         $content = $req->get_parameter('omb_notice_content');
         $content_shortened = common_shorten_links($content);
         if (mb_strlen($content_shortened) > 140) {
-            common_user_error(_('Invalid notice content'), 400);
+            $this->clientError(_('Invalid notice content'), 400);
             return false;
         }
         $notice_uri = $req->get_parameter('omb_notice');
         if (!Validate::uri($notice_uri) &&
             !common_valid_tag($notice_uri)) {
-            common_user_error(_('Invalid notice uri'), 400);
+            $this->clientError(_('Invalid notice uri'), 400);
             return false;
         }
         $notice_url = $req->get_parameter('omb_notice_url');
         if ($notice_url && !common_valid_http_url($notice_url)) {
-            common_user_error(_('Invalid notice url'), 400);
+            $this->clientError(_('Invalid notice url'), 400);
             return false;
         }
         $notice = Notice::staticGet('uri', $notice_uri);
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index ef45fc1d9f..6ad3f2ef5c 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -125,7 +125,7 @@ class ProfilesettingsAction extends SettingsAction
 
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->server_error(_('User without matching profile'));
+            $this->serverError(_('User without matching profile'));
             return;
         }
         
@@ -298,7 +298,7 @@ class ProfilesettingsAction extends SettingsAction
 
             if ($result === false) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
-                common_server_error(_('Couldn\'t update user.'));
+                $this->serverError(_('Couldn\'t update user.'));
                 return;
             } else {
                 # Re-initialize language environment if it changed
@@ -318,7 +318,7 @@ class ProfilesettingsAction extends SettingsAction
 
             if ($result === false) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
-                common_server_error(_('Couldn\'t update user for autosubscribe.'));
+                $this->serverError(_('Couldn\'t update user for autosubscribe.'));
                 return;
             }
         }
@@ -341,7 +341,7 @@ class ProfilesettingsAction extends SettingsAction
 
         if (!$result) {
             common_log_db_error($profile, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t save profile.'));
+            $this->serverError(_('Couldn\'t save profile.'));
             return;
         }
 
@@ -350,7 +350,7 @@ class ProfilesettingsAction extends SettingsAction
         $result = $user->setSelfTags($tags);
 
         if (!$result) {
-            common_server_error(_('Couldn\'t save tags.'));
+            $this->serverError(_('Couldn\'t save tags.'));
             return;
         }
         
@@ -475,7 +475,7 @@ class ProfilesettingsAction extends SettingsAction
         }
 
         if (!$user->update($original)) {
-            common_server_error(_('Can\'t save new password.'));
+            $this->serverError(_('Can\'t save new password.'));
             return;
         }
 
diff --git a/actions/public.php b/actions/public.php
index 62071ecccd..0ceeef98e8 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -165,7 +165,7 @@ class PublicAction extends Action
                                        NOTICES_PER_PAGE + 1);
 
         if (!$notice) {
-            $this->server_error(_('Could not retrieve public stream.'));
+            $this->serverError(_('Could not retrieve public stream.'));
             return;
         }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 3e6ecfb1f9..3d839e7514 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -30,7 +30,7 @@ class RecoverpasswordAction extends Action
     {
         parent::handle($args);
         if (common_logged_in()) {
-            $this->client_error(_('You are already logged in!'));
+            $this->clientError(_('You are already logged in!'));
             return;
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('recover')) {
@@ -38,7 +38,7 @@ class RecoverpasswordAction extends Action
             } else if ($this->arg('reset')) {
                 $this->reset_password();
             } else {
-                $this->client_error(_('Unexpected form submission.'));
+                $this->clientError(_('Unexpected form submission.'));
             }
         } else {
             if ($this->trimmed('code')) {
@@ -56,18 +56,18 @@ class RecoverpasswordAction extends Action
         $confirm = Confirm_address::staticGet('code', $code);
 
         if (!$confirm) {
-            $this->client_error(_('No such recovery code.'));
+            $this->clientError(_('No such recovery code.'));
             return;
         }
         if ($confirm->address_type != 'recover') {
-            $this->client_error(_('Not a recovery code.'));
+            $this->clientError(_('Not a recovery code.'));
             return;
         }
 
         $user = User::staticGet($confirm->user_id);
 
         if (!$user) {
-            $this->server_error(_('Recovery code for unknown user.'));
+            $this->serverError(_('Recovery code for unknown user.'));
             return;
         }
 
@@ -80,7 +80,7 @@ class RecoverpasswordAction extends Action
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            common_server_error(_('Error with confirmation code.'));
+            $this->serverError(_('Error with confirmation code.'));
             return;
         }
 
@@ -91,7 +91,7 @@ class RecoverpasswordAction extends Action
             common_log(LOG_WARNING, 
                        'Attempted redemption on recovery code ' .
                        'that is ' . $touched . ' seconds old. ');
-            $this->client_error(_('This confirmation code is too old. ' .
+            $this->clientError(_('This confirmation code is too old. ' .
                                    'Please start again.'));
             return;
         }
@@ -105,7 +105,7 @@ class RecoverpasswordAction extends Action
             $result = $user->updateKeys($orig);
             if (!$result) {
                 common_log_db_error($user, 'UPDATE', __FILE__);
-                $this->server_error(_('Could not update user with confirmed email address.'));
+                $this->serverError(_('Could not update user with confirmed email address.'));
                 return;
             }
         }
@@ -240,7 +240,7 @@ class RecoverpasswordAction extends Action
         }
 
         if (!$user->email && !$confirm_email) {
-            $this->client_error(_('No registered email address for that user.'));
+            $this->clientError(_('No registered email address for that user.'));
             return;
         }
 
@@ -254,7 +254,7 @@ class RecoverpasswordAction extends Action
 
         if (!$confirm->insert()) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
-            $this->server_error(_('Error saving address confirmation.'));
+            $this->serverError(_('Error saving address confirmation.'));
             return;
         }
 
@@ -298,7 +298,7 @@ class RecoverpasswordAction extends Action
         $user = $this->get_temp_user();
 
         if (!$user) {
-            $this->client_error(_('Unexpected password reset.'));
+            $this->clientError(_('Unexpected password reset.'));
             return;
         }
 
@@ -322,14 +322,14 @@ class RecoverpasswordAction extends Action
 
         if (!$user->update($original)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Can\'t save new password.'));
+            $this->serverError(_('Can\'t save new password.'));
             return;
         }
 
         $this->clear_temp_user();
 
         if (!common_set_user($user->nickname)) {
-            common_server_error(_('Error setting user.'));
+            $this->serverError(_('Error setting user.'));
             return;
         }
 
diff --git a/actions/register.php b/actions/register.php
index bac1796876..b4d0d43fb4 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -26,9 +26,9 @@ class RegisterAction extends Action
         parent::handle($args);
 
         if (common_config('site', 'closed')) {
-            common_user_error(_('Registration not allowed.'));
+            $this->clientError(_('Registration not allowed.'));
         } else if (common_logged_in()) {
-            common_user_error(_('Already logged in.'));
+            $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->try_register();
         } else {
@@ -65,7 +65,7 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && !($code && $invite)) {
-            $this->client_error(_('Sorry, only invited people can register.'));
+            $this->clientError(_('Sorry, only invited people can register.'));
             return;
         }
 
@@ -115,7 +115,7 @@ class RegisterAction extends Action
             }
             # success!
             if (!common_set_user($user)) {
-                common_server_error(_('Error setting user.'));
+                $this->serverError(_('Error setting user.'));
                 return;
             }
             # this is a real login
@@ -179,7 +179,7 @@ class RegisterAction extends Action
         }
 
         if (common_config('site', 'inviteonly') && !($code && $invite)) {
-            $this->client_error(_('Sorry, only invited people can register.'));
+            $this->clientError(_('Sorry, only invited people can register.'));
             return;
         }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index b9e29d645d..32e9bf3d37 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -30,7 +30,7 @@ class RemotesubscribeAction extends Action
         parent::handle($args);
 
         if (common_logged_in()) {
-            common_user_error(_('You can use the local subscription!'));
+            $this->clientError(_('You can use the local subscription!'));
             return;
         }
 
@@ -342,7 +342,7 @@ class RemotesubscribeAction extends Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->server_error(_('User without matching profile'));
+            $this->serverError(_('User without matching profile'));
             return;
         }
 
diff --git a/actions/replies.php b/actions/replies.php
index 8785508884..84fd894ff0 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -40,7 +40,7 @@ class RepliesAction extends StreamAction
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -57,7 +57,7 @@ class RepliesAction extends StreamAction
 
     function no_such_user()
     {
-        common_user_error(_('No such user.'));
+        $this->clientError(_('No such user.'));
     }
 
     function show_header($user)
diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 5f85f8d2e8..43be133a43 100644
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -34,7 +34,7 @@ class RepliesrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index a745487393..378db44030 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -39,7 +39,7 @@ class RequesttokenAction extends Action
             $token = $server->fetch_request_token($req);
             print $token;
         } catch (OAuthException $e) {
-            common_server_error($e->getMessage());
+            $this->serverError($e->getMessage());
         }
     }
 }
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 1dec3ba5ba..caa823893d 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -33,14 +33,14 @@ class ShowfavoritesAction extends StreamAction
         $user = User::staticGet('nickname', $nickname);
 
         if (!$user) {
-            $this->client_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return;
         }
 
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -90,7 +90,7 @@ class ShowfavoritesAction extends StreamAction
         $notice = $user->favoriteNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
 
         if (!$notice) {
-            $this->server_error(_('Could not retrieve favorite notices.'));
+            $this->serverError(_('Could not retrieve favorite notices.'));
             return;
         }
 
diff --git a/actions/showmessage.php b/actions/showmessage.php
index 25330a568f..d13e9f671f 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -32,7 +32,7 @@ class ShowmessageAction extends MailboxAction
         $message = $this->get_message();
 
         if (!$message) {
-            $this->client_error(_('No such message.'), 404);
+            $this->clientError(_('No such message.'), 404);
             return;
         }
         
@@ -41,7 +41,7 @@ class ShowmessageAction extends MailboxAction
         if ($cur && ($cur->id == $message->from_profile || $cur->id == $message->to_profile)) {
             $this->show_page($cur, 1);
         } else {
-            $this->client_error(_('Only the sender and recipient may read this message.'), 403);
+            $this->clientError(_('Only the sender and recipient may read this message.'), 403);
             return;
         }
     }
diff --git a/actions/shownotice.php b/actions/shownotice.php
index c519af0ba3..82d4bd2701 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -37,14 +37,14 @@ class ShownoticeAction extends StreamAction
         $this->notice = Notice::staticGet($id);
 
         if (!$this->notice) {
-            $this->client_error(_('No such notice.'), 404);
+            $this->clientError(_('No such notice.'), 404);
             return false;
         }
 
         $this->profile = $this->notice->getProfile();
 
         if (!$this->profile) {
-            $this->server_error(_('Notice has no profile'), 500);
+            $this->serverError(_('Notice has no profile'), 500);
             return false;
         }
 
@@ -119,6 +119,6 @@ class ShownoticeAction extends StreamAction
 
     function no_such_notice()
     {
-        common_user_error(_('No such notice.'));
+        $this->clientError(_('No such notice.'));
     }
 }
diff --git a/actions/showstream.php b/actions/showstream.php
index 9a59f7ae45..ed38c67f95 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -56,7 +56,7 @@ class ShowstreamAction extends StreamAction
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -159,7 +159,7 @@ class ShowstreamAction extends StreamAction
 
     function no_such_user()
     {
-        $this->client_error(_('No such user.'), 404);
+        $this->clientError(_('No such user.'), 404);
     }
 
     function show_profile($profile)
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 1be45d1cec..c5879e4d95 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -168,7 +168,7 @@ class SmssettingsAction extends EmailsettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
 
@@ -218,7 +218,7 @@ class SmssettingsAction extends EmailsettingsAction
 
         if ($result === false) {
             common_log_db_error($confirm, 'INSERT', __FILE__);
-            common_server_error(_('Couldn\'t insert confirmation code.'));
+            $this->serverError(_('Couldn\'t insert confirmation code.'));
             return;
         }
 
@@ -254,7 +254,7 @@ class SmssettingsAction extends EmailsettingsAction
 
         if (!$result) {
             common_log_db_error($confirm, 'DELETE', __FILE__);
-            $this->server_error(_('Couldn\'t delete email confirmation.'));
+            $this->serverError(_('Couldn\'t delete email confirmation.'));
             return;
         }
 
@@ -283,7 +283,7 @@ class SmssettingsAction extends EmailsettingsAction
         $result = $user->updateKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t update user.'));
+            $this->serverError(_('Couldn\'t update user.'));
             return;
         }
         $user->query('COMMIT');
diff --git a/actions/subedit.php b/actions/subedit.php
index 1142b7a032..e22384869b 100644
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -30,28 +30,28 @@ class SubeditAction extends Action
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         $id = $this->trimmed('profile');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
+            $this->clientError(_('No profile specified.'));
             return false;
         }
 
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
+            $this->clientError(_('No profile with that ID.'));
             return false;
         }
 
@@ -68,7 +68,7 @@ class SubeditAction extends Action
                                                'subscribed' => $this->profile->id));
 
             if (!$sub) {
-                $this->client_error(_('You are not subscribed to that profile.'));
+                $this->clientError(_('You are not subscribed to that profile.'));
                 return false;
             }
 
@@ -81,7 +81,7 @@ class SubeditAction extends Action
 
             if (!$result) {
                 common_log_db_error($sub, 'UPDATE', __FILE__);
-                $this->server_error(_('Could not save subscription.'));
+                $this->serverError(_('Could not save subscription.'));
                 return false;
             }
 
diff --git a/actions/subscribe.php b/actions/subscribe.php
index 99f9acc241..b6f03f0f13 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -27,7 +27,7 @@ class SubscribeAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         }
 
@@ -43,7 +43,7 @@ class SubscribeAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
@@ -52,14 +52,14 @@ class SubscribeAction extends Action
         $other = User::staticGet('id', $other_id);
 
         if (!$other) {
-            $this->client_error(_('Not a local user.'));
+            $this->clientError(_('Not a local user.'));
             return;
         }
 
         $result = subs_subscribe_to($user, $other);
 
         if($result != true) {
-            common_user_error($result);
+            $this->clientError($result);
             return;
         }
 
diff --git a/actions/tagother.php b/actions/tagother.php
index f0105ec8b7..e11e3a00df 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -30,7 +30,7 @@ class TagotherAction extends Action
         parent::handle($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in'), 403);
+            $this->clientError(_('Not logged in'), 403);
             return;
         }
 
@@ -39,12 +39,12 @@ class TagotherAction extends Action
         } else {
             $id = $this->trimmed('id');
             if (!$id) {
-                $this->client_error(_('No id argument.'));
+                $this->clientError(_('No id argument.'));
                 return;
             }
             $profile = Profile::staticGet('id', $id);
             if (!$profile) {
-                $this->client_error(_('No profile with that ID.'));
+                $this->clientError(_('No profile with that ID.'));
                 return;
             }
             $this->show_form($profile);
@@ -121,7 +121,7 @@ class TagotherAction extends Action
         $profile = Profile::staticGet('id', $id);
 
         if (!$profile) {
-            $this->client_error(_('No such profile.'));
+            $this->clientError(_('No such profile.'));
             return;
         }
 
@@ -147,14 +147,14 @@ class TagotherAction extends Action
             !Subscription::pkeyGet(array('subscriber' => $profile->id,
                                          'subscribed' => $user->id)))
         {
-            $this->client_error(_('You can only tag people you are subscribed to or who are subscribed to you.'));
+            $this->clientError(_('You can only tag people you are subscribed to or who are subscribed to you.'));
             return;
         }
 
         $result = Profile_tag::setTags($user->id, $profile->id, $tags);
 
         if (!$result) {
-            $this->client_error(_('Could not save tags.'));
+            $this->clientError(_('Could not save tags.'));
             return;
         }
 
diff --git a/actions/tagrss.php b/actions/tagrss.php
index 912d71413d..b0227ab391 100644
--- a/actions/tagrss.php
+++ b/actions/tagrss.php
@@ -32,7 +32,7 @@ class TagrssAction extends Rss10Action
         $this->tag = Notice_tag::staticGet('tag', $tag);
 
         if (!$this->tag) {
-            common_user_error(_('No such tag.'));
+            $this->clientError(_('No such tag.'));
             return false;
         } else {
             return true;
diff --git a/actions/twitapiaccount.php b/actions/twitapiaccount.php
index 79e1ed990d..e51a29a2d0 100644
--- a/actions/twitapiaccount.php
+++ b/actions/twitapiaccount.php
@@ -29,7 +29,7 @@ class TwitapiaccountAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -39,7 +39,7 @@ class TwitapiaccountAction extends TwitterapiAction
     function end_session($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     function update_location($args, $apidata)
@@ -47,7 +47,7 @@ class TwitapiaccountAction extends TwitterapiAction
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -56,7 +56,7 @@ class TwitapiaccountAction extends TwitterapiAction
         if (!is_null($location) && strlen($location) > 255) {
 
             // XXX: But Twitter just truncates and runs with it. -- Zach
-            $this->client_error(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
+            $this->clientError(_('That\'s too long. Max notice size is 255 chars.'), 406, $apidate['content-type']);
             return;
         }
 
@@ -64,7 +64,7 @@ class TwitapiaccountAction extends TwitterapiAction
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -75,7 +75,7 @@ class TwitapiaccountAction extends TwitterapiAction
 
         if (!$result) {
             common_log_db_error($profile, 'UPDATE', __FILE__);
-            common_server_error(_('Couldn\'t save profile.'));
+            $this->serverError(_('Couldn\'t save profile.'));
             return;
         }
 
@@ -91,12 +91,12 @@ class TwitapiaccountAction extends TwitterapiAction
     function update_delivery_device($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     function rate_limit_status($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 }
\ No newline at end of file
diff --git a/actions/twitapiblocks.php b/actions/twitapiblocks.php
index 5d64f2f7d8..8135adef3c 100644
--- a/actions/twitapiblocks.php
+++ b/actions/twitapiblocks.php
@@ -32,7 +32,7 @@ class TwitapiblocksAction extends TwitterapiAction
         $blockee = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$blockee) {
-            $this->client_error('Not Found', 404, $apidata['content-type']);
+            $this->clientError('Not Found', 404, $apidata['content-type']);
             return;
         }
 
@@ -44,7 +44,7 @@ class TwitapiblocksAction extends TwitterapiAction
             $this->show_profile($blockee, $type);
             $this->end_document($type);
         } else {
-            common_server_error(_('Block user failed.'));
+            $this->serverError(_('Block user failed.'));
         }
     }
 
@@ -54,7 +54,7 @@ class TwitapiblocksAction extends TwitterapiAction
         $blockee = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$blockee) {
-            $this->client_error('Not Found', 404, $apidata['content-type']);
+            $this->clientError('Not Found', 404, $apidata['content-type']);
             return;
         }
 
@@ -66,7 +66,7 @@ class TwitapiblocksAction extends TwitterapiAction
             $this->show_profile($blockee, $type);
             $this->end_document($type);
         } else {
-            common_server_error(_('Unblock user failed.'));
+            $this->serverError(_('Unblock user failed.'));
         }
     }
 }
\ No newline at end of file
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index 36d2a7e09d..db55e8cd02 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -108,7 +108,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
             $this->show_json_dmsgs($message);
             break;
          default:
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
         }
 
     }
@@ -119,7 +119,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -134,11 +134,11 @@ class Twitapidirect_messagesAction extends TwitterapiAction
         $content = $this->trimmed('text');
 
         if (!$content) {
-            $this->client_error(_('No message text!'), $code = 406, $apidata['content-type']);
+            $this->clientError(_('No message text!'), $code = 406, $apidata['content-type']);
         } else {
             $content_shortened = common_shorten_links($content);
             if (mb_strlen($content_shortened) > 140) {
-                $this->client_error(_('That\'s too long. Max message size is 140 chars.'),
+                $this->clientError(_('That\'s too long. Max message size is 140 chars.'),
                     $code = 406, $apidata['content-type']);
                 return;
             }
@@ -147,15 +147,15 @@ class Twitapidirect_messagesAction extends TwitterapiAction
         $other = $this->get_user($this->trimmed('user'));
 
         if (!$other) {
-            $this->client_error(_('Recipient user not found.'), $code = 403, $apidata['content-type']);
+            $this->clientError(_('Recipient user not found.'), $code = 403, $apidata['content-type']);
             return;
         } else if (!$user->mutuallySubscribed($other)) {
-            $this->client_error(_('Can\'t send direct messages to users who aren\'t your friend.'),
+            $this->clientError(_('Can\'t send direct messages to users who aren\'t your friend.'),
                 $code = 403, $apidata['content-type']);
             return;
         } else if ($user->id == $other->id) {
             // Sending msgs to yourself is allowed by Twitter
-            $this->client_error(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
+            $this->clientError(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'),
                 $code = 403, $apidata['content-type']);
             return;
         }
@@ -164,7 +164,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
             html_entity_decode($content, ENT_NOQUOTES, 'UTF-8'), $source);
 
         if (is_string($message)) {
-            $this->server_error($message);
+            $this->serverError($message);
             return;
         }
 
@@ -181,7 +181,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction
     function destroy($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     function show_xml_dmsgs($message)
diff --git a/actions/twitapifavorites.php b/actions/twitapifavorites.php
index 55e04732f5..737b7229f0 100644
--- a/actions/twitapifavorites.php
+++ b/actions/twitapifavorites.php
@@ -32,14 +32,14 @@ class TwitapifavoritesAction extends TwitterapiAction
         $user = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$user) {
-            $this->client_error('Not Found', 404, $apidata['content-type']);
+            $this->clientError('Not Found', 404, $apidata['content-type']);
             return;
         }
 
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -56,7 +56,7 @@ class TwitapifavoritesAction extends TwitterapiAction
         $notice = $user->favoriteNotices((($page-1)*20), $count);
 
         if (!$notice) {
-            common_server_error(_('Could not retrieve favorite notices.'));
+            $this->serverError(_('Could not retrieve favorite notices.'));
             return;
         }
 
@@ -82,7 +82,7 @@ class TwitapifavoritesAction extends TwitterapiAction
             $this->show_json_timeline($notice);
             break;
          default:
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
         }
 
     }
@@ -94,12 +94,12 @@ class TwitapifavoritesAction extends TwitterapiAction
         // Check for RESTfulness
         if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
             // XXX: Twitter just prints the err msg, no XML / JSON.
-            $this->client_error(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
             return;
         }
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -109,20 +109,20 @@ class TwitapifavoritesAction extends TwitterapiAction
         $notice = Notice::staticGet($notice_id);
 
         if (!$notice) {
-            $this->client_error(_('No status found with that ID.'), 404, $apidata['content-type']);
+            $this->clientError(_('No status found with that ID.'), 404, $apidata['content-type']);
             return;
         }
 
         // XXX: Twitter lets you fave things repeatedly via api.
         if ($user->hasFave($notice)) {
-            $this->client_error(_('This notice is already a favorite!'), 403, $apidata['content-type']);
+            $this->clientError(_('This notice is already a favorite!'), 403, $apidata['content-type']);
             return;
         }
 
         $fave = Fave::addNew($user, $notice);
 
         if (!$fave) {
-            common_server_error(_('Could not create favorite.'));
+            $this->serverError(_('Could not create favorite.'));
             return;
         }
 
@@ -140,7 +140,7 @@ class TwitapifavoritesAction extends TwitterapiAction
     function destroy($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     // XXX: these two funcs swiped from faves.  Maybe put in util.php, or some common base class?
diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index 458ff48a54..c50c5e84a9 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -29,7 +29,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         parent::handle($args);
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -38,7 +38,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         $other = $this->get_user($id);
 
         if (!$other) {
-            $this->client_error(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
+            $this->clientError(_('Could not follow user: User not found.'), 403, $apidata['content-type']);
             return;
         }
 
@@ -46,7 +46,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
 
         if ($user->isSubscribed($other)) {
             $errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
-            $this->client_error($errmsg, 403, $apidata['content-type']);
+            $this->clientError($errmsg, 403, $apidata['content-type']);
             return;
         }
 
@@ -62,7 +62,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
 
         if (!$result) {
             $errmsg = sprintf(_('Could not follow user: %s is already on your list.'), $other->nickname);
-            $this->client_error($errmsg, 400, $apidata['content-type']);
+            $this->clientError($errmsg, 400, $apidata['content-type']);
             return;
         }
 
@@ -82,7 +82,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
-            $this->client_error(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -102,7 +102,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
             $sub->delete();
             $sub->query('COMMIT');
         } else {
-            $this->client_error(_('You are not friends with the specified user.'), 403, $apidata['content-type']);
+            $this->clientError(_('You are not friends with the specified user.'), 403, $apidata['content-type']);
             return;
         }
 
@@ -118,7 +118,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -129,7 +129,7 @@ class TwitapifriendshipsAction extends TwitterapiAction
         $user_b = $this->get_user($user_b_id);
 
         if (!$user_a || !$user_b) {
-            $this->client_error(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
+            $this->clientError(_('Two user ids or screen_names must be supplied.'), 400, $apidata['content-type']);
             return;
         }
 
diff --git a/actions/twitapihelp.php b/actions/twitapihelp.php
index 531c6e9d31..db5892baf2 100644
--- a/actions/twitapihelp.php
+++ b/actions/twitapihelp.php
@@ -41,7 +41,7 @@ class TwitapihelpAction extends TwitterapiAction
             print '"ok"';
             $this->end_document('json');
         } else {
-            common_user_error(_('API method not found!'), $code=404);
+            $this->clientError(_('API method not found!'), $code=404);
         }
 
     }
@@ -49,7 +49,7 @@ class TwitapihelpAction extends TwitterapiAction
     function downtime_schedule($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
 }
\ No newline at end of file
diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php
index 34c8f88fc4..8cd7a64b9f 100644
--- a/actions/twitapilaconica.php
+++ b/actions/twitapilaconica.php
@@ -79,7 +79,7 @@ class TwitapilaconicaAction extends TwitterapiAction
             $this->end_document('json');
             break;
          default:
-            $this->client_error(_('API method not found!'), $code=404);
+            $this->clientError(_('API method not found!'), $code=404);
         }
     }
 
@@ -148,7 +148,7 @@ class TwitapilaconicaAction extends TwitterapiAction
             $this->end_document('json');
             break;
          default:
-            $this->client_error(_('API method not found!'), $code=404);
+            $this->clientError(_('API method not found!'), $code=404);
         }
     }
 
@@ -169,6 +169,6 @@ class TwitapilaconicaAction extends TwitterapiAction
     function wadl($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), 501);
+        $this->serverError(_('API method under construction.'), 501);
     }
 }
diff --git a/actions/twitapinotifications.php b/actions/twitapinotifications.php
index a19d652c3d..411971af16 100644
--- a/actions/twitapinotifications.php
+++ b/actions/twitapinotifications.php
@@ -28,13 +28,13 @@ class TwitapinotificationsAction extends TwitterapiAction
     function follow($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     function leave($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
 }
\ No newline at end of file
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 8d175ecab8..a35f4b12ea 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -76,12 +76,12 @@ class TwitapistatusesAction extends TwitterapiAction
                     $this->show_json_timeline($notice);
                     break;
                 default:
-                    common_user_error(_('API method not found!'), $code = 404);
+                    $this->clientError(_('API method not found!'), $code = 404);
                     break;
             }
 
         } else {
-            common_server_error(_('Couldn\'t find any statuses.'), $code = 503);
+            $this->serverError(_('Couldn\'t find any statuses.'), $code = 503);
         }
 
     }
@@ -144,7 +144,7 @@ class TwitapistatusesAction extends TwitterapiAction
             $this->show_json_timeline($notice);
             break;
          default:
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
         }
 
     }
@@ -157,14 +157,14 @@ class TwitapistatusesAction extends TwitterapiAction
         $user = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$user) {
-            $this->client_error('Not Found', 404, $apidata['content-type']);
+            $this->clientError('Not Found', 404, $apidata['content-type']);
             return;
         }
 
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -225,7 +225,7 @@ class TwitapistatusesAction extends TwitterapiAction
             $this->show_json_timeline($notice);
             break;
          default:
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
         }
 
     }
@@ -236,12 +236,12 @@ class TwitapistatusesAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            $this->client_error(_('This method requires a POST.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -273,7 +273,7 @@ class TwitapistatusesAction extends TwitterapiAction
                 // as "truncated." Sending this error may screw up some clients
                 // that assume Twitter will truncate for them.    Should we just
                 // truncate too? -- Zach
-                $this->client_error(_('That\'s too long. Max notice size is 140 chars.'), $code = 406, $apidata['content-type']);
+                $this->clientError(_('That\'s too long. Max notice size is 140 chars.'), $code = 406, $apidata['content-type']);
                 return;
 
             }
@@ -306,7 +306,7 @@ class TwitapistatusesAction extends TwitterapiAction
                 if ($reply) {
                     $reply_to = $in_reply_to_status_id;
                 } else {
-                    $this->client_error(_('Not found'), $code = 404, $apidata['content-type']);
+                    $this->clientError(_('Not found'), $code = 404, $apidata['content-type']);
                     return;
                 }
             }
@@ -315,7 +315,7 @@ class TwitapistatusesAction extends TwitterapiAction
                 $source, 1, $reply_to);
 
             if (is_string($notice)) {
-                $this->server_error($notice);
+                $this->serverError($notice);
                 return;
             }
 
@@ -389,7 +389,7 @@ class TwitapistatusesAction extends TwitterapiAction
             $this->show_json_timeline($notices);
             break;
          default:
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
         }
 
     }
@@ -399,7 +399,7 @@ class TwitapistatusesAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -415,7 +415,7 @@ class TwitapistatusesAction extends TwitterapiAction
             }
         } else {
             // XXX: Twitter just sets a 404 header and doens't bother to return an err msg
-            $this->client_error(_('No status with that ID found.'), 404, $apidata['content-type']);
+            $this->clientError(_('No status with that ID found.'), 404, $apidata['content-type']);
         }
 
     }
@@ -426,14 +426,14 @@ class TwitapistatusesAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
         // Check for RESTfulness
         if (!in_array($_SERVER['REQUEST_METHOD'], array('POST', 'DELETE'))) {
             // XXX: Twitter just prints the err msg, no XML / JSON.
-            $this->client_error(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
+            $this->clientError(_('This method requires a POST or DELETE.'), 400, $apidata['content-type']);
             return;
         }
 
@@ -443,7 +443,7 @@ class TwitapistatusesAction extends TwitterapiAction
         $notice = Notice::staticGet($notice_id);
 
         if (!$notice) {
-            $this->client_error(_('No status found with that ID.'), 404, $apidata['content-type']);
+            $this->clientError(_('No status found with that ID.'), 404, $apidata['content-type']);
             return;
         }
 
@@ -460,7 +460,7 @@ class TwitapistatusesAction extends TwitterapiAction
                 $this->show_single_json_status($notice);
             }
         } else {
-            $this->client_error(_('You may not delete another user\'s status.'), 403, $apidata['content-type']);
+            $this->clientError(_('You may not delete another user\'s status.'), 403, $apidata['content-type']);
         }
 
     }
@@ -487,7 +487,7 @@ class TwitapistatusesAction extends TwitterapiAction
         $user = $this->get_user($apidata['api_arg'], $apidata);
 
         if (!$user) {
-            $this->client_error('Not Found', 404, $apidata['content-type']);
+            $this->clientError('Not Found', 404, $apidata['content-type']);
             return;
         }
 
@@ -500,7 +500,7 @@ class TwitapistatusesAction extends TwitterapiAction
         $profile = $user->getProfile();
 
         if (!$profile) {
-            common_server_error(_('User has no profile.'));
+            $this->serverError(_('User has no profile.'));
             return;
         }
 
@@ -552,14 +552,14 @@ class TwitapistatusesAction extends TwitterapiAction
             print json_encode($arrays);
             break;
          default:
-            $this->client_error(_('unsupported file type'));
+            $this->clientError(_('unsupported file type'));
         }
     }
 
     function featured($args, $apidata)
     {
         parent::handle($args);
-        common_server_error(_('API method under construction.'), $code=501);
+        $this->serverError(_('API method under construction.'), $code=501);
     }
 
     function supported($cmd)
diff --git a/actions/twitapiusers.php b/actions/twitapiusers.php
index 409986985c..ed24175611 100644
--- a/actions/twitapiusers.php
+++ b/actions/twitapiusers.php
@@ -29,7 +29,7 @@ class TwitapiusersAction extends TwitterapiAction
         parent::handle($args);
 
         if (!in_array($apidata['content-type'], array('xml', 'json'))) {
-            common_user_error(_('API method not found!'), $code = 404);
+            $this->clientError(_('API method not found!'), $code = 404);
             return;
         }
 
@@ -44,7 +44,7 @@ class TwitapiusersAction extends TwitterapiAction
 
         if (!$user) {
             // XXX: Twitter returns a random(?) user instead of throwing and err! -- Zach
-            $this->client_error(_('Not found.'), 404, $apidata['content-type']);
+            $this->clientError(_('Not found.'), 404, $apidata['content-type']);
             return;
         }
 
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 6636880375..9c879c9650 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -285,7 +285,7 @@ class TwittersettingsAction extends SettingsAction
 
         if (!$result) {
             common_log_db_error($flink, 'DELETE', __FILE__);
-            common_server_error(_('Couldn\'t remove Twitter user.'));
+            $this->serverError(_('Couldn\'t remove Twitter user.'));
             return;
         }
 
diff --git a/actions/unblock.php b/actions/unblock.php
index 112304f71b..59270f8821 100644
--- a/actions/unblock.php
+++ b/actions/unblock.php
@@ -30,28 +30,28 @@ class UnblockAction extends Action
         parent::prepare($args);
 
         if (!common_logged_in()) {
-            $this->client_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return false;
         }
 
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         $id = $this->trimmed('unblockto');
 
         if (!$id) {
-            $this->client_error(_('No profile specified.'));
+            $this->clientError(_('No profile specified.'));
             return false;
         }
 
         $this->profile = Profile::staticGet('id', $id);
 
         if (!$this->profile) {
-            $this->client_error(_('No profile with that ID.'));
+            $this->clientError(_('No profile with that ID.'));
             return false;
         }
 
@@ -74,7 +74,7 @@ class UnblockAction extends Action
         $result = $cur->unblock($this->profile);
 
         if (!$result) {
-            $this->server_error(_('Error removing the block.'));
+            $this->serverError(_('Error removing the block.'));
             return;
         }
 
diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 455c5e28e8..32511a4b49 100644
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -24,7 +24,7 @@ class UnsubscribeAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         }
 
@@ -40,28 +40,28 @@ class UnsubscribeAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->client_error(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. Try again, please.'));
             return;
         }
 
         $other_id = $this->arg('unsubscribeto');
 
         if (!$other_id) {
-            $this->client_error(_('No profile id in request.'));
+            $this->clientError(_('No profile id in request.'));
             return;
         }
 
         $other = Profile::staticGet('id', $other_id);
 
         if (!$other_id) {
-            $this->client_error(_('No profile with that id.'));
+            $this->clientError(_('No profile with that id.'));
             return;
         }
 
         $result = subs_unsubscribe_to($user, $other);
 
         if ($result != true) {
-            common_user_error($result);
+            $this->clientError($result);
             return;
         }
 
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index abb034c81e..c79112dace 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -37,7 +37,7 @@ class UpdateprofileAction extends Action
                 print "omb_version=".OMB_VERSION_01;
             }
         } catch (OAuthException $e) {
-            $this->server_error($e->getMessage());
+            $this->serverError($e->getMessage());
             return;
         }
     }
@@ -46,14 +46,14 @@ class UpdateprofileAction extends Action
     {
         $version = $req->get_parameter('omb_version');
         if ($version != OMB_VERSION_01) {
-            $this->client_error(_('Unsupported OMB version'), 400);
+            $this->clientError(_('Unsupported OMB version'), 400);
             return false;
         }
         # First, check to see if listenee exists
         $listenee =  $req->get_parameter('omb_listenee');
         $remote = Remote_profile::staticGet('uri', $listenee);
         if (!$remote) {
-            $this->client_error(_('Profile unknown'), 404);
+            $this->clientError(_('Profile unknown'), 404);
             return false;
         }
         # Second, check to see if they should be able to post updates!
@@ -64,72 +64,72 @@ class UpdateprofileAction extends Action
         $sub->subscribed = $remote->id;
         $sub->token = $token->key;
         if (!$sub->find(true)) {
-            $this->client_error(_('You did not send us that profile'), 403);
+            $this->clientError(_('You did not send us that profile'), 403);
             return false;
         }
 
         $profile = Profile::staticGet('id', $remote->id);
         if (!$profile) {
             # This one is our fault
-            $this->server_error(_('Remote profile with no matching profile'), 500);
+            $this->serverError(_('Remote profile with no matching profile'), 500);
             return false;
         }
         $nickname = $req->get_parameter('omb_listenee_nickname');
         if ($nickname && !Validate::string($nickname, array('min_length' => 1,
                                                             'max_length' => 64,
                                                             'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-            $this->client_error(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+            $this->clientError(_('Nickname must have only lowercase letters and numbers and no spaces.'));
             return false;
         }
         $license = $req->get_parameter('omb_listenee_license');
         if ($license && !common_valid_http_url($license)) {
-            $this->client_error(sprintf(_("Invalid license URL '%s'"), $license));
+            $this->clientError(sprintf(_("Invalid license URL '%s'"), $license));
             return false;
         }
         $profile_url = $req->get_parameter('omb_listenee_profile');
         if ($profile_url && !common_valid_http_url($profile_url)) {
-            $this->client_error(sprintf(_("Invalid profile URL '%s'."), $profile_url));
+            $this->clientError(sprintf(_("Invalid profile URL '%s'."), $profile_url));
             return false;
         }
         # optional stuff
         $fullname = $req->get_parameter('omb_listenee_fullname');
         if ($fullname && strlen($fullname) > 255) {
-            $this->client_error(_("Full name is too long (max 255 chars)."));
+            $this->clientError(_("Full name is too long (max 255 chars)."));
             return false;
         }
         $homepage = $req->get_parameter('omb_listenee_homepage');
         if ($homepage && (!common_valid_http_url($homepage) || strlen($homepage) > 255)) {
-            $this->client_error(sprintf(_("Invalid homepage '%s'"), $homepage));
+            $this->clientError(sprintf(_("Invalid homepage '%s'"), $homepage));
             return false;
         }
         $bio = $req->get_parameter('omb_listenee_bio');
         if ($bio && strlen($bio) > 140) {
-            $this->client_error(_("Bio is too long (max 140 chars)."));
+            $this->clientError(_("Bio is too long (max 140 chars)."));
             return false;
         }
         $location = $req->get_parameter('omb_listenee_location');
         if ($location && strlen($location) > 255) {
-            $this->client_error(_("Location is too long (max 255 chars)."));
+            $this->clientError(_("Location is too long (max 255 chars)."));
             return false;
         }
         $avatar = $req->get_parameter('omb_listenee_avatar');
         if ($avatar) {
             if (!common_valid_http_url($avatar) || strlen($avatar) > 255) {
-                $this->client_error(sprintf(_("Invalid avatar URL '%s'"), $avatar));
+                $this->clientError(sprintf(_("Invalid avatar URL '%s'"), $avatar));
                 return false;
             }
             $size = @getimagesize($avatar);
             if (!$size) {
-                $this->client_error(sprintf(_("Can't read avatar URL '%s'"), $avatar));
+                $this->clientError(sprintf(_("Can't read avatar URL '%s'"), $avatar));
                 return false;
             }
             if ($size[0] != AVATAR_PROFILE_SIZE || $size[1] != AVATAR_PROFILE_SIZE) {
-                $this->client_error(sprintf(_("Wrong size image at '%s'"), $avatar));
+                $this->clientError(sprintf(_("Wrong size image at '%s'"), $avatar));
                 return false;
             }
             if (!in_array($size[2], array(IMAGETYPE_GIF, IMAGETYPE_JPEG,
                                           IMAGETYPE_PNG))) {
-                $this->client_error(sprintf(_("Wrong image type for '%s'"), $avatar));
+                $this->clientError(sprintf(_("Wrong image type for '%s'"), $avatar));
                 return false;
             }
         }
@@ -156,14 +156,14 @@ class UpdateprofileAction extends Action
         }
 
         if (!$profile->update($orig_profile)) {
-            $this->server_error(_('Could not save new profile info'), 500);
+            $this->serverError(_('Could not save new profile info'), 500);
             return false;
         } else {
             if ($avatar) {
                 $temp_filename = tempnam(sys_get_temp_dir(), 'listenee_avatar');
                 copy($avatar, $temp_filename);
                 if (!$profile->setOriginal($temp_filename)) {
-                    $this->server_error(_('Could not save avatar info'), 500);
+                    $this->serverError(_('Could not save avatar info'), 500);
                     return false;
                 }
             }
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 196fae9ad4..838458932b 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -54,7 +54,7 @@ class UserauthorizationAction extends Action
                 common_debug('getting new request', __FILE__);
                 $req = $this->get_new_request();
                 if (!$req) {
-                    $this->client_error(_('No request found!'));
+                    $this->clientError(_('No request found!'));
                 }
                 common_debug('validating request', __FILE__);
                 # XXX: only validate new requests, since nonce is one-time use
@@ -64,7 +64,7 @@ class UserauthorizationAction extends Action
                 $this->show_form($req);
             } catch (OAuthException $e) {
                 $this->clear_request();
-                $this->client_error($e->getMessage());
+                $this->clientError($e->getMessage());
                 return;
             }
 
@@ -137,7 +137,7 @@ class UserauthorizationAction extends Action
         $req = $this->get_stored_request();
 
         if (!$req) {
-            common_user_error(_('No authorization request!'));
+            $this->clientError(_('No authorization request!'));
             return;
         }
 
@@ -145,10 +145,10 @@ class UserauthorizationAction extends Action
 
         if ($this->arg('accept')) {
             if (!$this->authorize_token($req)) {
-                $this->client_error(_('Error authorizing token'));
+                $this->clientError(_('Error authorizing token'));
             }
             if (!$this->save_remote_profile($req)) {
-                $this->client_error(_('Error saving remote profile'));
+                $this->clientError(_('Error saving remote profile'));
             }
             if (!$callback) {
                 $this->show_accept_message($req->get_parameter('oauth_token'));
@@ -160,7 +160,7 @@ class UserauthorizationAction extends Action
                 $profile = $user->getProfile();
                 if (!$profile) {
                     common_log_db_error($user, 'SELECT', __FILE__);
-                    $this->server_error(_('User without matching profile'));
+                    $this->serverError(_('User without matching profile'));
                     return;
                 }
                 $params['omb_listener_nickname'] = $user->nickname;
diff --git a/actions/userbyid.php b/actions/userbyid.php
index d57ed21a54..3ff2c9c410 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -32,11 +32,11 @@ class UserbyidAction extends Action
         parent::handle($args);
         $id = $this->trimmed('id');
         if (!$id) {
-            $this->client_error(_('No id.'));
+            $this->clientError(_('No id.'));
         }
         $user =& User::staticGet($id);
         if (!$user) {
-            $this->client_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
         }
 
         // support redirecting to FOAF rdf/xml if the agent prefers it
diff --git a/actions/userrss.php b/actions/userrss.php
index 1e9fe121f0..d14fc523e8 100644
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -34,7 +34,7 @@ class UserrssAction extends Rss10Action
         $this->user = User::staticGet('nickname', $nickname);
 
         if (!$this->user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return false;
         } else {
             return true;
@@ -78,7 +78,7 @@ class UserrssAction extends Rss10Action
         $profile = $user->getProfile();
         if (!$profile) {
             common_log_db_error($user, 'SELECT', __FILE__);
-            $this->server_error(_('User without matching profile'));
+            $this->serverError(_('User without matching profile'));
             return null;
         }
         $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
diff --git a/actions/xrds.php b/actions/xrds.php
index 9c51f1dd21..7cb2cd2100 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -35,7 +35,7 @@ class XrdsAction extends Action
         $nickname = $this->trimmed('nickname');
         $user = User::staticGet('nickname', $nickname);
         if (!$user) {
-            common_user_error(_('No such user.'));
+            $this->clientError(_('No such user.'));
             return;
         }
         $this->show_xrds($user);
diff --git a/lib/action.php b/lib/action.php
index d02a1b7097..207be3c824 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -529,14 +529,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__);

From 8d9fb7711f32f7b7c0676641dd0c2b9343a5666f Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:05:36 +0000
Subject: [PATCH 089/256] Unnecessary wrapper

---
 actions/login.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index fd98e656db..f43de31ffd 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -122,9 +122,7 @@ class LoginAction extends Action
         } else {
             $instr = $this->get_instructions();
             $output = common_markup_to_html($instr);
-	    $this->elementStart('div', 'instructions');
             $this->raw($output);
-            $this->elementEnd('div');
         }
     }
     

From f294eab92a4e44c0ad8790b7875173a1340f4b5c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:07:49 +0000
Subject: [PATCH 090/256] is_readonly() -> isReadOnly()

---
 index.php      | 2 +-
 lib/action.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 3cecb5c8b6..387b642e2c 100644
--- a/index.php
+++ b/index.php
@@ -55,7 +55,7 @@ if (file_exists($actionfile)) {
 
     $action_obj = new $action_class();
 
-    if ($config['db']['mirror'] && $action_obj->is_readonly()) {
+    if ($config['db']['mirror'] && $action_obj->isReadOnly()) {
         if (is_array($config['db']['mirror'])) {
             // "load balancing", ha ha
             $k = array_rand($config['db']['mirror']);
diff --git a/lib/action.php b/lib/action.php
index 207be3c824..2a8f5677c5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -460,7 +460,7 @@ class Action extends HTMLOutputter // lawsuit
         return null;
     }
 
-    function is_readonly()
+    function isReadOnly()
     {
         return false;
     }

From ba9f1f603b5d832d8dd2f2b910ddf90bf32181b8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:09:16 +0000
Subject: [PATCH 091/256] All actions now use isReadOnly()

---
 actions/api.php          |  2 +-
 actions/foaf.php         |  2 +-
 actions/invite.php       |  2 +-
 actions/login.php        | 21 ++++++++-------------
 actions/logout.php       |  2 +-
 actions/publicxrds.php   |  2 +-
 actions/requesttoken.php |  2 +-
 actions/sup.php          |  2 +-
 actions/userbyid.php     |  2 +-
 actions/xrds.php         |  2 +-
 10 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/actions/api.php b/actions/api.php
index 64971774de..47c1196052 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -174,7 +174,7 @@ class ApiAction extends Action
         }
     }
 
-    function is_readonly()
+    function isReadOnly()
     {
         # NOTE: before handle(), can't use $this->arg
         $apiaction = $_REQUEST['apiaction'];
diff --git a/actions/foaf.php b/actions/foaf.php
index a0f8a1ff39..9fa321d4a9 100644
--- a/actions/foaf.php
+++ b/actions/foaf.php
@@ -26,7 +26,7 @@ define('BOTH', 0);
 class FoafAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
diff --git a/actions/invite.php b/actions/invite.php
index 879264deb9..95d96bcde0 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class InviteAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return false;
     }
diff --git a/actions/login.php b/actions/login.php
index 060d16ad61..cd337bd395 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class LoginAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
@@ -33,13 +33,13 @@ class LoginAction extends Action
         if (common_is_real_login()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->check_login();
+            $this->checkLogin();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function check_login()
+    function checkLogin()
     {
         # XXX: login throttle
 
@@ -75,7 +75,7 @@ class LoginAction extends Action
             }
             common_redirect($url);
         } else {
-            $this->show_form(_('Incorrect username or password.'));
+            $this->showForm(_('Incorrect username or password.'));
             return;
         }
 
@@ -104,7 +104,7 @@ class LoginAction extends Action
         common_redirect($url);
     }
 
-    function show_form($error=null)
+    function showForm($error=null)
     {
 	$this->error = $error;
 	$this->showPage();
@@ -120,7 +120,7 @@ class LoginAction extends Action
         if ($this->error) {
             $this->element('p', 'error', $this->error);
         } else {
-            $instr = $this->get_instructions();
+            $instr = $this->getInstructions();
             $output = common_markup_to_html($instr);
 	    $this->elementStart('div', 'instructions');
             $this->raw($output);
@@ -145,10 +145,9 @@ class LoginAction extends Action
         $this->element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
         $this->elementEnd('p');
-        common_show_footer();
     }
 
-    function get_instructions()
+    function getInstructions()
     {
         if (common_logged_in() &&
             !common_is_real_login() &&
@@ -166,8 +165,4 @@ class LoginAction extends Action
                      'try [OpenID](%%action.openidlogin%%). ');
         }
     }
-
-    function show_top($error=null)
-    {
-    }
 }
diff --git a/actions/logout.php b/actions/logout.php
index 3001f3613e..86d6270abe 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
 class LogoutAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index f66e34533a..e765fb1c92 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -26,7 +26,7 @@ require_once(INSTALLDIR.'/lib/openid.php');
 class PublicxrdsAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
diff --git a/actions/requesttoken.php b/actions/requesttoken.php
index 378db44030..5058deedb5 100644
--- a/actions/requesttoken.php
+++ b/actions/requesttoken.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
 class RequesttokenAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {
         return false;
     }
diff --git a/actions/sup.php b/actions/sup.php
index 6a1897585a..38e2e2e59c 100644
--- a/actions/sup.php
+++ b/actions/sup.php
@@ -79,7 +79,7 @@ class SupAction extends Action
         return $updates;
     }
     
-    function is_readonly()
+    function isReadOnly()
     {
         return true;
     }
diff --git a/actions/userbyid.php b/actions/userbyid.php
index 3ff2c9c410..4bb896c38e 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -22,7 +22,7 @@ if (!defined('LACONICA')) { exit(1); }
 class UserbyidAction extends Action
 {
     
-    function is_readonly()
+    function isReadOnly()
     {                
         return true;
     }
diff --git a/actions/xrds.php b/actions/xrds.php
index 7cb2cd2100..14cb9d503e 100644
--- a/actions/xrds.php
+++ b/actions/xrds.php
@@ -24,7 +24,7 @@ require_once(INSTALLDIR.'/lib/omb.php');
 class XrdsAction extends Action
 {
 
-    function is_readonly()
+    function isReadOnly()
     {                
         return true;
     }

From a22714b5ee84afe387d3a2671b787822461154b0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:15:13 +0000
Subject: [PATCH 092/256] Fix errant } in action

---
 lib/action.php | 39 +--------------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 2a8f5677c5..ed8b5c3525 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -331,11 +331,10 @@ class Action extends HTMLOutputter // lawsuit
 	$this->elementStart('dl', array('id' => 'page_notice',
 					'class' => 'system_notice'));
 	$this->element('dt', null, _('Page notice'));
-	$this->elementStart('dd', null);
+	$this->elementStart('dd');
 	$this->showPageNotice();
 	$this->elementEnd('dd');
 	$this->elementEnd('dl');
-	}
     }
 
     // SHOULD overload (unless there's not a notice)
@@ -554,42 +553,6 @@ class Action extends HTMLOutputter // lawsuit
         return common_local_url($action, $args);
     }
 
-    function nav_menu($menu)
-    {
-        $action = $this->trimmed('action');
-        $this->elementStart('ul', array('id' => 'nav_views'));
-        foreach ($menu as $menuaction => $menudesc) {
-            $this->menuItem(common_local_url($menuaction,
-                                              isset($menudesc[2]) ? $menudesc[2] : null),
-                             $menudesc[0],
-                             $menudesc[1],
-                             $action == $menuaction);
-        }
-        $this->elementEnd('ul');
-    }
-
-    function common_show_header($pagetitle, $callable=null, $data=null, $headercall=null)
-    {
-        global $config, $xw;
-        global $action; /* XXX: kind of cheating here. */
-
-        common_start_html();
-
-        $this->elementStart('head');
-
-        if ($callable) {
-            if ($data) {
-                call_user_func($callable, $data);
-            } else {
-                call_user_func($callable);
-            }
-        }
-        $this->elementEnd('head');
-        $this->elementStart('body', $action);
-        $this->elementStart('div', array('id' => 'wrap'));
-        $this->elementStart('div', array('id' => 'content'));
-    }
-
     // Added @id to li for some control.
     // XXX: We might want to move this to htmloutputter.php
 

From e20309315f1be64f93ceda2e02918bc6358eaca9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:17:04 +0000
Subject: [PATCH 093/256] Correct error var in login

---
 actions/login.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/actions/login.php b/actions/login.php
index cd337bd395..1044142a3c 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -21,7 +21,8 @@ if (!defined('LACONICA')) { exit(1); }
 
 class LoginAction extends Action
 {
-
+    var $error = null;
+    
     function isReadOnly()
     {
         return true;

From a18351bc390cc0c4081286220120a6b5e8402a19 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:32:02 +0000
Subject: [PATCH 094/256] Published title

---
 lib/noticelist.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index eb5416ee45..dd4c4a1881 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -343,7 +343,7 @@ class NoticeListItem extends Widget
             $noticeurl = $this->notice->uri;
         }
         $this->out->elementStart('dl', 'timestamp');
-        $this->out->element('dt', _('Published')); 
+        $this->out->element('dt', null, _('Published')); 
         $this->out->elementStart('dd', null);
         $this->out->elementStart('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));

From 1e874240bf58eaa2afd0cb4f3af166fb6dd50056 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:43:38 +0000
Subject: [PATCH 095/256] Add some stuff to .gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0c0fde8010..8c94886e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ config.php
 .htaccess
 *.tmproj
 dataobject.ini
+*~
+*.bak

From e697faf23bf70ed43d074a2f437aae362580e003 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:43:58 +0000
Subject: [PATCH 096/256] Add some includes to noticelist

---
 lib/noticelist.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index eb5416ee45..ccdd57feb3 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -31,6 +31,9 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
+require_once INSTALLDIR.'/lib/favorform.php';
+require_once INSTALLDIR.'/lib/disfavorform.php';
+
 /**
  * widget for displaying a list of notices
  *

From 16619439ab7d67331722cc00e3b24f451ee8fa6a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:44:19 +0000
Subject: [PATCH 097/256] Move some accounting stuff from publicgroupnav to
 action

More dl's and dd's. Rather than replicate them in every sub-class,
let's just put them in one place.
---
 lib/action.php         | 5 +++++
 lib/publicgroupnav.php | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index ed8b5c3525..9534073ec7 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -297,7 +297,12 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->elementStart('dl', array('id' => 'site_nav_local_views'));
+        $this->element('dt', null, _('Local views'));
+        $this->elementStart('dd');
         $this->showLocalNav();
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
         $this->showContentBlock();
         $this->showAside();
         $this->elementEnd('div');
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 1e5ed73596..7860783fa4 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -77,9 +77,6 @@ class PublicGroupNav extends Widget
 
     function show()
     {
-        $this->action->elementStart('dl', array('id' => 'site_nav_local_views'));
-        $this->action->element('dt', null, _('Local views'));
-        $this->action->elementStart('dd', null);
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         $this->out->menuItem(common_local_url('public'), _('Public'),
@@ -97,7 +94,5 @@ class PublicGroupNav extends Widget
             _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
 
         $this->action->elementEnd('ul');
-        $this->action->elementEnd('dd');
-        $this->action->elementEnd('dl');
     }
 }

From a0db0e391cdeb626436aa5941770ab1340a8156b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:45:43 +0000
Subject: [PATCH 098/256] Move personal group nav menu to its own class

---
 lib/personal.php         |  85 ------------------------
 lib/personalgroupnav.php | 135 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 85 deletions(-)
 create mode 100644 lib/personalgroupnav.php

diff --git a/lib/personal.php b/lib/personal.php
index 4e56c95664..46f9ff6be7 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -21,95 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
 
 class PersonalAction extends Action
 {
-
-    function is_readonly()
-    {
-        return true;
-    }
-
     function handle($args)
     {
         parent::handle($args);
         common_set_returnto($this->self_url());
     }
 
-    function views_menu()
-    {
-
-        $user = null;
-        $action = $this->trimmed('action');
-        $nickname = $this->trimmed('nickname');
-
-        if ($nickname) {
-            $user = User::staticGet('nickname', $nickname);
-            $user_profile = $user->getProfile();
-        } else {
-            $user_profile = false;
-        }
-
-        common_element_start('ul', array('id' => 'nav_views'));
-
-        common_menu_item(common_local_url('all', array('nickname' =>
-                                                       $nickname)),
-                         _('Personal'),
-                         sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                         $action == 'all');
-        common_menu_item(common_local_url('replies', array('nickname' =>
-                                                              $nickname)),
-                         _('Replies'),
-                         sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                         $action == 'replies');
-        common_menu_item(common_local_url('showstream', array('nickname' =>
-                                                              $nickname)),
-                         _('Profile'),
-                         ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
-                         $action == 'showstream');
-        common_menu_item(common_local_url('showfavorites', array('nickname' =>
-                                                              $nickname)),
-                         _('Favorites'),
-                         sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
-                         $action == 'showfavorites');
-
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id) {
-
-            common_menu_item(common_local_url('inbox', array('nickname' =>
-                                                                     $nickname)),
-                             _('Inbox'),
-                             _('Your incoming messages'),
-                             $action == 'inbox');
-            common_menu_item(common_local_url('outbox', array('nickname' =>
-                                                                     $nickname)),
-                             _('Outbox'),
-                             _('Your sent messages'),
-                             $action == 'outbox');
-        }
-
-        common_element_end('ul');
-    }
-
-    function source_link($source)
-    {
-        $source_name = _($source);
-        switch ($source) {
-         case 'web':
-         case 'xmpp':
-         case 'mail':
-         case 'omb':
-         case 'api':
-            common_element('span', 'noticesource', $source_name);
-            break;
-         default:
-            $ns = Notice_source::staticGet($source);
-            if ($ns) {
-                common_element('a', array('href' => $ns->url),
-                               $ns->name);
-            } else {
-                common_element('span', 'noticesource', $source_name);
-            }
-            break;
-        }
-        return;
-    }
 }
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
new file mode 100644
index 0000000000..5d727a5051
--- /dev/null
+++ b/lib/personalgroupnav.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for all actions (~views)
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Base class for all actions
+ *
+ * This is the base class for all actions in the package. An action is
+ * more or less a "view" in an MVC framework.
+ *
+ * Actions are responsible for extracting and validating parameters; using
+ * model classes to read and write to the database; and doing ouput.
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class PersonalGroupNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $user = null;
+	
+	// FIXME: we should probably pass this in
+	
+        $action = $this->action->trimmed('action');
+        $nickname = $this->action->trimmed('nickname');
+
+        if ($nickname) {
+            $user = User::staticGet('nickname', $nickname);
+            $user_profile = $user->getProfile();
+        } else {
+            $user_profile = false;
+        }
+
+        $this->out->elementStart('ul', array('id' => 'nav_views'));
+
+        $this->out->menuItem(common_local_url('all', array('nickname' =>
+                                                       $nickname)),
+                         _('Personal'),
+                         sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+                         $action == 'all');
+        $this->out->menuItem(common_local_url('replies', array('nickname' =>
+                                                              $nickname)),
+                         _('Replies'),
+                         sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
+                         $action == 'replies');
+        $this->out->menuItem(common_local_url('showstream', array('nickname' =>
+                                                              $nickname)),
+                         _('Profile'),
+                         ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
+                         $action == 'showstream');
+        $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
+                                                              $nickname)),
+                         _('Favorites'),
+                         sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
+                         $action == 'showfavorites');
+
+        $cur = common_current_user();
+
+        if ($cur && $cur->id == $user->id) {
+
+            $this->out->menuItem(common_local_url('inbox', array('nickname' =>
+                                                                     $nickname)),
+                             _('Inbox'),
+                             _('Your incoming messages'),
+                             $action == 'inbox');
+            $this->out->menuItem(common_local_url('outbox', array('nickname' =>
+                                                                     $nickname)),
+                             _('Outbox'),
+                             _('Your sent messages'),
+                             $action == 'outbox');
+        }
+
+        $this->out->elementEnd('ul');
+    }
+}

From c73ed29cb7977de759379249d0932f5fa62b179b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 23:46:22 +0000
Subject: [PATCH 099/256] Some work to make the all action work

---
 actions/all.php | 118 +++++++++++++++++++++++++-----------------------
 1 file changed, 62 insertions(+), 56 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 4ad7f12aee..548d7a1034 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -19,80 +19,86 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/actions/showstream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-class AllAction extends StreamAction
+class AllAction extends Action
 {
-
+    var $user = null;
+    var $page = null;
+    
+    function isReadOnly()
+    {
+        return true;
+    }
+    
+    function prepare($args)
+    {
+	parent::prepare($args);
+        $nickname = common_canonical_nickname($this->arg('nickname'));
+	$this->user = User::staticGet('nickname', $nickname);
+        $this->page = $this->trimmed('page');
+        if (!$this->page) {
+            $this->page = 1;
+        }
+	return true;
+    }
+    
     function handle($args)
     {
-
         parent::handle($args);
-
-        $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!$user) {
+	
+        if (!$this->user) {
             $this->clientError(_('No such user.'));
             return;
         }
-
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            $this->serverError(_('User has no profile.'));
-            return;
-        }
-
-        # Looks like we're good; show the header
-
-        common_show_header(sprintf(_("%s and friends"), $profile->nickname),
-                           array($this, 'show_header'), $user,
-                           array($this, 'show_top'));
-
-        $this->show_notices($user);
-
-        common_show_footer();
+	
+	$this->showPage();
     }
-
-    function show_header($user)
+    
+    function title()
+    {
+	if ($this->page > 1) {
+	    return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+	} else {
+	    return sprintf(_("%s and friends"), $this->user->nickname);
+	}
+    }
+    
+    function showFeeds()
     {
         $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('allrss', array('nickname' =>
-                                                                               $user->nickname)),
+										$this->user->nickname)),
                                      'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for friends of %s'), $user->nickname)));
+                                     'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname)));
+    }
+    
+    function showLocalNav()
+    {
+	$nav = new PersonalGroupNav($this);
+	$nav->show();
     }
 
-    function show_top($user)
+    function showExportData()
     {
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id) {
-            common_notice_form('all');
-        }
-
-        $this->views_menu();
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $user->nickname)),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'allrss')));
+        $fl = new FeedList($this);
+        $fl->show(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $this->user->nickname)),
+				 'type' => 'rss',
+				 'version' => 'RSS 1.0',
+				 'item' => 'allrss')));
     }
-
-    function show_notices($user)
+    
+    function showContent()
     {
+        $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+	
+        $nl = new NoticeList($notice, $this);
 
-        $page = $this->trimmed('page');
-        if (!$page) {
-            $page = 1;
-        }
-
-        $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        $cnt = $this->show_notice_list($notice);
-
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'all', array('nickname' => $user->nickname));
+        $cnt = $nl->show();
+	
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'all', array('nickname' => $this->user->nickname));
     }
 }

From f17df2e6be37f0d7a25e7e594fb0116785b46e6d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Thu, 15 Jan 2009 23:59:43 +0000
Subject: [PATCH 100/256] notice_favorite class submit doesn't need a paragraph
 wrapper

---
 lib/favorform.php     | 6 +++---
 lib/htmloutputter.php | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/favorform.php b/lib/favorform.php
index 4f4fd72a9d..8b01483b2e 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -125,7 +125,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Make a favorite'));
+                           _('Favorite'));
     }
     
     /**
@@ -136,6 +136,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-	return 'favor';
+	return 'notice_favorite';
     }
-}
\ No newline at end of file
+}
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 75a995bef1..eb8a612e4f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -324,13 +324,11 @@ class HTMLOutputter extends XMLOutputter
 
     function submit($id, $label, $cls='submit', $name=null)
     {
-        $this->elementStart('p');
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
                                       'value' => $label));
-        $this->elementEnd('p');
     }
 
     /**

From ed8c3794df59cb03c366e0a16188cefbd6719c90 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 00:50:46 +0000
Subject: [PATCH 101/256] Created reply icon (vertical flip of undo)

---
 theme/identica/css/display.css                     |   2 +-
 .../identica/images/icons/twotone/green/reply.gif  | Bin 0 -> 79 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 theme/identica/images/icons/twotone/green/reply.gif

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 4f2ba46526..7e0c6d7b4c 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -180,7 +180,7 @@ color:#333333;
 border-bottom-color:#ccc;
 }
 .notice-options .reply a {
-background:transparent url(../images/icons/twotone/green/undo.gif) no-repeat 0 45%;
+background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.notice_favorite input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
diff --git a/theme/identica/images/icons/twotone/green/reply.gif b/theme/identica/images/icons/twotone/green/reply.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6ff01bb355956903f06ddee4c88ec13185d7cf36
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwSjfQe|NsB^DFQ$e2o!&^FfuSOG3YP=0Z5*KNg<?f=CZf^{4<O%
eNe7=5ir8YAxFTjoMwP(Km3O#}=L9e?SOWlG;~T&L

literal 0
HcmV?d00001


From 55cb32d7ebc4f08e8a568a9b77d83a114f0fb3f0 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 01:03:10 +0000
Subject: [PATCH 102/256] Added formLegend()

---
 lib/favorform.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/favorform.php b/lib/favorform.php
index 8b01483b2e..977f191838 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -103,6 +103,18 @@ class FavorForm extends Form
                            common_session_token());
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Delete this notice'));
+    }
+
+
     /**
      * Data elements
      *

From 179ad6c13b06559959943ec6685b840f7ea3d18a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 01:33:42 +0000
Subject: [PATCH 103/256] showReplyLink

---
 lib/noticelist.php | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 6f4d1c04e0..fde93a3b66 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -438,16 +438,13 @@ class NoticeListItem extends Widget
         $reply_url = common_local_url('newnotice',
                                       array('replyto' => $this->profile->nickname));
 
-        $reply_js =
-          'return doreply("'.$this->profile->nickname.'",'.$this->notice->id.');';
-
-        $this->out->elementStart('a',
-                             array('href' => $reply_url,
-                                   'onclick' => $reply_js,
-                                   'title' => _('reply'),
-                                   'class' => 'replybutton'));
-        $this->out->raw(' &#8594;');
-        $this->out->elementEnd('a');
+        $this->out->elementStart('dl', 'reply');
+        $this->out->element('dt', null, _('Reply to this notice'));
+        $this->out->elementStart('dd');
+        $this->out->element('a', array('href' => $reply_url,
+                                       'title' => _('reply')), _('Reply'));
+        $this->out->elementEnd('dd');
+        $this->out->elementEnd('dl');
     }
 
     /**

From 5d5dcb6f51c0babc54f43f1baace4cc9830e4939 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 01:55:39 +0000
Subject: [PATCH 104/256] Markup update for common_tag_link(),
 common_at_link(), common_at_hash_link()

---
 lib/util.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 8c6cddbd9e..9ca817eab3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -571,7 +571,7 @@ function common_tag_link($tag)
 {
     $canonical = common_canonical_tag($tag);
     $url = common_local_url('tag', array('tag' => $canonical));
-    return '<a href="' . htmlspecialchars($url) . '" rel="tag" class="hashlink">' . htmlspecialchars($tag) . '</a>';
+    return '<span class="tag"><a href="' . htmlspecialchars($url) . '" rel="tag">' . htmlspecialchars($tag) . '</a></span>';
 }
 
 function common_canonical_tag($tag)
@@ -589,7 +589,7 @@ function common_at_link($sender_id, $nickname)
     $sender = Profile::staticGet($sender_id);
     $recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
     if ($recipient) {
-        return '<a href="'.htmlspecialchars($recipient->profileurl).'" class="atlink">'.$nickname.'</a>';
+        return '<span class="vcard"><a href="'.htmlspecialchars($recipient->profileurl).'" class="url"><span class="fn nickname">'.$nickname.'</span></a></span>';
     } else {
         return $nickname;
     }
@@ -606,7 +606,7 @@ function common_at_hash_link($sender_id, $tag)
         $url = common_local_url('subscriptions',
                                 array('nickname' => $user->nickname,
                                       'tag' => $tag));
-        return '<a href="'.htmlspecialchars($url).'" class="atlink">'.$tag.'</a>';
+        return '<span class="tag"><a href="'.htmlspecialchars($url).'" rel="tag">'.$tag.'</a></span>';
     } else {
         return $tag;
     }

From ba1e36dd492cedbad49f00715cf35a8cdf23ac07 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 02:21:58 +0000
Subject: [PATCH 105/256] Fix use of $config in Action

---
 lib/action.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 90bb678703..159621b7a5 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -222,15 +222,13 @@ class Action extends HTMLOutputter // lawsuit
                                               'class' => 'vcard'));
         $this->elementStart('a', array('class' => 'url home bookmark',
                                         'href' => common_local_url('public')));
-        if ((isset($config['site']['logo']) && is_string($config['site']['logo']) && (strlen($config['site']['logo']) > 0))
-            || file_exists(theme_file('logo.png')))
+        if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
         {
             $this->element('img', array('class' => 'logo photo',
-                                        'src' => isset($config['site']['logo']) ?
-                                        ($config['site']['logo']) : theme_path('logo.png'),
-                                        'alt' => $config['site']['name']));
+                                        'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
+                                        'alt' => common_config('site', 'name')));
         }
-        $this->element('span', array('class' => 'fn org'), $config['site']['name']);
+        $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
         $this->elementEnd('a');
         $this->elementEnd('address');
     }

From 38ad44f6325a71d290d7582744efbb11bbe1c122 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 02:35:56 +0000
Subject: [PATCH 106/256] Auto-load from lib as well as classes

---
 lib/common.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/common.php b/lib/common.php
index 74c992f1c9..2ef26cfc62 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -169,5 +169,7 @@ function __autoload($class)
         require_once('OAuth.php');
     } else if (file_exists(INSTALLDIR.'/classes/' . $class . '.php')) {
         require_once(INSTALLDIR.'/classes/' . $class . '.php');
+    } else if (file_exists(INSTALLDIR.'/lib/' . strtolower($class) . '.php')) {
+        require_once(INSTALLDIR.'/lib/' . strtolower($class) . '.php');
     }
 }

From 03221906071c7669b6c1d8a7ab5afc0deb4f26f8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 02:49:51 +0000
Subject: [PATCH 107/256] Readjusted location and size for logo, form_notice,
 site_nav_global_primary

---
 theme/base/css/display.css | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 8685bdc872..b58a5b09c0 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -316,6 +316,7 @@ padding:18px 4px 18px 18px;
 /*Start: FORM NOTICE*/
 #form_notice {
 width:384px;
+width:458px;
 float:left;
 margin-left:68px;
 position:relative;
@@ -331,7 +332,9 @@ display:none;
 #form_notice textarea {
 -moz-border-radius:4px;
 width:304px;
+width:377px;
 height:95px;
+height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
 }
@@ -357,6 +360,7 @@ margin-left:4px;
 #form_notice .form_note {
 position:absolute;
 top:125px;
+top:116px;
 right:98px;
 z-index:9;
 }
@@ -385,6 +389,7 @@ text-indent:-9999px;
 #form_notice .form_actions {
 position:absolute;
 top:107px;
+top:98px;
 right:0;
 }
 #form_notice li {
@@ -1076,7 +1081,6 @@ text-align:center;
 }
 
 
-c
 #testimonials {
 clear:both;
 }

From 944876181cdd3fa1d44e517d6c103fd2ec3a8783 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 04:50:44 +0000
Subject: [PATCH 108/256] NoticeOver styles

---
 theme/base/css/display.css     | 11 ++++++-----
 theme/identica/css/display.css | 19 ++++++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b58a5b09c0..b039dc110a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -36,7 +36,7 @@ input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
--moz-border:radius:4px;
+-moz-border-radius:4px;
 }
 select, option {
 padding-bottom:0;
@@ -47,7 +47,7 @@ padding:11px;
 input:focus, textarea:focus, select:focus {
 border-width:2px;
 border-style: solid;
--moz-border:radius:4px;
+-moz-border-radius:4px;
 }
 caption {
 font-weight:bold;
@@ -611,6 +611,9 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
+.notices li.over {
+background-color:#fcfcfc;
+}
 
 
 /* NOTICES */
@@ -786,11 +789,9 @@ display:none;
 .notice-options form input.submit {
 display:block;
 border:0;
-border-bottom-width:1px;
-border-bottom-style:dotted;
 padding-left:20px;
-
 }
+
 .notice-options .reply a {
 text-decoration:none;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 7e0c6d7b4c..6ae85449ac 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -176,8 +176,6 @@ background-image:url(../images/icons/twotone/green/document.gif);
 .notice-options .reply a,
 .notice-options form input.submit {
 background-color:transparent;
-color:#333333;
-border-bottom-color:#ccc;
 }
 .notice-options .reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
@@ -188,6 +186,20 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea
 .notice-options form.notice_delete input.submit {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
+
+.notice-options a,
+.notice-options input {
+opacity:0.1;
+}
+.notices li.hover {
+background-color:#fcfcfc;
+}
+.notices li.hover .notice-options a,
+.notices li.hover .notice-options input {
+opacity:1;
+}
+
+
 /*END: NOTICES */
 
 
@@ -221,6 +233,3 @@ background-color:#0f0;
 background-color:#00f;
 }
 
-
-
-

From 1e8bb6bb31d66af8d68f5a5d4bde855d040baaa4 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 15:25:22 +0000
Subject: [PATCH 109/256] Minor

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 159621b7a5..19f48d673f 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -198,7 +198,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->showHeader();
         $this->showCore();
         $this->showFooter();
-        $this->elementEnd('div', 'wrap');
+        $this->elementEnd('div');
         $this->elementEnd('body');
     }
 

From 20b4cae84a1451804d43e63bb990d1d8c7337197 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 15:38:35 +0000
Subject: [PATCH 110/256] Put action name as body ID

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 19f48d673f..792b9c0575 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -193,7 +193,7 @@ class Action extends HTMLOutputter // lawsuit
 
     function showBody()
     {
-        $this->elementStart('body');
+        $this->elementStart('body', array('id' => $this->trimmed('action')));
         $this->elementStart('div', 'wrap');
         $this->showHeader();
         $this->showCore();

From 0b8131deec0b6fb2056b065462a22437e9ba6962 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 15:43:30 +0000
Subject: [PATCH 111/256] Removed max-width:100%

---
 theme/base/css/display.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b039dc110a..d56b416937 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -15,7 +15,6 @@ position:relative;
 margin:0 auto;
 width:1004px;
 width:71.714em;
-max-width:100%;
 }
 h1 {
 font-size:2.1em;

From 4549e577ac2c349881c7a411c0e25d5bdd0a0c51 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 15:52:17 +0000
Subject: [PATCH 112/256] Updating Creative Commons text and image

---
 lib/action.php             | 10 +++++-----
 lib/common.php             |  2 +-
 theme/base/css/display.css | 11 +++++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 792b9c0575..129a4b24b6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -436,16 +436,16 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('dt', array('id' => 'site_content_license'), _('Laconica software license'));
         $this->elementStart('dd', array('id' => 'site_content_license_cc'));
         $this->elementStart('p');
-        $this->text(_('Unless otherwise specified, contents of this site are copyright by the contributors and available under the '));
+        $this->element('img', array('id' => 'license_cc',
+                                    'src' => common_config('license', 'image'),
+                                    'alt' => common_config('license', 'title')));
+        $this->text(_('All criti.ca content and data are available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => common_config('license', 'url')),
                        common_config('license', 'title'));
-        $this->text(_('. Contributors should be attributed by full name or nickname.'));
+        $this->text(_('license.'));
         $this->elementEnd('p');
-        $this->element('img', array('id' => 'license_cc',
-                                    'src' => common_config('license', 'image'),
-                                    'alt' => common_config('license', 'title')));
         $this->elementEnd('dd');
     }
 
diff --git a/lib/common.php b/lib/common.php
index 2ef26cfc62..05fef045a1 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -79,7 +79,7 @@ $config =
         'license' =>
         array('url' => 'http://creativecommons.org/licenses/by/3.0/',
               'title' => 'Creative Commons Attribution 3.0',
-              'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
+              'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
         'mail' =>
         array('backend' => 'mail',
               'params' => null),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d56b416937..87a3a01e06 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -253,6 +253,9 @@ margin-left:0;
 
 
 
+#licenses {
+font-size:0.9em;
+}
 
 #licenses dt {
 font-weight:bold;
@@ -260,17 +263,17 @@ display:none;
 }
 #licenses dd {
 margin-bottom:11px;
+line-height:1.5;
 }
 
 
 #site_content_license_cc p {
-float:left;
-margin-left:10%;
 width:90%;
 }
 #site_content_license_cc img {
-float:left;
-margin-left:-100%;
+display:inline;
+vertical-align:top;
+margin-right:4px;
 }
 
 

From 1b625dcfd70c2f0e3f17e819a95d0fd816c1440a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 16:07:19 +0000
Subject: [PATCH 113/256] footer width

---
 theme/base/css/display.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 87a3a01e06..4d7611b309 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -175,7 +175,7 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:100%;
+width:68%;
 padding-bottom:11px;
 }
 
@@ -268,7 +268,6 @@ line-height:1.5;
 
 
 #site_content_license_cc p {
-width:90%;
 }
 #site_content_license_cc img {
 display:inline;

From eacb8df69157e3151e3de5074dec6a152882e207 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 16:17:27 +0000
Subject: [PATCH 114/256] Added jquery.form.js

---
 js/jquery.form.js | 632 ++++++++++++++++++++++++++++++++++++++++++++++
 lib/action.php    |   4 -
 2 files changed, 632 insertions(+), 4 deletions(-)
 create mode 100644 js/jquery.form.js

diff --git a/js/jquery.form.js b/js/jquery.form.js
new file mode 100644
index 0000000000..cb8b5a6609
--- /dev/null
+++ b/js/jquery.form.js
@@ -0,0 +1,632 @@
+/*
+ * jQuery Form Plugin
+ * version: 2.17 (06-NOV-2008)
+ * @requires jQuery v1.2.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id$
+ */
+;(function($) {
+
+/*
+    Usage Note:  
+    -----------
+    Do not use both ajaxSubmit and ajaxForm on the same form.  These
+    functions are intended to be exclusive.  Use ajaxSubmit if you want
+    to bind your own submit handler to the form.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').bind('submit', function() {
+            $(this).ajaxSubmit({
+                target: '#output'
+            });
+            return false; // <-- important!
+        });
+    });
+
+    Use ajaxForm when you want the plugin to manage all the event binding
+    for you.  For example,
+
+    $(document).ready(function() {
+        $('#myForm').ajaxForm({
+            target: '#output'
+        });
+    });
+        
+    When using ajaxForm, the ajaxSubmit function will be invoked for you
+    at the appropriate time.  
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting 
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+    // fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+    if (!this.length) {
+        log('ajaxSubmit: skipping submit process - no element selected');
+        return this;
+    }
+
+    if (typeof options == 'function')
+        options = { success: options };
+
+    options = $.extend({
+        url:  this.attr('action') || window.location.toString(),
+        type: this.attr('method') || 'GET'
+    }, options || {});
+
+    // hook for manipulating the form data before it is extracted;
+    // convenient for use with rich editors like tinyMCE or FCKEditor
+    var veto = {};
+    this.trigger('form-pre-serialize', [this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+        return this;
+    }
+
+    // provide opportunity to alter form data before it is serialized
+    if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSerialize callback');
+        return this;
+    }    
+   
+    var a = this.formToArray(options.semantic);
+    if (options.data) {
+        options.extraData = options.data;
+        for (var n in options.data) {
+          if(options.data[n] instanceof Array) {
+            for (var k in options.data[n])
+              a.push( { name: n, value: options.data[n][k] } )
+          }  
+          else
+             a.push( { name: n, value: options.data[n] } );
+        }
+    }
+
+    // give pre-submit callback an opportunity to abort the submit
+    if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+        log('ajaxSubmit: submit aborted via beforeSubmit callback');
+        return this;
+    }    
+
+    // fire vetoable 'validate' event
+    this.trigger('form-submit-validate', [a, this, options, veto]);
+    if (veto.veto) {
+        log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+        return this;
+    }    
+
+    var q = $.param(a);
+
+    if (options.type.toUpperCase() == 'GET') {
+        options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+        options.data = null;  // data is null for 'get'
+    }
+    else
+        options.data = q; // data is the query string for 'post'
+
+    var $form = this, callbacks = [];
+    if (options.resetForm) callbacks.push(function() { $form.resetForm(); });
+    if (options.clearForm) callbacks.push(function() { $form.clearForm(); });
+
+    // perform a load on the target only if dataType is not provided
+    if (!options.dataType && options.target) {
+        var oldSuccess = options.success || function(){};
+        callbacks.push(function(data) {
+            $(options.target).html(data).each(oldSuccess, arguments);
+        });
+    }
+    else if (options.success)
+        callbacks.push(options.success);
+
+    options.success = function(data, status) {
+        for (var i=0, max=callbacks.length; i < max; i++)
+            callbacks[i].apply(options, [data, status, $form]);
+    };
+
+    // are there files to upload?
+    var files = $('input:file', this).fieldValue();
+    var found = false;
+    for (var j=0; j < files.length; j++)
+        if (files[j])
+            found = true;
+
+    // options.iframe allows user to force iframe mode
+   if (options.iframe || found) { 
+       // hack to fix Safari hang (thanks to Tim Molendijk for this)
+       // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+       if ($.browser.safari && options.closeKeepAlive)
+           $.get(options.closeKeepAlive, fileUpload);
+       else
+           fileUpload();
+       }
+   else
+       $.ajax(options);
+
+    // fire 'notify' event
+    this.trigger('form-submit-notify', [this, options]);
+    return this;
+
+
+    // private function for handling file uploads (hat tip to YAHOO!)
+    function fileUpload() {
+        var form = $form[0];
+        
+        if ($(':input[@name=submit]', form).length) {
+            alert('Error: Form elements must not be named "submit".');
+            return;
+        }
+        
+        var opts = $.extend({}, $.ajaxSettings, options);
+		var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
+
+        var id = 'jqFormIO' + (new Date().getTime());
+        var $io = $('<iframe id="' + id + '" name="' + id + '" />');
+        var io = $io[0];
+
+        if ($.browser.msie || $.browser.opera) 
+            io.src = 'javascript:false;document.write("");';
+        $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+        var xhr = { // mock object
+            aborted: 0,
+            responseText: null,
+            responseXML: null,
+            status: 0,
+            statusText: 'n/a',
+            getAllResponseHeaders: function() {},
+            getResponseHeader: function() {},
+            setRequestHeader: function() {},
+            abort: function() { 
+                this.aborted = 1; 
+                $io.attr('src','about:blank'); // abort op in progress
+            }
+        };
+
+        var g = opts.global;
+        // trigger ajax global events so that activity/block indicators work like normal
+        if (g && ! $.active++) $.event.trigger("ajaxStart");
+        if (g) $.event.trigger("ajaxSend", [xhr, opts]);
+
+		if (s.beforeSend && s.beforeSend(xhr, s) === false) {
+			s.global && jQuery.active--;
+			return;
+        }
+        if (xhr.aborted)
+            return;
+        
+        var cbInvoked = 0;
+        var timedOut = 0;
+
+        // add submitting element to data if we know it
+        var sub = form.clk;
+        if (sub) {
+            var n = sub.name;
+            if (n && !sub.disabled) {
+                options.extraData = options.extraData || {};
+                options.extraData[n] = sub.value;
+                if (sub.type == "image") {
+                    options.extraData[name+'.x'] = form.clk_x;
+                    options.extraData[name+'.y'] = form.clk_y;
+                }
+            }
+        }
+
+        // take a breath so that pending repaints get some cpu time before the upload starts
+        setTimeout(function() {
+            // make sure form attrs are set
+            var t = $form.attr('target'), a = $form.attr('action');
+            $form.attr({
+                target:   id,
+                method:   'POST',
+                action:   opts.url
+            });
+            
+            // ie borks in some cases when setting encoding
+            if (! options.skipEncodingOverride) {
+                $form.attr({
+                    encoding: 'multipart/form-data',
+                    enctype:  'multipart/form-data'
+                });
+            }
+
+            // support timout
+            if (opts.timeout)
+                setTimeout(function() { timedOut = true; cb(); }, opts.timeout);
+
+            // add "extra" data to form if provided in options
+            var extraInputs = [];
+            try {
+                if (options.extraData)
+                    for (var n in options.extraData)
+                        extraInputs.push(
+                            $('<input type="hidden" name="'+n+'" value="'+options.extraData[n]+'" />')
+                                .appendTo(form)[0]);
+            
+                // add iframe to doc and submit the form
+                $io.appendTo('body');
+                io.attachEvent ? io.attachEvent('onload', cb) : io.addEventListener('load', cb, false);
+                form.submit();
+            }
+            finally {
+                // reset attrs and remove "extra" input elements
+                $form.attr('action', a);
+                t ? $form.attr('target', t) : $form.removeAttr('target');
+                $(extraInputs).remove();
+            }
+        }, 10);
+
+        function cb() {
+            if (cbInvoked++) return;
+            
+            io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
+
+            var operaHack = 0;
+            var ok = true;
+            try {
+                if (timedOut) throw 'timeout';
+                // extract the server response from the iframe
+                var data, doc;
+
+                doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+                
+                if (doc.body == null && !operaHack && $.browser.opera) {
+                    // In Opera 9.2.x the iframe DOM is not always traversable when
+                    // the onload callback fires so we give Opera 100ms to right itself
+                    operaHack = 1;
+                    cbInvoked--;
+                    setTimeout(cb, 100);
+                    return;
+                }
+                
+                xhr.responseText = doc.body ? doc.body.innerHTML : null;
+                xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+                xhr.getResponseHeader = function(header){
+                    var headers = {'content-type': opts.dataType};
+                    return headers[header];
+                };
+
+                if (opts.dataType == 'json' || opts.dataType == 'script') {
+                    var ta = doc.getElementsByTagName('textarea')[0];
+                    xhr.responseText = ta ? ta.value : xhr.responseText;
+                }
+                else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+                    xhr.responseXML = toXml(xhr.responseText);
+                }
+                data = $.httpData(xhr, opts.dataType);
+            }
+            catch(e){
+                ok = false;
+                $.handleError(opts, xhr, 'error', e);
+            }
+
+            // ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+            if (ok) {
+                opts.success(data, 'success');
+                if (g) $.event.trigger("ajaxSuccess", [xhr, opts]);
+            }
+            if (g) $.event.trigger("ajaxComplete", [xhr, opts]);
+            if (g && ! --$.active) $.event.trigger("ajaxStop");
+            if (opts.complete) opts.complete(xhr, ok ? 'success' : 'error');
+
+            // clean up
+            setTimeout(function() {
+                $io.remove();
+                xhr.responseXML = null;
+            }, 100);
+        };
+
+        function toXml(s, doc) {
+            if (window.ActiveXObject) {
+                doc = new ActiveXObject('Microsoft.XMLDOM');
+                doc.async = 'false';
+                doc.loadXML(s);
+            }
+            else
+                doc = (new DOMParser()).parseFromString(s, 'text/xml');
+            return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+        };
+    };
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *    is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *    used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */ 
+$.fn.ajaxForm = function(options) {
+    return this.ajaxFormUnbind().bind('submit.form-plugin',function() {
+        $(this).ajaxSubmit(options);
+        return false;
+    }).each(function() {
+        // store options in hash
+        $(":submit,input:image", this).bind('click.form-plugin',function(e) {
+            var form = this.form;
+            form.clk = this;
+            if (this.type == 'image') {
+                if (e.offsetX != undefined) {
+                    form.clk_x = e.offsetX;
+                    form.clk_y = e.offsetY;
+                } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+                    var offset = $(this).offset();
+                    form.clk_x = e.pageX - offset.left;
+                    form.clk_y = e.pageY - offset.top;
+                } else {
+                    form.clk_x = e.pageX - this.offsetLeft;
+                    form.clk_y = e.pageY - this.offsetTop;
+                }
+            }
+            // clear form vars
+            setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10);
+        });
+    });
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+    this.unbind('submit.form-plugin');
+    return this.each(function() {
+        $(":submit,input:image", this).unbind('click.form-plugin');
+    });
+
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+    var a = [];
+    if (this.length == 0) return a;
+
+    var form = this[0];
+    var els = semantic ? form.getElementsByTagName('*') : form.elements;
+    if (!els) return a;
+    for(var i=0, max=els.length; i < max; i++) {
+        var el = els[i];
+        var n = el.name;
+        if (!n) continue;
+
+        if (semantic && form.clk && el.type == "image") {
+            // handle image inputs on the fly when semantic == true
+            if(!el.disabled && form.clk == el)
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+            continue;
+        }
+
+        var v = $.fieldValue(el, true);
+        if (v && v.constructor == Array) {
+            for(var j=0, jmax=v.length; j < jmax; j++)
+                a.push({name: n, value: v[j]});
+        }
+        else if (v !== null && typeof v != 'undefined')
+            a.push({name: n, value: v});
+    }
+
+    if (!semantic && form.clk) {
+        // input type=='image' are not found in elements array! handle them here
+        var inputs = form.getElementsByTagName("input");
+        for(var i=0, max=inputs.length; i < max; i++) {
+            var input = inputs[i];
+            var n = input.name;
+            if(n && !input.disabled && input.type == "image" && form.clk == input)
+                a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+        }
+    }
+    return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+    //hand off to jQuery.param for proper encoding
+    return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+    var a = [];
+    this.each(function() {
+        var n = this.name;
+        if (!n) return;
+        var v = $.fieldValue(this, successful);
+        if (v && v.constructor == Array) {
+            for (var i=0,max=v.length; i < max; i++)
+                a.push({name: n, value: v[i]});
+        }
+        else if (v !== null && typeof v != 'undefined')
+            a.push({name: this.name, value: v});
+    });
+    //hand off to jQuery.param for proper encoding
+    return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *      <input name="A" type="text" />
+ *      <input name="A" type="text" />
+ *      <input name="B" type="checkbox" value="B1" />
+ *      <input name="B" type="checkbox" value="B2"/>
+ *      <input name="C" type="radio" value="C1" />
+ *      <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *       array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+    for (var val=[], i=0, max=this.length; i < max; i++) {
+        var el = this[i];
+        var v = $.fieldValue(el, successful);
+        if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length))
+            continue;
+        v.constructor == Array ? $.merge(val, v) : val.push(v);
+    }
+    return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+    var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+    if (typeof successful == 'undefined') successful = true;
+
+    if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+        (t == 'checkbox' || t == 'radio') && !el.checked ||
+        (t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+        tag == 'select' && el.selectedIndex == -1))
+            return null;
+
+    if (tag == 'select') {
+        var index = el.selectedIndex;
+        if (index < 0) return null;
+        var a = [], ops = el.options;
+        var one = (t == 'select-one');
+        var max = (one ? index+1 : ops.length);
+        for(var i=(one ? index : 0); i < max; i++) {
+            var op = ops[i];
+            if (op.selected) {
+                // extra pain for IE...
+                var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value;
+                if (one) return v;
+                a.push(v);
+            }
+        }
+        return a;
+    }
+    return el.value;
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+    return this.each(function() {
+        $('input,select,textarea', this).clearFields();
+    });
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+    return this.each(function() {
+        var t = this.type, tag = this.tagName.toLowerCase();
+        if (t == 'text' || t == 'password' || tag == 'textarea')
+            this.value = '';
+        else if (t == 'checkbox' || t == 'radio')
+            this.checked = false;
+        else if (tag == 'select')
+            this.selectedIndex = -1;
+    });
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+    return this.each(function() {
+        // guard against an input with the name of 'reset'
+        // note that IE reports the reset function as an 'object'
+        if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType))
+            this.reset();
+    });
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) { 
+    if (b == undefined) b = true;
+    return this.each(function() { 
+        this.disabled = !b 
+    });
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+    if (select == undefined) select = true;
+    return this.each(function() { 
+        var t = this.type;
+        if (t == 'checkbox' || t == 'radio')
+            this.checked = select;
+        else if (this.tagName.toLowerCase() == 'option') {
+            var $sel = $(this).parent('select');
+            if (select && $sel[0] && $sel[0].type == 'select-one') {
+                // deselect all other options
+                $sel.find('option').selected(false);
+            }
+            this.selected = select;
+        }
+    });
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+    if ($.fn.ajaxSubmit.debug && window.console && window.console.log)
+        window.console.log('[jquery.form] ' + Array.prototype.join.call(arguments,''));
+};
+
+})(jQuery);
diff --git a/lib/action.php b/lib/action.php
index 129a4b24b6..94be04b520 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -126,10 +126,6 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
-        $this->element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
-                                     'media' => 'screen, projection, tv'));
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,

From 41d958f11feba8be0c9375a4c424e51fd83fa20e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 16:43:10 +0000
Subject: [PATCH 115/256] Ignore .orig and .rej

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8c94886e7c..f5a3e0212f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej

From 877327a18e15d768df3bda658ce9dded116399fa Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 17:02:46 +0000
Subject: [PATCH 116/256] Update to XHR post notice

---
 actions/newnotice.php |  2 +-
 js/util.js            | 57 +++++++++++++++++++++++++------------------
 lib/action.php        |  4 +++
 3 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index cb02854a1d..b6ed87f815 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -91,7 +91,7 @@ class NewnoticeAction extends Action
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
diff --git a/js/util.js b/js/util.js
index 38a9589680..c43af23337 100644
--- a/js/util.js
+++ b/js/util.js
@@ -20,21 +20,21 @@ $(document).ready(function(){
 	// count character on keyup
 	function counter(event){
 		var maxLength = 140;
-		var currentLength = $("#status_textarea").val().length;
+		var currentLength = $("#notice_data-text").val().length;
 		var remaining = maxLength - currentLength;
 		var counter = $("#counter");
 		counter.text(remaining);
 		
 		if (remaining <= 0) {
-			$("#status_form").addClass("response_error");
+			$("#form_notice").addClass("response_error");
 		} else {
-			$("#status_form").removeClass("response_error");
+			$("#form_notice").removeClass("response_error");
 		}
 	}
 
 	function submitonreturn(event) {
 		if (event.keyCode == 13) {
-			$("#status_form").submit();
+			$("#form_notice").submit();
 			event.preventDefault();
 			event.stopPropagation();
 			return false;
@@ -42,15 +42,15 @@ $(document).ready(function(){
 		return true;
 	}
 
-	if ($("#status_textarea").length) {
-		$("#status_textarea").bind("keyup", counter);
-		$("#status_textarea").bind("keydown", submitonreturn);
+	if ($("#notice_data-text").length) {
+		$("#notice_data-text").bind("keyup", counter);
+		$("#notice_data-text").bind("keydown", submitonreturn);
 		
 		// run once in case there's something in there
 		counter();
 		
 		// set the focus
-		$("#status_textarea").focus();
+		$("#notice_data-text").focus();
 	}
 
 	// XXX: refactor this code
@@ -136,12 +136,12 @@ $(document).ready(function(){
 
 
 	var PostNotice = { dataType: 'xml',
-					   beforeSubmit: function(formData, jqForm, options) { if ($("#status_textarea").get(0).value.length == 0) {
-																				$("#status_form").addClass("response_error");
+					   beforeSubmit: function(formData, jqForm, options) { if ($("#notice_data-text").get(0).value.length == 0) {
+																				$("#form_notice").addClass("warning");
 																				return false;
 																		   }
-																		   $("#status_form input[type=submit]").attr("disabled", "disabled");
-																		   $("#status_form input[type=submit]").addClass("disabled");
+																		   $("#notice_action-submit").attr("disabled", "disabled");
+																		   $("#notice_action-submit").addClass("disabled");
 																		   return true;
 												 						 },
 					   success: function(xml) {	if ($("#error", xml).length > 0 || $("#command_result", xml).length > 0) {
@@ -150,28 +150,37 @@ $(document).ready(function(){
 													alert(result);
 												}
 												else {
-													$("#notices").prepend(document._importNode($("li", xml).get(0), true));
-													$("#status_textarea").val("");
+													$("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
+													$("#notice_data-text").val("");
 													counter();
-													$(".notice_single:first").css({display:"none"});
-													$(".notice_single:first").fadeIn(2500);
+													$("#notices_primary .notice:first").css({display:"none"});
+													$("#notices_primary .notice:first").fadeIn(2500);
 												}
-												$("#status_form input[type=submit]").removeAttr("disabled");
-												$("#status_form input[type=submit]").removeClass("disabled");
+												$("#notice_action-submit").removeAttr("disabled");
+												$("#notice_action-submit").removeClass("disabled");
 											 }
 					   };
-	$("#status_form").ajaxForm(PostNotice);
-	$("#status_form").each(addAjaxHidden);
+	$("#form_notice").ajaxForm(PostNotice);
+	$("#form_notice").each(addAjaxHidden);
+
+    $(".notice").hover(
+        function () {
+            $(this).addClass('hover');
+        }, 
+        function () {
+            $(this).removeClass('hover');
+        }
+    );
 });
 
 function doreply(nick,id) {
 	rgx_username = /^[0-9a-zA-Z\-_.]*$/;
 	if (nick.match(rgx_username)) {
 		replyto = "@" + nick + " ";
-		if ($("#status_textarea").length) {
-			$("#status_textarea").val(replyto);
-			$("form#status_form input#inreplyto").val(id);
-			$("#status_textarea").focus();
+		if ($("#notice_data-text").length) {
+			$("#notice_data-text").val(replyto);
+			$("form#form_notice input#inreplyto").val(id);
+			$("#notice_data-text").focus();
 			return false;
 		}
 	}
diff --git a/lib/action.php b/lib/action.php
index 94be04b520..129a4b24b6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -126,6 +126,10 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', 'base') . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => theme_path('css/thickbox.css', 'base') . '?version=' . LACONICA_VERSION,
+                                     'media' => 'screen, projection, tv'));
         $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,

From 8abf9351860408db930ce9f423f94baa97ed5f56 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 17:50:14 +0000
Subject: [PATCH 117/256] .notice style update

---
 theme/base/css/display.css     | 59 ++++++++++------------------------
 theme/identica/css/display.css |  5 +--
 2 files changed, 18 insertions(+), 46 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 4d7611b309..2892ca4f1a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -633,11 +633,7 @@ padding-left:28px;
 
 
 .notice .author {
-float:left;
-width:96px;
-width:199px;
-margin-left:-217px;
-margin-left:-199px;
+margin-right:11px;
 }
 .notice .author a {
 }
@@ -647,34 +643,29 @@ content:":";
 
 .vcard .photo {
 display:inline;
-margin-right:11px;
-margin-right:4px;
-vertical-align:top;
+margin-right:7px;
+margin-bottom:7px;
+float:left;
 }
 .vcard .url {
 text-decoration:none;
 }
+.vcard .url:hover {
+text-decoration:underline;
+}
 .vcard .fn {
-border-bottom-width:1px;
-border-bottom-style:dotted;
 font-style:italic;
 }
 .vcard .fn:hover {
-border-bottom-width:1px;
-border-bottom-style:solid;
+
 }
 
 
 .notice .entry-title {
 float:left;
-margin-bottom:11px;
-margin-left:217px;
-margin-left:199px;
 }
 .notice p.entry-content {
-float:left;
-width:427px;
-width:100%;
+display:inline;
 }
 
 .notice_video p.entry-content,
@@ -683,8 +674,6 @@ width:100%;
 .notice_location p.entry-content,
 .notice_event p.entry-content,
 .notice_document p.entry-content {
-width:322px;
-width:75.41%;
 }
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
@@ -707,11 +696,7 @@ width:75.41%;
 /*border:1px solid blue;*/
 clear:left;
 float:left;
-margin-left:11px;
-margin-left:0;
-margin-bottom:4px;
-width:199px;
-width:149px;
+width:48%;
 }
 .notice div.entry-content,
 .notice .notice-options a,
@@ -741,12 +726,9 @@ text-transform:lowercase;
 }
 .notice div.entry-content a {
 text-decoration:none;
-border-bottom-width:1px;
-border-bottom-style:dotted;
 }
 .notice div.entry-content a:hover {
-border-bottom-width:1px;
-border-bottom-style:solid;
+text-decoration:underline;
 }
 
 
@@ -770,11 +752,7 @@ outline:none;
 
 
 .notice-options {
-margin-left:18px;
-margin-left:260px;
-margin-left:304px;
-margin-left:18px;
-margin-left:50px;
+margin-left:2%;
 float:left;
 }
 .notice-options .reply,
@@ -783,6 +761,9 @@ float:left;
 float:left;
 margin-right:11px;
 }
+.notice-options .reply {
+margin-top:1px;
+}
 .notice-options .reply dt {
 display:none;
 }
@@ -790,21 +771,15 @@ display:none;
 .notice-options form input.submit {
 display:block;
 border:0;
-padding-left:20px;
 }
 
 .notice-options .reply a {
 text-decoration:none;
+padding-left:20px;
 }
 .notice-options form input.submit {
 cursor:pointer;
-width:16px;
-width:auto;
-height:16px;
-height:auto;
-padding-top:0;
-padding-right:0;
-padding-bottom:0;
+padding:0 0 0 17px;
 }
 
 .notice-options .notice_delete legend,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 6ae85449ac..1eba97a459 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -130,10 +130,8 @@ color:#555;
 
 
 .vcard .fn {
-border-bottom-color:#ccc;
 }
 .vcard .fn:hover {
-border-bottom-color:#555;
 }
 
 
@@ -142,10 +140,8 @@ border-bottom-color:#555;
 /* NOTICES */
 .notice div.entry-content a {
 color:#333;
-border-bottom-color:#ccc;
 }
 .notice div.entry-content a:hover {
-border-bottom-color:#555;
 }
 
 
@@ -190,6 +186,7 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 .notice-options a,
 .notice-options input {
 opacity:0.1;
+color:#333;
 }
 .notices li.hover {
 background-color:#fcfcfc;

From 05b69a290ddddf91a407fe4603361b53bff009e3 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 18:04:04 +0000
Subject: [PATCH 118/256] Removed : after username

---
 theme/base/css/display.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2892ca4f1a..b8b260266c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -638,7 +638,7 @@ margin-right:11px;
 .notice .author a {
 }
 .notice .author:after {
-content:":";
+/*content:":";*/
 }
 
 .vcard .photo {

From e34efca7f326d794be5398abae8cbb7363bcfb9c Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 18:14:20 +0000
Subject: [PATCH 119/256] Update to notice form character count warning

---
 js/util.js                     |  6 +++---
 theme/identica/css/display.css | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/js/util.js b/js/util.js
index c43af23337..35d69310bf 100644
--- a/js/util.js
+++ b/js/util.js
@@ -22,13 +22,13 @@ $(document).ready(function(){
 		var maxLength = 140;
 		var currentLength = $("#notice_data-text").val().length;
 		var remaining = maxLength - currentLength;
-		var counter = $("#counter");
+		var counter = $("#notice_text-count");
 		counter.text(remaining);
 		
 		if (remaining <= 0) {
-			$("#form_notice").addClass("response_error");
+			$("#form_notice").addClass("warning");
 		} else {
-			$("#form_notice").removeClass("response_error");
+			$("#form_notice").removeClass("warning");
 		}
 	}
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1eba97a459..c2eb4ef655 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -41,12 +41,12 @@ color:#88171A;
 #notice_text-count {
 color:#333;
 }
-#notice_text-count.warning {
-color:#FDFF00;
-background-color:#000;
+#form_notice.warning #notice_text-count {
+color:#000;
+background-color:#A9BF4F;
 }
-#notice_data-text.warning {
-border-color:#FDFF00;
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
 }
 
 #form_notice #notice_data-attach_view {

From be445a4b91b8a6245965fc68557947c52b99d35d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 19:35:37 +0000
Subject: [PATCH 120/256] Update settingsaction.php to new framework

---
 lib/settingsaction.php | 209 +++++++++++++++++++++++------------------
 1 file changed, 118 insertions(+), 91 deletions(-)

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 03bac3a93b..77ecb80e45 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Base class for settings actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,125 +18,149 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Earle Martin <earle@downlode.org>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/settingsgroupnav.php';
+
+/**
+ * Base class for settings group of actions
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
 
 class SettingsAction extends Action
 {
+    /**
+     * A message for the user.
+     */
+
+    var $msg = null;
+
+    /**
+     * Whether the message is a good one or a bad one.
+     */
+
+    var $success = false;
+
+    /**
+     * Handle input and output a page
+     *
+     * @param array $args $_REQUEST arguments
+     *
+     * @return void
+     */
 
     function handle($args)
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_user_error(_('Not logged in.'));
+            $this->clientError(_('Not logged in.'));
             return;
         } else if (!common_is_real_login()) {
-            # Cookie theft means that automatic logins can't
-            # change important settings or see private info, and
-            # _all_ our settings are important
-            common_set_returnto($this->self_url());
+            // Cookie theft means that automatic logins can't
+            // change important settings or see private info, and
+            // _all_ our settings are important
+            common_set_returnto($this->selfUrl());
             common_redirect(common_local_url('login'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->handle_post();
+            $this->handlePost();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    # override!
-    function handle_post()
+    /**
+     * Handle a POST request
+     *
+     * @return boolean success flag
+     */
+
+    function handlePost()
     {
         return false;
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * show the settings form
+     *
+     * @param string $msg     an extra message for the user
+     * @param string $success good message or bad message?
+     *
+     * @return void
+     */
+
+    function showForm($msg=null, $success=false)
     {
-        return false;
+        $this->msg     = $msg;
+        $this->success = $success;
+
+        $this->showPage();
     }
 
-    function message($msg, $success)
-    {
-        if ($msg) {
-            common_element('div', ($success) ? 'success' : 'error',
-                           $msg);
-        }
-    }
+    /**
+     * show human-readable instructions for the page
+     *
+     * @return void
+     */
 
-    function form_header($title, $msg=NULL, $success=false) 
+    function showPageNotice()
     {
-        common_show_header($title,
-                           array($this, 'show_header'),
-                           array($msg, $success),
-                           array($this, 'show_top'));
-    }
-
-    function show_header() 
-    {
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => common_path('js/jcrop/jquery.Jcrop.css?version='.LACONICA_VERSION),
-                                     'media' => 'screen, projection, tv'));
-        common_element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/jcrop/jquery.Jcrop.pack.js')));
-        common_element('script', array('type' => 'text/javascript',
-                                       'src' => common_path('js/jcrop/jquery.Jcrop.go.js')));
-    }
-
-    function show_top($arr)
-    {
-        $msg = $arr[0];
-        $success = $arr[1];
-        if ($msg) {
-            $this->message($msg, $success);
+        if ($this->msg) {
+            $this->element('div', ($this->success) ? 'success' : 'error',
+                           $this->msg);
         } else {
-            $inst = $this->get_instructions();
+            $inst   = $this->get_instructions();
             $output = common_markup_to_html($inst);
-            common_element_start('div', 'instructions');
-            common_raw($output);
-            common_element_end('div');
+
+            $this->elementStart('div', 'instructions');
+            $this->raw($output);
+            $this->elementEend('div');
         }
-        $this->settings_menu();
     }
 
-    function settings_menu()
+    /**
+     * instructions recipe for sub-classes
+     *
+     * Subclasses should override this to return readable instructions. They'll
+     * be processed by common_markup_to_html().
+     *
+     * @return string instructions text
+     */
+
+    function getInstructions()
     {
-        # action => array('prompt', 'title')
-        $menu =
-          array('profilesettings' =>
-                array(_('Profile'),
-                      _('Change your profile settings')),
-                'emailsettings' =>
-                array(_('Email'),
-                      _('Change email handling')),
-                'openidsettings' =>
-                array(_('OpenID'),
-                      _('Add or remove OpenIDs')),
-                'smssettings' =>
-                array(_('SMS'),
-                      _('Updates by SMS')),
-                'imsettings' =>
-                array(_('IM'),
-                      _('Updates by instant messenger (IM)')),
-                'twittersettings' =>
-                array(_('Twitter'),
-                      _('Twitter integration options')),
-                'othersettings' =>
-                array(_('Other'),
-                      _('Other options')));
-        
-        $action = $this->trimmed('action');
-        common_element_start('ul', array('id' => 'nav_views'));
-        foreach ($menu as $menuaction => $menudesc) {
-            if ($menuaction == 'imsettings' &&
-                !common_config('xmpp', 'enabled')) {
-                continue;
-            }
-            common_menu_item(common_local_url($menuaction),
-                    $menudesc[0],
-                    $menudesc[1],
-                    $action == $menuaction);
-        }
-        common_element_end('ul');
+        return '';
+    }
+
+    /**
+     * Show the local navigation menu
+     *
+     * This is the same for all settings, so we show it here.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $menu = new SettingsGroupNav($this);
+        $menu->show();
     }
 }

From ed2fd6da6bbae0ccd433fead33c82f46e86a801e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 19:59:16 +0000
Subject: [PATCH 121/256] self_url -> selfUrl

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 792b9c0575..1edfe157f6 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -545,7 +545,7 @@ class Action extends HTMLOutputter // lawsuit
         common_user_error($msg, $code);
     }
 
-    function self_url()
+    function selfUrl()
     {
         $action = $this->trimmed('action');
         $args = $this->args;

From c7b60f3b9e3d11c2290d5ee3e61c8c8bb3f9285a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 19:59:54 +0000
Subject: [PATCH 122/256] Better doc comments for PublicGroupNav

---
 lib/publicgroupnav.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 7860783fa4..5ac4c0e120 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * Base class for all actions (~views)
+ * Menu for public group of actions
  *
  * PHP version 5
  *
@@ -19,10 +19,9 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Action
+ * @category  Menu
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -35,22 +34,15 @@ if (!defined('LACONICA')) {
 require_once INSTALLDIR.'/lib/widget.php';
 
 /**
- * Base class for all actions
- *
- * This is the base class for all actions in the package. An action is
- * more or less a "view" in an MVC framework.
- *
- * Actions are responsible for extracting and validating parameters; using
- * model classes to read and write to the database; and doing ouput.
+ * Menu for public group of actions
  *
  * @category Output
  * @package  Laconica
  * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  *
- * @see      HTMLOutputter
+ * @see      Widget
  */
 
 class PublicGroupNav extends Widget

From 2bea8b83590b92426b6cad94183701cdc890a618 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 20:00:26 +0000
Subject: [PATCH 123/256] Modify settingsaction to better work with new
 framework

---
 lib/settingsaction.php   |   5 +-
 lib/settingsgroupnav.php | 112 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 lib/settingsgroupnav.php

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 77ecb80e45..8624803ac4 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -22,7 +22,6 @@
  * @category  Settings
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
- * @author    Earle Martin <earle@downlode.org>
  * @copyright 2008-2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -127,12 +126,12 @@ class SettingsAction extends Action
             $this->element('div', ($this->success) ? 'success' : 'error',
                            $this->msg);
         } else {
-            $inst   = $this->get_instructions();
+            $inst   = $this->getInstructions();
             $output = common_markup_to_html($inst);
 
             $this->elementStart('div', 'instructions');
             $this->raw($output);
-            $this->elementEend('div');
+            $this->elementEnd('div');
         }
     }
 
diff --git a/lib/settingsgroupnav.php b/lib/settingsgroupnav.php
new file mode 100644
index 0000000000..044c74552a
--- /dev/null
+++ b/lib/settingsgroupnav.php
@@ -0,0 +1,112 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Navigation widget for the settings group
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Widget
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * A widget for showing the settings group local nav menu
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class SettingsGroupNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        # action => array('prompt', 'title')
+        $menu =
+          array('profilesettings' =>
+                array(_('Profile'),
+                      _('Change your profile settings')),
+                'emailsettings' =>
+                array(_('Email'),
+                      _('Change email handling')),
+                'openidsettings' =>
+                array(_('OpenID'),
+                      _('Add or remove OpenIDs')),
+                'smssettings' =>
+                array(_('SMS'),
+                      _('Updates by SMS')),
+                'imsettings' =>
+                array(_('IM'),
+                      _('Updates by instant messenger (IM)')),
+                'twittersettings' =>
+                array(_('Twitter'),
+                      _('Twitter integration options')),
+                'othersettings' =>
+                array(_('Other'),
+                      _('Other options')));
+        
+        $action_name = $this->action->trimmed('action');
+        $this->action->elementStart('ul', array('id' => 'nav_views'));
+	
+        foreach ($menu as $menuaction => $menudesc) {
+            if ($menuaction == 'imsettings' &&
+                !common_config('xmpp', 'enabled')) {
+                continue;
+            }
+            $this->action->menuItem(common_local_url($menuaction),
+				    $menudesc[0],
+				    $menudesc[1],
+				    $action_name == $menuaction);
+        }
+	
+        $this->action->elementEnd('ul');
+    }
+}

From aedf9942b4fbc9fdc8c65e3bbafc4cff0a32cb2d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 20:00:52 +0000
Subject: [PATCH 124/256] Convert emailsettings to use new framework

---
 actions/emailsettings.php | 304 +++++++++++++++++++++++++++-----------
 1 file changed, 218 insertions(+), 86 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 6210c07b42..4cd63a9d3b 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Settings for email
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,28 +18,77 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once INSTALLDIR.'/lib/settingsaction.php';
+
+/**
+ * Settings for email
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
 
 class EmailsettingsAction extends SettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
+    {
+        return _('Email Settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
     {
         return _('Manage how you get email from %%site.name%%.');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Content area of the page
+     *
+     * Shows a form for adding and removing email addresses and setting
+     * email preferences.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
         $user = common_current_user();
-        $this->form_header(_('Email Settings'), $msg, $success);
+
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'emailsettings',
-                                           'action' =>
-                                           common_local_url('emailsettings')));
+                                          'id' => 'emailsettings',
+                                          'action' =>
+                                          common_local_url('emailsettings')));
+
         $this->hidden('token', common_session_token());
 
         $this->element('h2', null, _('Address'));
@@ -50,12 +102,14 @@ class EmailsettingsAction extends SettingsAction
             $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
-            $confirm = $this->get_confirmation();
+            $confirm = $this->getConfirmation();
             if ($confirm) {
                 $this->elementStart('p');
                 $this->element('span', 'address unconfirmed', $confirm->address);
                 $this->element('span', 'input_instructions',
-                               _('Awaiting confirmation on this address. Check your inbox (and spam box!) for a message with further instructions.'));
+                               _('Awaiting confirmation on this address. '.
+                                 'Check your inbox (and spam box!) for a message '.
+                                 'with further instructions.'));
                 $this->hidden('email', $confirm->address);
                 $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
@@ -69,7 +123,7 @@ class EmailsettingsAction extends SettingsAction
 
         if ($user->email) {
             $this->element('h2', null, _('Incoming email'));
-            
+
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -78,21 +132,23 @@ class EmailsettingsAction extends SettingsAction
                 $this->elementEnd('p');
                 $this->submit('removeincoming', _('Remove'));
             }
-            
+
             $this->elementStart('p');
             $this->element('span', 'input_instructions',
-                           _('Make a new email address for posting to; cancels the old one.'));
+                           _('Make a new email address for posting to; '.
+                             'cancels the old one.'));
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
-        
+
         $this->element('h2', null, _('Preferences'));
 
         $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
                         $user->emailnotifysub);
         $this->checkbox('emailnotifyfav',
-                        _('Send me email when someone adds my notice as a favorite.'),
+                        _('Send me email when someone '.
+                          'adds my notice as a favorite.'),
                         $user->emailnotifyfav);
         $this->checkbox('emailnotifymsg',
                         _('Send me email when someone sends me a private message.'),
@@ -108,17 +164,25 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailmicroid);
 
         $this->submit('save', _('Save'));
-        
+
         $this->elementEnd('form');
-        common_show_footer();
     }
 
-    function get_confirmation()
+    /**
+     * Gets any existing email address confirmations we're waiting for
+     *
+     * @return Confirm_address Email address confirmation for user, or null
+     */
+
+    function getConfirmation()
     {
         $user = common_current_user();
+
         $confirm = new Confirm_address();
-        $confirm->user_id = $user->id;
+
+        $confirm->user_id      = $user->id;
         $confirm->address_type = 'email';
+
         if ($confirm->find(true)) {
             return $confirm;
         } else {
@@ -126,57 +190,72 @@ class EmailsettingsAction extends SettingsAction
         }
     }
 
-    function handle_post()
-    {
+    /**
+     * Handle posts
+     *
+     * Since there are a lot of different options on the page, we
+     * figure out what we're supposed to do based on which button was
+     * pushed
+     *
+     * @return void
+     */
 
-        # CSRF protection
+    function handlePost()
+    {
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->show_form(_('There was a problem with your session token. '.
+                               'Try again, please.'));
             return;
         }
 
         if ($this->arg('save')) {
-            $this->save_preferences();
+            $this->savePreferences();
         } else if ($this->arg('add')) {
-            $this->add_address();
+            $this->addAddress();
         } else if ($this->arg('cancel')) {
-            $this->cancel_confirmation();
+            $this->cancelConfirmation();
         } else if ($this->arg('remove')) {
-            $this->remove_address();
+            $this->removeAddress();
         } else if ($this->arg('removeincoming')) {
-            $this->remove_incoming();
+            $this->removeIncoming();
         } else if ($this->arg('newincoming')) {
-            $this->new_incoming();
+            $this->newIncoming();
         } else {
-            $this->show_form(_('Unexpected form submission.'));
+            $this->showForm(_('Unexpected form submission.'));
         }
     }
 
-    function save_preferences()
-    {
+    /**
+     * Save email preferences
+     *
+     * @return void
+     */
 
-        $emailnotifysub = $this->boolean('emailnotifysub');
-        $emailnotifyfav = $this->boolean('emailnotifyfav');
-        $emailnotifymsg = $this->boolean('emailnotifymsg');
+    function savePreferences()
+    {
+        $emailnotifysub   = $this->boolean('emailnotifysub');
+        $emailnotifyfav   = $this->boolean('emailnotifyfav');
+        $emailnotifymsg   = $this->boolean('emailnotifymsg');
         $emailnotifynudge = $this->boolean('emailnotifynudge');
-        $emailmicroid = $this->boolean('emailmicroid');
-        $emailpost = $this->boolean('emailpost');
+        $emailmicroid     = $this->boolean('emailmicroid');
+        $emailpost        = $this->boolean('emailpost');
 
         $user = common_current_user();
 
-        assert(!is_null($user)); # should already be checked
+        assert(!is_null($user)); // should already be checked
 
         $user->query('BEGIN');
 
         $original = clone($user);
 
-        $user->emailnotifysub = $emailnotifysub;
-        $user->emailnotifyfav = $emailnotifyfav;
-        $user->emailnotifymsg = $emailnotifymsg;
+        $user->emailnotifysub   = $emailnotifysub;
+        $user->emailnotifyfav   = $emailnotifyfav;
+        $user->emailnotifymsg   = $emailnotifymsg;
         $user->emailnotifynudge = $emailnotifynudge;
-        $user->emailmicroid = $emailmicroid;
-        $user->emailpost = $emailpost;
+        $user->emailmicroid     = $emailmicroid;
+        $user->emailpost        = $emailpost;
 
         $result = $user->update($original);
 
@@ -188,45 +267,52 @@ class EmailsettingsAction extends SettingsAction
 
         $user->query('COMMIT');
 
-        $this->show_form(_('Preferences saved.'), true);
+        $this->showForm(_('Preferences saved.'), true);
     }
 
-    function add_address()
-    {
+    /**
+     * Add the address passed in by the user
+     *
+     * @return void
+     */
 
+    function addAddress()
+    {
         $user = common_current_user();
 
         $email = $this->trimmed('email');
 
-        # Some validation
+        // Some validation
 
         if (!$email) {
-            $this->show_form(_('No email address.'));
+            $this->showForm(_('No email address.'));
             return;
         }
 
         $email = common_canonical_email($email);
 
         if (!$email) {
-            $this->show_form(_('Cannot normalize that email address'));
+            $this->showForm(_('Cannot normalize that email address'));
             return;
         }
         if (!Validate::email($email, true)) {
-            $this->show_form(_('Not a valid email address'));
+            $this->showForm(_('Not a valid email address'));
             return;
         } else if ($user->email == $email) {
-            $this->show_form(_('That is already your email address.'));
+            $this->showForm(_('That is already your email address.'));
             return;
-        } else if ($this->email_exists($email)) {
-            $this->show_form(_('That email address already belongs to another user.'));
+        } else if ($this->emailExists($email)) {
+            $this->showForm(_('That email address already belongs '.
+                              'to another user.'));
             return;
         }
 
-          $confirm = new Confirm_address();
-           $confirm->address = $email;
-           $confirm->address_type = 'email';
-           $confirm->user_id = $user->id;
-           $confirm->code = common_confirmation_code(64);
+        $confirm = new Confirm_address();
+
+        $confirm->address      = $email;
+        $confirm->address_type = 'email';
+        $confirm->user_id      = $user->id;
+        $confirm->code         = common_confirmation_code(64);
 
         $result = $confirm->insert();
 
@@ -238,21 +324,31 @@ class EmailsettingsAction extends SettingsAction
 
         mail_confirm_address($user, $confirm->code, $user->nickname, $email);
 
-        $msg = _('A confirmation code was sent to the email address you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
+        $msg = _('A confirmation code was sent to the email address you added. '.
+                 'Check your inbox (and spam box!) for the code and instructions '.
+                 'on how to use it.');
 
-        $this->show_form($msg, true);
+        $this->showForm($msg, true);
     }
 
-    function cancel_confirmation()
+    /**
+     * Handle a request to cancel email confirmation
+     *
+     * @return void
+     */
+
+    function cancelConfirmation()
     {
         $email = $this->arg('email');
-        $confirm = $this->get_confirmation();
+
+        $confirm = $this->getConfirmation();
+
         if (!$confirm) {
-            $this->show_form(_('No pending confirmation to cancel.'));
+            $this->showForm(_('No pending confirmation to cancel.'));
             return;
         }
         if ($confirm->address != $email) {
-            $this->show_form(_('That is the wrong IM address.'));
+            $this->showForm(_('That is the wrong IM address.'));
             return;
         }
 
@@ -264,26 +360,36 @@ class EmailsettingsAction extends SettingsAction
             return;
         }
 
-        $this->show_form(_('Confirmation cancelled.'), true);
+        $this->showForm(_('Confirmation cancelled.'), true);
     }
 
-    function remove_address()
-    {
+    /**
+     * Handle a request to remove an address from the user's account
+     *
+     * @return void
+     */
 
+    function removeAddress()
+    {
         $user = common_current_user();
+
         $email = $this->arg('email');
 
-        # Maybe an old tab open...?
+        // Maybe an old tab open...?
 
         if ($user->email != $email) {
-            $this->show_form(_('That is not your email address.'));
+            $this->showForm(_('That is not your email address.'));
             return;
         }
 
         $user->query('BEGIN');
+
         $original = clone($user);
+
         $user->email = null;
+
         $result = $user->updateKeys($original);
+
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             $this->serverError(_('Couldn\'t update user.'));
@@ -291,48 +397,74 @@ class EmailsettingsAction extends SettingsAction
         }
         $user->query('COMMIT');
 
-        $this->show_form(_('The address was removed.'), true);
+        $this->showForm(_('The address was removed.'), true);
     }
 
-    function remove_incoming()
+    /**
+     * Handle a request to remove an incoming email address
+     *
+     * @return void
+     */
+
+    function removeIncoming()
     {
         $user = common_current_user();
-        
+
         if (!$user->incomingemail) {
-            $this->show_form(_('No incoming email address.'));
+            $this->showForm(_('No incoming email address.'));
             return;
         }
-        
+
         $orig = clone($user);
+
         $user->incomingemail = null;
 
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             $this->serverError(_("Couldn't update user record."));
         }
-        
-        $this->show_form(_('Incoming email address removed.'), true);
+
+        $this->showForm(_('Incoming email address removed.'), true);
     }
 
-    function new_incoming()
+    /**
+     * Generate a new incoming email address
+     *
+     * @return void
+     */
+
+    function newIncoming()
     {
         $user = common_current_user();
-        
+
         $orig = clone($user);
+
         $user->incomingemail = mail_new_incoming_address();
-        
+
         if (!$user->updateKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             $this->serverError(_("Couldn't update user record."));
         }
 
-        $this->show_form(_('New incoming email address added.'), true);
+        $this->showForm(_('New incoming email address added.'), true);
     }
-    
-    function email_exists($email)
+
+    /**
+     * Does another user already have this email address?
+     *
+     * Email addresses are unique for users.
+     *
+     * @param string $email Address to check
+     *
+     * @return boolean Whether the email already exists.
+     */
+
+    function emailExists($email)
     {
         $user = common_current_user();
+
         $other = User::staticGet('email', $email);
+
         if (!$other) {
             return false;
         } else {

From 2c9759c3b329eff455b3998d748292d581635f90 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Fri, 16 Jan 2009 20:19:49 +0000
Subject: [PATCH 125/256] trac750 Don't accidentally show login form after user
 logs in

---
 actions/facebookhome.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index f72f08a345..b780b8cc32 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -71,15 +71,16 @@ class FacebookhomeAction extends FacebookAction
                 // XXX: Do some error handling here
 
                 $this->setDefaults();
-
                 $this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
-
+                return;
+                
             } else {
                 $msg = _('Incorrect username or password.');
             }
         }
 
         $this->showLoginForm($msg);
+        
     }
 
     function setDefaults()

From 2f99a257a0d8bd773ea96249b13b134fcfbc99cd Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 20:25:46 +0000
Subject: [PATCH 126/256] Make the OpenID settings work with new framework

---
 actions/finishaddopenid.php | 112 +++++++++++++++++++++++----
 actions/openidsettings.php  | 149 ++++++++++++++++++++++++++----------
 2 files changed, 203 insertions(+), 58 deletions(-)

diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php
index 708e8d4bfb..8f10505cff 100644
--- a/actions/finishaddopenid.php
+++ b/actions/finishaddopenid.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Complete adding an OpenID
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,14 +18,47 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/openid.php');
+require_once INSTALLDIR.'/lib/openid.php';
+
+/**
+ * Complete adding an OpenID
+ *
+ * Handle the return from an OpenID verification
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class FinishaddopenidAction extends Action
 {
+    var $msg = null;
+
+    /**
+     * Handle the redirect back from OpenID confirmation
+     *
+     * Check to see if the user's logged in, and then try
+     * to use the OpenID login system.
+     *
+     * @param array $args $_REQUEST arguments
+     *
+     * @return void
+     */
 
     function handle($args)
     {
@@ -30,13 +66,20 @@ class FinishaddopenidAction extends Action
         if (!common_logged_in()) {
             $this->clientError(_('Not logged in.'));
         } else {
-            $this->try_login();
+            $this->tryLogin();
         }
     }
-    
-    function try_login()
-    {
 
+    /**
+     * Try to log in using OpenID
+     *
+     * Check the OpenID for validity; potentially store it.
+     *
+     * @return void
+     */
+
+    function tryLogin()
+    {
         $consumer =& oid_consumer();
 
         $response = $consumer->complete(common_local_url('finishaddopenid'));
@@ -46,10 +89,11 @@ class FinishaddopenidAction extends Action
             return;
         } else if ($response->status == Auth_OpenID_FAILURE) {
             // Authentication failed; display the error message.
-            $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message));
+            $this->message(sprintf(_('OpenID authentication failed: %s'),
+                                   $response->message));
         } else if ($response->status == Auth_OpenID_SUCCESS) {
 
-            $display = $response->getDisplayIdentifier();
+            $display   = $response->getDisplayIdentifier();
             $canonical = ($response->endpoint && $response->endpoint->canonicalID) ?
               $response->endpoint->canonicalID : $display;
 
@@ -60,6 +104,7 @@ class FinishaddopenidAction extends Action
             }
 
             $cur =& common_current_user();
+
             $other = oid_get_user($canonical);
 
             if ($other) {
@@ -71,7 +116,7 @@ class FinishaddopenidAction extends Action
                 return;
             }
 
-            # start a transaction
+            // start a transaction
 
             $cur->query('BEGIN');
 
@@ -88,7 +133,7 @@ class FinishaddopenidAction extends Action
                 }
             }
 
-            # success!
+            // success!
 
             $cur->query('COMMIT');
 
@@ -98,10 +143,43 @@ class FinishaddopenidAction extends Action
         }
     }
 
+    /**
+     * Show a failure message
+     *
+     * Something went wrong. Save the message, and show the page.
+     *
+     * @param string $msg Error message to show
+     *
+     * @return void
+     */
+
     function message($msg)
     {
-        common_show_header(_('OpenID Login'));
-        $this->element('p', null, $msg);
-        common_show_footer();
+        $this->message = $msg;
+        $this->showPage();
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string title
+     */
+
+    function title()
+    {
+        return _('OpenID Login');
+    }
+
+    /**
+     * Show error message
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        if ($this->message) {
+            $this->element('p', 'error', $this->message);
+        }
     }
 }
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 9265b5ea62..a21a9869e3 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Settings for OpenID
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,39 +18,81 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
-require_once(INSTALLDIR.'/lib/openid.php');
+require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/openid.php';
+
+/**
+ * Settings for OpenID
+ *
+ * Lets users add, edit and delete OpenIDs from their account
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class OpenidsettingsAction extends SettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Page title
+     */
 
-    function get_instructions()
+    function title()
     {
-        return _('[OpenID](%%doc.openid%%) lets you log into many sites ' .
-                  ' with the same user account. '.
-                  ' Manage your associated OpenIDs from here.');
+        return _('OpenID settings');
     }
 
-    function show_form($msg=null, $success=false)
-    {
+    /**
+     * Instructions for use
+     *
+     * @return string Instructions for use
+     */
 
+    function getInstructions()
+    {
+        return _('[OpenID](%%doc.openid%%) lets you log into many sites ' .
+                 ' with the same user account. '.
+                 ' Manage your associated OpenIDs from here.');
+    }
+
+    /**
+     * Show the form for OpenID management
+     *
+     * We have one form with a few different submit buttons to do different things.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
         $user = common_current_user();
 
-        $this->form_header(_('OpenID settings'), $msg, $success);
-
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'openidadd',
-                                           'action' =>
-                                           common_local_url('openidsettings')));
+                                          'id' => 'openidadd',
+                                          'action' =>
+                                          common_local_url('openidsettings')));
         $this->hidden('token', common_session_token());
         $this->element('h2', null, _('Add OpenID'));
         $this->element('p', null,
                        _('If you want to add an OpenID to your account, ' .
-                          'enter it in the box below and click "Add".'));
+                         'enter it in the box below and click "Add".'));
         $this->elementStart('p');
         $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
@@ -63,6 +108,7 @@ class OpenidsettingsAction extends SettingsAction
         $this->elementEnd('form');
 
         $oid = new User_openid();
+
         $oid->user_id = $user->id;
 
         $cnt = $oid->find();
@@ -74,8 +120,10 @@ class OpenidsettingsAction extends SettingsAction
             if ($cnt == 1 && !$user->password) {
 
                 $this->element('p', null,
-                               _('Removing your only OpenID would make it impossible to log in! ' .
-                                  'If you need to remove it, add another OpenID first.'));
+                               _('Removing your only OpenID '.
+                                 'would make it impossible to log in! ' .
+                                 'If you need to remove it, '.
+                                 'add another OpenID first.'));
 
                 if ($oid->fetch()) {
                     $this->elementStart('p');
@@ -88,14 +136,15 @@ class OpenidsettingsAction extends SettingsAction
 
                 $this->element('p', null,
                                _('You can remove an OpenID from your account '.
-                                  'by clicking the button marked "Remove".'));
+                                 'by clicking the button marked "Remove".'));
                 $idx = 0;
 
                 while ($oid->fetch()) {
-                    $this->elementStart('form', array('method' => 'POST',
-                                                       'id' => 'openiddelete' . $idx,
-                                                       'action' =>
-                                                       common_local_url('openidsettings')));
+                    $this->elementStart('form',
+                                        array('method' => 'POST',
+                                              'id' => 'openiddelete' . $idx,
+                                              'action' =>
+                                              common_local_url('openidsettings')));
                     $this->elementStart('p');
                     $this->hidden('token', common_session_token());
                     $this->element('a', array('href' => $oid->canonical),
@@ -115,47 +164,65 @@ class OpenidsettingsAction extends SettingsAction
                 }
             }
         }
-
-        common_show_footer();
     }
 
-    function handle_post()
+    /**
+     * Handle a POST request
+     *
+     * Muxes to different sub-functions based on which button was pushed
+     *
+     * @return void
+     */
+
+    function handlePost()
     {
-        # CSRF protection
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
         if ($this->arg('add')) {
-            $result = oid_authenticate($this->trimmed('openid_url'), 'finishaddopenid');
-            if (is_string($result)) { # error message
-                $this->show_form($result);
+            $result = oid_authenticate($this->trimmed('openid_url'),
+                                       'finishaddopenid');
+            if (is_string($result)) { // error message
+                $this->showForm($result);
             }
         } else if ($this->arg('remove')) {
-            $this->remove_openid();
+            $this->removeOpenid();
         } else {
-            $this->show_form(_('Something weird happened.'));
+            $this->showForm(_('Something weird happened.'));
         }
     }
 
-    function remove_openid()
-    {
+    /**
+     * Handles a request to remove an OpenID from the user's account
+     *
+     * Validates input and, if everything is OK, deletes the OpenID.
+     * Reloads the form with a success or error notification.
+     *
+     * @return void
+     */
 
+    function removeOpenid()
+    {
         $openid_url = $this->trimmed('openid_url');
+
         $oid = User_openid::staticGet('canonical', $openid_url);
+
         if (!$oid) {
-            $this->show_form(_('No such OpenID.'));
+            $this->showForm(_('No such OpenID.'));
             return;
         }
         $cur = common_current_user();
         if (!$cur || $oid->user_id != $cur->id) {
-            $this->show_form(_('That OpenID does not belong to you.'));
+            $this->showForm(_('That OpenID does not belong to you.'));
             return;
         }
         $oid->delete();
-        $this->show_form(_('OpenID removed.'), true);
+        $this->showForm(_('OpenID removed.'), true);
         return;
     }
 }

From c0a5ade1e7a9ed7a501c8db74213e203449d861d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 20:56:39 +0000
Subject: [PATCH 127/256] SMS settings updated to new framework

---
 actions/smssettings.php | 342 ++++++++++++++++++++++++++++------------
 1 file changed, 239 insertions(+), 103 deletions(-)

diff --git a/actions/smssettings.php b/actions/smssettings.php
index c5879e4d95..f214997ec6 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Settings for SMS
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,36 +18,83 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
-require_once(INSTALLDIR.'/actions/emailsettings.php');
+require_once INSTALLDIR.'/lib/settingsaction.php';
 
-class SmssettingsAction extends EmailsettingsAction
+/**
+ * Settings for SMS
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      SettingsAction
+ */
+
+class SmssettingsAction extends SettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
+    {
+        return _('SMS Settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
     {
         return _('You can receive SMS messages through email from %%site.name%%.');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Content area of the page
+     *
+     * Shows a form for adding and removing SMS phone numbers and setting
+     * SMS preferences.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
         $user = common_current_user();
-        $this->form_header(_('SMS Settings'), $msg, $success);
+
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'smssettings',
-                                           'action' =>
-                                           common_local_url('smssettings')));
+                                          'id' => 'smssettings',
+                                          'action' =>
+                                          common_local_url('smssettings')));
+
         $this->hidden('token', common_session_token());
         $this->element('h2', null, _('Address'));
 
         if ($user->sms) {
             $this->elementStart('p');
             $carrier = $user->getCarrier();
-            $this->element('span', 'address confirmed', $user->sms . ' (' . $carrier->name . ')');
+            $this->element('span', 'address confirmed',
+                           $user->sms . ' (' . $carrier->name . ')');
             $this->element('span', 'input_instructions',
                            _('Current confirmed SMS-enabled phone number.'));
             $this->hidden('sms', $user->sms);
@@ -52,11 +102,12 @@ class SmssettingsAction extends EmailsettingsAction
             $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
-            $confirm = $this->get_confirmation();
+            $confirm = $this->getConfirmation();
             if ($confirm) {
                 $carrier = Sms_carrier::staticGet($confirm->address_extra);
                 $this->elementStart('p');
-                $this->element('span', 'address unconfirmed', $confirm->address . ' (' . $carrier->name . ')');
+                $this->element('span', 'address unconfirmed',
+                               $confirm->address . ' (' . $carrier->name . ')');
                 $this->element('span', 'input_instructions',
                                _('Awaiting confirmation on this phone number.'));
                 $this->hidden('sms', $confirm->address);
@@ -69,15 +120,16 @@ class SmssettingsAction extends EmailsettingsAction
             } else {
                 $this->input('sms', _('SMS Phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
-                             _('Phone number, no punctuation or spaces, with area code'));
-                $this->carrier_select();
+                             _('Phone number, no punctuation or spaces, '.
+                               'with area code'));
+                $this->carrierSelect();
                 $this->submit('add', _('Add'));
             }
         }
 
         if ($user->sms) {
             $this->element('h2', null, _('Incoming email'));
-            
+
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -86,32 +138,45 @@ class SmssettingsAction extends EmailsettingsAction
                 $this->elementEnd('p');
                 $this->submit('removeincoming', _('Remove'));
             }
-            
+
             $this->elementStart('p');
             $this->element('span', 'input_instructions',
-                           _('Make a new email address for posting to; cancels the old one.'));
+                           _('Make a new email address for posting to; '.
+                             'cancels the old one.'));
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
-        
+
         $this->element('h2', null, _('Preferences'));
-        
+
         $this->checkbox('smsnotify',
-                        _('Send me notices through SMS; I understand I may incur exorbitant charges from my carrier.'),
+                        _('Send me notices through SMS; '.
+                          'I understand I may incur '.
+                          'exorbitant charges from my carrier.'),
                         $user->smsnotify);
-            
+
         $this->submit('save', _('Save'));
-        
+
         $this->elementEnd('form');
-        common_show_footer();
     }
 
-    function get_confirmation()
+    /**
+     * Get a pending confirmation, if any, for this user
+     *
+     * @return void
+     *
+     * @todo very similar to EmailsettingsAction::getConfirmation(); refactor?
+     */
+
+    function getConfirmation()
     {
         $user = common_current_user();
+
         $confirm = new Confirm_address();
-        $confirm->user_id = $user->id;
+
+        $confirm->user_id      = $user->id;
         $confirm->address_type = 'sms';
+
         if ($confirm->find(true)) {
             return $confirm;
         } else {
@@ -119,44 +184,62 @@ class SmssettingsAction extends EmailsettingsAction
         }
     }
 
-    function handle_post()
-    {
+    /**
+     * Handle posts to this form
+     *
+     * Based on the button that was pressed, muxes out to other functions
+     * to do the actual task requested.
+     *
+     * All sub-functions reload the form with a message -- success or failure.
+     *
+     * @return void
+     */
 
-        # CSRF protection
+    function handlePost()
+    {
+        // CSRF protection
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
         if ($this->arg('save')) {
-            $this->save_preferences();
+            $this->savePreferences();
         } else if ($this->arg('add')) {
-            $this->add_address();
+            $this->addAddress();
         } else if ($this->arg('cancel')) {
-            $this->cancel_confirmation();
+            $this->cancelConfirmation();
         } else if ($this->arg('remove')) {
-            $this->remove_address();
+            $this->removeAddress();
         } else if ($this->arg('removeincoming')) {
-            $this->remove_incoming();
+            $this->removeIncoming();
         } else if ($this->arg('newincoming')) {
-            $this->new_incoming();
+            $this->newIncoming();
         } else if ($this->arg('confirm')) {
-            $this->confirm_code();
+            $this->confirmCode();
         } else {
-            $this->show_form(_('Unexpected form submission.'));
+            $this->showForm(_('Unexpected form submission.'));
         }
     }
 
-    function save_preferences()
-    {
+    /**
+     * Handle a request to save preferences
+     *
+     * Sets the user's SMS preferences in the DB.
+     *
+     * @return void
+     */
 
+    function savePreferences()
+    {
         $smsnotify = $this->boolean('smsnotify');
-        
+
         $user = common_current_user();
 
-        assert(!is_null($user)); # should already be checked
+        assert(!is_null($user)); // should already be checked
 
         $user->query('BEGIN');
 
@@ -174,45 +257,54 @@ class SmssettingsAction extends EmailsettingsAction
 
         $user->query('COMMIT');
 
-        $this->show_form(_('Preferences saved.'), true);
+        $this->showForm(_('Preferences saved.'), true);
     }
 
-    function add_address()
-    {
+    /**
+     * Add a new SMS number for confirmation
+     *
+     * When the user requests a new SMS number, sends a confirmation
+     * message.
+     *
+     * @return void
+     */
 
+    function addAddress()
+    {
         $user = common_current_user();
 
-        $sms = $this->trimmed('sms');
+        $sms        = $this->trimmed('sms');
         $carrier_id = $this->trimmed('carrier');
-        
-        # Some validation
+
+        // Some validation
 
         if (!$sms) {
-            $this->show_form(_('No phone number.'));
+            $this->showForm(_('No phone number.'));
             return;
         }
 
         if (!$carrier_id) {
-            $this->show_form(_('No carrier selected.'));
-            return;
-        }
-        
-        $sms = common_canonical_sms($sms);
-        
-        if ($user->sms == $sms) {
-            $this->show_form(_('That is already your phone number.'));
-            return;
-        } else if ($this->sms_exists($sms)) {
-            $this->show_form(_('That phone number already belongs to another user.'));
+            $this->showForm(_('No carrier selected.'));
             return;
         }
 
-          $confirm = new Confirm_address();
-           $confirm->address = $sms;
-           $confirm->address_extra = $carrier_id;
-           $confirm->address_type = 'sms';
-           $confirm->user_id = $user->id;
-           $confirm->code = common_confirmation_code(40);
+        $sms = common_canonical_sms($sms);
+
+        if ($user->sms == $sms) {
+            $this->showForm(_('That is already your phone number.'));
+            return;
+        } else if ($this->smsExists($sms)) {
+            $this->showForm(_('That phone number already belongs to another user.'));
+            return;
+        }
+
+        $confirm = new Confirm_address();
+
+        $confirm->address       = $sms;
+        $confirm->address_extra = $carrier_id;
+        $confirm->address_type  = 'sms';
+        $confirm->user_id       = $user->id;
+        $confirm->code          = common_confirmation_code(40);
 
         $result = $confirm->insert();
 
@@ -223,30 +315,39 @@ class SmssettingsAction extends EmailsettingsAction
         }
 
         $carrier = Sms_carrier::staticGet($carrier_id);
-        
+
         mail_confirm_sms($confirm->code,
                          $user->nickname,
                          $carrier->toEmailAddress($sms));
 
-        $msg = _('A confirmation code was sent to the phone number you added. Check your inbox (and spam box!) for the code and instructions on how to use it.');
+        $msg = _('A confirmation code was sent to the phone number you added. '.
+                 'Check your phone for the code and instructions '.
+                 'on how to use it.');
 
-        $this->show_form($msg, true);
+        $this->showForm($msg, true);
     }
 
-    function cancel_confirmation()
+    /**
+     * Cancel a pending confirmation
+     *
+     * Cancels the confirmation.
+     *
+     * @return void
+     */
+
+    function cancelConfirmation()
     {
-        
-        $sms = $this->trimmed('sms');
+        $sms     = $this->trimmed('sms');
         $carrier = $this->trimmed('carrier');
-        
-        $confirm = $this->get_confirmation();
-        
+
+        $confirm = $this->getConfirmation();
+
         if (!$confirm) {
-            $this->show_form(_('No pending confirmation to cancel.'));
+            $this->showForm(_('No pending confirmation to cancel.'));
             return;
         }
         if ($confirm->address != $sms) {
-            $this->show_form(_('That is the wrong confirmation number.'));
+            $this->showForm(_('That is the wrong confirmation number.'));
             return;
         }
 
@@ -258,28 +359,37 @@ class SmssettingsAction extends EmailsettingsAction
             return;
         }
 
-        $this->show_form(_('Confirmation cancelled.'), true);
+        $this->showForm(_('Confirmation cancelled.'), true);
     }
 
-    function remove_address()
-    {
+    /**
+     * Remove a phone number from the user's account
+     *
+     * @return void
+     */
 
+    function removeAddress()
+    {
         $user = common_current_user();
-        $sms = $this->arg('sms');
+
+        $sms     = $this->arg('sms');
         $carrier = $this->arg('carrier');
-        
-        # Maybe an old tab open...?
+
+        // Maybe an old tab open...?
 
         if ($user->sms != $sms) {
-            $this->show_form(_('That is not your phone number.'));
+            $this->showForm(_('That is not your phone number.'));
             return;
         }
 
         $user->query('BEGIN');
+
         $original = clone($user);
-        $user->sms = null;
-        $user->carrier = null;        
-        $user->smsemail = null;        
+
+        $user->sms      = null;
+        $user->carrier  = null;
+        $user->smsemail = null;
+
         $result = $user->updateKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
@@ -288,13 +398,25 @@ class SmssettingsAction extends EmailsettingsAction
         }
         $user->query('COMMIT');
 
-        $this->show_form(_('The address was removed.'), true);
+        $this->showForm(_('The address was removed.'), true);
     }
-    
-    function sms_exists($sms)
+
+    /**
+     * Does this sms number exist in our database?
+     *
+     * Also checks if it belongs to someone else
+     *
+     * @param string $sms phone number to check
+     *
+     * @return boolean does the number exist
+     */
+
+    function smsExists($sms)
     {
         $user = common_current_user();
+
         $other = User::staticGet('sms', $sms);
+
         if (!$other) {
             return false;
         } else {
@@ -302,15 +424,22 @@ class SmssettingsAction extends EmailsettingsAction
         }
     }
 
-    function carrier_select()
+    /**
+     * Show a drop-down box with all the SMS carriers in the DB
+     *
+     * @return void
+     */
+
+    function carrierSelect()
     {
         $carrier = new Sms_carrier();
+
         $cnt = $carrier->find();
 
         $this->elementStart('p');
         $this->element('label', array('for' => 'carrier'));
         $this->elementStart('select', array('name' => 'carrier',
-                                             'id' => 'carrier'));
+                                            'id' => 'carrier'));
         $this->element('option', array('value' => 0),
                        _('Select a carrier'));
         while ($carrier->fetch()) {
@@ -321,23 +450,30 @@ class SmssettingsAction extends EmailsettingsAction
         $this->elementEnd('p');
         $this->element('span', 'input_instructions',
                        sprintf(_('Mobile carrier for your phone. '.
-                                 'If you know a carrier that accepts ' . 
+                                 'If you know a carrier that accepts ' .
                                  'SMS over email but isn\'t listed here, ' .
                                  'send email to let us know at %s.'),
                                common_config('site', 'email')));
     }
 
-    function confirm_code()
+    /**
+     * Confirm an SMS confirmation code
+     *
+     * Redirects to the confirmaddress page for this code
+     *
+     * @return void
+     */
+
+    function confirmCode()
     {
-        
         $code = $this->trimmed('code');
-        
+
         if (!$code) {
-            $this->show_form(_('No code entered'));
+            $this->showForm(_('No code entered'));
             return;
         }
-        
-        common_redirect(common_local_url('confirmaddress', 
+
+        common_redirect(common_local_url('confirmaddress',
                                          array('code' => $code)));
     }
 }

From d5a876865ba0a90921a160653cf19115f3abb714 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 21:18:30 +0000
Subject: [PATCH 128/256] Update twittersettings to new framework

---
 actions/twittersettings.php | 319 ++++++++++++++++++++++++------------
 1 file changed, 218 insertions(+), 101 deletions(-)

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index d6d31c4838..5492dd9958 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Settings for Twitter integration
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,39 +18,88 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once INSTALLDIR.'/lib/settingsaction.php';
 
 define('SUBSCRIPTIONS', 80);
 
+/**
+ * Settings for Twitter integration
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      SettingsAction
+ */
+
 class TwittersettingsAction extends SettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
     {
-        return _('Add your Twitter account to automatically send your notices to Twitter, ' .
-            'and subscribe to Twitter friends already here.');
+        _('Twitter settings');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('Add your Twitter account to automatically send '.
+                 ' your notices to Twitter, ' .
+                 'and subscribe to Twitter friends already here.');
+    }
+
+    /**
+     * Content area of the page
+     *
+     * Shows a form for associating a Twitter account with this
+     * Laconica account. Also lets the user set preferences.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
         $user = common_current_user();
+
         $profile = $user->getProfile();
+
         $fuser = null;
+
         $flink = Foreign_link::getByUserID($user->id, 1); // 1 == Twitter
 
         if ($flink) {
             $fuser = $flink->getForeignUser();
         }
 
-        $this->form_header(_('Twitter settings'), $msg, $success);
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'twittersettings',
-                                           'action' =>
-                                           common_local_url('twittersettings')));
+                                          'id' => 'twittersettings',
+                                          'action' =>
+                                          common_local_url('twittersettings')));
         $this->hidden('token', common_session_token());
 
         $this->element('h2', null, _('Twitter Account'));
@@ -56,7 +108,7 @@ class TwittersettingsAction extends SettingsAction
             $this->elementStart('p');
 
             $this->element('span', 'twitter_user', $fuser->nickname);
-            $this->element('a', array('href' => $fuser->uri),  $fuser->uri);
+            $this->element('a', array('href' => $fuser->uri), $fuser->uri);
             $this->element('span', 'input_instructions',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
@@ -64,7 +116,9 @@ class TwittersettingsAction extends SettingsAction
             $this->submit('remove', _('Remove'));
         } else {
             $this->input('twitter_username', _('Twitter user name'),
-                         ($this->arg('twitter_username')) ? $this->arg('twitter_username') : $profile->nickname,
+                         ($this->arg('twitter_username')) ?
+                         $this->arg('twitter_username') :
+                         $profile->nickname,
                          _('No spaces, please.')); // hey, it's what Twitter says
 
             $this->password('twitter_password', _('Twitter password'));
@@ -72,14 +126,23 @@ class TwittersettingsAction extends SettingsAction
 
         $this->element('h2', null, _('Preferences'));
 
-        $this->checkbox('noticesync', _('Automatically send my notices to Twitter.'),
-                        ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
+        $this->checkbox('noticesync',
+                        _('Automatically send my notices to Twitter.'),
+                        ($flink) ?
+                        ($flink->noticesync & FOREIGN_NOTICE_SEND) :
+                        true);
 
-        $this->checkbox('replysync', _('Send local "@" replies to Twitter.'),
-                        ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
+        $this->checkbox('replysync',
+                        _('Send local "@" replies to Twitter.'),
+                        ($flink) ?
+                        ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) :
+                        true);
 
-        $this->checkbox('friendsync', _('Subscribe to my Twitter friends here.'),
-                        ($flink) ? ($flink->friendsync & FOREIGN_FRIEND_RECV) : false);
+        $this->checkbox('friendsync',
+                        _('Subscribe to my Twitter friends here.'),
+                        ($flink) ?
+                        ($flink->friendsync & FOREIGN_FRIEND_RECV) :
+                        false);
 
         if ($flink) {
             $this->submit('save', _('Save'));
@@ -87,24 +150,31 @@ class TwittersettingsAction extends SettingsAction
             $this->submit('add', _('Add'));
         }
 
-        $this->show_twitter_subscriptions();
+        $this->showTwitterSubscriptions();
 
         $this->elementEnd('form');
-
-        common_show_footer();
     }
 
-    function subscribed_twitter_users()
+    /**
+     * Gets some of the user's Twitter friends
+     *
+     * Gets the number of Twitter friends that are on this
+     * instance of Laconica.
+     *
+     * @return array array of User objects
+     */
+
+    function subscribedTwitterUsers()
     {
 
         $current_user = common_current_user();
 
         $qry = 'SELECT user.* ' .
-            'FROM subscription ' .
-            'JOIN user ON subscription.subscribed = user.id ' .
-            'JOIN foreign_link ON foreign_link.user_id = user.id ' .
-            'WHERE subscriber = %d ' .
-            'ORDER BY user.nickname';
+          'FROM subscription ' .
+          'JOIN user ON subscription.subscribed = user.id ' .
+          'JOIN foreign_link ON foreign_link.user_id = user.id ' .
+          'WHERE subscriber = %d ' .
+          'ORDER BY user.nickname';
 
         $user = new User();
 
@@ -123,10 +193,20 @@ class TwittersettingsAction extends SettingsAction
         return $users;
     }
 
-    function show_twitter_subscriptions()
+    /**
+     * Show user's Twitter friends
+     *
+     * Gets the number of Twitter friends that are on this
+     * instance of Laconica, and shows their mini-avatars.
+     *
+     * @return void
+     */
+
+    function showTwitterSubscriptions()
     {
 
-        $friends = $this->subscribed_twitter_users();
+        $friends = $this->subscribedTwitterUsers();
+
         $friends_count = count($friends);
 
         if ($friends_count > 0) {
@@ -146,13 +226,19 @@ class TwittersettingsAction extends SettingsAction
 
                 $this->elementStart('li');
                 $this->elementStart('a', array('title' => ($other->fullname) ?
-                                                $other->fullname :
-                                                $other->nickname,
-                                                'href' => $other->profileurl,
-                                                'rel' => 'contact',
-                                                'class' => 'subscription'));
+                                               $other->fullname :
+                                               $other->nickname,
+                                               'href' => $other->profileurl,
+                                               'rel' => 'contact',
+                                               'class' => 'subscription'));
+
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
-                $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
+
+                $avatar_url = ($avatar) ?
+                  common_avatar_display_url($avatar) :
+                  common_default_avatar(AVATAR_MINI_SIZE);
+
+                $this->element('img', array('src' => $avatar_url,
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
                                             'class' => 'avatar mini',
@@ -168,88 +254,96 @@ class TwittersettingsAction extends SettingsAction
             $this->elementEnd('div');
 
         }
-
-        // XXX Figure out a way to show all Twitter friends... ?
-
-        /*
-        if ($subs_count > SUBSCRIPTIONS) {
-            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
-
-            $this->element('a', array('href' => common_local_url('subscriptions',
-                                                                 array('nickname' => $profile->nickname)),
-                                      'class' => 'moresubscriptions'),
-                           _('All subscriptions'));
-            $this->elementEnd('p');
-        }
-        */
-
     }
 
-    function handle_post()
+    /**
+     * Handle posts to this form
+     *
+     * Based on the button that was pressed, muxes out to other functions
+     * to do the actual task requested.
+     *
+     * All sub-functions reload the form with a message -- success or failure.
+     *
+     * @return void
+     */
+
+    function handlePost()
     {
 
-        # CSRF protection
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
         if ($this->arg('save')) {
-            $this->save_preferences();
+            $this->savePreferences();
         } else if ($this->arg('add')) {
-            $this->add_twitter_acct();
+            $this->addTwitterAccount();
         } else if ($this->arg('remove')) {
-            $this->remove_twitter_acct();
+            $this->removeTwitterAccount();
         } else {
-            $this->show_form(_('Unexpected form submission.'));
+            $this->showForm(_('Unexpected form submission.'));
         }
     }
 
-    function add_twitter_acct()
-    {
+    /**
+     * Associate a Twitter account with the user's account
+     *
+     * Validates post input; verifies it against Twitter; and if
+     * successful stores in the database.
+     *
+     * @return void
+     */
 
+    function addTwitterAccount()
+    {
         $screen_name = $this->trimmed('twitter_username');
-        $password = $this->trimmed('twitter_password');
-        $noticesync = $this->boolean('noticesync');
-        $replysync = $this->boolean('replysync');
-        $friendsync = $this->boolean('friendsync');
+        $password    = $this->trimmed('twitter_password');
+        $noticesync  = $this->boolean('noticesync');
+        $replysync   = $this->boolean('replysync');
+        $friendsync  = $this->boolean('friendsync');
 
         if (!Validate::string($screen_name,
-                array(    'min_length' => 1,
-                        'max_length' => 15,
-                         'format' => VALIDATE_NUM . VALIDATE_ALPHA . '_'))) {
-            $this->show_form(
-                _('Username must have only numbers, upper- and lowercase letters, and underscore (_). 15 chars max.'));
+                              array('min_length' => 1,
+                                    'max_length' => 15,
+                                    'format' => VALIDATE_NUM.VALIDATE_ALPHA.'_'))) {
+            $this->showForm(_('Username must have only numbers, '.
+                              'upper- and lowercase letters, '.
+                              'and underscore (_). 15 chars max.'));
             return;
         }
 
-        if (!$this->verify_credentials($screen_name, $password)) {
-            $this->show_form(_('Could not verify your Twitter credentials!'));
+        if (!$this->verifyCredentials($screen_name, $password)) {
+            $this->showForm(_('Could not verify your Twitter credentials!'));
             return;
         }
 
         $twit_user = twitter_user_info($screen_name, $password);
 
         if (!$twit_user) {
-            $this->show_form(sprintf(_('Unable to retrieve account information for "%s" from Twitter.'),
-                $screen_name));
+            $this->showForm(sprintf(_('Unable to retrieve account information '.
+                                      'For "%s" from Twitter.'),
+                                    $screen_name));
             return;
         }
 
         if (!save_twitter_user($twit_user->id, $screen_name)) {
-            $this->show_form(_('Unable to save your Twitter settings!'));
+            $this->showForm(_('Unable to save your Twitter settings!'));
             return;
         }
 
         $user = common_current_user();
 
-        $flink = DB_DataObject::factory('foreign_link');
-        $flink->user_id = $user->id;
-        $flink->foreign_id = $twit_user->id;
-        $flink->service = 1; // Twitter
+        $flink = new Foreign_link();
+
+        $flink->user_id     = $user->id;
+        $flink->foreign_id  = $twit_user->id;
+        $flink->service     = 1; // Twitter
         $flink->credentials = $password;
-        $flink->created = common_sql_now();
+        $flink->created     = common_sql_now();
 
         $flink->set_flags($noticesync, $replysync, $friendsync);
 
@@ -257,7 +351,7 @@ class TwittersettingsAction extends SettingsAction
 
         if (!$flink_id) {
             common_log_db_error($flink, 'INSERT', __FILE__);
-            $this->show_form(_('Unable to save your Twitter settings!'));
+            $this->showForm(_('Unable to save your Twitter settings!'));
             return;
         }
 
@@ -265,19 +359,26 @@ class TwittersettingsAction extends SettingsAction
             save_twitter_friends($user, $twit_user->id, $screen_name, $password);
         }
 
-        $this->show_form(_('Twitter settings saved.'), true);
+        $this->showForm(_('Twitter settings saved.'), true);
     }
 
-    function remove_twitter_acct()
-    {
+    /**
+     * Disassociate an existing Twitter account from this account
+     *
+     * @return void
+     */
 
+    function removeTwitterAccount()
+    {
         $user = common_current_user();
+
         $flink = Foreign_link::getByUserID($user->id, 1);
+
         $flink_foreign_id = $this->arg('flink_foreign_id');
 
-        # Maybe an old tab open...?
+        // Maybe an old tab open...?
         if ($flink->foreign_id != $flink_foreign_id) {
-            $this->show_form(_('That is not your Twitter account.'));
+            $this->showForm(_('That is not your Twitter account.'));
             return;
         }
 
@@ -289,15 +390,20 @@ class TwittersettingsAction extends SettingsAction
             return;
         }
 
-        $this->show_form(_('Twitter account removed.'), true);
+        $this->showForm(_('Twitter account removed.'), true);
     }
 
-    function save_preferences()
-    {
+    /**
+     * Save user's Twitter-bridging preferences
+     *
+     * @return void
+     */
 
+    function savePreferences()
+    {
         $noticesync = $this->boolean('noticesync');
         $friendsync = $this->boolean('friendsync');
-        $replysync = $this->boolean('replysync');
+        $replysync  = $this->boolean('replysync');
 
         $user = common_current_user();
 
@@ -305,30 +411,32 @@ class TwittersettingsAction extends SettingsAction
 
         if (!$flink) {
             common_log_db_error($flink, 'SELECT', __FILE__);
-            $this->show_form(_('Couldn\'t save Twitter preferences.'));
+            $this->showForm(_('Couldn\'t save Twitter preferences.'));
             return;
         }
 
         $twitter_id = $flink->foreign_id;
-        $password = $flink->credentials;
+        $password   = $flink->credentials;
 
         $fuser = $flink->getForeignUser();
 
         if (!$fuser) {
             common_log_db_error($fuser, 'SELECT', __FILE__);
-            $this->show_form(_('Couldn\'t save Twitter preferences.'));
+            $this->showForm(_('Couldn\'t save Twitter preferences.'));
             return;
         }
 
         $screen_name = $fuser->nickname;
 
         $original = clone($flink);
+
         $flink->set_flags($noticesync, $replysync, $friendsync);
+
         $result = $flink->update($original);
 
         if ($result === false) {
             common_log_db_error($flink, 'UPDATE', __FILE__);
-            $this->show_form(_('Couldn\'t save Twitter preferences.'));
+            $this->showForm(_('Couldn\'t save Twitter preferences.'));
             return;
         }
 
@@ -336,12 +444,22 @@ class TwittersettingsAction extends SettingsAction
             save_twitter_friends($user, $flink->foreign_id, $screen_name, $password);
         }
 
-        $this->show_form(_('Twitter preferences saved.'), true);
+        $this->showForm(_('Twitter preferences saved.'), true);
     }
 
-    function verify_credentials($screen_name, $password)
+    /**
+     * Verifies a username and password against Twitter's API
+     *
+     * @param string $screen_name Twitter user name
+     * @param string $password    Twitter password
+     *
+     * @return boolean success flag
+     */
+
+    function verifyCredentials($screen_name, $password)
     {
-        $uri = 'http://twitter.com/account/verify_credentials.json';
+        $uri = 'http://twitter.com/account/verifyCredentials.json';
+
         $data = get_twitter_data($uri, $screen_name, $password);
 
         if (!$data) {
@@ -354,7 +472,7 @@ class TwittersettingsAction extends SettingsAction
             return false;
         }
 
-         $twitter_id = $user->id;
+        $twitter_id = $user->id;
 
         if ($twitter_id) {
             return $twitter_id;
@@ -363,5 +481,4 @@ class TwittersettingsAction extends SettingsAction
         return false;
     }
 
-
 }
\ No newline at end of file

From d1b5233eacd0afb19a72651eaaa34027f3735d8c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 21:39:39 +0000
Subject: [PATCH 129/256] Update IM settings to new system

---
 actions/imsettings.php | 269 +++++++++++++++++++++++++++++++----------
 1 file changed, 202 insertions(+), 67 deletions(-)

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 14df3451a8..3e578b307d 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Settings for Jabber/XMPP integration
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,29 +18,77 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
-require_once(INSTALLDIR.'/lib/jabber.php');
+require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/jabber.php';
+
+/**
+ * Settings for Jabber/XMPP integration
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      SettingsAction
+ */
 
 class ImsettingsAction extends SettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
     {
-        return _('You can send and receive notices through Jabber/GTalk [instant messages](%%doc.im%%). Configure your address and settings below.');
+        return _('IM Settings');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('You can send and receive notices through '.
+                 'Jabber/GTalk [instant messages](%%doc.im%%). '.
+                 'Configure your address and settings below.');
+    }
+
+    /**
+     * Content area of the page
+     *
+     * We make different sections of the form for the different kinds of
+     * functions, and have submit buttons with different names. These
+     * are muxed by handlePost() to see what the user really wants to do.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
         $user = common_current_user();
-        $this->form_header(_('IM Settings'), $msg, $success);
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'imsettings',
-                                           'action' =>
-                                           common_local_url('imsettings')));
+                                          'id' => 'imsettings',
+                                          'action' =>
+                                          common_local_url('imsettings')));
         $this->hidden('token', common_session_token());
 
         $this->element('h2', null, _('Address'));
@@ -51,19 +102,27 @@ class ImsettingsAction extends SettingsAction
             $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
-            $confirm = $this->get_confirmation();
+            $confirm = $this->getConfirmation();
             if ($confirm) {
                 $this->elementStart('p');
                 $this->element('span', 'address unconfirmed', $confirm->address);
                 $this->element('span', 'input_instructions',
-                                sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
+                               sprintf(_('Awaiting confirmation on this address. '.
+                                         'Check your Jabber/GTalk account for a '.
+                                         'message with further instructions. '.
+                                         '(Did you add %s to your buddy list?)'),
+                                       jabber_daemon_address()));
                 $this->hidden('jabber', $confirm->address);
                 $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
             } else {
                 $this->input('jabber', _('IM Address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
-                         sprintf(_('Jabber or GTalk address, like "UserName@example.org". First, make sure to add %s to your buddy list in your IM client or on GTalk.'), jabber_daemon_address()));
+                             sprintf(_('Jabber or GTalk address, '.
+                                       'like "UserName@example.org". '.
+                                       'First, make sure to add %s to your '.
+                                       'buddy list in your IM client or on GTalk.'),
+                                     jabber_daemon_address()));
                 $this->submit('add', _('Add'));
             }
         }
@@ -77,7 +136,8 @@ class ImsettingsAction extends SettingsAction
                         _('Post a notice when my Jabber/GTalk status changes.'),
                         $user->updatefrompresence);
         $this->checkbox('jabberreplies',
-                        _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
+                        _('Send me replies through Jabber/GTalk '.
+                          'from people I\'m not subscribed to.'),
                         $user->jabberreplies);
         $this->checkbox('jabbermicroid',
                         _('Publish a MicroID for my Jabber/GTalk address.'),
@@ -85,15 +145,23 @@ class ImsettingsAction extends SettingsAction
         $this->submit('save', _('Save'));
 
         $this->elementEnd('form');
-        common_show_footer();
     }
 
-    function get_confirmation()
+    /**
+     * Get a confirmation code for this user
+     *
+     * @return Confirm_address address object for this user
+     */
+
+    function getConfirmation()
     {
         $user = common_current_user();
+
         $confirm = new Confirm_address();
-        $confirm->user_id = $user->id;
+
+        $confirm->user_id      = $user->id;
         $confirm->address_type = 'jabber';
+
         if ($confirm->find(true)) {
             return $confirm;
         } else {
@@ -101,49 +169,69 @@ class ImsettingsAction extends SettingsAction
         }
     }
 
-    function handle_post()
-    {
+    /**
+     * Handle posts to this form
+     *
+     * Based on the button that was pressed, muxes out to other functions
+     * to do the actual task requested.
+     *
+     * All sub-functions reload the form with a message -- success or failure.
+     *
+     * @return void
+     */
 
-        # CSRF protection
+    function handlePost()
+    {
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
         if ($this->arg('save')) {
-            $this->save_preferences();
+            $this->savePreferences();
         } else if ($this->arg('add')) {
-            $this->add_address();
+            $this->addAddress();
         } else if ($this->arg('cancel')) {
-            $this->cancel_confirmation();
+            $this->cancelConfirmation();
         } else if ($this->arg('remove')) {
-            $this->remove_address();
+            $this->removeAddress();
         } else {
-            $this->show_form(_('Unexpected form submission.'));
+            $this->showForm(_('Unexpected form submission.'));
         }
     }
 
-    function save_preferences()
+    /**
+     * Save user's Jabber preferences
+     *
+     * These are the checkboxes at the bottom of the page. They're used to
+     * set different settings
+     *
+     * @return void
+     */
+
+    function savePreferences()
     {
 
-        $jabbernotify = $this->boolean('jabbernotify');
+        $jabbernotify       = $this->boolean('jabbernotify');
         $updatefrompresence = $this->boolean('updatefrompresence');
-        $jabberreplies = $this->boolean('jabberreplies');
-        $jabbermicroid = $this->boolean('jabbermicroid');
+        $jabberreplies      = $this->boolean('jabberreplies');
+        $jabbermicroid      = $this->boolean('jabbermicroid');
 
         $user = common_current_user();
 
-        assert(!is_null($user)); # should already be checked
+        assert(!is_null($user)); // should already be checked
 
         $user->query('BEGIN');
 
         $original = clone($user);
 
-        $user->jabbernotify = $jabbernotify;
+        $user->jabbernotify       = $jabbernotify;
         $user->updatefrompresence = $updatefrompresence;
-        $user->jabberreplies = $jabberreplies;
-        $user->jabbermicroid = $jabbermicroid;
+        $user->jabberreplies      = $jabberreplies;
+        $user->jabbermicroid      = $jabbermicroid;
 
         $result = $user->update($original);
 
@@ -155,45 +243,54 @@ class ImsettingsAction extends SettingsAction
 
         $user->query('COMMIT');
 
-        $this->show_form(_('Preferences saved.'), true);
+        $this->showForm(_('Preferences saved.'), true);
     }
 
-    function add_address()
-    {
+    /**
+     * Sends a confirmation to the address given
+     *
+     * Stores a confirmation record and sends out a
+     * Jabber message with the confirmation info.
+     *
+     * @return void
+     */
 
+    function addAddress()
+    {
         $user = common_current_user();
 
         $jabber = $this->trimmed('jabber');
 
-        # Some validation
+        // Some validation
 
         if (!$jabber) {
-            $this->show_form(_('No Jabber ID.'));
+            $this->showForm(_('No Jabber ID.'));
             return;
         }
 
         $jabber = jabber_normalize_jid($jabber);
 
         if (!$jabber) {
-            $this->show_form(_('Cannot normalize that Jabber ID'));
+            $this->showForm(_('Cannot normalize that Jabber ID'));
             return;
         }
         if (!jabber_valid_base_jid($jabber)) {
-            $this->show_form(_('Not a valid Jabber ID'));
+            $this->showForm(_('Not a valid Jabber ID'));
             return;
         } else if ($user->jabber == $jabber) {
-            $this->show_form(_('That is already your Jabber ID.'));
+            $this->showForm(_('That is already your Jabber ID.'));
             return;
-        } else if ($this->jabber_exists($jabber)) {
-            $this->show_form(_('Jabber ID already belongs to another user.'));
+        } else if ($this->jabberExists($jabber)) {
+            $this->showForm(_('Jabber ID already belongs to another user.'));
             return;
         }
 
-          $confirm = new Confirm_address();
-           $confirm->address = $jabber;
-           $confirm->address_type = 'jabber';
-           $confirm->user_id = $user->id;
-           $confirm->code = common_confirmation_code(64);
+        $confirm = new Confirm_address();
+
+        $confirm->address      = $jabber;
+        $confirm->address_type = 'jabber';
+        $confirm->user_id      = $user->id;
+        $confirm->code         = common_confirmation_code(64);
 
         $result = $confirm->insert();
 
@@ -209,21 +306,35 @@ class ImsettingsAction extends SettingsAction
                                    $jabber);
         }
 
-        $msg = sprintf(_('A confirmation code was sent to the IM address you added. You must approve %s for sending messages to you.'), jabber_daemon_address());
+        $msg = sprintf(_('A confirmation code was sent '.
+                         'to the IM address you added. '.
+                         'You must approve %s for '.
+                         'sending messages to you.'),
+                       jabber_daemon_address());
 
-        $this->show_form($msg, true);
+        $this->showForm($msg, true);
     }
 
-    function cancel_confirmation()
+    /**
+     * Cancel a confirmation
+     *
+     * If a confirmation exists, cancel it.
+     *
+     * @return void
+     */
+
+    function cancelConfirmation()
     {
         $jabber = $this->arg('jabber');
-        $confirm = $this->get_confirmation();
+
+        $confirm = $this->getConfirmation();
+
         if (!$confirm) {
-            $this->show_form(_('No pending confirmation to cancel.'));
+            $this->showForm(_('No pending confirmation to cancel.'));
             return;
         }
         if ($confirm->address != $jabber) {
-            $this->show_form(_('That is the wrong IM address.'));
+            $this->showForm(_('That is the wrong IM address.'));
             return;
         }
 
@@ -235,26 +346,38 @@ class ImsettingsAction extends SettingsAction
             return;
         }
 
-        $this->show_form(_('Confirmation cancelled.'), true);
+        $this->showForm(_('Confirmation cancelled.'), true);
     }
 
-    function remove_address()
-    {
+    /**
+     * Remove an address
+     *
+     * If the user has a confirmed address, remove it.
+     *
+     * @return void
+     */
 
+    function removeAddress()
+    {
         $user = common_current_user();
+
         $jabber = $this->arg('jabber');
 
-        # Maybe an old tab open...?
+        // Maybe an old tab open...?
 
         if ($user->jabber != $jabber) {
-            $this->show_form(_('That is not your Jabber ID.'));
+            $this->showForm(_('That is not your Jabber ID.'));
             return;
         }
 
         $user->query('BEGIN');
+
         $original = clone($user);
+
         $user->jabber = null;
+
         $result = $user->updateKeys($original);
+
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             $this->serverError(_('Couldn\'t update user.'));
@@ -262,15 +385,27 @@ class ImsettingsAction extends SettingsAction
         }
         $user->query('COMMIT');
 
-        # XXX: unsubscribe to the old address
+        // XXX: unsubscribe to the old address
 
-        $this->show_form(_('The address was removed.'), true);
+        $this->showForm(_('The address was removed.'), true);
     }
 
-    function jabber_exists($jabber)
+    /**
+     * Does this Jabber ID exist?
+     *
+     * Checks if we already have another user with this address.
+     *
+     * @param string $jabber Address to check
+     *
+     * @return boolean whether the Jabber ID exists
+     */
+
+    function jabberExists($jabber)
     {
         $user = common_current_user();
+
         $other = User::staticGet('jabber', $jabber);
+
         if (!$other) {
             return false;
         } else {

From 1b7b58192bd34f7d34ae6712ac1b09130bca6bd0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 22:29:13 +0000
Subject: [PATCH 130/256] Split avatar upload to its own page

---
 actions/avatarsettings.php | 306 +++++++++++++++++++++++++++++++++++++
 htaccess.sample            |   3 +-
 2 files changed, 308 insertions(+), 1 deletion(-)
 create mode 100644 actions/avatarsettings.php

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
new file mode 100644
index 0000000000..de5473d9f4
--- /dev/null
+++ b/actions/avatarsettings.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Upload an avatar
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/settingsaction.php';
+
+/**
+ * Upload an avatar
+ *
+ * We use jQuery to crop the image after upload.
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class AvatarsettingsAction extends SettingsAction
+{
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+
+    function title()
+    {
+        return _('Avatar');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('Set your personal avatar.');
+    }
+
+    /**
+     * Content area of the page
+     *
+     * Shows a form for uploading an avatar.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $user = common_current_user();
+
+        $profile = $user->getProfile();
+
+        if (!$profile) {
+            common_log_db_error($user, 'SELECT', __FILE__);
+            $this->serverError(_('User without matching profile'));
+            return;
+        }
+
+        $original = $profile->getOriginalAvatar();
+
+        $this->elementStart('form', array('enctype' => 'multipart/form-data',
+                                          'method' => 'POST',
+                                          'id' => 'avatar',
+                                          'action' =>
+                                          common_local_url('avatarsettings')));
+        $this->hidden('token', common_session_token());
+
+        if ($original) {
+            $this->elementStart('div',
+                                array('id' => 'avatar_original',
+                                      'class' => 'avatar_view'));
+            $this->element('h3', null, _("Original:"));
+            $this->elementStart('div', array('id'=>'avatar_original_view'));
+            $this->element('img', array('src' => $original->url,
+                                        'class' => 'avatar original',
+                                        'width' => $original->width,
+                                        'height' => $original->height,
+                                        'alt' => $user->nickname));
+            $this->elementEnd('div');
+            $this->elementEnd('div');
+        }
+
+        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+
+        if ($avatar) {
+            $this->elementStart('div',
+                                array('id' => 'avatar_preview',
+                                      'class' => 'avatar_view'));
+            $this->element('h3', null, _("Preview:"));
+            $this->elementStart('div', array('id'=>'avatar_preview_view'));
+            $this->element('img', array('src' => $original->url,//$avatar->url,
+                                        'class' => 'avatar profile',
+                                        'width' => AVATAR_PROFILE_SIZE,
+                                        'height' => AVATAR_PROFILE_SIZE,
+                                        'alt' => $user->nickname));
+            $this->elementEnd('div');
+            $this->elementEnd('div');
+
+            foreach (array('avatar_crop_x', 'avatar_crop_y',
+                           'avatar_crop_w', 'avatar_crop_h') as $crop_info) {
+                $this->element('input', array('name' => $crop_info,
+                                              'type' => 'hidden',
+                                              'id' => $crop_info));
+            }
+            $this->submit('crop', _('Crop'));
+        }
+
+        $this->element('input', array('name' => 'MAX_FILE_SIZE',
+                                      'type' => 'hidden',
+                                      'id' => 'MAX_FILE_SIZE',
+                                      'value' => MAX_AVATAR_SIZE));
+
+        $this->elementStart('p');
+
+        $this->element('input', array('name' => 'avatarfile',
+                                      'type' => 'file',
+                                      'id' => 'avatarfile'));
+        $this->elementEnd('p');
+
+        $this->submit('upload', _('Upload'));
+        $this->elementEnd('form');
+
+    }
+
+    /**
+     * Handle a post
+     *
+     * We mux on the button name to figure out what the user actually wanted.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->show_form(_('There was a problem with your session token. '.
+                               'Try again, please.'));
+            return;
+        }
+
+        if ($this->arg('upload')) {
+            $this->uploadAvatar();
+        } else if ($this->arg('crop')) {
+            $this->cropAvatar();
+        } else {
+            $this->showForm(_('Unexpected form submission.'));
+        }
+    }
+
+    /**
+     * Handle an image upload
+     *
+     * Does all the magic for handling an image upload, and crops the
+     * image by default.
+     *
+     * @return void
+     */
+
+    function uploadAvatar()
+    {
+        switch ($_FILES['avatarfile']['error']) {
+        case UPLOAD_ERR_OK: // success, jump out
+            break;
+        case UPLOAD_ERR_INI_SIZE:
+        case UPLOAD_ERR_FORM_SIZE:
+            $this->showForm(_('That file is too big.'));
+            return;
+        case UPLOAD_ERR_PARTIAL:
+            @unlink($_FILES['avatarfile']['tmp_name']);
+            $this->showForm(_('Partial upload.'));
+            return;
+        default:
+            $this->showForm(_('System error uploading file.'));
+            return;
+        }
+
+        $info = @getimagesize($_FILES['avatarfile']['tmp_name']);
+
+        if (!$info) {
+            @unlink($_FILES['avatarfile']['tmp_name']);
+            $this->showForm(_('Not an image or corrupt file.'));
+            return;
+        }
+
+        switch ($info[2]) {
+        case IMAGETYPE_GIF:
+        case IMAGETYPE_JPEG:
+        case IMAGETYPE_PNG:
+            break;
+        default:
+            $this->showForm(_('Unsupported image file format.'));
+            return;
+        }
+
+        $user = common_current_user();
+
+        $profile = $user->getProfile();
+
+        if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
+            $this->showForm(_('Avatar updated.'), true);
+        } else {
+            $this->showForm(_('Failed updating avatar.'));
+        }
+
+        @unlink($_FILES['avatarfile']['tmp_name']);
+    }
+
+    /**
+     * Handle the results of jcrop.
+     *
+     * @return void
+     */
+
+    function cropAvatar()
+    {
+        $user = common_current_user();
+
+        $profile = $user->getProfile();
+
+        $x = $this->arg('avatar_crop_x');
+        $y = $this->arg('avatar_crop_y');
+        $w = $this->arg('avatar_crop_w');
+        $h = $this->arg('avatar_crop_h');
+
+        if ($profile->crop_avatars($x, $y, $w, $h)) {
+            $this->showForm(_('Avatar updated.'), true);
+        } else {
+            $this->showForm(_('Failed updating avatar.'));
+        }
+    }
+
+    /**
+     * Add the jCrop stylesheet
+     *
+     * @return void
+     */
+
+    function showStylesheets()
+    {
+        parent::showStylesheets();
+        $jcropStyle =
+          common_path('js/jcrop/jquery.Jcrop.css?version='.LACONICA_VERSION);
+
+        $this->element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => $jcropStyle,
+                                     'media' => 'screen, projection, tv'));
+    }
+
+    /**
+     * Add the jCrop scripts
+     *
+     * @return void
+     */
+
+    function showScripts()
+    {
+        parent::showScripts();
+
+        $jcropPack = common_path('js/jcrop/jquery.Jcrop.pack.js');
+        $jcropGo   = common_path('js/jcrop/jquery.Jcrop.go.js');
+
+        $this->element('script', array('type' => 'text/javascript',
+                                       'src' => $jcropPack));
+        $this->element('script', array('type' => 'text/javascript',
+                                       'src' => $jcropGo));
+    }
+}
diff --git a/htaccess.sample b/htaccess.sample
index e348635a86..10e51b5b06 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -52,8 +52,9 @@ RewriteRule ^main/tagother$ index.php?action=tagother [L,QSA]
 
 RewriteRule ^main/block$ index.php?action=block [L,QSA]
 
-RewriteRule ^settings/delete$ index.php?action=deleteprofile [L,QSA]
 RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
+RewriteRule ^settings/avatar$ index.php?action=avatarsettings [L,QSA]
+RewriteRule ^settings/password$ index.php?action=passwordsettings [L,QSA]
 RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
 RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]
 RewriteRule ^settings/email$ index.php?action=emailsettings [L,QSA]

From b7dd4d2ad1e93771cdff11198e7fdf81ca8633de Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 23:13:22 +0000
Subject: [PATCH 131/256] Fix to put @class current on the navigation of the
 page viewed

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index 5ff536dab2..fce9df4da7 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -566,7 +566,7 @@ class Action extends HTMLOutputter // lawsuit
             $lattrs['class'] = 'current';
         }
 
-        $this->elementStart('li', (is_null($id)) ? null : array('id' => $id),  $lattrs);
+        $this->elementStart('li', (is_null($id)) ? $lattrs : array_merge(array('id' => $id), $lattrs));
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;

From 9881932d0734f515dc03e71551cfa7d04472f9a9 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 23:23:02 +0000
Subject: [PATCH 132/256] Minor

---
 lib/action.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index fce9df4da7..1622047c0c 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -565,8 +565,8 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-
-        $this->elementStart('li', (is_null($id)) ? $lattrs : array_merge(array('id' => $id), $lattrs));
+        (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
+        $this->elementStart('li', $lattrs);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;

From f46fd284e4395a113cdcc6e019d6f1b4b9ef8ff6 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 23:41:46 +0000
Subject: [PATCH 133/256] Update to forms and email settings

---
 actions/emailsettings.php  | 50 +++++++++++++++++++++++++++-----------
 lib/htmloutputter.php      | 21 ++++------------
 lib/settingsgroupnav.php   |  4 +--
 theme/base/css/display.css |  9 ++++++-
 4 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4cd63a9d3b..d03d5ff842 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -85,42 +85,46 @@ class EmailsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'emailsettings',
+                                          'id' => 'form_settings_email',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Email settings'));
         $this->hidden('token', common_session_token());
 
+        $this->elementStart('div', array('id' => 'settings_email_address'));
         $this->element('h2', null, _('Address'));
 
         if ($user->email) {
-            $this->elementStart('p');
-            $this->element('span', 'address confirmed', $user->email);
-            $this->element('span', 'input_instructions',
-                           _('Current confirmed email address.'));
+            $this->element('p', array('id' => 'email_confirmed', $user->email));
+            $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
             $this->hidden('email', $user->email);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed', $confirm->address);
-                $this->element('span', 'input_instructions',
-                               _('Awaiting confirmation on this address. '.
-                                 'Check your inbox (and spam box!) for a message '.
-                                 'with further instructions.'));
+                $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
+                $this->element('p', array('class' => 'form_note'), 
+                                        _('Awaiting confirmation on this address. '.
+                                        'Check your inbox (and spam box!) for a message '.
+                                        'with further instructions.'));
                 $this->hidden('email', $confirm->address);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
             } else {
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('email', _('Email Address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
                              _('Email address, like "UserName@example.org"'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('add', _('Add'));
             }
         }
+        $this->elementEnd('div');
 
+        $this->elementStart('div', array('id' => 'settings_email_incoming'));
         if ($user->email) {
             $this->element('h2', null, _('Incoming email'));
 
@@ -140,31 +144,49 @@ class EmailsettingsAction extends SettingsAction
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
+        $this->elementEnd('div');
 
+        $this->elementStart('div', array('id' => 'settings_email_preferences'));
         $this->element('h2', null, _('Preferences'));
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
                         $user->emailnotifysub);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifyfav',
                         _('Send me email when someone '.
                           'adds my notice as a favorite.'),
                         $user->emailnotifyfav);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifymsg',
                         _('Send me email when someone sends me a private message.'),
                         $user->emailnotifymsg);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifynudge',
                         _('Allow friends to nudge me and send me an email.'),
                         $user->emailnotifynudge);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailpost',
                         _('I want to post notices by email.'),
                         $user->emailpost);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailmicroid',
                         _('Publish a MicroID for my email address.'),
                         $user->emailmicroid);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('div');
 
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index eb8a612e4f..37853f345f 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -155,20 +155,17 @@ class HTMLOutputter extends XMLOutputter
 
     function input($id, $label, $value=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'text',
-                       'class' => 'input_text',
                        'id' => $id);
         if ($value) {
             $attrs['value'] = htmlspecialchars($value);
         }
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -192,7 +189,6 @@ class HTMLOutputter extends XMLOutputter
     function checkbox($id, $label, $checked=false, $instructions=null,
                       $value='true', $disabled=false)
     {
-        $this->elementStart('p');
         $attrs = array('name' => $id,
                        'type' => 'checkbox',
                        'class' => 'checkbox',
@@ -213,9 +209,8 @@ class HTMLOutputter extends XMLOutputter
                        $label);
         $this->text(' ');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -240,7 +235,6 @@ class HTMLOutputter extends XMLOutputter
     function dropdown($id, $label, $content, $instructions=null,
                       $blank_select=false, $selected=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->elementStart('select', array('id' => $id, 'name' => $id));
         if ($blank_select) {
@@ -257,9 +251,8 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->elementEnd('select');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -296,7 +289,6 @@ class HTMLOutputter extends XMLOutputter
 
     function password($id, $label, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'password',
@@ -304,9 +296,8 @@ class HTMLOutputter extends XMLOutputter
                        'id' => $id);
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -348,7 +339,6 @@ class HTMLOutputter extends XMLOutputter
 
     function textarea($id, $label, $content=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->element('textarea', array('rows' => 3,
                                          'cols' => 40,
@@ -356,8 +346,7 @@ class HTMLOutputter extends XMLOutputter
                                          'id' => $id),
                        ($content) ? $content : '');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 }
diff --git a/lib/settingsgroupnav.php b/lib/settingsgroupnav.php
index 044c74552a..bd66c65a65 100644
--- a/lib/settingsgroupnav.php
+++ b/lib/settingsgroupnav.php
@@ -94,7 +94,7 @@ class SettingsGroupNav extends Widget
                       _('Other options')));
         
         $action_name = $this->action->trimmed('action');
-        $this->action->elementStart('ul', array('id' => 'nav_views'));
+        $this->action->elementStart('ul', array('class' => 'nav'));
 	
         foreach ($menu as $menuaction => $menudesc) {
             if ($menuaction == 'imsettings' &&
@@ -104,7 +104,7 @@ class SettingsGroupNav extends Widget
             $this->action->menuItem(common_local_url($menuaction),
 				    $menudesc[0],
 				    $menudesc[1],
-				    $action_name == $menuaction);
+				    $action_name === $menuaction);
         }
 	
         $this->action->elementEnd('ul');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b8b260266c..027cb16662 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -100,7 +100,7 @@ border:0;
 display:none;
 }
 .form_settings .form_datas label {
-display:block;
+
 }
 
 .form_guide {
@@ -116,6 +116,13 @@ display:inline;
 font-weight:bold;
 }
 
+.form_settings p {
+margin-bottom:18px;
+}
+
+#settings_email_address {
+margin-bottom:29px;
+}
 
 
 /* FORM SETTINGS */

From 0a5125675b4165be4c8278edf8d30f33483081fa Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:01:53 +0000
Subject: [PATCH 134/256] Updates to form styling

---
 actions/emailsettings.php  | 28 ++++++++++++----------------
 lib/htmloutputter.php      |  2 +-
 theme/base/css/display.css | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index d03d5ff842..090df30dd2 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -89,12 +89,10 @@ class EmailsettingsAction extends SettingsAction
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-        $this->elementStart('fieldset');
-        $this->element('legend', null, _('Email settings'));
-        $this->hidden('token', common_session_token());
 
-        $this->elementStart('div', array('id' => 'settings_email_address'));
-        $this->element('h2', null, _('Address'));
+        $this->elementStart('fieldset',array('id' => 'settings_email_address'));
+        $this->element('legend', null, _('Address'));
+        $this->hidden('token', common_session_token());
 
         if ($user->email) {
             $this->element('p', array('id' => 'email_confirmed', $user->email));
@@ -122,12 +120,11 @@ class EmailsettingsAction extends SettingsAction
                 $this->submit('add', _('Add'));
             }
         }
-        $this->elementEnd('div');
-
-        $this->elementStart('div', array('id' => 'settings_email_incoming'));
-        if ($user->email) {
-            $this->element('h2', null, _('Incoming email'));
+        $this->elementEnd('fieldset');
 
+       if ($user->email) {
+            $this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
+            $this->element('legend',_('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -143,11 +140,12 @@ class EmailsettingsAction extends SettingsAction
                              'cancels the old one.'));
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
+            $this->elementEnd('fieldset');
         }
-        $this->elementEnd('div');
 
-        $this->elementStart('div', array('id' => 'settings_email_preferences'));
-        $this->element('h2', null, _('Preferences'));
+
+        $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
+        $this->element('legend', null, _('Preferences'));
 
         $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
@@ -182,11 +180,9 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailmicroid);
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->elementEnd('div');
+        $this->elementEnd('fieldset');
 
         $this->submit('save', _('Save'));
-
-        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 37853f345f..71f17604ba 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -204,7 +204,7 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->element('input', $attrs);
         $this->text(' ');
-        $this->element('label', array('class' => 'checkbox_label',
+        $this->element('label', array('class' => 'checkbox',
                                       'for' => $id),
                        $label);
         $this->text(' ');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 027cb16662..294119c550 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -64,6 +64,13 @@ font-weight:bold;
 }
 form ul li input {
 }
+
+form input.checkbox {
+position:relative;
+top:2px;
+left:0;
+}
+
 form .error {
 margin-right:11px;
 }
@@ -97,7 +104,8 @@ padding:0;
 border:0;
 }
 .form_settings legend {
-display:none;
+font-size:1.6em;
+text-transform:uppercase;
 }
 .form_settings .form_datas label {
 
@@ -124,6 +132,9 @@ margin-bottom:18px;
 margin-bottom:29px;
 }
 
+#settings_email_preferences label {
+font-weight:normal;
+}
 
 /* FORM SETTINGS */
 

From 2561199e59ce6c4f4390443bda6d17d709ce1e36 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:06:31 +0000
Subject: [PATCH 135/256] OpenID form settings markup

---
 actions/openidsettings.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index a21a9869e3..f24c817954 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -85,26 +85,31 @@ class OpenidsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'openidadd',
+                                          'id' => 'form_openid_add',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('openidsettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Add OpenID'));
         $this->hidden('token', common_session_token());
-        $this->element('h2', null, _('Add OpenID'));
-        $this->element('p', null,
+        $this->element('p', 'form_guide',
                        _('If you want to add an OpenID to your account, ' .
                          'enter it in the box below and click "Add".'));
-        $this->elementStart('p');
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
         $this->element('input', array('name' => 'openid_url',
                                       'type' => 'text',
                                       'id' => 'openid_url'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->element('input', array('type' => 'submit',
                                       'id' => 'add',
                                       'name' => 'add',
                                       'class' => 'submit',
                                       'value' => _('Add')));
-        $this->elementEnd('p');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
 
         $oid = new User_openid();

From b9fb70ee70ecd465f5843241b308f2b8680120f6 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:46:33 +0000
Subject: [PATCH 136/256] Markup clean up and styles

---
 actions/emailsettings.php  |  7 +++----
 actions/openidsettings.php | 15 ++++++++-------
 lib/action.php             |  3 +--
 theme/base/css/display.css |  4 ++++
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 090df30dd2..3554708156 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -90,7 +90,7 @@ class EmailsettingsAction extends SettingsAction
                                           'action' =>
                                           common_local_url('emailsettings')));
 
-        $this->elementStart('fieldset',array('id' => 'settings_email_address'));
+        $this->elementStart('fieldset', array('id' => 'settings_email_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
@@ -123,7 +123,7 @@ class EmailsettingsAction extends SettingsAction
         $this->elementEnd('fieldset');
 
        if ($user->email) {
-            $this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
+            $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
             $this->element('legend',_('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
@@ -180,9 +180,8 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailmicroid);
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->elementEnd('fieldset');
-
         $this->submit('save', _('Save'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index f24c817954..6f17f154ca 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -85,11 +85,11 @@ class OpenidsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_openid_add',
+                                          'id' => 'form_settings_openid_add',
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('openidsettings')));
-        $this->elementStart('fieldset');
+        $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
         $this->element('legend', null, _('Add OpenID'));
         $this->hidden('token', common_session_token());
         $this->element('p', 'form_guide',
@@ -105,7 +105,7 @@ class OpenidsettingsAction extends SettingsAction
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->element('input', array('type' => 'submit',
-                                      'id' => 'add',
+                                      'id' => 'settings_openid_add_action-submit',
                                       'name' => 'add',
                                       'class' => 'submit',
                                       'value' => _('Add')));
@@ -139,7 +139,7 @@ class OpenidsettingsAction extends SettingsAction
 
             } else {
 
-                $this->element('p', null,
+                $this->element('p', 'form_guide',
                                _('You can remove an OpenID from your account '.
                                  'by clicking the button marked "Remove".'));
                 $idx = 0;
@@ -147,10 +147,11 @@ class OpenidsettingsAction extends SettingsAction
                 while ($oid->fetch()) {
                     $this->elementStart('form',
                                         array('method' => 'POST',
-                                              'id' => 'openiddelete' . $idx,
+                                              'id' => 'form_settings_openid_delete' . $idx,
+                                              'class' => 'form_settings',
                                               'action' =>
                                               common_local_url('openidsettings')));
-                    $this->elementStart('p');
+                    $this->elementStart('fieldset');
                     $this->hidden('token', common_session_token());
                     $this->element('a', array('href' => $oid->canonical),
                                    $oid->display);
@@ -163,7 +164,7 @@ class OpenidsettingsAction extends SettingsAction
                                                   'name' => 'remove',
                                                   'class' => 'submit',
                                                   'value' => _('Remove')));
-                    $this->elementEnd('p');
+                    $this->elementEnd('fieldset');
                     $this->elementEnd('form');
                     $idx++;
                 }
diff --git a/lib/action.php b/lib/action.php
index 1622047c0c..35f6f2e3ec 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -565,8 +565,7 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
-        $this->elementStart('li', $lattrs);
+        $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 294119c550..3aee52088a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -99,6 +99,10 @@ form input.submit {
 
 
 /* FORM SETTINGS */
+.form_settings {
+margin-bottom:29px;
+}
+
 .form_settings fieldset {
 padding:0;
 border:0;

From 0b947a33bc401faaddcae3bb5b39b9cbe2d5277c Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:49:48 +0000
Subject: [PATCH 137/256] Minor

---
 actions/smssettings.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/actions/smssettings.php b/actions/smssettings.php
index f214997ec6..d7c621b138 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -83,12 +83,14 @@ class SmssettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'smssettings',
+                                          'id' => 'form_settings_sms',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('smssettings')));
 
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
-        $this->element('h2', null, _('Address'));
 
         if ($user->sms) {
             $this->elementStart('p');
@@ -126,6 +128,7 @@ class SmssettingsAction extends SettingsAction
                 $this->submit('add', _('Add'));
             }
         }
+        $this->elementEnd('fieldset');
 
         if ($user->sms) {
             $this->element('h2', null, _('Incoming email'));
@@ -147,8 +150,8 @@ class SmssettingsAction extends SettingsAction
             $this->submit('newincoming', _('New'));
         }
 
-        $this->element('h2', null, _('Preferences'));
-
+        $this->elementStart('fieldset', array('id' => 'sms_preferences'));
+        $this->element('legend', null, _('Preferences'));
         $this->checkbox('smsnotify',
                         _('Send me notices through SMS; '.
                           'I understand I may incur '.
@@ -157,6 +160,7 @@ class SmssettingsAction extends SettingsAction
 
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 

From b2f16c523466f40589712a173a35c1b0bf54ea99 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 01:08:55 +0000
Subject: [PATCH 138/256] SMS form settings

---
 actions/smssettings.php    | 24 +++++++++++++++---------
 theme/base/css/display.css |  7 ++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/actions/smssettings.php b/actions/smssettings.php
index d7c621b138..6d3c549420 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -88,7 +88,7 @@ class SmssettingsAction extends SettingsAction
                                           'action' =>
                                           common_local_url('smssettings')));
 
-        $this->elementStart('fieldset');
+        $this->elementStart('fieldset', array('id' => 'settings_sms_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
@@ -142,21 +142,25 @@ class SmssettingsAction extends SettingsAction
                 $this->submit('removeincoming', _('Remove'));
             }
 
-            $this->elementStart('p');
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Make a new email address for posting to; '.
                              'cancels the old one.'));
-            $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
 
-        $this->elementStart('fieldset', array('id' => 'sms_preferences'));
+        $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
         $this->element('legend', null, _('Preferences'));
+
+
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->checkbox('smsnotify',
                         _('Send me notices through SMS; '.
                           'I understand I may incur '.
                           'exorbitant charges from my carrier.'),
                         $user->smsnotify);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
         $this->submit('save', _('Save'));
 
@@ -440,8 +444,9 @@ class SmssettingsAction extends SettingsAction
 
         $cnt = $carrier->find();
 
-        $this->elementStart('p');
-        $this->element('label', array('for' => 'carrier'));
+        $this->elementStart('ul');
+        $this->elementStart('li');
+        $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
         $this->elementStart('select', array('name' => 'carrier',
                                             'id' => 'carrier'));
         $this->element('option', array('value' => 0),
@@ -451,13 +456,14 @@ class SmssettingsAction extends SettingsAction
                            $carrier->name);
         }
         $this->elementEnd('select');
-        $this->elementEnd('p');
-        $this->element('span', 'input_instructions',
+        $this->element('p', 'form_guide',
                        sprintf(_('Mobile carrier for your phone. '.
                                  'If you know a carrier that accepts ' .
                                  'SMS over email but isn\'t listed here, ' .
                                  'send email to let us know at %s.'),
                                common_config('site', 'email')));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
     }
 
     /**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3aee52088a..fce4c7b86f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -99,13 +99,10 @@ form input.submit {
 
 
 /* FORM SETTINGS */
-.form_settings {
-margin-bottom:29px;
-}
-
 .form_settings fieldset {
 padding:0;
 border:0;
+margin-bottom:29px;
 }
 .form_settings legend {
 font-size:1.6em;
@@ -136,7 +133,7 @@ margin-bottom:18px;
 margin-bottom:29px;
 }
 
-#settings_email_preferences label {
+.form_settings label.checkbox {
 font-weight:normal;
 }
 

From 3e40a564bd7f727d2c967b6f70acc14d4b801d97 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 01:50:21 +0000
Subject: [PATCH 139/256] twitter settings markup

---
 actions/twittersettings.php | 39 ++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 5492dd9958..cd070cb450 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -97,58 +97,71 @@ class TwittersettingsAction extends SettingsAction
         }
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'twittersettings',
+                                          'id' => 'form_settings_twitter',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('twittersettings')));
+        $this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
+        $this->element('legend', null, _('Twitter Account'));
         $this->hidden('token', common_session_token());
-
-        $this->element('h2', null, _('Twitter Account'));
-
+        $this->elementStart('ul', 'form_datas');
         if ($fuser) {
-            $this->elementStart('p');
-
+            $this->elementStart('li');
             $this->element('span', 'twitter_user', $fuser->nickname);
             $this->element('a', array('href' => $fuser->uri), $fuser->uri);
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
+            $this->elementEnd('li');
         } else {
+            $this->elementStart('li');
             $this->input('twitter_username', _('Twitter user name'),
                          ($this->arg('twitter_username')) ?
                          $this->arg('twitter_username') :
                          $profile->nickname,
                          _('No spaces, please.')); // hey, it's what Twitter says
-
+            $this->elementEnd('li');
+            $this->elementStart('li');
             $this->password('twitter_password', _('Twitter password'));
+            $this->elementend('li');
         }
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
 
-        $this->element('h2', null, _('Preferences'));
+        $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences'));
+        $this->element('legend', null, _('Preferences'));
 
+        $this->elementStart('ul');
+        $this->elementStart('li');
         $this->checkbox('noticesync',
                         _('Automatically send my notices to Twitter.'),
                         ($flink) ?
                         ($flink->noticesync & FOREIGN_NOTICE_SEND) :
                         true);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('replysync',
                         _('Send local "@" replies to Twitter.'),
                         ($flink) ?
                         ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) :
                         true);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('friendsync',
                         _('Subscribe to my Twitter friends here.'),
                         ($flink) ?
                         ($flink->friendsync & FOREIGN_FRIEND_RECV) :
                         false);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
         if ($flink) {
             $this->submit('save', _('Save'));
         } else {
             $this->submit('add', _('Add'));
         }
+        $this->elementEnd('fieldset');
 
         $this->showTwitterSubscriptions();
 
@@ -481,4 +494,4 @@ class TwittersettingsAction extends SettingsAction
         return false;
     }
 
-}
\ No newline at end of file
+}

From 996eb1da4ea043360dbc7accf9254537d59c7df5 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 02:13:02 +0000
Subject: [PATCH 140/256] site nav local views styles -- rgba background color

---
 theme/base/css/display.css     | 3 ++-
 theme/identica/css/display.css | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fce4c7b86f..fb7e71acd4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -219,8 +219,9 @@ padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
 border-width:1px;
-border-style:dashed;
+border-style:solid;
 border-bottom:0;
+font-weight:bold;
 }
 #site_nav_local_views .nav {
 float:left;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index c2eb4ef655..aed4f95e50 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -59,6 +59,10 @@ background-color:transparent;
 
 #site_nav_local_views a {
 border-color:#fff;
+background-color:rgba(255, 255, 255, 0.2);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);:
 }
 
 /*

From 607e65be81d6b42990706884f96fa024301c7893 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 02:32:13 +0000
Subject: [PATCH 141/256] Delete notice markup and styles

---
 lib/noticelist.php             | 14 ++++++++------
 theme/base/css/display.css     | 17 +++++++++--------
 theme/identica/css/display.css |  6 +++---
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index fde93a3b66..1283e43e4a 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -438,7 +438,7 @@ class NoticeListItem extends Widget
         $reply_url = common_local_url('newnotice',
                                       array('replyto' => $this->profile->nickname));
 
-        $this->out->elementStart('dl', 'reply');
+        $this->out->elementStart('dl', 'notice_reply');
         $this->out->element('dt', null, _('Reply to this notice'));
         $this->out->elementStart('dd');
         $this->out->element('a', array('href' => $reply_url,
@@ -459,11 +459,13 @@ class NoticeListItem extends Widget
         if ($user && $this->notice->profile_id == $user->id) {
             $deleteurl = common_local_url('deletenotice',
                                           array('notice' => $this->notice->id));
-            $this->out->elementStart('a', array('class' => 'deletenotice',
-                                            'href' => $deleteurl,
-                                            'title' => _('delete')));
-            $this->out->raw(' &#215;');
-            $this->out->elementEnd('a');
+            $this->out->elementStart('dl', 'notice_delete');
+            $this->out->element('dt', null, _('Delete this notice'));
+            $this->out->elementStart('dd');
+            $this->out->element('a', array('href' => $deleteurl,
+                                           'title' => _('delete')), _('Delete'));
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fb7e71acd4..20e66c3519 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -775,25 +775,26 @@ outline:none;
 margin-left:2%;
 float:left;
 }
-.notice-options .reply,
+.notice-options .notice_reply,
 .notice-options .notice_delete ,
 .notice-options .notice_favorite {
 float:left;
 margin-right:11px;
 }
-.notice-options .reply {
+.notice-options .notice_reply {
 margin-top:1px;
 }
-.notice-options .reply dt {
+.notice-options .notice_reply dt {
 display:none;
 }
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;
 border:0;
 }
 
-.notice-options .reply a {
+.notice-options .notice_reply a,
+.notice-options .notice_delete a {
 text-decoration:none;
 padding-left:20px;
 }
@@ -802,7 +803,7 @@ cursor:pointer;
 padding:0 0 0 17px;
 }
 
-.notice-options .notice_delete legend,
+.notice-options .notice_delete dt,
 .notice-options .notice_favorite legend {
 display:none;
 }
@@ -813,8 +814,8 @@ padding:0;
 }
 
 
-.notice-options form.notice_delete {
-margin-left:2em;
+.notice-options .notice_delete {
+margin-left:3em;
 }
 /*END: NOTICES */
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index aed4f95e50..94e97d4148 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -173,17 +173,17 @@ background-image:url(../images/icons/twotone/green/flag.gif);
 background-image:url(../images/icons/twotone/green/document.gif);
 }
 
-.notice-options .reply a,
+.notice-options .notice_reply a,
 .notice-options form input.submit {
 background-color:transparent;
 }
-.notice-options .reply a {
+.notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.notice_favorite input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_delete input.submit {
+.notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 

From ba18deeee52f99067a453c45ce04d72892af985d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 02:57:51 +0000
Subject: [PATCH 142/256] Adding xbImportNode

---
 js/xbImportNode.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 js/xbImportNode.js

diff --git a/js/xbImportNode.js b/js/xbImportNode.js
new file mode 100644
index 0000000000..f600a4789e
--- /dev/null
+++ b/js/xbImportNode.js
@@ -0,0 +1,47 @@
+/* is this stuff defined? */
+if (!document.ELEMENT_NODE) {
+	document.ELEMENT_NODE = 1;
+	document.ATTRIBUTE_NODE = 2;
+	document.TEXT_NODE = 3;
+	document.CDATA_SECTION_NODE = 4;
+	document.ENTITY_REFERENCE_NODE = 5;
+	document.ENTITY_NODE = 6;
+	document.PROCESSING_INSTRUCTION_NODE = 7;
+	document.COMMENT_NODE = 8;
+	document.DOCUMENT_NODE = 9;
+	document.DOCUMENT_TYPE_NODE = 10;
+	document.DOCUMENT_FRAGMENT_NODE = 11;
+	document.NOTATION_NODE = 12;
+}
+
+document._importNode = function(node, allChildren) {
+	/* find the node type to import */
+	switch (node.nodeType) {
+		case document.ELEMENT_NODE:
+			/* create a new element */
+			var newNode = document.createElement(node.nodeName);
+			/* does the node have any attributes to add? */
+			if (node.attributes && node.attributes.length > 0)
+				/* add all of the attributes */
+				for (var i = 0, il = node.attributes.length; i < il;) {
+					if (node.attributes[i].nodeName == 'class') {
+						newNode.className = node.getAttribute(node.attributes[i++].nodeName);
+					} else {
+						newNode.setAttribute(node.attributes[i].nodeName, node.getAttribute(node.attributes[i++].nodeName));
+					}
+				}
+			/* are we going after children too, and does the node have any? */
+			if (allChildren && node.childNodes && node.childNodes.length > 0)
+				/* recursively get all of the child nodes */
+				for (var i = 0, il = node.childNodes.length; i < il;)
+					newNode.appendChild(document._importNode(node.childNodes[i++], allChildren));
+			return newNode;
+			break;
+		case document.TEXT_NODE:
+		case document.CDATA_SECTION_NODE:
+		case document.COMMENT_NODE:
+			return document.createTextNode(node.nodeValue);
+			break;
+	}
+};
+

From 102028fb4813a27957efeb6fdd5bc7bfc46a03f0 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 03:03:53 +0000
Subject: [PATCH 143/256] In reply to @id

---
 js/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/util.js b/js/util.js
index 35d69310bf..6fe4770756 100644
--- a/js/util.js
+++ b/js/util.js
@@ -179,7 +179,7 @@ function doreply(nick,id) {
 		replyto = "@" + nick + " ";
 		if ($("#notice_data-text").length) {
 			$("#notice_data-text").val(replyto);
-			$("form#form_notice input#inreplyto").val(id);
+			$("#form_notice input#notice_in-reply-to").val(id);
 			$("#notice_data-text").focus();
 			return false;
 		}

From 1df4a3831358753c59b996305a54bd2366450079 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 03:09:00 +0000
Subject: [PATCH 144/256] notice vcard url and a:visited style

---
 theme/base/css/display.css     |  4 ++--
 theme/identica/css/display.css | 11 +++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 20e66c3519..ce7f69b358 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -851,12 +851,12 @@ border-bottom:0;
 }
 
 .pagination .nav_prev a {
--moz-border-radius-topright:4px;
+-moz-border-radius-topright:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
--moz-border-radius-topleft:4px;
+-moz-border-radius-topleft:7px;
 padding-right:20px;
 border-right:0;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 94e97d4148..1bb2ca01ba 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -26,6 +26,17 @@ color:#EC008C;
 a {
 color:#002E6E;
 }
+a:active {
+background-color:#ddd;
+}
+.notice p.entry-content a:visited {
+background-color:#fcfcfc;
+-moz-border-radius:4px;
+}
+.notice p.entry-content .vcard a {
+background-color:#fcfffc;
+-moz-border-radius:4px;
+}
 
 
 

From 5a10287bc3e2ee2b2529bd95ce73d22e8c237e22 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 03:15:45 +0000
Subject: [PATCH 145/256] Minor

---
 lib/noticeform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 84817639a7..d6a3aa9c21 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -144,8 +144,8 @@ class NoticeForm extends Form
 
         if ($this->action) {
             $this->out->hidden('notice_return-to', $this->action, 'returnto');
-            $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
         }
+        $this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
     }
 
     /**

From e7687c66b21fec1a2db524842505d229ce896e72 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 06:33:45 +0000
Subject: [PATCH 146/256] Using @id instead of @class for navigation li

---
 lib/action.php           |  5 ++++-
 lib/personalgroupnav.php | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 35f6f2e3ec..71520b84e8 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -565,7 +565,10 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
+
+        (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
+        
+        $this->elementStart('li', $lattrs);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 5d727a5051..63e6138df2 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -91,28 +91,28 @@ class PersonalGroupNav extends Widget
             $user_profile = false;
         }
 
-        $this->out->elementStart('ul', array('id' => 'nav_views'));
+        $this->out->elementStart('ul', array('class' => 'nav'));
 
         $this->out->menuItem(common_local_url('all', array('nickname' =>
                                                        $nickname)),
                          _('Personal'),
                          sprintf(_('%s and friends'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                         $action == 'all');
+                         $action == 'all', 'nav_timeline_personal');
         $this->out->menuItem(common_local_url('replies', array('nickname' =>
                                                               $nickname)),
                          _('Replies'),
                          sprintf(_('Replies to %s'), (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
-                         $action == 'replies');
+                         $action == 'replies', 'nav_timeline_replies');
         $this->out->menuItem(common_local_url('showstream', array('nickname' =>
                                                               $nickname)),
                          _('Profile'),
                          ($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname,
-                         $action == 'showstream');
+                         $action == 'showstream', 'nav_profile');
         $this->out->menuItem(common_local_url('showfavorites', array('nickname' =>
                                                               $nickname)),
                          _('Favorites'),
                          sprintf(_('%s\'s favorite notices'), ($user_profile) ? $user_profile->getBestName() : _('User')),
-                         $action == 'showfavorites');
+                         $action == 'showfavorites', 'nav_timeline_favorites');
 
         $cur = common_current_user();
 

From 05b00cc7df22d2e998d642e91fee6cea317a9b83 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 16:22:36 +0000
Subject: [PATCH 147/256] Login styles

---
 actions/login.php          | 14 +++++++-
 theme/base/css/display.css | 68 +++++++++++++++++---------------------
 2 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 23ab166769..224b30f6fb 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -130,15 +130,27 @@ class LoginAction extends Action
     function showContent()
     {      
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'login',
+                                           'id' => 'form_login',
+                                           'class' => 'form_login',
                                            'action' => common_local_url('login')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Login to site'));
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('password', _('Password'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
                            'not for shared computers!'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('submit', _('Login'));
         $this->hidden('token', common_session_token());
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
         $this->elementStart('p');
         $this->element('a', array('href' => common_local_url('recoverpassword')),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ce7f69b358..afddefd270 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -30,30 +30,38 @@ h1,h2,h3,h4,h5,h6 {
 	text-transform:uppercase;
 	margin-bottom:7px;
 }
-legend { font-weight:bold; }
+caption {
+font-weight:bold;
+}
+.opened { display: block !important;}
+.closed { display: none !important;}
+
+
+legend {
+font-weight:bold; 
+font-size:1.6em;
+text-transform:uppercase;
+}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
 -moz-border-radius:4px;
 }
+input:focus, textarea:focus, select:focus {
+border-width:2px;
+border-style: solid;
+}
+
 select, option {
 padding-bottom:0;
 }
 fieldset {
-padding:11px;
+padding:0;
+border:0;
+margin-bottom:29px;
 }
-input:focus, textarea:focus, select:focus {
-border-width:2px;
-border-style: solid;
--moz-border-radius:4px;
-}
-caption {
-font-weight:bold;
-}
-.opened { display: block !important;}
-.closed { display: none !important;}
-span.required { font-weight:bold; }
+
 form ul li {
 list-style-type:none;
 margin:0 0 18px 0;
@@ -71,8 +79,10 @@ top:2px;
 left:0;
 }
 
-form .error {
-margin-right:11px;
+#page_notice .error {
+background-color:#F7E8E8;
+padding:4px 7px;
+-moz-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -83,15 +93,7 @@ display:block;
 .form_response {
 margin-bottom:18px;
 }
-.form_response dt {
-}
-.form_response dd {
-}
 
-form input.remove,
-form input.submit {
--moz-border-radius:4px;
-}
 form input.submit {
 }
 
@@ -99,24 +101,16 @@ form input.submit {
 
 
 /* FORM SETTINGS */
-.form_settings fieldset {
-padding:0;
-border:0;
-margin-bottom:29px;
-}
-.form_settings legend {
-font-size:1.6em;
-text-transform:uppercase;
-}
-.form_settings .form_datas label {
-
-}
-
 .form_guide {
 font-style:italic;
 }
 
-.form_settings .form_actions label {
+.form_login label,
+.form_settings label {
+margin-right:11px;
+}
+
+.form_actions label {
 display:none;
 }
 

From f28f1108a98cb33404513f760d1a40e9e98d85b9 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 16:42:54 +0000
Subject: [PATCH 148/256] Opacity on notice div.entry-content and
 div.notice-options

---
 theme/base/css/display.css     |  6 ++++--
 theme/identica/css/display.css | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index afddefd270..213f0c0d29 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -59,9 +59,7 @@ padding-bottom:0;
 fieldset {
 padding:0;
 border:0;
-margin-bottom:29px;
 }
-
 form ul li {
 list-style-type:none;
 margin:0 0 18px 0;
@@ -101,6 +99,10 @@ form input.submit {
 
 
 /* FORM SETTINGS */
+.form_settings fieldset {
+margin-bottom:29px;
+}
+
 .form_guide {
 font-style:italic;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 1bb2ca01ba..d1338e709d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -198,16 +198,16 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-.notice-options a,
-.notice-options input {
-opacity:0.1;
+div.entry-content,
+div.notice-options {
+opacity:0.2;
 color:#333;
 }
 .notices li.hover {
 background-color:#fcfcfc;
 }
-.notices li.hover .notice-options a,
-.notices li.hover .notice-options input {
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
 opacity:1;
 }
 

From 6cc3f78cf309a80c72156c673dceac21dde63603 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 20:06:56 +0000
Subject: [PATCH 149/256] Typography update to input and anchors on
 div.entry-content and div.notice-options

---
 theme/base/css/display.css     | 35 +++++++++++++++---------------
 theme/identica/css/display.css | 39 +++++++++++++---------------------
 2 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 213f0c0d29..b0a41cede8 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -42,6 +42,8 @@ font-weight:bold;
 font-size:1.6em;
 text-transform:uppercase;
 }
+form {
+}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
@@ -714,12 +716,15 @@ clear:left;
 float:left;
 width:48%;
 }
-.notice div.entry-content,
+.notice div.entry-content a,
 .notice .notice-options a,
 .notice .notice-options input {
-font-size:0.9em;
-}
 
+}
+.notice .notice-options a,
+.notice .notice-options input {
+float:left;
+}
 
 #laconicat .notice div.entry-content {
 /*margin-left:0;*/
@@ -734,17 +739,16 @@ display:inline;
 .notice div.entry-content .response dt {
 display:none;
 }
-.notice div.entry-content .timestamp {
+.notice div.entry-content .timestamp a {
 
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
 }
 .notice div.entry-content a {
-text-decoration:none;
+
 }
 .notice div.entry-content a:hover {
-text-decoration:underline;
 }
 
 
@@ -765,20 +769,17 @@ display:block;
 outline:none;
 }
 
-
-
 .notice-options {
-margin-left:2%;
+padding-left:2%;
 float:left;
+width:50%;
 }
 .notice-options .notice_reply,
-.notice-options .notice_delete ,
 .notice-options .notice_favorite {
 float:left;
 margin-right:11px;
 }
 .notice-options .notice_reply {
-margin-top:1px;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -788,15 +789,19 @@ display:none;
 display:block;
 border:0;
 }
-
 .notice-options .notice_reply a,
 .notice-options .notice_delete a {
 text-decoration:none;
 padding-left:20px;
 }
+
+.notice-options .notice_delete {
+float:right;
+}
+
 .notice-options form input.submit {
 cursor:pointer;
-padding:0 0 0 17px;
+padding:2px 0 2px 17px;
 }
 
 .notice-options .notice_delete dt,
@@ -809,10 +814,6 @@ border:0;
 padding:0;
 }
 
-
-.notice-options .notice_delete {
-margin-left:3em;
-}
 /*END: NOTICES */
 
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d1338e709d..4af7cf2396 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -1,28 +1,17 @@
 /* theme: identica */
 html {
-	background-color:#ddd;
+background-color:#ddd;
 }
 body {
-	font-family: sans-serif;
-	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
-	font-size:1em;
-
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-size:1em;
 }
 input, textarea, select, option {
-	font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input:focus, textarea:focus, select:focus {
 border-color:#B2D0DD;
 }
-form span.required { color:#f00; }
-form .error {
-background-color:#f00;
-color:#fff;
-}
-form .error_message {
-color:#EC008C;
-}
-
 a {
 color:#002E6E;
 }
@@ -76,13 +65,6 @@ background-color:rgba(255, 255, 255, 0.2);
 background-color:rgba(255, 255, 255, 0.7);:
 }
 
-/*
-#site_nav_global_primary .current a {
-font-weight:bold;
-border-color:#ccc;
-border-style:solid;
-}
-*/
 
 #content,
 #site_nav_local_views .current a {
@@ -154,7 +136,7 @@ color:#555;
 
 /* NOTICES */
 .notice div.entry-content a {
-color:#333;
+
 }
 .notice div.entry-content a:hover {
 }
@@ -201,7 +183,16 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 div.entry-content,
 div.notice-options {
 opacity:0.2;
-color:#333;
+font-family:sans-serif;
+}
+div.entry-content a,
+div.notice-options a,
+div.notice-options input {
+font-family:sans-serif;
+}
+div.notice-options input {
+color:#002E6E;
+
 }
 .notices li.hover {
 background-color:#fcfcfc;

From e93807d0e47266805fcf26738a11f23b5e689d18 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 20:48:09 +0000
Subject: [PATCH 150/256] Removed notice-options text labels :(

---
 theme/base/css/display.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b0a41cede8..15377a7b58 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -784,6 +784,12 @@ margin-right:11px;
 .notice-options .notice_reply dt {
 display:none;
 }
+
+.notice-options input,
+.notice-options a {
+text-indent:-9999px;
+}
+
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;

From 5a81b6d04ea7e2f7c5e5799ada8a611ec9406317 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 20:57:48 +0000
Subject: [PATCH 151/256] Added @title to input submit (reusing $label value
 until we really need to make it custom)

---
 lib/favorform.php     | 4 ++--
 lib/htmloutputter.php | 3 ++-
 lib/noticelist.php    | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/favorform.php b/lib/favorform.php
index 977f191838..519b305b6f 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -111,7 +111,7 @@ class FavorForm extends Form
      */
     function formLegend()
     {
-        $this->out->element('legend', null, _('Delete this notice'));
+        $this->out->element('legend', null, _('Favor this notice'));
     }
 
 
@@ -137,7 +137,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Favorite'));
+                           _('Favor this notice'));
     }
     
     /**
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 71f17604ba..f83998bc27 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -319,7 +319,8 @@ class HTMLOutputter extends XMLOutputter
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
-                                      'value' => $label));
+                                      'value' => $label,
+                                      'title' => $label));
     }
 
     /**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 1283e43e4a..9c433f81a0 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -442,7 +442,7 @@ class NoticeListItem extends Widget
         $this->out->element('dt', null, _('Reply to this notice'));
         $this->out->elementStart('dd');
         $this->out->element('a', array('href' => $reply_url,
-                                       'title' => _('reply')), _('Reply'));
+                                       'title' => _('Reply to this notice')), _('Reply'));
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
     }
@@ -463,7 +463,7 @@ class NoticeListItem extends Widget
             $this->out->element('dt', null, _('Delete this notice'));
             $this->out->elementStart('dd');
             $this->out->element('a', array('href' => $deleteurl,
-                                           'title' => _('delete')), _('Delete'));
+                                           'title' => _('Delete this notice')), _('Delete'));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
         }

From 91475ca33f27be5116268415d80513bba6cfbd13 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 21:09:42 +0000
Subject: [PATCH 152/256] Update. Added separate $title param for input submit

---
 lib/favorform.php     | 2 +-
 lib/htmloutputter.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/favorform.php b/lib/favorform.php
index 519b305b6f..37e13fb1c5 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -137,7 +137,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Favor this notice'));
+                           _('Favor'), 'submit', null, _('Favor this notice'));
     }
     
     /**
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index f83998bc27..1e164933ce 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -313,14 +313,14 @@ class HTMLOutputter extends XMLOutputter
      * @todo add a $name parameter
      */
 
-    function submit($id, $label, $cls='submit', $name=null)
+    function submit($id, $label, $cls='submit', $name=null, $title=null)
     {
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
                                       'value' => $label,
-                                      'title' => $label));
+                                      'title' => $title));
     }
 
     /**

From 97c98cf59ace088e487e130182ff4dc99d2d408b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 17 Jan 2009 22:30:44 +0000
Subject: [PATCH 153/256] Break up settings into two tabset

Made two tabsets: account and connect. Removed "Invite" from
the global nav to make room.
---
 actions/avatarsettings.php                    |   4 +-
 actions/emailsettings.php                     |   7 +-
 actions/imsettings.php                        |   4 +-
 actions/openidsettings.php                    |   4 +-
 actions/othersettings.php                     |   4 +-
 actions/passwordsettings.php                  | 161 ++++++++
 actions/profilesettings.php                   | 382 +++++-------------
 actions/smssettings.php                       |   5 +-
 actions/twittersettings.php                   |   7 +-
 lib/accountsettingsaction.php                 | 134 ++++++
 lib/action.php                                |  82 ++--
 ...groupnav.php => connectsettingsaction.php} |  67 +--
 lib/rssaction.php                             |  97 ++++-
 lib/settingsaction.php                        |  15 -
 lib/util.php                                  |   4 +
 15 files changed, 580 insertions(+), 397 deletions(-)
 create mode 100644 actions/passwordsettings.php
 create mode 100644 lib/accountsettingsaction.php
 rename lib/{settingsgroupnav.php => connectsettingsaction.php} (71%)

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index de5473d9f4..a9b381b0ac 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
 /**
  * Upload an avatar
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @link     http://laconi.ca/
  */
 
-class AvatarsettingsAction extends SettingsAction
+class AvatarsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 3554708156..b1f13c18ca 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
 /**
  * Settings for email
@@ -47,7 +47,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @see      Widget
  */
 
-class EmailsettingsAction extends SettingsAction
+class EmailsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
@@ -103,7 +103,7 @@ class EmailsettingsAction extends SettingsAction
             $confirm = $this->getConfirmation();
             if ($confirm) {
                 $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
-                $this->element('p', array('class' => 'form_note'), 
+                $this->element('p', array('class' => 'form_note'),
                                         _('Awaiting confirmation on this address. '.
                                         'Check your inbox (and spam box!) for a message '.
                                         'with further instructions.'));
@@ -143,7 +143,6 @@ class EmailsettingsAction extends SettingsAction
             $this->elementEnd('fieldset');
         }
 
-
         $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
         $this->element('legend', null, _('Preferences'));
 
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 3e578b307d..98951ac304 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
 require_once INSTALLDIR.'/lib/jabber.php';
 
 /**
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/jabber.php';
  * @see      SettingsAction
  */
 
-class ImsettingsAction extends SettingsAction
+class ImsettingsAction extends ConnectSettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 6f17f154ca..257aac8d08 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 require_once INSTALLDIR.'/lib/openid.php';
 
 /**
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @link     http://laconi.ca/
  */
 
-class OpenidsettingsAction extends SettingsAction
+class OpenidsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 51f6f8197d..a7664d74ec 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -19,9 +19,9 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once(INSTALLDIR.'/lib/accountsettingsaction.php');
 
-class OthersettingsAction extends SettingsAction
+class OthersettingsAction extends AccountSettingsAction
 {
 
     function get_instructions()
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
new file mode 100644
index 0000000000..f96da13bda
--- /dev/null
+++ b/actions/passwordsettings.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Change user password
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
+/**
+ * Change password
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class PasswordsettingsAction extends AccountSettingsAction
+{
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+
+    function title()
+    {
+        return _('Change password');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('Change your password.');
+    }
+
+    /**
+     * Content area of the page
+     *
+     * Shows a form for changing the password
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $user = common_current_user();
+        $this->elementStart('form', array('method' => 'POST',
+                                          'id' => 'password',
+                                          'action' =>
+                                          common_local_url('profilesettings')));
+
+        $this->hidden('token', common_session_token());
+
+        // Users who logged in with OpenID won't have a pwd
+        if ($user->password) {
+            $this->password('oldpassword', _('Old password'));
+        }
+        $this->password('newpassword', _('New password'),
+                        _('6 or more characters'));
+        $this->password('confirm', _('Confirm'),
+                        _('same as password above'));
+        $this->submit('changepass', _('Change'));
+        $this->elementEnd('form');
+    }
+
+    /**
+     * Handle a post
+     *
+     * Validate input and save changes. Reload the form with a success
+     * or error message.
+     *
+     * @return void
+     */
+
+    function handlePost()
+    {
+        // CSRF protection
+
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->showForm(_('There was a problem with your session token. '.
+                               'Try again, please.'));
+            return;
+        }
+
+        $user = common_current_user();
+        assert(!is_null($user)); // should already be checked
+
+        // FIXME: scrub input
+
+        $newpassword = $this->arg('newpassword');
+        $confirm     = $this->arg('confirm');
+
+        if (0 != strcmp($newpassword, $confirm)) {
+            $this->showForm(_('Passwords don\'t match.'));
+            return;
+        }
+
+        if ($user->password) {
+            $oldpassword = $this->arg('oldpassword');
+
+            if (!common_check_user($user->nickname, $oldpassword)) {
+                $this->showForm(_('Incorrect old password'));
+                return;
+            }
+        }
+
+        $original = clone($user);
+
+        $user->password = common_munge_password($newpassword, $user->id);
+
+        $val = $user->validate();
+        if ($val !== true) {
+            $this->showForm(_('Error saving user; invalid.'));
+            return;
+        }
+
+        if (!$user->update($original)) {
+            $this->serverError(_('Can\'t save new password.'));
+            return;
+        }
+
+        $this->showForm(_('Password saved.'), true);
+    }
+}
\ No newline at end of file
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 6ad3f2ef5c..c31f762274 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Change profile settings
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,62 +18,68 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/settingsaction.php');
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 
-class ProfilesettingsAction extends SettingsAction
+/**
+ * Change profile settings
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class ProfilesettingsAction extends AccountSettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
+    {
+        return _('Profile settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
     {
         return _('You can update your personal profile info here '.
                   'so people know more about you.');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Content area of the page
+     *
+     * Shows a form for uploading an avatar.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
-        $this->form_header(_('Profile settings'), $msg, $success);
-        $this->show_settings_form();
-        $this->element('h2', null, _('Avatar'));
-        $this->show_avatar_form();
-        $this->element('h2', null, _('Change password'));
-        $this->show_password_form();
-//        $this->element('h2', null, _('Delete my account'));
-//        $this->show_delete_form();
-        common_show_footer();
-    }
-
-    function handle_post()
-    {
-
-        # CSRF protection
-
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
-            return;
-        }
-
-        if ($this->arg('save')) {
-            $this->save_profile();
-        } else if ($this->arg('upload')) {
-            $this->upload_avatar();
-        } else if ($this->arg('crop')) {
-            $this->crop_avatar();
-        } else if ($this->arg('changepass')) {
-            $this->change_password();
-        } else {
-            $this->show_form(_('Unexpected form submission.'));
-        }
-
-    }
-
-    function show_settings_form()
-    {
-
         $user = common_current_user();
         $profile = $user->getProfile();
 
@@ -78,9 +87,9 @@ class ProfilesettingsAction extends SettingsAction
                                            'id' => 'profilesettings',
                                            'action' => common_local_url('profilesettings')));
         $this->hidden('token', common_session_token());
-        
+
         # too much common patterns here... abstractable?
-        
+
         $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
@@ -100,16 +109,24 @@ class ProfilesettingsAction extends SettingsAction
                      _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
 
         $language = common_language();
-        $this->dropdown('language', _('Language'), get_nice_language_list(), _('Preferred language'), true, $language);
+        $this->dropdown('language', _('Language'),
+                        get_nice_language_list(), _('Preferred language'),
+                        true, $language);
+
         $timezone = common_timezone();
         $timezones = array();
         foreach(DateTimeZone::listIdentifiers() as $k => $v) {
             $timezones[$v] = $v;
         }
-        $this->dropdown('timezone', _('Timezone'), $timezones, _('What timezone are you normally in?'), true, $timezone);
+        $this->dropdown('timezone', _('Timezone'),
+                        $timezones, _('What timezone are you normally in?'),
+                        true, $timezone);
 
-        $this->checkbox('autosubscribe', _('Automatically subscribe to whoever subscribes to me (best for non-humans)'),
-                        ($this->arg('autosubscribe')) ? $this->boolean('autosubscribe') : $user->autosubscribe);
+        $this->checkbox('autosubscribe',
+                        _('Automatically subscribe to whoever '.
+                          'subscribes to me (best for non-humans)'),
+                        ($this->arg('autosubscribe')) ?
+                        $this->boolean('autosubscribe') : $user->autosubscribe);
 
         $this->submit('save', _('Save'));
 
@@ -117,105 +134,26 @@ class ProfilesettingsAction extends SettingsAction
 
     }
 
-    function show_avatar_form()
+    /**
+     * Handle a post
+     *
+     * Validate input and save changes. Reload the form with a success
+     * or error message.
+     *
+     * @return void
+     */
+
+    function handlePost()
     {
+        # CSRF protection
 
-        $user = common_current_user();
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            common_log_db_error($user, 'SELECT', __FILE__);
-            $this->serverError(_('User without matching profile'));
+        $token = $this->trimmed('token');
+        if (!$token || $token != common_session_token()) {
+            $this->showForm(_('There was a problem with your session token. '.
+                               'Try again, please.'));
             return;
         }
-        
-        $original = $profile->getOriginalAvatar();
 
-
-        $this->elementStart('form', array('enctype' => 'multipart/form-data',
-                                           'method' => 'POST',
-                                           'id' => 'avatar',
-                                           'action' =>
-                                           common_local_url('profilesettings')));
-        $this->hidden('token', common_session_token());
-
-        if ($original) {
-            $this->elementStart('div', array('id'=>'avatar_original', 'class'=>'avatar_view'));
-            $this->element('h3', null, _("Original:"));
-            $this->elementStart('div', array('id'=>'avatar_original_view'));
-            $this->element('img', array('src' => $original->url,
-                                        'class' => 'avatar original',
-                                        'width' => $original->width,
-                                        'height' => $original->height,
-                                        'alt' => $user->nickname));
-            $this->elementEnd('div');
-            $this->elementEnd('div');
-        }
-
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-        if ($avatar) {
-            $this->elementStart('div', array('id'=>'avatar_preview', 'class'=>'avatar_view'));
-            $this->element('h3', null, _("Preview:"));
-            $this->elementStart('div', array('id'=>'avatar_preview_view'));
-            $this->element('img', array('src' => $original->url,//$avatar->url,
-                                        'class' => 'avatar profile',
-                                        'width' => AVATAR_PROFILE_SIZE,
-                                        'height' => AVATAR_PROFILE_SIZE,
-                                        'alt' => $user->nickname));
-            $this->elementEnd('div');
-            $this->elementEnd('div');
-
-            foreach(array('avatar_crop_x', 'avatar_crop_y', 'avatar_crop_w', 'avatar_crop_h') as $crop_info) {
-                $this->element('input', array('name' => $crop_info,
-                                              'type' => 'hidden',
-                                              'id' => $crop_info));
-            }
-            $this->submit('crop', _('Crop'));
-        }
-
-        $this->element('input', array('name' => 'MAX_FILE_SIZE',
-                                      'type' => 'hidden',
-                                      'id' => 'MAX_FILE_SIZE',
-                                      'value' => MAX_AVATAR_SIZE));
-
-        $this->elementStart('p');
-
-        $this->element('input', array('name' => 'avatarfile',
-                                      'type' => 'file',
-                                      'id' => 'avatarfile'));
-        $this->elementEnd('p');
-
-        $this->submit('upload', _('Upload'));
-        $this->elementEnd('form');
-
-    }
-
-    function show_password_form()
-    {
-
-        $user = common_current_user();
-        $this->elementStart('form', array('method' => 'POST',
-                                           'id' => 'password',
-                                           'action' =>
-                                           common_local_url('profilesettings')));
-
-        $this->hidden('token', common_session_token());
-
-        # Users who logged in with OpenID won't have a pwd
-        if ($user->password) {
-            $this->password('oldpassword', _('Old password'));
-        }
-        $this->password('newpassword', _('New password'),
-                        _('6 or more characters'));
-        $this->password('confirm', _('Confirm'),
-                        _('same as password above'));
-        $this->submit('changepass', _('Change'));
-        $this->elementEnd('form');
-    }
-
-    function save_profile()
-    {
         $nickname = $this->trimmed('nickname');
         $fullname = $this->trimmed('fullname');
         $homepage = $this->trimmed('homepage');
@@ -225,38 +163,38 @@ class ProfilesettingsAction extends SettingsAction
         $language = $this->trimmed('language');
         $timezone = $this->trimmed('timezone');
         $tagstring = $this->trimmed('tags');
-        
+
         # Some validation
 
         if (!Validate::string($nickname, array('min_length' => 1,
                                                'max_length' => 64,
                                                'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-            $this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
+            $this->showForm(_('Nickname must have only lowercase letters and numbers and no spaces.'));
             return;
         } else if (!User::allowed_nickname($nickname)) {
-            $this->show_form(_('Not a valid nickname.'));
+            $this->showForm(_('Not a valid nickname.'));
             return;
         } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
                    !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
-            $this->show_form(_('Homepage is not a valid URL.'));
+            $this->showForm(_('Homepage is not a valid URL.'));
             return;
         } else if (!is_null($fullname) && strlen($fullname) > 255) {
-            $this->show_form(_('Full name is too long (max 255 chars).'));
+            $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
         } else if (!is_null($bio) && strlen($bio) > 140) {
-            $this->show_form(_('Bio is too long (max 140 chars).'));
+            $this->showForm(_('Bio is too long (max 140 chars).'));
             return;
         } else if (!is_null($location) && strlen($location) > 255) {
-            $this->show_form(_('Location is too long (max 255 chars).'));
+            $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         }  else if (is_null($timezone) || !in_array($timezone, DateTimeZone::listIdentifiers())) {
-            $this->show_form(_('Timezone not selected.'));
+            $this->showForm(_('Timezone not selected.'));
             return;
-        } else if ($this->nickname_exists($nickname)) {
-            $this->show_form(_('Nickname already in use. Try another one.'));
+        } else if ($this->nicknameExists($nickname)) {
+            $this->showForm(_('Nickname already in use. Try another one.'));
             return;
         } else if (!is_null($language) && strlen($language) > 50) {
-            $this->show_form(_('Language is too long (max 50 chars).'));
+            $this->showForm(_('Language is too long (max 50 chars).'));
             return;
         }
 
@@ -265,14 +203,14 @@ class ProfilesettingsAction extends SettingsAction
         } else {
             $tags = array();
         }
-            
+
         foreach ($tags as $tag) {
             if (!common_valid_profile_tag($tag)) {
-                $this->show_form(sprintf(_('Invalid tag: "%s"'), $tag));
+                $this->showForm(sprintf(_('Invalid tag: "%s"'), $tag));
                 return;
             }
         }
-        
+
         $user = common_current_user();
 
         $user->query('BEGIN');
@@ -346,139 +284,29 @@ class ProfilesettingsAction extends SettingsAction
         }
 
         # Set the user tags
-        
+
         $result = $user->setSelfTags($tags);
 
         if (!$result) {
             $this->serverError(_('Couldn\'t save tags.'));
             return;
         }
-        
+
         $user->query('COMMIT');
 
         common_broadcast_profile($profile);
 
-        $this->show_form(_('Settings saved.'), true);
+        $this->showForm(_('Settings saved.'), true);
     }
 
-
-    function upload_avatar()
-    {
-        switch ($_FILES['avatarfile']['error']) {
-         case UPLOAD_ERR_OK: # success, jump out
-            break;
-         case UPLOAD_ERR_INI_SIZE:
-         case UPLOAD_ERR_FORM_SIZE:
-            $this->show_form(_('That file is too big.'));
-            return;
-         case UPLOAD_ERR_PARTIAL:
-            @unlink($_FILES['avatarfile']['tmp_name']);
-            $this->show_form(_('Partial upload.'));
-            return;
-         default:
-            $this->show_form(_('System error uploading file.'));
-            return;
-        }
-
-        $info = @getimagesize($_FILES['avatarfile']['tmp_name']);
-
-        if (!$info) {
-            @unlink($_FILES['avatarfile']['tmp_name']);
-            $this->show_form(_('Not an image or corrupt file.'));
-            return;
-        }
-
-        switch ($info[2]) {
-         case IMAGETYPE_GIF:
-         case IMAGETYPE_JPEG:
-         case IMAGETYPE_PNG:
-            break;
-         default:
-            $this->show_form(_('Unsupported image file format.'));
-            return;
-        }
-
-        $user = common_current_user();
-        $profile = $user->getProfile();
-
-        if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
-            $this->show_form(_('Avatar updated.'), true);
-        } else {
-            $this->show_form(_('Failed updating avatar.'));
-        }
-
-        @unlink($_FILES['avatarfile']['tmp_name']);
-    }
-
-    function crop_avatar() {
-
-        $user = common_current_user();
-        $profile = $user->getProfile();
-
-        $x = $this->arg('avatar_crop_x');
-        $y = $this->arg('avatar_crop_y');
-        $w = $this->arg('avatar_crop_w');
-        $h = $this->arg('avatar_crop_h');
-
-        if ($profile->crop_avatars($x, $y, $w, $h)) {
-            $this->show_form(_('Avatar updated.'), true);
-        } else {
-            $this->show_form(_('Failed updating avatar.'));
-        }
-    }
-
-    function nickname_exists($nickname)
+    function nicknameExists($nickname)
     {
         $user = common_current_user();
         $other = User::staticGet('nickname', $nickname);
         if (!$other) {
-            return false;
+           return false;
         } else {
             return $other->id != $user->id;
         }
     }
-
-    function change_password()
-    {
-
-        $user = common_current_user();
-        assert(!is_null($user)); # should already be checked
-
-        # FIXME: scrub input
-
-        $newpassword = $this->arg('newpassword');
-        $confirm = $this->arg('confirm');
-        $token = $this->arg('token');
-
-        if (0 != strcmp($newpassword, $confirm)) {
-            $this->show_form(_('Passwords don\'t match.'));
-            return;
-        }
-
-        if ($user->password) {
-            $oldpassword = $this->arg('oldpassword');
-
-            if (!common_check_user($user->nickname, $oldpassword)) {
-                $this->show_form(_('Incorrect old password'));
-                return;
-            }
-        }
-
-        $original = clone($user);
-
-        $user->password = common_munge_password($newpassword, $user->id);
-
-        $val = $user->validate();
-        if ($val !== true) {
-            $this->show_form(_('Error saving user; invalid.'));
-            return;
-        }
-
-        if (!$user->update($original)) {
-            $this->serverError(_('Can\'t save new password.'));
-            return;
-        }
-
-        $this->show_form(_('Password saved.'), true);
-    }
 }
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 6d3c549420..845266d18b 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
 
 /**
  * Settings for SMS
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/settingsaction.php';
  * @see      SettingsAction
  */
 
-class SmssettingsAction extends SettingsAction
+class SmssettingsAction extends ConnectSettingsAction
 {
     /**
      * Title of the page
@@ -151,7 +151,6 @@ class SmssettingsAction extends SettingsAction
         $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-
         $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
         $this->checkbox('smsnotify',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index cd070cb450..597623c801 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/connectsettingsaction.php';
 
 define('SUBSCRIPTIONS', 80);
 
@@ -47,7 +47,7 @@ define('SUBSCRIPTIONS', 80);
  * @see      SettingsAction
  */
 
-class TwittersettingsAction extends SettingsAction
+class TwittersettingsAction extends ConnectSettingsAction
 {
     /**
      * Title of the page
@@ -129,7 +129,8 @@ class TwittersettingsAction extends SettingsAction
         $this->elementEnd('ul');
         $this->elementEnd('fieldset');
 
-        $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences'));
+        $this->elementStart('fieldset',
+                            array('id' => 'settings_twitter_preferences'));
         $this->element('legend', null, _('Preferences'));
 
         $this->elementStart('ul');
diff --git a/lib/accountsettingsaction.php b/lib/accountsettingsaction.php
new file mode 100644
index 0000000000..46090b8c19
--- /dev/null
+++ b/lib/accountsettingsaction.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Base class for account settings actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/settingsaction.php';
+
+/**
+ * Base class for account settings actions
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
+
+class AccountSettingsAction extends SettingsAction
+{
+    /**
+     * Show the local navigation menu
+     *
+     * This is the same for all settings, so we show it here.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $menu = new AccountSettingsNav($this);
+        $menu->show();
+    }
+}
+
+/**
+ * A widget for showing the settings group local nav menu
+ *
+ * @category Widget
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      HTMLOutputter
+ */
+
+class AccountSettingsNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        # action => array('prompt', 'title')
+        $menu =
+          array('profilesettings' =>
+                array(_('Profile'),
+                      _('Change your profile settings')),
+                'avatarsettings' =>
+                array(_('Avatar'),
+                      _('Upload an avatar')),
+                'passwordsettings' =>
+                array(_('Password'),
+                      _('Change your password')),
+                'emailsettings' =>
+                array(_('Email'),
+                      _('Change email handling')),
+                'openidsettings' =>
+                array(_('OpenID'),
+                      _('Add or remove OpenIDs')),
+                'othersettings' =>
+                array(_('Other'),
+                      _('Other options')));
+
+        $action_name = $this->action->trimmed('action');
+        $this->action->elementStart('ul', array('class' => 'nav'));
+
+        foreach ($menu as $menuaction => $menudesc) {
+            $this->action->menuItem(common_local_url($menuaction),
+				    $menudesc[0],
+				    $menudesc[1],
+				    $action_name === $menuaction);
+        }
+
+        $this->action->elementEnd('ul');
+    }
+}
diff --git a/lib/action.php b/lib/action.php
index 71520b84e8..e62a032b60 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -208,20 +208,20 @@ class Action extends HTMLOutputter // lawsuit
         $this->showLogo();
         $this->showPrimaryNav();
         $this->showSiteNotice();
-	if (common_logged_in()) {
-	    $this->showNoticeForm();
-	} else {
-	    $this->showAnonymousMessage();
-	}
+        if (common_logged_in()) {
+            $this->showNoticeForm();
+        } else {
+            $this->showAnonymousMessage();
+        }
         $this->elementEnd('div');
     }
 
     function showLogo()
     {
         $this->elementStart('address', array('id' => 'site_contact',
-                                              'class' => 'vcard'));
+                                             'class' => 'vcard'));
         $this->elementStart('a', array('class' => 'url home bookmark',
-                                        'href' => common_local_url('public')));
+                                       'href' => common_local_url('public')));
         if (common_config('site', 'logo') || file_exists(theme_file('logo.png')))
         {
             $this->element('img', array('class' => 'logo photo',
@@ -237,21 +237,21 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('dl', array('id' => 'site_nav_global_primary'));
         $this->element('dt', null, _('Primary site navigation'));
-	$this->elementStart('dd');
+        $this->elementStart('dd');
         $user = common_current_user();
         $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                             _('Home'));
+                            _('Home'));
         }
         $this->menuItem(common_local_url('peoplesearch'), _('Search'));
         if ($user) {
             $this->menuItem(common_local_url('profilesettings'),
-                             _('Settings'));
-            $this->menuItem(common_local_url('invite'),
-                             _('Invite'));
+                            _('Account'));
+            $this->menuItem(common_local_url('imsettings'),
+                            _('Connect'));
             $this->menuItem(common_local_url('logout'),
-                             _('Logout'));
+                            _('Logout'));
         } else {
             $this->menuItem(common_local_url('login'), _('Login'));
             if (!common_config('site', 'closed')) {
@@ -260,25 +260,25 @@ class Action extends HTMLOutputter // lawsuit
             $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
         }
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                         _('Help'));
+                        _('Help'));
         $this->elementEnd('ul');
-	$this->elementEnd('dd');	
+        $this->elementEnd('dd');
         $this->elementEnd('dl');
     }
 
     // Revist. Should probably do an hAtom pattern here
     function showSiteNotice()
     {
-	$text = common_config('site', 'notice');
-	if ($text) {
-	    $this->elementStart('dl', array('id' => 'site_notice',
-					    'class' => 'system_notice'));
-	    $this->element('dt', null, _('Site notice'));
-	    $this->element('dd', null, $text);
-	    $this->elementEnd('dl');
-	}
+        $text = common_config('site', 'notice');
+        if ($text) {
+            $this->elementStart('dl', array('id' => 'site_notice',
+                                            'class' => 'system_notice'));
+            $this->element('dt', null, _('Site notice'));
+            $this->element('dd', null, $text);
+            $this->elementEnd('dl');
+        }
     }
-    
+
     // MAY overload if no notice form needed... or direct message box????
 
     function showNoticeForm()
@@ -289,9 +289,9 @@ class Action extends HTMLOutputter // lawsuit
 
     function showAnonymousMessage()
     {
-	// needs to be defined by the class
+        // needs to be defined by the class
     }
-    
+
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
@@ -331,13 +331,13 @@ class Action extends HTMLOutputter // lawsuit
 
     function showPageNoticeBlock()
     {
-	$this->elementStart('dl', array('id' => 'page_notice',
-					'class' => 'system_notice'));
-	$this->element('dt', null, _('Page notice'));
-	$this->elementStart('dd');
-	$this->showPageNotice();
-	$this->elementEnd('dd');
-	$this->elementEnd('dl');
+        $this->elementStart('dl', array('id' => 'page_notice',
+                                        'class' => 'system_notice'));
+        $this->element('dt', null, _('Page notice'));
+        $this->elementStart('dd');
+        $this->showPageNotice();
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 	}
 
     // SHOULD overload (unless there's not a notice)
@@ -345,7 +345,7 @@ class Action extends HTMLOutputter // lawsuit
     function showPageNotice()
     {
     }
-    
+
     // MUST overload
 
     function showContent()
@@ -391,17 +391,17 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dd', null);
         $this->elementStart('ul', array('class' => 'nav'));
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                         _('Help'));
+                        _('Help'));
         $this->menuItem(common_local_url('doc', array('title' => 'about')),
-                         _('About'));
+                        _('About'));
         $this->menuItem(common_local_url('doc', array('title' => 'faq')),
-                         _('FAQ'));
+                        _('FAQ'));
         $this->menuItem(common_local_url('doc', array('title' => 'privacy')),
-                         _('Privacy'));
+                        _('Privacy'));
         $this->menuItem(common_local_url('doc', array('title' => 'source')),
-                         _('Source'));
+                        _('Source'));
         $this->menuItem(common_local_url('doc', array('title' => 'contact')),
-                         _('Contact'));
+                        _('Contact'));
         $this->elementEnd('ul');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
@@ -567,7 +567,7 @@ class Action extends HTMLOutputter // lawsuit
         }
 
         (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
-        
+
         $this->elementStart('li', $lattrs);
         $attrs['href'] = $url;
         if ($title) {
diff --git a/lib/settingsgroupnav.php b/lib/connectsettingsaction.php
similarity index 71%
rename from lib/settingsgroupnav.php
rename to lib/connectsettingsaction.php
index bd66c65a65..30629680ec 100644
--- a/lib/settingsgroupnav.php
+++ b/lib/connectsettingsaction.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * Navigation widget for the settings group
+ * Base class for connection settings actions
  *
  * PHP version 5
  *
@@ -19,10 +19,10 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Widget
+ * @category  Settings
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @copyright 2008-2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
  */
@@ -31,10 +31,39 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/widget.php';
+require_once INSTALLDIR.'/lib/settingsaction.php';
 
 /**
- * A widget for showing the settings group local nav menu
+ * Base class for connection settings actions
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
+
+class ConnectSettingsAction extends SettingsAction
+{
+    /**
+     * Show the local navigation menu
+     *
+     * This is the same for all settings, so we show it here.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $menu = new ConnectSettingsNav($this);
+        $menu->show();
+    }
+}
+
+/**
+ * A widget for showing the connect group local nav menu
  *
  * @category Widget
  * @package  Laconica
@@ -45,7 +74,7 @@ require_once INSTALLDIR.'/lib/widget.php';
  * @see      HTMLOutputter
  */
 
-class SettingsGroupNav extends Widget
+class ConnectSettingsNav extends Widget
 {
     var $action = null;
 
@@ -71,31 +100,19 @@ class SettingsGroupNav extends Widget
     {
         # action => array('prompt', 'title')
         $menu =
-          array('profilesettings' =>
-                array(_('Profile'),
-                      _('Change your profile settings')),
-                'emailsettings' =>
-                array(_('Email'),
-                      _('Change email handling')),
-                'openidsettings' =>
-                array(_('OpenID'),
-                      _('Add or remove OpenIDs')),
+          array('imsettings' =>
+                array(_('IM'),
+                      _('Updates by instant messenger (IM)')),
                 'smssettings' =>
                 array(_('SMS'),
                       _('Updates by SMS')),
-                'imsettings' =>
-                array(_('IM'),
-                      _('Updates by instant messenger (IM)')),
                 'twittersettings' =>
                 array(_('Twitter'),
-                      _('Twitter integration options')),
-                'othersettings' =>
-                array(_('Other'),
-                      _('Other options')));
-        
+                      _('Twitter integration options')));
+
         $action_name = $this->action->trimmed('action');
         $this->action->elementStart('ul', array('class' => 'nav'));
-	
+
         foreach ($menu as $menuaction => $menudesc) {
             if ($menuaction == 'imsettings' &&
                 !common_config('xmpp', 'enabled')) {
@@ -106,7 +123,7 @@ class SettingsGroupNav extends Widget
 				    $menudesc[1],
 				    $action_name === $menuaction);
         }
-	
+
         $this->action->elementEnd('ul');
     }
 }
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 9564cfb460..2c532912b4 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Base class for RSS 1.0 feed actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,6 +18,14 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Mail
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Earle Martin <earle@downlode.org>
+ * @copyright 2008-9 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
 if (!defined('LACONICA')) { exit(1); }
@@ -23,35 +34,84 @@ define('DEFAULT_RSS_LIMIT', 48);
 
 class Rss10Action extends Action
 {
-
     # This will contain the details of each feed item's author and be used to generate SIOC data.
+    
     var $creators = array();
+    var $limit = DEFAULT_RSS_LIMIT;
+    
+    /**
+     * Constructor
+     *
+     * Just wraps the Action constructor.
+     *
+     * @param string  $output URI to output to, default = stdout
+     * @param boolean $indent Whether to indent output, default true
+     *
+     * @see Action::__construct
+     */
 
-    function is_readonly()
+    function __construct($output='php://output', $indent=true)
+    {
+        parent::__construct($output, $indent);
+    }
+
+    /**
+     * Do we need to write to the database?
+     * 
+     * @return boolean true
+     */
+    
+    function isReadonly()
     {
         return true;
     }
 
+    /**
+     * Read arguments and initialize members
+     * 
+     * @param array $args Arguments from $_REQUEST
+     * @return boolean success
+     */
+    
+    function prepare($args)
+    {
+	$this->limit = (int) $this->trimmed('limit');
+	if ($this->limit == 0) {
+	    $this->limit = DEFAULT_RSS_LIMIT;
+	}
+	return true;
+    }
+	
+    /**
+     * Handle a request
+     * 
+     * @param array $args Arguments from $_REQUEST
+     * 
+     * @return void
+     */
+    
     function handle($args)
     {
         parent::handle($args);
-        $limit = (int) $this->trimmed('limit');
-        if ($limit == 0) {
-            $limit = DEFAULT_RSS_LIMIT;
-        }
         $this->show_rss($limit);
     }
 
-    function init()
-    {
-        return true;
-    }
-
-    function get_notices()
+    /**
+     * Get the notices to output in this stream
+     * 
+     * @return array an array of Notice objects sorted in reverse chron
+     */
+    
+    function getNotices()
     {
         return array();
     }
 
+    /**
+     * Get a description of the channel
+     * 
+     * Returns an array with the following 
+     * @return array 
     function get_channel()
     {
         return array('url' => '',
@@ -67,11 +127,6 @@ class Rss10Action extends Action
 
     function show_rss($limit=0)
     {
-
-        if (!$this->init()) {
-            return;
-        }
-
         $notices = $this->get_notices($limit);
 
         $this->init_rss();
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 8624803ac4..dfe1f114b2 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -31,8 +31,6 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsgroupnav.php';
-
 /**
  * Base class for settings group of actions
  *
@@ -149,17 +147,4 @@ class SettingsAction extends Action
         return '';
     }
 
-    /**
-     * Show the local navigation menu
-     *
-     * This is the same for all settings, so we show it here.
-     *
-     * @return void
-     */
-
-    function showLocalNav()
-    {
-        $menu = new SettingsGroupNav($this);
-        $menu->show();
-    }
 }
diff --git a/lib/util.php b/lib/util.php
index 9ca817eab3..d67c649728 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -770,6 +770,8 @@ function common_fancy_url($action, $args=null)
         return common_path('main/openid');
      case 'profilesettings':
         return common_path('settings/profile');
+     case 'passwordsettings':
+        return common_path('settings/password');
      case 'emailsettings':
         return common_path('settings/email');
      case 'openidsettings':
@@ -852,6 +854,8 @@ function common_fancy_url($action, $args=null)
         return common_path($path);
      case 'imsettings':
         return common_path('settings/im');
+     case 'avatarsettings':
+        return common_path('settings/avatar');
      case 'peoplesearch':
         return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : ''));
      case 'noticesearch':

From 99a4daa5015a3dd9254df7fffcd107963f7c8f36 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 17 Jan 2009 22:42:53 +0000
Subject: [PATCH 154/256] Bring othersettings up to date

---
 actions/othersettings.php | 210 +++++++++++++++++---------------------
 1 file changed, 93 insertions(+), 117 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index a7664d74ec..f35630f360 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Miscellaneous settings
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,157 +18,130 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Settings
+ * @package   Laconica
+ * @author    Robin Millette <millette@controlyourself.ca>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/accountsettingsaction.php');
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
+
+/**
+ * Miscellaneous settings actions
+ *
+ * Currently this just manages URL shortening.
+ *
+ * @category Settings
+ * @package  Laconica
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class OthersettingsAction extends AccountSettingsAction
 {
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
 
-    function get_instructions()
+    function title()
+    {
+        return _('Other Settings');
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
     {
         return _('Manage various other options.');
     }
 
-    function show_form($msg=null, $success=false)
+    /**
+     * Content area of the page
+     *
+     * Shows a form for uploading an avatar.
+     *
+     * @return void
+     */
+
+    function showContent()
     {
         $user = common_current_user();
 
-        $this->form_header(_('Other Settings'), $msg, $success);
-
         $this->element('h2', null, _('URL Auto-shortening'));
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'othersettings',
-                                           'action' =>
-                                           common_local_url('othersettings')));
+                                          'id' => 'othersettings',
+                                          'action' =>
+                                          common_local_url('othersettings')));
         $this->hidden('token', common_session_token());
 
-        $services = array(
-            '' => 'None',
-            'ur1.ca' => 'ur1.ca (free service)',
-            '2tu.us' => '2tu.us (free service)',
-            'ptiturl.com' => 'ptiturl.com',
-            'bit.ly' => 'bit.ly',
-            'tinyurl.com' => 'tinyurl.com',
-            'is.gd' => 'is.gd',
-            'snipr.com' => 'snipr.com',
-            'metamark.net' => 'metamark.net'
-        );
+        // I18N
 
-        $this->dropdown('urlshorteningservice', _('Service'), $services, _('Automatic shortening service to use.'), false, $user->urlshorteningservice);
+        $services = array(
+                          '' => 'None',
+                          'ur1.ca' => 'ur1.ca (free service)',
+                          '2tu.us' => '2tu.us (free service)',
+                          'ptiturl.com' => 'ptiturl.com',
+                          'bit.ly' => 'bit.ly',
+                          'tinyurl.com' => 'tinyurl.com',
+                          'is.gd' => 'is.gd',
+                          'snipr.com' => 'snipr.com',
+                          'metamark.net' => 'metamark.net'
+                          );
+
+        $this->dropdown('urlshorteningservice', _('Service'),
+                        $services, _('Automatic shortening service to use.'),
+                        false, $user->urlshorteningservice);
 
         $this->submit('save', _('Save'));
 
         $this->elementEnd('form');
-
-//        $this->element('h2', null, _('Delete my account'));
-//        $this->show_delete_form();
-
-        common_show_footer();
     }
 
-    function show_feeds_list($feeds)
+    /**
+     * Handle a post
+     *
+     * Saves the changes to url-shortening prefs and shows a success or failure
+     * message.
+     *
+     * @return void
+     */
+
+    function handlePost()
     {
-        $this->elementStart('div', array('class' => 'feedsdel'));
-        $this->element('p', null, 'Feeds:');
-        $this->elementStart('ul', array('class' => 'xoxo'));
-
-        foreach ($feeds as $key => $value) {
-            $this->common_feed_item($feeds[$key]);
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('div');
-    }
-
-    //TODO move to common.php (and retrace its origin)
-    function common_feed_item($feed)
-    {
-        $user = common_current_user();
-        $nickname = $user->nickname;
-
-        switch($feed['item']) {
-            case 'notices': default:
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's ".$feed['version']." notice feed";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'foaf':
-                $feed_classname = "foaf";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's FOAF file";
-                $feed['textContent'] = "FOAF";
-                break;
-        }
-        $this->elementStart('li');
-        $this->element('a', array('href' => $feed['href'],
-                                  'class' => $feed_classname,
-                                  'type' => $feed_mimetype,
-                                  'title' => $feed_title),
-                            $feed['textContent']);
-        $this->elementEnd('li');
-    }
-
-//    function show_delete_form() {
-//        $user = common_current_user();
-//      $notices = DB_DataObject::factory('notice');
-//      $notices->profile_id = $user->id;
-//      $notice_count = (int) $notices->count();
-//
-//        $this->elementStart('form', array('method' => 'POST',
-//                                           'id' => 'delete',
-//                                           'action' =>
-//                                           common_local_url('deleteprofile')));
-//
-//        $this->hidden('token', common_session_token());
-//      $this->element('p', null, "You can copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
-//
-//        $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
-//                                              'type' => 'rss',
-//                                              'version' => 'RSS 1.0',
-//                                              'item' => 'notices'),
-//                                     1=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
-//                                              'type' => 'rdf',
-//                                              'version' => 'FOAF',
-//                                              'item' => 'foaf')));
-//
-//        $this->submit('deleteaccount', _('Delete my account'));
-//        $this->elementEnd('form');
-//    }
-
-    function handle_post()
-    {
-
-        # CSRF protection
+        // CSRF protection
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
-        if ($this->arg('save')) {
-            $this->save_preferences();
-        }else {
-            $this->show_form(_('Unexpected form submission.'));
-        }
-    }
-
-    function save_preferences()
-    {
-
         $urlshorteningservice = $this->trimmed('urlshorteningservice');
 
         if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
-            $this->show_form(_('URL shortening service is too long (max 50 chars).'));
+            $this->showForm(_('URL shortening service is too long (max 50 chars).'));
             return;
         }
 
         $user = common_current_user();
 
-        assert(!is_null($user)); # should already be checked
+        assert(!is_null($user)); // should already be checked
 
         $user->query('BEGIN');
 
@@ -183,6 +159,6 @@ class OthersettingsAction extends AccountSettingsAction
 
         $user->query('COMMIT');
 
-        $this->show_form(_('Preferences saved.'), true);
+        $this->showForm(_('Preferences saved.'), true);
     }
 }

From d3f27765d95d0c4e0c5d8f224822c469ea64660b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sat, 17 Jan 2009 23:17:57 +0000
Subject: [PATCH 155/256] Adapt replies to new framework

---
 actions/replies.php | 192 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 143 insertions(+), 49 deletions(-)

diff --git a/actions/replies.php b/actions/replies.php
index 84fd894ff0..ea8ef47643 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of replies
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,86 +18,177 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/actions/showstream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-class RepliesAction extends StreamAction
+/**
+ * List of replies
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class RepliesAction extends Action
 {
+    var $user = null;
+    var $page = null;
 
-    function handle($args)
+    /**
+     * Prepare the object
+     *
+     * Check the input values and initialize the object.
+     * Shows an error page on bad input.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
     {
-
-        parent::handle($args);
+        parent::prepare($args);
 
         $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user = User::staticGet('nickname', $nickname);
 
-        if (!$user) {
-            $this->no_such_user();
-            return;
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            $this->clientError(_('No such user.'));
+            return false;
         }
 
-        $profile = $user->getProfile();
+        $profile = $this->user->getProfile();
 
         if (!$profile) {
             $this->serverError(_('User has no profile.'));
-            return;
+            return false;
         }
 
-        # Looks like we're good; show the header
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        common_show_header(sprintf(_("Replies to %s"), $profile->nickname),
-                           array($this, 'show_header'), $user,
-                           array($this, 'show_top'));
-
-        $this->show_replies($user);
-
-        common_show_footer();
+        return true;
     }
 
-    function no_such_user()
+    /**
+     * Handle a request
+     *
+     * Just show the page. All args already handled.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return void
+     */
+
+    function handle($args)
     {
-        $this->clientError(_('No such user.'));
+        parent::handle($args);
+        $this->showPage();
     }
 
-    function show_header($user)
+    /**
+     * Title of the page
+     *
+     * Includes name of user and page number.
+     *
+     * @return string title of page
+     */
+
+    function title()
     {
+        if ($this->page == 1) {
+            return sprintf(_("Replies to %s"), $this->user->nickname);
+        } else {
+            return sprintf(_("Replies to %s, page %d"),
+                           $profile->nickname,
+                           $this->page);
+        }
+    }
+
+    /**
+     * Feeds for the <head> section
+     *
+     * @return void
+     */
+
+    function showFeeds()
+    {
+        $rssurl   = common_local_url('repliesrss',
+                                     array('nickname' => $this->user->nickname));
+        $rsstitle = sprintf(_('Feed for replies to %s'), $this->user->nickname);
+
         $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('repliesrss', array('nickname' =>
-                                                                                    $user->nickname)),
+                                     'href' => $rssurl,
                                      'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for replies to %s'), $user->nickname)));
+                                     'title' => $rsstitle));
     }
 
-    function show_top($user)
+    /**
+     * show the personal group nav
+     *
+     * @return void
+     */
+
+    function showLocalNav()
     {
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id) {
-            common_notice_form('replies');
-        }
-
-        $this->views_menu();
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('repliesrss', array('nickname' => $user->nickname)),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'repliesrss')));
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
     }
 
-    function show_replies($user)
+    /**
+     * Show the replies feed links
+     *
+     * @return void
+     */
+
+    function showExportData()
     {
+        $fl = new FeedList($this);
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        $rssurl = common_local_url('repliesrss',
+                                   array('nickname' => $this->user->nickname));
 
-        $notice = $user->getReplies(($page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+        $fl->show(array(0=>array('href'=> $rssurl,
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'repliesrss')));
+    }
 
-        $cnt = $this->show_notice_list($notice);
+    /**
+     * Show the content
+     *
+     * A list of notices that are replies to the user, plus pagination.
+     *
+     * @return void
+     */
 
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'replies', array('nickname' => $user->nickname));
+    function showContent()
+    {
+        $notice = $this->user->getReplies(($this->page-1) * NOTICES_PER_PAGE,
+                                          NOTICES_PER_PAGE + 1);
+
+        $nl = new NoticeList($notice, $this);
+
+        $cnt = $nl->show();
+
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'replies',
+                          array('nickname' => $this->user->nickname));
     }
 }

From 0ecdd5363df5e80464f80f58347102d2f1adb4fe Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 23:49:12 +0000
Subject: [PATCH 156/256] Profile settings styles

---
 actions/profilesettings.php | 30 +++++++++++++++++++++++++-----
 theme/base/css/display.css  | 33 +++++++++++++++++++++++++++++++--
 2 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index c31f762274..12251b83b3 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -84,52 +84,72 @@ class ProfilesettingsAction extends AccountSettingsAction
         $profile = $user->getProfile();
 
         $this->elementStart('form', array('method' => 'POST',
-                                           'id' => 'profilesettings',
+                                           'id' => 'form_settings_profile',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('profilesettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Profile information'));
         $this->hidden('token', common_session_token());
 
         # too much common patterns here... abstractable?
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('fullname', _('Full name'),
                      ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('homepage', _('Homepage'),
                      ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
                      _('URL of your homepage, blog, or profile on another site'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->textarea('bio', _('Bio'),
                         ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
                         _('Describe yourself and your interests in 140 chars'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('location', _('Location'),
                      ($this->arg('location')) ? $this->arg('location') : $profile->location,
                      _('Where you are, like "City, State (or Region), Country"'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
                      _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $language = common_language();
         $this->dropdown('language', _('Language'),
                         get_nice_language_list(), _('Preferred language'),
                         true, $language);
-
+        $this->elementEnd('li');
         $timezone = common_timezone();
         $timezones = array();
         foreach(DateTimeZone::listIdentifiers() as $k => $v) {
             $timezones[$v] = $v;
         }
+        $this->elementStart('li');
         $this->dropdown('timezone', _('Timezone'),
                         $timezones, _('What timezone are you normally in?'),
                         true, $timezone);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('autosubscribe',
                         _('Automatically subscribe to whoever '.
                           'subscribes to me (best for non-humans)'),
                         ($this->arg('autosubscribe')) ?
                         $this->boolean('autosubscribe') : $user->autosubscribe);
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
 
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 15377a7b58..396d12ef0f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -109,9 +109,23 @@ margin-bottom:29px;
 font-style:italic;
 }
 
+
+.form_settings .form_datas li {
+width:100%;
+float:left;
+}
+
 .form_login label,
-.form_settings label {
+.form_settings .form_datas label,
+.form_login input,
+.form_settings .form_datas input {
 margin-right:11px;
+float:left;
+}
+
+.form_settings label {
+margin-top:7px;
+width:123px;
 }
 
 .form_actions label {
@@ -123,16 +137,31 @@ display:inline;
 font-weight:bold;
 }
 
+#form_settings_profile legend {
+display:none;
+}
+
+.form_settings .form_datas p.form_guide {
+clear:both;
+margin-left:134px;
+margin-bottom:0;
+}
+
 .form_settings p {
-margin-bottom:18px;
+margin-bottom:11px;
 }
 
 #settings_email_address {
 margin-bottom:29px;
 }
 
+.form_settings input.checkbox {
+margin-top:3px;
+}
 .form_settings label.checkbox {
 font-weight:normal;
+width:auto;
+margin-top:0;
 }
 
 /* FORM SETTINGS */

From 4687f6dac93a9f7b1f276eda7677821c5069433b Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 23:52:37 +0000
Subject: [PATCH 157/256] Other settings markup

---
 actions/othersettings.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index f35630f360..cbb2c0cb9e 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -83,11 +83,14 @@ class OthersettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
 
-        $this->element('h2', null, _('URL Auto-shortening'));
+
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'othersettings',
+                                          'id' => 'form_settings_other',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('othersettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('URL Auto-shortening'));
         $this->hidden('token', common_session_token());
 
         // I18N
@@ -104,12 +107,15 @@ class OthersettingsAction extends AccountSettingsAction
                           'metamark.net' => 'metamark.net'
                           );
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->dropdown('urlshorteningservice', _('Service'),
                         $services, _('Automatic shortening service to use.'),
                         false, $user->urlshorteningservice);
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
-
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 

From cb35bd606149d01ba533a5198b65e6d88f76c81d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 00:02:31 +0000
Subject: [PATCH 158/256] Reduced h1, legend font-size

---
 theme/base/css/display.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 396d12ef0f..5d2ef324a4 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -17,7 +17,7 @@ width:1004px;
 width:71.714em;
 }
 h1 {
-font-size:2.1em;
+font-size:1.7em;
 line-height:1.1;
 margin-bottom:0.25em;
 }
@@ -39,7 +39,7 @@ font-weight:bold;
 
 legend {
 font-weight:bold; 
-font-size:1.6em;
+font-size:1.5em;
 text-transform:uppercase;
 }
 form {

From 620d0594fc5603d42292fcc5d43ccf20366f4fe8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 00:58:43 +0000
Subject: [PATCH 159/256] Reusing @class form_settings

---
 actions/login.php          | 1 -
 theme/base/css/display.css | 2 --
 2 files changed, 3 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 224b30f6fb..e92087a28a 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -131,7 +131,6 @@ class LoginAction extends Action
     {      
         $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_login',
-                                           'class' => 'form_login',
                                            'action' => common_local_url('login')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Login to site'));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5d2ef324a4..435cb15760 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -115,9 +115,7 @@ width:100%;
 float:left;
 }
 
-.form_login label,
 .form_settings .form_datas label,
-.form_login input,
 .form_settings .form_datas input {
 margin-right:11px;
 float:left;

From 88c7da66f0102b0890d52a53aba47c02a16fa5c2 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 01:02:42 +0000
Subject: [PATCH 160/256] Minor cleanup for login style

---
 actions/login.php          | 1 +
 theme/base/css/display.css | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index e92087a28a..c213e2ab5e 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -131,6 +131,7 @@ class LoginAction extends Action
     {      
         $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_login',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('login')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Login to site'));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 435cb15760..35a146fa74 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -149,10 +149,6 @@ margin-bottom:0;
 margin-bottom:11px;
 }
 
-#settings_email_address {
-margin-bottom:29px;
-}
-
 .form_settings input.checkbox {
 margin-top:3px;
 }
@@ -162,6 +158,10 @@ width:auto;
 margin-top:0;
 }
 
+#form_login p.form_guide {
+margin-left:0;
+}
+
 /* FORM SETTINGS */
 
 

From ffb1bb1fbbab8ac25a725c1848d2607519959130 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 01:14:14 +0000
Subject: [PATCH 161/256] notice div.entry-content notice-options styles

---
 theme/base/css/display.css     | 18 ++++++++++++++----
 theme/identica/css/display.css |  8 +++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 35a146fa74..2af6cc67df 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -742,6 +742,7 @@ display:inline;
 clear:left;
 float:left;
 width:48%;
+font-size:0.95em;
 }
 .notice div.entry-content a,
 .notice .notice-options a,
@@ -800,13 +801,22 @@ outline:none;
 padding-left:2%;
 float:left;
 width:50%;
+position:relative;
 }
+.notice-options .notice_delete,
 .notice-options .notice_reply,
 .notice-options .notice_favorite {
-float:left;
-margin-right:11px;
+position:absolute;
+top:0;
+}
+.notice-options .notice_favorite {
+left:0;
 }
 .notice-options .notice_reply {
+left:29px;
+}
+.notice-options .notice_delete {
+left:76px;
 }
 .notice-options .notice_reply dt {
 display:none;
@@ -825,11 +835,11 @@ border:0;
 .notice-options .notice_reply a,
 .notice-options .notice_delete a {
 text-decoration:none;
-padding-left:20px;
+padding-left:16px;
 }
 
 .notice-options .notice_delete {
-float:right;
+
 }
 
 .notice-options form input.submit {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 4af7cf2396..9896529abd 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -180,12 +180,14 @@ background:transparent url(../images/icons/twotone/green/favourite.gif) no-repea
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
-div.entry-content,
 div.notice-options {
-opacity:0.2;
+opacity:0.3;
 font-family:sans-serif;
 }
-div.entry-content a,
+
+div.entry-content {
+color:#333;
+}
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;

From 3e18c2f0f8bbab01e16f66254dc9eadc9e1ffd60 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 18 Jan 2009 01:31:39 +0000
Subject: [PATCH 162/256] trac750 Facebook App - generate HTML similar to
 uiredisign for everything

---
 actions/facebookhome.php     |  10 ++-
 actions/facebookinvite.php   |   8 +-
 actions/facebooksettings.php |  14 ++--
 lib/facebookaction.php       | 145 +++++++++++++++++++++++++----------
 lib/facebookutil.php         | 133 +++++++++++++++++++++++++++++++-
 5 files changed, 253 insertions(+), 57 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index b780b8cc32..46f886451c 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
 
 class FacebookhomeAction extends FacebookAction
 {
@@ -35,6 +35,8 @@ class FacebookhomeAction extends FacebookAction
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
         if ($flink) {
+            $user = $flink->getUser();
+            common_set_user($user);
             $this->showHome($flink, null);
         } else {
             $this->login($fbuid);
@@ -103,7 +105,7 @@ class FacebookhomeAction extends FacebookAction
         update_profile_box($facebook, $fbuid, $user, $notice);
 
 
-        $this->show_header('Home');
+        $this->showHeader('Home');
 
         if ($msg) {
             common_element('fb:success', array('message' => $msg));
@@ -111,7 +113,7 @@ class FacebookhomeAction extends FacebookAction
 
         echo $this->show_notices($user);
 
-        $this->show_footer();
+        $this->showFooter();
     }
 
     function show_notices($user)
@@ -132,7 +134,7 @@ class FacebookhomeAction extends FacebookAction
 
     function show_notice_list($notice)
     {
-        $nl = new NoticeList($notice);
+        $nl = new FacebookNoticeList($notice);
         return $nl->show();
     }
 
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index fe0c5e4934..d7e82dae7b 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -41,7 +41,7 @@ class FacebookinviteAction extends FacebookAction
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
-        $this->show_header('Invite');
+        $this->showHeader('Invite');
 
         common_element('h2', null, _('Thanks for inviting your friends to use Identi.ca!'));
         common_element('p', null, _('Invitations have been sent to the following users:'));
@@ -60,7 +60,7 @@ class FacebookinviteAction extends FacebookAction
 
         common_element_end("ul");
 
-        $this->show_footer();
+        $this->showFooter();
     }
 
     function showInviteForm()
@@ -69,7 +69,7 @@ class FacebookinviteAction extends FacebookAction
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
-        $this->show_header('Invite');
+        $this->showHeader('Invite');
 
         // Get a list of users who are already using the app for exclusion
         $exclude_ids = $facebook->api_client->friends_getAppUsers();
@@ -104,7 +104,7 @@ class FacebookinviteAction extends FacebookAction
 
         common_element_end("ul");
 
-        $this->show_footer();
+        $this->showFooter();
 
     }
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index ab04ad82b5..eafd911236 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
 
 class FacebooksettingsAction extends FacebookAction
 {
@@ -29,13 +29,13 @@ class FacebooksettingsAction extends FacebookAction
         parent::handle($args);
 
         if ($this->arg('save')) {
-            $this->save_settings();
+            $this->saveSettings();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function save_settings() {
+    function saveSettings() {
 
         $noticesync = $this->arg('noticesync');
         $replysync = $this->arg('replysync');
@@ -59,14 +59,14 @@ class FacebooksettingsAction extends FacebookAction
         }
     }
 
-    function show_form($msg = null, $success = false) {
+    function showForm($msg = null, $success = false) {
 
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
-        $this->show_header('Settings', $msg, $success);
+        $this->showHeader('Settings', $msg, $success);
 
         common_element_start('fb:if-section-not-added', array('section' => 'profile'));
         common_element('h2', null, _('Add an Identi.ca box to my profile'));
@@ -108,7 +108,7 @@ class FacebooksettingsAction extends FacebookAction
 
         }
 
-        $this->show_footer();
+        $this->showFooter();
     }
 
 }
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 3a00c71dd0..1bf026281e 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -17,9 +17,11 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) { 
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/facebookutil.php');
+require_once INSTALLDIR.'/lib/facebookutil.php';
 
 class FacebookAction extends Action
 {
@@ -29,32 +31,67 @@ class FacebookAction extends Action
         parent::handle($args);
     }
 
-    function show_header($selected = 'Home', $msg = null, $success = false)
+    function showLogo(){
+        
+        global $xw;
+        
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => get_facebook_css()));
+
+        common_element_start('a', array('class' => 'url home bookmark',
+                                            'href' => common_local_url('public')));
+        if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
+            common_element('img', array('class' => 'logo photo',
+                'src' => (common_config('site', 'logo')) ? 
+                    common_config('site', 'logo') : theme_path('logo.png'),
+                'alt' => common_config('site', 'name')));
+        }
+         
+        common_element('span', array('class' => 'fn org'), common_config('site', 'name'));
+        common_element_end('a');
+    
+    }
+
+    function showHeader($selected = 'Home', $msg = null, $success = false)
     {
 
         start_fbml();
 
-        # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-        $ts = filemtime(theme_file('facebookapp.css'));
-        $cssurl = theme_path('facebookapp.css') . "?ts=$ts";
+        $this->showLogo();
 
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => $cssurl));
+        common_element_start('dl', array("id" => 'site_nav_local_views'));
+        common_element('dt', null, _('Local Views'));
+        common_element_start('dd');
 
-        common_element('fb:dashboard');
+        common_element_start('ul', array('class' => 'nav'));
 
-        common_element_start('fb:tabs');
-        common_element('fb:tab-item', array('title' => 'Home',
-                                            'href' => 'index.php',
-                                            'selected' => ($selected == 'Home')));
-        common_element('fb:tab-item', array('title' => 'Invite',
-                                            'href' => 'invite.php',
-                                            'selected' => ($selected == 'Invite')));
-        common_element('fb:tab-item', array('title' => 'Settings',
-                                            'href' => 'settings.php',
-                                            'selected' => ($selected == 'Settings')));
-        common_element_end('fb:tabs');
+        common_element_start('li', array('class' => 
+            ($selected == 'Home') ? 'current' : 'facebook_home'));
+        common_element('a', 
+            array('href' => 'index.php', 'title' => _('Home')), _('Home'));
+        common_element_end('li');
+
+        
+        common_element_start('li', 
+            array('class' =>
+                ($selected == 'Invite') ? 'current' : 'facebook_invite'));
+        common_element('a', 
+            array('href' => 'invite.php', 'title' => _('Invite')), _('Invite'));
+        common_element_end('li');
+
+        common_element_start('li', 
+            array('class' =>
+                ($selected == 'Settings') ? 'current' : 'facebook_settings'));
+        common_element('a', 
+            array('href' => 'settings.php', 
+                'title' => _('Settings')), _('Settings'));
+        common_element_end('li');
+
+        common_element_end('ul');
+
+        common_element_end('dd');
+        common_element_end('dl');
 
 
         if ($msg) {
@@ -69,44 +106,73 @@ class FacebookAction extends Action
 
     }
 
-    function show_footer()
+    function showFooter()
     {
         common_element_end('div');
         common_end_xml();
     }
 
+
+    function showInstructions()
+    {
+        global $xw; 
+        
+        common_element_start('dl', array('class' => 'system_notice'));
+        common_element('dt', null, 'Page Notice');
+    
+        $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' .
+            'with your username and password. Don\'t have a username yet? '); 
+        
+        $loginmsg_part2 = _(' a new account.');
+        
+        common_element_start('dd');
+        common_element_start('p');
+        common_text(sprintf($loginmsg_part1, common_config('site', 'name')));
+        common_element('a', 
+            array('href' => common_local_url('register')), _('Register'));
+        common_text($loginmsg_part2);
+        common_element_end('dd');
+        common_element_end('dl');        
+    }
+
     function showLoginForm($msg = null)
     {
         start_fbml();
 
-        common_element_start('a', array('href' => 'http://identi.ca'));
-        common_element('img', array('src' => 'http://theme.identi.ca/identica/logo.png',
-                                    'alt' => 'Identi.ca',
-                                    'id' => 'logo'));
-        common_element_end('a');
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => get_facebook_css()));
 
+
+        $this->showLogo();
+                                 
+        common_element_start('div', array('class' => 'content'));
+        common_element('h1', null, _('Login'));
+   
         if ($msg) {
              common_element('fb:error', array('message' => $msg));
         }
+        
+        $this->showInstructions();
 
-        common_element("h2", null,
-            _('To add the Identi.ca application, you need to log into your Identi.ca account.'));
+        common_element_start('div', array('id' => 'content_inner'));
 
-
-        common_element_start('div', array('class' => 'instructions'));
-        common_element_start('p');
-        common_raw('Login with your username and password. Don\'t have a username yet?'
-        .' <a href="http://identi.ca/main/register">Register</a> a new account.');
-        common_element_end('p');
-        common_element_end('div');
-
-        common_element_start('div', array('id' => 'content'));
         common_element_start('form', array('method' => 'post',
                                                'id' => 'login',
                                                'action' => 'index.php'));
+    
+        common_element_start('fieldset');
+        common_element('legend', null, _('Login to site'));
+        
+        common_element_start('ul', array('class' => 'form_datas'));
+        common_element_start('li');                                             
         common_input('nickname', _('Nickname'));
+        common_element_end('li');
+        common_element_start('li');
         common_password('password', _('Password'));
-
+        common_element_end('li');
+        common_element_end('ul');
+        
         common_submit('submit', _('Login'));
         common_element_end('form');
 
@@ -114,6 +180,7 @@ class FacebookAction extends Action
         common_element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
         common_element_end('p');
+        
         common_element_end('div');
 
         common_end_xml();
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 2529b8a4b8..532e9c9d74 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -17,8 +17,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-require_once(INSTALLDIR.'/extlib/facebook/facebook.php');
-require_once(INSTALLDIR.'/lib/noticelist.php');
+require_once INSTALLDIR.'/extlib/facebook/facebook.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
 
 define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
 
@@ -94,7 +94,7 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
     $xw = new XMLWriter();
     $xw->openMemory();
 
-    $item = new NoticeListItem($notice);
+    $item = new FacebookNoticeListItem($notice);
     $item->show();
 
     $fbml = "<fb:wide>$style " . $xw->outputMemory(false) . "</fb:wide>";
@@ -104,3 +104,130 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
 
     $facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
 }
+
+function get_facebook_css()
+{    
+    # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
+    $ts = filemtime(theme_file('facebookapp.css'));
+    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";   
+    return $cssurl;
+}
+
+
+class FacebookNoticeList extends NoticeList
+{
+    /**
+     * show the list of notices
+     *
+     * "Uses up" the stream by looping through it. So, probably can't
+     * be called twice on the same list.
+     *
+     * @return int count of notices listed.
+     */
+
+    function show()
+    {
+        common_element_start('div', array('id' =>'notices_primary'));
+        common_element('h2', null, _('Notices'));
+        common_element_start('ul', array('class' => 'notices'));
+
+        $cnt = 0;
+
+        while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
+            $cnt++;
+
+            if ($cnt > NOTICES_PER_PAGE) {
+                break;
+            }
+
+            $item = $this->newListItem($this->notice);
+            $item->show();
+        }
+
+        common_element_end('ul');
+        common_element_end('div');
+
+        return $cnt;
+    }
+    
+    /**
+     * returns a new list item for the current notice
+     *
+     * Overridden to return a Facebook specific list item.
+     *
+     * @param Notice $notice the current notice
+     *
+     * @return FacebookNoticeListItem a list item for displaying the notice
+     * formatted for display in the Facebook App.
+     */
+
+    function newListItem($notice)
+    {
+        return new FacebookNoticeListItem($notice);
+    }
+    
+}
+
+class FacebookNoticeListItem extends NoticeListItem
+{
+    /**
+     * recipe function for displaying a single notice in the Facebook App.
+     *
+     * Overridden to strip out some of the controls that we don't
+     * want to be available.
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        $this->showStart();
+        
+        common_element_start('div', 'entry-title');
+        $this->showAuthor();
+        $this->showContent();
+        common_element_end('div');
+
+        common_element_start('div', 'entry-content');
+        $this->showNoticeLink();
+        $this->showNoticeSource();
+        $this->showReplyTo();
+        common_element_end('div');
+        
+        $this->showEnd();
+    }
+    
+    function showStart()
+    {
+        // XXX: RDFa
+        // TODO: add notice_type class e.g., notice_video, notice_image
+        common_element_start('li', array('class' => 'hentry notice',
+                                         'id' => 'notice-' . $this->notice->id));
+    }
+
+    function showNoticeLink()
+    {
+        $noticeurl = common_local_url('shownotice',
+                                      array('notice' => $this->notice->id));
+        // XXX: we need to figure this out better. Is this right?
+        if (strcmp($this->notice->uri, $noticeurl) != 0 &&
+            preg_match('/^http/', $this->notice->uri)) {
+            $noticeurl = $this->notice->uri;
+        }
+        
+        common_element_start('dl', 'timestamp');
+        common_element('dt', null, _('Published')); 
+        common_element_start('dd', null);
+        common_element_start('a', array('rel' => 'bookmark',
+                                        'href' => $noticeurl));
+        $dt = common_date_iso8601($this->notice->created);
+        common_element('abbr', array('class' => 'published',
+                                     'title' => $dt),
+        common_date_string($this->notice->created));
+        common_element_end('a');
+        common_element_end('dd');
+        common_element_end('dl');
+    }
+
+} 
+

From 245f317bbdfd10a44adedafd27a1be5b79bf7921 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 01:52:54 +0000
Subject: [PATCH 163/256] Tweaking notice div.entry-content which impacts
 notice-option input

---
 theme/base/css/display.css     | 6 ++++++
 theme/identica/css/display.css | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2af6cc67df..e4b83a0fa3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -752,6 +752,7 @@ font-size:0.95em;
 .notice .notice-options a,
 .notice .notice-options input {
 float:left;
+font-size:1.025em;
 }
 
 #laconicat .notice div.entry-content {
@@ -802,6 +803,11 @@ padding-left:2%;
 float:left;
 width:50%;
 position:relative;
+font-size:0.95em;
+}
+
+.notice-options a {
+float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 9896529abd..6880e756e1 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -182,7 +182,6 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 
 div.notice-options {
 opacity:0.3;
-font-family:sans-serif;
 }
 
 div.entry-content {

From c1a247358d08c666a838f74ca3d7a54906445746 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 02:34:30 +0000
Subject: [PATCH 164/256] Outline for notice-option anchor

---
 theme/base/css/display.css     | 11 +++++++++--
 theme/identica/css/display.css |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e4b83a0fa3..789eaee4ce 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -162,6 +162,12 @@ margin-top:0;
 margin-left:0;
 }
 
+
+.form_settings .form_note {
+-moz-border-radius:4px;
+padding:0 7px;
+}
+
 /* FORM SETTINGS */
 
 
@@ -769,7 +775,7 @@ display:inline;
 display:none;
 }
 .notice div.entry-content .timestamp a {
-
+display:inline-block;
 }
 .notice div.entry-content .device dt {
 text-transform:lowercase;
@@ -831,6 +837,7 @@ display:none;
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
+outline:none;
 }
 
 .notice-options .notice_reply a,
@@ -850,7 +857,7 @@ padding-left:16px;
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 17px;
+padding:2px 0 2px 10px;
 }
 
 .notice-options .notice_delete dt,
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 6880e756e1..d3d28001a4 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -203,6 +203,9 @@ background-color:#fcfcfc;
 opacity:1;
 }
 
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
 
 /*END: NOTICES */
 

From 4b1cc73a583ce8b73760f6e709c0fc794af1b471 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 03:12:39 +0000
Subject: [PATCH 165/256] Favor/Disfavor form @class Created icon, and add
 style JS selector change Fixed return actions

---
 actions/disfavor.php           |  2 +-
 actions/favor.php              |  2 +-
 actions/login.php              |  6 +++---
 js/util.js                     |  8 ++++----
 lib/disfavorform.php           |  6 +++---
 lib/favorform.php              |  4 ++--
 theme/base/css/display.css     | 10 ++++++----
 theme/identica/css/display.css |  9 ++++++---
 8 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/actions/disfavor.php b/actions/disfavor.php
index fc36f7c75f..3e3e4a5476 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -69,7 +69,7 @@ class DisfavorAction extends Action
         $user->blowFavesCache();
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');
diff --git a/actions/favor.php b/actions/favor.php
index 8d751a7a97..afda93cff2 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -68,7 +68,7 @@ class FavorAction extends Action
         $user->blowFavesCache();
         
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml;charset=utf-8', true);
+            $this->startHTML('text/xml;charset=utf-8', true);
             $this->elementStart('head');
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
diff --git a/actions/login.php b/actions/login.php
index c213e2ab5e..4e580d3607 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -107,13 +107,13 @@ class LoginAction extends Action
 
     function showForm($error=null)
     {
-	$this->error = $error;
-	$this->showPage();
+        $this->error = $error;
+        $this->showPage();
     }
 
     function title()
     {
-	return _('Login');
+        return _('Login');
     }
 
     function showPageNotice()
diff --git a/js/util.js b/js/util.js
index 6fe4770756..0a03b86c23 100644
--- a/js/util.js
+++ b/js/util.js
@@ -81,10 +81,10 @@ $(document).ready(function(){
 		this.appendChild(ajax);
 	}
 
-	$("form.favor").ajaxForm(favoptions);
-	$("form.disfavor").ajaxForm(disoptions);
-	$("form.favor").each(addAjaxHidden);
-	$("form.disfavor").each(addAjaxHidden);
+	$("form.form_favor").ajaxForm(favoptions);
+	$("form.form_disfavor").ajaxForm(disoptions);
+	$("form.form_favor").each(addAjaxHidden);
+	$("form.form_disfavor").each(addAjaxHidden);
 
 	$("#nudge").ajaxForm ({ dataType: 'xml',
 							beforeSubmit: function(xml) { $("form#nudge input[type=submit]").attr("disabled", "disabled");
diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index ffca0cd8bf..d0c3b18329 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -88,7 +88,7 @@ class DisfavorForm extends Form
 
     function action()
     {
-        common_local_url('disfavor');
+        return common_local_url('disfavor');
     }
 
     /**
@@ -136,7 +136,7 @@ class DisfavorForm extends Form
 
     function formClass()
     {
-	return 'disfavor';
+        return 'form_disfavor';
     }
 
-}
\ No newline at end of file
+}
diff --git a/lib/favorform.php b/lib/favorform.php
index 37e13fb1c5..f3a7a97569 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -88,7 +88,7 @@ class FavorForm extends Form
 
     function action()
     {
-        common_local_url('favor');
+        return common_local_url('favor');
     }
 
     /**
@@ -148,6 +148,6 @@ class FavorForm extends Form
     
     function formClass()
     {
-	return 'notice_favorite';
+        return 'form_favor';
     }
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 789eaee4ce..9146a2bf54 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -817,11 +817,13 @@ float:left;
 }
 .notice-options .notice_delete,
 .notice-options .notice_reply,
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 position:absolute;
 top:0;
 }
-.notice-options .notice_favorite {
+.notice-options .form_favor,
+.notice-options .form_disfavor {
 left:0;
 }
 .notice-options .notice_reply {
@@ -861,11 +863,11 @@ padding:2px 0 2px 10px;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .notice_favorite legend {
+.notice-options .form_favor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .notice_favorite fieldset {
+.notice-options .form_favor fieldset {
 border:0;
 padding:0;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d3d28001a4..8328625514 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -62,7 +62,7 @@ border-color:#fff;
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
-background-color:rgba(255, 255, 255, 0.7);:
+background-color:rgba(255, 255, 255, 0.7);
 }
 
 
@@ -87,7 +87,7 @@ background-image:url(../../base/images/icons/icon_atom.jpg);
 }
 #export_data li a.foaf {
 background-image:url(../../base/images/icons/icon_foaf.gif);
-=}
+}
 #export_data li a.export_vcard {
 background-image:url(../../base/images/icons/icon_vcard.gif);
 }
@@ -173,9 +173,12 @@ background-color:transparent;
 .notice-options .notice_reply a {
 background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
-.notice-options form.notice_favorite input.submit {
+.notice-options form.form_favor input.submit {
 background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
 }
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+}
 .notice-options .notice_delete a {
 background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }

From 8fdf888edbd74e707d2698c7625dc90b22f0aeef Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 18 Jan 2009 06:12:47 +0000
Subject: [PATCH 166/256] trac750 Javascript file for Facebook app

---
 actions/facebooksettings.php | 17 +++++++----------
 js/facebookapp.js            | 25 +++++++++++++++++++++++++
 lib/facebookaction.php       | 15 ++++++++++++---
 lib/facebookutil.php         | 10 +++++++++-
 4 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 js/facebookapp.js

diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index eafd911236..372c40c28c 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -68,19 +68,18 @@ class FacebooksettingsAction extends FacebookAction
 
         $this->showHeader('Settings', $msg, $success);
 
-        common_element_start('fb:if-section-not-added', array('section' => 'profile'));
-        common_element('h2', null, _('Add an Identi.ca box to my profile'));
+        common_element('form', array('id' => 'redirect_form',
+                                     'style' => 'display: none;'));        
+                
         common_element_start('p');
-        common_element('fb:add-section-button', array('section' => 'profile'));
-        common_element_end('p');
-
-        common_element_end('fb:if-section-not-added');
-        common_element_start('p');
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update'));
+        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+            'next_fbjs' => 'redirectSettings()'));
         common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
         common_element_end('fb:prompt-permission');
         common_element_end('p');
 
+
+
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
             common_element_start('form', array('method' => 'post',
@@ -94,8 +93,6 @@ class FacebooksettingsAction extends FacebookAction
             common_checkbox('replysync', _('Send local "@" replies to Facebook.'),
                              ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
-            // function common_input($id, $label, $value=null,$instructions=null)
-
             $prefix = $facebook->api_client->data_getUserPreference(1);
             
 
diff --git a/js/facebookapp.js b/js/facebookapp.js
new file mode 100644
index 0000000000..3f809e50cb
--- /dev/null
+++ b/js/facebookapp.js
@@ -0,0 +1,25 @@
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+// Psycho Facebook redirect hack, used because 'document.location'
+// simply does not work in FBJS
+function redirectSettings() {
+    form = document.getElementById('redirect_form');
+    form.setAction('settings.php');
+    form.submit();
+}
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 1bf026281e..a8f16b34a6 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -37,7 +37,11 @@ class FacebookAction extends Action
         
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => get_facebook_css()));
+                                     'href' => getFacebookCSS()));
+
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => getFacebookJS()),
+                                       ' ');
 
         common_element_start('a', array('class' => 'url home bookmark',
                                             'href' => common_local_url('public')));
@@ -58,6 +62,12 @@ class FacebookAction extends Action
 
         start_fbml();
 
+        common_element_start('fb:if-section-not-added', array('section' => 'profile'));
+        common_element_start('span', array('id' => 'add_to_profile'));
+        common_element('fb:add-section-button', array('section' => 'profile'));
+        common_element_end('span');
+        common_element_end('fb:if-section-not-added');
+
         $this->showLogo();
 
         common_element_start('dl', array("id" => 'site_nav_local_views'));
@@ -141,8 +151,7 @@ class FacebookAction extends Action
 
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => get_facebook_css()));
-
+                                     'href' => getFacebookCSS()));
 
         $this->showLogo();
                                  
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 532e9c9d74..61469b3c64 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -105,7 +105,7 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
     $facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
 }
 
-function get_facebook_css()
+function getFacebookCSS()
 {    
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
     $ts = filemtime(theme_file('facebookapp.css'));
@@ -113,6 +113,14 @@ function get_facebook_css()
     return $cssurl;
 }
 
+function getFacebookJS() {
+    
+    # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes
+    $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
+    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";   
+    return $jsurl;
+}
+
 
 class FacebookNoticeList extends NoticeList
 {

From 5a313fef6e8b8ff8480d917f9fc49d41aee6e486 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 12:48:47 +0000
Subject: [PATCH 167/256] Add tabset to login and make it phpcs-compliant

---
 actions/login.php     | 157 +++++++++++++++++++++++++++++++++++-------
 lib/logingroupnav.php |  96 ++++++++++++++++++++++++++
 2 files changed, 229 insertions(+), 24 deletions(-)
 create mode 100644 lib/logingroupnav.php

diff --git a/actions/login.php b/actions/login.php
index 4e580d3607..9fcf740ebf 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of replies
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,19 +18,58 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Login
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * List of replies
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class LoginAction extends Action
 {
+    /**
+     * Has there been an error?
+     */
+
     var $error = null;
-    
+
+    /**
+     * Is this a read-only action?
+     *
+     * @return boolean true
+     */
+
     function isReadOnly()
     {
         return true;
     }
 
+    /**
+     * Handle input, produce output
+     *
+     * Switches on request method; either shows the form or handles its input.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return void
+     */
+
     function handle($args)
     {
         parent::handle($args);
@@ -40,21 +82,32 @@ class LoginAction extends Action
         }
     }
 
+    /**
+     * Check the login data
+     *
+     * Determines if the login data is valid. If so, logs the user
+     * in, and redirects to the 'with friends' page, or to the stored
+     * return-to URL.
+     *
+     * @return void
+     */
+
     function checkLogin()
     {
-        # XXX: login throttle
+        // XXX: login throttle
 
-        # CSRF protection - token set in common_notice_form()
+        // CSRF protection - token set in common_notice_form()
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. Try again, please.'));
+            $this->clientError(_('There was a problem with your session token. '.
+                                 'Try again, please.'));
             return;
         }
 
         $nickname = common_canonical_nickname($this->trimmed('nickname'));
         $password = $this->arg('password');
         if (common_check_user($nickname, $password)) {
-            # success!
+            // success!
             if (!common_set_user($nickname)) {
                 $this->serverError(_('Error setting user.'));
                 return;
@@ -64,10 +117,10 @@ class LoginAction extends Action
                 common_debug('Adding rememberme cookie for ' . $nickname);
                 common_rememberme();
             }
-            # success!
+            // success!
             $url = common_get_returnto();
             if ($url) {
-                # We don't have to return to it again
+                // We don't have to return to it again
                 common_set_returnto(null);
             } else {
                 $url = common_local_url('all',
@@ -80,7 +133,7 @@ class LoginAction extends Action
             return;
         }
 
-        # success!
+        // success!
         if (!common_set_user($user)) {
             $this->serverError(_('Error setting user.'));
             return;
@@ -92,10 +145,10 @@ class LoginAction extends Action
             common_debug('Adding rememberme cookie for ' . $nickname);
             common_rememberme($user);
         }
-        # success!
+        // success!
         $url = common_get_returnto();
         if ($url) {
-            # We don't have to return to it again
+            // We don't have to return to it again
             common_set_returnto(null);
         } else {
             $url = common_local_url('all',
@@ -105,30 +158,65 @@ class LoginAction extends Action
         common_redirect($url);
     }
 
+    /**
+     * Store an error and show the page
+     *
+     * This used to show the whole page; now, it's just a wrapper
+     * that stores the error in an attribute.
+     *
+     * @param string $error error, if any.
+     *
+     * @return void
+     */
+
     function showForm($error=null)
     {
         $this->error = $error;
         $this->showPage();
     }
 
+    /**
+     * Title of the page
+     *
+     * @return string title of the page
+     */
+
     function title()
     {
         return _('Login');
     }
 
+    /**
+     * Show page notice
+     *
+     * Display a notice for how to use the page, or the
+     * error if it exists.
+     *
+     * @return void
+     */
+
     function showPageNotice()
     {
         if ($this->error) {
             $this->element('p', 'error', $this->error);
         } else {
-            $instr = $this->getInstructions();
+            $instr  = $this->getInstructions();
             $output = common_markup_to_html($instr);
+
             $this->raw($output);
         }
     }
-    
+
+    /**
+     * Core of the display code
+     *
+     * Shows the login form.
+     *
+     * @return void
+     */
+
     function showContent()
-    {      
+    {
         $this->elementStart('form', array('method' => 'post',
                                            'id' => 'form_login',
                                            'class' => 'form_settings',
@@ -158,14 +246,21 @@ class LoginAction extends Action
         $this->elementEnd('p');
     }
 
+    /**
+     * Instructions for using the form
+     *
+     * For "remembered" logins, we make the user re-login when they
+     * try to change settings. Different instructions for this case.
+     *
+     * @return void
+     */
+
     function getInstructions()
     {
-        if (common_logged_in() &&
-            !common_is_real_login() &&
-            common_get_returnto())
-        {
-            # rememberme logins have to reauthenticate before
-            # changing any profile settings (cookie-stealing protection)
+        if (common_logged_in() && !common_is_real_login() &&
+            common_get_returnto()) {
+            // rememberme logins have to reauthenticate before
+            // changing any profile settings (cookie-stealing protection)
             return _('For security reasons, please re-enter your ' .
                      'user name and password ' .
                      'before changing your settings.');
@@ -176,4 +271,18 @@ class LoginAction extends Action
                      'try [OpenID](%%action.openidlogin%%). ');
         }
     }
+
+    /**
+     * A local menu
+     *
+     * Shows different login/register actions.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $nav = new LoginGroupNav($this);
+        $nav->show();
+    }
 }
diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
new file mode 100644
index 0000000000..285d60b30d
--- /dev/null
+++ b/lib/logingroupnav.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Menu for login group of actions
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Menu
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Menu for login group of actions
+ *
+ * @category Output
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ *
+ * @see      Widget
+ */
+
+class LoginGroupNav extends Widget
+{
+    var $action = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+
+    function __construct($action=null)
+    {
+        parent::__construct($action);
+        $this->action = $action;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+
+    function show()
+    {
+        # action => array('prompt', 'title')
+        $menu =
+          array('login' =>
+                array(_('Login'),
+                      _('Login with a username and password')),
+                'register' =>
+                array(_('Register'),
+                      _('Sign up for a new account')),
+                'openid' =>
+                array(_('OpenID'),
+                      _('Login or register with OpenID')));
+
+        $action_name = $this->action->trimmed('action');
+        $this->action->elementStart('ul', array('class' => 'nav'));
+
+        foreach ($menu as $menuaction => $menudesc) {
+            $this->action->menuItem(common_local_url($menuaction),
+				    $menudesc[0],
+				    $menudesc[1],
+				    $action_name === $menuaction);
+        }
+
+        $this->action->elementEnd('ul');
+    }
+}

From 710ddd92a393cc1e5df21f9a43836795be6ed43a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 12:49:57 +0000
Subject: [PATCH 168/256] Make logingroupnav.php phpcs-compliant

---
 lib/logingroupnav.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/logingroupnav.php b/lib/logingroupnav.php
index 285d60b30d..8c03ecceae 100644
--- a/lib/logingroupnav.php
+++ b/lib/logingroupnav.php
@@ -69,7 +69,7 @@ class LoginGroupNav extends Widget
 
     function show()
     {
-        # action => array('prompt', 'title')
+        // action => array('prompt', 'title')
         $menu =
           array('login' =>
                 array(_('Login'),
@@ -86,9 +86,9 @@ class LoginGroupNav extends Widget
 
         foreach ($menu as $menuaction => $menudesc) {
             $this->action->menuItem(common_local_url($menuaction),
-				    $menudesc[0],
-				    $menudesc[1],
-				    $action_name === $menuaction);
+                                    $menudesc[0],
+                                    $menudesc[1],
+                                    $action_name === $menuaction);
         }
 
         $this->action->elementEnd('ul');

From b4b686c1185c8b5c923f584b097371b21fa5198f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 12:55:07 +0000
Subject: [PATCH 169/256] Fix file and class descriptors

---
 actions/login.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 9fcf740ebf..2a94110b2f 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -2,7 +2,7 @@
 /**
  * Laconica, the distributed open-source microblogging tool
  *
- * List of replies
+ * Login form
  *
  * PHP version 5
  *
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
 }
 
 /**
- * List of replies
+ * Login form
  *
  * @category Personal
  * @package  Laconica

From 4163f450040d92f417a2481e65cada97f77d74f2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 13:37:58 +0000
Subject: [PATCH 170/256] Update register action to match phpcs and new
 framework

---
 actions/register.php | 368 +++++++++++++++++++++++++++++++++----------
 lib/common.php       |   4 +
 2 files changed, 290 insertions(+), 82 deletions(-)

diff --git a/actions/register.php b/actions/register.php
index b4d0d43fb4..b15aea08ed 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Register a new user account
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,12 +18,70 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Login
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * An action for registering a new user account
+ *
+ * @category Login
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class RegisterAction extends Action
 {
+    /**
+     * Has there been an error?
+     */
+
+    var $error = null;
+
+    /**
+     * Have we registered?
+     */
+
+    var $registered = false;
+
+    /**
+     * Title of the page
+     *
+     * @return string title
+     */
+
+    function title()
+    {
+        if ($this->registered) {
+            return _('Registration successful');
+        } else {
+            return _('Register');
+        }
+    }
+
+    /**
+     * Handle input, produce output
+     *
+     * Switches on request method; either shows the form or handles its input.
+     *
+     * Checks if registration is closed and shows an error if so.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return void
+     */
+
     function handle($args)
     {
         parent::handle($args);
@@ -30,33 +91,43 @@ class RegisterAction extends Action
         } else if (common_logged_in()) {
             $this->clientError(_('Already logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->try_register();
+            $this->tryRegister();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function try_register()
+    /**
+     * Try to register a user
+     *
+     * Validates the input and tries to save a new user and profile
+     * record. On success, shows an instructions page.
+     *
+     * @return void
+     */
+
+    function tryRegister()
     {
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. '.
+                              'Try again, please.'));
             return;
         }
 
         $nickname = $this->trimmed('nickname');
-        $email = $this->trimmed('email');
+        $email    = $this->trimmed('email');
         $fullname = $this->trimmed('fullname');
         $homepage = $this->trimmed('homepage');
-        $bio = $this->trimmed('bio');
+        $bio      = $this->trimmed('bio');
         $location = $this->trimmed('location');
 
-        # We don't trim these... whitespace is OK in a password!
+        // We don't trim these... whitespace is OK in a password!
 
         $password = $this->arg('password');
-        $confirm = $this->arg('confirm');
+        $confirm  = $this->arg('confirm');
 
-        # invitation code, if any
+        // invitation code, if any
 
         $code = $this->trimmed('code');
 
@@ -69,80 +140,105 @@ class RegisterAction extends Action
             return;
         }
 
-        # Input scrubbing
+        // Input scrubbing
 
         $nickname = common_canonical_nickname($nickname);
-        $email = common_canonical_email($email);
+        $email    = common_canonical_email($email);
 
         if (!$this->boolean('license')) {
-            $this->show_form(_('You can\'t register if you don\'t agree to the license.'));
+            $this->showForm(_('You can\'t register if you don\'t '.
+                              'agree to the license.'));
         } else if ($email && !Validate::email($email, true)) {
-            $this->show_form(_('Not a valid email address.'));
+            $this->showForm(_('Not a valid email address.'));
         } else if (!Validate::string($nickname, array('min_length' => 1,
                                                       'max_length' => 64,
-                                                      'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
-            $this->show_form(_('Nickname must have only lowercase letters and numbers and no spaces.'));
-        } else if ($this->nickname_exists($nickname)) {
-            $this->show_form(_('Nickname already in use. Try another one.'));
+                                                      'format' => NICKNAME_FMT))) {
+            $this->showForm(_('Nickname must have only lowercase letters '.
+                              'and numbers and no spaces.'));
+        } else if ($this->nicknameExists($nickname)) {
+            $this->showForm(_('Nickname already in use. Try another one.'));
         } else if (!User::allowed_nickname($nickname)) {
-            $this->show_form(_('Not a valid nickname.'));
-        } else if ($this->email_exists($email)) {
-            $this->show_form(_('Email address already exists.'));
+            $this->showForm(_('Not a valid nickname.'));
+        } else if ($this->emailExists($email)) {
+            $this->showForm(_('Email address already exists.'));
         } else if (!is_null($homepage) && (strlen($homepage) > 0) &&
-                   !Validate::uri($homepage, array('allowed_schemes' => array('http', 'https')))) {
-            $this->show_form(_('Homepage is not a valid URL.'));
+                   !Validate::uri($homepage,
+                                  array('allowed_schemes' =>
+                                        array('http', 'https')))) {
+            $this->showForm(_('Homepage is not a valid URL.'));
             return;
         } else if (!is_null($fullname) && strlen($fullname) > 255) {
-            $this->show_form(_('Full name is too long (max 255 chars).'));
+            $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
         } else if (!is_null($bio) && strlen($bio) > 140) {
-            $this->show_form(_('Bio is too long (max 140 chars).'));
+            $this->showForm(_('Bio is too long (max 140 chars).'));
             return;
         } else if (!is_null($location) && strlen($location) > 255) {
-            $this->show_form(_('Location is too long (max 255 chars).'));
+            $this->showForm(_('Location is too long (max 255 chars).'));
             return;
         } else if (strlen($password) < 6) {
-            $this->show_form(_('Password must be 6 or more characters.'));
+            $this->showForm(_('Password must be 6 or more characters.'));
             return;
         } else if ($password != $confirm) {
-            $this->show_form(_('Passwords don\'t match.'));
-        } else if ($user = User::register(array('nickname' => $nickname, 'password' => $password, 'email' => $email,
-                                                'fullname' => $fullname, 'homepage' => $homepage, 'bio' => $bio,
-                                                'location' => $location, 'code' => $code))) {
+            $this->showForm(_('Passwords don\'t match.'));
+        } else if ($user = User::register(array('nickname' => $nickname,
+                                                'password' => $password,
+                                                'email' => $email,
+                                                'fullname' => $fullname,
+                                                'homepage' => $homepage,
+                                                'bio' => $bio,
+                                                'location' => $location,
+                                                'code' => $code))) {
             if (!$user) {
-                $this->show_form(_('Invalid username or password.'));
+                $this->showForm(_('Invalid username or password.'));
                 return;
             }
-            # success!
+            // success!
             if (!common_set_user($user)) {
                 $this->serverError(_('Error setting user.'));
                 return;
             }
-            # this is a real login
+            // this is a real login
             common_real_login(true);
             if ($this->boolean('rememberme')) {
                 common_debug('Adding rememberme cookie for ' . $nickname);
                 common_rememberme($user);
             }
-            # Re-init language env in case it changed (not yet, but soon)
+            // Re-init language env in case it changed (not yet, but soon)
             common_init_language();
-            $this->show_success();
+            $this->showSuccess();
         } else {
-            $this->show_form(_('Invalid username or password.'));
+            $this->showForm(_('Invalid username or password.'));
         }
     }
 
-    # checks if *CANONICAL* nickname exists
+    /**
+     * Does the given nickname already exist?
+     *
+     * Checks a canonical nickname against the database.
+     *
+     * @param string $nickname nickname to check
+     *
+     * @return boolean true if the nickname already exists
+     */
 
-    function nickname_exists($nickname)
+    function nicknameExists($nickname)
     {
         $user = User::staticGet('nickname', $nickname);
         return ($user !== false);
     }
 
-    # checks if *CANONICAL* email exists
+    /**
+     * Does the given email address already exist?
+     *
+     * Checks a canonical email address against the database.
+     *
+     * @param string $email email address to check
+     *
+     * @return boolean true if the address already exists
+     */
 
-    function email_exists($email)
+    function emailExists($email)
     {
         $email = common_canonical_email($email);
         if (!$email || strlen($email) == 0) {
@@ -152,15 +248,29 @@ class RegisterAction extends Action
         return ($user !== false);
     }
 
-    function show_top($error=null)
+    /**
+     * Instructions or a notice for the page
+     *
+     * Shows the error, if any, or instructions for registration.
+     *
+     * @return void
+     */
+
+    function showPageNotice()
     {
-        if ($error) {
-            $this->element('p', 'error', $error);
+        if ($this->registered) {
+            return;
+        } else if ($this->error) {
+            $this->element('p', 'error', $this->error);
         } else {
-            $instr = common_markup_to_html(_('With this form you can create a new account. ' .
-                                             'You can then post notices and link up to friends and colleagues. '.
-                                             '(Have an [OpenID](http://openid.net/)? ' .
-                                             'Try our [OpenID registration](%%action.openidlogin%%)!)'));
+            $instr =
+              common_markup_to_html(_('With this form you can create '.
+                                      ' a new account. ' .
+                                      'You can then post notices and '.
+                                      'link up to friends and colleagues. '.
+                                      '(Have an [OpenID](http://openid.net/)? ' .
+                                      'Try our [OpenID registration]'.
+                                      '(%%action.openidlogin%%)!)'));
 
             $this->elementStart('div', 'instructions');
             $this->raw($instr);
@@ -168,10 +278,48 @@ class RegisterAction extends Action
         }
     }
 
-    function show_form($error=null)
-    {
-        global $config;
+    /**
+     * Wrapper for showing a page
+     *
+     * Stores an error and shows the page
+     *
+     * @param string $error Error, if any
+     *
+     * @return void
+     */
 
+    function showForm($error=null)
+    {
+        $this->error = $error;
+        $this->showPage();
+    }
+
+    /**
+     * Show the page content
+     *
+     * Either shows the registration form or, if registration was successful,
+     * instructions for using the site.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        if ($this->registered) {
+            $this->showSuccessContent();
+        } else {
+            $this->showFormContent();
+        }
+    }
+
+    /**
+     * Show the registration form
+     *
+     * @return void
+     */
+
+    function showFormContent()
+    {
         $code = $this->trimmed('code');
 
         if ($code) {
@@ -183,10 +331,9 @@ class RegisterAction extends Action
             return;
         }
 
-        common_show_header(_('Register'), null, $error, array($this, 'show_top'));
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'login',
-                                           'action' => common_local_url('register')));
+                                          'id' => 'login',
+                                          'action' => common_local_url('register')));
 
         $this->hidden('token', common_session_token());
 
@@ -195,33 +342,40 @@ class RegisterAction extends Action
         }
 
         $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
-                     _('1-64 lowercase letters or numbers, no punctuation or spaces. Required.'));
+                     _('1-64 lowercase letters or numbers, '.
+                       'no punctuation or spaces. Required.'));
         $this->password('password', _('Password'),
                         _('6 or more characters. Required.'));
         $this->password('confirm', _('Confirm'),
                         _('Same as password above. Required.'));
         if ($invite && $invite->address_type == 'email') {
             $this->input('email', _('Email'), $invite->address,
-                     _('Used only for updates, announcements, and password recovery'));
+                         _('Used only for updates, announcements, '.
+                           'and password recovery'));
         } else {
             $this->input('email', _('Email'), $this->trimmed('email'),
-                         _('Used only for updates, announcements, and password recovery'));
+                         _('Used only for updates, announcements, '.
+                           'and password recovery'));
         }
         $this->input('fullname', _('Full name'),
                      $this->trimmed('fullname'),
-                      _('Longer name, preferably your "real" name'));
+                     _('Longer name, preferably your "real" name'));
         $this->input('homepage', _('Homepage'),
                      $this->trimmed('homepage'),
-                     _('URL of your homepage, blog, or profile on another site'));
+                     _('URL of your homepage, blog, '.
+                       'or profile on another site'));
         $this->textarea('bio', _('Bio'),
                         $this->trimmed('bio'),
-                         _('Describe yourself and your interests in 140 chars'));
+                        _('Describe yourself and your '.
+                          'interests in 140 chars'));
         $this->input('location', _('Location'),
                      $this->trimmed('location'),
-                     _('Where you are, like "City, State (or Region), Country"'));
+                     _('Where you are, like "City, '.
+                       'State (or Region), Country"'));
         $this->checkbox('rememberme', _('Remember me'),
                         $this->boolean('rememberme'),
-                        _('Automatically login in the future; not for shared computers!'));
+                        _('Automatically login in the future; '.
+                          'not for shared computers!'));
         $this->elementStart('p');
         $attrs = array('type' => 'checkbox',
                        'id' => 'license',
@@ -232,37 +386,87 @@ class RegisterAction extends Action
         }
         $this->element('input', $attrs);
         $this->text(_('My text and files are available under '));
-        $this->element('a', array('href' => $config['license']['url']),
+        $this->element('a', array('href' => common_config('license', 'url')),
                        $config['license']['title']);
-        $this->text(_(' except this private data: password, email address, IM address, phone number.'));
+        $this->text(_(' except this private data: password, '.
+                      'email address, IM address, phone number.'));
         $this->elementEnd('p');
         $this->submit('submit', _('Register'));
         $this->elementEnd('form');
-        common_show_footer();
     }
 
-    function show_success()
+    /**
+     * Show some information about registering for the site
+     *
+     * Save the registration flag, run showPage
+     *
+     * @return void
+     */
+
+    function showSuccess()
+    {
+        $this->registered = true;
+        $this->showPage();
+    }
+
+    /**
+     * Show some information about registering for the site
+     *
+     * Gives some information and options for new registrees.
+     *
+     * @return void
+     */
+
+    function showSuccessContent()
     {
         $nickname = $this->arg('nickname');
-        common_show_header(_('Registration successful'));
+
+        $profileurl = common_local_url('showstream',
+                                       array('nickname' => $nickname));
+
         $this->elementStart('div', 'success');
-        $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may want to...'. "\n\n" .
-                           '* Go to [your profile](%s) and post your first message.' .  "\n" .
-                           '* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send notices through instant messages.' . "\n" .
-                           '* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that share your interests. ' . "\n" .
-                           '* Update your [profile settings](%%%%action.profilesettings%%%%) to tell others more about you. ' . "\n" .
-                           '* Read over the [online docs](%%%%doc.help%%%%) for features you may have missed. ' . "\n\n" .
-                           'Thanks for signing up and we hope you enjoy using this service.'),
-                         $nickname, common_local_url('showstream', array('nickname' => $nickname)));
+        $instr = sprintf(_('Congratulations, %s! And welcome to %%%%site.name%%%%. '.
+                           'From here, you may want to...'. "\n\n" .
+                           '* Go to [your profile](%s) '.
+                           'and post your first message.' .  "\n" .
+                           '* Add a [Jabber/GTalk address]'.
+                           '(%%%%action.imsettings%%%%) '.
+                           'so you can send notices '.
+                           'through instant messages.' . "\n" .
+                           '* [Search for people](%%%%action.peoplesearch%%%%) '.
+                           'that you may know or '.
+                           'that share your interests. ' . "\n" .
+                           '* Update your [profile settings]'.
+                           '(%%%%action.profilesettings%%%%)'.
+                           ' to tell others more about you. ' . "\n" .
+                           '* Read over the [online docs](%%%%doc.help%%%%)'.
+                           ' for features you may have missed. ' . "\n\n" .
+                           'Thanks for signing up and we hope '.
+                           'you enjoy using this service.'),
+                         $nickname, $profileurl);
+
         $this->raw(common_markup_to_html($instr));
+
         $have_email = $this->trimmed('email');
         if ($have_email) {
-            $emailinstr = _('(You should receive a message by email momentarily, with ' .
-                            'instructions on how to confirm your email address.)');
+            $emailinstr = _('(You should receive a message by email '.
+                            'momentarily, with ' .
+                            'instructions on how to confirm '.
+                            'your email address.)');
             $this->raw(common_markup_to_html($emailinstr));
         }
         $this->elementEnd('div');
-        common_show_footer();
     }
 
+    /**
+     * Show the login group nav menu
+     *
+     * @return void
+     */
+
+    function showLocalNav()
+    {
+        $nav = new LoginGroupNav($this);
+        $nav->show();
+    }
 }
diff --git a/lib/common.php b/lib/common.php
index 05fef045a1..1068d4c135 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -163,6 +163,10 @@ require_once(INSTALLDIR.'/lib/subs.php');
 require_once(INSTALLDIR.'/lib/Shorturl_api.php');
 require_once(INSTALLDIR.'/lib/twitter.php');
 
+// XXX: other formats here
+
+define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+
 function __autoload($class)
 {
     if ($class == 'OAuthRequest') {

From df58688a58f8ccf36dd39746ef876375f7d9d4e2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 13:38:29 +0000
Subject: [PATCH 171/256] Fix comment blocks for login

---
 actions/login.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/login.php b/actions/login.php
index 2a94110b2f..9fa501a5d9 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -52,12 +52,12 @@ class LoginAction extends Action
     /**
      * Is this a read-only action?
      *
-     * @return boolean true
+     * @return boolean false
      */
 
     function isReadOnly()
     {
-        return true;
+        return false;
     }
 
     /**

From fbae20812329cb4c5a1eabdb5e746488680d1b08 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 16:01:10 +0000
Subject: [PATCH 172/256] Display noned legend of the login fieldset.

---
 theme/base/css/display.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9146a2bf54..6f7f9aedf3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -135,7 +135,8 @@ display:inline;
 font-weight:bold;
 }
 
-#form_settings_profile legend {
+#form_settings_profile legend,
+#form_login legend {
 display:none;
 }
 

From 00daeeba643121a51065ff7b6e55d6661d3bad24 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 16:06:12 +0000
Subject: [PATCH 173/256] Reduced h1 font-size again

---
 theme/base/css/display.css | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 6f7f9aedf3..7433a45e46 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -16,30 +16,30 @@ margin:0 auto;
 width:1004px;
 width:71.714em;
 }
+h1,h2,h3,h4,h5,h6 {
+	text-transform:uppercase;
+	margin-bottom:7px;
+}
 h1 {
-font-size:1.7em;
-line-height:1.1;
-margin-bottom:0.25em;
+font-size:1.4em;
+line-height:1;
+margin-bottom:18px;
 }
 h2 { font-size:1.3em; }
 h3 { font-size:1.2em; }
 h4 { font-size:1.1em; }
 h5 { font-size:1em; }
 h6 { font-size:0.9em; }
-h1,h2,h3,h4,h5,h6 {
-	text-transform:uppercase;
-	margin-bottom:7px;
-}
+
 caption {
 font-weight:bold;
 }
 .opened { display: block !important;}
 .closed { display: none !important;}
 
-
 legend {
 font-weight:bold; 
-font-size:1.5em;
+font-size:1.3em;
 text-transform:uppercase;
 }
 form {

From 321d52a15cc2dc461ffa850b397a934b6e543077 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 17:06:38 +0000
Subject: [PATCH 174/256] Make newnotice work

---
 actions/newnotice.php | 204 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 166 insertions(+), 38 deletions(-)

diff --git a/actions/newnotice.php b/actions/newnotice.php
index b6ed87f815..572adbb239 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -1,28 +1,86 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Handler for posting new notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once INSTALLDIR . '/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+
+/**
+ * Action for posting new notices
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class NewnoticeAction extends Action
 {
+    /**
+     * Error message, if any
+     */
+
+    var $msg = null;
+
+    /**
+     * Title of the page
+     *
+     * Note that this usually doesn't get called unless something went wrong
+     *
+     * @return string page title
+     */
+
+    function title()
+    {
+        return _('New notice');
+    }
+
+    /**
+     * Handle input, produce output
+     *
+     * Switches based on GET or POST method. On GET, shows a form
+     * for posting a notice. On POST, saves the results of that form.
+     *
+     * Results may be a full page, or just a single notice list item,
+     * depending on whether AJAX was requested.
+     *
+     * @param array $args $_REQUEST contents
+     *
+     * @return void
+     */
 
     function handle($args)
     {
@@ -32,36 +90,47 @@ class NewnoticeAction extends Action
             $this->clientError(_('Not logged in.'));
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 
-            # CSRF protection - token set in common_notice_form()
+            // CSRF protection - token set in common_notice_form()
             $token = $this->trimmed('token');
             if (!$token || $token != common_session_token()) {
-                $this->clientError(_('There was a problem with your session token. Try again, please.'));
+                $this->clientError(_('There was a problem with your session token. '.
+                                     'Try again, please.'));
                 return;
             }
 
-            $this->save_new_notice();
+            $this->saveNewNotice();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function save_new_notice()
-    {
+    /**
+     * Save a new notice, based on arguments
+     *
+     * If successful, will show the notice, or return an Ajax-y result.
+     * If not, it will show an error message -- possibly Ajax-y.
+     *
+     * Also, if the notice input looks like a command, it will run the
+     * command and show the results -- again, possibly ajaxy.
+     *
+     * @return void
+     */
 
+    function saveNewNotice()
+    {
         $user = common_current_user();
-        assert($user); # XXX: maybe an error instead...
+        assert($user); // XXX: maybe an error instead...
         $content = $this->trimmed('status_textarea');
 
         if (!$content) {
-            $this->show_form(_('No content!'));
+            $this->showForm(_('No content!'));
             return;
         } else {
             $content_shortened = common_shorten_links($content);
 
             if (mb_strlen($content_shortened) > 140) {
-                common_debug("Content = '$content_shortened'", __FILE__);
-                common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
-                $this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
+                $this->showForm(_('That\'s too long. '.
+                                  'Max notice size is 140 chars.'));
                 return;
             }
         }
@@ -81,10 +150,11 @@ class NewnoticeAction extends Action
 
         $replyto = $this->trimmed('inreplyto');
 
-        $notice = Notice::saveNew($user->id, $content, 'web', 1, ($replyto == 'false') ? null : $replyto);
+        $notice = Notice::saveNew($user->id, $content, 'web', 1,
+                                  ($replyto == 'false') ? null : $replyto);
 
         if (is_string($notice)) {
-            $this->show_form($notice);
+            $this->showForm($notice);
             return;
         }
 
@@ -96,7 +166,7 @@ class NewnoticeAction extends Action
             $this->element('title', null, _('Notice posted'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            $this->show_notice($notice);
+            $this->showNotice($notice);
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
@@ -113,7 +183,17 @@ class NewnoticeAction extends Action
         }
     }
 
-    function ajax_error_msg($msg)
+    /**
+     * Show an Ajax-y error message
+     *
+     * Goes back to the browser, where it's shown in a popup.
+     *
+     * @param string $msg Message to show
+     *
+     * @return void
+     */
+
+    function ajaxErrorMsg($msg)
     {
         common_start_html('text/xml;charset=utf-8', true);
         $this->elementStart('head');
@@ -125,17 +205,42 @@ class NewnoticeAction extends Action
         $this->elementEnd('html');
     }
 
-    function show_top($content=null)
-    {
-        common_notice_form(null, $content);
-    }
+    /**
+     * Formerly page output
+     *
+     * This used to be the whole page output; now that's been largely
+     * subsumed by showPage. So this just stores an error message, if
+     * it was passed, and calls showPage.
+     *
+     * Note that since we started doing Ajax output, this page is rarely
+     * seen.
+     *
+     * @param string $msg An error message, if any
+     *
+     * @return void
+     */
 
-    function show_form($msg=null)
+    function showForm($msg=null)
     {
         if ($msg && $this->boolean('ajax')) {
-            $this->ajax_error_msg($msg);
+            $this->ajaxErrorMsg($msg);
             return;
         }
+
+        $this->msg = $msg;
+        $this->showPage();
+    }
+
+    /**
+     * Overload for replies or bad results
+     *
+     * We show content in the notice form if there were replies or results.
+     *
+     * @return void
+     */
+
+    function showNoticeForm()
+    {
         $content = $this->trimmed('status_textarea');
         if (!$content) {
             $replyto = $this->trimmed('replyto');
@@ -144,18 +249,41 @@ class NewnoticeAction extends Action
                 $content = '@' . $profile->nickname . ' ';
             }
         }
-        common_show_header(_('New notice'), null, $content,
-                           array($this, 'show_top'));
-        if ($msg) {
-            $this->element('p', array('id' => 'error'), $msg);
-        }
-        common_show_footer();
+
+        $notice_form = new NoticeForm($this, $content);
+        $notice_form->show();
     }
 
-    function show_notice($notice)
+    /**
+     * Show an error message
+     *
+     * Shows an error message if there is one.
+     *
+     * @return void
+     *
+     * @todo maybe show some instructions?
+     */
+
+    function showPageNotice()
     {
-        $nli = new NoticeListItem($notice);
+        if ($this->msg) {
+            $this->element('p', array('id' => 'error'), $this->msg);
+        }
+    }
+
+    /**
+     * Output a notice
+     *
+     * Used to generate the notice code for Ajax results.
+     *
+     * @param Notice $notice Notice that was saved
+     *
+     * @return void
+     */
+
+    function showNotice($notice)
+    {
+        $nli = new NoticeListItem($notice, $this);
         $nli->show();
     }
-
 }

From 727d9e8865393a60ca243cdf647303b0a66f6977 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 17:11:18 +0000
Subject: [PATCH 175/256] Change use of self_url to selfUrl

---
 actions/confirmaddress.php | 2 +-
 actions/tagother.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 53410fbe63..3d1a3c275d 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -26,7 +26,7 @@ class ConfirmaddressAction extends Action
     {
         parent::handle($args);
         if (!common_logged_in()) {
-            common_set_returnto($this->self_url());
+            common_set_returnto($this->selfUrl());
             common_redirect(common_local_url('login'));
             return;
         }
diff --git a/actions/tagother.php b/actions/tagother.php
index e11e3a00df..e60eb8b584 100644
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -93,7 +93,7 @@ class TagotherAction extends Action
         $this->elementStart('form', array('method' => 'post',
                                            'id' => 'tag_user',
                                            'name' => 'tagother',
-                                           'action' => $this->self_url()));
+                                           'action' => $this->selfUrl()));
         $this->hidden('token', common_session_token());
         $this->hidden('id', $profile->id);
         $this->input('tags', _('Tags'),

From b6b7ae1a9722e2e9600762d52d93ff09e464fa92 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 18:32:16 +0000
Subject: [PATCH 176/256] New class for Microids

---
 lib/microid.php | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 lib/microid.php

diff --git a/lib/microid.php b/lib/microid.php
new file mode 100644
index 0000000000..806b7ee7da
--- /dev/null
+++ b/lib/microid.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Microid class
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  ID
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * A class for microids
+ *
+ * @category ID
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ * @see      http://microid.org/
+ */
+
+class Microid
+{
+    /** Agent part of the ID. */
+
+    var $agent = null;
+
+    /** Resource part of the ID. */
+
+    var $resource = null;
+
+    /**
+     * Constructor
+     *
+     * @param string $agent    Agent of the ID
+     * @param string $resource Resource part
+     */
+
+    function __construct($agent, $resource)
+    {
+        $this->agent    = $agent;
+        $this->resource = $resource;
+
+    }
+
+    /**
+     * Generate a MicroID string
+     *
+     * @return string MicroID for agent and resource
+     */
+
+    function toString()
+    {
+        $agent_proto    = $this->_getProto($this->agent);
+        $resource_proto = $this->_getProto($this->resource);
+
+        return $agent_proto.'+'.$resource_proto.':sha1:'.
+          sha1(sha1($this->agent).sha1($this->resource));
+    }
+
+    /**
+     * Utility for getting the protocol part of a URI
+     *
+     * @param string $uri URI to parse
+     *
+     * @return string scheme part of the URI
+     */
+
+    function _getProto($uri)
+    {
+        $colon = strpos($uri, ':');
+        return substr($uri, 0, $colon);
+    }
+}

From 2c4db393f54eddbe021b11a42ed2bb6abf5b11b2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 18:32:33 +0000
Subject: [PATCH 177/256] Fix output of email settings for confirmed address

---
 actions/emailsettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index b1f13c18ca..8b8a5351ef 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -95,7 +95,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->hidden('token', common_session_token());
 
         if ($user->email) {
-            $this->element('p', array('id' => 'email_confirmed', $user->email));
+            $this->element('p', array('id' => 'email_confirmed'), $user->email);
             $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
             $this->hidden('email', $user->email);
             $this->submit('remove', _('Remove'));

From 2ca56c0bc6a4f503ebf4444f1da1c7c8c400d8aa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 18:34:54 +0000
Subject: [PATCH 178/256] Update caching methods to use camel case

---
 lib/action.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index e62a032b60..89c7d5d7b8 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -452,7 +452,7 @@ class Action extends HTMLOutputter // lawsuit
     // For comparison with If-Last-Modified
     // If not applicable, return null
 
-    function last_modified()
+    function lastModified()
     {
         return null;
     }
@@ -487,7 +487,7 @@ class Action extends HTMLOutputter // lawsuit
     function handle($argarray=null)
     {
 
-        $lm = $this->last_modified();
+        $lm = $this->lastModified();
         $etag = $this->etag();
 
         if ($etag) {
@@ -501,7 +501,7 @@ class Action extends HTMLOutputter // lawsuit
                 $ims = strtotime($if_modified_since);
                 if ($lm <= $ims) {
                     if (!$etag ||
-                        $this->_has_etag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
+                        $this->_hasEtag($etag, $_SERVER['HTTP_IF_NONE_MATCH'])) {
                         header('HTTP/1.1 304 Not Modified');
                         // Better way to do this?
                         exit(0);
@@ -511,7 +511,7 @@ class Action extends HTMLOutputter // lawsuit
         }
     }
 
-    function _has_etag($etag, $if_none_match)
+    function _hasEtag($etag, $if_none_match)
     {
         return ($if_none_match) && in_array($etag, explode(',', $if_none_match));
     }

From c0f23a2703edbc64486a00ea72b87f5be62cc445 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 18:35:11 +0000
Subject: [PATCH 179/256] Update shownotice for new framework, make phpcs-clean

---
 actions/shownotice.php | 185 ++++++++++++++++++++++++++++++++---------
 1 file changed, 145 insertions(+), 40 deletions(-)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 82d4bd2701..52faba93ef 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Show a single notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,25 +18,69 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-class ShownoticeAction extends StreamAction
+/**
+ * Show a single notice
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class ShownoticeAction extends Action
 {
+    /**
+     * Notice object to show
+     */
 
     var $notice = null;
+
+    /**
+     * Profile of the notice object
+     */
+
     var $profile = null;
+
+    /**
+     * Avatar of the profile of the notice object
+     */
+
     var $avatar = null;
 
+    /**
+     * Load attributes based on database arguments
+     *
+     * Loads all the DB stuff
+     *
+     * @param array $args $_REQUEST array
+     *
+     * @return success flag
+     */
+
     function prepare($args)
     {
-
         parent::prepare($args);
 
         $id = $this->arg('notice');
+
         $this->notice = Notice::staticGet($id);
 
         if (!$this->notice) {
@@ -53,45 +100,112 @@ class ShownoticeAction extends StreamAction
         return true;
     }
 
-    function last_modified()
+    /**
+     * Is this action read-only?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly()
+    {
+        return true;
+    }
+
+    /**
+     * Last-modified date for page
+     *
+     * When was the content of this page last modified? Based on notice,
+     * profile, avatar.
+     *
+     * @return int last-modified date as unix timestamp
+     */
+
+    function lastModified()
     {
         return max(strtotime($this->notice->created),
                    strtotime($this->profile->modified),
                    ($this->avatar) ? strtotime($this->avatar->modified) : 0);
     }
 
+    /**
+     * An entity tag for this page
+     *
+     * Shows the ETag for the page, based on the notice ID and timestamps
+     * for the notice, profile, and avatar. It's weak, since we change
+     * the date text "one hour ago", etc.
+     *
+     * @return string etag
+     */
+
     function etag()
     {
+        $avtime = ($this->avatar) ?
+          strtotime($this->avatar->modified) : 0;
+
         return 'W/"' . implode(':', array($this->arg('action'),
                                           common_language(),
                                           $this->notice->id,
                                           strtotime($this->notice->created),
                                           strtotime($this->profile->modified),
-                                          ($this->avatar) ? strtotime($this->avatar->modified) : 0)) . '"';
+                                          $avtime)) . '"';
     }
 
+    /**
+     * Title of the page
+     *
+     * @return string title of the page
+     */
+
+    function title()
+    {
+        return sprintf(_('%1$s\'s status on %2$s'),
+                       $this->profile->nickname,
+                       common_exact_date($this->notice->created));
+    }
+
+    /**
+     * Handle input
+     *
+     * Only handles get, so just show the page.
+     *
+     * @param array $args $_REQUEST data (unused)
+     *
+     * @return void
+     */
+
     function handle($args)
     {
-
         parent::handle($args);
 
-        common_show_header(sprintf(_('%1$s\'s status on %2$s'),
-                                   $this->profile->nickname,
-                                   common_exact_date($this->notice->created)),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
-
-        $this->elementStart('ul', array('id' => 'notices'));
-        $nli = new NoticeListItem($this->notice);
-        $nli->show();
-        $this->elementEnd('ul');
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_header()
-    {
+    /**
+     * Fill the content area of the page
+     *
+     * Shows a single notice list item.
+     *
+     * @return void
+     */
 
+    function showContent()
+    {
+        $this->elementStart('ul', array('id' => 'notices'));
+        $nli = new NoticeListItem($this->notice, $this);
+        $nli->show();
+        $this->elementEnd('ul');
+    }
+
+    /**
+     * Extra <head> content
+     *
+     * We show the microid(s) for the author, if any.
+     *
+     * @return void
+     */
+
+    function extraHead()
+    {
         $user = User::staticGet($this->profile->id);
 
         if (!$user) {
@@ -99,26 +213,17 @@ class ShownoticeAction extends StreamAction
         }
 
         if ($user->emailmicroid && $user->email && $this->notice->uri) {
+            $id = new Microid('mailto:'. $user->email,
+                              $this->notice->uri);
             $this->element('meta', array('name' => 'microid',
-                                         'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($this->notice->uri))));
+                                         'content' => $id->toString()));
         }
 
         if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
+            $id = new Microid('xmpp:', $user->jabber,
+                              $this->notice->uri);
             $this->element('meta', array('name' => 'microid',
-                                         'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($this->notice->uri))));
+                                         'content' => $id->toString()));
         }
     }
-
-    function show_top()
-    {
-        $cur = common_current_user();
-        if ($cur && $cur->id == $this->profile->id) {
-            common_notice_form();
-        }
-    }
-
-    function no_such_notice()
-    {
-        $this->clientError(_('No such notice.'));
-    }
 }

From f2b06b8bbd56ce94d7b46ffcec36e2be3f260fe9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 18 Jan 2009 18:41:41 +0000
Subject: [PATCH 180/256] update commitaddress

---
 actions/confirmaddress.php | 86 +++++++++++++++++++++++++++++++++-----
 1 file changed, 76 insertions(+), 10 deletions(-)

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 3d1a3c275d..725c1f1e3b 100644
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Confirm an address
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,12 +18,49 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Confirm
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Confirm an address
+ *
+ * When users change their SMS, email, Jabber, or other addresses, we send out
+ * a confirmation code to make sure the owner of that address approves. This class
+ * accepts those codes.
+ *
+ * @category Confirm
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class ConfirmaddressAction extends Action
 {
+    /** type of confirmation. */
+
+    var $type = null;
+
+    /**
+     * Accept a confirmation code
+     *
+     * Checks the code and confirms the address in the
+     * user record
+     *
+     * @param args $args $_REQUEST array
+     *
+     * @return void
+     */
 
     function handle($args)
     {
@@ -62,8 +102,8 @@ class ConfirmaddressAction extends Action
         $cur->$type = $confirm->address;
 
         if ($type == 'sms') {
-            $cur->carrier = ($confirm->address_extra)+0;
-            $carrier = Sms_carrier::staticGet($cur->carrier);
+            $cur->carrier  = ($confirm->address_extra)+0;
+            $carrier       = Sms_carrier::staticGet($cur->carrier);
             $cur->smsemail = $carrier->toEmailAddress($cur->sms);
         }
 
@@ -89,9 +129,35 @@ class ConfirmaddressAction extends Action
 
         $cur->query('COMMIT');
 
-        common_show_header(_('Confirm Address'));
+        $this->type = $type;
+        $this->showPage();
+    }
+
+    /**
+     * Title of the page
+     *
+     * @return string title
+     */
+
+    function title()
+    {
+        return _('Confirm Address');
+    }
+
+    /**
+     * Show a confirmation message.
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $cur  = common_current_user();
+        $type = $this->type;
+
         $this->element('p', null,
-                       sprintf(_('The address "%s" has been confirmed for your account.'), $cur->$type));
-        common_show_footer();
+                       sprintf(_('The address "%s" has been '.
+                                 'confirmed for your account.'),
+                               $cur->$type));
     }
 }

From 5da9511c317648da6beb5fa2752f084166b88adc Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 19:42:08 +0000
Subject: [PATCH 181/256] Markup and styles for the Register page

---
 actions/register.php       | 31 +++++++++++++++++++++++++++----
 theme/base/css/display.css |  6 ++++--
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/actions/register.php b/actions/register.php
index b15aea08ed..f0d47f19b2 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -332,22 +332,32 @@ class RegisterAction extends Action
         }
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'login',
+                                          'id' => 'form_register',
+                                          'class' => 'form_settings',
                                           'action' => common_local_url('register')));
-
+        $this->elementStart('fieldset');
+        $this->element('legend', null, 'Account settings');
         $this->hidden('token', common_session_token());
 
         if ($code) {
             $this->hidden('code', $code);
         }
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
                      _('1-64 lowercase letters or numbers, '.
                        'no punctuation or spaces. Required.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('password', _('Password'),
                         _('6 or more characters. Required.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
                         _('Same as password above. Required.'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         if ($invite && $invite->address_type == 'email') {
             $this->input('email', _('Email'), $invite->address,
                          _('Used only for updates, announcements, '.
@@ -357,26 +367,36 @@ class RegisterAction extends Action
                          _('Used only for updates, announcements, '.
                            'and password recovery'));
         }
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('fullname', _('Full name'),
                      $this->trimmed('fullname'),
                      _('Longer name, preferably your "real" name'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('homepage', _('Homepage'),
                      $this->trimmed('homepage'),
                      _('URL of your homepage, blog, '.
                        'or profile on another site'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->textarea('bio', _('Bio'),
                         $this->trimmed('bio'),
                         _('Describe yourself and your '.
                           'interests in 140 chars'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('location', _('Location'),
                      $this->trimmed('location'),
                      _('Where you are, like "City, '.
                        'State (or Region), Country"'));
+        $this->elementEnd('li');
+        $this->elementStart('li', array('id' => 'settings_rememberme'));
         $this->checkbox('rememberme', _('Remember me'),
                         $this->boolean('rememberme'),
                         _('Automatically login in the future; '.
                           'not for shared computers!'));
-        $this->elementStart('p');
+        $this->elementEnd('li');
         $attrs = array('type' => 'checkbox',
                        'id' => 'license',
                        'name' => 'license',
@@ -384,14 +404,17 @@ class RegisterAction extends Action
         if ($this->boolean('license')) {
             $attrs['checked'] = 'checked';
         }
+        $this->elementStart('li');
         $this->element('input', $attrs);
         $this->text(_('My text and files are available under '));
         $this->element('a', array('href' => common_config('license', 'url')),
                        $config['license']['title']);
         $this->text(_(' except this private data: password, '.
                       'email address, IM address, phone number.'));
-        $this->elementEnd('p');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('submit', _('Register'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 7433a45e46..b5c47e1bb3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -136,7 +136,8 @@ font-weight:bold;
 }
 
 #form_settings_profile legend,
-#form_login legend {
+#form_login legend,
+#form_register legend {
 display:none;
 }
 
@@ -159,7 +160,8 @@ width:auto;
 margin-top:0;
 }
 
-#form_login p.form_guide {
+#form_login p.form_guide,
+#form_register #settings_rememberme p.form_guide {
 margin-left:0;
 }
 

From 41e5e7e912fb93bc618a431c6e0d731a76fa87c8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 19:45:21 +0000
Subject: [PATCH 182/256] Added @title for input submit

---
 lib/disfavorform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index d0c3b18329..f339f215a9 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -125,7 +125,7 @@ class DisfavorForm extends Form
     function formActions()
     {
         $this->out->submit('disfavor-submit-' . $this->notice->id,
-                           _('Disfavor favorite'));
+                           _('Disfavor favorite'), 'submit', null, _('Disfavor this notice'));
     }
     
     /**

From 5426c4ec6a8691969fbb704056ea87ad85021b79 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 19:58:28 +0000
Subject: [PATCH 183/256] Using config site name for creative commons bit. Fix
 i18n.

---
 lib/action.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index e62a032b60..320814a8a0 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -439,7 +439,8 @@ class Action extends HTMLOutputter // lawsuit
         $this->element('img', array('id' => 'license_cc',
                                     'src' => common_config('license', 'image'),
                                     'alt' => common_config('license', 'title')));
-        $this->text(_('All criti.ca content and data are available under the '));
+        //TODO: This is dirty: i18n
+        $this->text(_('All '.common_config('site', 'name').' content and data are available under the '));
         $this->element('a', array('class' => 'license',
                                   'rel' => 'external license',
                                   'href' => common_config('license', 'url')),

From d46c2cc8a70d83f7bf761ea8c778a8cd56d8e692 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 20:36:50 +0000
Subject: [PATCH 184/256] IM settings markup and style. Added
 confirmed/unconfirmed styles

---
 actions/emailsettings.php      |  4 ++--
 actions/imsettings.php         | 42 ++++++++++++++++++++++------------
 theme/base/css/display.css     |  9 +++-----
 theme/identica/css/display.css | 11 +++++++++
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 8b8a5351ef..7ae62fb55c 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -95,14 +95,14 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->hidden('token', common_session_token());
 
         if ($user->email) {
-            $this->element('p', array('id' => 'email_confirmed'), $user->email);
+            $this->element('p', array('id' => 'form_confirmed'), $user->email);
             $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
             $this->hidden('email', $user->email);
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
+                $this->element('p', array('id' => 'form_unconfirmed'), $confirm->address);
                 $this->element('p', array('class' => 'form_note'),
                                         _('Awaiting confirmation on this address. '.
                                         'Check your inbox (and spam box!) for a message '.
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 98951ac304..edbd81b578 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -86,36 +86,35 @@ class ImsettingsAction extends ConnectSettingsAction
     {
         $user = common_current_user();
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'imsettings',
+                                          'id' => 'form_settings_im',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('imsettings')));
+        $this->elementStart('fieldset', array('id' => 'settings_im_address'));
+        $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
-        $this->element('h2', null, _('Address'));
-
         if ($user->jabber) {
-            $this->elementStart('p');
-            $this->element('span', 'address confirmed', $user->jabber);
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_confirmed', $user->jabber);
+            $this->element('p', 'form_note',
                            _('Current confirmed Jabber/GTalk address.'));
             $this->hidden('jabber', $user->jabber);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed', $confirm->address);
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_unconfirmed', $confirm->address);
+                $this->element('p', 'form_note',
                                sprintf(_('Awaiting confirmation on this address. '.
                                          'Check your Jabber/GTalk account for a '.
                                          'message with further instructions. '.
                                          '(Did you add %s to your buddy list?)'),
                                        jabber_daemon_address()));
                 $this->hidden('jabber', $confirm->address);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
             } else {
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('jabber', _('IM Address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
                              sprintf(_('Jabber or GTalk address, '.
@@ -123,27 +122,40 @@ class ImsettingsAction extends ConnectSettingsAction
                                        'First, make sure to add %s to your '.
                                        'buddy list in your IM client or on GTalk.'),
                                      jabber_daemon_address()));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('add', _('Add'));
             }
         }
-
-        $this->element('h2', null, _('Preferences'));
-
+        $this->elementEnd('fieldset');
+        
+        $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
+        $this->element('legend', null, _('Preferences'));
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->checkbox('jabbernotify',
                         _('Send me notices through Jabber/GTalk.'),
                         $user->jabbernotify);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('updatefrompresence',
                         _('Post a notice when my Jabber/GTalk status changes.'),
                         $user->updatefrompresence);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('jabberreplies',
                         _('Send me replies through Jabber/GTalk '.
                           'from people I\'m not subscribed to.'),
                         $user->jabberreplies);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('jabbermicroid',
                         _('Publish a MicroID for my Jabber/GTalk address.'),
                         $user->jabbermicroid);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
-
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b5c47e1bb3..2857070f81 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -79,11 +79,12 @@ top:2px;
 left:0;
 }
 
-#page_notice .error {
-background-color:#F7E8E8;
+#page_notice .error,
+#page_notice .success {
 padding:4px 7px;
 -moz-border-radius:4px;
 }
+
 form label.submit {
 display:none;
 }
@@ -666,10 +667,6 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
-.notices li.over {
-background-color:#fcfcfc;
-}
-
 
 /* NOTICES */
 #notices_primary {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8328625514..0235c2d7d8 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -71,6 +71,12 @@ background-color:rgba(255, 255, 255, 0.7);
 background-color:#fff;
 }
 
+#page_notice .error {
+background-color:#F7E8E8;
+}
+#page_notice .success {
+background-color:#EFF3DC;
+}
 
 
 
@@ -135,6 +141,11 @@ color:#555;
 
 
 /* NOTICES */
+.notices li.over {
+background-color:#fcfcfc;
+}
+
+
 .notice div.entry-content a {
 
 }

From aea172bee0f2ffdda55cc77016dd609481d7dfee Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Sun, 18 Jan 2009 21:08:56 +0000
Subject: [PATCH 185/256] trac750 Removed psychotic FB redirect hack. Found a
 better way with document.setLocation()

---
 actions/facebooksettings.php | 12 ++++++------
 js/facebookapp.js            |  9 +--------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 372c40c28c..b678f19a14 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -67,19 +67,19 @@ class FacebooksettingsAction extends FacebookAction
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
         $this->showHeader('Settings', $msg, $success);
-
-        common_element('form', array('id' => 'redirect_form',
-                                     'style' => 'display: none;'));        
                 
         common_element_start('p');
+        
+        // Figure what the URL of our app is.
+        $app_props = $facebook->api_client->Admin_getAppProperties(array('canvas_name'));
+        $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
+                
         common_element_start('fb:prompt-permission', array('perms' => 'status_update',
-            'next_fbjs' => 'redirectSettings()'));
+            'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
         common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
         common_element_end('fb:prompt-permission');
         common_element_end('p');
 
-
-
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
             common_element_start('form', array('method' => 'post',
diff --git a/js/facebookapp.js b/js/facebookapp.js
index 3f809e50cb..c7e8d6aa22 100644
--- a/js/facebookapp.js
+++ b/js/facebookapp.js
@@ -15,11 +15,4 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
- 
-// Psycho Facebook redirect hack, used because 'document.location'
-// simply does not work in FBJS
-function redirectSettings() {
-    form = document.getElementById('redirect_form');
-    form.setAction('settings.php');
-    form.submit();
-}
+ 
\ No newline at end of file

From 061de33e576ac542459fd48ab61877eece05ea39 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 21:14:47 +0000
Subject: [PATCH 186/256] SMS settings markup and styles. Minor check with
 twitter settings form_datas

---
 actions/smssettings.php     | 33 +++++++++++++++++++--------------
 actions/twittersettings.php |  2 +-
 theme/base/css/display.css  | 18 +++++++++++++-----
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 845266d18b..489fd1f587 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -93,37 +93,42 @@ class SmssettingsAction extends ConnectSettingsAction
         $this->hidden('token', common_session_token());
 
         if ($user->sms) {
-            $this->elementStart('p');
             $carrier = $user->getCarrier();
-            $this->element('span', 'address confirmed',
+            $this->element('p', 'form_confirmed',
                            $user->sms . ' (' . $carrier->name . ')');
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Current confirmed SMS-enabled phone number.'));
             $this->hidden('sms', $user->sms);
             $this->hidden('carrier', $user->carrier);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
                 $carrier = Sms_carrier::staticGet($confirm->address_extra);
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed',
+                $this->element('p', 'form_unconfirmed',
                                $confirm->address . ' (' . $carrier->name . ')');
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_guide',
                                _('Awaiting confirmation on this phone number.'));
                 $this->hidden('sms', $confirm->address);
                 $this->hidden('carrier', $confirm->address_extra);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
+
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('code', _('Confirmation code'), null,
                              _('Enter the code you received on your phone.'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('confirm', _('Confirm'));
             } else {
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('sms', _('SMS Phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
                              _('Phone number, no punctuation or spaces, '.
                                'with area code'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->carrierSelect();
                 $this->submit('add', _('Add'));
             }
@@ -131,14 +136,13 @@ class SmssettingsAction extends ConnectSettingsAction
         $this->elementEnd('fieldset');
 
         if ($user->sms) {
-            $this->element('h2', null, _('Incoming email'));
+        $this->elementStart('fieldset', array('id' => 'settings_sms_incoming_email'));
+            $this->element('legend', null, _('Incoming email'));
 
             if ($user->incomingemail) {
-                $this->elementStart('p');
-                $this->element('span', 'address', $user->incomingemail);
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_unconfirmed', $user->incomingemail);
+                $this->element('p', 'form_note',
                                _('Send email to this address to post new notices.'));
-                $this->elementEnd('p');
                 $this->submit('removeincoming', _('Remove'));
             }
 
@@ -146,6 +150,7 @@ class SmssettingsAction extends ConnectSettingsAction
                            _('Make a new email address for posting to; '.
                              'cancels the old one.'));
             $this->submit('newincoming', _('New'));
+            $this->elementEnd('fieldset');
         }
 
         $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
@@ -443,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $cnt = $carrier->find();
 
-        $this->elementStart('ul');
+        $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
         $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
         $this->elementStart('select', array('name' => 'carrier',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 597623c801..0790991232 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction
                             array('id' => 'settings_twitter_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul');
+        $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
         $this->checkbox('noticesync',
                         _('Automatically send my notices to Twitter.'),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2857070f81..08805c1e0f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -116,15 +116,19 @@ width:100%;
 float:left;
 }
 
-.form_settings .form_datas label,
+.form_settings .form_datas label {
+float:left;
+}
+.form_settings .form_datas textarea,
+.form_settings .form_datas select,
 .form_settings .form_datas input {
-margin-right:11px;
+margin-left:11px;
 float:left;
 }
 
 .form_settings label {
 margin-top:7px;
-width:123px;
+width:152px;
 }
 
 .form_actions label {
@@ -144,7 +148,7 @@ display:none;
 
 .form_settings .form_datas p.form_guide {
 clear:both;
-margin-left:134px;
+margin-left:163px;
 margin-bottom:0;
 }
 
@@ -154,11 +158,15 @@ margin-bottom:11px;
 
 .form_settings input.checkbox {
 margin-top:3px;
+margin-left:0;
 }
 .form_settings label.checkbox {
 font-weight:normal;
-width:auto;
 margin-top:0;
+margin-right:0;
+margin-left:11px;
+float:left;
+width:90%;
 }
 
 #form_login p.form_guide,

From 7749228f52d914d4949cb5fa139cdd6ade4ead6e Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 21:22:31 +0000
Subject: [PATCH 187/256] OpenID settings remove style

---
 actions/openidsettings.php |  4 ++--
 theme/base/css/display.css | 11 ++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 257aac8d08..126d2c9922 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -124,7 +124,7 @@ class OpenidsettingsAction extends AccountSettingsAction
 
             if ($cnt == 1 && !$user->password) {
 
-                $this->element('p', null,
+                $this->element('p', 'form_guide',
                                _('Removing your only OpenID '.
                                  'would make it impossible to log in! ' .
                                  'If you need to remove it, '.
@@ -162,7 +162,7 @@ class OpenidsettingsAction extends AccountSettingsAction
                     $this->element('input', array('type' => 'submit',
                                                   'id' => 'remove'.$idx,
                                                   'name' => 'remove',
-                                                  'class' => 'submit',
+                                                  'class' => 'submit remove',
                                                   'value' => _('Remove')));
                     $this->elementEnd('fieldset');
                     $this->elementEnd('form');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 08805c1e0f..76e52ffc9c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -84,18 +84,11 @@ left:0;
 padding:4px 7px;
 -moz-border-radius:4px;
 }
-
 form label.submit {
 display:none;
 }
-form .error_message {
-display:block;
-}
-.form_response {
-margin-bottom:18px;
-}
-
-form input.submit {
+.form_settings input.remove {
+margin-left:11px;
 }
 
 

From 6b23a9ed2f35e487847fe80b588eb3a967aaecb8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 21:34:57 +0000
Subject: [PATCH 188/256] Disfavor markup/style

---
 lib/disfavorform.php       | 12 ++++++++++++
 theme/base/css/display.css |  9 ++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/disfavorform.php b/lib/disfavorform.php
index f339f215a9..45a9ddb1d4 100644
--- a/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@ -103,6 +103,18 @@ class DisfavorForm extends Form
                            common_session_token());
     }
 
+
+    /**
+     * Legend of the Form
+     *
+     * @return void
+     */
+    function formLegend()
+    {
+        $this->out->element('legend', null, _('Disfavor this notice'));
+    }
+
+
     /**
      * Data elements
      *
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 76e52ffc9c..0041baf448 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -860,15 +860,18 @@ padding-left:16px;
 
 .notice-options form input.submit {
 cursor:pointer;
-padding:2px 0 2px 10px;
+width:16px;
+padding:2px 0;
 }
 
 .notice-options .notice_delete dt,
-.notice-options .form_favor legend {
+.notice-options .form_favor legend,
+.notice-options .form_disfavor legend {
 display:none;
 }
 .notice-options .notice_delete fieldset,
-.notice-options .form_favor fieldset {
+.notice-options .form_favor fieldset,
+.notice-options .form_disfavor fieldset {
 border:0;
 padding:0;
 }

From 9d384aadb1f27cea85d23c944f787cf300a4389a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 22:08:51 +0000
Subject: [PATCH 189/256] @id for site_nav_global_primary items in order to
 target for styling

---
 actions/register.php           |  1 +
 lib/action.php                 | 22 +++++++++++++---------
 theme/identica/css/display.css | 19 ++++++++++++++++---
 3 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/actions/register.php b/actions/register.php
index f0d47f19b2..08243c1e29 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -399,6 +399,7 @@ class RegisterAction extends Action
         $this->elementEnd('li');
         $attrs = array('type' => 'checkbox',
                        'id' => 'license',
+                       'class' => 'checkbox',
                        'name' => 'license',
                        'value' => 'true');
         if ($this->boolean('license')) {
diff --git a/lib/action.php b/lib/action.php
index 320814a8a0..3d61afde28 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -242,25 +242,29 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                            _('Home'));
+                            _('Home'), _('Personal timeline'), false, 'nav_home');
         }
-        $this->menuItem(common_local_url('peoplesearch'), _('Search'));
+        $this->menuItem(common_local_url('peoplesearch'),
+                        _('Search'), _('Search the site for people and text'), false, 'nav_search');
         if ($user) {
             $this->menuItem(common_local_url('profilesettings'),
-                            _('Account'));
+                            _('Account'), _('Account settings'), false, 'nav_account');
             $this->menuItem(common_local_url('imsettings'),
-                            _('Connect'));
+                            _('Connect'), _('Connect settings'), false, 'nav_connect');
             $this->menuItem(common_local_url('logout'),
-                            _('Logout'));
+                            _('Logout'), _('Logout from the site'), false, 'nav_logout');
         } else {
-            $this->menuItem(common_local_url('login'), _('Login'));
+            $this->menuItem(common_local_url('login'),
+                            _('Login'), _('Login to the site'), false, 'nav_login');
             if (!common_config('site', 'closed')) {
-                $this->menuItem(common_local_url('register'), _('Register'));
+                $this->menuItem(common_local_url('register'),
+                                _('Register'), _('Create an account'), false, 'nav_register');
             }
-            $this->menuItem(common_local_url('openidlogin'), _('OpenID'));
+            $this->menuItem(common_local_url('openidlogin'),
+                            _('OpenID'), _('Login with OpenID'), false, 'nav_openid');
         }
         $this->menuItem(common_local_url('doc', array('title' => 'help')),
-                        _('Help'));
+                        _('Help'), _('Help me!'), false, 'nav_help');
         $this->elementEnd('ul');
         $this->elementEnd('dd');
         $this->elementEnd('dl');
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 0235c2d7d8..a5b177004a 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -57,6 +57,21 @@ background-color:transparent;
 }
 
 
+#site_nav_global_primary a {
+}
+
+#nav_register a {
+background-color:#A9BF4F;
+color:#fff;
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+
+}
+#nav_login a {
+}
+
+
 #site_nav_local_views a {
 border-color:#fff;
 background-color:rgba(255, 255, 255, 0.2);
@@ -71,6 +86,7 @@ background-color:rgba(255, 255, 255, 0.7);
 background-color:#fff;
 }
 
+
 #page_notice .error {
 background-color:#F7E8E8;
 }
@@ -78,9 +94,6 @@ background-color:#F7E8E8;
 background-color:#EFF3DC;
 }
 
-
-
-
 #export_data li a {
 background-repeat:no-repeat;
 background-position:0 45%;

From c04fade6be03385213b97fff998e1b6c19ae3790 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 22:27:20 +0000
Subject: [PATCH 190/256] Using #ddd for anti-aliasing

---
 theme/identica/logo.png | Bin 2059 -> 2215 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/theme/identica/logo.png b/theme/identica/logo.png
index 4a5b5470e964d5b76269b3d69d8626e15933c089..cee36799e165697d2e03f72ffcf87e90abeed51e 100644
GIT binary patch
delta 2038
zcmV<S2MPF#5T_B4S$|njOjJc~Zf-X>H>Rehii(OVDk=^R4$sfe!NI}2$c-Ev9G|yH
z)!50j!+PfI&)C}B*w4>XQ&Y3Ev#h>mn3$NSyj;Z2q51mr+1k_NzrT#P$?Wml&Dx)Q
ze0;1^Q@eb8VPRpx(1yo=fUv=E%+s}&5D?MTznvf;xnN+Zy?<7rxk~EK&$P#G$J5wF
zMMcfk*}%(}^Y-V{-m8=j4z9vtz>12aH#f<qrl&<k+T*vl#)P`ddYK#?;ON7byv)<V
z!L7#8o+>KEn3%S1ZpYP<(%9Ok!_czG($$}zqq$Pfv$K-9%lPl_z;JNz_V}H?&B)NJ
zyw%{3xyz-;)@YW!&-nWMq%bg^!qSvP7sJ}*z0TE;3k0IU&zF2Fx69PD(B00DkCaav
zk}VLcKtPup6wJ<>%iia$%h|1BOQ51cv0-7FsXEf*>YAQ5hqTC#005h`J^%m!|NsBp
z-Q9*4ant|+0CSUZ0bG-i0UCb*?~AW~000J6Nkl<Zc-ril=UdxI5QkM=uyMu4*aic}
zgl0?$0YYd8ganch?sDnLU2?s+NdNzb+tq4UD_LbFWc!|b?)L@N*_YXw+0mL)gJ|+*
zKR4Dz$|Va4^={$<5ESOS7Cnh2h6*tm8|&IBSsxyR1A>N;7!E{ZqU(R6vDPpkT3rv#
zPYxU++4a;!V!#j#3}8wc1BI|KtXB5Mp*Cli%oK?MLYNqq_KJ$3^6WA_Ba;JzD3}lw
zi;8D-bPft4L6wKIqSCMOw(&q~KoB`H!t$PCtK!4pVZr&FjODW8q}jj|!Upk#*ngxr
z%kV{g01$>FHeDE$;&y*PS1>`46=PL#RhhshLWgJ&+Z*l>Mp(o`huFuaXFV8{BI$BM
zhaj_2_JS~6kq8-L5*yz3WH6$l6*5E}8?JamD0me~h71wI5aSFGxK`vsh9Ggtz@Sv{
z!y!ZD{6IV!FvKbg#Q6UZLxNZyB}DSykR8721g_f?Awv|HnhAehOF=pc28cwEwIdcX
zggVCBPACd!{r~*<=1T|aV0Y#yJcuOo3RYbH`_20frIY(%LENx(xtf0dv18TAgOGYm
zJRe05hLxW>Hu}cS<l5SrPly;>$-G?X*lOBh?)><w4Rv^Y?gOIEl%kg%Cz&Wx7i~kw
zDZid@Z!uREIxK$_>r-u7hwJ{nJC<A-t`|ElI(1-Zx2M+GAoNc6%#C5=H)_c5=Srp0
z<vq$ZTWNhRtPH>xDJF=5cY;=aHwOH=f}Jzhmm(MKem(Y6tc;ShcV+_Gs4R8gkm2sx
z#tCx8dD~7Y_OksD6KD<f^6cg~tm5VI$|^j6Z^uAWXr+Ji7?1ni%eTK0h))a<4I@D}
zHn;6J?LLxlu*}mB_{J_Yb)^sc`4zbJ{I!1eg1w*EC|9-}cMeIpE?J|6Bn=Ep><4t~
zId%odnxNe!x9!U>`bdj?Axm8G6x3>c(6{=%Z<!$`S@uxvBLb>~Z#^&|{_+h`@B=Z|
zpS@I)Vu*iVd_yF|gHX|!x37H1g!u=KC;N>;E-(bjj+ct!Gdmjej&TfapC?-LG}^>|
zgDoc3(V(wyVV(GViyiUK6M}q`=US%Smqfi4gQ{!Wg*%Sf@r;7Fuq~KV-W3xi=zPI_
z+k6@ib?H(k?29(T+5!6gvE+^C#{GRf)Z(?7fvkUFJ5G)`^j^yA$s3lABi(UWJIM7J
z2S<RFJjm~&?(<=yC>bq9+TIZ_Qfhb*52%)=)EAVn!2|uw)r;fDYwM4V#%AhM&|iqX
zTmb@O&N3IBts^zHPFme}A0Wrnhj%G8T!{1*-BZq495EC2Z{-d;HFdTnIy+G_F$@SJ
zO`(4lu8msRIY|!<!c6g1xyQ;7DujAU$Hg<8p3`0o;X<fKJAI!$2d5$bV9!!7EErp9
zb@&j#8#6mDU*toA0GhG+2pu|vx=SKL9UVmaK!^Bagb?ae<6~oV5PDdgs3V0yVKFme
z2rVp*MhpSNVkhvnG7lt%6BhSbA+qtFY$AW@0R{0-gzxn-5mQ*CSs~(ZP%#9E41BQ`
z$Y)&7I%rS`?Z4qi0HM8%W9beMHSnq&4FMt#kMqGGR58Ov)es<5AyX67fDm?u13?5A
zmlc5Y%o2H7Zc-2tP6E@6QzxQ5DDpjCzbyzF1h@=c85Q&cQ{HM8s^mPHk$Ul_)nR{}
z7EjvMh}6SEqhw`tCS}o>FqbpvN`&}<JkQy<FdH{n(9@vTYet+Pc(YM8D&y051Vixj
z1D+5Oiv^CnAUQx}dlra{<y@d1kWqoxj`cEc15q_zfHM-M42bp+nh}|oi7o9&l1Ta^
zh-Q<DMmjKUAT--?VgWIs5qK8}5v6}S@wS92p#cFdNWLJzM1Vh14L?yuBe+2bXea|h
z5F`@>um69{5a5Lf{e(d5Fhl6N8-)5_fRK4jwV^`fEfC;Yp{iF@W(ZN%s}qkRInQxI
z)-r+{gjAKx)4_?d-|5hvi<1<sao7SHL6lq|L~F5X8s`~55U4H+=5klVi#>iFW&IGi
z#>Q<bWYiBtmAqn<NYt_5wa6I)yCO^C3;RYERX-3BGJ#eLx+{dZ6++~I&<dOfH{*f|
zuIOuR7Wz}p=<9P7J_)R8Z|H9uhpGUNwHKo`zN#0fY?HR2!paxVLkp(0;~xPA0AQkX
UODj}$lmGw#07*qoM6N<$f{EAP?*IS*

delta 1904
zcmV-$2aout5sMIzS$_*qOjJdGe}6zgK)=7gpP!!)5D+jhFy`#fp}9)=`t$Ga@9gp0
zw8w6_U|_DoV&C82&DowHARzef@8iF}mJkr~_UFOShmX0-ogg6h`uxw&&tPC+sJ&L|
z&(E)~ui4|a)t{fvkB{*7_>Yf|&Dx)y!qRYXaL0gvy3BjL)qmitKtQB0Fu~A<rN`Fc
z?D4eF-ShV6)84D-@%2zpP}AP3mc7riP*BI!liK6A$A5pv)sni)dfczC@!#LTaB$$~
z!qVgF!`b8D=)=R><dj4g`1<^mPaBdg5ReN5t<2fV-shKmE3INn%iiajsXENgo2|>)
znw~bGqC%G&6dH%L$d3R3o3uUv00960|NsC01|KS600014lfMC6e*jN~0S^EG1|dmA
zK~#9!?3s6a;y4h8UBN);C6qu2gap!ol*^{xW^dc|qgdbnlbmcd+qlS%fqm||-#^&c
z9=(iaMq?p>DAJy9Gsy)~rrN21_eqFA&^cZ>)XG;j3Zdnb3pZ60n}hH`Ffl5dfk<Z;
zK1xnE0Wn<!=vZ4je?)Z=sBC4;5F89}O44hEa4=;0cL_sRr!6~0WsMLvhSr^?Go??h
zDU;RK2GOx0=niT3*63UpM8)!3?=^i@*5sY82_nPh{7!e3_91#$2q7mUnby5@8hJwa
zAXozYtb2?3BC!St=7=jF23^ZWbOjd#HJ;IZm8P(j*ddthe@lM|78d!~A#RE3(*Oot
zqopKv2s#_-APDA)O3V=S=Vb#KSX4}7hDZ>@{a^^4RMu+D5P6#Y91x^dWMYP(amm4;
z_sPvMLuA50B-RX(`5)p(f=F%?qWU9bN2oeM>UK6}hz?gXfz^uAQE)(1qO2YHm?1!t
zx1G>+*!utefBo(A+|ce#_c1<*D)$PeCI5Q+GPmetKQ4%8o-WtaAHU3<Iw{4}W0LvM
z0vPuGnY-vGH<Rb*=OH2Td?j<gJa^TO!`#8}dS>Wwcn|_2!Ih%>b1&H_>K8MnVLhxT
z{9DYu@|=faT$@>SI1cyT(eh;|?#_Mm;K4AP)y8}ff4I}V_hY#H)tV7UrBZ2s$KslD
z5zmE_0s5lO1<?sk(Ei_Sz|kIY&e2MWT+CMW8m3sWl5}@(1G?<D7H@3+UE>6~;$Y^c
zI)B;zKnTo+I(d4PFsgVu(Kq{zFK!H03bS+$$+*|UkAG5#ZyXS5mY|nc9=oaEX*f9M
zsY@>0e;B5&@vs-4;H85@e0Ij)Ph6(^-ut<<T$h~DLX*ZYMf`v+(a8~b6Lit?+rIpa
zN7`KpS?Y>CSgY}%AMv#_ZU~KM57j*)43(&l7{p6xh)x)Yqt)!SBq@RTEi^<mJ_sBW
zwNIgA!u|(G>o(oVM20}wG1T>t*^##H80XRUe|cqkY}-h_P4mUX7#HfAQ70~F1%C;I
zpzq|FscrYAl9=WVCCu%@k!N;1Ss*T43uZ02Vxj~+?)Yz;@6f{NQzzVuHpkil`~76~
zIdJ2iHZ;3MI|E(AMqZ9M3|`6;)n}fLqd50iJLvaa4@bb2Jj(x~{_|m@D6y8J=<bNK
ze>#W{qGWCISAx=L@L)f4eKveOAHTB3ruHrBKg2<<fPr!3n2UM&5!A=D)qVMDaMZrO
z)Iq!uMO&YH<Zwhc?*Ga?^kD03OV;c}&BP`kfbG4bTx7L!ep1{Rgq>of@9;9j3IQIh
zaq&b>c7hn<g#eGEmDir#hj{-h=c*SDe~fYwY#su7qdW3>Bi|4NRM+JtbmI`<hDHR~
z9t3?wf7&7h*kdmn+k?PiaRRmqfx@D@We77Y9=8l(gvBWGwz3E%#}gL&ybz7TQn8UN
zp`!RFB`%lElr1cZybuLrP&o#Ort#n)lFx*tbI_;|=C2XA0AW5%V(A?a1Nf+te~SU4
zZ5+3wK>)ca<UkA%Kxz&o5D~)7a3qN65*iW|&Ma9}l!*l*C8%(kN$RA`8)b1R;>(g`
zLcp&LSLP&qV9Q(6LXV#3n(DGJaXL&e<4Gckj)g{PDCkUWpfQbHZlZ5e)DQH2!NrA*
zg3SU>gXMCP@`4cUMnO&?r-c-Oe-N!V1VW@776kf$>H*PMIv|>kbIEdpf(pEOjLW<W
zM2|gS%t+2+Kz4^PjVPi*ZJ9@^O4A=fOeU6Sv<9XNglW4#Eg&W|g6IPwqjaa<R#7En
z5bz5%6a<_I_@NHS9X&LHAB2R4Vi1y~+8{*y`?w+C11akr61Bq(f%QHJfAC*`P()LM
zjY6~?5b$29hbt;KgskA|B%(-e3xd>ejNk{M_Eh_H2(l7(I?VeDG(`sjv4BR9RUZi1
zS*#}Pycq@p)kVo(?gnJBw?^421gWtFmkOB+1JR?8uo8(n7P1z3Ll9RqXnYahC^85G
zk)jjmw18b96`T;V0EJfIN;bS$kO2G!ueA-spGp(2&pG2xXw7^AKg|w-WE`6h<_2O9
q7pTU>Y5^FPuh2Fu*w&7J1sDJkSA|{q9Rd0P0000<MNUMnLSTZ9WVAT|


From 910bd332430b0af233ae78b330994520d4b59c97 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 00:10:42 +0000
Subject: [PATCH 191/256] Minimal cross browser styling (mostly IE7). w00t!

---
 lib/action.php                 |  2 +-
 theme/base/css/display.css     | 28 ++++++++++++++++++----------
 theme/identica/css/display.css | 20 ++++++++++++++++----
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 3d61afde28..c463c84593 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -138,7 +138,7 @@ class Action extends HTMLOutputter // lawsuit
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
                 // Yes, IE people should be put in jail.
                 $this->comment('[if lte IE '.$ver.']><link rel="stylesheet" type="text/css" '.
-                               'href="'.theme_path('ie'.$ver.'.css').'?version='.LACONICA_VERSION.'" /><![endif]');
+                               'href="'.theme_path('css/ie'.$ver.'.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
             }
         }
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 0041baf448..5a52780fca 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -48,13 +48,18 @@ input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
--moz-border-radius:4px;
 }
-input:focus, textarea:focus, select:focus {
+input, textarea, select {
 border-width:2px;
 border-style: solid;
+-moz-border-radius:4px;
+}
+input.submit {
+font-weight:bold;
+}
+textarea {
+overflow:auto;
 }
-
 select, option {
 padding-bottom:0;
 }
@@ -73,10 +78,11 @@ font-weight:bold;
 form ul li input {
 }
 
-form input.checkbox {
+input.checkbox {
 position:relative;
 top:2px;
 left:0;
+border:0;
 }
 
 #page_notice .error,
@@ -120,7 +126,7 @@ float:left;
 }
 
 .form_settings label {
-margin-top:7px;
+margin-top:2px;
 width:152px;
 }
 
@@ -388,9 +394,7 @@ display:none;
 }
 #form_notice textarea {
 -moz-border-radius:4px;
-width:304px;
 width:377px;
-height:95px;
 height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
@@ -416,7 +420,6 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:125px;
 top:116px;
 right:98px;
 z-index:9;
@@ -445,10 +448,14 @@ text-indent:-9999px;
 }
 #form_notice .form_actions {
 position:absolute;
-top:107px;
-top:98px;
+bottom:0;
 right:0;
 }
+#form_notice .form_actions input.submit {
+width:60px;
+padding:8px;
+}
+
 #form_notice li {
 margin-bottom:0;
 }
@@ -715,6 +722,7 @@ font-style:italic;
 
 .notice .entry-title {
 float:left;
+width:100%;
 }
 .notice p.entry-content {
 display:inline;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index a5b177004a..8a11303873 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -5,13 +5,23 @@ background-color:#ddd;
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
+background-color:#ddd;
 }
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
-input:focus, textarea:focus, select:focus {
-border-color:#B2D0DD;
+input, textarea, select {
+border-color:#aaa;
 }
+
+input:focus, textarea:focus, select:focus {
+border-color:#A9BF4F;
+}
+input.submit {
+background-color:#A9BF4F;
+color:#fff;
+}
+
 a {
 color:#002E6E;
 }
@@ -33,7 +43,8 @@ background-color:#fcfffc;
 background-color:#CEE1E9;
 }
 
-
+#form_notice textarea {
+}
 
 #form_notice label {
 color:#88171A;
@@ -59,7 +70,8 @@ background-color:transparent;
 
 #site_nav_global_primary a {
 }
-
+#form_notice .form_actions input.submit {
+}
 #nav_register a {
 background-color:#A9BF4F;
 color:#fff;

From 8f9762aab183a8bf502d734ec5f18ca0e68f48cb Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 00:48:12 +0000
Subject: [PATCH 192/256] Cross-browser stuff

---
 lib/action.php                 |  2 ++
 theme/base/css/display.css     | 35 +++++++++++++++++++++++++++++-----
 theme/base/css/ie.css          | 26 +++++++++++++++++++++++++
 theme/base/css/ie7.css         |  5 +++++
 theme/identica/css/display.css |  4 ++++
 5 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 theme/base/css/ie.css
 create mode 100644 theme/base/css/ie7.css

diff --git a/lib/action.php b/lib/action.php
index c463c84593..9cd2d5a184 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -134,6 +134,8 @@ class Action extends HTMLOutputter // lawsuit
                                      'type' => 'text/css',
                                      'href' => theme_path('css/display.css', null) . '?version=' . LACONICA_VERSION,
                                      'media' => 'screen, projection, tv'));
+        $this->comment('[if IE]><link rel="stylesheet" type="text/css" '.
+                       'href="'.theme_path('css/ie.css', 'base').'?version='.LACONICA_VERSION.'" /><![endif]');
         foreach (array(6,7) as $ver) {
             if (file_exists(theme_file('ie'.$ver.'.css'))) {
                 // Yes, IE people should be put in jail.
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 5a52780fca..06860e30d9 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -52,7 +52,9 @@ font-size:1em;
 input, textarea, select {
 border-width:2px;
 border-style: solid;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 input.submit {
 font-weight:bold;
@@ -88,7 +90,9 @@ border:0;
 #page_notice .error,
 #page_notice .success {
 padding:4px 7px;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -175,7 +179,9 @@ margin-left:0;
 
 
 .form_settings .form_note {
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 padding:0 7px;
 }
 
@@ -206,6 +212,7 @@ margin-bottom:29px;
 
 #site_nav_global_primary {
 float:right;
+margin-right:18px;
 }
 #site_nav_global_primary ul li {
 display:inline;
@@ -236,8 +243,8 @@ margin-bottom:18px;
 
 #footer {
 float:left;
-width:68%;
-padding-bottom:11px;
+width:64%;
+padding:18px;
 }
 
 
@@ -260,6 +267,8 @@ text-decoration:none;
 padding:4px 11px;
 -moz-border-radius-topleft:4px;
 -moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
@@ -328,8 +337,8 @@ margin-bottom:11px;
 line-height:1.5;
 }
 
-
-#site_content_license_cc p {
+#site_content_license_cc {
+margin-bottom:0;
 }
 #site_content_license_cc img {
 display:inline;
@@ -357,12 +366,17 @@ margin-bottom:1em;
 width:644px;
 padding:18px;
 float:left;
+border-radius:7px;
 -moz-border-radius:7px;
 -moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
 }
 
 #content_inner {
 position:relative;
+width:100%;
+float;left;
 }
 
 #aside_primary {
@@ -370,7 +384,9 @@ width:300px;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 
 
@@ -393,8 +409,11 @@ padding:0;
 display:none;
 }
 #form_notice textarea {
--moz-border-radius:4px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
 width:377px;
+width:370px;
 height:86px;
 line-height:1.5;
 padding:7px 7px 14px 7px;
@@ -680,7 +699,9 @@ list-style-type:none;
 #notices_primary {
 float:left;
 width:644px;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 }
 #notices_primary h2 {
 display:none;
@@ -919,11 +940,13 @@ border-bottom:0;
 
 .pagination .nav_prev a {
 -moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
 padding-left:20px;
 border-left:0;
 }
 .pagination .nav_next a {
 -moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
 padding-right:20px;
 border-right:0;
 }
@@ -1138,7 +1161,9 @@ height:109px;
 border-width:1px;
 border-style:dotted;
 text-decoration:none;
+border-radius:7px;
 -moz-border-radius:7px;
+-webkit-border-radius:7px;
 padding:7px;
 font-size:1.6em;
 font-weight:bold;
diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
new file mode 100644
index 0000000000..ef64da9537
--- /dev/null
+++ b/theme/base/css/ie.css
@@ -0,0 +1,26 @@
+/* IE specific styles */
+
+#aside_primary {
+padding-left:11px;
+}
+.notice-options form input.submit {
+font-size:0;
+margin-top:3px;
+height:16px;
+text-align:right;
+text-indent:0;
+color:#fff;
+width:24px;
+}
+
+input.checkbox {
+top:0;
+}
+
+legend {
+margin-left:-7px;
+}
+
+.notice div.entry-content .timestamp a {
+display:inline;
+}
\ No newline at end of file
diff --git a/theme/base/css/ie7.css b/theme/base/css/ie7.css
new file mode 100644
index 0000000000..a6e2548ab0
--- /dev/null
+++ b/theme/base/css/ie7.css
@@ -0,0 +1,5 @@
+/* IE7 specific styles */
+
+#form_notice textarea {
+width:370px;
+} 
\ No newline at end of file
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 8a11303873..eb7b47a127 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -30,11 +30,15 @@ background-color:#ddd;
 }
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
+border-radius:4px;
 -moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
 
 

From 12f7ec980ceb40d5241b63b88e7601e293c9f277 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 19 Jan 2009 00:50:45 +0000
Subject: [PATCH 193/256] trac750 Better workflow for asking user for status
 update permission

---
 actions/facebookhome.php     | 94 ++++++++++++++++++++++++++++++++++--
 actions/facebooksettings.php | 49 ++++++++++++-------
 lib/facebookaction.php       | 60 +++++++++++------------
 lib/facebookutil.php         | 26 +++++-----
 4 files changed, 166 insertions(+), 63 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 46f886451c..d211e8844d 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -31,14 +31,41 @@ class FacebookhomeAction extends FacebookAction
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
+        // If the user has opted not to initially allow the app to have
+        // Facebook status update permission, store that preference. Only
+        // promt the user the first time she uses the app
+        if ($this->arg('skip')) {
+            $facebook->api_client->data_setUserPreference(
+                FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
+        }
+
         // Check to see whether there's already a Facebook link for this user
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
         if ($flink) {
+
             $user = $flink->getUser();
             common_set_user($user);
+
+            // If this is the first time the user has started the app
+            // prompt for Facebook status update permission
+            if (!$facebook->api_client->users_hasAppPermission('status_update')) {
+
+                if ($facebook->api_client->data_getUserPreference(
+                        FACEBOOK_PROMPTED_UPDATE_PREF) != 'true') {
+                    $this->getUpdatePermission();
+                    return;
+                }
+            }
+
+            // Use is authenticated and has already been prompted once for
+            // Facebook status update permission? Then show the main page
+            // of the app
             $this->showHome($flink, null);
+
         } else {
+
+            // User hasn't authenticated yet, prompt for creds
             $this->login($fbuid);
         }
 
@@ -73,16 +100,18 @@ class FacebookhomeAction extends FacebookAction
                 // XXX: Do some error handling here
 
                 $this->setDefaults();
-                $this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
+                //$this->showHome($flink, _('You can now use Identi.ca from Facebook!'));
+
+                $this->getUpdatePermission();
                 return;
-                
+
             } else {
                 $msg = _('Incorrect username or password.');
             }
         }
 
         $this->showLoginForm($msg);
-        
+
     }
 
     function setDefaults()
@@ -90,7 +119,10 @@ class FacebookhomeAction extends FacebookAction
         $facebook = get_facebook();
 
         // A default prefix string for notices
-        $facebook->api_client->data_setUserPreference(1, 'dented: ');
+        $facebook->api_client->data_setUserPreference(
+            FACEBOOK_NOTICE_PREFIX, 'dented: ');
+        $facebook->api_client->data_setUserPreference(
+            FACEBOOK_PROMPTED_UPDATE_PREF, 'false');
     }
 
     function showHome($flink, $msg)
@@ -138,4 +170,58 @@ class FacebookhomeAction extends FacebookAction
         return $nl->show();
     }
 
+    function getUpdatePermission() {
+
+        $facebook = get_facebook();
+        $fbuid = $facebook->require_login();
+
+        start_fbml();
+
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => getFacebookCSS()));
+
+        $this->showLogo();
+
+        common_element_start('div', array('class' => 'content'));
+
+        // Figure what the URL of our app is.
+        $app_props = $facebook->api_client->Admin_getAppProperties(
+                array('canvas_name', 'application_name'));
+        $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/index.php';
+        $app_name = $app_props['application_name'];
+
+        $instructions = sprintf(_('If you would like the %s app to automatically update ' .
+            'your Facebook status with your latest notice, you need ' .
+            'to give it permission.'), $app_name);
+
+        common_element_start('p');
+        common_element('span', array('id' => 'permissions_notice'), $instructions);
+        common_element_end('p');
+
+        common_element_start('form', array('method' => 'post',
+                                           'action' => $app_url,
+                                           'id' => 'facebook-skip-permissions'));
+
+        common_element_start('ul', array('id' => 'fb-permissions-list'));
+        common_element_start('li', array('id' => 'fb-permissions-item'));
+        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+            'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
+        common_element('span', array('class' => 'facebook-button'),
+            _('Allow Identi.ca to update my Facebook status'));
+        common_element_end('fb:prompt-permission');
+        common_element_end('li');
+
+        common_element_start('li', array('id' => 'fb-permissions-item'));
+        common_submit('skip', _('Skip'));
+        common_element_end('li');
+        common_element_end('ul');
+
+        common_element_end('form');
+        common_element_end('div');
+
+        common_end_xml();
+
+    }
+
 }
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index b678f19a14..84e9a343bf 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -50,12 +50,13 @@ class FacebooksettingsAction extends FacebookAction
         $flink->set_flags($noticesync, $replysync, false);
         $result = $flink->update($original);
 
-        $facebook->api_client->data_setUserPreference(1, substr($prefix, 0, 128));
+        $facebook->api_client->data_setUserPreference(FACEBOOK_NOTICE_PREFIX,
+            substr($prefix, 0, 128));
 
         if ($result) {
-            $this->show_form('Sync preferences saved.', true);
+            $this->showForm('Sync preferences saved.', true);
         } else {
-            $this->show_form('There was a problem saving your sync preferences!');
+            $this->showForm('There was a problem saving your sync preferences!');
         }
     }
 
@@ -67,18 +68,7 @@ class FacebooksettingsAction extends FacebookAction
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
         $this->showHeader('Settings', $msg, $success);
-                
-        common_element_start('p');
-        
-        // Figure what the URL of our app is.
-        $app_props = $facebook->api_client->Admin_getAppProperties(array('canvas_name'));
-        $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
-                
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
-            'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
-        common_element('h2', null, _('Allow Identi.ca to update my Facebook status'));
-        common_element_end('fb:prompt-permission');
-        common_element_end('p');
+
 
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
@@ -90,11 +80,11 @@ class FacebooksettingsAction extends FacebookAction
             common_checkbox('noticesync', _('Automatically update my Facebook status with my notices.'),
                                 ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND) : true);
 
-            common_checkbox('replysync', _('Send local "@" replies to Facebook.'),
+            common_checkbox('replysync', _('Send "@" replies to Facebook.'),
                              ($flink) ? ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) : true);
 
             $prefix = $facebook->api_client->data_getUserPreference(1);
-            
+
 
             common_input('prefix', _('Prefix'),
                          ($prefix) ? $prefix : null,
@@ -103,6 +93,31 @@ class FacebooksettingsAction extends FacebookAction
 
             common_element_end('form');
 
+        } else {
+
+            // Figure what the URL of our app is.
+            $app_props = $facebook->api_client->Admin_getAppProperties(
+                    array('canvas_name', 'application_name'));
+            $app_url = 'http://apps.facebook.com/' . $app_props['canvas_name'] . '/settings.php';
+            $app_name = $app_props['application_name'];
+
+            $instructions = sprintf(_('If you would like the %s app to automatically update ' .
+                'your Facebook status with your latest notice, you need ' .
+                'to give it permission.'), $app_name);
+
+            common_element_start('p');
+            common_element('span', array('id' => 'permissions_notice'), $instructions);
+            common_element_end('p');
+
+            common_element_start('ul', array('id' => 'fb-permissions-list'));
+            common_element_start('li', array('id' => 'fb-permissions-item'));
+            common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+                'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
+            common_element('span', array('class' => 'facebook-button'),
+                _('Allow Identi.ca to update my Facebook status'));
+            common_element_end('fb:prompt-permission');
+            common_element_end('li');
+            common_element_end('ul');
         }
 
         $this->showFooter();
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index a8f16b34a6..0a364851fe 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -17,7 +17,7 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { 
+if (!defined('LACONICA')) {
     exit(1);
 }
 
@@ -32,9 +32,9 @@ class FacebookAction extends Action
     }
 
     function showLogo(){
-        
+
         global $xw;
-        
+
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookCSS()));
@@ -47,14 +47,14 @@ class FacebookAction extends Action
                                             'href' => common_local_url('public')));
         if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
             common_element('img', array('class' => 'logo photo',
-                'src' => (common_config('site', 'logo')) ? 
+                'src' => (common_config('site', 'logo')) ?
                     common_config('site', 'logo') : theme_path('logo.png'),
                 'alt' => common_config('site', 'name')));
         }
-         
+
         common_element('span', array('class' => 'fn org'), common_config('site', 'name'));
         common_element_end('a');
-    
+
     }
 
     function showHeader($selected = 'Home', $msg = null, $success = false)
@@ -76,25 +76,25 @@ class FacebookAction extends Action
 
         common_element_start('ul', array('class' => 'nav'));
 
-        common_element_start('li', array('class' => 
+        common_element_start('li', array('class' =>
             ($selected == 'Home') ? 'current' : 'facebook_home'));
-        common_element('a', 
+        common_element('a',
             array('href' => 'index.php', 'title' => _('Home')), _('Home'));
         common_element_end('li');
 
-        
-        common_element_start('li', 
+
+        common_element_start('li',
             array('class' =>
                 ($selected == 'Invite') ? 'current' : 'facebook_invite'));
-        common_element('a', 
+        common_element('a',
             array('href' => 'invite.php', 'title' => _('Invite')), _('Invite'));
         common_element_end('li');
 
-        common_element_start('li', 
+        common_element_start('li',
             array('class' =>
                 ($selected == 'Settings') ? 'current' : 'facebook_settings'));
-        common_element('a', 
-            array('href' => 'settings.php', 
+        common_element('a',
+            array('href' => 'settings.php',
                 'title' => _('Settings')), _('Settings'));
         common_element_end('li');
 
@@ -125,24 +125,24 @@ class FacebookAction extends Action
 
     function showInstructions()
     {
-        global $xw; 
-        
+        global $xw;
+
         common_element_start('dl', array('class' => 'system_notice'));
         common_element('dt', null, 'Page Notice');
-    
+
         $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' .
-            'with your username and password. Don\'t have a username yet? '); 
-        
+            'with your username and password. Don\'t have a username yet? ');
+
         $loginmsg_part2 = _(' a new account.');
-        
+
         common_element_start('dd');
         common_element_start('p');
         common_text(sprintf($loginmsg_part1, common_config('site', 'name')));
-        common_element('a', 
+        common_element('a',
             array('href' => common_local_url('register')), _('Register'));
         common_text($loginmsg_part2);
         common_element_end('dd');
-        common_element_end('dl');        
+        common_element_end('dl');
     }
 
     function showLoginForm($msg = null)
@@ -154,14 +154,14 @@ class FacebookAction extends Action
                                      'href' => getFacebookCSS()));
 
         $this->showLogo();
-                                 
+
         common_element_start('div', array('class' => 'content'));
         common_element('h1', null, _('Login'));
-   
+
         if ($msg) {
              common_element('fb:error', array('message' => $msg));
         }
-        
+
         $this->showInstructions();
 
         common_element_start('div', array('id' => 'content_inner'));
@@ -169,19 +169,19 @@ class FacebookAction extends Action
         common_element_start('form', array('method' => 'post',
                                                'id' => 'login',
                                                'action' => 'index.php'));
-    
+
         common_element_start('fieldset');
         common_element('legend', null, _('Login to site'));
-        
+
         common_element_start('ul', array('class' => 'form_datas'));
-        common_element_start('li');                                             
+        common_element_start('li');
         common_input('nickname', _('Nickname'));
         common_element_end('li');
         common_element_start('li');
         common_password('password', _('Password'));
         common_element_end('li');
         common_element_end('ul');
-        
+
         common_submit('submit', _('Login'));
         common_element_end('form');
 
@@ -189,7 +189,7 @@ class FacebookAction extends Action
         common_element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
         common_element_end('p');
-        
+
         common_element_end('div');
 
         common_end_xml();
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 61469b3c64..74e5945923 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -21,6 +21,8 @@ require_once INSTALLDIR.'/extlib/facebook/facebook.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 
 define("FACEBOOK_SERVICE", 2); // Facebook is foreign_service ID 2
+define("FACEBOOK_NOTICE_PREFIX", 1);
+define("FACEBOOK_PROMPTED_UPDATE_PREF", 2);
 
 // Gets all the notices from users with a Facebook link since a given ID
 function get_facebook_notices($since)
@@ -106,18 +108,18 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
 }
 
 function getFacebookCSS()
-{    
+{
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
     $ts = filemtime(theme_file('facebookapp.css'));
-    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";   
+    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";
     return $cssurl;
 }
 
 function getFacebookJS() {
-    
+
     # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes
     $ts = filemtime(INSTALLDIR.'/js/facebookapp.js');
-    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";   
+    $jsurl = common_path('js/facebookapp.js') . "?ts=$ts";
     return $jsurl;
 }
 
@@ -157,7 +159,7 @@ class FacebookNoticeList extends NoticeList
 
         return $cnt;
     }
-    
+
     /**
      * returns a new list item for the current notice
      *
@@ -173,7 +175,7 @@ class FacebookNoticeList extends NoticeList
     {
         return new FacebookNoticeListItem($notice);
     }
-    
+
 }
 
 class FacebookNoticeListItem extends NoticeListItem
@@ -190,7 +192,7 @@ class FacebookNoticeListItem extends NoticeListItem
     function show()
     {
         $this->showStart();
-        
+
         common_element_start('div', 'entry-title');
         $this->showAuthor();
         $this->showContent();
@@ -201,10 +203,10 @@ class FacebookNoticeListItem extends NoticeListItem
         $this->showNoticeSource();
         $this->showReplyTo();
         common_element_end('div');
-        
+
         $this->showEnd();
     }
-    
+
     function showStart()
     {
         // XXX: RDFa
@@ -222,9 +224,9 @@ class FacebookNoticeListItem extends NoticeListItem
             preg_match('/^http/', $this->notice->uri)) {
             $noticeurl = $this->notice->uri;
         }
-        
+
         common_element_start('dl', 'timestamp');
-        common_element('dt', null, _('Published')); 
+        common_element('dt', null, _('Published'));
         common_element_start('dd', null);
         common_element_start('a', array('rel' => 'bookmark',
                                         'href' => $noticeurl));
@@ -237,5 +239,5 @@ class FacebookNoticeListItem extends NoticeListItem
         common_element_end('dl');
     }
 
-} 
+}
 

From 2637433093e28b2e6bdc38bba417d728d934a5e6 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 01:04:22 +0000
Subject: [PATCH 194/256] text-shadow for local a

---
 theme/base/css/display.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 06860e30d9..716f3256f5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -272,6 +272,7 @@ padding:4px 11px;
 border-width:1px;
 border-style:solid;
 border-bottom:0;
+text-shadow: 4px 4px 4px #ddd;
 font-weight:bold;
 }
 #site_nav_local_views .nav {

From 64bda5bd6ca58289c3a525a20c2dc27501fb1cf8 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 19 Jan 2009 01:34:25 +0000
Subject: [PATCH 195/256] trac750 New CSS files for FB app to allow bettter
 per-install theming

---
 lib/facebookaction.php |  6 +++++-
 lib/facebookutil.php   | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 0a364851fe..fd171c4578 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -37,7 +37,11 @@ class FacebookAction extends Action
 
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookCSS()));
+                                     'href' => getFacebookBaseCSS()));
+
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => getFacebookThemeCSS()));
 
         common_element('script', array('type' => 'text/javascript',
                                        'src' => getFacebookJS()),
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 74e5945923..0bde68c0f6 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -107,14 +107,22 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
     $facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
 }
 
-function getFacebookCSS()
+function getFacebookBaseCSS()
 {
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(theme_file('facebookapp.css'));
-    $cssurl = theme_path('facebookapp.css') . "?ts=$ts";
+    $ts = filemtime(theme_file('facebookapp_base.css'));
+    $cssurl = theme_path('facebookapp_base.css') . "?ts=$ts";
     return $cssurl;
 }
 
+function getFacebookThemeCSS() 
+{
+    # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
+    $ts = filemtime(theme_file('facebookapp_theme.css'));
+    $cssurl = theme_path('facebookapp_theme.css') . "?ts=$ts";
+    return $cssurl;   
+}
+
 function getFacebookJS() {
 
     # Add a timestamp to the FBJS file so Facebook cache wont ignore our changes

From 323432aec3da49b23c3fb270e42427abea745101 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 01:48:04 +0000
Subject: [PATCH 196/256] Facebook base and theme stylesheets. Copy of site
 display.css files for now.

---
 theme/base/css/facebookapp.base.css      |  285 ++++++
 theme/identica/css/facebookapp.theme.css | 1177 ++++++++++++++++++++++
 2 files changed, 1462 insertions(+)
 create mode 100644 theme/base/css/facebookapp.base.css
 create mode 100644 theme/identica/css/facebookapp.theme.css

diff --git a/theme/base/css/facebookapp.base.css b/theme/base/css/facebookapp.base.css
new file mode 100644
index 0000000000..eb7b47a127
--- /dev/null
+++ b/theme/base/css/facebookapp.base.css
@@ -0,0 +1,285 @@
+/* theme: identica */
+html {
+background-color:#ddd;
+}
+body {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-size:1em;
+background-color:#ddd;
+}
+input, textarea, select, option {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+input, textarea, select {
+border-color:#aaa;
+}
+
+input:focus, textarea:focus, select:focus {
+border-color:#A9BF4F;
+}
+input.submit {
+background-color:#A9BF4F;
+color:#fff;
+}
+
+a {
+color:#002E6E;
+}
+a:active {
+background-color:#ddd;
+}
+.notice p.entry-content a:visited {
+background-color:#fcfcfc;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+.notice p.entry-content .vcard a {
+background-color:#fcfffc;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+
+
+
+#aside_primary {
+background-color:#CEE1E9;
+}
+
+#form_notice textarea {
+}
+
+#form_notice label {
+color:#88171A;
+}
+#notice_text-count {
+color:#333;
+}
+#form_notice.warning #notice_text-count {
+color:#000;
+background-color:#A9BF4F;
+}
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
+}
+
+#form_notice #notice_data-attach_view {
+background-image:url(../images/icons/twotone/green/paper-clip.gif);
+background-repeat:no-repeat;
+background-position:0 45%;
+background-color:transparent;
+}
+
+
+#site_nav_global_primary a {
+}
+#form_notice .form_actions input.submit {
+}
+#nav_register a {
+background-color:#A9BF4F;
+color:#fff;
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+
+}
+#nav_login a {
+}
+
+
+#site_nav_local_views a {
+border-color:#fff;
+background-color:rgba(255, 255, 255, 0.2);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);
+}
+
+
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+
+#page_notice .error {
+background-color:#F7E8E8;
+}
+#page_notice .success {
+background-color:#EFF3DC;
+}
+
+#export_data li a {
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+#export_data li a.rss {
+background-image:url(../../base/images/icons/icon_rss.jpg);
+}
+#export_data li a.atom {
+background-image:url(../../base/images/icons/icon_atom.jpg);
+}
+#export_data li a.foaf {
+background-image:url(../../base/images/icons/icon_foaf.gif);
+}
+#export_data li a.export_vcard {
+background-image:url(../../base/images/icons/icon_vcard.gif);
+}
+
+
+/*user_actions*/
+#user_actions li {
+border-top-color:#eee;
+}
+#user_actions a {
+color:#000;
+}
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
+}
+.form_user_unsubscribe input.submit {
+background-color:#647819;
+color:#fff;
+}
+#user_send-a-message a {
+background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+}
+.form_user_nudge input.submit {
+background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+}
+.form_user_block input.submit {
+background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+}
+
+
+.user_tags .mark_hash {
+color:#555;
+}
+
+
+
+.vcard .fn {
+}
+.vcard .fn:hover {
+}
+
+
+
+
+/* NOTICES */
+.notices li.over {
+background-color:#fcfcfc;
+}
+
+
+.notice div.entry-content a {
+
+}
+.notice div.entry-content a:hover {
+}
+
+
+.notice-data a span {
+background-color:transparent;
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+.notice_video .notice-data a span {
+background-image:url(../images/icons/twotone/green/camera.gif);
+}
+.notice_audio .notice-data a span {
+background-image:url(../images/icons/twotone/green/music.gif);
+}
+.notice_image .notice-data a span {
+background-image:url(../images/icons/twotone/green/search.gif);
+}
+.notice_event .notice-data a span {
+background-image:url(../images/icons/twotone/green/calendar.gif);
+}
+.notice_location .notice-data a span {
+background-image:url(../images/icons/twotone/green/flag.gif);
+}
+.notice_document .notice-data a span {
+background-image:url(../images/icons/twotone/green/document.gif);
+}
+
+.notice-options .notice_reply a,
+.notice-options form input.submit {
+background-color:transparent;
+}
+.notice-options .notice_reply a {
+background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+}
+.notice-options form.form_favor input.submit {
+background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+}
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+}
+.notice-options .notice_delete a {
+background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+}
+
+div.notice-options {
+opacity:0.3;
+}
+
+div.entry-content {
+color:#333;
+}
+div.notice-options a,
+div.notice-options input {
+font-family:sans-serif;
+}
+div.notice-options input {
+color:#002E6E;
+
+}
+.notices li.hover {
+background-color:#fcfcfc;
+}
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
+opacity:1;
+}
+
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
+
+/*END: NOTICES */
+
+
+
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-repeat:no-repeat;
+}
+.pagination .nav_prev a {
+background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-position:0 45%;
+}
+.pagination .nav_next a {
+background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-position:100% 45%;
+}
+
+
+
+#home #intro #guide_steps li a {
+border-color:#ccc;
+color:#fff;
+}
+#home #intro #step_join-now a {
+background-color:#f00;
+}
+#home #intro #step_start-a-group a {
+background-color:#0f0;
+}
+#home #intro #step_create-a-community a {
+background-color:#00f;
+}
+
diff --git a/theme/identica/css/facebookapp.theme.css b/theme/identica/css/facebookapp.theme.css
new file mode 100644
index 0000000000..716f3256f5
--- /dev/null
+++ b/theme/identica/css/facebookapp.theme.css
@@ -0,0 +1,1177 @@
+/* theme: base */
+* { margin:0; padding:0; }
+img { display:block; border:0; }
+a abbr { cursor: pointer; border-bottom:0; }
+table { border-collapse:collapse; }
+ol { list-style-position:inside; }
+html { font-size: 87.5%; background-color:#fff; height:100%; }
+body {
+background-color:#fff;
+color:#000;
+font-family:sans-serif;
+font-size:1em;
+line-height:1.65;
+position:relative;
+margin:0 auto;
+width:1004px;
+width:71.714em;
+}
+h1,h2,h3,h4,h5,h6 {
+	text-transform:uppercase;
+	margin-bottom:7px;
+}
+h1 {
+font-size:1.4em;
+line-height:1;
+margin-bottom:18px;
+}
+h2 { font-size:1.3em; }
+h3 { font-size:1.2em; }
+h4 { font-size:1.1em; }
+h5 { font-size:1em; }
+h6 { font-size:0.9em; }
+
+caption {
+font-weight:bold;
+}
+.opened { display: block !important;}
+.closed { display: none !important;}
+
+legend {
+font-weight:bold; 
+font-size:1.3em;
+text-transform:uppercase;
+}
+form {
+}
+input, textarea, select, option {
+padding:4px;
+font-family:sans-serif;
+font-size:1em;
+}
+input, textarea, select {
+border-width:2px;
+border-style: solid;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+input.submit {
+font-weight:bold;
+}
+textarea {
+overflow:auto;
+}
+select, option {
+padding-bottom:0;
+}
+fieldset {
+padding:0;
+border:0;
+}
+form ul li {
+list-style-type:none;
+margin:0 0 18px 0;
+}
+form label {
+font-weight:bold;
+/*margin:0 0 11px 0;*/
+}
+form ul li input {
+}
+
+input.checkbox {
+position:relative;
+top:2px;
+left:0;
+border:0;
+}
+
+#page_notice .error,
+#page_notice .success {
+padding:4px 7px;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+form label.submit {
+display:none;
+}
+.form_settings input.remove {
+margin-left:11px;
+}
+
+
+
+
+/* FORM SETTINGS */
+.form_settings fieldset {
+margin-bottom:29px;
+}
+
+.form_guide {
+font-style:italic;
+}
+
+
+.form_settings .form_datas li {
+width:100%;
+float:left;
+}
+
+.form_settings .form_datas label {
+float:left;
+}
+.form_settings .form_datas textarea,
+.form_settings .form_datas select,
+.form_settings .form_datas input {
+margin-left:11px;
+float:left;
+}
+
+.form_settings label {
+margin-top:2px;
+width:152px;
+}
+
+.form_actions label {
+display:none;
+}
+
+.form_settings #settings_autosubscribe label {
+display:inline;
+font-weight:bold;
+}
+
+#form_settings_profile legend,
+#form_login legend,
+#form_register legend {
+display:none;
+}
+
+.form_settings .form_datas p.form_guide {
+clear:both;
+margin-left:163px;
+margin-bottom:0;
+}
+
+.form_settings p {
+margin-bottom:11px;
+}
+
+.form_settings input.checkbox {
+margin-top:3px;
+margin-left:0;
+}
+.form_settings label.checkbox {
+font-weight:normal;
+margin-top:0;
+margin-right:0;
+margin-left:11px;
+float:left;
+width:90%;
+}
+
+#form_login p.form_guide,
+#form_register #settings_rememberme p.form_guide {
+margin-left:0;
+}
+
+
+.form_settings .form_note {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+padding:0 7px;
+}
+
+/* FORM SETTINGS */
+
+
+
+
+address {
+float:left;
+margin-bottom:18px;
+margin-left:18px;
+}
+address .fn,
+address .email {
+display:none;
+}
+
+
+
+#header {
+width:100%;
+position:relative;
+float:left;
+padding-top:18px;
+margin-bottom:29px;
+}
+
+#site_nav_global_primary {
+float:right;
+margin-right:18px;
+}
+#site_nav_global_primary ul li {
+display:inline;
+margin-left:11px;
+}
+
+
+.system_notice dt {
+font-weight:bold;
+text-transform:uppercase;
+display:none;
+}
+
+#site_notice {
+position:absolute;
+right:0;
+top:49px;
+float:right;
+width:322px;
+}
+#page_notice {
+clear:both;
+margin-bottom:18px;
+}
+
+
+
+
+#footer {
+float:left;
+width:64%;
+padding:18px;
+}
+
+
+
+#site_nav_local_views {
+width:100%;
+float:left;
+}
+#site_nav_local_views dt {
+display:none;
+}
+#site_nav_local_views li {
+float:left;
+margin-right:18px;
+list-style-type:none;
+}
+#site_nav_local_views a {
+float:left;
+text-decoration:none;
+padding:4px 11px;
+-moz-border-radius-topleft:4px;
+-moz-border-radius-topright:4px;
+-webkit-border-top-left-radius:4px;
+-webkit-border-top-right-radius:4px;
+border-width:1px;
+border-style:solid;
+border-bottom:0;
+text-shadow: 4px 4px 4px #ddd;
+font-weight:bold;
+}
+#site_nav_local_views .nav {
+float:left;
+width:100%;
+}
+
+
+#site_nav_global_primary dt,
+#site_nav_global_secondary dt {
+display:none;
+}
+/*
+#site_nav_global_primary .current a {
+font-weight:bold;
+border-style:solid;
+}
+*/
+#site_nav_global_secondary {
+margin-bottom:11px;
+}
+
+#site_nav_global_secondary ul li {
+display:inline;
+margin-right:11px;
+}
+#export_data li a {
+padding-left:20px;
+}
+#export_data li a.foaf {
+padding-left:30px;
+}
+#export_data li a.export_vcard {
+padding-left:28px;
+}
+
+
+
+#export_data ul {
+display:inline;
+}
+#export_data li {
+list-style-type:none;
+display:inline;
+margin-left:11px;
+}
+#export_data li:first-child {
+margin-left:0;
+}
+
+
+
+#licenses {
+font-size:0.9em;
+}
+
+#licenses dt {
+font-weight:bold;
+display:none;
+}
+#licenses dd {
+margin-bottom:11px;
+line-height:1.5;
+}
+
+#site_content_license_cc {
+margin-bottom:0;
+}
+#site_content_license_cc img {
+display:inline;
+vertical-align:top;
+margin-right:4px;
+}
+
+
+#wrap {
+	float:left;
+	margin:0 auto;
+    width:1004px;
+    width:71.714em;
+}
+
+
+#core {
+position:relative;
+width:100%;
+float:left;
+margin-bottom:1em;
+}
+
+#content {
+width:644px;
+padding:18px;
+float:left;
+border-radius:7px;
+-moz-border-radius:7px;
+-moz-border-radius-topleft:0;
+-webkit-border-radius:7px;
+-webkit-border-top-left-radius:0;
+}
+
+#content_inner {
+position:relative;
+width:100%;
+float;left;
+}
+
+#aside_primary {
+width:300px;
+float:left;
+margin-left:2px;
+padding:18px 4px 18px 18px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
+
+
+
+
+/*Start: FORM NOTICE*/
+#form_notice {
+width:384px;
+width:458px;
+float:left;
+margin-left:68px;
+position:relative;
+line-height:1;
+}
+#form_notice fieldset {
+border:0;
+padding:0;
+}
+#form_notice legend {
+display:none;
+}
+#form_notice textarea {
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+width:377px;
+width:370px;
+height:86px;
+line-height:1.5;
+padding:7px 7px 14px 7px;
+}
+#form_notice label {
+display:block;
+font-size:1.3em;
+margin-bottom:7px;
+}
+#form_notice .form_datas li {
+float:left;
+}
+
+#form_notice #notice_attach_file label,
+#form_notice #notice_submit label {
+display:none;
+}
+
+#form_notice #notice_attachment {
+margin-top:25px;
+margin-left:4px;
+}
+
+#form_notice .form_note {
+position:absolute;
+top:116px;
+right:98px;
+z-index:9;
+}
+
+#form_notice .form_note dt {
+font-weight:bold;
+display:none;
+}
+#notice_text-count {
+font-weight:bold;
+line-height:1.15;
+}
+
+#form_notice #notice_data-attach_view {
+/*position:absolute;*/
+top:25px;
+right:30px;
+margin-left:4px;
+padding:0;
+cursor:pointer;
+width:16px;
+height:16px;
+border:0;
+text-indent:-9999px;
+}
+#form_notice .form_actions {
+position:absolute;
+bottom:0;
+right:0;
+}
+#form_notice .form_actions input.submit {
+width:60px;
+padding:8px;
+}
+
+#form_notice li {
+margin-bottom:0;
+}
+/*end FORM NOTICE*/
+
+
+
+
+
+/* user_profile */
+#user_profile {
+position:relative;
+width:633px;
+min-height:123px;
+float:left;
+margin-bottom:17px;
+margin-left:0;
+}
+#user_profile dt,
+#user_statistics dt {
+font-weight:bold;
+}
+#user_profile .user_depiction {
+float:left;
+position:absolute;
+top:0;
+left:0;
+width:96px;
+}
+#user_profile .user_fn,
+#user_profile .user_nickname,
+#user_profile .user_location,
+#user_profile .user_url,
+#user_profile .user_note,
+#user_profile .user_tags {
+float:left;
+clear:left;
+margin-left:125px;
+width:322px;
+margin-bottom:4px;
+}
+
+#user_profile .user_fn,
+#user_profile .user_nickname {
+width:auto;
+clear:none;
+}
+#user_profile .user_nickname {
+margin-left:11px;
+}
+#user_profile .user_nickname .nickname {
+font-style:italic;
+font-weight:bold;
+margin-left:4px;
+margin-right:4px;
+}
+
+#user_profile .user_nickname dd:before {
+content: "(";
+}
+#user_profile .user_nickname dd:after {
+content: ")";
+}
+
+#user_profile dt {
+display:none;
+}
+#user_profile h2 {
+display:none;
+}
+/* user_profile */
+
+/*user_actions*/
+#user_actions {
+clear:left;
+float:left;
+position:absolute;
+top:0;
+right:0;
+}
+#user_actions h2 {
+display:none;
+}
+#user_actions ul {
+list-style-type:none;
+}
+#user_actions li {
+border-top-width:1px;
+border-top-style:dotted;
+}
+#user_actions li:first-child {
+border-top:0;
+}
+#user_actions fieldset {
+border:0;
+padding:0;
+}
+#user_actions legend {
+display:none;
+}
+
+#user_actions a,
+#user_actions input.submit {
+display:block;
+text-align:left;
+padding:4px 0 4px 19px;
+}
+#user_actions a {
+text-decoration:none;
+}
+#user_subscribe a,
+#TB_window input.submit,
+#user_actions input.submit {
+border:0;
+cursor:pointer;
+padding-left:16px;
+width:100%;
+font-size:0.9em;
+}
+
+#user_subscribe a {
+width:auto;
+padding-left:20px;
+}
+
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+font-weight:bold;
+}
+
+
+
+#user_send-a-message form {
+clear:left;
+width:322px;
+margin-top:18px;
+}
+
+#user_send-a-message textarea {
+width:96%;
+}
+
+.user_tags ul {
+list-style-type:none;
+}
+.user_tags li {
+display:inline;
+margin-right:1em;
+float:left;
+}
+
+
+
+.aside .section {
+margin-bottom:29px;
+clear:both;
+}
+.aside .section h2 {
+text-transform:uppercase;
+font-size:1em;
+}
+
+#user_statistics dt,
+#user_statistics dd {
+display:inline;
+}
+#user_statistics dt:after {
+content: ":";
+}
+
+
+#user_subscriptions,
+#user_subscriptions-common {
+float:left;
+}
+#user_subscriptions ul.users {
+width:220px;
+float:left;
+}
+#user_subscriptions .users li {
+list-style-type:none;
+float:left;
+margin-right:7px;
+margin-bottom:7px;
+}
+#user_subscriptions .users li .photo {
+width:24px;
+height:24px;
+margin-right:0;
+}
+#user_subscriptions .users li .fn {
+display:none;
+}
+.aside .section .more {
+clear:both;
+}
+
+
+
+
+
+/* NOTICE */
+.notice {
+position:relative;
+padding-top:18px;
+padding-bottom:18px;
+clear:both;
+float:left;
+width:644px;
+width:96.699%;
+width:100%;
+border-top:1px dashed #D1D9E4;
+/*-moz-border-radius:7px;*/
+}
+.notices li {
+list-style-type:none;
+/*margin-bottom:11px;*/
+}
+
+/* NOTICES */
+#notices_primary {
+float:left;
+width:644px;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+}
+#notices_primary h2 {
+display:none;
+}
+.notice-data a span {
+display:block;
+padding-left:28px;
+}
+
+
+.notice .author {
+margin-right:11px;
+}
+.notice .author a {
+}
+.notice .author:after {
+/*content:":";*/
+}
+
+.vcard .photo {
+display:inline;
+margin-right:7px;
+margin-bottom:7px;
+float:left;
+}
+.vcard .url {
+text-decoration:none;
+}
+.vcard .url:hover {
+text-decoration:underline;
+}
+.vcard .fn {
+font-style:italic;
+}
+.vcard .fn:hover {
+
+}
+
+
+.notice .entry-title {
+float:left;
+width:100%;
+}
+.notice p.entry-content {
+display:inline;
+}
+
+.notice_video p.entry-content,
+.notice_audio p.entry-content,
+.notice_image p.entry-content,
+.notice_location p.entry-content,
+.notice_event p.entry-content,
+.notice_document p.entry-content {
+}
+#laconicat .notice p.entry-content {
+/*margin-left:199px;*/
+}
+.notice p.entry-content a {
+
+}
+.notice p.entry-content a:hover {
+
+}
+.notice p.entry-content .tag a {
+
+}
+.notice p.entry-content .tag a:hover {
+
+}
+
+
+.notice div.entry-content {
+/*border:1px solid blue;*/
+clear:left;
+float:left;
+width:48%;
+font-size:0.95em;
+}
+.notice div.entry-content a,
+.notice .notice-options a,
+.notice .notice-options input {
+
+}
+.notice .notice-options a,
+.notice .notice-options input {
+float:left;
+font-size:1.025em;
+}
+
+#laconicat .notice div.entry-content {
+/*margin-left:0;*/
+}
+
+.notice div.entry-content dl,
+.notice div.entry-content dt,
+.notice div.entry-content dd {
+display:inline;
+}
+.notice div.entry-content .timestamp dt,
+.notice div.entry-content .response dt {
+display:none;
+}
+.notice div.entry-content .timestamp a {
+display:inline-block;
+}
+.notice div.entry-content .device dt {
+text-transform:lowercase;
+}
+.notice div.entry-content a {
+
+}
+.notice div.entry-content a:hover {
+}
+
+
+
+.notice-data {
+position:absolute;
+top:18px;
+right:0;
+min-height:50px;
+margin-bottom:4px;
+}
+.notice .entry-content .notice-data dt {
+display:none;
+}
+
+.notice-data a {
+display:block;
+outline:none;
+}
+
+.notice-options {
+padding-left:2%;
+float:left;
+width:50%;
+position:relative;
+font-size:0.95em;
+}
+
+.notice-options a {
+float:left;
+}
+.notice-options .notice_delete,
+.notice-options .notice_reply,
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+position:absolute;
+top:0;
+}
+.notice-options .form_favor,
+.notice-options .form_disfavor {
+left:0;
+}
+.notice-options .notice_reply {
+left:29px;
+}
+.notice-options .notice_delete {
+left:76px;
+}
+.notice-options .notice_reply dt {
+display:none;
+}
+
+.notice-options input,
+.notice-options a {
+text-indent:-9999px;
+outline:none;
+}
+
+.notice-options .notice_reply a,
+.notice-options form input.submit {
+display:block;
+border:0;
+}
+.notice-options .notice_reply a,
+.notice-options .notice_delete a {
+text-decoration:none;
+padding-left:16px;
+}
+
+.notice-options .notice_delete {
+
+}
+
+.notice-options form input.submit {
+cursor:pointer;
+width:16px;
+padding:2px 0;
+}
+
+.notice-options .notice_delete dt,
+.notice-options .form_favor legend,
+.notice-options .form_disfavor legend {
+display:none;
+}
+.notice-options .notice_delete fieldset,
+.notice-options .form_favor fieldset,
+.notice-options .form_disfavor fieldset {
+border:0;
+padding:0;
+}
+
+/*END: NOTICES */
+
+
+
+
+
+.pagination dt {
+font-weight:bold;
+display:none;
+}
+
+.pagination .nav {
+float:left;
+width:100%;
+list-style-type:none;
+}
+
+.pagination .nav_prev {
+float:left;
+}
+.pagination .nav_next {
+float:right;
+}
+
+.pagination a {
+display:block;
+text-decoration:none;
+font-weight:bold;
+padding:7px;
+border:1px dotted #D1D9E4;
+border-bottom:0;
+}
+
+.pagination .nav_prev a {
+-moz-border-radius-topright:7px;
+-webkit-border-top-right-radius:7px;
+padding-left:20px;
+border-left:0;
+}
+.pagination .nav_next a {
+-moz-border-radius-topleft:7px;
+-webkit-border-top-left-radius:7px;
+padding-right:20px;
+border-right:0;
+}
+
+
+/* END: NOTICE */
+
+
+
+
+
+
+
+/*START: LOAD ALONG WITH JS*/
+.notice .in-reply-to {
+	width:98%;
+	margin-left:2%;
+}
+.notice .in-reply-to li {
+background-color:#F7F9FB;
+}
+.notice .in-reply-to li .in-reply-to li {
+background-color:#E4E9F0;
+}
+.notice .in-reply-to li .in-reply-to li .in-reply-to li {
+background-color:#D1D9E4;
+}
+
+
+
+#user_actions #user_subscribe .form_note,
+#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_actions label {
+display:none;
+}
+#form_user-relationship .form_note,
+#form_user-relationship .form_datas,
+#form_user-relationship .form_actions label {
+display:block;
+}
+
+#user_actions #user-relationship_submit {
+margin-bottom:0;
+}
+#form_user-relationship .form_datas li label {
+margin-right:11px;
+}
+
+#user_relationship_xfn {
+/*z-index:1000;
+position:absolute;
+width:521px;
+height:322px;*/
+display:none;
+}
+#user_relationship_xfn fieldset {
+background-color:#fff;
+}
+
+/*END: LOAD ALONG WITH JS*/
+
+
+
+/* TOP_POSTERS */
+#top-posters caption {
+text-align:left;
+text-transform:uppercase;
+}
+
+#top-posters thead {
+display:none;
+}
+#top-poster_user {
+width:199px;
+}
+#top-poster_number-of-notices {
+width:123px;
+}
+#top-posters tbody td {
+padding-right:11px;
+padding-bottom:4px;
+}
+#top-posters img {
+margin-right:7px;
+height:24px;
+width:24px;
+}
+
+
+
+/* tagcloud */
+#tagcloud ul {
+list-style-type:none;
+}
+#tagcloud ul li {
+display:inline;
+margin-right:7px;
+line-height:1.4;
+}
+
+#tagcloud.section dt {
+text-transform:uppercase;
+font-weight:bold;
+}
+#tagcloud .weight_1 {
+font-size:1em;
+}
+#tagcloud .weight_2 {
+font-size:1.3em;
+}
+#tagcloud .weight_3 {
+font-size:1.6em;
+}
+#tagcloud .weight_4 {
+font-size:1.9em;
+}
+#tagcloud .weight_5 {
+font-size:2.2em;
+}
+
+
+
+#form_settings_photo .form_datas {
+clear:both;
+}
+
+
+
+
+#photo_original,
+#photo_preview {
+float:left;
+}
+#photo_preview,
+#settings_photo_action-crop {
+margin-left:29px;
+}
+#photo_preview_view {
+height:96px;
+width:96px;
+overflow:hidden;
+}
+
+
+
+
+.section .groups,
+#users_featured ul {
+list-style-type:none;
+}
+.section .groups li,
+#users_featured li {
+margin-top:11px;
+float:left;
+width:100%;
+}
+.section .groups li:first-child,
+#users_featured li:first-child {
+margin-top:0;
+}
+
+.section .groups .vcard,
+#users_featured .vcard {
+float:left;
+margin-bottom:-23px;
+}
+
+.section .groups dl,
+#users_featured dl {
+float:left;
+margin-left:63px;
+clear:left;
+}
+.section .groups dt,
+#users_featured dt {
+display:none;
+font-weight:bold;
+}
+
+
+
+#home.logged_out h1 {
+display:none;
+}
+
+#home #intro {
+margin-bottom:29px;
+float:left;
+width:100%;
+}
+
+#home #intro p {
+margin-bottom:18px;
+font-size:1.8em;
+}
+
+#home #intro #guide_steps {
+list-style-type:none;
+}
+#home #intro #guide_steps li {
+float:left;
+margin-left:18px;
+}
+#home #intro #guide_steps li:first-child {
+margin-left:0;
+}
+#home #intro #guide_steps li a {
+display:block;
+float:left;
+width:185px;
+height:109px;
+border-width:1px;
+border-style:dotted;
+text-decoration:none;
+border-radius:7px;
+-moz-border-radius:7px;
+-webkit-border-radius:7px;
+padding:7px;
+font-size:1.6em;
+font-weight:bold;
+text-align:center;
+}
+
+
+#testimonials {
+clear:both;
+}

From 5f2fce04cb7726f44b797908b073e22e399b8be2 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 19 Jan 2009 01:59:31 +0000
Subject: [PATCH 197/256] trac750 Updated paths for new css files; deleted old
 unused css file

---
 lib/facebookutil.php           |   8 +-
 theme/identica/facebookapp.css | 161 ---------------------------------
 2 files changed, 4 insertions(+), 165 deletions(-)
 delete mode 100644 theme/identica/facebookapp.css

diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index 0bde68c0f6..cc4941bdc1 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -110,16 +110,16 @@ function update_profile_box($facebook, $fbuid, $user, $notice)
 function getFacebookBaseCSS()
 {
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(theme_file('facebookapp_base.css'));
-    $cssurl = theme_path('facebookapp_base.css') . "?ts=$ts";
+    $ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css');
+    $cssurl = INSTALLDIR.'/theme/base/css/facebookapp.base.css' . "?ts=$ts";
     return $cssurl;
 }
 
 function getFacebookThemeCSS() 
 {
     # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
-    $ts = filemtime(theme_file('facebookapp_theme.css'));
-    $cssurl = theme_path('facebookapp_theme.css') . "?ts=$ts";
+    $ts = filemtime(theme_file('css/facebookapp.theme.css'));
+    $cssurl = theme_path('css/facebookapp.theme.css') . "?ts=$ts";
     return $cssurl;   
 }
 
diff --git a/theme/identica/facebookapp.css b/theme/identica/facebookapp.css
deleted file mode 100644
index b2bbbac510..0000000000
--- a/theme/identica/facebookapp.css
+++ /dev/null
@@ -1,161 +0,0 @@
-
-/* XXX: Most of this just copied out of display.css -- need to factor out what we really neeed -- Zach */
-
-body {
-    color: #193441;
-}
-
-a {
-color: #d1451a;
-text-decoration: none;
-}
-a:hover {
-text-decoration: underline;
-}
-img, img a {
-border: 0;
-}
-h1 {
-font-size: 14px;
-}
-
-#wrap {
-margin: 0 auto;
-padding: 0 20px;
-width: 760px;
-background: url(bg-header.gif) repeat-x #fbf2d7;
-}
-
-
-#notices {
-clear: both;
-margin: 0 auto;
-padding: 0;
-list-style-type: none;
-width: 600px;
-border-top: 1px solid #dec5b5;
-}
-#notices a:hover {
-text-decoration: underline;
-}
-.notice_single {
-clear: both;
-display: block;
-margin: 0;
-padding: 5px 5px 5px 0;
-min-height: 48px;
-font-family: Georgia, "Times New Roman", Times, serif;
-font-size: 13px;
-line-height: 16px;
-border-bottom: 1px solid #dec5b5;
-background-color:#FCFFF5;
-opacity:1;
-}
-.notice_single:hover {
-background-color: #f7ebcc;
-}
-.notice_single p {
-display: inline;
-margin: 0;
-padding: 0;
-}
-#notice_delete_form #confirmation_text {
-   display: block;
-font-size: 14px;
-font-weight: bold;
-}
-
-input#submit_yes, input#submit_no {
-margin: 18px 10px 0px 0px;
-padding: 4px;
-font-weight: bold;
-color: #fff6d5;
-background-color: #F60;
-cursor: pointer;
-border: 0;
-width: 40px;
-}
-input#submit_yes:hover, input#submit_no:hover {
-background-color: #701238;
-}
-.avatar.stream {
-float: left;
-margin: 0 10px 0.5em 0;
-}
-p.time {
-display: block;
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
-line-height: 15px;
-}
-p.time a {
-color: #dab134;
-}
-
-
-/* ----- Forms General Style ----- */
-form {
-	margin: 0 auto;
-	padding: 0;
-	}
-form {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	}
-form label {
-	display: block;
-	font-size: 12px;
-	font-weight: bold;
-	line-height: 18px;
-	}
-form input {
-	border: 1px solid #dec5b5;
-	width: 264px;
-	}
-input#submit, input.submit  {
-	display: block;
-	margin: 18px 0;
-	padding: 4px;
-	font-weight: bold;
-	color: #fff6d5;
-	background-color: #F60;
-	cursor: pointer;
-	border: 0;
-	width: auto;
-	}
-input#submit:hover, input.submit:hover {
-	background-color: #701238;
-	}
-input.checkbox {
-	/*width: 14px;
-	height: 14px;*/
-	width: auto;
-	border: 0;
-	}
-
-label.checkbox_label {
-    display: inline;
-    font-weight: normal;
-}
-
-textarea, input {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-	color: #701238;
-	padding: 3px;
-	}
-textarea:focus, input:focus {
-	background-color: #f8ebc0;
-	}
-textarea {
-	width: 270px;
-	border: 1px solid #D8E2D7;
-	}
-.input_instructions {
-	margin-top: 3px;
-	display: block;
-	font-size: 11px;
-	line-height: 15px;
-	color: #924959;
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	}

From 6fa7ac1305d516c6a50ae1f2008e71539baa4ff2 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 02:06:40 +0000
Subject: [PATCH 198/256] Started default stylesheet. Grouped colours for
 themeing.

---
 theme/default/css/display.css                 | 243 ++++++++++++++++++
 theme/identica/css/display.css                |  96 ++-----
 .../icons/twotone/green/disfavourite.gif      | Bin 0 -> 88 bytes
 3 files changed, 270 insertions(+), 69 deletions(-)
 create mode 100644 theme/default/css/display.css
 create mode 100644 theme/identica/images/icons/twotone/green/disfavourite.gif

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
new file mode 100644
index 0000000000..877c833fe5
--- /dev/null
+++ b/theme/default/css/display.css
@@ -0,0 +1,243 @@
+/* theme: identica */
+html,
+body,
+a:active {
+background-color:#ddd;
+}
+body {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+font-size:1em;
+}
+input, textarea, select, option {
+font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
+}
+input, textarea, select {
+border-color:#aaa;
+}
+
+input.submit,
+#form_notice.warning #notice_text-count,
+#nav_register a,
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
+
+input:focus, textarea:focus, select:focus,
+#form_notice.warning #notice_data-text {
+border-color:#A9BF4F;
+}
+input.submit,
+#nav_register a {
+color:#fff;
+}
+
+a,
+div.notice-options input {
+color:#002E6E;
+}
+
+.notice p.entry-content a:visited {
+background-color:#fcfcfc;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+.notice p.entry-content .vcard a {
+background-color:#fcfffc;
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+
+#aside_primary,
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background-color:#CEE1E9;
+}
+
+
+#notice_text-count {
+color:#333;
+}
+#form_notice.warning #notice_text-count,
+#user_actions a {
+color:#000;
+}
+
+#form_notice #notice_data-attach_view {
+background-image:url(../images/icons/twotone/green/paper-clip.gif);
+background-repeat:no-repeat;
+background-position:0 45%;
+background-color:transparent;
+}
+
+#nav_register a {
+text-decoration:none;
+font-weight:bold;
+padding:2px 4px;
+}
+
+#site_nav_local_views a {
+border-color:#fff;
+background-color:rgba(255, 255, 255, 0.2);
+}
+#site_nav_local_views a:hover {
+background-color:rgba(255, 255, 255, 0.7);
+}
+
+
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+
+#page_notice .error {
+background-color:#F7E8E8;
+}
+#page_notice .success {
+background-color:#EFF3DC;
+}
+
+#export_data li a {
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+#export_data li a.rss {
+background-image:url(../../base/images/icons/icon_rss.jpg);
+}
+#export_data li a.atom {
+background-image:url(../../base/images/icons/icon_atom.jpg);
+}
+#export_data li a.foaf {
+background-image:url(../../base/images/icons/icon_foaf.gif);
+}
+#export_data li a.export_vcard {
+background-image:url(../../base/images/icons/icon_vcard.gif);
+}
+
+
+/*user_actions*/
+#user_actions li {
+border-top-color:#eee;
+}
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
+background-image: url(../images/icons/twotone/green/shield.gif);
+background-position: 0 45%;
+background-repeat: no-repeat;
+}
+.form_user_unsubscribe input.submit {
+background-color:#647819;
+color:#fff;
+}
+#user_send-a-message a {
+background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+}
+.form_user_nudge input.submit {
+background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+}
+.form_user_block input.submit {
+background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+}
+
+
+/* NOTICES */
+.notices li.over {
+background-color:#fcfcfc;
+}
+
+.notice-data a span {
+background-color:transparent;
+background-repeat:no-repeat;
+background-position:0 45%;
+}
+.notice_video .notice-data a span {
+background-image:url(../images/icons/twotone/green/camera.gif);
+}
+.notice_audio .notice-data a span {
+background-image:url(../images/icons/twotone/green/music.gif);
+}
+.notice_image .notice-data a span {
+background-image:url(../images/icons/twotone/green/search.gif);
+}
+.notice_event .notice-data a span {
+background-image:url(../images/icons/twotone/green/calendar.gif);
+}
+.notice_location .notice-data a span {
+background-image:url(../images/icons/twotone/green/flag.gif);
+}
+.notice_document .notice-data a span {
+background-image:url(../images/icons/twotone/green/document.gif);
+}
+
+.notice-options .notice_reply a,
+.notice-options form input.submit {
+background-color:transparent;
+}
+.notice-options .notice_reply a {
+background:transparent url(../images/icons/twotone/green/reply.gif) no-repeat 0 45%;
+}
+.notice-options form.form_favor input.submit {
+background:transparent url(../images/icons/twotone/green/favourite.gif) no-repeat 0 45%;
+}
+.notice-options form.form_disfavor input.submit {
+background:transparent url(../images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
+}
+.notice-options .notice_delete a {
+background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0 45%;
+}
+
+div.notice-options {
+opacity:0.3;
+}
+
+div.entry-content {
+color:#333;
+}
+div.notice-options a,
+div.notice-options input {
+font-family:sans-serif;
+}
+.notices li.hover {
+background-color:#fcfcfc;
+}
+.notices li.hover div.entry-content,
+.notices li.hover div.notice-options {
+opacity:1;
+}
+
+/*END: NOTICES */
+
+
+
+.pagination .nav_prev a,
+.pagination .nav_next a {
+background-repeat:no-repeat;
+}
+.pagination .nav_prev a {
+background-image:url(../images/icons/twotone/green/arrow-left.gif);
+background-position:0 45%;
+}
+.pagination .nav_next a {
+background-image:url(../images/icons/twotone/green/arrow-right.gif);
+background-position:100% 45%;
+}
+
+
+
+#home #intro #guide_steps li a {
+border-color:#ccc;
+color:#fff;
+}
+#home #intro #step_join-now a {
+background-color:#f00;
+}
+#home #intro #step_start-a-group a {
+background-color:#0f0;
+}
+#home #intro #step_create-a-community a {
+background-color:#00f;
+}
\ No newline at end of file
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index eb7b47a127..877c833fe5 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -1,11 +1,12 @@
 /* theme: identica */
-html {
+html,
+body,
+a:active {
 background-color:#ddd;
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
-background-color:#ddd;
 }
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
@@ -14,20 +15,27 @@ input, textarea, select {
 border-color:#aaa;
 }
 
-input:focus, textarea:focus, select:focus {
+input.submit,
+#form_notice.warning #notice_text-count,
+#nav_register a,
+.form_settings .form_note {
+background-color:#A9BF4F;
+}
+
+input:focus, textarea:focus, select:focus,
+#form_notice.warning #notice_data-text {
 border-color:#A9BF4F;
 }
-input.submit {
-background-color:#A9BF4F;
+input.submit,
+#nav_register a {
 color:#fff;
 }
 
-a {
+a,
+div.notice-options input {
 color:#002E6E;
 }
-a:active {
-background-color:#ddd;
-}
+
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
 border-radius:4px;
@@ -41,27 +49,20 @@ border-radius:4px;
 -webkit-border-radius:4px;
 }
 
-
-
-#aside_primary {
+#aside_primary,
+#user_subscribe a,
+#TB_window input.submit,
+.form_user_subscribe input.submit {
 background-color:#CEE1E9;
 }
 
-#form_notice textarea {
-}
 
-#form_notice label {
-color:#88171A;
-}
 #notice_text-count {
 color:#333;
 }
-#form_notice.warning #notice_text-count {
+#form_notice.warning #notice_text-count,
+#user_actions a {
 color:#000;
-background-color:#A9BF4F;
-}
-#form_notice.warning #notice_data-text {
-border-color:#A9BF4F;
 }
 
 #form_notice #notice_data-attach_view {
@@ -71,22 +72,11 @@ background-position:0 45%;
 background-color:transparent;
 }
 
-
-#site_nav_global_primary a {
-}
-#form_notice .form_actions input.submit {
-}
 #nav_register a {
-background-color:#A9BF4F;
-color:#fff;
 text-decoration:none;
 font-weight:bold;
 padding:2px 4px;
-
 }
-#nav_login a {
-}
-
 
 #site_nav_local_views a {
 border-color:#fff;
@@ -132,13 +122,12 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 #user_actions li {
 border-top-color:#eee;
 }
-#user_actions a {
-color:#000;
-}
 #user_subscribe a,
 #TB_window input.submit,
 .form_user_subscribe input.submit {
-background:#CEE1E9 url(../images/icons/twotone/green/shield.gif) 0 45% no-repeat;
+background-image: url(../images/icons/twotone/green/shield.gif);
+background-position: 0 45%;
+background-repeat: no-repeat;
 }
 .form_user_unsubscribe input.submit {
 background-color:#647819;
@@ -155,33 +144,11 @@ background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
 }
 
 
-.user_tags .mark_hash {
-color:#555;
-}
-
-
-
-.vcard .fn {
-}
-.vcard .fn:hover {
-}
-
-
-
-
 /* NOTICES */
 .notices li.over {
 background-color:#fcfcfc;
 }
 
-
-.notice div.entry-content a {
-
-}
-.notice div.entry-content a:hover {
-}
-
-
 .notice-data a span {
 background-color:transparent;
 background-repeat:no-repeat;
@@ -233,10 +200,6 @@ color:#333;
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
-}
-div.notice-options input {
-color:#002E6E;
-
 }
 .notices li.hover {
 background-color:#fcfcfc;
@@ -246,10 +209,6 @@ background-color:#fcfcfc;
 opacity:1;
 }
 
-.form_settings .form_note {
-background-color:#A9BF4F;
-}
-
 /*END: NOTICES */
 
 
@@ -281,5 +240,4 @@ background-color:#0f0;
 }
 #home #intro #step_create-a-community a {
 background-color:#00f;
-}
-
+}
\ No newline at end of file
diff --git a/theme/identica/images/icons/twotone/green/disfavourite.gif b/theme/identica/images/icons/twotone/green/disfavourite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3946869ae070474df5622c56ba6d0984bb06af5d
GIT binary patch
literal 88
zcmZ?wbhEHb6krfwSjfQe|NsB^DFQ$e2o!&^FfuSOG3YP=0Z5*KNi(ExCfnQpd~^IR
nW#;qjPMx6XakMgtb5Z7{-1x4Q%h>kLs(l!eFlSK!1A{dHn&}~%

literal 0
HcmV?d00001


From cd6b9d6c4608cc5bb524031f8de97a3dc5cc3ea9 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 19 Jan 2009 02:13:25 +0000
Subject: [PATCH 199/256] trac750 fix method calls to get CSS files

---
 actions/facebookhome.php | 10 +++++++++-
 lib/facebookaction.php   | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index d211e8844d..7430cc41fa 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -179,7 +179,15 @@ class FacebookhomeAction extends FacebookAction
 
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookCSS()));
+                                     'href' => getFacebookBaseCSS()));
+
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => getFacebookThemeCSS()));
+
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => getFacebookJS()),
+                                       ' ');
 
         $this->showLogo();
 
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index fd171c4578..263248f679 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -155,7 +155,15 @@ class FacebookAction extends Action
 
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
-                                     'href' => getFacebookCSS()));
+                                     'href' => getFacebookBaseCSS()));
+
+        common_element('link', array('rel' => 'stylesheet',
+                                     'type' => 'text/css',
+                                     'href' => getFacebookThemeCSS()));
+
+        common_element('script', array('type' => 'text/javascript',
+                                       'src' => getFacebookJS()),
+                                       ' ');
 
         $this->showLogo();
 

From 0b5f0f4faaf04fdf13dbd5dea1f081b9e1cc6071 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 03:09:13 +0000
Subject: [PATCH 200/256] Renamed form_datas to form_data

---
 actions/emailsettings.php   |  4 ++--
 actions/imsettings.php      |  4 ++--
 actions/login.php           |  2 +-
 actions/openidsettings.php  |  2 +-
 actions/othersettings.php   |  2 +-
 actions/profilesettings.php |  2 +-
 actions/register.php        |  2 +-
 actions/smssettings.php     |  8 ++++----
 actions/twittersettings.php |  4 ++--
 lib/noticeform.php          |  2 +-
 theme/base/css/display.css  | 22 +++++++++++-----------
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 7ae62fb55c..b84acb2141 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -110,7 +110,7 @@ class EmailsettingsAction extends AccountSettingsAction
                 $this->hidden('email', $confirm->address);
                 $this->submit('cancel', _('Cancel'));
             } else {
-                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
                 $this->input('email', _('Email Address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
@@ -146,7 +146,7 @@ class EmailsettingsAction extends AccountSettingsAction
         $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
diff --git a/actions/imsettings.php b/actions/imsettings.php
index edbd81b578..e0f5ede3a7 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -113,7 +113,7 @@ class ImsettingsAction extends ConnectSettingsAction
                 $this->hidden('jabber', $confirm->address);
                 $this->submit('cancel', _('Cancel'));
             } else {
-                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
                 $this->input('jabber', _('IM Address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
@@ -131,7 +131,7 @@ class ImsettingsAction extends ConnectSettingsAction
         
         $this->elementStart('fieldset', array('id' => 'settings_im_preferences'));
         $this->element('legend', null, _('Preferences'));
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('jabbernotify',
                         _('Send me notices through Jabber/GTalk.'),
diff --git a/actions/login.php b/actions/login.php
index 9fa501a5d9..11cf1f02a6 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -223,7 +223,7 @@ class LoginAction extends Action
                                            'action' => common_local_url('login')));
         $this->elementStart('fieldset');
         $this->element('legend', null, _('Login to site'));
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('nickname', _('Nickname'));
         $this->elementEnd('li');
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 126d2c9922..92469d20f8 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -95,7 +95,7 @@ class OpenidsettingsAction extends AccountSettingsAction
         $this->element('p', 'form_guide',
                        _('If you want to add an OpenID to your account, ' .
                          'enter it in the box below and click "Add".'));
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
diff --git a/actions/othersettings.php b/actions/othersettings.php
index cbb2c0cb9e..b542233ca7 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -107,7 +107,7 @@ class OthersettingsAction extends AccountSettingsAction
                           'metamark.net' => 'metamark.net'
                           );
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->dropdown('urlshorteningservice', _('Service'),
                         $services, _('Automatic shortening service to use.'),
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index 12251b83b3..6dd4775e5a 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -93,7 +93,7 @@ class ProfilesettingsAction extends AccountSettingsAction
 
         # too much common patterns here... abstractable?
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
diff --git a/actions/register.php b/actions/register.php
index 08243c1e29..159daaa737 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -343,7 +343,7 @@ class RegisterAction extends Action
             $this->hidden('code', $code);
         }
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->input('nickname', _('Nickname'), $this->trimmed('nickname'),
                      _('1-64 lowercase letters or numbers, '.
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 489fd1f587..f89cbe1ab9 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -113,7 +113,7 @@ class SmssettingsAction extends ConnectSettingsAction
                 $this->hidden('carrier', $confirm->address_extra);
                 $this->submit('cancel', _('Cancel'));
 
-                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
                 $this->input('code', _('Confirmation code'), null,
                              _('Enter the code you received on your phone.'));
@@ -121,7 +121,7 @@ class SmssettingsAction extends ConnectSettingsAction
                 $this->elementEnd('ul');
                 $this->submit('confirm', _('Confirm'));
             } else {
-                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('ul', 'form_data');
                 $this->elementStart('li');
                 $this->input('sms', _('SMS Phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
@@ -156,7 +156,7 @@ class SmssettingsAction extends ConnectSettingsAction
         $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('smsnotify',
                         _('Send me notices through SMS; '.
@@ -448,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $cnt = $carrier->find();
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
         $this->elementStart('select', array('name' => 'carrier',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 0790991232..efc8215cdf 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -104,7 +104,7 @@ class TwittersettingsAction extends ConnectSettingsAction
         $this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
         $this->element('legend', null, _('Twitter Account'));
         $this->hidden('token', common_session_token());
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         if ($fuser) {
             $this->elementStart('li');
             $this->element('span', 'twitter_user', $fuser->nickname);
@@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction
                             array('id' => 'settings_twitter_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->checkbox('noticesync',
                         _('Automatically send my notices to Twitter.'),
diff --git a/lib/noticeform.php b/lib/noticeform.php
index d6a3aa9c21..f0205f1c1e 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -123,7 +123,7 @@ class NoticeForm extends Form
     {
         $user = common_current_user();
 
-        $this->out->elementStart('ul', 'form_datas');
+        $this->out->elementStart('ul', 'form_data');
         $this->out->elementStart('li', array('id' => 'notice_text'));
         $this->out->element('label', array('for' => 'notice_data-text'),
                             sprintf(_('What\'s up, %s?'), $user->nickname));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 716f3256f5..d659a4b4c1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -114,17 +114,17 @@ font-style:italic;
 }
 
 
-.form_settings .form_datas li {
+.form_settings .form_data li {
 width:100%;
 float:left;
 }
 
-.form_settings .form_datas label {
+.form_settings .form_data label {
 float:left;
 }
-.form_settings .form_datas textarea,
-.form_settings .form_datas select,
-.form_settings .form_datas input {
+.form_settings .form_data textarea,
+.form_settings .form_data select,
+.form_settings .form_data input {
 margin-left:11px;
 float:left;
 }
@@ -149,7 +149,7 @@ font-weight:bold;
 display:none;
 }
 
-.form_settings .form_datas p.form_guide {
+.form_settings .form_data p.form_guide {
 clear:both;
 margin-left:163px;
 margin-bottom:0;
@@ -424,7 +424,7 @@ display:block;
 font-size:1.3em;
 margin-bottom:7px;
 }
-#form_notice .form_datas li {
+#form_notice .form_data li {
 float:left;
 }
 
@@ -979,12 +979,12 @@ background-color:#D1D9E4;
 
 
 #user_actions #user_subscribe .form_note,
-#user_actions #user_subscribe .form_datas,
+#user_actions #user_subscribe .form_data,
 #user_actions #user_subscribe .form_actions label {
 display:none;
 }
 #form_user-relationship .form_note,
-#form_user-relationship .form_datas,
+#form_user-relationship .form_data,
 #form_user-relationship .form_actions label {
 display:block;
 }
@@ -992,7 +992,7 @@ display:block;
 #user_actions #user-relationship_submit {
 margin-bottom:0;
 }
-#form_user-relationship .form_datas li label {
+#form_user-relationship .form_data li label {
 margin-right:11px;
 }
 
@@ -1070,7 +1070,7 @@ font-size:2.2em;
 
 
 
-#form_settings_photo .form_datas {
+#form_settings_photo .form_data {
 clear:both;
 }
 

From 1a6d120f28d232f3c6684450b197203fe297a605 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 03:16:50 +0000
Subject: [PATCH 201/256] margin-bottom for global nav for more space

---
 theme/base/css/display.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d659a4b4c1..22e1e7b9e3 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -213,6 +213,7 @@ margin-bottom:29px;
 #site_nav_global_primary {
 float:right;
 margin-right:18px;
+margin-bottom:11px;
 }
 #site_nav_global_primary ul li {
 display:inline;

From ea2e908bc0bf875b9e3967d0143f116e0c8b0885 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 03:20:41 +0000
Subject: [PATCH 202/256] More space for the counter

---
 theme/base/css/display.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 22e1e7b9e3..1d22901fea 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -418,7 +418,7 @@ width:377px;
 width:370px;
 height:86px;
 line-height:1.5;
-padding:7px 7px 14px 7px;
+padding:7px 7px 16px 7px;
 }
 #form_notice label {
 display:block;
@@ -441,7 +441,7 @@ margin-left:4px;
 
 #form_notice .form_note {
 position:absolute;
-top:116px;
+top:120px;
 right:98px;
 z-index:9;
 }

From 2fb53cdae446313546b7e65dccfef046fb7150da Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 03:54:46 +0000
Subject: [PATCH 203/256] Cleaning styles

---
 theme/base/css/display.css     | 25 ++++++++++++++-----------
 theme/default/css/display.css  | 27 +++++++++++----------------
 theme/identica/css/display.css | 27 +++++++++++----------------
 3 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 1d22901fea..e9799160c5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -696,6 +696,12 @@ border-top:1px dashed #D1D9E4;
 list-style-type:none;
 /*margin-bottom:11px;*/
 }
+.notices li.hover {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
+}
+
 
 /* NOTICES */
 #notices_primary {
@@ -761,19 +767,16 @@ display:inline;
 #laconicat .notice p.entry-content {
 /*margin-left:199px;*/
 }
-.notice p.entry-content a {
-
+.notice p.entry-content a:visited {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-.notice p.entry-content a:hover {
-
+.notice p.entry-content .vcard a {
+border-radius:4px;
+-moz-border-radius:4px;
+-webkit-border-radius:4px;
 }
-.notice p.entry-content .tag a {
-
-}
-.notice p.entry-content .tag a:hover {
-
-}
-
 
 .notice div.entry-content {
 /*border:1px solid blue;*/
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 877c833fe5..2d3cd9dc99 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -38,15 +38,9 @@ color:#002E6E;
 
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 
 #aside_primary,
@@ -78,8 +72,16 @@ font-weight:bold;
 padding:2px 4px;
 }
 
+#content,
 #site_nav_local_views a {
 border-color:#fff;
+}
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+#site_nav_local_views a {
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
@@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
 
 
 #page_notice .error {
@@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 div.notice-options {
 opacity:0.3;
 }
-
+.notices li.hover div.notice-options {
+opacity:1;
+}
 div.entry-content {
 color:#333;
 }
@@ -204,11 +204,6 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
 /*END: NOTICES */
 
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 877c833fe5..2d3cd9dc99 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -38,15 +38,9 @@ color:#002E6E;
 
 .notice p.entry-content a:visited {
 background-color:#fcfcfc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 .notice p.entry-content .vcard a {
 background-color:#fcfffc;
-border-radius:4px;
--moz-border-radius:4px;
--webkit-border-radius:4px;
 }
 
 #aside_primary,
@@ -78,8 +72,16 @@ font-weight:bold;
 padding:2px 4px;
 }
 
+#content,
 #site_nav_local_views a {
 border-color:#fff;
+}
+#content,
+#site_nav_local_views .current a {
+background-color:#fff;
+}
+
+#site_nav_local_views a {
 background-color:rgba(255, 255, 255, 0.2);
 }
 #site_nav_local_views a:hover {
@@ -87,10 +89,6 @@ background-color:rgba(255, 255, 255, 0.7);
 }
 
 
-#content,
-#site_nav_local_views .current a {
-background-color:#fff;
-}
 
 
 #page_notice .error {
@@ -193,7 +191,9 @@ background:transparent url(../images/icons/twotone/green/trash.gif) no-repeat 0
 div.notice-options {
 opacity:0.3;
 }
-
+.notices li.hover div.notice-options {
+opacity:1;
+}
 div.entry-content {
 color:#333;
 }
@@ -204,11 +204,6 @@ font-family:sans-serif;
 .notices li.hover {
 background-color:#fcfcfc;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
-opacity:1;
-}
-
 /*END: NOTICES */
 
 

From 6967e3ec86b421066cd3d5be74a103a3b394937c Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 04:19:14 +0000
Subject: [PATCH 204/256] Setting up a way to deal with different logo sizes.

---
 theme/base/css/display.css     | 7 ++-----
 theme/default/css/display.css  | 9 ++++++++-
 theme/identica/css/display.css | 7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e9799160c5..e337f1c985 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -195,13 +195,11 @@ float:left;
 margin-bottom:18px;
 margin-left:18px;
 }
-address .fn,
-address .email {
-display:none;
+address.vcard img.logo {
+margin-right:0;
 }
 
 
-
 #header {
 width:100%;
 position:relative;
@@ -399,7 +397,6 @@ border-radius:7px;
 width:384px;
 width:458px;
 float:left;
-margin-left:68px;
 position:relative;
 line-height:1;
 }
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 2d3cd9dc99..3c579cec75 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -2,12 +2,19 @@
 html,
 body,
 a:active {
-background-color:#ddd;
+background-color:#777;
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
+address {
+margin-right:71px;
+}
+address .fn {
+display:none;
+}
+
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2d3cd9dc99..d5a5ce9564 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -8,6 +8,13 @@ body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 font-size:1em;
 }
+address {
+margin-right:71px;
+}
+address .fn {
+display:none;
+}
+
 input, textarea, select, option {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }

From 0ea3f0e31be136bc91616aa62e93fc553ee1812a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 04:36:25 +0000
Subject: [PATCH 205/256] Default theme: first draft

---
 theme/default/css/display.css                    |  14 +++++++-------
 theme/default/images/icons/icon_atom.jpg         | Bin 0 -> 1117 bytes
 theme/default/images/icons/icon_foaf.gif         | Bin 0 -> 1144 bytes
 theme/default/images/icons/icon_rss.jpg          | Bin 0 -> 1166 bytes
 theme/default/images/icons/icon_vcard.gif        | Bin 0 -> 331 bytes
 .../images/icons/twotone/green/against.gif       | Bin 0 -> 85 bytes
 .../images/icons/twotone/green/arrow-down.gif    | Bin 0 -> 75 bytes
 .../icons/twotone/green/arrow-downleft.gif       | Bin 0 -> 75 bytes
 .../icons/twotone/green/arrow-downright.gif      | Bin 0 -> 75 bytes
 .../images/icons/twotone/green/arrow-left.gif    | Bin 0 -> 73 bytes
 .../images/icons/twotone/green/arrow-right.gif   | Bin 0 -> 74 bytes
 .../images/icons/twotone/green/arrow-up.gif      | Bin 0 -> 74 bytes
 .../images/icons/twotone/green/arrow-upleft.gif  | Bin 0 -> 75 bytes
 .../images/icons/twotone/green/arrow-upright.gif | Bin 0 -> 73 bytes
 .../images/icons/twotone/green/back-forth.gif    | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/bookmark.gif      | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/bulb.gif  | Bin 0 -> 83 bytes
 .../images/icons/twotone/green/calendar.gif      | Bin 0 -> 83 bytes
 .../images/icons/twotone/green/calendar2.gif     | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/camera.gif        | Bin 0 -> 79 bytes
 .../default/images/icons/twotone/green/cart.gif  | Bin 0 -> 86 bytes
 .../images/icons/twotone/green/caution.gif       | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/chart.gif | Bin 0 -> 81 bytes
 .../images/icons/twotone/green/checkmark.gif     | Bin 0 -> 76 bytes
 .../images/icons/twotone/green/clipboard.gif     | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/clock.gif | Bin 0 -> 81 bytes
 .../images/icons/twotone/green/closed-folder.gif | Bin 0 -> 78 bytes
 .../images/icons/twotone/green/database.gif      | Bin 0 -> 82 bytes
 .../images/icons/twotone/green/disfavourite.gif  | Bin 0 -> 88 bytes
 .../images/icons/twotone/green/diskette.gif      | Bin 0 -> 85 bytes
 .../images/icons/twotone/green/document.gif      | Bin 0 -> 81 bytes
 .../images/icons/twotone/green/double-arrow.gif  | Bin 0 -> 78 bytes
 .../default/images/icons/twotone/green/edit.gif  | Bin 0 -> 75 bytes
 .../default/images/icons/twotone/green/eject.gif | Bin 0 -> 73 bytes
 .../images/icons/twotone/green/exclaim.gif       | Bin 0 -> 74 bytes
 .../images/icons/twotone/green/fastforward.gif   | Bin 0 -> 77 bytes
 .../images/icons/twotone/green/favourite.gif     | Bin 0 -> 73 bytes
 .../default/images/icons/twotone/green/flag.gif  | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/graph.gif | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/grow.gif  | Bin 0 -> 90 bytes
 .../images/icons/twotone/green/headphones.gif    | Bin 0 -> 78 bytes
 .../default/images/icons/twotone/green/home.gif  | Bin 0 -> 81 bytes
 .../images/icons/twotone/green/hourglass.gif     | Bin 0 -> 85 bytes
 .../default/images/icons/twotone/green/info.gif  | Bin 0 -> 73 bytes
 theme/default/images/icons/twotone/green/key.gif | Bin 0 -> 76 bytes
 .../default/images/icons/twotone/green/lock.gif  | Bin 0 -> 83 bytes
 .../default/images/icons/twotone/green/mail.gif  | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/move.gif  | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/music.gif | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/news.gif  | Bin 0 -> 76 bytes
 .../default/images/icons/twotone/green/note.gif  | Bin 0 -> 82 bytes
 .../images/icons/twotone/green/open-folder.gif   | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/paper-clip.gif    | Bin 0 -> 78 bytes
 .../images/icons/twotone/green/paper-clip2.gif   | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/pause.gif | Bin 0 -> 75 bytes
 .../default/images/icons/twotone/green/phone.gif | Bin 0 -> 79 bytes
 .../default/images/icons/twotone/green/play.gif  | Bin 0 -> 75 bytes
 .../default/images/icons/twotone/green/plus.gif  | Bin 0 -> 74 bytes
 .../default/images/icons/twotone/green/print.gif | Bin 0 -> 85 bytes
 .../images/icons/twotone/green/question-mark.gif | Bin 0 -> 74 bytes
 .../default/images/icons/twotone/green/quote.gif | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/refresh.gif       | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/reply.gif | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/rewind.gif        | Bin 0 -> 77 bytes
 .../images/icons/twotone/green/search.gif        | Bin 0 -> 76 bytes
 .../images/icons/twotone/green/shield.gif        | Bin 0 -> 85 bytes
 .../images/icons/twotone/green/skip-back.gif     | Bin 0 -> 76 bytes
 .../default/images/icons/twotone/green/skip.gif  | Bin 0 -> 78 bytes
 .../default/images/icons/twotone/green/skull.gif | Bin 0 -> 85 bytes
 .../images/icons/twotone/green/statusbar.gif     | Bin 0 -> 82 bytes
 .../default/images/icons/twotone/green/stop.gif  | Bin 0 -> 72 bytes
 .../images/icons/twotone/green/template.gif      | Bin 0 -> 81 bytes
 .../images/icons/twotone/green/text-bigger.gif   | Bin 0 -> 82 bytes
 .../images/icons/twotone/green/text-smaller.gif  | Bin 0 -> 80 bytes
 .../default/images/icons/twotone/green/trash.gif | Bin 0 -> 77 bytes
 .../images/icons/twotone/green/two-docs.gif      | Bin 0 -> 83 bytes
 .../images/icons/twotone/green/twotone.gif       | Bin 0 -> 2461 bytes
 .../default/images/icons/twotone/green/undo.gif  | Bin 0 -> 79 bytes
 .../default/images/icons/twotone/green/user.gif  | Bin 0 -> 77 bytes
 .../images/icons/twotone/green/vegetable.gif     | Bin 0 -> 82 bytes
 theme/default/images/icons/twotone/green/x.gif   | Bin 0 -> 79 bytes
 .../images/icons/twotone/green/zoom-in.gif       | Bin 0 -> 86 bytes
 .../images/icons/twotone/green/zoom-out.gif      | Bin 0 -> 85 bytes
 83 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 theme/default/images/icons/icon_atom.jpg
 create mode 100644 theme/default/images/icons/icon_foaf.gif
 create mode 100644 theme/default/images/icons/icon_rss.jpg
 create mode 100644 theme/default/images/icons/icon_vcard.gif
 create mode 100644 theme/default/images/icons/twotone/green/against.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-down.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-downleft.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-downright.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-left.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-right.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-up.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-upleft.gif
 create mode 100644 theme/default/images/icons/twotone/green/arrow-upright.gif
 create mode 100644 theme/default/images/icons/twotone/green/back-forth.gif
 create mode 100644 theme/default/images/icons/twotone/green/bookmark.gif
 create mode 100644 theme/default/images/icons/twotone/green/bulb.gif
 create mode 100644 theme/default/images/icons/twotone/green/calendar.gif
 create mode 100644 theme/default/images/icons/twotone/green/calendar2.gif
 create mode 100644 theme/default/images/icons/twotone/green/camera.gif
 create mode 100644 theme/default/images/icons/twotone/green/cart.gif
 create mode 100644 theme/default/images/icons/twotone/green/caution.gif
 create mode 100644 theme/default/images/icons/twotone/green/chart.gif
 create mode 100644 theme/default/images/icons/twotone/green/checkmark.gif
 create mode 100644 theme/default/images/icons/twotone/green/clipboard.gif
 create mode 100644 theme/default/images/icons/twotone/green/clock.gif
 create mode 100644 theme/default/images/icons/twotone/green/closed-folder.gif
 create mode 100644 theme/default/images/icons/twotone/green/database.gif
 create mode 100644 theme/default/images/icons/twotone/green/disfavourite.gif
 create mode 100644 theme/default/images/icons/twotone/green/diskette.gif
 create mode 100644 theme/default/images/icons/twotone/green/document.gif
 create mode 100644 theme/default/images/icons/twotone/green/double-arrow.gif
 create mode 100644 theme/default/images/icons/twotone/green/edit.gif
 create mode 100644 theme/default/images/icons/twotone/green/eject.gif
 create mode 100644 theme/default/images/icons/twotone/green/exclaim.gif
 create mode 100644 theme/default/images/icons/twotone/green/fastforward.gif
 create mode 100644 theme/default/images/icons/twotone/green/favourite.gif
 create mode 100644 theme/default/images/icons/twotone/green/flag.gif
 create mode 100644 theme/default/images/icons/twotone/green/graph.gif
 create mode 100644 theme/default/images/icons/twotone/green/grow.gif
 create mode 100644 theme/default/images/icons/twotone/green/headphones.gif
 create mode 100644 theme/default/images/icons/twotone/green/home.gif
 create mode 100644 theme/default/images/icons/twotone/green/hourglass.gif
 create mode 100644 theme/default/images/icons/twotone/green/info.gif
 create mode 100644 theme/default/images/icons/twotone/green/key.gif
 create mode 100644 theme/default/images/icons/twotone/green/lock.gif
 create mode 100644 theme/default/images/icons/twotone/green/mail.gif
 create mode 100644 theme/default/images/icons/twotone/green/move.gif
 create mode 100644 theme/default/images/icons/twotone/green/music.gif
 create mode 100644 theme/default/images/icons/twotone/green/news.gif
 create mode 100644 theme/default/images/icons/twotone/green/note.gif
 create mode 100644 theme/default/images/icons/twotone/green/open-folder.gif
 create mode 100644 theme/default/images/icons/twotone/green/paper-clip.gif
 create mode 100644 theme/default/images/icons/twotone/green/paper-clip2.gif
 create mode 100644 theme/default/images/icons/twotone/green/pause.gif
 create mode 100644 theme/default/images/icons/twotone/green/phone.gif
 create mode 100644 theme/default/images/icons/twotone/green/play.gif
 create mode 100644 theme/default/images/icons/twotone/green/plus.gif
 create mode 100644 theme/default/images/icons/twotone/green/print.gif
 create mode 100644 theme/default/images/icons/twotone/green/question-mark.gif
 create mode 100644 theme/default/images/icons/twotone/green/quote.gif
 create mode 100644 theme/default/images/icons/twotone/green/refresh.gif
 create mode 100644 theme/default/images/icons/twotone/green/reply.gif
 create mode 100644 theme/default/images/icons/twotone/green/rewind.gif
 create mode 100644 theme/default/images/icons/twotone/green/search.gif
 create mode 100644 theme/default/images/icons/twotone/green/shield.gif
 create mode 100644 theme/default/images/icons/twotone/green/skip-back.gif
 create mode 100644 theme/default/images/icons/twotone/green/skip.gif
 create mode 100644 theme/default/images/icons/twotone/green/skull.gif
 create mode 100644 theme/default/images/icons/twotone/green/statusbar.gif
 create mode 100644 theme/default/images/icons/twotone/green/stop.gif
 create mode 100644 theme/default/images/icons/twotone/green/template.gif
 create mode 100644 theme/default/images/icons/twotone/green/text-bigger.gif
 create mode 100644 theme/default/images/icons/twotone/green/text-smaller.gif
 create mode 100644 theme/default/images/icons/twotone/green/trash.gif
 create mode 100644 theme/default/images/icons/twotone/green/two-docs.gif
 create mode 100644 theme/default/images/icons/twotone/green/twotone.gif
 create mode 100644 theme/default/images/icons/twotone/green/undo.gif
 create mode 100644 theme/default/images/icons/twotone/green/user.gif
 create mode 100644 theme/default/images/icons/twotone/green/vegetable.gif
 create mode 100644 theme/default/images/icons/twotone/green/x.gif
 create mode 100644 theme/default/images/icons/twotone/green/zoom-in.gif
 create mode 100644 theme/default/images/icons/twotone/green/zoom-out.gif

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 3c579cec75..2b71b07196 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -2,7 +2,7 @@
 html,
 body,
 a:active {
-background-color:#777;
+background-color:#CEE1E9;
 }
 body {
 font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
@@ -35,7 +35,7 @@ border-color:#A9BF4F;
 }
 input.submit,
 #nav_register a {
-color:#fff;
+color:#F5FDFD;
 }
 
 a,
@@ -54,7 +54,7 @@ background-color:#fcfffc;
 #user_subscribe a,
 #TB_window input.submit,
 .form_user_subscribe input.submit {
-background-color:#CEE1E9;
+background-color:#fff;
 }
 
 
@@ -81,11 +81,11 @@ padding:2px 4px;
 
 #content,
 #site_nav_local_views a {
-border-color:#fff;
+border-color:#F5FDFD;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#F5FDFD;
 }
 
 #site_nav_local_views a {
@@ -136,7 +136,7 @@ background-repeat: no-repeat;
 }
 .form_user_unsubscribe input.submit {
 background-color:#647819;
-color:#fff;
+color:#F5FDFD;
 }
 #user_send-a-message a {
 background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
@@ -232,7 +232,7 @@ background-position:100% 45%;
 
 #home #intro #guide_steps li a {
 border-color:#ccc;
-color:#fff;
+color:#F5FDFD;
 }
 #home #intro #step_join-now a {
 background-color:#f00;
diff --git a/theme/default/images/icons/icon_atom.jpg b/theme/default/images/icons/icon_atom.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..22853edc43ff04778001d28e5e14e64b32693f05
GIT binary patch
literal 1117
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&k!i+{EEZ-41_o9j<^p0qAQnZ!AUPHw2Fat#
zfz*M-L6`@Kk@dmY*vy2<4F>xE0R}-11_1^EW=25<CP7AKLB{{L8Cn>anV3L`8Hkvf
zSy(w(Sy@<Ex!5__IC!{ud3m^bc=-551o`-d`FVH*B?N^<Ma9I$cm*Y;B*dgd#Kc4y
zf!bJsI#^k`MEQ95_(Vws|Bo;(VqjooWds9Y=z;+w6VNei>>Qk2+yV?tKuefdm_beh
zs;mXdF|Y`-3Mm>ovIz$!vMUve7&T5@$f4}C@t|nX#SbdRNkvVZTw>x9l2WQ_>Kd9_
zCZ=ZQ7M51dF0O9w9-dyoA)#U65s^{JDXD4c8JStdC8cHM6_r)ZEv;?s9i3g1CQq3<
zZTgIvvlcC0vUJ(<6)RV5+Pr1!w(UE1?mBe%$kAiRPn<k;>GGAU*RJ2VdF$b$$4{O<
zd;a3(tB;>PfBE|D`;VW$7#Wx$-T{&r{s9I*BNGb?GYdP&Ka5P}K+G)2!m4P<Cgd2%
zo>(ZXWYowZ;xuvL#)F*7#z7xMlZq~KiK&=8RQ(9@64*z?d8mmjAHh8Y_s{=Z3_Q$?
zz+}TL$Y9U#^*!s4{C`4kQ@{F)F8#NE<^7nNX{$BEX7;OWE|d3v8oxYgwT`W+-_*q-
z+uzjLw=VzM)weYJobTH^U)E+Hs>*NOQoXkN(6;Tf#Fj2Ov+-`EuiCfmW$ej|9|&<u
zJpUO!(Ob~!Qb^WTRn^7s?>k>x-`dJy<I3_-!(>*iwaIS@snEOaP0Pi8o%z1YZ)MKM
zRh|Np+Y=60roJjLZm^p5YSuI*^Cmyt+P{5LF*_nZUCA@@&Al93&$PVvpTfaM*5M!4
zAAY>*^{;80%VnnTYCTgO_i(zRpnz~I%X9Ugp$`rGx_=#0x)>OxdU^ku>!Q7(i@)aR
QKG!^Hc0cZ<-tqr80k4%pzW@LL

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/icon_foaf.gif b/theme/default/images/icons/icon_foaf.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8f78442355bf0d0b509536bca7c57b4eedab04a
GIT binary patch
literal 1144
zcmd^;?N1ta0Dyn!iB*(>T3&i*JrF8R7w1whHElM8C<3ml?j+W9-3dwyO`2L|HqDkn
z5%F#4%5=zqhahRU8WmVVw{A%ro6Wr`PE6ceVj2??L*}%}w$5a?_V3v9;raf2cvR|!
zleHa30UP`^2O^P(TCHAKSg=~He14Hqsif%uZ8F&hVl+)kq!MMLzPTBX#bWfui_Upx
zD&?A({APN6nl_tVpScF^4um#Ch!`OgWH@Z1X>XUc>*oB;p^^I*kHugxqzIz#MkuV+
z27e0fbavY2Z0Yob-EJpWNrkE-kx0z`GV7<3B)Q`M(a*|fwO?ze5|oczl~rJTgzvcP
zz!1czQbk)^OUg=ic0LdYc>Kb`Zg=<I-iJ1ujW!zn{<XMHH!-<vv>9odT3ob5qn5U-
zZT@vXO;3k^3m?hNp^{WgtIf?~Vi*>WTf)DFYicA*OYfDHpIEwZfu=*Xwa2whum5W{
zlO!obgc%u(w8@kv2n>cj-+78r7)Id$weIzL7Z!R>!0^-*v5e!F&8~w3Z(YM%0)Y@I
zE{Nm!F$q#$j-}IMH89-M7w}AdKk~&$^8EQ0k%;<%3Q);-{B4CovDekr^qO&h-@R)#
zADB!U?U`h<e_yZf?Nu|gncO1SN3B;>6#s5A^?%aeE|u=?euQDt>S{El*K_kZ{mxHA
zKZiIhc5pN3^BG3p|I*eU;lW3AS9DcXD27Q~_gwCYuVpe!2=hknj|h-5S$U0@T;=iD
z)k0w^HAb$Gi#YE0tpNaNntta0C!(hi1AsYD`8@ym6W|aH&PB`*h_CXP`B1cFukIl$
zs|1(%WPd!$fVg5p|HQsAS^bi1b0#pP6%J=GW{H{G^{kf%TYUG<8ipXeV7Bse-~cv|
zbFQln4K0m}iaXIuv5tC2w(J<*7GbcULq^Pkw5D#|;fUDp4ksPTyrZ@I+X3#gFQA-x
zk0&Fbfm(V`Kb^8?Lhb_Ijq8^l&o~_g;dlNH1SJ|q-7P$;xu;<b%Dz50+W1&J%F1yM
z&V4)Hu@QLn6sRP)k`?$x-9IO}PY8%vBzR%N`bMLZt-ZXRCTh0CQbnI`h!e@hm(Tjg
zI~4}Goteq}vxp<JK6F>vu8g;$-KF`Z%EK&)8HeT>g)Y#vUAp}MLgmL1PV~(!a7HD+
zI?Nr*lXC$Eu30nL$d)62zg!{*uVkS>^T@WwmwfEeqXVc$01lsS6Nu{>3~=f{5zlh9

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/icon_rss.jpg b/theme/default/images/icons/icon_rss.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..da23422d0616d0d2925545214c2591b78dd1d6cb
GIT binary patch
literal 1166
zcmex=<NpH&0WUXCHwH!~Mg|WcWcdG&ktySh4hu5_0|P4%a{)0Q5Q`#VkQ@sTgXGcW
zK<Yr^Aj|{A$ogPxY-Ymb1_S;70D~Y0g8+j7Gov5_lOQ9rAmjhr3@r@IOiUoe3`ES#
zEUX-?tSl_7T<jcd96a2-ygb}IJbe5jf_(hK{5(8@5`w~_qGIA=yn>Qa5@J#!Vq&6<
zKy9o*9jvTeqI^7je4?a+|3?@XF)%Q)GJ*jxbisg;3FsI$b`DN1ZUF`+pe0N!%pj)$
zRn`LK7+3^Zg%k}P*@OcV*_8@Kj2b5{<WP3ncu+Lx;s+Juq@pHHE-`TlNhwt|bq!4|
z6H_yD3rj0!7gslT4^OY)kkGL3h{&kql+?8JjLfX!lG3vBipr|yme#iRj?S)0lc!9b
zHhsp-S&J4gS-Ncbij}K2ZQinV+x8thcO5!><mj>ECr+Nabot8FYu9hwy!G(W<0ns_
zJ%91?)yGetzkL1n{m0K=j10^W?*K^*{{VxZk%@(cnS~wXA4aBfAZ8Y1VO2C_6LJh>
zPb?HxGHT=yahkYr<3Ubk<Dd_sNktdA#8gZks(u7{3G5@{Jk&&%kKi7H`{(~H1|DWc
zV6tHrWUy!Wm3-hI-{n1p4`1&sKR(S)b>6e=l{~ZV&R(<em;s-hT?FI21tsf`70k%8
z_+zut;>P($<#Tc_eT}|Zsr;?yuxz;gdKo>o08iH_ez(7J*Xx$0_w2DP{4nd=rPuyD
z`a)(@-l|)kedxsE9m)%3QmU^v_nh7s>82){>G!efn0MO#wHIGL{c+0jtmNgD(xyum
zefR%$bCwl<_gg!Wm##8d)9z_*-yNvB?~T)ip1kmw&vVT4op{R=4C8OwoLuR)CoA_`
zOx3bo_v7ZyN>|fo)OqB&T-^0={g$N{mw&I*Tx@-;&iYcF!b_?4mOt{Tt77hWuXV3n
z?EbBWV{xfmmW=#VXK{s+mvPsWMca>EoX5{A_C9zP*X`J>JyYMgG3%|L9@=Its<C9H
Q#rfD<KjLR^a{qr503@_mkpKVy

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/icon_vcard.gif b/theme/default/images/icons/icon_vcard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6d52947f3e96c0f74f00a80b430f99695e110e5e
GIT binary patch
literal 331
zcmV-R0kr-{Nk%w1VHW@n0K^{vi^LV;@6MUi1^D~(*6OmW*GsnCZu9x+db$Rr+7rg(
zj*Y_!l*<dH*({I3D38V)oYE4M$0mWj1fbXqlFb8`$49B%6@|kBiopk&$~vOf5r)11
zjKmX(!4m)f|NZ;sA^8LW0018VEC2ui02crb000HZ;P*XTX`X2Lh#!+!a5BMkO()E#
zS&7{Ilb$dk5Kv|b07p1!5CVioPzX_23qcM*!xb0?o`FHY<w87Y14W~SxG4p&cnzUk
z0BDZ^LFoY8bp;0=2L%*$1P6m?1Bwm+3=j+y5(FLu7ZeN(5&?O683-Jc4;f!+5u*$U
zo{SlH01FQapLq(S3ka466%q^`919Ll0ma4y5eo|#2nrPl3=16(7#I%M*w`Hy${h$2
d$_oG=)f?vL=hf=U>MRc(@bU8V@GBo706UV+d;tIe

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/against.gif b/theme/default/images/icons/twotone/green/against.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ca796c8a36ff26f41dcb0bacfd1e4e076c9c095f
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
l<P!HC*U-dym67JAOGD;${_0d*wJzdK*~MOY9z78TYXD`N93}t&

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-down.gif b/theme/default/images/icons/twotone/green/arrow-down.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c709e58774d240056d41deb3aad1fab144060409
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%dgDh
app?ab&iYckZ-Pdd+{~p}M<SdU8LR;~^A+d-

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-downleft.gif b/theme/default/images/icons/twotone/green/arrow-downleft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a4a98035d8298e44ad997172476c2736c62495ec
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
bCqvfz&5Fm*)Xrnc3h-R2b=1d+k--`OUWylq

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-downright.gif b/theme/default/images/icons/twotone/green/arrow-downright.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3e6001a612fd9673f024520ce0a9a295646838e4
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
b!<pc>XBVD&QyasQ6;Qb}>xhpNBZD;nc>)<7

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-left.gif b/theme/default/images/icons/twotone/green/arrow-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..afed190841f8b88f930d0dfe7030339f8aea296c
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
ZBSY5uGcnueIVwI2eAel8Mn#0d8UQdZ7iIte

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-right.gif b/theme/default/images/icons/twotone/green/arrow-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ee1707ed96a315d287e778dd7650fdad9f5ccc55
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%fEOI
a2ZPj`+FkFTWlpxJyV1Ff%b1gu!5RQfjTe{z

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-up.gif b/theme/default/images/icons/twotone/green/arrow-up.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d0f5fbeaa84564e38daa0f772acd229affc82e61
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%dgDh
ZAm^oetS~(`@?iSJ1s%(jk~vu!tN|tM6`cS8

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-upleft.gif b/theme/default/images/icons/twotone/green/arrow-upleft.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e9e6935bd9a3ddfed9b46a5c3f34aeefa2046c6
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%b(0V
b<y4mPG{)xNp?4JfZgwowI#S@o$Y2csUZ)r;

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/arrow-upright.gif b/theme/default/images/icons/twotone/green/arrow-upright.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c7fecc8a0647d4c3368082d0b506cdf1a6a4b398
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%dgBb
Z<y2Pw)#_VsN@lrCd-l^{NdN<bH2^&U7?}V7

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/back-forth.gif b/theme/default/images/icons/twotone/green/back-forth.gif
new file mode 100644
index 0000000000000000000000000000000000000000..33a9540c83365fba86f9194a89c728bec10322f2
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFaO
fh%svYKKA8jOXodpOjd6S6-ax{?d_u~!e9*mv<Mhb

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/bookmark.gif b/theme/default/images/icons/twotone/green/bookmark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..23f318ecc89d02300e72853ba1bdba4a1bec44ae
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%g@MU
i<d?;NbY0t9%}YCM6*A_<EMAv1d({OWb01w125SHWcp7g2

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/bulb.gif b/theme/default/images/icons/twotone/green/bulb.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f70652c03a1f1a8a9abdc86046468d2f251c8456
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%b`?Z
jaJF1GFY+#D-f{PdbCu`5@Q8dRwP(&9EgxA9Rt9STE`l2H

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/calendar.gif b/theme/default/images/icons/twotone/green/calendar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a09b65aca01affa98e89057037bf26b4ed18120f
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%ilO>
k^F{6jZZmF8W=)*Y^I&C3XxFSYH=?w5UKI%DW@WGj09=(E<NyEw

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/calendar2.gif b/theme/default/images/icons/twotone/green/calendar2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7884b02ddd7750ab293a82354d5f7d66b5b2215b
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFau
f%dIry2}PGb)C#|t8k5p?d&Q*Z+|E4eA`I35;nNzm

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/camera.gif b/theme/default/images/icons/twotone/green/camera.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1a85fbad0e7693c8096fa58729db241f2e5345d2
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fEQa
ff@>L{8Fg<LXx<Z5Q)aiicVyc;X@kiD3=Gx))1w*N

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/cart.gif b/theme/default/images/icons/twotone/green/cart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47eaa0a2ef6f4cb040e18a453676d93d0baddc3e
GIT binary patch
literal 86
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CX`erV>%W&6v
mLlkSu3C-WUMI9EUAsk73mQhpLRu{hBl$(B@!<d_u!5RQ@qZ;%8

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/caution.gif b/theme/default/images/icons/twotone/green/caution.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3ad2c322baa7e2aaa80133a338ed27fe10ebab04
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P+_f
i=oe+!_PJzT?%AickKN~8*P52GYD0mmJCCjigEasd7#kk|

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/chart.gif b/theme/default/images/icons/twotone/green/chart.gif
new file mode 100644
index 0000000000000000000000000000000000000000..136d74517d9b0c9db57e402c355e33729c4bf6ca
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%g;PR
h<Px{cvE2Lbd=o?q=O<0dSlSmPcGT$52`5GdYXI~i8g~Ey

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/checkmark.gif b/theme/default/images/icons/twotone/green/checkmark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..892429d48352cb3abd1fa68f0bc14b643f50c832
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEOI
c?*)cWXRej5sgx2gOstH1^~+##00V<H0E%!KSO5S3

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/clipboard.gif b/theme/default/images/icons/twotone/green/clipboard.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9317bdcd083856423ed6cc5b1c3f377f12ff14f6
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%P+`a
gc){}R;x2QZs@NHpDL?1V&f26IdDKXlo0Y*D0L~K_-T(jq

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/clock.gif b/theme/default/images/icons/twotone/green/clock.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d1410f9251c5c5df97e71d3f80be5f10eea373a4
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%g;PR
h<Px{cw9vP=YhsO><kBX+Sh47u*ioZHC!81=tO59t8zKMz

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/closed-folder.gif b/theme/default/images/icons/twotone/green/closed-folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0410fc6e8210d210e28f33b00c54da3950fddd34
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%b(0F
e;?b=Yw(I?y&|r_=C6ZRlk8I03u)&Fu!5RRdLK#;8

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/database.gif b/theme/default/images/icons/twotone/green/database.gif
new file mode 100644
index 0000000000000000000000000000000000000000..29ce024929f32bf2db1efe1f4cd5c77b09c68eb1
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erV>%dpTp
i@LV_liI8i573MP+IhKSiS<#lZt9Qm9IUaQp25SH%`WtTm

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/disfavourite.gif b/theme/default/images/icons/twotone/green/disfavourite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3946869ae070474df5622c56ba6d0984bb06af5d
GIT binary patch
literal 88
zcmZ?wbhEHb6krfwSjfQe|NsB^DFQ$e2o!&^FfuSOG3YP=0Z5*KNi(ExCfnQpd~^IR
nW#;qjPMx6XakMgtb5Z7{-1x4Q%h>kLs(l!eFlSK!1A{dHn&}~%

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/diskette.gif b/theme/default/images/icons/twotone/green/diskette.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e970b0a30c1881cf9a40679a435a9edd8a574587
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB`@dn%
lmW$juVL^}2<#JlosU*#FZ|zFGwlY^>_k~_|A3YHUYXF>E9a{hZ

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/document.gif b/theme/default/images/icons/twotone/green/document.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9c08f4a3a91cba4925fbfded9759f2d1c5fe52e5
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%ilQ1
h;Ec3>snFYHwO-E|{XLq}Di`HO95p(0!ikZ=8UXm`8j%11

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/double-arrow.gif b/theme/default/images/icons/twotone/green/double-arrow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2e8648264d54f9a17eb030a5ec2f45c7282df6b1
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%fEOI
e!yK;FytiK7*Hn0sI43gh_K|IRr+u6l8LR=iv>HGF

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/edit.gif b/theme/default/images/icons/twotone/green/edit.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c746aca601dfce71bec63cc34bd2cea576a608c6
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fFb#
bLC#BkUBTx**BG_BS(!^$or-W`WUvMRPNf%3

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/eject.gif b/theme/default/images/icons/twotone/green/eject.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7e0906cfe983cc8cd86af5fb84cd6faa05e7525b
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
ZJ44pmGnPfZzV}6^J-cZzIe>w|8UQMM7X$zR

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/exclaim.gif b/theme/default/images/icons/twotone/green/exclaim.gif
new file mode 100644
index 0000000000000000000000000000000000000000..588e28c26122f6eb76a68e44d5fdf796be4737ae
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%P+`a
acvef3ue|(E=)-533p|(cHFL5uSOWkrdlpCl

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/fastforward.gif b/theme/default/images/icons/twotone/green/fastforward.gif
new file mode 100644
index 0000000000000000000000000000000000000000..28e49510317e0f0814ed89e227337c2f0b2765ae
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%fEOI
dLyOkxqXGH9E5u)9B)1e^KDAB9n3I*k8UUVN8B72G

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/favourite.gif b/theme/default/images/icons/twotone/green/favourite.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d93515e3790aa4672656512f416edf2c5c30f2f5
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%fEOI
Z!yK;F*Ye-L@sv;Xeb%|`jEV?@H2^xX7##or

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/flag.gif b/theme/default/images/icons/twotone/green/flag.gif
new file mode 100644
index 0000000000000000000000000000000000000000..68c8aee2598d4c470b1c60c36232fea6b52dbef6
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%g@;0
g#a2CkYK(uMX`+Uoh*MBz%DnK`$BZ6xu`*Z#0Jqf`MF0Q*

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/graph.gif b/theme/default/images/icons/twotone/green/graph.gif
new file mode 100644
index 0000000000000000000000000000000000000000..0c1794b4e7f35194cd5734cfc5de513c6283a4b7
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P-4d
ic(!ZZl9}eU4X0eIltb-SW-NSXe$>d#okvZC!5RPzJ{ji#

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/grow.gif b/theme/default/images/icons/twotone/green/grow.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c4118d53bdc16883409cf7276480cffb5d4b3291
GIT binary patch
literal 90
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J611`erV>%dohG
r(<0@g?ab9LGUKnYF6~@)=SyhLQ!m|bU8{L62k$lYsTUAoV6X-NHqIaP

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/headphones.gif b/theme/default/images/icons/twotone/green/headphones.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5be6c67ddf1a3d7ced982417295971bcf5da2cd4
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%m0{J
e#G`w|<;Y(LWEWZl^{!m-^5@pPBNa}J4Aua|3L8WK

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/home.gif b/theme/default/images/icons/twotone/green/home.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2a3421efe8e1f15d2c8f8de2ba5dd90e6f7245a
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB%P+_f
h=qL5QHEQ?0T7_#pOCGUap1f|+>#(AuC!81=tN{eA95w&|

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/hourglass.gif b/theme/default/images/icons/twotone/green/hourglass.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b62b9480cbb0d8706a7d224020d253166eee5609
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%ebf~
l|J*GGx2X4zZ3Q%nQY8B#W~r^66*)!u{L{mC8Uq*@tO0)l9drNy

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/info.gif b/theme/default/images/icons/twotone/green/info.gif
new file mode 100644
index 0000000000000000000000000000000000000000..86ef1f8b4a7ba4171b2c27e4a0dbd2374cbbe3b2
GIT binary patch
literal 73
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b*`erVB%dgDh
Zpp;d-=xR}K>U{C6XD<z=1u!sJ0{|UQ7JvW%

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/key.gif b/theme/default/images/icons/twotone/green/key.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ccf357ab28dc96a63117b33dbf511215bd51ae8e
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEQa
c0zUz*zFn`M$=+C2bGdWbD=CA?0SpY*0FeS2<p2Nx

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/lock.gif b/theme/default/images/icons/twotone/green/lock.gif
new file mode 100644
index 0000000000000000000000000000000000000000..db00706b5db28318af151af4125776bbfc53ff71
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB%g;YU
jp-of!iqWUtfsdS1<AdU6OkU=@d()%Ls{+B?tPIuwGj<!G

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/mail.gif b/theme/default/images/icons/twotone/green/mail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1084c862f62fd5490abc582fcfe7b577d450efff
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%fEQa
if?KZ~c0{bs%Z(FiQZABxslH78RN`eH|DIR|25SH{2phKm

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/move.gif b/theme/default/images/icons/twotone/green/move.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d2c30b1d276505fdf5ae7825a2268baa0381fb9c
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%XuK!
g@Lcysn`xJ08>Q9DWR2z}AKSEW_cpG{oU9Di0P08@NdN!<

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/music.gif b/theme/default/images/icons/twotone/green/music.gif
new file mode 100644
index 0000000000000000000000000000000000000000..64b51d4e100420e2fca737504aaf22bbea0ecffd
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%m0{p
g3sZ)6Sox>9B@eF#Hg-g`-<qMRb+qWr1y%-Y0P~j{%m4rY

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/news.gif b/theme/default/images/icons/twotone/green/news.gif
new file mode 100644
index 0000000000000000000000000000000000000000..712c685dc0b02b2bfd262e9007b7a8ce0f81e2e8
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%dgDh
c(B`#%N#&>iH4Co$il<Gzc4}RZstAKM0D!+4mH+?%

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/note.gif b/theme/default/images/icons/twotone/green/note.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bcc0b149b537374417a9a71e8439d04c6c7a3e27
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%b(1w
i5D+bUH@fOfY*blCaE4aqtOYsV`wYHY_Na?6SOWn2XBp@K

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/open-folder.gif b/theme/default/images/icons/twotone/green/open-folder.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d41300a08640d2de03ded235974b78f99b76180b
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%b(0F
e;?b=YR>fZ5aPvz?l804#xaT`=`5tW%25SJKSQoGW

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/paper-clip.gif b/theme/default/images/icons/twotone/green/paper-clip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1d45f1d1eef9831bc859c5e643387f3d9d593599
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%dgB5
e!q!l5B&N(Z_K{lC`Si?X>9N_n4>&P0SOWl)+8CSw

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/paper-clip2.gif b/theme/default/images/icons/twotone/green/paper-clip2.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a8c7805bef4ca86c713bfb88a424952eb3fc14f4
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%P%_P
gBST5zHmiXDF-kXjRV9-`x4Fi%9_L`@W@WGj0MNP^3;+NC

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/pause.gif b/theme/default/images/icons/twotone/green/pause.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ced0b6440c8fe67e6d530103d8ac1aa4b70453ca
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fEOI
b!yKu?3;xB=BLil1-fvm9>WGgMBZD;nY2_H}

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/phone.gif b/theme/default/images/icons/twotone/green/phone.gif
new file mode 100644
index 0000000000000000000000000000000000000000..69359f7648c04ec6d70f9dea5d3d2cf68c61f1b3
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%lW7|
f@LW{-0f+q8srRn;CUq=ad2Hr`7Y2(17#OSp`+Xe#

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/play.gif b/theme/default/images/icons/twotone/green/play.gif
new file mode 100644
index 0000000000000000000000000000000000000000..794ec85b6ac815e0ca134bbc0e81872ded44cc8e
GIT binary patch
literal 75
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F5`erVB%fFa8
bL@rA8T*2p;t_wRNm$oj;IuPN+$Y2csUhNo3

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/plus.gif b/theme/default/images/icons/twotone/green/plus.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4407d0b2d5e65816a16edb6989936e37dbfc45d1
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%dgDh
app?bmx8?iu%1dbzlcz3Sb#wzOgEas@*ce~{

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/print.gif b/theme/default/images/icons/twotone/green/print.gif
new file mode 100644
index 0000000000000000000000000000000000000000..17727d5d7d78a79ac3b4222d642f852d38a90b65
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
lLC#9|+y<rpISG?`Ma$>TPFXZxyDMdl)|PDDpNb+3)&N?q8{z-}

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/question-mark.gif b/theme/default/images/icons/twotone/green/question-mark.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1689efcd0293bfd8c25b47f5a1c0ddfc43d1b722
GIT binary patch
literal 74
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J5b+`erVB%m0{J
a<V2LRZFE~r=|Xp{M-j^e9&@rXSOWk!MHYMj

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/quote.gif b/theme/default/images/icons/twotone/green/quote.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4ba1f0c03d98b57424a087f4abad901425e9e5cf
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%ilQX
f(nW5mWmVx%YdvR_N{Do1?ArG3wZYl|1_o;Y*+?4Z

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/refresh.gif b/theme/default/images/icons/twotone/green/refresh.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8a8b8144fefab41052feb10e25dbd2a1ba9a2855
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P-g=
i6p>{-@AH?kQ2!UTT#^eskIhQ=KKiN0U}FFSgEasbdmDKG

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/reply.gif b/theme/default/images/icons/twotone/green/reply.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6ff01bb355956903f06ddee4c88ec13185d7cf36
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwSjfQe|NsB^DFQ$e2o!&^FfuSOG3YP=0Z5*KNg<?f=CZf^{4<O%
eNe7=5ir8YAxFTjoMwP(Km3O#}=L9e?SOWlG;~T&L

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/rewind.gif b/theme/default/images/icons/twotone/green/rewind.gif
new file mode 100644
index 0000000000000000000000000000000000000000..aca3ee35b8aca2e3025e8c51064b6905a6673468
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%fEOI
dV?))#qc?MR+saGy&aG&@a%!7^F()g7H2|NL86N-u

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/search.gif b/theme/default/images/icons/twotone/green/search.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c36463d0d9843feb92b597f68e902f1bad26b7d6
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%b&~=
c!q)KNOwfJL(147IOVgLWk}{YUz`$S)0CD;l9RL6T

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/shield.gif b/theme/default/images/icons/twotone/green/shield.gif
new file mode 100644
index 0000000000000000000000000000000000000000..419d5ee4be0c57121049c616e8ef6bf6dc736e3e
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%Xy&L
m=u~<0*$KCf<=zp@TOe*ZbEQ(w>ZOy#&cDmB_R$kzum%90svYG3

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/skip-back.gif b/theme/default/images/icons/twotone/green/skip-back.gif
new file mode 100644
index 0000000000000000000000000000000000000000..adca7aa3ee2c0cc939c8b7a3ee6ea5eafd52e657
GIT binary patch
literal 76
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J3F6`erVB%fEOI
cLnGJ6qwDkDRYWg|UBc@3>Xg?R6%ht&0E-nFl>h($

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/skip.gif b/theme/default/images/icons/twotone/green/skip.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ae5417f2f816c60245db5bba38a4a875f047c679
GIT binary patch
literal 78
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7yn`erVB%fEOI
eg95kqG5_dy6^u7B*jI*JKeBDzX&)y>25SJI+8Iay

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/skull.gif b/theme/default/images/icons/twotone/green/skull.gif
new file mode 100644
index 0000000000000000000000000000000000000000..033506732767418de878eb41beffb4164c41a1ba
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%g;PR
m<P!HCo9MKwt?^BXXOD&^tX%hW^U=qzu3qew=g|{kum%8)8Xm6z

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/statusbar.gif b/theme/default/images/icons/twotone/green/statusbar.gif
new file mode 100644
index 0000000000000000000000000000000000000000..47d61b106b5181a730c6abea80a81260cba63b3d
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%g@Y^
i?q;1irR@3Hz`K`w6=p8YTvR7|d)4zd1`7fh7_0#uavWCx

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/stop.gif b/theme/default/images/icons/twotone/green/stop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e0b108d352c6c88de6cc4795738bbf6dac8cfc12
GIT binary patch
literal 72
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0@R`erVB%fEQe
Yf?FB-XGDwVH{NoYrgqZDiIKq?03@9kF8}}l

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/template.gif b/theme/default/images/icons/twotone/green/template.gif
new file mode 100644
index 0000000000000000000000000000000000000000..65c0c4a0a5bf328de3a385826ddebbc125f8ad41
GIT binary patch
literal 81
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=r`erVB`@dn%
hmW$jv^EN2=Wk#-Om@YA)GjeKBRn?~BC!81=tN|#_9CH8w

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/text-bigger.gif b/theme/default/images/icons/twotone/green/text-bigger.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45e143b7a487d711da6c9ef5824ef4c88c47db44
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%b(0F
iqF}AfYdZg|rPPm}h|Y;gRqNulkA9Ld*ciaTU=0A~+!;~;

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/text-smaller.gif b/theme/default/images/icons/twotone/green/text-smaller.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a54d0c1d3648fd15b5b6d92cb96afd22dbba9ff7
GIT binary patch
literal 80
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TB`erVB%b(0F
gaw5t(>`O^Ut$#-2(ib%^N~T@nKF;x(i<Q9|0OOw;!~g&Q

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/trash.gif b/theme/default/images/icons/twotone/green/trash.gif
new file mode 100644
index 0000000000000000000000000000000000000000..78dd64a3d8a2ee60d4696de96c0e5b2945cafe98
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%g;YU
d;ZpSCX%+k4SteZTk*_G5uxqQ-W=>WHYXF^I8F2sr

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/two-docs.gif b/theme/default/images/icons/twotone/green/two-docs.gif
new file mode 100644
index 0000000000000000000000000000000000000000..97e54b964730d112b13e90e99912f13393179ec2
GIT binary patch
literal 83
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J2p=`erVB`@exj
k;A~dvj4LnCR!V(WjW1sy>ALD=M%Y@Pq-|#(urgQ!0B6D;9RL6T

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/twotone.gif b/theme/default/images/icons/twotone/green/twotone.gif
new file mode 100644
index 0000000000000000000000000000000000000000..45aad25c4c49c27a500a05daa7b606df4d52f268
GIT binary patch
literal 2461
zcmV;O31ap~Nk%w1VZs4O0FeLy|NsAAln?*_00000A^8LV00000EC2ui0Kx%C00092
zjE||y?GK}zwAzca-n{z{hT=$;=82~2%C_zc$MQ_q_KoNI&iDQg3<`(DqVb4KDwoWr
z^9hYgr_`$Tip^@b+^+Wv4vWX+viXcotJgh&`wfR5;`H~tPQT;jhJ9S`CjjU-xL1gG
zSeKaB7wES5*XRhz7vT6P8AxfDN!V%li5RLl%4m7HiP>>!$NK0h2z$ypiz<8TT04nL
z%WIqKy9+$rOZ;1mjJj$poZNi;3m~l-OieeP2PeI~EmuwWZ5WO?u2`PUZ0)SM9Ebg<
z&CT7K4qh)V0N^G+AN$6S&Yix1|GL2|2#{Vreg^&RD@gDe!-22vk+WzHV?=fT(4I|d
zhmfMeiSK5Sq^Jww!F3S5J;XDx7Q>YxH`;rt&E>+03iGMddF*6QkNZRp<=B#DNRcUT
zLX($~B`6L8`yIV0w4%FzKo=HOT63gNePn$)+zIul)vNe$j@9`tsm!oiVZtTJHg4Ud
zUA;!7do}G|y?yzf72I_i;gpJvdWe@$Yu2+w&00P@Gw@oIdt%1>x%X>8itkWv<$9NA
zUD6FHR~?BrbWz832vcsI7_sZwOke+nOml5+va~<re#|>EXR`xMKWyxGH))`%L+f5%
zw(RQ6vhiW-hmEmY$ws5kB_6lw?9|+4a+h8nbL89CYj3^=y=UX{?r{(Q?v|c$$AMIx
zL(RS9+*rh!hu?8kIr!jcwNWQhfDs<_ok8JUGoFF5$%oin>#?UCWFbDNSAQqs_uEd<
z!PlCK@ww-sQuA2&m2k)<7voZbsdo`*U<r4aXe$*6;(aEjh+1?Bx>X!nCHjaXfQv2J
zqkU2GXrpcL{pMeHO7a$@Z$nwxWsRIr6;_o9;=~zrB>`8aVcR(+QH8xxxo0xkxn)vo
zbMi@Hn2g1@+l$uucW9kP=GNAdh1v!rlLBs(-<lhk_$YR7O6FCjG)9^yq6U__B9Aye
z#i4$3K3SkHVY+52kS!|OoujxWs%xrJ-byM`?667Zi-A^Wt4+cG;;9ajGG?i2pMY&Q
zpR5ZG8f{_AZmTP|z;+Anx8f=rt|^;p1QxUEdOMn)>9U(HrC6?78NAw-`!2rsj+-yP
z`;zOgrW%~nFTe&DjPSn+v!yS?0q6QKuMsD^FvJHdjIqNP3p}tg6stl@DUp0Eh{%<M
zOmZqEr)=_?D8KA6%pb8#v&_TV>`Bcrd(1}9KL4Bp&Ql33iq10=O^VSs?|d}VOE(Sm
z(^BV*v?*1Oe03$nb|mb&4O?8X#2bU1G1(f2O|sc)i;XtHWwZTu+AE(cm7_$;jknup
z$8F!ldas=~x_k@1cj18lJ$J`Gb}4U8O&(4-<fmau>V9qivp6=~uzC3<ri}I-(R`Xq
z&b8MQ6ZoFBpFa+$FGNy{XyDWS7b$D>KB^g*j_2O4sYTuhsiKEoNvPqY(-%A9c(;?G
zk*Y)3p|pNkdfAwIt{SVP1ig3aQoP4IBc0HG);n6kwK~}D)^&L7eoxwoJoLq;DZD_e
z%WBw;%`>R}mIwYRpAnHqP@8KHR{#R5KS?WlP_l~b$j3PO!7otBnbeq|L_g|5#eogt
z4~n+*s|<orLpBniD(E(u=TXlx2P)u{F0;G#z0iI9dlbD&)2HiUOGw}A%iZRcL-*~F
zf!R7!bE34thNy6a^}&(|BM3wM>4<q6QeuvBvLVO+0nkIpVqKGD_#>5A?oNCWPp2Li
zMl%(rahwWH>RM7ES5-@V*vn85ZTCLWEir;CoE{SuQ^F|{D}^~q;-ZK*B4{BhL4+(8
z2l;Y42o`C6odX}3nrOfBy--TytKtIfNTM`4Lyss5-4Pi#9{j24go@*&h5Ta>GkTDG
z8nnv*4fvc5%F$PtTMb~EvN}J3vWJ_i-Yzfb$xuGhl~#1(a3uITYvE3sshnJjP#3B_
zog|Byyj&4shs-xR(}=u0A_z?=8#ZEajp6Iy5XG6uDtR)2bBrAFzIMFjZS7Sq!3#H0
zGt0X9&7Q;Sqk=LA%ytUYCYvN8mn=9wPI|NdboMfyKIs;e4<&S<3!P}adZkc`;`4zY
z<)}zaT2h264<sq|XxA!Ax|R;Eqcc6JN(rjGoZ>VWJDS?ioJKXE{xoVqCF)RpTC}XW
zOsGj^YSNSnGN)Qis#xP0(5{NrtfBy_E90ulzS^>=8nvloeJWK?cGjhqb*gKvYFp9z
zR<$BEX<L)2MRiKkyY4ivF@5Ps@oH0-n(n43!>BNH)6Z@8b+CekDU7xkP3<-IuX_z_
zP3^i^$M%$x6+tXLeCHWjp3^Cu%V%dI87xd1C7`P%EKJ_#*Qhj-ucl=NDQ%0%{&5Tg
zKpY%sX(vIB<VSkwOw@D^xy*-twn@eRiI4xTMci%{l(4gvq*#R8kWYH)S-1OP@x){-
zmLkP>r&#TG(uv4bx-o?7t0wv^Q_yC54@1nQ?|YLJ(O#<3y%p>oE)TfH^7`(UW8|Wh
z7@6H2N>rKhbr$OCDaL-37jvPd(~;EcD)!RqEk2x{S|+Eui=YRP{ruHvE9Wj>PR_t2
z?CTFRgTzx_hJw42p<FVlL5(($KMyYFd?$>>mxMUST}+BWvlB=TxA%)`EHO@+J0XbP
zFvYcXWepE3UuJqEGV+Y9a_>?j1@jP$$?flMFVNdF*+X;{77dZln?PnExx)dzZyvY%
z<ok6fijtgiHudvfGGAGU^js1D4wor90xJ}hV#ctIFBzg9U(iKq5wLLDT&miUmqT?9
zGHbO%;(N+gjmr@dccsTq^5~aJaEfr5&39odtGdQ;Tr?hGOX~`jIdzhb=&d`eo6v3(
z)7X`>l2r`DTh32~ko_++<6K7jiONpzG?c5ee9#l0(apBT-2mw#yCf=@*ZYL$o<AFG
zU~`#tr3EH`nNy~?Oj$>#jb*+6>Cit9G0?oga--FGUmCM<e{O`Zbz!&4_>Ro5x4pKo
z)9sI8vwPE>p&v>$EHMfDLE{kYva>PE#RXT{vU*({J0V@a2AQjsAFXt>I8IxV+DYc>
z3g&AyCT4?!oaUMZ?9P2|?#0Aq0O*XpY;0Zo^U5YY=0xwg(vOa|%^tO=b7gDQ-FkJn
zW?imS@A}lgPS&l9RqS0&>)5>>cC^z~t88z(+usiNxXXR+bg#SJ?~eDp>wWKh@4Mgs
b4*0+ee(;1Zyx|Xz_{1xI@r+M=0RR9ydkW?<

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/undo.gif b/theme/default/images/icons/twotone/green/undo.gif
new file mode 100644
index 0000000000000000000000000000000000000000..6869b30501187a85f8bcf2fd105aba5707f9f42e
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%g^7z
f=_9pfTfzIf)P=%DGb$GKr>~3WvgT0}VXy`Owage$

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/user.gif b/theme/default/images/icons/twotone/green/user.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c85460fcd5c48dc10a37be719df04a141b87d29b
GIT binary patch
literal 77
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7ym`erVB%P+_f
d=oh7bZg-V+q12LIze?MTA6xk!bFwm60|0b<7m5G?

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/vegetable.gif b/theme/default/images/icons/twotone/green/vegetable.gif
new file mode 100644
index 0000000000000000000000000000000000000000..4d421c1bbd4d3359c91d724dd3c86fb14513f873
GIT binary patch
literal 82
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J4=s`erVB%P;6*
i>=z(<@AlIRt_tae5-Icif0-_`*ruUlv>||j!5RPr6&c?E

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/x.gif b/theme/default/images/icons/twotone/green/x.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ffb2efea00c78ee8fd74913cce781c2d08c9ed80
GIT binary patch
literal 79
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J0TA`erVB%fFbp
f)2@MkTk-Q3o{k(<F`F~*hjhOCZL}zWfx#L8%A6X3

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/zoom-in.gif b/theme/default/images/icons/twotone/green/zoom-in.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a59a5bb50cb6d51d9eff41a6c5ab3e1d2af5cb48
GIT binary patch
literal 86
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CX`erVB%a~Nd
muJPKy#p>mJ$4OTU(?l0#1$&+62)?5co~QeWubG>b!5RQ|VjD*Q

literal 0
HcmV?d00001

diff --git a/theme/default/images/icons/twotone/green/zoom-out.gif b/theme/default/images/icons/twotone/green/zoom-out.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c61f999fd009be1c7bcb21d9f1b1d61b6d021977
GIT binary patch
literal 85
zcmZ?wbhEHb6krfwn8?KN|NsB^DFQ%}fq_BsCkrD30~3P|kPVa-0J7CW`erVB%a~Nd
luJQWA**%e#nVlUILZ8P5vo(dh+&4ibJWbYMYXAd-H2{749CrW!

literal 0
HcmV?d00001


From 838502dfd9894e409714c512f83179bab68446d7 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 04:46:18 +0000
Subject: [PATCH 206/256] timestamp anchor spacing for IE

---
 theme/base/css/ie.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/theme/base/css/ie.css b/theme/base/css/ie.css
index ef64da9537..9baa953b38 100644
--- a/theme/base/css/ie.css
+++ b/theme/base/css/ie.css
@@ -22,5 +22,5 @@ margin-left:-7px;
 }
 
 .notice div.entry-content .timestamp a {
-display:inline;
+margin-right:4px;
 }
\ No newline at end of file

From 739baf0396b2e6796f07616cdb9d52d09cf6ed2f Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Mon, 19 Jan 2009 07:24:12 +0000
Subject: [PATCH 207/256] trac750 Add notice input box to FB app and ability to
 post notices

---
 actions/facebookhome.php     |  93 ++++++++++++++++++--------
 actions/facebookinvite.php   |   3 +-
 actions/facebookremove.php   |   2 +-
 actions/facebooksettings.php |   4 +-
 lib/facebookaction.php       | 124 +++++++++++++++++++++++++----------
 lib/facebookutil.php         |  38 ++++++++++-
 scripts/update_facebook.php  |  10 ++-
 7 files changed, 205 insertions(+), 69 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index 7430cc41fa..3696df90ac 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -30,6 +30,9 @@ class FacebookhomeAction extends FacebookAction
 
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
+ 
+        // Check to see whether there's already a Facebook link for this user
+        $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
         // If the user has opted not to initially allow the app to have
         // Facebook status update permission, store that preference. Only
@@ -39,11 +42,13 @@ class FacebookhomeAction extends FacebookAction
                 FACEBOOK_PROMPTED_UPDATE_PREF, 'true');
         }
 
-        // Check to see whether there's already a Facebook link for this user
-        $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
-
         if ($flink) {
 
+            if ($_POST['submit'] == 'Send') {       
+                $this->saveNewNotice($flink);
+                return;
+            }
+
             $user = $flink->getUser();
             common_set_user($user);
 
@@ -136,19 +141,16 @@ class FacebookhomeAction extends FacebookAction
         $notice = $user->getCurrentNotice();
         update_profile_box($facebook, $fbuid, $user, $notice);
 
-
-        $this->showHeader('Home');
-
-        if ($msg) {
-            common_element('fb:success', array('message' => $msg));
-        }
-
-        echo $this->show_notices($user);
+        $this->showHeader($msg);      
+        $this->showNoticeForm($user);
+        $this->showNav('Home');
+        
+        echo $this->showNotices($user);
 
         $this->showFooter();
     }
 
-    function show_notices($user)
+    function showNotices($user)
     {
 
         $page = $this->trimmed('page');
@@ -158,13 +160,13 @@ class FacebookhomeAction extends FacebookAction
 
         $notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
 
-        $cnt = $this->show_notice_list($notice);
+        $cnt = $this->showNoticeList($notice);
 
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'all', array('nickname' => $user->nickname));
+        facebookPagination($page > 1, $cnt > NOTICES_PER_PAGE,
+            $page, 'all', array('nickname' => $user->nickname));
     }
 
-    function show_notice_list($notice)
+    function showNoticeList($notice)
     {
         $nl = new FacebookNoticeList($notice);
         return $nl->show();
@@ -175,19 +177,10 @@ class FacebookhomeAction extends FacebookAction
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
-        start_fbml();
+        startFBML();
 
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => getFacebookBaseCSS()));
-
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => getFacebookThemeCSS()));
-
-        common_element('script', array('type' => 'text/javascript',
-                                       'src' => getFacebookJS()),
-                                       ' ');
+        $this->showStylesheets();
+        $this->showScripts();
 
         $this->showLogo();
 
@@ -231,5 +224,49 @@ class FacebookhomeAction extends FacebookAction
         common_end_xml();
 
     }
+    
+    function saveNewNotice($flink)
+    {
+        
+        $user = $flink->getUser();
 
+        $content = $_POST['status_textarea']; 
+
+        if (!$content) {
+            $this->showHome($flink, _('No content!'));
+            return;
+        } else {
+            $content_shortened = common_shorten_links($content);
+
+            if (mb_strlen($content_shortened) > 140) {
+                common_debug("Content = '$content_shortened'", __FILE__);
+                common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
+                $this->showHome($flink, _('That\'s too long. Max notice size is 140 chars.'));
+                return;
+            }
+        }
+
+        $inter = new CommandInterpreter();
+
+        $cmd = $inter->handle_command($user, $content_shortened);
+
+        if ($cmd) {
+            $cmd->execute(new WebChannel());
+            return;
+        }
+
+        $replyto = $this->trimmed('inreplyto');
+
+        $notice = Notice::saveNew($user->id, $content,
+            'Facebook', 1, ($replyto == 'false') ? null : $replyto);
+
+        if (is_string($notice)) {
+            $this->showHome($flink, 'Error!');
+            return;
+        }
+
+        common_broadcast_notice($notice);
+        $this->showHome($flink, 'Success!');
+    }
+    
 }
diff --git a/actions/facebookinvite.php b/actions/facebookinvite.php
index d7e82dae7b..e67bfaa000 100644
--- a/actions/facebookinvite.php
+++ b/actions/facebookinvite.php
@@ -69,7 +69,8 @@ class FacebookinviteAction extends FacebookAction
         $facebook = get_facebook();
         $fbuid = $facebook->require_login();
 
-        $this->showHeader('Invite');
+        $this->showHeader();
+        $this->showNav('Invite');
 
         // Get a list of users who are already using the app for exclusion
         $exclude_ids = $facebook->api_client->friends_getAppUsers();
diff --git a/actions/facebookremove.php b/actions/facebookremove.php
index a200fefbfe..557c0655b4 100644
--- a/actions/facebookremove.php
+++ b/actions/facebookremove.php
@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/lib/facebookaction.php');
+require_once INSTALLDIR.'/lib/facebookaction.php';
 
 class FacebookremoveAction extends FacebookAction
 {
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index 84e9a343bf..a08abc9371 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -67,8 +67,8 @@ class FacebooksettingsAction extends FacebookAction
 
         $flink = Foreign_link::getByForeignID($fbuid, FACEBOOK_SERVICE);
 
-        $this->showHeader('Settings', $msg, $success);
-
+        $this->showHeader($msg, $success);
+        $this->showNav('Settings');
 
         if ($facebook->api_client->users_hasAppPermission('status_update')) {
 
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index 263248f679..cd43a2ccb9 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -35,17 +35,8 @@ class FacebookAction extends Action
 
         global $xw;
 
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => getFacebookBaseCSS()));
-
-        common_element('link', array('rel' => 'stylesheet',
-                                     'type' => 'text/css',
-                                     'href' => getFacebookThemeCSS()));
-
-        common_element('script', array('type' => 'text/javascript',
-                                       'src' => getFacebookJS()),
-                                       ' ');
+        $this->showStylesheets();
+        $this->showScripts();
 
         common_element_start('a', array('class' => 'url home bookmark',
                                             'href' => common_local_url('public')));
@@ -61,19 +52,34 @@ class FacebookAction extends Action
 
     }
 
-    function showHeader($selected = 'Home', $msg = null, $success = false)
-    {
 
-        start_fbml();
+    function showHeader($msg = null, $success = false) 
+    {
+        startFBML();
 
         common_element_start('fb:if-section-not-added', array('section' => 'profile'));
         common_element_start('span', array('id' => 'add_to_profile'));
         common_element('fb:add-section-button', array('section' => 'profile'));
         common_element_end('span');
         common_element_end('fb:if-section-not-added');
-
+        
         $this->showLogo();
 
+        if ($msg) {
+            if ($success) {
+                common_element('fb:success', array('message' => $msg));
+            } else {
+                // XXX do an error message here
+            }
+        }
+
+        common_element_start('div', 'main_body');        
+        
+    }
+
+    function showNav($selected = 'Home')
+    {
+
         common_element_start('dl', array("id" => 'site_nav_local_views'));
         common_element('dt', null, _('Local Views'));
         common_element_start('dd');
@@ -86,7 +92,6 @@ class FacebookAction extends Action
             array('href' => 'index.php', 'title' => _('Home')), _('Home'));
         common_element_end('li');
 
-
         common_element_start('li',
             array('class' =>
                 ($selected == 'Invite') ? 'current' : 'facebook_invite'));
@@ -107,17 +112,6 @@ class FacebookAction extends Action
         common_element_end('dd');
         common_element_end('dl');
 
-
-        if ($msg) {
-            if ($success) {
-                common_element('fb:success', array('message' => $msg));
-            } else {
-                // XXX do an error message here
-            }
-        }
-
-        common_element_start('div', 'main_body');
-
     }
 
     function showFooter()
@@ -149,10 +143,11 @@ class FacebookAction extends Action
         common_element_end('dl');
     }
 
-    function showLoginForm($msg = null)
-    {
-        start_fbml();
 
+    function showStylesheets() 
+    {
+        global $xw;
+        
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookBaseCSS()));
@@ -160,10 +155,23 @@ class FacebookAction extends Action
         common_element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookThemeCSS()));
-
+    }
+    
+    function showScripts() 
+    {
+        global $xw;
+        
         common_element('script', array('type' => 'text/javascript',
-                                       'src' => getFacebookJS()),
-                                       ' ');
+                                       'src' => getFacebookJS()));
+        
+    }
+
+    function showLoginForm($msg = null)
+    {
+        startFBML();
+
+        $this->showStylesheets();
+        $this->showScripts();
 
         $this->showLogo();
 
@@ -179,6 +187,7 @@ class FacebookAction extends Action
         common_element_start('div', array('id' => 'content_inner'));
 
         common_element_start('form', array('method' => 'post',
+                                               'class' => 'form_settings',
                                                'id' => 'login',
                                                'action' => 'index.php'));
 
@@ -209,4 +218,53 @@ class FacebookAction extends Action
     }
 
 
+    function showNoticeForm($user) 
+    {
+    
+        global $xw;
+
+        common_element_start('form', array('id' => 'form_notice',
+                                           'method' => 'post',
+                                           'action' => 'index.php'));
+
+        common_element_start('fieldset');
+        common_element('legend', null, 'Send a notice');
+
+        common_element_start('ul', 'form_datas');
+        common_element_start('li', array('id' => 'noticcommon_elemente_text'));
+        common_element('label', array('for' => 'notice_data-text'),
+                            sprintf(_('What\'s up, %s?'), $user->nickname));
+
+        common_element('textarea', array('id' => 'notice_data-text',
+                                              'cols' => 35,
+                                              'rows' => 4,
+                                              'name' => 'status_textarea'));
+        common_element_end('li');
+        common_element_end('ul');
+
+        common_element_start('dl', 'form_note');
+        common_element('dt', null, _('Available characters'));
+        common_element('dd', array('id' => 'notice_text-count'),
+                            '140');
+        common_element_end('dl');
+
+        common_element_start('ul', array('class' => 'form_actions'));
+
+        common_element_start('li', array('id' => 'notice_submit'));
+        
+        common_submit('submit', _('Send'));
+        
+        /*
+        common_element('input', array('id' => 'notice_action-submit',
+                                           'class' => 'submit',
+                                           'name' => 'status_submit',
+                                           'type' => 'submit',
+                                           'value' => _('Send')));
+        */
+        common_element_end('li');
+        common_element_end('ul');    
+        common_element_end('fieldset');    
+        common_element_end('form');
+    }
+
 }
diff --git a/lib/facebookutil.php b/lib/facebookutil.php
index cc4941bdc1..a133ce8ba5 100644
--- a/lib/facebookutil.php
+++ b/lib/facebookutil.php
@@ -44,7 +44,7 @@ function get_facebook()
     return new Facebook($apikey, $secret);
 }
 
-function start_fbml($indent = true)
+function startFBML($indent = true)
 {
     global $xw;
     $xw = new XMLWriter();
@@ -132,6 +132,42 @@ function getFacebookJS() {
 }
 
 
+// Does a little before-after block for next/prev page
+
+function facebookPagination($have_before, $have_after, $page, $action, $args=null)
+{
+
+    if ($have_before || $have_after) {
+        common_element_start('div', array('id' => 'pagination'));
+        common_element_start('ul', array('id' => 'nav_pagination'));
+    }
+
+    if ($have_before) {
+        $pargs = array('page' => $page-1);
+        $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+
+        common_element_start('li', 'before');
+        common_element('a', array('href' => "index.php?page=$newargs[page]", 'rel' => 'prev'),
+                       _('« After'));
+        common_element_end('li');
+    }
+
+    if ($have_after) {
+        $pargs = array('page' => $page+1);
+        $newargs = ($args) ? array_merge($args,$pargs) : $pargs;
+        common_element_start('li', 'after');
+        common_element('a', array('href' => "index.php?page=$newargs[page]", 'rel' => 'next'),
+                       _('Before »'));
+        common_element_end('li');
+    }
+
+    if ($have_before || $have_after) {
+        common_element_end('ul');
+        common_element_end('div');
+    }
+}
+
+
 class FacebookNoticeList extends NoticeList
 {
     /**
diff --git a/scripts/update_facebook.php b/scripts/update_facebook.php
index 8c91df384b..0c54cec7cf 100755
--- a/scripts/update_facebook.php
+++ b/scripts/update_facebook.php
@@ -67,9 +67,13 @@ while($notice->fetch()) {
         // If it's not a reply, or if the user WANTS to send replies...
         if (!preg_match('/@[a-zA-Z0-9_]{1,15}\b/u', $content) ||
             (($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) == FOREIGN_NOTICE_SEND_REPLY)) {
-                update_status($fbuid, $content);
-                update_profile_box($facebook, $fbuid, $user, $notice);
-                $cnt++;
+             
+                // Avoid a Loop
+                if ($notice->source != 'Facebook') {
+                    update_status($fbuid, $content);
+                    update_profile_box($facebook, $fbuid, $user, $notice);
+                    $cnt++;
+                }
             }
     }
 }

From dc973820681063f81449d003ab90718c7e58d6ba Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 13:19:28 +0000
Subject: [PATCH 208/256] Fix public group nav so it shows selection correctly

---
 lib/publicgroupnav.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 5ac4c0e120..97b57ec17c 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -69,21 +69,23 @@ class PublicGroupNav extends Widget
 
     function show()
     {
+        $action_name = $this->action->trimmed('action');
+
         $this->action->elementStart('ul', array('class' => 'nav'));
 
         $this->out->menuItem(common_local_url('public'), _('Public'),
-            _('Public timeline'), $this->action == 'public', 'nav_timeline_public');
+            _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
 
         $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
-            _('Recent tags'), $this->action == 'tag', 'nav_recent-tags');
+            _('Recent tags'), $action_name == 'tag', 'nav_recent-tags');
 
         if (count(common_config('nickname', 'featured')) > 0) {
             $this->out->menuItem(common_local_url('featured'), _('Featured'),
-                _('Featured users'), $this->action == 'featured', 'nav_featured');
+                _('Featured users'), $action_name == 'featured', 'nav_featured');
         }
 
         $this->out->menuItem(common_local_url('favorited'), _('Popular'),
-            _("Popular notices"), $this->action == 'favorited', 'nav_timeline_favorited');
+            _("Popular notices"), $action_name == 'favorited', 'nav_timeline_favorited');
 
         $this->action->elementEnd('ul');
     }

From 6edbf3ca781d20f2ec98daf32080c60e804d8215 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 13:22:22 +0000
Subject: [PATCH 209/256] Update favorited for new layout and framework

---
 actions/favorited.php | 203 ++++++++++++++++++++++++++++++------------
 1 file changed, 147 insertions(+), 56 deletions(-)

diff --git a/actions/favorited.php b/actions/favorited.php
index 9369057322..0223564f34 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -1,105 +1,196 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of popular notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
 
-class FavoritedAction extends StreamAction
+/**
+ * List of popular notices
+ *
+ * We provide a list of the most popular notices. Popularity
+ * is measured by
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class FavoritedAction extends Action
 {
+    var $page = null;
+
+    /**
+     * Title of the page
+     *
+     * @return string Title of the page
+     */
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return _('Popular notices');
+        } else {
+            return sprintf(_('Popular notices, page %d'), $this->page);
+        }
+    }
+
+    /**
+     * Instructions for use
+     *
+     * @return instructions for use
+     */
+
+    function getInstructions()
+    {
+        return _('The most popular notices on the site right now.');
+    }
+
+    /**
+     * Is this page read-only?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly()
+    {
+        return true;
+    }
+
+    /**
+     * Take arguments for running
+     *
+     * @param array $args $_REQUEST args
+     *
+     * @return boolean success flag
+     *
+     * @todo move queries from showContent() to here
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        return true;
+    }
+
+    /**
+     * Handle request
+     *
+     * Shows a page with list of favorite notices
+     *
+     * @param array $args $_REQUEST args; handled in prepare()
+     *
+     * @return void
+     */
 
     function handle($args)
     {
         parent::handle($args);
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        common_show_header(_('Popular notices'),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
-
-        $this->show_notices($page);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_top()
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
     {
-        $instr = $this->get_instructions();
+        $instr  = $this->getInstructions();
         $output = common_markup_to_html($instr);
+
         $this->elementStart('div', 'instructions');
         $this->raw($output);
         $this->elementEnd('div');
-        $this->public_views_menu();
     }
 
-    function show_header()
+    /**
+     * Local navigation
+     *
+     * This page is part of the public group, so show that.
+     *
+     * @return void
+     */
+
+    function showLocalNav()
     {
-        return;
+        $nav = new PublicGroupNav($this);
+        $nav->show();
     }
 
-    function get_instructions()
+    /**
+     * Content area
+     *
+     * Shows the list of popular notices
+     *
+     * @return void
+     */
+
+    function showContent()
     {
-        return _('Showing recently popular notices');
-    }
+        $qry = 'SELECT notice.*, '.
+          'sum(exp(-(now() - fave.modified) / %s)) as weight ' .
+          'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
+          'GROUP BY fave.notice_id ' .
+          'ORDER BY weight DESC';
 
-    function show_notices($page)
-    {
+        $offset = ($this->page - 1) * NOTICES_PER_PAGE;
+        $limit  = NOTICES_PER_PAGE + 1;
 
-        $qry = 'SELECT notice.*, sum(exp(-(now() - fave.modified) / %s)) as weight ' .
-                'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
-                'GROUP BY fave.notice_id ' .
-                'ORDER BY weight DESC';
-
-        $offset = ($page - 1) * NOTICES_PER_PAGE;
-        $limit = NOTICES_PER_PAGE + 1;
-
-        if (common_config('db','type') == 'pgsql') {
+        if (common_config('db', 'type') == 'pgsql') {
             $qry .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
         } else {
             $qry .= ' LIMIT ' . $offset . ', ' . $limit;
         }
 
-        # Figure out how to cache this query
+        // XXX: Figure out how to cache this query
 
         $notice = new Notice;
         $notice->query(sprintf($qry, common_config('popular', 'dropoff')));
 
-        $this->elementStart('ul', array('id' => 'notices'));
+        $nl = new NoticeList($notice, $this);
 
-        $cnt = 0;
+        $cnt = $nl->show();
 
-        while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
-            }
-
-            $item = new NoticeListItem($notice);
-            $item->show();
-        }
-
-        $this->elementEnd('ul');
-
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'favorited');
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'favorited');
     }
-
 }

From 582e2eefa3e88e228f59d1d656f29e9c7a6ea173 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 13:24:50 +0000
Subject: [PATCH 210/256] Slightly better hover notices for global nav (glad
 it's there!)

---
 lib/action.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index 812eee0e5f..c056c128fb 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -244,15 +244,15 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('ul', array('class' => 'nav'));
         if ($user) {
             $this->menuItem(common_local_url('all', array('nickname' => $user->nickname)),
-                            _('Home'), _('Personal timeline'), false, 'nav_home');
+                            _('Home'), _('Personal profile and friends timeline'), false, 'nav_home');
         }
         $this->menuItem(common_local_url('peoplesearch'),
-                        _('Search'), _('Search the site for people and text'), false, 'nav_search');
+                        _('Search'), _('Search for people or text'), false, 'nav_search');
         if ($user) {
             $this->menuItem(common_local_url('profilesettings'),
-                            _('Account'), _('Account settings'), false, 'nav_account');
+                            _('Account'), _('Change your email, avatar, password, profile'), false, 'nav_account');
             $this->menuItem(common_local_url('imsettings'),
-                            _('Connect'), _('Connect settings'), false, 'nav_connect');
+                            _('Connect'), _('Connect to IM, SMS, Twitter'), false, 'nav_connect');
             $this->menuItem(common_local_url('logout'),
                             _('Logout'), _('Logout from the site'), false, 'nav_logout');
         } else {

From e703f5e347574c2f68c97a3884bec209f924602f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 13:27:45 +0000
Subject: [PATCH 211/256] First pass at with-friends; doesn't pass phpcs

---
 actions/all.php | 52 ++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 548d7a1034..428466f243 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -27,77 +27,77 @@ class AllAction extends Action
 {
     var $user = null;
     var $page = null;
-    
+
     function isReadOnly()
     {
         return true;
     }
-    
+
     function prepare($args)
     {
-	parent::prepare($args);
+        parent::prepare($args);
         $nickname = common_canonical_nickname($this->arg('nickname'));
-	$this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::staticGet('nickname', $nickname);
         $this->page = $this->trimmed('page');
         if (!$this->page) {
             $this->page = 1;
         }
-	return true;
+        return true;
     }
-    
+
     function handle($args)
     {
         parent::handle($args);
-	
+
         if (!$this->user) {
             $this->clientError(_('No such user.'));
             return;
         }
-	
-	$this->showPage();
+
+        $this->showPage();
     }
-    
+
     function title()
     {
-	if ($this->page > 1) {
-	    return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
-	} else {
-	    return sprintf(_("%s and friends"), $this->user->nickname);
-	}
+        if ($this->page > 1) {
+            return sprintf(_("%s and friends, page %d"), $this->user->nickname, $this->page);
+        } else {
+            return sprintf(_("%s and friends"), $this->user->nickname);
+        }
     }
-    
+
     function showFeeds()
     {
         $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('allrss', array('nickname' =>
-										$this->user->nickname)),
+                                                                                $this->user->nickname)),
                                      'type' => 'application/rss+xml',
                                      'title' => sprintf(_('Feed for friends of %s'), $this->user->nickname)));
     }
-    
+
     function showLocalNav()
     {
-	$nav = new PersonalGroupNav($this);
-	$nav->show();
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
     }
 
     function showExportData()
     {
         $fl = new FeedList($this);
         $fl->show(array(0=>array('href'=>common_local_url('allrss', array('nickname' => $this->user->nickname)),
-				 'type' => 'rss',
-				 'version' => 'RSS 1.0',
-				 'item' => 'allrss')));
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'allrss')));
     }
-    
+
     function showContent()
     {
         $notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-	
+
         $nl = new NoticeList($notice, $this);
 
         $cnt = $nl->show();
-	
+
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'all', array('nickname' => $this->user->nickname));
     }

From 91457944003049d021947fde0a5f2658393010d9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 13:44:10 +0000
Subject: [PATCH 212/256] Update facebook stuff to use new methods

change facebook stuff to use new methods for XML and HTML.
---
 actions/facebookhome.php     |  32 +++---
 actions/facebooksettings.php |  20 ++--
 lib/facebookaction.php       | 198 +++++++++++++++++------------------
 3 files changed, 123 insertions(+), 127 deletions(-)

diff --git a/actions/facebookhome.php b/actions/facebookhome.php
index ae29ee1f84..14342f944b 100644
--- a/actions/facebookhome.php
+++ b/actions/facebookhome.php
@@ -184,7 +184,7 @@ class FacebookhomeAction extends FacebookAction
 
         $this->showLogo();
 
-        common_element_start('div', array('class' => 'content'));
+        $this->elementStart('div', array('class' => 'content'));
 
         // Figure what the URL of our app is.
         $app_props = $facebook->api_client->Admin_getAppProperties(
@@ -196,30 +196,30 @@ class FacebookhomeAction extends FacebookAction
             'your Facebook status with your latest notice, you need ' .
             'to give it permission.'), $app_name);
 
-        common_element_start('p');
-        common_element('span', array('id' => 'permissions_notice'), $instructions);
-        common_element_end('p');
+        $this->elementStart('p');
+        $this->element('span', array('id' => 'permissions_notice'), $instructions);
+        $this->elementEnd('p');
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                            'action' => $app_url,
                                            'id' => 'facebook-skip-permissions'));
 
-        common_element_start('ul', array('id' => 'fb-permissions-list'));
-        common_element_start('li', array('id' => 'fb-permissions-item'));
-        common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+        $this->elementStart('ul', array('id' => 'fb-permissions-list'));
+        $this->elementStart('li', array('id' => 'fb-permissions-item'));
+        $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
             'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
-        common_element('span', array('class' => 'facebook-button'),
+        $this->element('span', array('class' => 'facebook-button'),
             _('Allow Identi.ca to update my Facebook status'));
-        common_element_end('fb:prompt-permission');
-        common_element_end('li');
+        $this->elementEnd('fb:prompt-permission');
+        $this->elementEnd('li');
 
-        common_element_start('li', array('id' => 'fb-permissions-item'));
+        $this->elementStart('li', array('id' => 'fb-permissions-item'));
         common_submit('skip', _('Skip'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_element_end('form');
-        common_element_end('div');
+        $this->elementEnd('form');
+        $this->elementEnd('div');
 
         common_end_xml();
 
diff --git a/actions/facebooksettings.php b/actions/facebooksettings.php
index bc034bc46d..d4f03e58c0 100644
--- a/actions/facebooksettings.php
+++ b/actions/facebooksettings.php
@@ -104,19 +104,19 @@ class FacebooksettingsAction extends FacebookAction
                 'your Facebook status with your latest notice, you need ' .
                 'to give it permission.'), $app_name);
 
-            common_element_start('p');
-            common_element('span', array('id' => 'permissions_notice'), $instructions);
-            common_element_end('p');
+            $this->elementStart('p');
+            $this->element('span', array('id' => 'permissions_notice'), $instructions);
+            $this->elementEnd('p');
 
-            common_element_start('ul', array('id' => 'fb-permissions-list'));
-            common_element_start('li', array('id' => 'fb-permissions-item'));
-            common_element_start('fb:prompt-permission', array('perms' => 'status_update',
+            $this->elementStart('ul', array('id' => 'fb-permissions-list'));
+            $this->elementStart('li', array('id' => 'fb-permissions-item'));
+            $this->elementStart('fb:prompt-permission', array('perms' => 'status_update',
                 'next_fbjs' => 'document.setLocation(\'' . $app_url . '\')'));
-            common_element('span', array('class' => 'facebook-button'),
+            $this->element('span', array('class' => 'facebook-button'),
                 _('Allow Identi.ca to update my Facebook status'));
-            common_element_end('fb:prompt-permission');
-            common_element_end('li');
-            common_element_end('ul');
+            $this->elementEnd('fb:prompt-permission');
+            $this->elementEnd('li');
+            $this->elementEnd('ul');
         }
 
         $this->showFooter();
diff --git a/lib/facebookaction.php b/lib/facebookaction.php
index cd43a2ccb9..6d42596e8e 100644
--- a/lib/facebookaction.php
+++ b/lib/facebookaction.php
@@ -38,132 +38,129 @@ class FacebookAction extends Action
         $this->showStylesheets();
         $this->showScripts();
 
-        common_element_start('a', array('class' => 'url home bookmark',
+        $this->elementStart('a', array('class' => 'url home bookmark',
                                             'href' => common_local_url('public')));
         if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
-            common_element('img', array('class' => 'logo photo',
+            $this->element('img', array('class' => 'logo photo',
                 'src' => (common_config('site', 'logo')) ?
                     common_config('site', 'logo') : theme_path('logo.png'),
                 'alt' => common_config('site', 'name')));
         }
 
-        common_element('span', array('class' => 'fn org'), common_config('site', 'name'));
-        common_element_end('a');
+        $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
+        $this->elementEnd('a');
 
     }
 
-
-    function showHeader($msg = null, $success = false) 
+    function showHeader($msg = null, $success = false)
     {
         startFBML();
 
-        common_element_start('fb:if-section-not-added', array('section' => 'profile'));
-        common_element_start('span', array('id' => 'add_to_profile'));
-        common_element('fb:add-section-button', array('section' => 'profile'));
-        common_element_end('span');
-        common_element_end('fb:if-section-not-added');
-        
+        $this->elementStart('fb:if-section-not-added', array('section' => 'profile'));
+        $this->elementStart('span', array('id' => 'add_to_profile'));
+        $this->element('fb:add-section-button', array('section' => 'profile'));
+        $this->elementEnd('span');
+        $this->elementEnd('fb:if-section-not-added');
+
         $this->showLogo();
 
         if ($msg) {
             if ($success) {
-                common_element('fb:success', array('message' => $msg));
+                $this->element('fb:success', array('message' => $msg));
             } else {
                 // XXX do an error message here
             }
         }
 
-        common_element_start('div', 'main_body');        
-        
+        $this->elementStart('div', 'main_body');
+
     }
 
     function showNav($selected = 'Home')
     {
 
-        common_element_start('dl', array("id" => 'site_nav_local_views'));
-        common_element('dt', null, _('Local Views'));
-        common_element_start('dd');
+        $this->elementStart('dl', array("id" => 'site_nav_local_views'));
+        $this->element('dt', null, _('Local Views'));
+        $this->elementStart('dd');
 
-        common_element_start('ul', array('class' => 'nav'));
+        $this->elementStart('ul', array('class' => 'nav'));
 
-        common_element_start('li', array('class' =>
+        $this->elementStart('li', array('class' =>
             ($selected == 'Home') ? 'current' : 'facebook_home'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'index.php', 'title' => _('Home')), _('Home'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_start('li',
+        $this->elementStart('li',
             array('class' =>
                 ($selected == 'Invite') ? 'current' : 'facebook_invite'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'invite.php', 'title' => _('Invite')), _('Invite'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_start('li',
+        $this->elementStart('li',
             array('class' =>
                 ($selected == 'Settings') ? 'current' : 'facebook_settings'));
-        common_element('a',
+        $this->element('a',
             array('href' => 'settings.php',
                 'title' => _('Settings')), _('Settings'));
-        common_element_end('li');
+        $this->elementEnd('li');
 
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
-        common_element_end('dd');
-        common_element_end('dl');
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 
     }
 
     function showFooter()
     {
-        common_element_end('div');
-        common_end_xml();
+        $this->elementEnd('div');
+        $this->endXml();
     }
 
-
     function showInstructions()
     {
         global $xw;
 
-        common_element_start('dl', array('class' => 'system_notice'));
-        common_element('dt', null, 'Page Notice');
+        $this->elementStart('dl', array('class' => 'system_notice'));
+        $this->element('dt', null, 'Page Notice');
 
         $loginmsg_part1 = _('To use the %s Facebook Application you need to login ' .
             'with your username and password. Don\'t have a username yet? ');
 
         $loginmsg_part2 = _(' a new account.');
 
-        common_element_start('dd');
-        common_element_start('p');
-        common_text(sprintf($loginmsg_part1, common_config('site', 'name')));
-        common_element('a',
+        $this->elementStart('dd');
+        $this->elementStart('p');
+        $this->text(sprintf($loginmsg_part1, common_config('site', 'name')));
+        $this->element('a',
             array('href' => common_local_url('register')), _('Register'));
-        common_text($loginmsg_part2);
-        common_element_end('dd');
-        common_element_end('dl');
+        $this->text($loginmsg_part2);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
-
-    function showStylesheets() 
+    function showStylesheets()
     {
         global $xw;
-        
-        common_element('link', array('rel' => 'stylesheet',
+
+        $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookBaseCSS()));
 
-        common_element('link', array('rel' => 'stylesheet',
+        $this->element('link', array('rel' => 'stylesheet',
                                      'type' => 'text/css',
                                      'href' => getFacebookThemeCSS()));
     }
-    
-    function showScripts() 
+
+    function showScripts()
     {
         global $xw;
-        
-        common_element('script', array('type' => 'text/javascript',
+
+        $this->element('script', array('type' => 'text/javascript',
                                        'src' => getFacebookJS()));
-        
+
     }
 
     function showLoginForm($msg = null)
@@ -175,96 +172,95 @@ class FacebookAction extends Action
 
         $this->showLogo();
 
-        common_element_start('div', array('class' => 'content'));
-        common_element('h1', null, _('Login'));
+        $this->elementStart('div', array('class' => 'content'));
+        $this->element('h1', null, _('Login'));
 
         if ($msg) {
-             common_element('fb:error', array('message' => $msg));
+             $this->element('fb:error', array('message' => $msg));
         }
 
         $this->showInstructions();
 
-        common_element_start('div', array('id' => 'content_inner'));
+        $this->elementStart('div', array('id' => 'content_inner'));
 
-        common_element_start('form', array('method' => 'post',
+        $this->elementStart('form', array('method' => 'post',
                                                'class' => 'form_settings',
                                                'id' => 'login',
                                                'action' => 'index.php'));
 
-        common_element_start('fieldset');
-        common_element('legend', null, _('Login to site'));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Login to site'));
 
-        common_element_start('ul', array('class' => 'form_datas'));
-        common_element_start('li');
-        common_input('nickname', _('Nickname'));
-        common_element_end('li');
-        common_element_start('li');
-        common_password('password', _('Password'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementStart('ul', array('class' => 'form_datas'));
+        $this->elementStart('li');
+        $this->input('nickname', _('Nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
+        $this->password('password', _('Password'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_submit('submit', _('Login'));
-        common_element_end('form');
+        $this->submit('submit', _('Login'));
+        $this->elementEnd('form');
 
-        common_element_start('p');
-        common_element('a', array('href' => common_local_url('recoverpassword')),
+        $this->elementStart('p');
+        $this->element('a', array('href' => common_local_url('recoverpassword')),
                        _('Lost or forgotten password?'));
-        common_element_end('p');
+        $this->elementEnd('p');
 
-        common_element_end('div');
+        $this->elementEnd('div');
 
-        common_end_xml();
+        $this->endXml();
 
     }
 
-
-    function showNoticeForm($user) 
+    function showNoticeForm($user)
     {
-    
+
         global $xw;
 
-        common_element_start('form', array('id' => 'form_notice',
+        $this->elementStart('form', array('id' => 'form_notice',
                                            'method' => 'post',
                                            'action' => 'index.php'));
 
-        common_element_start('fieldset');
-        common_element('legend', null, 'Send a notice');
+        $this->elementStart('fieldset');
+        $this->element('legend', null, 'Send a notice');
 
-        common_element_start('ul', 'form_datas');
-        common_element_start('li', array('id' => 'noticcommon_elemente_text'));
-        common_element('label', array('for' => 'notice_data-text'),
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li', array('id' => 'noticcommon_elemente_text'));
+        $this->element('label', array('for' => 'notice_data-text'),
                             sprintf(_('What\'s up, %s?'), $user->nickname));
 
-        common_element('textarea', array('id' => 'notice_data-text',
+        $this->element('textarea', array('id' => 'notice_data-text',
                                               'cols' => 35,
                                               'rows' => 4,
                                               'name' => 'status_textarea'));
-        common_element_end('li');
-        common_element_end('ul');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
-        common_element_start('dl', 'form_note');
-        common_element('dt', null, _('Available characters'));
-        common_element('dd', array('id' => 'notice_text-count'),
+        $this->elementStart('dl', 'form_note');
+        $this->element('dt', null, _('Available characters'));
+        $this->element('dd', array('id' => 'notice_text-count'),
                             '140');
-        common_element_end('dl');
+        $this->elementEnd('dl');
 
-        common_element_start('ul', array('class' => 'form_actions'));
+        $this->elementStart('ul', array('class' => 'form_actions'));
+
+        $this->elementStart('li', array('id' => 'notice_submit'));
+
+        $this->submit('submit', _('Send'));
 
-        common_element_start('li', array('id' => 'notice_submit'));
-        
-        common_submit('submit', _('Send'));
-        
         /*
-        common_element('input', array('id' => 'notice_action-submit',
+        $this->element('input', array('id' => 'notice_action-submit',
                                            'class' => 'submit',
                                            'name' => 'status_submit',
                                            'type' => 'submit',
                                            'value' => _('Send')));
         */
-        common_element_end('li');
-        common_element_end('ul');    
-        common_element_end('fieldset');    
-        common_element_end('form');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
     }
 
 }

From b635b6de04073e7b2876801a5f335cc1a80fb084 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 15:28:27 +0000
Subject: [PATCH 213/256] Update showfavorites

---
 actions/showfavorites.php | 217 ++++++++++++++++++++++++++++----------
 1 file changed, 159 insertions(+), 58 deletions(-)

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index caa823893d..d2c91c0250 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of replies
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,88 +18,186 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/actions/showstream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-class ShowfavoritesAction extends StreamAction
+/**
+ * List of replies
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class ShowfavoritesAction extends Action
 {
+    /** User we're getting the faves of */
+    var $user = null;
+    /** Page of the faves we're on */
+    var $page = null;
+
+    /**
+     * Title of the page
+     *
+     * Includes name of user and page number.
+     *
+     * @return string title of page
+     */
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return sprintf(_("%s favorite notices"), $this->user->nickname);
+        } else {
+            return sprintf(_("%s favorite notices, page %d"),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
+
+    /**
+     * Prepare the object
+     *
+     * Check the input values and initialize the object.
+     * Shows an error page on bad input.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return boolean success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $nickname = common_canonical_nickname($this->arg('nickname'));
+
+        $this->user = User::staticGet('nickname', $nickname);
+
+        if (!$this->user) {
+            $this->clientError(_('No such user.'));
+            return false;
+        }
+
+        $this->page = $this->trimmed('page');
+
+        if (!$this->page) {
+            $this->page = 1;
+        }
+
+        return true;
+    }
+
+    /**
+     * Handle a request
+     *
+     * Just show the page. All args already handled.
+     *
+     * @param array $args $_REQUEST data
+     *
+     * @return void
+     */
 
     function handle($args)
     {
-
         parent::handle($args);
-
-        $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!$user) {
-            $this->clientError(_('No such user.'));
-            return;
-        }
-
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            $this->serverError(_('User has no profile.'));
-            return;
-        }
-
-        # Looks like we're good; show the header
-
-        common_show_header(sprintf(_("%s favorite notices"), $profile->nickname),
-                           array($this, 'show_header'), $user,
-                           array($this, 'show_top'));
-
-        $this->show_notices($user);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_header($user)
+    /**
+     * Feeds for the <head> section
+     *
+     * @return void
+     */
+
+    function showFeeds()
     {
+        $feedurl   = common_local_url('favoritesrss',
+                                      array('nickname' =>
+                                            $this->user->nickname));
+        $feedtitle = sprintf(_('Feed for favorites of %s'),
+                             $this->user->nickname);
+
         $this->element('link', array('rel' => 'alternate',
-                                     'href' => common_local_url('favoritesrss', array('nickname' =>
-                                                                                      $user->nickname)),
+                                     'href' => $feedurl,
                                      'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Feed for favorites of %s'), $user->nickname)));
+                                     'title' => $feedtitle));
     }
 
-    function show_top($user)
+    /**
+     * show the personal group nav
+     *
+     * @return void
+     */
+
+    function showLocalNav()
     {
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id) {
-            common_notice_form('all');
-        }
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('favoritesrss', array('nickname' => $user->nickname)),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'Favorites')));
-        $this->views_menu();
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
     }
 
-    function show_notices($user)
+    /**
+     * Show the replies feed links
+     *
+     * @return void
+     */
+
+    function showExportData()
     {
+        $feedurl = common_local_url('favoritesrss',
+                                    array('nickname' =>
+                                          $this->user->nickname));
 
-        $page = $this->trimmed('page');
-        if (!$page) {
-            $page = 1;
-        }
+        $fl = new FeedList($this);
 
-        $notice = $user->favoriteNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+        // XXX: I18N
+
+        $fl->show(array(0=>array('href'=> $feedurl,
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'Favorites')));
+    }
+
+    /**
+     * Show the content
+     *
+     * A list of notices that this user has marked as a favorite
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $notice = $this->user->favoriteNotices(($this->page-1)*NOTICES_PER_PAGE,
+                                               NOTICES_PER_PAGE + 1);
 
         if (!$notice) {
             $this->serverError(_('Could not retrieve favorite notices.'));
             return;
         }
 
-        $cnt = $this->show_notice_list($notice);
+        $nl = new NoticeList($notice, $this);
 
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'showfavorites', array('nickname' => $user->nickname));
+        $cnt = $nl->show();
+
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'showfavorites',
+                          array('nickname' => $this->user->nickname));
     }
 }

From 02b49e3f87ebe3fb64a24b21356d03d3b3d697e9 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 16:35:04 +0000
Subject: [PATCH 214/256] Reformat notice list code

---
 lib/noticelist.php | 65 +++++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 9c433f81a0..c57d6ce199 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -67,7 +67,7 @@ class NoticeList extends Widget
 
     function __construct($notice, $out=null)
     {
-	parent::__construct($out);
+        parent::__construct($out);
         $this->notice = $notice;
     }
 
@@ -160,7 +160,7 @@ class NoticeListItem extends Widget
 
     function __construct($notice, $out=null)
     {
-	parent::__construct($out);
+        parent::__construct($out);
         $this->notice  = $notice;
         $this->profile = $notice->getProfile();
     }
@@ -209,7 +209,6 @@ class NoticeListItem extends Widget
         $this->out->elementEnd('div');
     }
 
-
     /**
      * start a single notice.
      *
@@ -221,7 +220,7 @@ class NoticeListItem extends Widget
         // XXX: RDFa
         // TODO: add notice_type class e.g., notice_video, notice_image
         $this->out->elementStart('li', array('class' => 'hentry notice',
-                                         'id' => 'notice-' . $this->notice->id));
+                                             'id' => 'notice-' . $this->notice->id));
     }
 
     /**
@@ -235,11 +234,11 @@ class NoticeListItem extends Widget
         $user = common_current_user();
         if ($user) {
             if ($user->hasFave($this->notice)) {
-		$disfavor = new DisfavorForm($this->out, $this->notice);
-		$disfavor->show();
+                $disfavor = new DisfavorForm($this->out, $this->notice);
+                $disfavor->show();
             } else {
-		$favor = new FavorForm($this->out, $this->notice);
-		$favor->show();
+                $favor = new FavorForm($this->out, $this->notice);
+                $favor->show();
             }
         }
     }
@@ -256,7 +255,7 @@ class NoticeListItem extends Widget
     {
         $this->out->elementStart('span', 'vcard author');
         $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                        'class' => 'url'));
+                                            'class' => 'url'));
         $this->showAvatar();
         $this->showNickname();
         $this->out->elementEnd('a');
@@ -277,15 +276,15 @@ class NoticeListItem extends Widget
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
 
         $this->out->element('img', array('src' => ($avatar) ?
-                                    common_avatar_display_url($avatar) :
-                                    common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar photo',
-                                    'width' => AVATAR_STREAM_SIZE,
-                                    'height' => AVATAR_STREAM_SIZE,
-                                    'alt' =>
-                                    ($this->profile->fullname) ?
-                                    $this->profile->fullname :
-                                    $this->profile->nickname));
+                                         common_avatar_display_url($avatar) :
+                                         common_default_avatar(AVATAR_STREAM_SIZE),
+                                         'class' => 'avatar photo',
+                                         'width' => AVATAR_STREAM_SIZE,
+                                         'height' => AVATAR_STREAM_SIZE,
+                                         'alt' =>
+                                         ($this->profile->fullname) ?
+                                         $this->profile->fullname :
+                                         $this->profile->nickname));
     }
 
     /**
@@ -299,7 +298,7 @@ class NoticeListItem extends Widget
     function showNickname()
     {
         $this->out->element('span', array('class' => 'nickname fn'),
-                       $this->profile->nickname);
+                            $this->profile->nickname);
     }
 
     /**
@@ -346,14 +345,14 @@ class NoticeListItem extends Widget
             $noticeurl = $this->notice->uri;
         }
         $this->out->elementStart('dl', 'timestamp');
-        $this->out->element('dt', null, _('Published')); 
+        $this->out->element('dt', null, _('Published'));
         $this->out->elementStart('dd', null);
         $this->out->elementStart('a', array('rel' => 'bookmark',
-                                        'href' => $noticeurl));
+                                            'href' => $noticeurl));
         $dt = common_date_iso8601($this->notice->created);
         $this->out->element('abbr', array('class' => 'published',
-                                     'title' => $dt),
-                       common_date_string($this->notice->created));
+                                          'title' => $dt),
+                            common_date_string($this->notice->created));
         $this->out->elementEnd('a');
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
@@ -375,20 +374,20 @@ class NoticeListItem extends Widget
             $this->out->element('dt', null, _('From'));
             $source_name = _($this->notice->source);
             switch ($this->notice->source) {
-            case 'web':
-            case 'xmpp':
-            case 'mail':
-            case 'omb':
-            case 'api':
+             case 'web':
+             case 'xmpp':
+             case 'mail':
+             case 'omb':
+             case 'api':
                 $this->out->element('dd', 'noticesource', $source_name);
                 break;
-            default:
+             default:
                 $ns = Notice_source::staticGet($this->notice->source);
                 if ($ns) {
                     $this->out->elementStart('dd', null);
                     $this->out->element('a', array('href' => $ns->url,
-                                              'rel' => 'external'),
-                                   $ns->name);
+                                                   'rel' => 'external'),
+                                        $ns->name);
                     $this->out->elementEnd('dd');
                 } else {
                     $this->out->element('dd', 'noticesource', $source_name);
@@ -417,8 +416,8 @@ class NoticeListItem extends Widget
             $this->out->element('dt', null, _('To'));
             $this->out->elementStart('dd');
             $this->out->element('a', array('href' => $replyurl,
-                                      'rel' => 'in-reply-to'),
-                           _('in reply to'));
+                                           'rel' => 'in-reply-to'),
+                                _('in reply to'));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
         }

From bc15d027a804e60e76bdaf6fd47e69d41b395e7e Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 16:50:22 +0000
Subject: [PATCH 215/256] Changed @id to @class for notices ul

---
 actions/shownotice.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 52faba93ef..7033a1672b 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -190,7 +190,7 @@ class ShownoticeAction extends Action
 
     function showContent()
     {
-        $this->elementStart('ul', array('id' => 'notices'));
+        $this->elementStart('ul', array('class' => 'notices'));
         $nli = new NoticeListItem($this->notice, $this);
         $nli->show();
         $this->elementEnd('ul');

From 7ca32eb2e6d36b9173bb2864c439492034f0beaf Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 16:56:41 +0000
Subject: [PATCH 216/256] Upgraded showstream, didn't make it phpcs-compatible

---
 actions/showstream.php | 399 +++++++++++++++++++++--------------------
 1 file changed, 204 insertions(+), 195 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index ed38c67f95..aaa55b3306 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * User profile page
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,27 +18,64 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
+require_once INSTALLDIR.'/lib/personalgroupnav.php';
+require_once INSTALLDIR.'/lib/noticelist.php';
+require_once INSTALLDIR.'/lib/feedlist.php';
 
-define('SUBSCRIPTIONS_PER_ROW', 4);
-define('SUBSCRIPTIONS', 80);
+/**
+ * User profile page
+ *
+ * When I created this page, "show stream" seemed like the best name for it.
+ * Now, it seems like a really bad name.
+ *
+ * It shows a stream of the user's posts, plus lots of profile info, links
+ * to subscriptions and stuff, etc.
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
-class ShowstreamAction extends StreamAction
+class ShowstreamAction extends Action
 {
+    var $user = null;
+    var $page = null;
+    var $profile = null;
 
-    function handle($args)
+    function title()
     {
+        if ($this->page == 1) {
+            return $this->user->nickname;
+        } else {
+            return sprintf(_("%s, page %d"),
+                           $this->user->nickname,
+                           $this->page);
+        }
+    }
 
-        parent::handle($args);
+    function prepare($args)
+    {
+        parent::prepare($args);
 
         $nickname_arg = $this->arg('nickname');
         $nickname = common_canonical_nickname($nickname_arg);
 
-        # Permanent redirect on non-canonical nickname
+        // Permanent redirect on non-canonical nickname
 
         if ($nickname_arg != $nickname) {
             $args = array('nickname' => $nickname);
@@ -43,181 +83,182 @@ class ShowstreamAction extends StreamAction
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url('showstream', $args), 301);
-            return;
+            return false;
         }
 
-        $user = User::staticGet('nickname', $nickname);
+        $this->user = User::staticGet('nickname', $nickname);
 
-        if (!$user) {
-            $this->no_such_user();
-            return;
+        if (!$this->user) {
+            $this->clientError(_('No such user.'), 404);
+            return false;
         }
 
-        $profile = $user->getProfile();
+        $this->profile = $this->user->getProfile();
 
-        if (!$profile) {
+        if (!$this->profile) {
             $this->serverError(_('User has no profile.'));
-            return;
+            return false;
         }
 
-        # Looks like we're good; start output
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
-        # For YADIS discovery, we also have a <meta> tag
+        return true;
+    }
+
+    function handle($args)
+    {
+
+        // Looks like we're good; start output
+
+        // For YADIS discovery, we also have a <meta> tag
 
         header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' =>
-                                                                   $user->nickname)));
+                                                                   $this->user->nickname)));
 
-        common_show_header($profile->nickname,
-                           array($this, 'show_header'), $user,
-                           array($this, 'show_top'));
-
-        $this->show_profile($profile);
-
-        $this->show_notices($user);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_top($user)
+    function showContent()
     {
-        $cur = common_current_user();
-
-        if ($cur && $cur->id == $user->id) {
-            common_notice_form('showstream');
-        }
-
-        $this->views_menu();
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('nickname' => $user->nickname)),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'notices'),
-                                     1=>array('href'=>common_local_url('usertimeline', array('nickname' => $user->nickname)),
-                                              'type' => 'atom',
-                                              'version' => 'Atom 1.0',
-                                              'item' => 'usertimeline'),
-
-                                     2=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
-                                              'type' => 'rdf',
-                                              'version' => 'FOAF',
-                                              'item' => 'foaf')));
+        $this->showProfile();
+        $this->showNotices();
     }
 
-    function show_header($user)
+    function showLocalNav()
     {
-        # Feeds
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
+    }
+
+    function showPageTitle()
+    {
+        // Don't show the H1; we have one in the profile block
+    }
+
+    function showExportData()
+    {
+        $fl = new FeedList($this);
+        $fl->show(array(0=>array('href'=>common_local_url('userrss',
+                                                          array('nickname' => $this->user->nickname)),
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'notices'),
+                        1=>array('href'=>common_local_url('usertimeline',
+                                                          array('nickname' => $this->user->nickname)),
+                                 'type' => 'atom',
+                                 'version' => 'Atom 1.0',
+                                 'item' => 'usertimeline'),
+                        2=>array('href'=>common_local_url('foaf',
+                                                          array('nickname' => $this->user->nickname)),
+                                 'type' => 'rdf',
+                                 'version' => 'FOAF',
+                                 'item' => 'foaf')));
+    }
+
+    function showFeeds()
+    {
+        // Feeds
         $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.rss',
-                                                                      'argument' => $user->nickname)),
+                                                                      'argument' => $this->user->nickname)),
                                      'type' => 'application/rss+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
+                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
         $this->element('link', array('rel' => 'alternate feed',
                                      'href' => common_local_url('api',
                                                                 array('apiaction' => 'statuses',
                                                                       'method' => 'user_timeline.atom',
-                                                                      'argument' => $user->nickname)),
+                                                                      'argument' => $this->user->nickname)),
                                      'type' => 'application/atom+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
+                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
         $this->element('link', array('rel' => 'alternate',
                                      'href' => common_local_url('userrss', array('nickname' =>
-                                                                               $user->nickname)),
+                                                                               $this->user->nickname)),
                                      'type' => 'application/rdf+xml',
-                                     'title' => sprintf(_('Notice feed for %s'), $user->nickname)));
-        # FOAF
+                                     'title' => sprintf(_('Notice feed for %s'), $this->user->nickname)));
+    }
+
+    function extraHead()
+    {
+        // FOAF
         $this->element('link', array('rel' => 'meta',
                                      'href' => common_local_url('foaf', array('nickname' =>
-                                                                              $user->nickname)),
+                                                                              $this->user->nickname)),
                                      'type' => 'application/rdf+xml',
                                      'title' => 'FOAF'));
-        # for remote subscriptions etc.
+        // for remote subscriptions etc.
         $this->element('meta', array('http-equiv' => 'X-XRDS-Location',
                                      'content' => common_local_url('xrds', array('nickname' =>
-                                                                               $user->nickname))));
-        $profile = $user->getProfile();
-        if ($profile->bio) {
+                                                                               $this->user->nickname))));
+
+        if ($this->profile->bio) {
             $this->element('meta', array('name' => 'description',
-                                         'content' => $profile->bio));
+                                         'content' => $this->profile->bio));
         }
 
-        if ($user->emailmicroid && $user->email && $profile->profileurl) {
+        if ($this->user->emailmicroid && $this->user->email && $this->profile->profileurl) {
+            $id = new Microid('mailto:'.$this->user->email,
+                              $this->selfUrl());
             $this->element('meta', array('name' => 'microid',
-                                         'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($profile->profileurl))));
+                                         'content' => $id->toString()));
         }
-        if ($user->jabbermicroid && $user->jabber && $profile->profileurl) {
+        if ($this->user->jabbermicroid && $this->user->jabber && $this->profile->profileurl) {
+            $id = new Microid('xmpp:'.$this->user->jabber,
+                              $this->selfUrl());
             $this->element('meta', array('name' => 'microid',
-                                         'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($profile->profileurl))));
+                                         'content' => $id->toString()));
         }
 
-        # See https://wiki.mozilla.org/Microsummaries
+        // See https://wiki.mozilla.org/Microsummaries
 
         $this->element('link', array('rel' => 'microsummary',
                                      'href' => common_local_url('microsummary',
-                                                                array('nickname' => $profile->nickname))));
+                                                                array('nickname' => $this->profile->nickname))));
     }
 
-    function no_such_user()
+    function showProfile()
     {
-        $this->clientError(_('No such user.'), 404);
-    }
-
-    function show_profile($profile)
-    {
-
         $this->elementStart('div', array('id' => 'profile', 'class' => 'vcard'));
 
-        $this->show_personal($profile);
-
-        $this->show_last_notice($profile);
-
-        $cur = common_current_user();
-
-        $this->show_subscriptions($profile);
-
-        $this->elementEnd('div');
-    }
-
-    function show_personal($profile)
-    {
-
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
         $this->elementStart('div', array('id' => 'profile_avatar'));
         $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
                                     'class' => 'avatar profile photo',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
-                                    'alt' => $profile->nickname));
+                                    'alt' => $this->profile->nickname));
 
         $this->elementStart('ul', array('id' => 'profile_actions'));
 
         $this->elementStart('li', array('id' => 'profile_subscribe'));
         $cur = common_current_user();
         if ($cur) {
-            if ($cur->id != $profile->id) {
-                if ($cur->isSubscribed($profile)) {
-                    common_unsubscribe_form($profile);
+            if ($cur->id != $this->profile->id) {
+                if ($cur->isSubscribed($this->profile)) {
+                    $sf = new SubscribeForm($this, $this->profile);
+                    $sf->show();
                 } else {
-                    common_subscribe_form($profile);
+                    $usf = new UnsubscribeForm($this, $this->profile);
+                    $usf->show();
                 }
             }
         } else {
-            $this->show_remote_subscribe_link($profile);
+            $this->showRemoteSubscribeLink();
         }
         $this->elementEnd('li');
 
-        $user = User::staticGet('id', $profile->id);
-        common_profile_new_message_nudge($cur, $user, $profile);
+        common_profile_new_message_nudge($cur, $this->user, $this->profile);
 
-        if ($cur && $cur->id != $profile->id) {
-            $blocked = $cur->hasBlocked($profile);
+        if ($cur && $cur->id != $this->profile->id) {
+            $blocked = $cur->hasBlocked($this->profile);
             $this->elementStart('li', array('id' => 'profile_block'));
             if ($blocked) {
-                common_unblock_form($profile, array('action' => 'showstream',
-                                                    'nickname' => $profile->nickname));
+                $bf = new BlockForm($this, $this->profile);
+                $bf->show();
             } else {
-                common_block_form($profile, array('action' => 'showstream',
-                                                  'nickname' => $profile->nickname));
+                $ubf = new UnblockForm($this, $this->profile);
+                $ubf->show();
             }
             $this->elementEnd('li');
         }
@@ -228,72 +269,73 @@ class ShowstreamAction extends StreamAction
 
         $this->elementStart('div', array('id' => 'profile_information'));
 
-        if ($profile->fullname) {
-            $this->element('h1', array('class' => 'fn'), $profile->fullname . ' (' . $profile->nickname . ')');
+        if ($this->profile->fullname) {
+            $this->element('h1', array('class' => 'fn'), $this->profile->fullname . ' (' . $this->profile->nickname . ')');
         } else {
-            $this->element('h1', array('class' => 'fn nickname'), $profile->nickname);
+            $this->element('h1', array('class' => 'fn nickname'), $this->profile->nickname);
         }
 
-        if ($profile->location) {
-            $this->element('p', 'location', $profile->location);
+        if ($this->profile->location) {
+            $this->element('p', 'location', $this->profile->location);
         }
-        if ($profile->bio) {
-            $this->element('p', 'description note', $profile->bio);
+        if ($this->profile->bio) {
+            $this->element('p', 'description note', $this->profile->bio);
         }
-        if ($profile->homepage) {
+        if ($this->profile->homepage) {
             $this->elementStart('p', 'website');
-            $this->element('a', array('href' => $profile->homepage,
+            $this->element('a', array('href' => $this->profile->homepage,
                                       'rel' => 'me', 'class' => 'url'),
-                           $profile->homepage);
+                           $this->profile->homepage);
             $this->elementEnd('p');
         }
 
-        $this->show_statistics($profile);
+        $this->elementEnd('div');
 
         $this->elementEnd('div');
     }
 
-    function show_remote_subscribe_link($profile)
+    function showRemoteSubscribeLink()
     {
         $url = common_local_url('remotesubscribe',
-                                array('nickname' => $profile->nickname));
+                                array('nickname' => $this->profile->nickname));
         $this->element('a', array('href' => $url,
                                   'id' => 'remotesubscribe'),
                        _('Subscribe'));
     }
 
-    function show_unsubscribe_form($profile)
+    function showNotices()
     {
-        $this->elementStart('form', array('id' => 'unsubscribe', 'method' => 'post',
-                                           'action' => common_local_url('unsubscribe')));
-        $this->hidden('token', common_session_token());
-        $this->element('input', array('id' => 'unsubscribeto',
-                                      'name' => 'unsubscribeto',
-                                      'type' => 'hidden',
-                                      'value' => $profile->nickname));
-        $this->element('input', array('type' => 'submit',
-                                      'class' => 'submit',
-                                      'value' => _('Unsubscribe')));
-        $this->elementEnd('form');
+        $notice = $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
+
+        $pnl = new ProfileNoticeList($notice, $this);
+        $cnt = $pnl->show();
+
+        $this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
+                          'showstream', array('nickname' => $this->user->nickname));
     }
 
-    function show_subscriptions($profile)
+    function showSections()
     {
-        global $config;
+        $this->showStatistics();
+        $this->showSubscriptions();
+    }
 
-        $subs = DB_DataObject::factory('subscription');
-        $subs->subscriber = $profile->id;
-        $subs->whereAdd('subscribed != ' . $profile->id);
+    function showSubscriptions()
+    {
+        $subs = new Subscription();
+        $subs->subscriber = $this->profile->id;
+        $subs->whereAdd('subscribed != ' . $this->profile->id);
 
         $subs->orderBy('created DESC');
 
-        # We ask for an extra one to know if we need to do another page
+        // We ask for an extra one to know if we need to do another page
 
         $subs->limit(0, SUBSCRIPTIONS + 1);
 
         $subs_count = $subs->find();
 
-        $this->elementStart('div', array('id' => 'subscriptions'));
+        $this->elementStart('div', array('id' => 'subscriptions',
+                                         'class' => 'section'));
 
         $this->element('h2', null, _('Subscriptions'));
 
@@ -341,7 +383,7 @@ class ShowstreamAction extends StreamAction
             $this->elementStart('p', array('id' => 'subscriptions_viewall'));
 
             $this->element('a', array('href' => common_local_url('subscriptions',
-                                                                 array('nickname' => $profile->nickname)),
+                                                                 array('nickname' => $this->profile->nickname)),
                                       'class' => 'moresubscriptions'),
                            _('All subscriptions'));
             $this->elementEnd('p');
@@ -350,49 +392,51 @@ class ShowstreamAction extends StreamAction
         $this->elementEnd('div');
     }
 
-    function show_statistics($profile)
+    function showStatistics()
     {
 
         // XXX: WORM cache this
-        $subs = DB_DataObject::factory('subscription');
-        $subs->subscriber = $profile->id;
+        $subs = new Subscription();
+        $subs->subscriber = $this->profile->id;
         $subs_count = (int) $subs->count() - 1;
 
-        $subbed = DB_DataObject::factory('subscription');
-        $subbed->subscribed = $profile->id;
+        $subbed = new Subscription();
+        $subbed->subscribed = $this->profile->id;
         $subbed_count = (int) $subbed->count() - 1;
 
-        $notices = DB_DataObject::factory('notice');
-        $notices->profile_id = $profile->id;
+        $notices = new Notice();
+        $notices->profile_id = $this->profile->id;
         $notice_count = (int) $notices->count();
 
-        $this->elementStart('div', 'statistics');
+        $this->elementStart('div', array('id' => 'statistics',
+                                         'class' => 'section'));
+
         $this->element('h2', 'statistics', _('Statistics'));
 
-        # Other stats...?
+        // Other stats...?
         $this->elementStart('dl', 'statistics');
         $this->element('dt', 'membersince', _('Member since'));
         $this->element('dd', 'membersince', date('j M Y',
-                                                 strtotime($profile->created)));
+                                                 strtotime($this->profile->created)));
 
         $this->elementStart('dt', 'subscriptions');
         $this->element('a', array('href' => common_local_url('subscriptions',
-                                                             array('nickname' => $profile->nickname))),
+                                                             array('nickname' => $this->profile->nickname))),
                        _('Subscriptions'));
         $this->elementEnd('dt');
         $this->element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
         $this->elementStart('dt', 'subscribers');
         $this->element('a', array('href' => common_local_url('subscribers',
-                                                             array('nickname' => $profile->nickname))),
+                                                             array('nickname' => $this->profile->nickname))),
                        _('Subscribers'));
         $this->elementEnd('dt');
         $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
         $this->element('dt', 'notices', _('Notices'));
         $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
-        # XXX: link these to something
+        // XXX: link these to something
         $this->element('dt', 'tags', _('Tags'));
         $this->elementStart('dd', 'tags');
-        $tags = Profile_tag::getTags($profile->id, $profile->id);
+        $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
 
         $this->elementStart('ul', 'tags xoxo');
         foreach ($tags as $tag) {
@@ -411,50 +455,15 @@ class ShowstreamAction extends StreamAction
         $this->elementEnd('div');
     }
 
-    function show_notices($user)
-    {
-
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        $notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-
-        $pnl = new ProfileNoticeList($notice);
-        $cnt = $pnl->show();
-
-        common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
-                          'showstream', array('nickname' => $user->nickname));
-    }
-
-    function show_last_notice($profile)
-    {
-
-        $this->element('h2', null, _('Currently'));
-
-        $notice = $profile->getCurrentNotice();
-
-        if ($notice) {
-            # FIXME: URL, image, video, audio
-            $this->elementStart('p', array('class' => 'notice_current'));
-            if ($notice->rendered) {
-                $this->raw($notice->rendered);
-            } else {
-                # XXX: may be some uncooked notices in the DB,
-                # we cook them right now. This can probably disappear in future
-                # versions (>> 0.4.x)
-                $this->raw(common_render_content($notice->content, $notice));
-            }
-            $this->elementEnd('p');
-        }
-    }
 }
 
-# We don't show the author for a profile, since we already know who it is!
+// We don't show the author for a profile, since we already know who it is!
 
 class ProfileNoticeList extends NoticeList
 {
     function newListItem($notice)
     {
-        return new ProfileNoticeListItem($notice);
+        return new ProfileNoticeListItem($notice, $this->out);
     }
 }
 

From 042b01d169bc26444e1150c8a01dd0f5bb9d2f4f Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 17:04:59 +0000
Subject: [PATCH 217/256] Extracted the showLocalNav block information into its
 own method in order to override it from other actions. This HTML need not be
 outputted if there is no page_notice.

---
 lib/action.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/action.php b/lib/action.php
index c056c128fb..d385c3cb5d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -301,15 +301,20 @@ class Action extends HTMLOutputter // lawsuit
     function showCore()
     {
         $this->elementStart('div', array('id' => 'core'));
+        $this->showLocalNavBlock();
+        $this->elementEnd('dl');
+        $this->showContentBlock();
+        $this->showAside();
+        $this->elementEnd('div');
+    }
+
+    function showLocalNavBlock()
+    {
         $this->elementStart('dl', array('id' => 'site_nav_local_views'));
         $this->element('dt', null, _('Local views'));
         $this->elementStart('dd');
         $this->showLocalNav();
         $this->elementEnd('dd');
-        $this->elementEnd('dl');
-        $this->showContentBlock();
-        $this->showAside();
-        $this->elementEnd('div');
     }
 
     // SHOULD overload

From 77a9b4b75844873071f2c741da0234f9bf723def Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 17:09:50 +0000
Subject: [PATCH 218/256] Moved minor dangling HTML.

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action.php b/lib/action.php
index d385c3cb5d..5987abf3c3 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -302,7 +302,6 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('div', array('id' => 'core'));
         $this->showLocalNavBlock();
-        $this->elementEnd('dl');
         $this->showContentBlock();
         $this->showAside();
         $this->elementEnd('div');
@@ -315,6 +314,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->elementStart('dd');
         $this->showLocalNav();
         $this->elementEnd('dd');
+        $this->elementEnd('dl');
     }
 
     // SHOULD overload

From a5f3e3b759879aaed31a82fa98a89d6d3594af8c Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 17:12:35 +0000
Subject: [PATCH 219/256] Removed unnecessary empty containers (page_notice,
 aside, local navigation)

---
 actions/shownotice.php | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 7033a1672b..beae478ba8 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -180,6 +180,18 @@ class ShownoticeAction extends Action
         $this->showPage();
     }
 
+
+    /**
+     * Don't show local navigation
+     *
+     * @return void
+     */
+
+    function showLocalNavBlock()
+    {
+    }
+
+
     /**
      * Fill the content area of the page
      *
@@ -196,6 +208,29 @@ class ShownoticeAction extends Action
         $this->elementEnd('ul');
     }
 
+
+
+    /**
+     * Don't show page notice
+     *
+     * @return void
+     */
+
+    function showPageNoticeBlock()
+    {
+    }
+
+
+    /**
+     * Don't show aside
+     *
+     * @return void
+     */
+
+    function showAside() {
+    }
+
+
     /**
      * Extra <head> content
      *

From b39474935a0e0d58bd4d09cbca979b82b981eed7 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 17:48:53 +0000
Subject: [PATCH 220/256] Update profile list for new framework

---
 lib/profilelist.php | 149 ++++++++++++++++++++++++++------------------
 1 file changed, 90 insertions(+), 59 deletions(-)

diff --git a/lib/profilelist.php b/lib/profilelist.php
index bda05daf3b..0dbc7f2157 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -1,10 +1,13 @@
 <?php
 
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Widget to show a list of profiles
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -16,30 +19,56 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
 
 define('PROFILES_PER_PAGE', 20);
 
-class ProfileList
-{
+/**
+ * Widget to show a list of profiles
+ *
+ * @category Public
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
+class ProfileList extends Widget
+{
+    /** Current profile, profile query. */
     var $profile = null;
+    /** Owner of this list */
     var $owner = null;
+    /** Action object using us. */
     var $action = null;
 
     function __construct($profile, $owner=null, $action=null)
     {
+        parent::__construct($action);
+
         $this->profile = $profile;
         $this->owner = $owner;
         $this->action = $action;
     }
 
-    function show_list()
+    function show()
     {
 
-        common_element_start('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+        $this->out->elementStart('ul', array('id' => 'profiles', 'class' => 'profile_list'));
 
         $cnt = 0;
 
@@ -48,18 +77,18 @@ class ProfileList
             if($cnt > PROFILES_PER_PAGE) {
                 break;
             }
-            $this->show();
+            $this->showProfile();
         }
 
-        common_element_end('ul');
+        $this->out->elementEnd('ul');
 
         return $cnt;
     }
 
-    function show()
+    function showProfile()
     {
 
-        common_element_start('li', array('class' => 'profile_single',
+        $this->out->elementStart('li', array('class' => 'profile_single',
                                          'id' => 'profile-' . $this->profile->id));
 
         $user = common_current_user();
@@ -68,51 +97,53 @@ class ProfileList
             # XXX: special-case for user looking at own
             # subscriptions page
             if ($user->isSubscribed($this->profile)) {
-                common_unsubscribe_form($this->profile);
+                $usf = new UnsubscribeForm($this->out, $this->profile);
+                $usf->show();
             } else {
-                common_subscribe_form($this->profile);
+                $sf = new SubscribeForm($this->out, $this->profile);
+                $sf->show();
             }
         }
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-        common_element_start('a', array('href' => $this->profile->profileurl));
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl));
+        $this->out->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
                                     'class' => 'avatar stream',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        common_element_end('a');
-        common_element_start('p');
-        common_element_start('a', array('href' => $this->profile->profileurl,
+        $this->out->elementEnd('a');
+        $this->out->elementStart('p');
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
                                         'class' => 'nickname'));
-        common_raw($this->highlight($this->profile->nickname));
-        common_element_end('a');
+        $this->out->raw($this->highlight($this->profile->nickname));
+        $this->out->elementEnd('a');
         if ($this->profile->fullname) {
-            common_text(' | ');
-            common_element_start('span', 'fullname');
-            common_raw($this->highlight($this->profile->fullname));
-            common_element_end('span');
+            $this->out->text(' | ');
+            $this->out->elementStart('span', 'fullname');
+            $this->out->raw($this->highlight($this->profile->fullname));
+            $this->out->elementEnd('span');
         }
         if ($this->profile->location) {
-            common_text(' | ');
-            common_element_start('span', 'location');
-            common_raw($this->highlight($this->profile->location));
-            common_element_end('span');
+            $this->out->text(' | ');
+            $this->out->elementStart('span', 'location');
+            $this->out->raw($this->highlight($this->profile->location));
+            $this->out->elementEnd('span');
         }
-        common_element_end('p');
+        $this->out->elementEnd('p');
         if ($this->profile->homepage) {
-            common_element_start('p', 'website');
-            common_element_start('a', array('href' => $this->profile->homepage));
-            common_raw($this->highlight($this->profile->homepage));
-            common_element_end('a');
-            common_element_end('p');
+            $this->out->elementStart('p', 'website');
+            $this->out->elementStart('a', array('href' => $this->profile->homepage));
+            $this->out->raw($this->highlight($this->profile->homepage));
+            $this->out->elementEnd('a');
+            $this->out->elementEnd('p');
         }
         if ($this->profile->bio) {
-            common_element_start('p', 'bio');
-            common_raw($this->highlight($this->profile->bio));
-            common_element_end('p');
+            $this->out->elementStart('p', 'bio');
+            $this->out->raw($this->highlight($this->profile->bio));
+            $this->out->elementEnd('p');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
@@ -121,49 +152,49 @@ class ProfileList
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            common_element_start('div', 'tags_user');
-            common_element_start('dl');
-            common_element_start('dt');
+            $this->out->elementStart('div', 'tags_user');
+            $this->out->elementStart('dl');
+            $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
-                common_element('a', array('href' => common_local_url('tagother',
+                $this->out->element('a', array('href' => common_local_url('tagother',
                                                                      array('id' => $this->profile->id))),
                                _('Tags'));
             } else {
-                common_text(_('Tags'));
+                $this->out->text(_('Tags'));
             }
-            common_text(":");
-            common_element_end('dt');
-            common_element_start('dd');
+            $this->out->text(":");
+            $this->out->elementEnd('dt');
+            $this->out->elementStart('dd');
             if ($tags) {
-                common_element_start('ul', 'tags xoxo');
+                $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
-                    common_element_start('li');
-                    common_element('a', array('rel' => 'tag',
+                    $this->out->elementStart('li');
+                    $this->out->element('a', array('rel' => 'tag',
                                               'href' => common_local_url($this->action,
                                                                          array('nickname' => $this->owner->nickname,
                                                                                'tag' => $tag))),
                                    $tag);
-                    common_element_end('li');
+                    $this->out->elementEnd('li');
                 }
-                common_element_end('ul');
+                $this->out->elementEnd('ul');
             } else {
-                common_text(_('(none)'));
+                $this->out->text(_('(none)'));
             }
-            common_element_end('dd');
-            common_element_end('dl');
-            common_element_end('div');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
+            $this->out->elementEnd('div');
         }
 
         if ($user && $user->id == $this->owner->id) {
-            $this->show_owner_controls($this->profile);
+            $this->showOwnerControls($this->profile);
         }
 
-        common_element_end('li');
+        $this->out->elementEnd('li');
     }
 
     /* Override this in subclasses. */
 
-    function show_owner_controls($profile)
+    function showOwnerControls($profile)
     {
         return;
     }

From 4f100c8159536283247ee27cda3eafcbae14b16d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 17:49:12 +0000
Subject: [PATCH 221/256] Update featured for new framework, but not
 phpcs-clean yet

---
 actions/featured.php | 97 ++++++++++++++++++++++++++++++--------------
 1 file changed, 66 insertions(+), 31 deletions(-)

diff --git a/actions/featured.php b/actions/featured.php
index 0356226914..d1ac6e054e 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -1,67 +1,102 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of featured users
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.     If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
 
-class FeaturedAction extends StreamAction
+/**
+ * List of featured users
+ *
+ * @category Public
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class FeaturedAction extends Action
 {
+    var $page = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        return true;
+    }
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return _('Featured users');
+        } else {
+            return sprintf(_('Featured users, page %d'), $this->page);
+        }
+    }
 
     function handle($args)
     {
         parent::handle($args);
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        common_show_header(_('Featured users'),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
-
-        $this->show_notices($page);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_top()
+    function showPageNotice()
     {
-        $instr = $this->get_instructions();
+        $instr = $this->getInstructions();
         $output = common_markup_to_html($instr);
         $this->elementStart('div', 'instructions');
         $this->raw($output);
         $this->elementEnd('div');
-        $this->public_views_menu();
     }
 
-    function show_header()
+    function showLocalNav()
     {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
     }
 
-    function get_instructions()
+    function getInstructions()
     {
-        return _('Featured users');
+        return sprintf(_('A selection of some of the great users on %s'),
+                       common_config('site', 'name'));
     }
 
-    function show_notices($page)
+    function showContent()
     {
-
         // XXX: Note I'm doing it this two-stage way because a raw query
         // with a JOIN was *not* working. --Zach
 
@@ -77,7 +112,7 @@ class FeaturedAction extends StreamAction
 
             $user = new User;
             $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
-            $user->limit(($page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
+            $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
             $user->orderBy('user.nickname ASC');
 
             $user->find();
@@ -95,14 +130,14 @@ class FeaturedAction extends StreamAction
             $cnt = $profile->find();
 
             if ($cnt > 0) {
-                $featured = new ProfileList($profile);
-                $featured->show_list();
+                $featured = new ProfileList($profile, null, $this);
+                $featured->show();
             }
 
             $profile->free();
 
-            common_pagination($page > 1, $cnt > PROFILES_PER_PAGE, $page, 'featured');
+            $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                              $this->page, 'featured');
         }
     }
-
 }
\ No newline at end of file

From ccf5f58608db6ff6fab43f64782b73c5e4ad4d39 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 18:09:34 +0000
Subject: [PATCH 222/256] Extra whitespace in profilelist

---
 lib/profilelist.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 0dbc7f2157..fdc71ab8df 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -87,7 +87,6 @@ class ProfileList extends Widget
 
     function showProfile()
     {
-
         $this->out->elementStart('li', array('class' => 'profile_single',
                                          'id' => 'profile-' . $this->profile->id));
 

From 8b89fbb3f02553579c8dcfc9843ef47aff4d31b5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 18:09:59 +0000
Subject: [PATCH 223/256] Mark featured users as readonly

---
 actions/featured.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/actions/featured.php b/actions/featured.php
index d1ac6e054e..f3bade6a5e 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -50,6 +50,11 @@ class FeaturedAction extends Action
 {
     var $page = null;
 
+    function isReadOnly()
+    {
+        return true;
+    }
+
     function prepare($args)
     {
         parent::prepare($args);

From 7c0286bfcc64525b85cafb68434f0689c03519bc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 18:10:20 +0000
Subject: [PATCH 224/256] Favorites is readonly

---
 actions/showfavorites.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index d2c91c0250..bb68f8d94f 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -52,6 +52,17 @@ class ShowfavoritesAction extends Action
     /** Page of the faves we're on */
     var $page = null;
 
+    /**
+     * Is this a read-only page?
+     *
+     * @return boolean true
+     */
+
+    function isReadOnly()
+    {
+        return true;
+    }
+
     /**
      * Title of the page
      *

From 930f82a95170e05ad2d4fc079cc944d29521797d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Mon, 19 Jan 2009 18:21:14 +0000
Subject: [PATCH 225/256] Update tag to use new framework

Broke up the tag action into two different actions (publictagcloud and
tag). Brought it up-to-date with the new framework, but haven't fixed it
for phpcs yet.
---
 actions/publictagcloud.php | 149 ++++++++++++++++++++++++++++++++
 actions/tag.php            | 173 ++++++++++---------------------------
 htaccess.sample            |   2 +-
 lib/publicgroupnav.php     |   4 +-
 lib/util.php               |  10 +--
 5 files changed, 201 insertions(+), 137 deletions(-)
 create mode 100644 actions/publictagcloud.php

diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
new file mode 100644
index 0000000000..ec28edbadc
--- /dev/null
+++ b/actions/publictagcloud.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Public tag cloud for notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Mike Cochrane
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+define('TAGS_PER_PAGE', 100);
+
+/**
+ * Public tag cloud for notices
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author    Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008 Mike Cochrane
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @link     http://laconi.ca/
+ */
+
+class PublictagcloudAction extends Action
+{
+    function isReadOnly()
+    {
+        return true;
+    }
+
+    function title()
+    {
+        return _('Public tag cloud');
+    }
+
+    function showPageNotice()
+    {
+        $this->element('p', 'instructions',
+                       sprintf(_('These are most popular recent tags on %s '),
+                               common_config('site', 'name')));
+    }
+
+    function showLocalNav()
+    {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
+    }
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    function showContent()
+    {
+        # This should probably be cached rather than recalculated
+        $tags = new Notice_tag();
+
+        #Need to clear the selection and then only re-add the field
+        #we are grouping by, otherwise it's not a valid 'group by'
+        #even though MySQL seems to let it slide...
+        $tags->selectAdd();
+        $tags->selectAdd('tag');
+
+        #Add the aggregated columns...
+        $tags->selectAdd('max(notice_id) as last_notice_id');
+        if(common_config('db','type')=='pgsql') {
+            $calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
+        } else {
+            $calc='sum(exp(-(now() - created)/%s)) as weight';
+        }
+        $tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
+        $tags->groupBy('tag');
+        $tags->orderBy('weight DESC');
+
+        $tags->limit(TAGS_PER_PAGE);
+
+        $cnt = $tags->find();
+
+        if ($cnt > 0) {
+            $this->elementStart('p', 'tagcloud');
+
+            $tw = array();
+            $sum = 0;
+            while ($tags->fetch()) {
+                $tw[$tags->tag] = $tags->weight;
+                $sum += $tags->weight;
+            }
+
+            ksort($tw);
+
+            foreach ($tw as $tag => $weight) {
+                $this->showTag($tag, $weight, $weight/$sum);
+            }
+
+            $this->elementEnd('p');
+        }
+    }
+
+    function showTag($tag, $weight, $relative)
+    {
+        # XXX: these should probably tune to the size of the site
+        if ($relative > 0.1) {
+            $cls =  'largest';
+        } else if ($relative > 0.05) {
+            $cls = 'verylarge';
+        } else if ($relative > 0.02) {
+            $cls = 'large';
+        } else if ($relative > 0.01) {
+            $cls = 'medium';
+        } else if ($relative > 0.005) {
+            $cls = 'small';
+        } else if ($relative > 0.002) {
+            $cls = 'verysmall';
+        } else {
+            $cls = 'smallest';
+        }
+
+        $this->element('a', array('class' => "$cls weight-$weight relative-$relative",
+                                  'href' => common_local_url('tag', array('tag' => $tag))),
+                       $tag);
+        $this->text(' ');
+    }
+}
diff --git a/actions/tag.php b/actions/tag.php
index 3096b75b39..039cd9660b 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -19,154 +19,71 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-require_once(INSTALLDIR.'/actions/showstream.php');
-define('TAGS_PER_PAGE', 100);
-
-class TagAction extends StreamAction
+class TagAction extends Action
 {
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->tag = $this->trimmed('tag');
+
+        if (!$this->tag) {
+            common_redirect(common_local_url('publictagcloud'), 301);
+            return false;
+        }
+
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+        return true;
+    }
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return sprintf(_("Notices tagged with %s"), $this->tag);
+        } else {
+            return sprintf(_("Notices tagged with %s, page %d"),
+                           $this->tag,
+                           $this->page);
+        }
+    }
 
     function handle($args)
     {
-
         parent::handle($args);
 
-        # Looks like we're good; show the header
-
-        if (isset($args['tag']) && $args['tag']) {
-            $tag = $args['tag'];
-            common_show_header(sprintf(_("Notices tagged with %s"), $tag),
-                               array($this, 'show_header'), $tag,
-                               array($this, 'show_top'));
-            $this->show_notices($tag);
-        } else {
-            common_show_header(_("Tags"),
-                               array($this, 'show_header'), '',
-                               array($this, 'show_top'));
-            $this->show_tags();
-        }
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_header($tag = false)
+    function showFeeds()
     {
-        if ($tag) {
-            $this->element('link', array('rel' => 'alternate',
-                                         'href' => common_local_url('tagrss', array('tag' => $tag)),
-                                         'type' => 'application/rss+xml',
-                                         'title' => sprintf(_('Feed for tag %s'), $tag)));
-        }
+        $this->element('link', array('rel' => 'alternate',
+                                     'href' => common_local_url('tagrss', array('tag' => $this->tag)),
+                                     'type' => 'application/rss+xml',
+                                     'title' => sprintf(_('Feed for tag %s'), $this->tag)));
     }
 
-    function get_instructions()
+    function showPageNotice()
     {
-        return _('Showing most popular tags from the last week');
+        return sprintf(_('Messages tagged "%s", most recent first'), $this->tag);
     }
 
-    function show_top($tag = false)
+    function showExportData()
     {
-        if (!$tag) {
-            $instr = $this->get_instructions();
-            $output = common_markup_to_html($instr);
-            $this->elementStart('div', 'instructions');
-            $this->raw($output);
-            $this->elementEnd('div');
-            $this->public_views_menu();
-        }
-        else {
-            $this->show_feeds_list(array(0=>array('href'=>common_local_url('tagrss'),
-                                                  'type' => 'rss',
-                                                  'version' => 'RSS 1.0',
-                                                  'item' => 'tagrss')));
-        }
+        $fl = new FeedList($this);
+        $fl->show(array(0=>array('href'=>common_local_url('tagrss', array('tag' => $this->tag)),
+                                 'type' => 'rss',
+                                 'version' => 'RSS 1.0',
+                                 'item' => 'tagrss')));
     }
 
-    function show_tags()
+    function showContent()
     {
-        # This should probably be cached rather than recalculated
-        $tags = DB_DataObject::factory('Notice_tag');
+        $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-        #Need to clear the selection and then only re-add the field
-        #we are grouping by, otherwise it's not a valid 'group by'
-        #even though MySQL seems to let it slide...
-        $tags->selectAdd();
-        $tags->selectAdd('tag');
+        $nl = new NoticeList($notice, $this);
 
-        #Add the aggregated columns...
-        $tags->selectAdd('max(notice_id) as last_notice_id');
-        if(common_config('db','type')=='pgsql') {
-            $calc='sum(exp(-extract(epoch from (now()-created))/%s)) as weight';
-        } else {
-            $calc='sum(exp(-(now() - created)/%s)) as weight';
-        }
-        $tags->selectAdd(sprintf($calc, common_config('tag', 'dropoff')));
-        $tags->groupBy('tag');
-        $tags->orderBy('weight DESC');
+        $cnt = $nl->show();
 
-        # $tags->whereAdd('created > "' . strftime('%Y-%m-%d %H:%M:%S', strtotime('-1 MONTH')) . '"');
-
-        $tags->limit(TAGS_PER_PAGE);
-
-        $cnt = $tags->find();
-
-        if ($cnt > 0) {
-            $this->elementStart('p', 'tagcloud');
-
-            $tw = array();
-            $sum = 0;
-            while ($tags->fetch()) {
-                $tw[$tags->tag] = $tags->weight;
-                $sum += $tags->weight;
-            }
-
-            ksort($tw);
-
-            foreach ($tw as $tag => $weight) {
-                $this->show_tag($tag, $weight, $weight/$sum);
-            }
-
-            $this->elementEnd('p');
-        }
-    }
-
-    function show_tag($tag, $weight, $relative)
-    {
-
-        # XXX: these should probably tune to the size of the site
-        if ($relative > 0.1) {
-            $cls =  'largest';
-        } else if ($relative > 0.05) {
-            $cls = 'verylarge';
-        } else if ($relative > 0.02) {
-            $cls = 'large';
-        } else if ($relative > 0.01) {
-            $cls = 'medium';
-        } else if ($relative > 0.005) {
-            $cls = 'small';
-        } else if ($relative > 0.002) {
-            $cls = 'verysmall';
-        } else {
-            $cls = 'smallest';
-        }
-
-        $this->element('a', array('class' => "$cls weight-$weight relative-$relative",
-                                  'href' => common_local_url('tag', array('tag' => $tag))),
-                       $tag);
-        $this->text(' ');
-    }
-
-    function show_notices($tag)
-    {
-
-        $cnt = 0;
-
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        $notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
-
-        $cnt = $this->show_notice_list($notice);
-
-        common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
-                          $page, 'tag', array('tag' => $tag));
+        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
+                          $this->page, 'tag', array('tag' => $this->tag));
     }
 }
diff --git a/htaccess.sample b/htaccess.sample
index 10e51b5b06..b0e3e93e00 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -76,7 +76,7 @@ RewriteRule ^message/(\d+)$ index.php?action=showmessage&message=$1 [L,QSA]
 
 RewriteRule ^user/(\d+)$ index.php?action=userbyid&id=$1 [L,QSA]
 
-RewriteRule ^tags/?$ index.php?action=tag [L,QSA]
+RewriteRule ^tags/?$ index.php?action=publictagcloud [L,QSA]
 RewriteRule ^tag/([a-zA-Z0-9]+)/rss$ index.php?action=tagrss&tag=$1 [L,QSA]
 RewriteRule ^tag(/(.*))?$ index.php?action=tag&tag=$2 [L,QSA]
 
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 97b57ec17c..8dd97a3b78 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -76,8 +76,8 @@ class PublicGroupNav extends Widget
         $this->out->menuItem(common_local_url('public'), _('Public'),
             _('Public timeline'), $action_name == 'public', 'nav_timeline_public');
 
-        $this->out->menuItem(common_local_url('tag'), _('Recent tags'),
-            _('Recent tags'), $action_name == 'tag', 'nav_recent-tags');
+        $this->out->menuItem(common_local_url('publictagcloud'), _('Recent tags'),
+            _('Recent tags'), $action_name == 'publictagcloud', 'nav_recent-tags');
 
         if (count(common_config('nickname', 'featured')) > 0) {
             $this->out->menuItem(common_local_url('featured'), _('Featured'),
diff --git a/lib/util.php b/lib/util.php
index d67c649728..73c4cdcc88 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -865,13 +865,11 @@ function common_fancy_url($action, $args=null)
      case 'avatarbynickname':
         return common_path($args['nickname'].'/avatar/'.$args['size']);
      case 'tag':
-        if (isset($args['tag']) && $args['tag']) {
-            $path = 'tag/' . $args['tag'];
-            unset($args['tag']);
-        } else {
-            $path = 'tags';
-        }
+        $path = 'tag/' . $args['tag'];
+        unset($args['tag']);
         return common_path($path . (($args) ? ('?' . http_build_query($args)) : ''));
+     case 'publictagcloud':
+        return common_path('tags');
      case 'peopletag':
         $path = 'peopletag/' . $args['tag'];
         unset($args['tag']);

From 93a5865b2bb4965847abb383a49059022ca3177a Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 18:24:30 +0000
Subject: [PATCH 226/256] Bolding address fn for cases where there is no logo.

---
 theme/base/css/display.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e337f1c985..59429cf726 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -198,6 +198,9 @@ margin-left:18px;
 address.vcard img.logo {
 margin-right:0;
 }
+address .fn {
+font-weight:bold;
+}
 
 
 #header {

From 77790ab7687c6ef6c86f502c27158ef71cdffa76 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 21:56:55 +0000
Subject: [PATCH 227/256] Featuerd profile list markup Minor class change to
 (un)subscribeform.php

---
 lib/profilelist.php     | 53 ++++++++++++++++++++++-------------------
 lib/subscribeform.php   | 15 +++++++++++-
 lib/unsubscribeform.php | 14 ++++++++++-
 3 files changed, 55 insertions(+), 27 deletions(-)

diff --git a/lib/profilelist.php b/lib/profilelist.php
index fdc71ab8df..24b3573857 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -68,7 +68,7 @@ class ProfileList extends Widget
     function show()
     {
 
-        $this->out->elementStart('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+        $this->out->elementStart('ul', 'profiles');
 
         $cnt = 0;
 
@@ -87,51 +87,40 @@ class ProfileList extends Widget
 
     function showProfile()
     {
-        $this->out->elementStart('li', array('class' => 'profile_single',
-                                         'id' => 'profile-' . $this->profile->id));
+        $this->out->elementStart('li', array('class' => 'profile vcard',
+                                             'id' => 'profile-' . $this->profile->id));
 
         $user = common_current_user();
 
-        if ($user && $user->id != $this->profile->id) {
-            # XXX: special-case for user looking at own
-            # subscriptions page
-            if ($user->isSubscribed($this->profile)) {
-                $usf = new UnsubscribeForm($this->out, $this->profile);
-                $usf->show();
-            } else {
-                $sf = new SubscribeForm($this->out, $this->profile);
-                $sf->show();
-            }
-        }
+
+        $this->out->elementStart('div', array('id' => 'user_profile',
+                                              'class' => 'vcard'));
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-        $this->out->elementStart('a', array('href' => $this->profile->profileurl));
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
+                                            'class' => 'url'));
         $this->out->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar stream',
+                                    'class' => 'photo avatar',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->out->elementEnd('a');
-        $this->out->elementStart('p');
-        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                        'class' => 'nickname'));
+        $this->out->elementStart('span', 'nickname');
         $this->out->raw($this->highlight($this->profile->nickname));
+        $this->out->elementEnd('span');
         $this->out->elementEnd('a');
+        
         if ($this->profile->fullname) {
-            $this->out->text(' | ');
-            $this->out->elementStart('span', 'fullname');
+            $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
         }
         if ($this->profile->location) {
-            $this->out->text(' | ');
             $this->out->elementStart('span', 'location');
             $this->out->raw($this->highlight($this->profile->location));
             $this->out->elementEnd('span');
         }
-        $this->out->elementEnd('p');
         if ($this->profile->homepage) {
             $this->out->elementStart('p', 'website');
             $this->out->elementStart('a', array('href' => $this->profile->homepage));
@@ -188,6 +177,20 @@ class ProfileList extends Widget
             $this->showOwnerControls($this->profile);
         }
 
+        $this->out->elementEnd('div');
+
+        if ($user && $user->id != $this->profile->id) {
+            # XXX: special-case for user looking at own
+            # subscriptions page
+            if ($user->isSubscribed($this->profile)) {
+                $usf = new UnsubscribeForm($this->out, $this->profile);
+                $usf->show();
+            } else {
+                $sf = new SubscribeForm($this->out, $this->profile);
+                $sf->show();
+            }
+        }
+
         $this->out->elementEnd('li');
     }
 
@@ -202,4 +205,4 @@ class ProfileList extends Widget
     {
         return htmlspecialchars($text);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 996729a281..8b69efd1ac 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -80,6 +80,19 @@ class SubscribeForm extends Form
         return 'subscribe-' . $this->profile->id;
     }
 
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_subscribe';
+    }
+
+
     /**
      * Action of the form
      *
@@ -114,4 +127,4 @@ class SubscribeForm extends Form
     {
         $this->out->submit('submit', _('Subscribe'));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index a724bb3122..b222f0e54d 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -80,6 +80,18 @@ class UnsubscribeForm extends Form
         return 'unsubscribe-' . $this->profile->id;
     }
 
+
+    /**
+     * class of the form
+     *
+     * @return string of the form class
+     */
+
+    function formClass()
+    {
+        return 'form_unsubscribe';
+    }
+
     /**
      * Action of the form
      *
@@ -114,4 +126,4 @@ class UnsubscribeForm extends Form
     {
         $this->out->submit('submit', _('Unsubscribe'));
     }
-}
\ No newline at end of file
+}

From 774fc5378bc89ccfa05ba613ffae96addd3427cf Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 22:40:21 +0000
Subject: [PATCH 228/256] user_profile markup

---
 actions/showstream.php | 126 +++++++++++++++++++++++++----------------
 1 file changed, 76 insertions(+), 50 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index aaa55b3306..60270cfd7c 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -219,19 +219,89 @@ class ShowstreamAction extends Action
 
     function showProfile()
     {
-        $this->elementStart('div', array('id' => 'profile', 'class' => 'vcard'));
+        $this->elementStart('div', array('id' => 'user_profile', 'class' => 'vcard author'));
+        $this->element('h2', null, _('User profile'));
 
         $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $this->elementStart('div', array('id' => 'profile_avatar'));
+        $this->elementStart('dl', 'user_depiction');
+        $this->element('dt', null, _('Photo'));
+        $this->elementStart('dd');
         $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
-                                    'class' => 'avatar profile photo',
+                                    'class' => 'photo avatar',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' => $this->profile->nickname));
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 
-        $this->elementStart('ul', array('id' => 'profile_actions'));
+        if ($this->profile->fullname) {
+            $this->elementStart('dl', 'user_fn');
+            $this->element('dt', null, _('Full name'));
+            $this->elementStart('dd');
+            $this->element('a', array('href' => $this->profile->homepage,
+                                      'rel' => 'me', 'class' => 'fn url uid'),
+                           $this->profile->fullname);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
 
-        $this->elementStart('li', array('id' => 'profile_subscribe'));
+        $this->elementStart('dl', 'user_nickname');
+        $this->element('dt', null, _('Nickname'));
+        $this->elementStart('dd');
+        $this->element('span', 'fn nickname', $this->profile->nickname);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
+
+        if ($this->profile->location) {
+            $this->elementStart('dl', 'user_location');
+            $this->element('dt', null, _('Location'));
+            $this->element('dd', 'location', $this->profile->location);
+            $this->elementEnd('dl');
+        }
+
+        if ($this->profile->homepage) {
+            $this->elementStart('dl', 'user_url');
+            $this->element('dt', null, _('URL'));
+            $this->elementStart('dd');
+            $this->element('a', array('href' => $this->profile->homepage,
+                                      'rel' => 'me', 'class' => 'url'),
+                           $this->profile->homepage);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
+
+        if ($this->profile->bio) {
+            $this->elementStart('dl', 'user_note');
+            $this->element('dt', null, _('Note'));
+            $this->element('dd', 'note', $this->profile->bio);
+            $this->elementEnd('dl');
+        }
+
+        $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
+        if (count($tags) > 0) {
+            $this->elementStart('dl', 'user_tags');
+            $this->element('dt', null, _('Tags'));
+            $this->elementStart('dd', 'tags');
+            $this->elementStart('ul', 'tags xoxo');
+            foreach ($tags as $tag) {
+                $this->elementStart('li');
+                $this->element('a', array('rel' => 'tag',
+                                          'href' => common_local_url('peopletag',
+                                                                     array('tag' => $tag))),
+                               $tag);
+                $this->elementEnd('li');
+            }
+            $this->elementEnd('ul');
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
+        $this->elementEnd('div');
+
+
+        $this->elementStart('div', array('id' => 'user_actions'));
+        $this->element('h2', null, _('User actions'));
+        $this->elementStart('ul');
+        $this->elementStart('li', array('id' => 'user_subscribe'));
         $cur = common_current_user();
         if ($cur) {
             if ($cur->id != $this->profile->id) {
@@ -252,7 +322,7 @@ class ShowstreamAction extends Action
 
         if ($cur && $cur->id != $this->profile->id) {
             $blocked = $cur->hasBlocked($this->profile);
-            $this->elementStart('li', array('id' => 'profile_block'));
+            $this->elementStart('li', array('id' => 'user_block'));
             if ($blocked) {
                 $bf = new BlockForm($this, $this->profile);
                 $bf->show();
@@ -262,33 +332,7 @@ class ShowstreamAction extends Action
             }
             $this->elementEnd('li');
         }
-
         $this->elementEnd('ul');
-
-        $this->elementEnd('div');
-
-        $this->elementStart('div', array('id' => 'profile_information'));
-
-        if ($this->profile->fullname) {
-            $this->element('h1', array('class' => 'fn'), $this->profile->fullname . ' (' . $this->profile->nickname . ')');
-        } else {
-            $this->element('h1', array('class' => 'fn nickname'), $this->profile->nickname);
-        }
-
-        if ($this->profile->location) {
-            $this->element('p', 'location', $this->profile->location);
-        }
-        if ($this->profile->bio) {
-            $this->element('p', 'description note', $this->profile->bio);
-        }
-        if ($this->profile->homepage) {
-            $this->elementStart('p', 'website');
-            $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'url'),
-                           $this->profile->homepage);
-            $this->elementEnd('p');
-        }
-
         $this->elementEnd('div');
 
         $this->elementEnd('div');
@@ -394,7 +438,6 @@ class ShowstreamAction extends Action
 
     function showStatistics()
     {
-
         // XXX: WORM cache this
         $subs = new Subscription();
         $subs->subscriber = $this->profile->id;
@@ -433,23 +476,6 @@ class ShowstreamAction extends Action
         $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
         $this->element('dt', 'notices', _('Notices'));
         $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
-        // XXX: link these to something
-        $this->element('dt', 'tags', _('Tags'));
-        $this->elementStart('dd', 'tags');
-        $tags = Profile_tag::getTags($this->profile->id, $this->profile->id);
-
-        $this->elementStart('ul', 'tags xoxo');
-        foreach ($tags as $tag) {
-            $this->elementStart('li');
-            $this->element('a', array('rel' => 'bookmark tag',
-                                      'href' => common_local_url('peopletag',
-                                                                 array('tag' => $tag))),
-                           $tag);
-            $this->elementEnd('li');
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('dd');
-
         $this->elementEnd('dl');
 
         $this->elementEnd('div');

From 8e8c5805862344b82f2b1b0a30cb376ec5d91160 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Mon, 19 Jan 2009 23:19:05 +0000
Subject: [PATCH 229/256] showPageTitle() and showPageNoticeBlock() and using
 url on nickname instead of fullname

---
 actions/showstream.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 60270cfd7c..39c74f0ee6 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -132,7 +132,12 @@ class ShowstreamAction extends Action
 
     function showPageTitle()
     {
-        // Don't show the H1; we have one in the profile block
+         $this->element('h1', NULL, $this->profile->nickname._("'s profile"));
+    }
+
+    function showPageNoticeBlock()
+    {
+        return;
     }
 
     function showExportData()
@@ -238,17 +243,16 @@ class ShowstreamAction extends Action
             $this->elementStart('dl', 'user_fn');
             $this->element('dt', null, _('Full name'));
             $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->homepage,
-                                      'rel' => 'me', 'class' => 'fn url uid'),
-                           $this->profile->fullname);
+            $this->element('span', 'fn', $this->profile->fullname);
             $this->elementEnd('dd');
             $this->elementEnd('dl');
         }
-
         $this->elementStart('dl', 'user_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
-        $this->element('span', 'fn nickname', $this->profile->nickname);
+            $this->element('a', array('href' => $this->profile->profileurl,
+                                      'rel' => 'me', 'class' => 'fn nickname url uid'),
+                           $this->profile->nickname);
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 

From ec1249d3ad05b20e06b94dd4052d299eb8c1c17d Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 04:57:15 +0000
Subject: [PATCH 230/256] User statistics markup

---
 actions/showstream.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 39c74f0ee6..ead8521e6f 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -455,31 +455,39 @@ class ShowstreamAction extends Action
         $notices->profile_id = $this->profile->id;
         $notice_count = (int) $notices->count();
 
-        $this->elementStart('div', array('id' => 'statistics',
+        $this->elementStart('div', array('id' => 'user_statistics',
                                          'class' => 'section'));
 
-        $this->element('h2', 'statistics', _('Statistics'));
+        $this->element('h2', null, _('Statistics'));
 
         // Other stats...?
-        $this->elementStart('dl', 'statistics');
-        $this->element('dt', 'membersince', _('Member since'));
-        $this->element('dd', 'membersince', date('j M Y',
+        $this->elementStart('dl', 'user_member-since');
+        $this->element('dt', null, _('Member since'));
+        $this->element('dd', null, date('j M Y',
                                                  strtotime($this->profile->created)));
+        $this->elementEnd('dl');
 
-        $this->elementStart('dt', 'subscriptions');
+        $this->elementStart('dl', 'user_subscriptions');
+        $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscriptions',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscriptions'));
         $this->elementEnd('dt');
-        $this->element('dd', 'subscriptions', (is_int($subs_count)) ? $subs_count : '0');
-        $this->elementStart('dt', 'subscribers');
+        $this->element('dd', null, (is_int($subs_count)) ? $subs_count : '0');
+        $this->elementEnd('dl');
+
+        $this->elementStart('dl', 'user_subscribers');
+        $this->elementStart('dt');
         $this->element('a', array('href' => common_local_url('subscribers',
                                                              array('nickname' => $this->profile->nickname))),
                        _('Subscribers'));
         $this->elementEnd('dt');
         $this->element('dd', 'subscribers', (is_int($subbed_count)) ? $subbed_count : '0');
-        $this->element('dt', 'notices', _('Notices'));
-        $this->element('dd', 'notices', (is_int($notice_count)) ? $notice_count : '0');
+        $this->elementEnd('dl');
+
+        $this->elementStart('dl', 'user_notices');
+        $this->element('dt', null, _('Notices'));
+        $this->element('dd', null, (is_int($notice_count)) ? $notice_count : '0');
         $this->elementEnd('dl');
 
         $this->elementEnd('div');

From 7f60558cbbe6f7cd862d9e9cf11667f29d8b08d8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 05:04:41 +0000
Subject: [PATCH 231/256] User subscriptions markup

---
 actions/showstream.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index ead8521e6f..23013b007b 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -382,14 +382,14 @@ class ShowstreamAction extends Action
 
         $subs_count = $subs->find();
 
-        $this->elementStart('div', array('id' => 'subscriptions',
+        $this->elementStart('div', array('id' => 'user_subscriptions',
                                          'class' => 'section'));
 
         $this->element('h2', null, _('Subscriptions'));
 
         if ($subs_count > 0) {
 
-            $this->elementStart('ul', array('id' => 'subscriptions_avatars'));
+            $this->elementStart('ul', 'users');
 
             for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
 
@@ -411,15 +411,16 @@ class ShowstreamAction extends Action
                                                 $other->nickname,
                                                 'href' => $other->profileurl,
                                                 'rel' => 'contact',
-                                                 'class' => 'subscription fn url'));
+                                                 'class' => 'url'));
                 $avatar = $other->getAvatar(AVATAR_MINI_SIZE);
                 $this->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
                                             'width' => AVATAR_MINI_SIZE,
                                             'height' => AVATAR_MINI_SIZE,
-                                            'class' => 'avatar mini photo',
+                                            'class' => 'avatar photo',
                                             'alt' =>  ($other->fullname) ?
                                             $other->fullname :
                                             $other->nickname));
+                $this->element('span', 'fn nickname', $other->nickname);
                 $this->elementEnd('a');
                 $this->elementEnd('li');
             }
@@ -428,11 +429,11 @@ class ShowstreamAction extends Action
         }
 
         if ($subs_count > SUBSCRIPTIONS) {
-            $this->elementStart('p', array('id' => 'subscriptions_viewall'));
+            $this->elementStart('p');
 
             $this->element('a', array('href' => common_local_url('subscriptions',
                                                                  array('nickname' => $this->profile->nickname)),
-                                      'class' => 'moresubscriptions'),
+                                      'class' => 'mores'),
                            _('All subscriptions'));
             $this->elementEnd('p');
         }

From 918bd84c0d22251d30289b6bed41d4d2d417f591 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 05:06:46 +0000
Subject: [PATCH 232/256] Removed extra div

---
 actions/showstream.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 23013b007b..c8a6db6756 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -338,8 +338,6 @@ class ShowstreamAction extends Action
         }
         $this->elementEnd('ul');
         $this->elementEnd('div');
-
-        $this->elementEnd('div');
     }
 
     function showRemoteSubscribeLink()

From 27308afe8509d14ae2efc20cd806fa8541eee017 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 05:11:45 +0000
Subject: [PATCH 233/256] Added mark_hash for content (i.e., to indicate tags
 with the character '#')

---
 actions/showstream.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/actions/showstream.php b/actions/showstream.php
index c8a6db6756..b877f5df35 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -289,6 +289,7 @@ class ShowstreamAction extends Action
             $this->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->elementStart('li');
+                $this->element('span', 'mark_hash', '#');
                 $this->element('a', array('rel' => 'tag',
                                           'href' => common_local_url('peopletag',
                                                                      array('tag' => $tag))),

From 96dc058bfa499e4acf9248b116eada2009d72371 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 05:58:35 +0000
Subject: [PATCH 234/256] Using nickname only for uid

---
 actions/showstream.php     | 17 +++++++++--------
 theme/base/css/display.css | 17 ++++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index b877f5df35..1d79ea30d2 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -239,6 +239,15 @@ class ShowstreamAction extends Action
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
+        $this->elementStart('dl', 'user_nickname');
+        $this->element('dt', null, _('Nickname'));
+        $this->elementStart('dd');
+            $this->element('a', array('href' => $this->profile->profileurl,
+                                      'rel' => 'me', 'class' => 'nickname url uid'),
+                           $this->profile->nickname);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
+
         if ($this->profile->fullname) {
             $this->elementStart('dl', 'user_fn');
             $this->element('dt', null, _('Full name'));
@@ -247,14 +256,6 @@ class ShowstreamAction extends Action
             $this->elementEnd('dd');
             $this->elementEnd('dl');
         }
-        $this->elementStart('dl', 'user_nickname');
-        $this->element('dt', null, _('Nickname'));
-        $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => 'fn nickname url uid'),
-                           $this->profile->nickname);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
 
         if ($this->profile->location) {
             $this->elementStart('dl', 'user_location');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 59429cf726..406ba3f9ac 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -489,7 +489,7 @@ margin-bottom:0;
 /* user_profile */
 #user_profile {
 position:relative;
-width:633px;
+width:475px;
 min-height:123px;
 float:left;
 margin-bottom:17px;
@@ -514,7 +514,7 @@ width:96px;
 #user_profile .user_tags {
 float:left;
 clear:left;
-margin-left:125px;
+margin-left:113px;
 width:322px;
 margin-bottom:4px;
 }
@@ -524,21 +524,24 @@ margin-bottom:4px;
 width:auto;
 clear:none;
 }
-#user_profile .user_nickname {
+#user_profile .user_fn {
 margin-left:11px;
+margin-left:4px;
+margin-right:4px;
+font-weight:bold;
 }
 #user_profile .user_nickname .nickname {
 font-style:italic;
 font-weight:bold;
-margin-left:4px;
-margin-right:4px;
 }
 
-#user_profile .user_nickname dd:before {
+#user_profile .user_fn dd:before {
 content: "(";
+font-weight:normal;
 }
-#user_profile .user_nickname dd:after {
+#user_profile .user_fn dd:after {
 content: ")";
+font-weight:normal;
 }
 
 #user_profile dt {

From f93575bd46db8eb559b6eef6abcab4e13b349748 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 20:29:31 +0000
Subject: [PATCH 235/256] uiredesign and phpdocs

---
 actions/doc.php | 70 +++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 8 deletions(-)

diff --git a/actions/doc.php b/actions/doc.php
index 3d14b25b8a..fd48ac110f 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -1,5 +1,17 @@
 <?php
-/*
+
+/**
+ * Documentation action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,24 +29,66 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
+/**
+ * Documentation class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+
+
+*/
 class DocAction extends Action
 {
+    var $filename;
+    var $title;
 
+    /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+    */
     function handle($args)
     {
         parent::handle($args);
-        $title = $this->trimmed('title');
-        $filename = INSTALLDIR.'/doc/'.$title;
-        if (!file_exists($filename)) {
+        $this->title    = $this->trimmed('title');
+        $this->filename = INSTALLDIR.'/doc/'.$this->title;
+        if (!file_exists($this->filename)) {
             $this->clientError(_('No such document.'));
             return;
         }
-        $c = file_get_contents($filename);
+        $this->showPage();
+    }
+
+    /**
+     * Display content.
+     * 
+     * @return nothing
+    */
+    function showContent()
+    {
+        $c      = file_get_contents($this->filename);
         $output = common_markup_to_html($c);
-        common_show_header(_(ucfirst($title)));
         $this->raw($output);
-        common_show_footer();
+    }
+
+    /**
+     * Page title.
+     * 
+     * @return page title
+    */
+    function title()
+    {
+        return ucfirst($this->title);
     }
 }
+

From 15264328420839c5ec3951f306169f5640037bce Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 20:44:03 +0000
Subject: [PATCH 236/256] tiny phpdoc fixes

---
 actions/doc.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/actions/doc.php b/actions/doc.php
index fd48ac110f..aaf006f071 100644
--- a/actions/doc.php
+++ b/actions/doc.php
@@ -42,9 +42,7 @@ if (!defined('LACONICA')) {
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
-
-
-*/
+ */
 class DocAction extends Action
 {
     var $filename;
@@ -56,7 +54,7 @@ class DocAction extends Action
      * @param array $args array of arguments
      *
      * @return nothing
-    */
+     */
     function handle($args)
     {
         parent::handle($args);
@@ -73,7 +71,7 @@ class DocAction extends Action
      * Display content.
      * 
      * @return nothing
-    */
+     */
     function showContent()
     {
         $c      = file_get_contents($this->filename);
@@ -85,7 +83,7 @@ class DocAction extends Action
      * Page title.
      * 
      * @return page title
-    */
+     */
     function title()
     {
         return ucfirst($this->title);

From 9c43974d23dd55ce81797f789d59c16c90b5e854 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 20:46:45 +0000
Subject: [PATCH 237/256] fn font-style normal

---
 theme/base/css/display.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 406ba3f9ac..3c776aea0a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -528,7 +528,10 @@ clear:none;
 margin-left:11px;
 margin-left:4px;
 margin-right:4px;
+}
+#user_profile .user_fn .fn {
 font-weight:bold;
+font-style:normal;
 }
 #user_profile .user_nickname .nickname {
 font-style:italic;

From 4471f62bc5d883fda015156ec7d3391cc7f3ac41 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 20:55:16 +0000
Subject: [PATCH 238/256] uiredesign + phpdocs

---
 actions/logout.php | 47 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 41 insertions(+), 6 deletions(-)

diff --git a/actions/logout.php b/actions/logout.php
index 86d6270abe..0ff8dc7545 100644
--- a/actions/logout.php
+++ b/actions/logout.php
@@ -1,5 +1,16 @@
 <?php
-/*
+/**
+ * Logout action.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,18 +28,42 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/openid.php');
+require_once INSTALLDIR.'/lib/openid.php';
 
+/**
+ * Logout action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class LogoutAction extends Action
 {
     
+    /**
+     * This is read only.
+     * 
+     * @return boolean true
+     */
     function isReadOnly()
     {
         return true;
     }
-    
+
+    /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
     function handle($args)
     {
         parent::handle($args);
@@ -36,8 +71,8 @@ class LogoutAction extends Action
             $this->clientError(_('Not logged in.'));
         } else {
             common_set_user(null);
-            common_real_login(false); # not logged in
-            common_forgetme(); # don't log back in!
+            common_real_login(false); // not logged in
+            common_forgetme(); // don't log back in!
             common_redirect(common_local_url('public'));
         }
     }

From 75f27a9ef207ca215e082b935c2c7a4c08aae402 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 20:58:07 +0000
Subject: [PATCH 239/256] updated Open Software Service Definition

---
 doc/faq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/faq b/doc/faq
index 5699f3635d..31582b9f0d 100644
--- a/doc/faq
+++ b/doc/faq
@@ -12,7 +12,7 @@ and fans.
 How is %%site.name%% different from Twitter, Jaiku, Pownce, Plurk, others?
 --------------------------------------------------------------------------
 
-%%site.name%% is an [Open Network Service](http://opendefinition.org/osd). Our main
+%%site.name%% is an [Open Network Service](http://opendefinition.org/ossd). Our main
 goal is to provide a fair and transparent service that preserves users' autonomy. In
 particular, all the software used for %%site.name%% is [Free Software](http://en.wikipedia.org/wiki/Free_Software), and all the data is available
 under the [%%license.title%%](%%license.url%%) license, making it Open Data.

From 6e6d651b254b8a890dccadca05bd8c9a450bcabf Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 21:05:55 +0000
Subject: [PATCH 240/256] uiredesign + phpdocs.

---
 actions/microsummary.php | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/actions/microsummary.php b/actions/microsummary.php
index b46c5bee53..196dd5de83 100644
--- a/actions/microsummary.php
+++ b/actions/microsummary.php
@@ -1,5 +1,16 @@
 <?php
-/*
+/**
+ * Microsummary action, see https://wiki.mozilla.org/Microsummaries
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,18 +28,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
+/**
+ * Microsummary action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class MicrosummaryAction extends Action
 {
-
+    /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
     function handle($args)
     {
-
         parent::handle($args);
 
         $nickname = common_canonical_nickname($this->arg('nickname'));
-        $user = User::staticGet('nickname', $nickname);
+        $user     = User::staticGet('nickname', $nickname);
 
         if (!$user) {
             $this->clientError(_('No such user'), 404);

From cadad553793844e7ef56bab164b1a5866d8d16e7 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 21:21:00 +0000
Subject: [PATCH 241/256] uiredesign + phpdocs

---
 actions/publicrss.php | 80 +++++++++++++++++++++++++++++++++----------
 1 file changed, 61 insertions(+), 19 deletions(-)

diff --git a/actions/publicrss.php b/actions/publicrss.php
index 822bc2db76..b98c272053 100644
--- a/actions/publicrss.php
+++ b/actions/publicrss.php
@@ -1,5 +1,17 @@
 <?php
-/*
+
+/**
+ * Public RSS action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,27 +29,45 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/rssaction.php');
-
-// Formatting of RSS handled by Rss10Action
+require_once INSTALLDIR.'/lib/rssaction.php';
 
+/**
+ * Formatting of RSS handled by Rss10Action
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class PublicrssAction extends Rss10Action
 {
-
+    /**
+     * Initialization.
+     * 
+     * @return boolean true
+     */
     function init()
     {
         return true;
     }
 
-    function get_notices($limit=0)
+    /**
+     * Get notices
+     *
+     * @param integer $limit max number of notices to return
+     *
+     * @return array notices
+     */
+    function getNotices($limit=0)
     {
-        
         $notices = array();
-        
-        $notice = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
-        
+        $notice  = Notice::publicStream(0, ($limit == 0) ? 48 : $limit);
         while ($notice->fetch()) {
             $notices[] = clone($notice);
         }
@@ -45,18 +75,30 @@ class PublicrssAction extends Rss10Action
         return $notices;
     }
 
-    function get_channel()
+     /**
+     * Get channel.
+     *
+     * @return array associative array on channel information
+     */
+    function getChannel()
     {
         global $config;
-        $c = array('url' => common_local_url('publicrss'),
-                   'title' => sprintf(_('%s Public Stream'), $config['site']['name']),
-                   'link' => common_local_url('public'),
-                   'description' => sprintf(_('All updates for %s'), $config['site']['name']));
+        $c = array(
+              'url' => common_local_url('publicrss')
+            , 'title' => sprintf(_('%s Public Stream'), $config['site']['name'])
+            , 'link' => common_local_url('public')
+            , 'description' => sprintf(_('All updates for %s'), $config['site']['name']));
         return $c;
     }
 
-    function get_image()
+    /**
+     * Get image.
+     *
+     * @return nothing
+    */
+    function getImage()
     {
-        return null;
+        // nop
     }
-}
\ No newline at end of file
+}
+

From 1cf469e244692055aab54f2f5c67e5b365767a33 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Tue, 20 Jan 2009 21:31:56 +0000
Subject: [PATCH 242/256] uiredesign + phpdocs

---
 actions/userbyid.php | 54 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 10 deletions(-)

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 4bb896c38e..8b0aec0573 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,5 +1,15 @@
 <?php
-/*
+/**
+ * User by ID action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,16 +27,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
+/**
+ * User by ID action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class UserbyidAction extends Action
 {
-    
+     /**
+     * Is read only?
+     * 
+     * @return boolean true
+     */
     function isReadOnly()
     {                
         return true;
     }
-    
+
+     /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
     function handle($args)
     {
         parent::handle($args);
@@ -41,12 +74,13 @@ class UserbyidAction extends Action
 
         // support redirecting to FOAF rdf/xml if the agent prefers it
         $page_prefs = 'application/rdf+xml,text/html,application/xhtml+xml,application/xml;q=0.3,text/xml;q=0.2';
-        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
-        $type = common_negotiate_type(common_accept_to_prefs($httpaccept),
-                                      common_accept_to_prefs($page_prefs));
-        $page = $type == 'application/rdf+xml' ? 'foaf' : 'showstream';
-
-        $url = common_local_url($page, array('nickname' => $user->nickname));
+        $httpaccept = isset($_SERVER['HTTP_ACCEPT'])
+                      ? $_SERVER['HTTP_ACCEPT'] : null;
+        $type       = common_negotiate_type(common_accept_to_prefs($httpaccept),
+                      common_accept_to_prefs($page_prefs));
+        $page       = $type == 'application/rdf+xml' ? 'foaf' : 'showstream';
+        $url        = common_local_url($page, array('nickname' => $user->nickname));
         common_redirect($url, 303);
     }
 }
+

From bb4a6a514bb62a0fef2314512c121951a40437e7 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 22:36:57 +0000
Subject: [PATCH 243/256] user_actions form markup and styling

---
 actions/showstream.php         |  1 +
 lib/blockform.php              | 15 ++++++++++++++-
 lib/subscribeform.php          |  2 +-
 lib/unblockform.php            | 13 ++++++++++++-
 lib/unsubscribeform.php        |  2 +-
 theme/base/css/display.css     | 30 ++++++++++++-----------------
 theme/identica/css/display.css | 35 ++++++++++++++++++++++------------
 7 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 1d79ea30d2..d550ec2951 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -22,6 +22,7 @@
  * @category  Personal
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
  * @copyright 2008-2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
diff --git a/lib/blockform.php b/lib/blockform.php
index 51e43f8b59..b7790681d8 100644
--- a/lib/blockform.php
+++ b/lib/blockform.php
@@ -88,6 +88,19 @@ class BlockForm extends Form
         return 'block-' . $this->profile->id;
     }
 
+
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_user_block';
+    }
+
+
     /**
      * Action of the form
      *
@@ -127,4 +140,4 @@ class BlockForm extends Form
     {
         $this->out->submit('submit', _('Block'));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/subscribeform.php b/lib/subscribeform.php
index 8b69efd1ac..231e740a72 100644
--- a/lib/subscribeform.php
+++ b/lib/subscribeform.php
@@ -89,7 +89,7 @@ class SubscribeForm extends Form
 
     function formClass()
     {
-        return 'form_subscribe';
+        return 'form_user_subscribe';
     }
 
 
diff --git a/lib/unblockform.php b/lib/unblockform.php
index 4cb9ae4f5d..025011a829 100644
--- a/lib/unblockform.php
+++ b/lib/unblockform.php
@@ -88,6 +88,17 @@ class UnblockForm extends Form
         return 'unblock-' . $this->profile->id;
     }
 
+    /**
+     * class of the form
+     *
+     * @return string class of the form
+     */
+
+    function formClass()
+    {
+        return 'form_user_unblock';
+    }
+
     /**
      * Action of the form
      *
@@ -127,4 +138,4 @@ class UnblockForm extends Form
     {
         $this->out->submit('submit', _('Unblock'));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/unsubscribeform.php b/lib/unsubscribeform.php
index b222f0e54d..092369db7b 100644
--- a/lib/unsubscribeform.php
+++ b/lib/unsubscribeform.php
@@ -89,7 +89,7 @@ class UnsubscribeForm extends Form
 
     function formClass()
     {
-        return 'form_unsubscribe';
+        return 'form_user_unsubscribe';
     }
 
     /**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3c776aea0a..fc1f35e356 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -570,8 +570,7 @@ display:none;
 list-style-type:none;
 }
 #user_actions li {
-border-top-width:1px;
-border-top-style:dotted;
+margin-bottom:4px;
 }
 #user_actions li:first-child {
 border-top:0;
@@ -584,34 +583,29 @@ padding:0;
 display:none;
 }
 
-#user_actions a,
 #user_actions input.submit {
 display:block;
 text-align:left;
-padding:4px 0 4px 19px;
+cursor:pointer;
+width:100%;
 }
 #user_actions a {
 text-decoration:none;
 }
-#user_subscribe a,
-#TB_window input.submit,
-#user_actions input.submit {
-border:0;
-cursor:pointer;
-padding-left:16px;
-width:100%;
-font-size:0.9em;
-}
 
-#user_subscribe a {
-width:auto;
+
+
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+border:0;
 padding-left:20px;
 }
 
-#user_subscribe a,
-#TB_window input.submit,
+
+
+#user_subscribe input.submit,
 .form_user_subscribe input.submit {
-font-weight:bold;
+
 }
 
 
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d5a5ce9564..eb5f78b9e8 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -125,30 +125,41 @@ background-image:url(../../base/images/icons/icon_vcard.gif);
 
 /*user_actions*/
 #user_actions li {
-border-top-color:#eee;
+/*border-top-color:#eee;*/
 }
-#user_subscribe a,
-#TB_window input.submit,
-.form_user_subscribe input.submit {
-background-image: url(../images/icons/twotone/green/shield.gif);
-background-position: 0 45%;
+
+
+.form_user_send-a-message input.submit,
+.form_user_nudge input.submit,
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-position: 0 40%;
 background-repeat: no-repeat;
+background-color:transparent;
 }
+.form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
-background-color:#647819;
+background-color:#A9BF4F;
 color:#fff;
 }
+.form_user_unsubscribe input.submit {
+background-color:#97BFD1;
+}
+
 #user_send-a-message a {
-background:url(../images/icons/twotone/green/quote.gif) 0 45% no-repeat;
+background-image:url(../images/icons/twotone/green/quote.gif);
 }
 .form_user_nudge input.submit {
-background:url(../images/icons/twotone/green/mail.gif) 0 45% no-repeat;
+background-image:url(../images/icons/twotone/green/mail.gif);
 }
-.form_user_block input.submit {
-background:url(../images/icons/twotone/green/against.gif) 0 45% no-repeat;
+.form_user_block input.submit,
+.form_user_unblock input.submit {
+background-image:url(../images/icons/twotone/green/shield.gif);
+color:#000;
 }
 
 
+
 /* NOTICES */
 .notices li.over {
 background-color:#fcfcfc;
@@ -242,4 +253,4 @@ background-color:#0f0;
 }
 #home #intro #step_create-a-community a {
 background-color:#00f;
-}
\ No newline at end of file
+}

From b8c4d0cad686fc942bf02dd6d4d8c39ca2158ea8 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 22:50:51 +0000
Subject: [PATCH 244/256] p and ul style for doc pages

---
 theme/base/css/display.css | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fc1f35e356..ec193b9b60 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -679,6 +679,8 @@ clear:both;
 
 
 
+
+
 /* NOTICE */
 .notice {
 position:relative;
@@ -961,8 +963,12 @@ border-right:0;
 
 
 
-
-
+#doc #content_inner p {
+margin-bottom:18px;
+}
+#doc #content_inner ul {
+list-style-position:inside;
+}
 
 
 /*START: LOAD ALONG WITH JS*/

From caeb74c9a5598147a77d0bb250d8fde67ad929ad Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 22:55:46 +0000
Subject: [PATCH 245/256] Styles for nested <li>s

---
 theme/base/css/display.css | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ec193b9b60..61ce2d043d 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -963,12 +963,20 @@ border-right:0;
 
 
 
+/*If there is hentry on #content_inner, this doesn't need to be specific to #doc */
 #doc #content_inner p {
 margin-bottom:18px;
 }
+#doc #content_inner ol,
 #doc #content_inner ul {
 list-style-position:inside;
 }
+#doc #content_inner li {
+margin-bottom:18px;
+}
+#doc #content_inner li li {
+margin-left:18px;
+}
 
 
 /*START: LOAD ALONG WITH JS*/

From 1ab0de3ddd863703648bdaedf92a2ae6cc7eb6ff Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Tue, 20 Jan 2009 23:50:52 +0000
Subject: [PATCH 246/256] If user has fn, then it will not link to their own
 profile with @class 'fn'. Only put @class 'fn' on the anchor if there is no
 fn.

---
 actions/showstream.php | 7 ++++---
 lib/profilelist.php    | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index d550ec2951..3fe71576d7 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -243,9 +243,10 @@ class ShowstreamAction extends Action
         $this->elementStart('dl', 'user_nickname');
         $this->element('dt', null, _('Nickname'));
         $this->elementStart('dd');
-            $this->element('a', array('href' => $this->profile->profileurl,
-                                      'rel' => 'me', 'class' => 'nickname url uid'),
-                           $this->profile->nickname);
+        $hasFN = ($this->profile->fullname) ? 'nickname url uid' : 'fn nickname url uid';
+        $this->element('a', array('href' => $this->profile->profileurl,
+                                  'rel' => 'me', 'class' => $hasFN),
+                            $this->profile->nickname);
         $this->elementEnd('dd');
         $this->elementEnd('dl');
 
diff --git a/lib/profilelist.php b/lib/profilelist.php
index 24b3573857..973df7bb68 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -87,7 +87,7 @@ class ProfileList extends Widget
 
     function showProfile()
     {
-        $this->out->elementStart('li', array('class' => 'profile vcard',
+        $this->out->elementStart('li', array('class' => 'profile',
                                              'id' => 'profile-' . $this->profile->id));
 
         $user = common_current_user();

From 592403cdc362e52f70570e6ba59afaa4857664fb Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 21 Jan 2009 00:06:56 +0000
Subject: [PATCH 247/256] uiredesign + phpdocs

---
 actions/nudge.php | 58 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 10 deletions(-)

diff --git a/actions/nudge.php b/actions/nudge.php
index 49223d4315..bb80ce3572 100644
--- a/actions/nudge.php
+++ b/actions/nudge.php
@@ -1,5 +1,17 @@
 <?php
-/*
+
+/**
+ * User by ID action class.
+ *
+ * PHP version 5
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ *
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *
@@ -17,13 +29,31 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/mail.php');
+require_once INSTALLDIR.'/lib/mail.php';
 
+/**
+ * Nudge a user action class.
+ *
+ * @category Action
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://laconi.ca/
+ */
 class NudgeAction extends Action
 {
-
+     /**
+     * Class handler.
+     * 
+     * @param array $args array of arguments
+     *
+     * @return nothing
+     */
     function handle($args)
     {
         parent::handle($args);
@@ -33,16 +63,16 @@ class NudgeAction extends Action
             return;
         }
 
-        $user = common_current_user();
+        $user  = common_current_user();
         $other = User::staticGet('nickname', $this->arg('nickname'));
 
         if ($_SERVER['REQUEST_METHOD'] != 'POST') {
-            common_redirect(common_local_url('showstream', array('nickname' => $other->nickname)));
+            common_redirect(common_local_url('showstream',
+                array('nickname' => $other->nickname)));
             return;
         }
 
-        # CSRF protection
-
+        // CSRF protection
         $token = $this->trimmed('token');
         
         if (!$token || $token != common_session_token()) {
@@ -73,14 +103,22 @@ class NudgeAction extends Action
         }
     }
 
+     /**
+     * Do the actual notification
+     *
+     * @param class $user  nudger
+     * @param class $other nudgee
+     *
+     * @return nothing
+     */
     function notify($user, $other)
     {
         if ($other->id != $user->id) {
             if ($other->email && $other->emailnotifynudge) {
                 mail_notify_nudge($user, $other);
             }
-            # XXX: notify by IM
-            # XXX: notify by SMS
+            // XXX: notify by IM
+            // XXX: notify by SMS
         }
     }
 }

From 560374e1702babd53f588c868f0189e2f935b5e7 Mon Sep 17 00:00:00 2001
From: Robin Millette <millette@controlyourself.ca>
Date: Wed, 21 Jan 2009 00:07:15 +0000
Subject: [PATCH 248/256] uiredesign + phpdocs

---
 actions/userbyid.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/actions/userbyid.php b/actions/userbyid.php
index 8b0aec0573..1e30d1aac3 100644
--- a/actions/userbyid.php
+++ b/actions/userbyid.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * User by ID action class.
  *
@@ -10,6 +11,7 @@
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
+
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
  *

From 96e40e06493148757896c7f6061e9cbb2d8c2ceb Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 21 Jan 2009 01:10:11 +0000
Subject: [PATCH 249/256] profilelist markup and styles

---
 lib/profilelist.php            | 32 +++++++++++++++++++-------
 theme/base/css/display.css     | 42 ++++++++++++++++++++++++++++++----
 theme/identica/css/display.css |  5 ++--
 3 files changed, 65 insertions(+), 14 deletions(-)

diff --git a/lib/profilelist.php b/lib/profilelist.php
index 973df7bb68..b2a9925c10 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -106,32 +106,48 @@ class ProfileList extends Widget
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->out->elementStart('span', 'nickname');
+        $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn nickname';
+        $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
         $this->out->elementEnd('span');
         $this->out->elementEnd('a');
         
         if ($this->profile->fullname) {
+            $this->out->elementStart('dl', 'user_fn');
+            $this->out->element('dt', null, 'Full name');
+            $this->out->elementStart('dd');
             $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->location) {
-            $this->out->elementStart('span', 'location');
+            $this->out->elementStart('dl', 'user_location');
+            $this->out->element('dt', null, _('Location'));
+            $this->out->elementStart('dd', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->homepage) {
-            $this->out->elementStart('p', 'website');
-            $this->out->elementStart('a', array('href' => $this->profile->homepage));
+            $this->out->elementStart('dl', 'user_url');
+            $this->out->element('dt', null, _('URL'));
+            $this->out->elementStart('dd');
+            $this->out->elementStart('a', array('href' => $this->profile->homepage,
+                                                'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            $this->out->elementStart('p', 'bio');
+            $this->out->elementStart('dl', 'user_note');
+            $this->out->element('dt', null, _('Note'));
+            $this->out->elementStart('dd', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 61ce2d043d..f0bf6bfc15 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -62,7 +62,9 @@ font-weight:bold;
 textarea {
 overflow:auto;
 }
-select, option {
+select {
+}
+option {
 padding-bottom:0;
 }
 fieldset {
@@ -526,14 +528,13 @@ clear:none;
 }
 #user_profile .user_fn {
 margin-left:11px;
-margin-left:4px;
 margin-right:4px;
 }
 #user_profile .user_fn .fn {
 font-weight:bold;
 font-style:normal;
 }
-#user_profile .user_nickname .nickname {
+#user_profile .nickname {
 font-style:italic;
 font-weight:bold;
 }
@@ -553,8 +554,13 @@ display:none;
 #user_profile h2 {
 display:none;
 }
+
 /* user_profile */
 
+
+
+
+
 /*user_actions*/
 #user_actions {
 clear:left;
@@ -677,12 +683,40 @@ clear:both;
 
 
 
+.profile #user_profile {
+margin-bottom:0;
+min-height:60px;
+}
 
+.profile .form_user_unsubscribe {
+float:right;
+}
+.profiles {
+list-style-type:none;
+}
+.profile #user_profile .user_location {
+width:auto;
+clear:none;
+margin-left:11px;
+}
+.profile #user_profile dl,
+.profile #user_profile dd {
+display:inline;
+float:none;
+}
+.profile #user_profile .user_note,
+.profile #user_profile .user_url {
+margin-left:55px;
+clear:none;
+display:block;
+width:auto;
+}
 
 
 
 /* NOTICE */
-.notice {
+.notice,
+.profile {
 position:relative;
 padding-top:18px;
 padding-bottom:18px;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index eb5f78b9e8..e3b5310f7a 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -39,7 +39,9 @@ color:#fff;
 }
 
 a,
-div.notice-options input {
+div.notice-options input,
+.form_user_block input.submit,
+.form_user_unblock input.submit {
 color:#002E6E;
 }
 
@@ -155,7 +157,6 @@ background-image:url(../images/icons/twotone/green/mail.gif);
 .form_user_block input.submit,
 .form_user_unblock input.submit {
 background-image:url(../images/icons/twotone/green/shield.gif);
-color:#000;
 }
 
 

From f51984175a7f14d9fdc07a7ef4434bb06acf5d34 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 21 Jan 2009 01:22:08 +0000
Subject: [PATCH 250/256] Matching markup for tags

---
 actions/showstream.php | 2 +-
 lib/profilelist.php    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/actions/showstream.php b/actions/showstream.php
index 3fe71576d7..3882af8451 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -288,7 +288,7 @@ class ShowstreamAction extends Action
         if (count($tags) > 0) {
             $this->elementStart('dl', 'user_tags');
             $this->element('dt', null, _('Tags'));
-            $this->elementStart('dd', 'tags');
+            $this->elementStart('dd');
             $this->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->elementStart('li');
diff --git a/lib/profilelist.php b/lib/profilelist.php
index b2a9925c10..f7ed5d19c6 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -156,8 +156,7 @@ class ProfileList extends Widget
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            $this->out->elementStart('div', 'tags_user');
-            $this->out->elementStart('dl');
+            $this->out->elementStart('dl', 'user_tags');
             $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
                 $this->out->element('a', array('href' => common_local_url('tagother',
@@ -166,13 +165,13 @@ class ProfileList extends Widget
             } else {
                 $this->out->text(_('Tags'));
             }
-            $this->out->text(":");
             $this->out->elementEnd('dt');
             $this->out->elementStart('dd');
             if ($tags) {
                 $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
+                    $this->element('span', 'mark_hash', '#');
                     $this->out->element('a', array('rel' => 'tag',
                                               'href' => common_local_url($this->action,
                                                                          array('nickname' => $this->owner->nickname,
@@ -186,7 +185,6 @@ class ProfileList extends Widget
             }
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
-            $this->out->elementEnd('div');
         }
 
         if ($user && $user->id == $this->owner->id) {

From 624ca93c9d2a55d7acfca453ba22268d09154dab Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 20 Jan 2009 17:49:47 -0800
Subject: [PATCH 251/256] Converted direct messaging actions to new uiredesign

---
 actions/inbox.php      |  51 ++++-----
 actions/newmessage.php | 123 ++++++++++++++-------
 actions/outbox.php     |  31 +++---
 lib/mailbox.php        | 237 +++++++++++++++++++----------------------
 lib/personal.php       |  43 ++++++--
 5 files changed, 264 insertions(+), 221 deletions(-)

diff --git a/actions/inbox.php b/actions/inbox.php
index da27814a6e..b553ab26ca 100644
--- a/actions/inbox.php
+++ b/actions/inbox.php
@@ -46,66 +46,57 @@ require_once INSTALLDIR.'/lib/mailbox.php';
 
 class InboxAction extends MailboxAction
 {
+    
     /**
-     * returns the title of the page
+     * Title of the page
      *
-     * @param User $user current user
-     * @param int  $page current page
-     *
-     * @return string localised title of the page
-     *
-     * @see MailboxAction::getTitle()
+     * @return string page title
      */
-
-    function getTitle($user, $page)
-    {
-        if ($page > 1) {
-            $title = sprintf(_("Inbox for %s - page %d"), $user->nickname, $page);
+    
+    function title()
+    {        
+        if ($this->page > 1) {
+            return sprintf(_("Inbox for %s - page %d"), $this->user->nickname,
+                $this->page);
         } else {
-            $title = sprintf(_("Inbox for %s"), $user->nickname);
+            return sprintf(_("Inbox for %s"), $this->user->nickname);
         }
-        return $title;
     }
 
     /**
-     * retrieve the messages for this user and this page
+     * Retrieve the messages for this user and this page
      *
      * Does a query for the right messages
-     *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
+     *  
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()
      */
 
-    function getMessages($user, $page)
+    function getMessages()
     {
         $message = new Message();
 
-        $message->to_profile = $user->id;
-
+        $message->to_profile = $this->user->id;
         $message->orderBy('created DESC, id DESC');
-        $message->limit((($page-1)*MESSAGES_PER_PAGE), MESSAGES_PER_PAGE + 1);
+        $message->limit((($this->page - 1) * MESSAGES_PER_PAGE),
+            MESSAGES_PER_PAGE + 1);
 
         if ($message->find()) {
             return $message;
-        } else {
+        } else {            
             return null;
         }
     }
 
     /**
-     * returns the profile we want to show with the message
+     * Returns the profile we want to show with the message
      *
-     * For inboxes, we show the sender.
+     * For inboxes, we show the sender; for outboxes, the recipient.
      *
      * @param Message $message The message to get the profile for
      *
-     * @return Profile The profile of the message sender
-     *
-     * @see MailboxAction::getMessageProfile()
+     * @return Profile The profile that matches the message
      */
 
     function getMessageProfile($message)
@@ -114,7 +105,7 @@ class InboxAction extends MailboxAction
     }
 
     /**
-     * instructions for using this page
+     * Instructions for using this page
      *
      * @return string localised instructions for using the page
      */
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 510a5f8f37..aa94f8c4fb 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Handler for posting new notices
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,13 +18,63 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
+ 
+if (!defined('LACONICA')) { 
+    exit(1); 
+}
 
-if (!defined('LACONICA')) { exit(1); }
+/**
+ * Action for posting new direct messages
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class NewmessageAction extends Action
 {
     
+    /**
+     * Error message, if any
+     */
+
+    var $msg = null;
+
+    /**
+     * Title of the page
+     *
+     * Note that this usually doesn't get called unless something went wrong
+     *
+     * @return string page title
+     */
+     
+    function title()
+    {
+        return _('New message');
+    }
+    
+    /**
+     * Handle input, produce output
+     *
+     * @param array $args $_REQUEST contents
+     *
+     * @return void
+     */
+    
     function handle($args)
     {
         parent::handle($args);
@@ -29,38 +82,42 @@ class NewmessageAction extends Action
         if (!common_logged_in()) {
             $this->clientError(_('Not logged in.'), 403);
         } else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->save_new_message();
+            $this->saveNewMessage();
         } else {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function save_new_message()
+    function saveNewMessage()
     {
         $user = common_current_user();
-        assert($user); # XXX: maybe an error instead...
+        assert($user); // XXX: maybe an error instead...
 
-        # CSRF protection
+        // CSRF protection
         
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. ' .
+                'Try again, please.'));
             return;
         }
         
         $content = $this->trimmed('content');
-        $to = $this->trimmed('to');
+        $to      = $this->trimmed('to');
         
         if (!$content) {
-            $this->show_form(_('No content!'));
+            $this->showForm(_('No content!'));
             return;
         } else {
             $content_shortened = common_shorten_links($content);
 
             if (mb_strlen($content_shortened) > 140) {
                 common_debug("Content = '$content_shortened'", __FILE__);
-                common_debug("mb_strlen(\$content) = " . mb_strlen($content_shortened), __FILE__);
-                $this->show_form(_('That\'s too long. Max message size is 140 chars.'));
+                common_debug("mb_strlen(\$content) = " . 
+                    mb_strlen($content_shortened),
+                    __FILE__);
+                $this->showForm(_('That\'s too long. ' .
+                    'Max message size is 140 chars.'));
                 return;
             }
         }
@@ -68,20 +125,21 @@ class NewmessageAction extends Action
         $other = User::staticGet('id', $to);
         
         if (!$other) {
-            $this->show_form(_('No recipient specified.'));
+            $this->showForm(_('No recipient specified.'));
             return;
         } else if (!$user->mutuallySubscribed($other)) {
             $this->clientError(_('You can\'t send a message to this user.'), 404);
             return;
         } else if ($user->id == $other->id) {
-            $this->clientError(_('Don\'t send a message to yourself; just say it to yourself quietly instead.'), 403);
+            $this->clientError(_('Don\'t send a message to yourself; ' .
+                'just say it to yourself quietly instead.'), 403);
             return;
         }
         
         $message = Message::saveNew($user->id, $other->id, $content, 'web');
         
         if (is_string($message)) {
-            $this->show_form($message);
+            $this->showForm($message);
             return;
         }
 
@@ -92,21 +150,10 @@ class NewmessageAction extends Action
         common_redirect($url, 303);
     }
 
-    function show_top($params)
+    function showForm($msg = null)
     {
-
-        list($content, $user, $to) = $params;
-        
-        assert(!is_null($user));
-
-        common_message_form($content, $user, $to);
-    }
-
-    function show_form($msg=null)
-    {
-        
         $content = $this->trimmed('content');
-        $user = common_current_user();
+        $user    = common_current_user();
 
         $to = $this->trimmed('to');
         
@@ -120,22 +167,16 @@ class NewmessageAction extends Action
         if (!$user->mutuallySubscribed($other)) {
             $this->clientError(_('You can\'t send a message to this user.'), 404);
             return;
-        }
+        }        
         
-        common_show_header(_('New message'), null,
-                           array($content, $user, $other),
-                           array($this, 'show_top'));
+        $this->msg = $msg;
         
-        if ($msg) {
-            $this->element('p', array('id'=>'error'), $msg);
-        }
-        
-        common_show_footer();
+        $this->showPage();
     }
     
     function notify($from, $to, $message)
     {
         mail_notify_message($message, $from, $to);
-        # XXX: Jabber, SMS notifications... probably queued
+        // XXX: Jabber, SMS notifications... probably queued
     }
 }
diff --git a/actions/outbox.php b/actions/outbox.php
index 9fb6dbf9f8..c8d7f28125 100644
--- a/actions/outbox.php
+++ b/actions/outbox.php
@@ -47,46 +47,39 @@ require_once INSTALLDIR.'/lib/mailbox.php';
 class OutboxAction extends MailboxAction
 {
     /**
-     * returns the title of the page
+     * Title of the page
      *
-     * @param User $user current user
-     * @param int  $page current page
-     *
-     * @return string localised title of the page
-     *
-     * @see MailboxAction::getTitle()
+     * @return string page title
      */
 
-    function getTitle($user, $page)
+    function title()
     {
-        if ($page > 1) {
-            $title = sprintf(_("Outbox for %s - page %d"), $user->nickname, $page);
+        if ($this->page > 1) {
+            return sprintf(_("Outbox for %s - page %d"),
+                $this->user->nickname, $page);
         } else {
-            $title = sprintf(_("Outbox for %s"), $user->nickname);
+            return sprintf(_("Outbox for %s"), $this->user->nickname);
         }
-        return $title;
     }
 
     /**
      * retrieve the messages for this user and this page
      *
      * Does a query for the right messages
-     *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
+     *  
      * @return Message data object with stream for messages
      *
      * @see MailboxAction::getMessages()
      */
 
-    function getMessages($user, $page)
+    function getMessages()
     {
         $message = new Message();
 
-        $message->from_profile = $user->id;
+        $message->from_profile = $this->user->id;
         $message->orderBy('created DESC, id DESC');
-        $message->limit((($page-1)*MESSAGES_PER_PAGE), MESSAGES_PER_PAGE + 1);
+        $message->limit((($this->page - 1) * MESSAGES_PER_PAGE),
+            MESSAGES_PER_PAGE + 1);
 
         if ($message->find()) {
             return $message;
diff --git a/lib/mailbox.php b/lib/mailbox.php
index bdc360a353..9af0dbd2f2 100644
--- a/lib/mailbox.php
+++ b/lib/mailbox.php
@@ -49,6 +49,23 @@ define('MESSAGES_PER_PAGE', 20);
 
 class MailboxAction extends PersonalAction
 {
+    var $page = null;
+
+    function prepare($args) 
+    {
+        parent::prepare($args);
+
+        $nickname   = common_canonical_nickname($this->arg('nickname'));
+        $this->user = User::staticGet('nickname', $nickname);
+        $this->page = $this->trimmed('page');
+
+        if (!$this->page) {
+            $this->page = 1;
+        }
+
+        return true;
+    }
+
     /**
      * output page based on arguments
      *
@@ -61,134 +78,42 @@ class MailboxAction extends PersonalAction
     {
         parent::handle($args);
 
-        $nickname = common_canonical_nickname($this->arg('nickname'));
-
-        $user = User::staticGet('nickname', $nickname);
-
-        if (!$user) {
-            $this->client_error(_('No such user.'), 404);
+        if (!$this->user) {
+            $this->clientError(_('No such user.'), 404);
             return;
         }
 
         $cur = common_current_user();
 
-        if (!$cur || $cur->id != $user->id) {
-            $this->client_error(_('Only the user can read their own mailboxes.'),
-                                403);
+        if (!$cur || $cur->id != $this->user->id) {
+            $this->clientError(_('Only the user can read their own mailboxes.'),
+                403);
             return;
         }
 
-        $profile = $user->getProfile();
-
-        if (!$profile) {
-            $this->server_error(_('User has no profile.'));
-            return;
-        }
-
-        $page = $this->trimmed('page');
-
-        if (!$page) {
-            $page = 1;
-        }
-
-        $this->showPage($user, $page);
+        $this->showPage();
     }
 
-    /**
-     * returns the title of the page
-     *
-     * @param User $user current user
-     * @param int  $page current page
-     *
-     * @return string localised title of the page
-     */
-
-    function getTitle($user, $page)
+    function showLocalNav()
     {
-        return '';
+        $nav = new PersonalGroupNav($this);
+        $nav->show();
     }
 
-    /**
-     * instructions for using this page
-     *
-     * @return string localised instructions for using the page
-     */
-
-    function getInstructions()
+    function showNoticeForm()
     {
-        return '';
+        $message_form = new MessageForm($this);
+        $message_form->show();
     }
 
-    /**
-     * do structured output for the "instructions" are of the page
-     *
-     * @return void
-     */
-
-    function showTop()
+    function showContent()
     {
-        $cur = common_current_user();
-
-        common_message_form(null, $cur, null);
-
-        $this->views_menu();
-    }
-
-    /**
-     * show a full page of output
-     *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
-     * @return void
-     */
-
-    function showPage($user, $page)
-    {
-        common_show_header($this->getTitle($user, $page),
-                           null, null,
-                           array($this, 'showTop'));
-
-        $this->showBox($user, $page);
-
-        common_show_footer();
-    }
-
-    /**
-     * retrieve the messages appropriate for this mailbox
-     *
-     * Does a query for the right messages
-     *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
-     * @return Message data object with stream for messages
-     */
-
-    function getMessages($user, $page)
-    {
-        return null;
-    }
-
-    /**
-     * show the messages for a mailbox in list format
-     *
-     * Includes the pagination links (before, after).
-     *
-     * @param User $user The current user
-     * @param int  $page The page the user is on
-     *
-     * @return void
-     */
-
-    function showBox($user, $page)
-    {
-        $message = $this->getMessages($user, $page);
+        $message = $this->getMessages();
 
         if ($message) {
 
             $cnt = 0;
-            common_element_start('ul', array('id' => 'messages'));
+            $this->elementStart('ul', array('id' => 'messages'));
 
             while ($message->fetch() && $cnt <= MESSAGES_PER_PAGE) {
                 $cnt++;
@@ -200,17 +125,22 @@ class MailboxAction extends PersonalAction
                 $this->showMessage($message);
             }
 
-            common_element_end('ul');
+            $this->elementEnd('ul');
 
-            common_pagination($page > 1, $cnt > MESSAGES_PER_PAGE,
-                              $page, $this->trimmed('action'),
-                              array('nickname' => $user->nickname));
+            $this->pagination($this->page > 1, $cnt > MESSAGES_PER_PAGE,
+                              $this->page, $this->trimmed('action'),
+                              array('nickname' => $this->user->nickname));
 
             $message->free();
             unset($message);
         }
     }
 
+    function getMessages()
+    {
+        return null;
+    }
+
     /**
      * returns the profile we want to show with the message
      *
@@ -229,6 +159,9 @@ class MailboxAction extends PersonalAction
     /**
      * show a single message in the list format
      *
+     * XXX: This needs to be extracted out into a MessageList similar
+     * to NoticeList.
+     *
      * @param Message $message the message to show
      *
      * @return void
@@ -236,14 +169,14 @@ class MailboxAction extends PersonalAction
 
     function showMessage($message)
     {
-        common_element_start('li', array('class' => 'message_single',
+        $this->elementStart('li', array('class' => 'message_single',
                                          'id' => 'message-' . $message->id));
 
         $profile = $this->getMessageProfile($message);
 
         $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-        common_element_start('a', array('href' => $profile->profileurl));
-        common_element('img', array('src' => ($avatar) ?
+        $this->elementStart('a', array('href' => $profile->profileurl));
+        $this->element('img', array('src' => ($avatar) ?
                                     common_avatar_display_url($avatar) :
                                     common_default_avatar(AVATAR_STREAM_SIZE),
                                     'class' => 'avatar stream',
@@ -252,14 +185,14 @@ class MailboxAction extends PersonalAction
                                     'alt' =>
                                     ($profile->fullname) ? $profile->fullname :
                                     $profile->nickname));
-        common_element_end('a');
-        common_element('a', array('href' => $profile->profileurl,
+        $this->elementEnd('a');
+        $this->element('a', array('href' => $profile->profileurl,
                                   'class' => 'nickname'),
                        $profile->nickname);
         // FIXME: URL, image, video, audio
-        common_element_start('p', array('class' => 'content'));
-        common_raw($message->rendered);
-        common_element_end('p');
+        $this->elementStart('p', array('class' => 'content'));
+        $this->raw($message->rendered);
+        $this->elementEnd('p');
 
         $messageurl = common_local_url('showmessage',
                                        array('message' => $message->id));
@@ -269,18 +202,72 @@ class MailboxAction extends PersonalAction
             preg_match('/^http/', $message->uri)) {
             $messageurl = $message->uri;
         }
-        common_element_start('p', 'time');
-        common_element('a', array('class' => 'permalink',
+        $this->elementStart('p', 'time');
+        $this->element('a', array('class' => 'permalink',
                                   'href' => $messageurl,
                                   'title' => common_exact_date($message->created)),
                        common_date_string($message->created));
         if ($message->source) {
-            common_text(_(' from '));
-            $this->source_link($message->source);
+            $this->text(_(' from '));
+            $this->showSource($message->source);
         }
 
-        common_element_end('p');
+        $this->elementEnd('p');
 
-        common_element_end('li');
+        $this->elementEnd('li');
     }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
+    }
+
+    /**
+     * Show the source of the message
+     *
+     * Returns either the name (and link) of the API client that posted the notice,
+     * or one of other other channels.
+     *
+     * @param string $source the source of the message 
+     *
+     * @return void
+     */
+
+    function showSource($source) 
+    {
+        $source_name = _($source);
+        switch ($source) {
+        case 'web':
+        case 'xmpp':
+        case 'mail':
+        case 'omb':
+        case 'api':
+            $this->element('span', 'noticesource', $source_name);
+            break;
+        default:
+            $ns = Notice_source::staticGet($source);
+            if ($ns) {
+                $this->element('a', array('href' => $ns->url),
+                               $ns->name);
+            } else {
+                $this->element('span', 'noticesource', $source_name);
+            }
+            break;
+        }
+        return;
+    }
+
 }
diff --git a/lib/personal.php b/lib/personal.php
index 46f9ff6be7..900df0257f 100644
--- a/lib/personal.php
+++ b/lib/personal.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * User profile page
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,16 +18,44 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Base class for user profile page
+ *
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class PersonalAction extends Action
 {
+
+    var $user = null;
+
+    function isReadOnly()
+    {
+         return true;
+    }
+
     function handle($args)
     {
         parent::handle($args);
-        common_set_returnto($this->self_url());
+        common_set_returnto($this->selfUrl());
     }
 
 }

From e9b9795eeb30837ddddd980eaea9d11c055cb843 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Wed, 21 Jan 2009 02:52:16 +0000
Subject: [PATCH 252/256] (dis)favor form method call fix

---
 actions/disfavor.php       | 5 ++++-
 actions/favor.php          | 4 +++-
 theme/base/css/display.css | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/actions/disfavor.php b/actions/disfavor.php
index 3e3e4a5476..d4a189d196 100644
--- a/actions/disfavor.php
+++ b/actions/disfavor.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once INSTALLDIR.'/lib/favorform.php';
+
 class DisfavorAction extends Action
 {
 
@@ -74,7 +76,8 @@ class DisfavorAction extends Action
             $this->element('title', null, _('Add to favorites'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            common_favor_form($notice);
+            $favor = new FavorForm($this, $notice);
+            $favor->show();
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
diff --git a/actions/favor.php b/actions/favor.php
index afda93cff2..92756366d9 100644
--- a/actions/favor.php
+++ b/actions/favor.php
@@ -20,6 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/mail.php');
+require_once INSTALLDIR.'/lib/disfavorform.php';
 
 class FavorAction extends Action
 {
@@ -73,7 +74,8 @@ class FavorAction extends Action
             $this->element('title', null, _('Disfavor favorite'));
             $this->elementEnd('head');
             $this->elementStart('body');
-            common_disfavor_form($notice);
+            $disfavor = new DisFavorForm($this, $notice);
+            $disfavor->show();
             $this->elementEnd('body');
             $this->elementEnd('html');
         } else {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index f0bf6bfc15..d2480be14a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -706,7 +706,7 @@ float:none;
 }
 .profile #user_profile .user_note,
 .profile #user_profile .user_url {
-margin-left:55px;
+margin-left:59px;
 clear:none;
 display:block;
 width:auto;
@@ -767,8 +767,8 @@ margin-right:11px;
 
 .vcard .photo {
 display:inline;
-margin-right:7px;
-margin-bottom:7px;
+margin-right:11px;
+margin-bottom:11px;
 float:left;
 }
 .vcard .url {

From 61850ceb5575c0fab8bd70bbe924543b09a2d765 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 20 Jan 2009 19:16:52 -0800
Subject: [PATCH 253/256] Converted ShowmessageAction to work with new
 uiredesign

---
 actions/showmessage.php | 197 +++++++++++++++++++++++++++-------------
 1 file changed, 134 insertions(+), 63 deletions(-)

diff --git a/actions/showmessage.php b/actions/showmessage.php
index d13e9f671f..289414153b 100644
--- a/actions/showmessage.php
+++ b/actions/showmessage.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Show a single message
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,94 +18,162 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
+if (!defined('LACONICA')) { 
+    exit(1); 
+}
 
-if (!defined('LACONICA')) { exit(1); }
+require_once INSTALLDIR.'/lib/mailbox.php';
 
-require_once(INSTALLDIR.'/lib/mailbox.php');
+/**
+ * Show a single message
+ *
+ * // XXX: It is totally weird how this works!
+ * 
+ * @category Personal
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
 class ShowmessageAction extends MailboxAction
 {
+    /**
+     * Message object to show
+     */
+
+    var $message = null;
+    
+    /**
+     * The current user
+     */
+    
+    var $user = null;
+
+    /**
+     * Load attributes based on database arguments
+     *
+     * Loads all the DB stuff
+     *
+     * @param array $args $_REQUEST array
+     *
+     * @return success flag
+     */
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        
+        $this->page = 1;
+        
+        $id            = $this->trimmed('message');
+        $this->message = Message::staticGet('id', $id);
+
+        if (!$this->message) {
+            $this->clientError(_('No such message.'), 404);
+            return false;
+        }
+
+        $this->user = common_current_user();
+
+        return true;
+    }
 
     function handle($args)
     {
-
         Action::handle($args);
-
-        $message = $this->get_message();
-
-        if (!$message) {
-            $this->clientError(_('No such message.'), 404);
-            return;
-        }
-        
-        $cur = common_current_user();
-        
-        if ($cur && ($cur->id == $message->from_profile || $cur->id == $message->to_profile)) {
-            $this->show_page($cur, 1);
+                        
+        if ($this->user && ($this->user->id == $this->message->from_profile || 
+            $this->user->id == $this->message->to_profile)) {
+                $this->showPage();
         } else {
-            $this->clientError(_('Only the sender and recipient may read this message.'), 403);
+            $this->clientError(_('Only the sender and recipient ' .
+                'may read this message.'), 403);
             return;
         }
     }
     
-    function get_message()
-    {
-        $id = $this->trimmed('message');
-        $message = Message::staticGet('id', $id);
-        return $message;
-    }
-    
-    function get_title($user, $page)
-    {
-        $message = $this->get_message();
-        if (!$message) {
-            return null;
-        }
-        
-        if ($user->id == $message->from_profile) {
-            $to = $message->getTo();
-            $title = sprintf(_("Message to %1\$s on %2\$s"),
+    function title()
+    {                        
+        if ($this->user->id == $this->message->from_profile) {
+            $to = $this->message->getTo();
+            return sprintf(_("Message to %1\$s on %2\$s"),
                              $to->nickname,
-                             common_exact_date($message->created));
-        } else if ($user->id == $message->to_profile) {
-            $from = $message->getFrom();
-            $title = sprintf(_("Message from %1\$s on %2\$s"),
+                             common_exact_date($this->message->created));
+        } else if ($this->user->id == $this->message->to_profile) {
+            $from = $this->message->getFrom();
+            return sprintf(_("Message from %1\$s on %2\$s"),
                              $from->nickname,
-                             common_exact_date($message->created));
+                             common_exact_date($this->message->created));
         }
-        return $title;
     }
-
-    function get_messages($user, $page)
-    {
-        $message = new Message();
-        $message->id = $this->trimmed('message');
+        
+    function getMessages() 
+    {    
+        $message     = new Message();
+        $message->id = $this->message->id;
         $message->find();
         return $message;
     }
     
-    function get_message_profile($message)
+    function getMessageProfile()
     {
-        $user = common_current_user();
-        if ($user->id == $message->from_profile) {
-            return $message->getTo();
-        } else if ($user->id == $message->to_profile) {
-            return $message->getFrom();
+        if ($this->user->id == $this->message->from_profile) {
+            return $this->message->getTo();
+        } else if ($this->user->id == $this->message->to_profile) {
+            return $this->message->getFrom();
         } else {
-            # This shouldn't happen
+            // This shouldn't happen
             return null;
         }
     }
     
-    function get_instructions()
+    /**
+     * Don't show local navigation
+     *
+     * @return void
+     */
+
+    function showLocalNavBlock()
+    {
+    }
+    
+    /**
+     * Don't show page notice
+     *
+     * @return void
+     */
+
+    function showPageNoticeBlock()
+    {
+    }
+
+    /**
+     * Don't show aside
+     *
+     * @return void
+     */
+
+    function showAside() 
+    {
+    }
+ 
+    /**
+     * Don't show any instructions
+     *
+     * @return string
+     */
+     
+    function getInstructions()
     {
         return '';
     }
-    
-    function views_menu()
-    {
-        return;
-    }
-}
-    
\ No newline at end of file
+}
\ No newline at end of file

From afde3c62d8d95b892fe095cb54822c2e7c062ca6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 21 Jan 2009 03:59:30 +0000
Subject: [PATCH 254/256] Remove deleteprofile.php

---
 actions/deleteprofile.php | 289 --------------------------------------
 1 file changed, 289 deletions(-)
 delete mode 100644 actions/deleteprofile.php

diff --git a/actions/deleteprofile.php b/actions/deleteprofile.php
deleted file mode 100644
index cc236f8474..0000000000
--- a/actions/deleteprofile.php
+++ /dev/null
@@ -1,289 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-class DeleteprofileAction extends Action
-{
-    function handle($args)
-    {
-        parent::handle($args);
-        $this->serverError(_('Code not yet ready.'));
-        return;
-        if ('POST' === $_SERVER['REQUEST_METHOD']) {
-            $this->handle_post();
-        }
-        else if ('GET' === $_SERVER['REQUEST_METHOD']) {
-            $this->show_form();
-        }
-    }
-
-    function get_instructions()
-    {
-        return _('Export and delete your user information.');
-    }
-
-    function form_header($title, $msg=null, $success=false)
-    {
-        common_show_header($title,
-                           null,
-                           array($msg, $success),
-                           array($this, 'show_top'));
-    }
-
-    function show_feeds_list($feeds)
-    {
-        $this->elementStart('div', array('class' => 'feedsdel'));
-        $this->element('p', null, 'Feeds:');
-        $this->elementStart('ul', array('class' => 'xoxo'));
-
-        foreach ($feeds as $key => $value) {
-            $this->common_feed_item($feeds[$key]);
-        }
-        $this->elementEnd('ul');
-        $this->elementEnd('div');
-    }
-
-    //TODO move to common.php (and retrace its origin)
-    function common_feed_item($feed)
-    {
-        $user = common_current_user();
-        $nickname = $user->nickname;
-
-        switch($feed['item']) {
-            case 'notices': default:
-                $feed_classname = $feed['type'];
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's ".$feed['version']." notice feed";
-                $feed['textContent'] = "RSS";
-                break;
-
-            case 'foaf':
-                $feed_classname = "foaf";
-                $feed_mimetype = "application/".$feed['type']."+xml";
-                $feed_title = "$nickname's FOAF file";
-                $feed['textContent'] = "FOAF";
-                break;
-        }
-        $this->elementStart('li');
-        $this->element('a', array('href' => $feed['href'],
-                                  'class' => $feed_classname,
-                                  'type' => $feed_mimetype,
-                                  'title' => $feed_title),
-                            $feed['textContent']);
-        $this->elementEnd('li');
-    }
-
-    function show_form($msg=null, $success=false)
-    {
-        $this->form_header(_('Delete my account'), $msg, $success);
-        $this->element('h2', null, _('Delete my account confirmation'));
-        $this->show_confirm_delete_form();
-        common_show_footer();
-    }
-
-    function show_confirm_delete_form()
-    {
-        $user = common_current_user();
-        $notices = DB_DataObject::factory('notice');
-        $notices->profile_id = $user->id;
-        $notice_count = (int) $notices->count();
-
-        $this->elementStart('form', array('method' => 'POST',
-                                           'id' => 'delete',
-                                           'action' =>
-                                           common_local_url('deleteprofile')));
-
-        $this->hidden('token', common_session_token());
-        $this->element('p', null, "Last chance to copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
-
-        $this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
-                                              'type' => 'rss',
-                                              'version' => 'RSS 1.0',
-                                              'item' => 'notices'),
-                                     1=>array('href'=>common_local_url('foaf',array('nickname' => $user->nickname)),
-                                              'type' => 'rdf',
-                                              'version' => 'FOAF',
-                                              'item' => 'foaf')));
-
-        $this->checkbox('confirmation', _('Check if you are sure you want to delete your account.'));
-
-        $this->submit('deleteaccount', _('Delete my account'));
-        $this->elementEnd('form');
-    }
-
-    function handle_post()
-    {
-        # CSRF protection
-        $token = $this->trimmed('token');
-        if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
-            return;
-        }
-
-        if ($this->arg('deleteaccount') && $this->arg('confirmation')) {
-            $this->delete_account();
-        }
-        $this->show_form();
-    }
-
-    function delete_account()
-    {
-        $user = common_current_user();
-        assert(!is_null($user)); # should already be checked
-
-        // deleted later through the profile
-        /*
-        $avatar = new Avatar;
-        $avatar->profile_id = $user->id;
-        $n_avatars_deleted = $avatar->delete();
-        */
-
-        $fave = new Fave;
-        $fave->user_id = $user->id;
-        $n_faves_deleted = $fave->delete();
-
-        $confirmation = new Confirm_address;
-        $confirmation->user_id = $user->id;
-        $n_confirmations_deleted = $confirmation->delete();
-
-        // TODO foreign stuff...
-
-        $invitation = new Invitation;
-        $invitation->user_id = $user->id;
-        $n_invitations_deleted = $invitation->delete();
-
-        $message_from = new Message;
-        $message_from->from_profile = $user->id;
-        $n_messages_from_deleted = $message_from->delete();
-
-        $message_to = new Message;
-        $message_to->to_profile = $user->id;
-        $n_messages_to_deleted = $message_to->delete();
-
-        $notice_inbox = new Notice_inbox;
-        $notice_inbox->user_id = $user->id;
-        $n_notices_inbox_deleted = $notice_inbox->delete();
-
-        $profile_tagger = new Profile_tag;
-        $profile_tagger->tagger = $user->id;
-        $n_profiles_tagger_deleted = $profile_tagger->delete();
-
-        $profile_tagged = new Profile_tag;
-        $profile_tagged->tagged = $user->id;
-        $n_profiles_tagged_deleted = $profile_tagged->delete();
-
-        $remember_me = new Remember_me;
-        $remember_me->user_id = $user->id;
-        $n_remember_mes_deleted = $remember_me->delete();
-
-        $reply= new Reply;
-        $reply->profile_id = $user->id;
-        $n_replies_deleted = $reply->delete();
-
-        // FIXME we're not removings replies to deleted notices.
-        //       notices should take care of that themselves.
-
-        $notice = new Notice;
-        $notice->profile_id = $user->id;
-        $n_notices_deleted = $notice->delete();
-
-        $subscriber = new Subscription;
-        $subscriber->subscriber = $user->id;
-        $n_subscribers_deleted = $subscriber->delete();
-
-        $subscribed = new Subscription;
-        $subscribed->subscribed = $user->id;
-        $n_subscribeds_deleted = $subscribed->delete();
-
-        $user_openid = new User_openid;
-        $user_openid->user_id = $user->id;
-        $n_user_openids_deleted = $user_openid->delete();
-
-        $profile = new Profile;
-        $profile->id = $user->id;
-        $profile->delete_avatars();
-        $n_profiles_deleted = $profile->delete();
-        $n_users_deleted = $user->delete();
-
-        // logout and redirect to public
-        common_set_user(null);
-        common_real_login(false); # not logged in
-        common_forgetme(); # don't log back in!
-        common_redirect(common_local_url('public'));
-    }
-
-    function show_top($arr)
-    {
-        $msg = $arr[0];
-        $success = $arr[1];
-        if ($msg) {
-            $this->message($msg, $success);
-        } else {
-            $inst = $this->get_instructions();
-            $output = common_markup_to_html($inst);
-            $this->elementStart('div', 'instructions');
-            $this->raw($output);
-            $this->elementEnd('div');
-        }
-        $this->settings_menu();
-    }
-
-    function settings_menu()
-    {
-        # action => array('prompt', 'title')
-        $menu =
-          array('profilesettings' =>
-                array(_('Profile'),
-                      _('Change your profile settings')),
-                'emailsettings' =>
-                array(_('Email'),
-                      _('Change email handling')),
-                'openidsettings' =>
-                array(_('OpenID'),
-                      _('Add or remove OpenIDs')),
-                'smssettings' =>
-                array(_('SMS'),
-                      _('Updates by SMS')),
-                'imsettings' =>
-                array(_('IM'),
-                      _('Updates by instant messenger (IM)')),
-                'twittersettings' =>
-                array(_('Twitter'),
-                      _('Twitter integration options')),
-                'othersettings' =>
-                array(_('Other'),
-                      _('Other options')));
-
-        $action = $this->trimmed('action');
-        $this->elementStart('ul', array('id' => 'nav_views'));
-        foreach ($menu as $menuaction => $menudesc) {
-            if ($menuaction == 'imsettings' &&
-                !common_config('xmpp', 'enabled')) {
-                continue;
-            }
-            common_menu_item(common_local_url($menuaction),
-                    $menudesc[0],
-                    $menudesc[1],
-                    $action == $menuaction);
-        }
-        $this->elementEnd('ul');
-    }
-}
-

From 724abe9ea94092b6a5e922ebabc555d42cd65e7e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 21 Jan 2009 03:59:47 +0000
Subject: [PATCH 255/256] Remove "finishimmediate" action

---
 actions/finishimmediate.php | 68 -------------------------------------
 1 file changed, 68 deletions(-)
 delete mode 100644 actions/finishimmediate.php

diff --git a/actions/finishimmediate.php b/actions/finishimmediate.php
deleted file mode 100644
index 0964c39f44..0000000000
--- a/actions/finishimmediate.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-if (!defined('LACONICA')) { exit(1); }
-
-require_once(INSTALLDIR.'/lib/openid.php');
-
-class FinishimmediateAction extends Action
-{
-
-    function handle($args)
-    {
-        parent::handle($args);
-
-        $consumer = oid_consumer();
-
-        $response = $consumer->complete(common_local_url('finishimmediate'));
-
-        if ($response->status == Auth_OpenID_SUCCESS) {
-            $display = $response->getDisplayIdentifier();
-            $canonical = ($response->endpoint->canonicalID) ?
-              $response->endpoint->canonicalID : $response->getDisplayIdentifier();
-
-            $user = oid_get_user($canonical);
-
-            if ($user) {
-                oid_update_user($user, $sreg);
-                oid_set_last($display); # refresh for another year
-                common_set_user($user->nickname);
-                $this->go_backto();
-                return;
-            }
-        }
-
-        # Failure! Clear openid so we don't try it again
-
-        oid_clear_last();
-        $this->go_backto();
-        return;
-    }
-
-    function go_backto()
-    {
-        common_ensure_session();
-        $backto = $_SESSION['openid_immediate_backto'];
-        if (!$backto) {
-            # gar. Well, push them to the public page
-            $backto = common_local_url('public');
-        }
-        common_redirect($backto);
-    }
-}

From 65bfda33b8464caf14ce268c9bea2e7eceb27fe5 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Wed, 21 Jan 2009 04:04:23 +0000
Subject: [PATCH 256/256] Documented the site notice option.

---
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
index 1ef31a8c10..a0758e5ee0 100644
--- a/README
+++ b/README
@@ -817,6 +817,10 @@ private: If set to 'true', anonymous users will be redirected to the
          authentication will require it. Note that this does not turn
          off registration; use 'closed' or 'inviteonly' for the
          behaviour you want.
+notice: A plain string that will appear on every page. A good place
+	to put introductory information about your service, or info about
+	upgrades and outages, or other community info. Any HTML will
+        be escaped.
 
 db
 --