We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 7233e89b authored by Evan Prodromou's avatar Evan Prodromou

Merge ../csarven into uiredesign

Conflicts:

	lib/action.php
parents c42b8830 c08eadc7
......@@ -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'))) {
......@@ -324,6 +324,7 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dd', null);
// Output a bunch of paragraphs here
$this->elementEnd('dd');
$this->elementEnd('dl');
}
// MUST overload
......@@ -366,7 +367,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')),
......@@ -380,6 +384,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()
......
......@@ -127,4 +127,16 @@ class DisfavorForm extends Form
$this->out->submit('disfavor-submit-' . $this->notice->id,
_('Disfavor favorite'));
}
/**
* Class of the form.
*
* @return string the form's class
*/
function formClass()
{
return 'disfavor';
}
}
\ No newline at end of file
......@@ -127,4 +127,15 @@ class FavorForm extends Form
$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';
}
}
\ No newline at end of file
......@@ -65,6 +65,7 @@ class Form extends Widget
{
$this->out->elementStart('form',
array('id' => $this->id(),
'class' => $this->formClass(),
'method' => 'POST',
'action' => $this->action()));
$this->out->elementStart('fieldset');
......@@ -153,4 +154,15 @@ class Form extends Widget
function action()
{
}
/**
* Class of the form.
*
* @return string the form's class
*/
function formClass()
{
return 'form';
}
}
......@@ -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');
}
/**
......
......@@ -229,9 +229,11 @@ class NoticeListItem extends Widget
$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();
}
}
}
......
......@@ -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;
}
......
......@@ -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);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment