diff options
| -rw-r--r-- | lib/action.php | 8 | ||||
| -rw-r--r-- | lib/noticeform.php | 4 | ||||
| -rw-r--r-- | theme/base/css/display.css | 3 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 8 |
4 files changed, 12 insertions, 11 deletions
diff --git a/lib/action.php b/lib/action.php index 4f0b0def1..4d2aa02e2 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'))) { @@ -271,6 +271,7 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('dd', null); // Output a bunch of paragraphs here $this->elementEnd('dd'); + $this->elementEnd('dl'); } // MAY overload if no notice form needed... or direct message box???? @@ -320,6 +321,7 @@ class Action extends HTMLOutputter // lawsuit $this->elementStart('dd', null); // Output a bunch of paragraphs here $this->elementEnd('dd'); + $this->elementEnd('dl'); } // MUST overload 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/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); } |