Merge ../csarven into uiredesign

Conflicts:

	lib/action.php

diff --cc lib/action.php
Simple merge

diff --cc lib/disfavorform.php
index 25f99f43c157467c3886e35fdcebdee346f3f01a,25f99f43c157467c3886e35fdcebdee346f3f01a..ffca0cd8bf24638e7380eeac725ad00869694582
--- 1/lib/disfavorform.php
--- 2/lib/disfavorform.php
+++ b/lib/disfavorform.php
@@@ -127,4 -127,4 +127,16 @@@ class DisfavorForm extends For
          $this->out->submit('disfavor-submit-' . $this->notice->id,
                             _('Disfavor favorite'));
      }
++    
++    /**
++     * Class of the form.
++     *
++     * @return string the form's class
++     */
++
++    function formClass()
++    {
++      return 'disfavor';
++    }
++
  }

diff --cc lib/favorform.php
index c67e186974e1241a905d8984e726f4d4bac5c932,c67e186974e1241a905d8984e726f4d4bac5c932..4f4fd72a9dc4321dc76fc33d8df0fe5a3dac13d4
--- 1/lib/favorform.php
--- 2/lib/favorform.php
+++ b/lib/favorform.php
@@@ -127,4 -127,4 +127,15 @@@ class FavorForm extends For
          $this->out->submit('favor-submit-' . $this->notice->id,
                             _('Make a favorite'));
      }
++    
++    /**
++     * Class of the form.
++     *
++     * @return string the form's class
++     */
++    
++    function formClass()
++    {
++      return 'favor';
++    }
  }

diff --cc lib/form.php
index 5c75bb65fa20747a80aeda4f748fda7475ae990c,5c75bb65fa20747a80aeda4f748fda7475ae990c..bd68fb0c5f69cecbf000c4c1fe2e00339d83ad0b
--- 1/lib/form.php
--- 2/lib/form.php
+++ b/lib/form.php
@@@ -65,6 -65,6 +65,7 @@@ class Form extends Widge
      {
          $this->out->elementStart('form',
                                   array('id' => $this->id(),
++                                     'class' => $this->formClass(),
                                         'method' => 'POST',
                                         'action' => $this->action()));
          $this->out->elementStart('fieldset');
@@@ -153,4 -153,4 +154,15 @@@
      function action()
      {
      }
++    
++    /**
++     * Class of the form.
++     *
++     * @return string the form's class
++     */
++
++    function formClass()
++    {
++      return 'form';
++    }
  }

diff --cc lib/noticelist.php
index fb3e66f9fb90d108e3bba506b633c07d3be23e0e,fb3e66f9fb90d108e3bba506b633c07d3be23e0e..0fc6d513f4dfa2127b1473ee93502277390e55bb
--- 1/lib/noticelist.php
--- 2/lib/noticelist.php
+++ b/lib/noticelist.php
@@@ -229,9 -229,9 +229,11 @@@ class NoticeListItem extends Widge
          $user = common_current_user();
          if ($user) {
              if ($user->hasFave($this->notice)) {
--                common_disfavor_form($this->notice);
++              $disfavor = new DisfavorForm($this->out, $this->notice);
++              $disfavor->show();
              } else {
--                common_favor_form($this->notice);
++              $favor = new FavorForm($this->out, $this->notice);
++              $favor->show();
              }
          }
      }