summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-01-20 19:18:02 -0800
committerZach Copley <zach@controlyourself.ca>2009-01-20 19:18:02 -0800
commitd6da9779f7e24136a255808e36501129ed0c1c1f (patch)
tree620e1af584c6297cf7b0635c8b96a9ae26bf5fb6
parent61850ceb5575c0fab8bd70bbe924543b09a2d765 (diff)
parente9b9795eeb30837ddddd980eaea9d11c055cb843 (diff)
Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk
-rw-r--r--actions/disfavor.php5
-rw-r--r--actions/favor.php4
-rw-r--r--theme/base/css/display.css6
3 files changed, 10 insertions, 5 deletions
diff --git a/actions/disfavor.php b/actions/disfavor.php
index 3e3e4a547..d4a189d19 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 afda93cff..92756366d 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 f0bf6bfc1..d2480be14 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 {