From 4a2aebe5cfab4a4b0388f98b296eac66be6e3396 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 19:24:07 +0000 Subject: [PATCH 1/6] Minor: Including formData()'s inreplyto in action check --- lib/noticeform.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/noticeform.php b/lib/noticeform.php index 9bc5e0d6a3..84817639a7 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'); - } /** From d8f9628a17d5739182fdab92bf9e5202310d89f5 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 19:33:45 +0000 Subject: [PATCH 2/6] Using a specific path for CSS files. --- lib/action.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/action.php b/lib/action.php index 30a3c8a031..cc00699c4f 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'))) { From edf84cca041be956d8a8ac02d4542e9d835e42c9 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:10:20 +0000 Subject: [PATCH 3/6] showSiteNotice() was missing closing dl tag --- lib/action.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/action.php b/lib/action.php index 9ba9f36fc0..5f6c600b13 100644 --- a/lib/action.php +++ b/lib/action.php @@ -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???? From 7bb074898f0be7e606eeb9844adcba001c571b38 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:15:11 +0000 Subject: [PATCH 4/6] Up to date --- theme/base/css/display.css | 3 ++- theme/identica/css/display.css | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/theme/base/css/display.css b/theme/base/css/display.css index 5fc24779bb..8b2e2f801e 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 4659c7f2ae..f6a4747c74 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); } From 186783f45bccf604c295bf0bfafd02637d10b473 Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:20:03 +0000 Subject: [PATCH 5/6] Missing end dl tag for showPageNotice() --- lib/action.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/action.php b/lib/action.php index 4b9db46525..4d2aa02e2c 100644 --- a/lib/action.php +++ b/lib/action.php @@ -321,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 From c08eadc774c2231e6b434ba067e2d7115404606f Mon Sep 17 00:00:00 2001 From: sarven Date: Thu, 15 Jan 2009 20:24:41 +0000 Subject: [PATCH 6/6] HTML update to showSecondaryNav() --- lib/action.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/action.php b/lib/action.php index 4d2aa02e2c..52eee6d6ab 100644 --- a/lib/action.php +++ b/lib/action.php @@ -364,7 +364,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')), @@ -378,6 +381,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()