Merge branch 'master' of ssh://zach@dev.controlyourself.ca/var/www/trunk

This commit is contained in:
Zach Copley 2009-01-20 19:18:02 -08:00
commit d6da9779f7
3 changed files with 10 additions and 5 deletions

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {