From 259c76df98d6f702e1f26f1fb34929fe1bb757a9 Mon Sep 17 00:00:00 2001 From: Ian Date: Tue, 19 Jan 2016 20:27:30 +0100 Subject: [PATCH] add to 4cde8ac --- serendipity_event_page_nugget/ChangeLog | 5 +++ .../UTF-8/lang_bg.inc.php | 27 +++++++------- .../UTF-8/lang_cs.inc.php | 1 - .../UTF-8/lang_cz.inc.php | 1 - .../UTF-8/lang_de.inc.php | 7 ++-- .../UTF-8/lang_ko.inc.php | 27 +++++++------- serendipity_event_page_nugget/lang_bg.inc.php | 27 +++++++------- serendipity_event_page_nugget/lang_cs.inc.php | 1 - serendipity_event_page_nugget/lang_cz.inc.php | 1 - serendipity_event_page_nugget/lang_de.inc.php | 7 ++-- serendipity_event_page_nugget/lang_en.inc.php | 7 ++-- serendipity_event_page_nugget/lang_ko.inc.php | 27 +++++++------- .../serendipity_event_page_nugget.php | 35 ++++++++++++------- 13 files changed, 97 insertions(+), 76 deletions(-) diff --git a/serendipity_event_page_nugget/ChangeLog b/serendipity_event_page_nugget/ChangeLog index b5b3e86b..6621e172 100644 --- a/serendipity_event_page_nugget/ChangeLog +++ b/serendipity_event_page_nugget/ChangeLog @@ -1,3 +1,8 @@ +1.13: +----- +Add lang +Add new option for case bottom, closing a div class with certain templates + 1.12: ----- Add ability for "plaintext" markup diff --git a/serendipity_event_page_nugget/UTF-8/lang_bg.inc.php b/serendipity_event_page_nugget/UTF-8/lang_bg.inc.php index 86e980d8..592e8dea 100644 --- a/serendipity_event_page_nugget/UTF-8/lang_bg.inc.php +++ b/serendipity_event_page_nugget/UTF-8/lang_bg.inc.php @@ -1,4 +1,4 @@ - # (c) 2005 http://www.tool-box.info/ @@ -8,15 +8,16 @@ * EN-Revision: 1.1 */ - @define('PLUGIN_PAGE_NUGGET_NAME', 'HTML блок'); - @define('PLUGIN_PAGE_NUGGET_DESC', 'Поставя HTML блок на различни места в страницата или вътре в нейния HEAD таг'); - @define('PLUGIN_PAGE_NUGGET_PLACE', 'Място на блока'); - @define('PLUGIN_PAGE_NUGGET_HEAD', 'HEAD таг на страницата'); - @define('PLUGIN_PAGE_NUGGET_TOP', 'Над съдържанието'); - @define('PLUGIN_PAGE_NUGGET_ART_FOOT', 'Под статията'); - @define('PLUGIN_PAGE_NUGGET_BOTTOM', 'Под съдържанието'); - @define('PLUGIN_PAGE_NUGGET_FOOT', 'В края на страницата'); - @define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'Не е приложимо с опция HEAD таг. '); - @define('PLUGIN_PAGE_NUGGET_LANG', 'Език'); - @define('PLUGIN_PAGE_NUGGET_ALL', 'Всички езици'); - @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' (не се показва на действителната страница)'); +@define('PLUGIN_PAGE_NUGGET_NAME', 'HTML блок'); +@define('PLUGIN_PAGE_NUGGET_DESC', 'Поставя HTML блок на различни места в страницата или вътре в нейния HEAD таг'); +@define('PLUGIN_PAGE_NUGGET_PLACE', 'Място на блока'); +@define('PLUGIN_PAGE_NUGGET_HEAD', 'HEAD таг на страницата'); +@define('PLUGIN_PAGE_NUGGET_TOP', 'Над съдържанието'); +@define('PLUGIN_PAGE_NUGGET_ART_FOOT', 'Под статията'); +@define('PLUGIN_PAGE_NUGGET_BOTTOM', 'Под съдържанието'); +@define('PLUGIN_PAGE_NUGGET_FOOT', 'В края на страницата'); +@define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'Не е приложимо с опция HEAD таг. '); +@define('PLUGIN_PAGE_NUGGET_LANG', 'Език'); +@define('PLUGIN_PAGE_NUGGET_ALL', 'Всички езици'); +@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' (не се показва на действителната страница)'); + diff --git a/serendipity_event_page_nugget/UTF-8/lang_cs.inc.php b/serendipity_event_page_nugget/UTF-8/lang_cs.inc.php index aa847d8f..7a347f1b 100644 --- a/serendipity_event_page_nugget/UTF-8/lang_cs.inc.php +++ b/serendipity_event_page_nugget/UTF-8/lang_cs.inc.php @@ -18,4 +18,3 @@ @define('PLUGIN_PAGE_NUGGET_ALL', 'Všechny jazyky'); @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.'); -?> diff --git a/serendipity_event_page_nugget/UTF-8/lang_cz.inc.php b/serendipity_event_page_nugget/UTF-8/lang_cz.inc.php index aa847d8f..7a347f1b 100644 --- a/serendipity_event_page_nugget/UTF-8/lang_cz.inc.php +++ b/serendipity_event_page_nugget/UTF-8/lang_cz.inc.php @@ -18,4 +18,3 @@ @define('PLUGIN_PAGE_NUGGET_ALL', 'Všechny jazyky'); @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.'); -?> diff --git a/serendipity_event_page_nugget/UTF-8/lang_de.inc.php b/serendipity_event_page_nugget/UTF-8/lang_de.inc.php index 1978bbac..a345028c 100644 --- a/serendipity_event_page_nugget/UTF-8/lang_de.inc.php +++ b/serendipity_event_page_nugget/UTF-8/lang_de.inc.php @@ -1,4 +1,4 @@ - @@ -18,4 +18,7 @@ @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' (Wird nie auf Seite(n) angezeigt.)'); @define('PLUGIN_PAGE_NUGGET_RSS', 'In RSS/Atom-Feeds'); @define('PLUGIN_PAGE_NUGGET_CONTENT', 'Zusätzlich zu HTML-formatierten Inhalten kann hier jedes spezifische HTML-Markup angegeben werden. Es wird zusammen mit den oben angegebenen Inhalten ausgegeben. Man kann also entweder beide Inhaltsfelder oder nur eines von beiden ausfüllen. Dieses Inhaltsfeld ist besonders nützlich, wenn man einen WYSIWYG-Editor verwendet, da dieser bestimmte HTML-Elemente, die man vielleicht einfügen möchte, entfernen würde (wie z.B. das meta-Element).'); -?> + +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV', 'Schließe "div" bei Auswahl: "Am Ende des Seiteninhalts"?'); +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV_DESC', 'Schließt vorher eine eventuell vorhandene
Klasse für bestimmte "ältere" Templates.'); + diff --git a/serendipity_event_page_nugget/UTF-8/lang_ko.inc.php b/serendipity_event_page_nugget/UTF-8/lang_ko.inc.php index 113b4772..01fec205 100644 --- a/serendipity_event_page_nugget/UTF-8/lang_ko.inc.php +++ b/serendipity_event_page_nugget/UTF-8/lang_ko.inc.php @@ -1,18 +1,17 @@ - # (c) 2005 http://www.tool-box.info/ - @define('PLUGIN_PAGE_NUGGET_NAME', '페이지에 HTML 덩어리 넣기'); - @define('PLUGIN_PAGE_NUGGET_DESC', 'HTML 덩어리를 페이지 꼭대기 또는 밑바닥에 넣거나 페이지의 HEAD 태그 속에 넣음'); - @define('PLUGIN_PAGE_NUGGET_PLACE', '덩어리 위치'); - @define('PLUGIN_PAGE_NUGGET_HEAD', '페이지의 HEAD 태그'); - @define('PLUGIN_PAGE_NUGGET_TOP', '내용 꼭대기'); - @define('PLUGIN_PAGE_NUGGET_ART_FOOT', '글 끝부분'); - @define('PLUGIN_PAGE_NUGGET_BOTTOM', '내용 밑바닥'); - @define('PLUGIN_PAGE_NUGGET_FOOT', '페이지 끝부분'); - @define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'HEAD 태그 옵션을 쓸 경우 적용되지 않습니다. '); - @define('PLUGIN_PAGE_NUGGET_LANG', '언어 선택'); - @define('PLUGIN_PAGE_NUGGET_ALL', '모든 언어'); - @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' 페이지에는 실제로 나타나지 않습니다.'); +@define('PLUGIN_PAGE_NUGGET_NAME', '페이지에 HTML 덩어리 넣기'); +@define('PLUGIN_PAGE_NUGGET_DESC', 'HTML 덩어리를 페이지 꼭대기 또는 밑바닥에 넣거나 페이지의 HEAD 태그 속에 넣음'); +@define('PLUGIN_PAGE_NUGGET_PLACE', '덩어리 위치'); +@define('PLUGIN_PAGE_NUGGET_HEAD', '페이지의 HEAD 태그'); +@define('PLUGIN_PAGE_NUGGET_TOP', '내용 꼭대기'); +@define('PLUGIN_PAGE_NUGGET_ART_FOOT', '글 끝부분'); +@define('PLUGIN_PAGE_NUGGET_BOTTOM', '내용 밑바닥'); +@define('PLUGIN_PAGE_NUGGET_FOOT', '페이지 끝부분'); +@define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'HEAD 태그 옵션을 쓸 경우 적용되지 않습니다. '); +@define('PLUGIN_PAGE_NUGGET_LANG', '언어 선택'); +@define('PLUGIN_PAGE_NUGGET_ALL', '모든 언어'); +@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' 페이지에는 실제로 나타나지 않습니다.'); -?> \ No newline at end of file diff --git a/serendipity_event_page_nugget/lang_bg.inc.php b/serendipity_event_page_nugget/lang_bg.inc.php index ad90f85f..c09052dd 100644 --- a/serendipity_event_page_nugget/lang_bg.inc.php +++ b/serendipity_event_page_nugget/lang_bg.inc.php @@ -1,4 +1,4 @@ - # (c) 2005 http://www.tool-box.info/ @@ -8,15 +8,16 @@ * EN-Revision: 1.1 */ - @define('PLUGIN_PAGE_NUGGET_NAME', 'HTML '); - @define('PLUGIN_PAGE_NUGGET_DESC', ' HTML HEAD '); - @define('PLUGIN_PAGE_NUGGET_PLACE', ' '); - @define('PLUGIN_PAGE_NUGGET_HEAD', 'HEAD '); - @define('PLUGIN_PAGE_NUGGET_TOP', ' '); - @define('PLUGIN_PAGE_NUGGET_ART_FOOT', ' '); - @define('PLUGIN_PAGE_NUGGET_BOTTOM', ' '); - @define('PLUGIN_PAGE_NUGGET_FOOT', ' '); - @define('PLUGIN_PAGE_NUGGET_MARKUP_NO', ' HEAD . '); - @define('PLUGIN_PAGE_NUGGET_LANG', ''); - @define('PLUGIN_PAGE_NUGGET_ALL', ' '); - @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' ( )'); +@define('PLUGIN_PAGE_NUGGET_NAME', 'HTML '); +@define('PLUGIN_PAGE_NUGGET_DESC', ' HTML HEAD '); +@define('PLUGIN_PAGE_NUGGET_PLACE', ' '); +@define('PLUGIN_PAGE_NUGGET_HEAD', 'HEAD '); +@define('PLUGIN_PAGE_NUGGET_TOP', ' '); +@define('PLUGIN_PAGE_NUGGET_ART_FOOT', ' '); +@define('PLUGIN_PAGE_NUGGET_BOTTOM', ' '); +@define('PLUGIN_PAGE_NUGGET_FOOT', ' '); +@define('PLUGIN_PAGE_NUGGET_MARKUP_NO', ' HEAD . '); +@define('PLUGIN_PAGE_NUGGET_LANG', ''); +@define('PLUGIN_PAGE_NUGGET_ALL', ' '); +@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' ( )'); + diff --git a/serendipity_event_page_nugget/lang_cs.inc.php b/serendipity_event_page_nugget/lang_cs.inc.php index 8dfcfb4b..2d33e4dc 100644 --- a/serendipity_event_page_nugget/lang_cs.inc.php +++ b/serendipity_event_page_nugget/lang_cs.inc.php @@ -18,4 +18,3 @@ @define('PLUGIN_PAGE_NUGGET_ALL', 'Vechny jazyky'); @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuln strnce.'); -?> diff --git a/serendipity_event_page_nugget/lang_cz.inc.php b/serendipity_event_page_nugget/lang_cz.inc.php index f251fa08..e0f40031 100644 --- a/serendipity_event_page_nugget/lang_cz.inc.php +++ b/serendipity_event_page_nugget/lang_cz.inc.php @@ -18,4 +18,3 @@ @define('PLUGIN_PAGE_NUGGET_ALL', 'Vechny jazyky'); @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuln strnce.'); -?> diff --git a/serendipity_event_page_nugget/lang_de.inc.php b/serendipity_event_page_nugget/lang_de.inc.php index f3cb423f..f405f938 100644 --- a/serendipity_event_page_nugget/lang_de.inc.php +++ b/serendipity_event_page_nugget/lang_de.inc.php @@ -1,4 +1,4 @@ - @@ -18,4 +18,7 @@ @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' (Wird nie auf Seite(n) angezeigt.)'); @define('PLUGIN_PAGE_NUGGET_RSS', 'In RSS/Atom-Feeds'); @define('PLUGIN_PAGE_NUGGET_CONTENT', 'Zustzlich zu HTML-formatierten Inhalten kann hier jedes spezifische HTML-Markup angegeben werden. Es wird zusammen mit den oben angegebenen Inhalten ausgegeben. Man kann also entweder beide Inhaltsfelder oder nur eines von beiden ausfllen. Dieses Inhaltsfeld ist besonders ntzlich, wenn man einen WYSIWYG-Editor verwendet, da dieser bestimmte HTML-Elemente, die man vielleicht einfgen mchte, entfernen wrde (wie z.B. das meta-Element).'); -?> + +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV', 'Schliee "div" bei Auswahl: "Am Ende des Seiteninhalts"?'); +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV_DESC', 'Schliet vorher eine eventuell vorhandene
Klasse fr bestimmte "ltere" Templates.'); + diff --git a/serendipity_event_page_nugget/lang_en.inc.php b/serendipity_event_page_nugget/lang_en.inc.php index b810ca9a..985717b2 100644 --- a/serendipity_event_page_nugget/lang_en.inc.php +++ b/serendipity_event_page_nugget/lang_en.inc.php @@ -1,4 +1,4 @@ - + +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV', 'Close "div" for case "Bottom of the content"?'); +@define('PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV_DESC', 'Get out of a possible
class for certain "older" templates'); + diff --git a/serendipity_event_page_nugget/lang_ko.inc.php b/serendipity_event_page_nugget/lang_ko.inc.php index 113b4772..01fec205 100644 --- a/serendipity_event_page_nugget/lang_ko.inc.php +++ b/serendipity_event_page_nugget/lang_ko.inc.php @@ -1,18 +1,17 @@ - # (c) 2005 http://www.tool-box.info/ - @define('PLUGIN_PAGE_NUGGET_NAME', '페이지에 HTML 덩어리 넣기'); - @define('PLUGIN_PAGE_NUGGET_DESC', 'HTML 덩어리를 페이지 꼭대기 또는 밑바닥에 넣거나 페이지의 HEAD 태그 속에 넣음'); - @define('PLUGIN_PAGE_NUGGET_PLACE', '덩어리 위치'); - @define('PLUGIN_PAGE_NUGGET_HEAD', '페이지의 HEAD 태그'); - @define('PLUGIN_PAGE_NUGGET_TOP', '내용 꼭대기'); - @define('PLUGIN_PAGE_NUGGET_ART_FOOT', '글 끝부분'); - @define('PLUGIN_PAGE_NUGGET_BOTTOM', '내용 밑바닥'); - @define('PLUGIN_PAGE_NUGGET_FOOT', '페이지 끝부분'); - @define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'HEAD 태그 옵션을 쓸 경우 적용되지 않습니다. '); - @define('PLUGIN_PAGE_NUGGET_LANG', '언어 선택'); - @define('PLUGIN_PAGE_NUGGET_ALL', '모든 언어'); - @define('PLUGIN_PAGE_NUGGET_NOSHOW', ' 페이지에는 실제로 나타나지 않습니다.'); +@define('PLUGIN_PAGE_NUGGET_NAME', '페이지에 HTML 덩어리 넣기'); +@define('PLUGIN_PAGE_NUGGET_DESC', 'HTML 덩어리를 페이지 꼭대기 또는 밑바닥에 넣거나 페이지의 HEAD 태그 속에 넣음'); +@define('PLUGIN_PAGE_NUGGET_PLACE', '덩어리 위치'); +@define('PLUGIN_PAGE_NUGGET_HEAD', '페이지의 HEAD 태그'); +@define('PLUGIN_PAGE_NUGGET_TOP', '내용 꼭대기'); +@define('PLUGIN_PAGE_NUGGET_ART_FOOT', '글 끝부분'); +@define('PLUGIN_PAGE_NUGGET_BOTTOM', '내용 밑바닥'); +@define('PLUGIN_PAGE_NUGGET_FOOT', '페이지 끝부분'); +@define('PLUGIN_PAGE_NUGGET_MARKUP_NO', 'HEAD 태그 옵션을 쓸 경우 적용되지 않습니다. '); +@define('PLUGIN_PAGE_NUGGET_LANG', '언어 선택'); +@define('PLUGIN_PAGE_NUGGET_ALL', '모든 언어'); +@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' 페이지에는 실제로 나타나지 않습니다.'); -?> \ No newline at end of file diff --git a/serendipity_event_page_nugget/serendipity_event_page_nugget.php b/serendipity_event_page_nugget/serendipity_event_page_nugget.php index ab29d5ad..d0a89183 100644 --- a/serendipity_event_page_nugget/serendipity_event_page_nugget.php +++ b/serendipity_event_page_nugget/serendipity_event_page_nugget.php @@ -1,4 +1,4 @@ - true, 'frontend_footer' => true, 'frontend_display' => true)); - $propbag->add('configuration', array('title', 'placement', 'language', 'content', 'content_plain', 'markup', 'show_where')); + $propbag->add('configuration', array('title', 'placement', 'language', 'content', 'content_plain', 'footer_close', 'markup', 'show_where')); } function introspect_config_item($name, &$propbag) @@ -111,6 +111,13 @@ class serendipity_event_page_nugget extends serendipity_event $propbag->add('default', ''); break; + case 'footer_close': + $propbag->add('type', 'boolean'); + $propbag->add('name', PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV); + $propbag->add('description', PLUGIN_PAGE_NUGGET_CLOSE_FOOTER_DIV_DESC); + $propbag->add('default', 'true'); + break; + case 'markup': $propbag->add('type', 'boolean'); $propbag->add('name', DO_MARKUP); @@ -151,7 +158,7 @@ class serendipity_event_page_nugget extends serendipity_event // RSS-Feed special case if ($event == 'frontend_display' && $addData['from'] == 'functions_entries:printEntries_rss') { if ($placement == 'rss') { - if ($this->get_config('markup', 'true') == 'true' && $event != 'frontend_header') { + if (serendipity_db_bool($this->get_config('markup', 'true')) && $event != 'frontend_header') { $entry = array('html_nugget' => $this->get_config('content')); serendipity_plugin_api::hook_event('frontend_display', $entry); $eventData['body'] .= $entry['html_nugget'] . $this->get_config('content_plain'); @@ -170,14 +177,16 @@ class serendipity_event_page_nugget extends serendipity_event return false; } - if (($placement == 'head' && $event == 'frontend_header') || - ($placement == 'top' && $event == 'entries_header') || + if (($placement == 'head' && $event == 'frontend_header') || + ($placement == 'top' && $event == 'entries_header') || ($placement == 'bottom' && $event == 'entries_footer') || - ($placement == 'foot' && $event == 'frontend_footer')){ + ($placement == 'foot' && $event == 'frontend_footer')) { // entries_footer hook location workaround: get out of the 'serendipity_entryFooter' class - if ($event == 'entries_footer') echo '
'; + if (serendipity_db_bool($this->get_config('footer_close', 'true')) && $event == 'entries_footer') { + echo "\n
\n
\n"; + } // if not for HEAD, apply markup? - if ($this->get_config('markup', 'true') == 'true' && $event != 'frontend_header') { + if (serendipity_db_bool($this->get_config('markup', 'true')) && $event != 'frontend_header') { $entry = array('html_nugget' => $this->get_config('content')); serendipity_plugin_api::hook_event('frontend_display', $entry); echo $entry['html_nugget'] . $this->get_config('content_plain'); @@ -185,16 +194,16 @@ class serendipity_event_page_nugget extends serendipity_event echo $this->get_config('content') . $this->get_config('content_plain'); } return true; - } elseif ($placement == 'art_foot' && $event == 'entry_display'){ + } elseif ($placement == 'art_foot' && $event == 'entry_display') { if (!is_array($eventData)) return false; $elements = count($eventData); for ($i = 0; $i < $elements; $i++) { - if ($this->get_config('markup', 'true') == 'true') { + if (serendipity_db_bool($this->get_config('markup', 'true'))) { $entry = array('html_nugget' => $this->get_config('content')); serendipity_plugin_api::hook_event('frontend_display', $entry); - $eventData[$i]['add_footer'] .= sprintf('
' . $entry['html_nugget'] . $this->get_config('content_plain') . '
'); + $eventData[$i]['add_footer'] .= sprintf("\n
\n" . $entry['html_nugget'] . $this->get_config('content_plain') . "\n
\n"); } else { - $eventData[$i]['add_footer'] .= sprintf('
' . $this->get_config('content') . $this->get_config('content_plain') . '
'); + $eventData[$i]['add_footer'] .= sprintf("\n
\n" . $this->get_config('content') . $this->get_config('content_plain') . "\n
\n"); } } } else { @@ -202,3 +211,5 @@ class serendipity_event_page_nugget extends serendipity_event } } } + +?> \ No newline at end of file