diff options
| -rw-r--r-- | lib/action.php | 14 | ||||
| -rw-r--r-- | lib/disfavorform.php | 12 | ||||
| -rw-r--r-- | lib/favorform.php | 11 | ||||
| -rw-r--r-- | lib/form.php | 12 | ||||
| -rw-r--r-- | lib/noticeform.php | 4 | ||||
| -rw-r--r-- | lib/noticelist.php | 6 | ||||
| -rw-r--r-- | theme/base/css/display.css | 3 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 8 |
8 files changed, 56 insertions, 14 deletions
diff --git a/lib/action.php b/lib/action.php index 057b4a19a..4a164d8b0 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'))) { @@ -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() diff --git a/lib/disfavorform.php b/lib/disfavorform.php index 25f99f43c..ffca0cd8b 100644 --- a/lib/disfavorform.php +++ b/lib/disfavorform.php @@ -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 diff --git a/lib/favorform.php b/lib/favorform.php index c67e18697..4f4fd72a9 100644 --- a/lib/favorform.php +++ b/lib/favorform.php @@ -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 diff --git a/lib/form.php b/lib/form.php index 5c75bb65f..bd68fb0c5 100644 --- a/lib/form.php +++ b/lib/form.php @@ -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'; + } } diff --git a/lib/noticeform.php b/lib/noticeform.php index 9bc5e0d6a..84817639a 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'); - } /** diff --git a/lib/noticelist.php b/lib/noticelist.php index fb3e66f9f..0fc6d513f 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -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(); } } } diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5fc24779b..8b2e2f801 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 4659c7f2a..f6a4747c7 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); } |