This commit is contained in:
Ian 2016-01-19 20:27:30 +01:00
parent 4cde8ac427
commit 259c76df98
13 changed files with 97 additions and 76 deletions

View file

@ -1,3 +1,8 @@
1.13:
-----
Add lang <de>
Add new option for case bottom, closing a div class with certain templates
1.12:
-----
Add ability for "plaintext" markup

View file

@ -1,4 +1,4 @@
<?php #
<?php
# Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
# (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', ' (не се показва на действителната страница)');

View file

@ -18,4 +18,3 @@
@define('PLUGIN_PAGE_NUGGET_ALL', 'Všechny jazyky');
@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.');
?>

View file

@ -18,4 +18,3 @@
@define('PLUGIN_PAGE_NUGGET_ALL', 'Všechny jazyky');
@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.');
?>

View file

@ -1,4 +1,4 @@
<?php #
<?php
/**
* @author Matthias Mees <mm@yellowled.de>
@ -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 <div class="serendipity_entryFooter"> Klasse für bestimmte "ältere" Templates.');

View file

@ -1,18 +1,17 @@
<?php #
<?php
# Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
# (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', ' 페이지에는 실제로 나타나지 않습니다.');
?>

View file

@ -1,4 +1,4 @@
<?php #
<?php
# Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
# (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', ' (íå ñå ïîêàçâà íà äåéñòâèòåëíàòà ñòðàíèöà)');

View file

@ -18,4 +18,3 @@
@define('PLUGIN_PAGE_NUGGET_ALL', 'Všechny jazyky');
@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.');
?>

View file

@ -18,4 +18,3 @@
@define('PLUGIN_PAGE_NUGGET_ALL', 'V¹echny jazyky');
@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' Nezobrazuje se na aktuální stránce.');
?>

View file

@ -1,4 +1,4 @@
<?php #
<?php
/**
* @author Matthias Mees <mm@yellowled.de>
@ -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 <div class="serendipity_entryFooter"> Klasse für bestimmte "ältere" Templates.');

View file

@ -1,4 +1,4 @@
<?php #
<?php
/**
* @version
@ -20,4 +20,7 @@
@define('PLUGIN_PAGE_NUGGET_NOSHOW', ' It does not show up on the actual page.');
@define('PLUGIN_PAGE_NUGGET_RSS', 'RSS/Atom feeds');
@define('PLUGIN_PAGE_NUGGET_CONTENT', 'On top of the HTML-formatted content, you can also add any specific HTML markup here. This will be emitted additionally to the content above, so you can either fill out both contents, or only one of them. This content area is specifically helpful if you are using a WYSIWYG-Editor which would otherwise strip out specific HTML tags (like META tags) you might want to add.');
?>
@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 <div class="serendipity_entryFooter"> class for certain "older" templates');

View file

@ -1,18 +1,17 @@
<?php #
<?php
# Translated by: Wesley Hwang-Chung <wesley96@gmail.com>
# (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', ' 페이지에는 실제로 나타나지 않습니다.');
?>

View file

@ -1,4 +1,4 @@
<?php #
<?php
if (IN_serendipity !== true) {
die ("Don't hack!");
@ -36,7 +36,7 @@ class serendipity_event_page_nugget extends serendipity_event
'entries_footer' => 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 '</div><div>';
if (serendipity_db_bool($this->get_config('footer_close', 'true')) && $event == 'entries_footer') {
echo "\n</div>\n<div>\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('</div>' . $entry['html_nugget'] . $this->get_config('content_plain') . '<div>');
$eventData[$i]['add_footer'] .= sprintf("\n</div>\n" . $entry['html_nugget'] . $this->get_config('content_plain') . "\n<div>\n");
} else {
$eventData[$i]['add_footer'] .= sprintf('</div>' . $this->get_config('content') . $this->get_config('content_plain') . '<div>');
$eventData[$i]['add_footer'] .= sprintf("\n</div>\n" . $this->get_config('content') . $this->get_config('content_plain') . "\n<div>\n");
}
}
} else {
@ -202,3 +211,5 @@ class serendipity_event_page_nugget extends serendipity_event
}
}
}
?>