diff --git a/admin/panels/entry/admin.entry.write.tpl b/admin/panels/entry/admin.entry.write.tpl index 6d78171..4d4e575 100755 --- a/admin/panels/entry/admin.entry.write.tpl +++ b/admin/panels/entry/admin.entry.write.tpl @@ -1,108 +1,102 @@

{$panelstrings.head}

- - {include file='shared:errorlist.tpl'} + + {include file="shared:errorlist.tpl"} {entry_block}
{if isset($preview)} -
{$panelstrings.preview} - {include file="preview.tpl"} -
+
{$panelstrings.preview} + {include file="preview.tpl"} +
{/if}
- {html_form} {if !isset($post)} {assign var=post value=""} {/if} {entry content=$post alwaysshow=true} - +
-


+


{if isset($error) && isset($error.subject) && !empty($error.subject)} {assign var=class value="field-error"} {else} {assign var=class value=""} {/if} -
- - +
+ +

- +

- {toolbar} + {if function_exists('plugin_bbcode_init')} + {include file="plugin:bbcode/toolbar"} + {/if}

-
- {*here will go a plugin hook*} - {action hook=simple_edit_form} - {action hook=simple_metatag_info} - + {if isset($error) && isset($error.content) && !empty($error.content)} + {assign var=class value="field-error"} + {else} + {assign var=class value=""} + {/if} +

+ {* here will go a plugin hook *} + {action hook=simple_edit_form} + {action hook=simple_metatag_info}
- +
- + {* let's disable this for now... *} - + {* -
{$panelstrings.uploader}
*} - + {* end of inline form *} - +
{$panelstrings.categories} {list_categories type=form selected=$categories}
- +
{$panelstrings.saveopts} -

{foreach from=$saved_flags item=flag} -
+
{/foreach}

-
- - +
{html_submit name="save" id="save" value=$panelstrings.submit accesskey=s} {html_submit name="savecontinue" id="savecontinue" value=$panelstrings.savecontinue accesskey=c} {html_submit name="preview" id="preview" value=$panelstrings.preview accesskey=p}
- {/entry} {/html_form} {/entry_block} -{if isset($smarty.get.entry) } +{if isset($smarty.get.entry)} -
- -

{$panelstrings.otheropts}

-
{/if} - - - diff --git a/admin/panels/static/admin.static.write.tpl b/admin/panels/static/admin.static.write.tpl index 0a55980..a4dd3ca 100755 --- a/admin/panels/static/admin.static.write.tpl +++ b/admin/panels/static/admin.static.write.tpl @@ -1,36 +1,40 @@

{$panelstrings.head}

- {include file="shared:errorlist.tpl"} + {include file="shared:errorlist.tpl"} {static_block} +
{if isset($preview)}
{$panelstrings.preview} {include file="previewstatic.tpl"}
{/if} +
-{html_form} - +{html_form} {if !isset($post)} {assign var=post value=""} {/if} - {static content=$post alwaysshow=true} + {static content=$post alwaysshow=true} -


+

+


{if isset($error) && isset($error.subject) && !empty($error.subject)} {assign var=class value="field-error"} {else} {assign var=class value=""} {/if}
- + value="{$subject|default:$smarty.request.subject|default:{$smarty.request.page|default:''}|wp_specialchars:1}">
+

- +

- {toolbar} + {if function_exists('plugin_bbcode_init')} + {include file="plugin:bbcode/toolbar"} + {/if}

{if isset($error) && isset($error.content) && !empty($error.content)} {assign var=class value="field-error"} @@ -38,35 +42,31 @@ {assign var=class value=""} {/if}
- {*here will go a plugin hook*} - {action hook=simple_metatag_info} + rows="20" cols="74">{$content|default:{$smarty.request.content|default:''}|htmlspecialchars}

- + {* here will go a plugin hook *} + {action hook=simple_metatag_info} +
+
{$panelstrings.fieldset2} - -


+ +


{if isset($error) && isset($error.id) && !empty($error.id)} {assign var=class value="field-error"} {else} {assign var=class value=""} {/if} -

- {html_submit name="save" id="save" value=$panelstrings.submit accesskey=s} - {html_submit name="preview" id="preview" value=$panelstrings.preview accesskey=p} - +

- +
+ {html_submit name="save" id="save" value=$panelstrings.submit accesskey=s} + {html_submit name="preview" id="preview" value=$panelstrings.preview accesskey=p} +
+ {/static} {/html_form} {/static_block} - - - - - - diff --git a/fp-interface/themes/leggero/cpheader.tpl b/fp-interface/themes/leggero/cpheader.tpl index 683353b..fa5682f 100644 --- a/fp-interface/themes/leggero/cpheader.tpl +++ b/fp-interface/themes/leggero/cpheader.tpl @@ -1,8 +1,8 @@ - + {$flatpress.title}{$pagetitle} - + {action hook=wp_head} {action hook=admin_head} diff --git a/fp-plugins/bbcode/plugin.bbcode.php b/fp-plugins/bbcode/plugin.bbcode.php index 54220f8..e00277e 100644 --- a/fp-plugins/bbcode/plugin.bbcode.php +++ b/fp-plugins/bbcode/plugin.bbcode.php @@ -46,7 +46,8 @@ function plugin_bbcode_startup() { add_filter('the_content', 'plugin_bbcode_undoHtml', 30); if (BBCODE_USE_EDITOR) { // initialize the toolbar - add_filter('editor_toolbar', 'plugin_bbcode_init_toolbar'); + add_filter('editor_toolbar', 'plugin_bbcode_toolbar'); + plugin_bbcode_init_toolbar(); } if (BBCODE_ENABLE_COMMENTS) { add_filter('comment_text', 'plugin_bbcode_comment', 1); @@ -807,8 +808,6 @@ function plugin_bbcode_init_toolbar() { sort($attachslist); array_unshift($attachslist, $selection); $_FP_SMARTY->assign('attachs_list', $attachslist); - - echo $_FP_SMARTY->fetch('plugin:bbcode/toolbar'); } /** diff --git a/fp-plugins/seometataginfo/lang/lang.cs-cz.php b/fp-plugins/seometataginfo/lang/lang.cs-cz.php index aa874c8..f301284 100644 --- a/fp-plugins/seometataginfo/lang/lang.cs-cz.php +++ b/fp-plugins/seometataginfo/lang/lang.cs-cz.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress související články, průvodci a pluginy', 'input_keywords' => 'Vložte klíčová slova:', 'sample_keywords' => 'flatpress, flatpress články, flatpress průvodci, flatpress pluginy', - 'input_noindex' => 'Zakázat indexování (noindex):', - 'input_nofollow' => 'Zakázat sledování (nofollow):', - 'input_noarchive' => 'Zakázat archivaci (noarchive):', - 'input_nosnippet' => 'Zakázat úryvky (nosnippet):' + 'input_noindex' => 'Zakázat indexování:', + 'input_nofollow' => 'Zakázat sledování:', + 'input_noarchive' => 'Zakázat archivaci:', + 'input_nosnippet' => 'Zakázat úryvky:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.da-dk.php b/fp-plugins/seometataginfo/lang/lang.da-dk.php index 693dc8c..55806ae 100644 --- a/fp-plugins/seometataginfo/lang/lang.da-dk.php +++ b/fp-plugins/seometataginfo/lang/lang.da-dk.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress-relaterede artikler, vejledninger og plugins', 'input_keywords' => 'Indsæt nøgleordene:', 'sample_keywords' => 'flatpress, flatpress-artikler, flatpress-guider, flatpress-plugins', - 'input_noindex' => 'Forbyd indeksering (noindex):', - 'input_nofollow' => 'Forbyd at følge links (nofollow):', - 'input_noarchive' => 'Forbyd arkivering (noarchive):', - 'input_nosnippet' => 'Forbyd udskæringer (nosnippet):' + 'input_noindex' => 'Forbyd indeksering:', + 'input_nofollow' => 'Forbyd at følge links:', + 'input_noarchive' => 'Forbyd arkivering:', + 'input_nosnippet' => 'Forbyd udskæringer:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.de-de.php b/fp-plugins/seometataginfo/lang/lang.de-de.php index 1b9b45a..3dddca4 100644 --- a/fp-plugins/seometataginfo/lang/lang.de-de.php +++ b/fp-plugins/seometataginfo/lang/lang.de-de.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress-bezogene Artikel, Anleitungen und Plugins', 'input_keywords' => 'Füge die Schlüsselwörter ein:', 'sample_keywords' => 'flatpress, flatpress artikel, flatpress anleitungen, flatpress plugins', - 'input_noindex' => 'Indizieren verbieten (noindex):', - 'input_nofollow' => 'Link-Following verbieten (nofollow):', - 'input_noarchive' => 'Archivierung verbieten (noarchive):', - 'input_nosnippet' => 'Ausschnitte verbieten (nosnippet):' + 'input_noindex' => 'Indizieren verbieten:', + 'input_nofollow' => 'Link-Following verbieten:', + 'input_noarchive' => 'Archivierung verbieten:', + 'input_nosnippet' => 'Ausschnitte verbieten:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.el-gr.php b/fp-plugins/seometataginfo/lang/lang.el-gr.php index 265ec04..a1db835 100644 --- a/fp-plugins/seometataginfo/lang/lang.el-gr.php +++ b/fp-plugins/seometataginfo/lang/lang.el-gr.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress σχετικά άρθρα, οδηγοί και plugins', 'input_keywords' => 'Εισάγετε τις λέξεις-κλειδιά:', 'sample_keywords' => 'flatpress, flatpress άρθρα, flatpress οδηγοί, flatpress πρόσθετα', - 'input_noindex' => 'Απαγόρευση ευρετηρίασης (noindex):', - 'input_nofollow' => 'Απαγόρευση της παρακολούθησης (nofollow):', - 'input_noarchive' => 'Απαγόρευση αρχειοθέτησης (noarchive):', - 'input_nosnippet' => 'Απαγόρευση αποσπασμάτων (nosnippet):' + 'input_noindex' => 'Απαγόρευση ευρετηρίασης:', + 'input_nofollow' => 'Απαγόρευση της παρακολούθησης:', + 'input_noarchive' => 'Απαγόρευση αρχειοθέτησης:', + 'input_nosnippet' => 'Απαγόρευση αποσπασμάτων:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.en-us.php b/fp-plugins/seometataginfo/lang/lang.en-us.php index d898f98..d16699c 100644 --- a/fp-plugins/seometataginfo/lang/lang.en-us.php +++ b/fp-plugins/seometataginfo/lang/lang.en-us.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress related articles, guides and plugins', 'input_keywords' => 'Insert the keywords:', 'sample_keywords' => 'flatpress, flatpress articles, flatpress guides, flatpress plugins', - 'input_noindex' => 'Disallow Indexing (noindex):', - 'input_nofollow' => 'Disallow Following (nofollow):', - 'input_noarchive' => 'Disallow Archiving (noarchive):', - 'input_nosnippet' => 'Disallow snippets (nosnippet):' + 'input_noindex' => 'Disallow Indexing:', + 'input_nofollow' => 'Disallow Following:', + 'input_noarchive' => 'Disallow Archiving:', + 'input_nosnippet' => 'Disallow snippets:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.es-es.php b/fp-plugins/seometataginfo/lang/lang.es-es.php index db407a7..6bfd259 100644 --- a/fp-plugins/seometataginfo/lang/lang.es-es.php +++ b/fp-plugins/seometataginfo/lang/lang.es-es.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress artículos relacionados, guías y plugins', 'input_keywords' => 'Introduzca las palabras clave:', 'sample_keywords' => 'flatpress, flatpress artículos, flatpress guías, flatpress plugins', - 'input_noindex' => 'No permitir la indexación (noindex):', - 'input_nofollow' => 'No permitir lo siguiente (nofollow):', - 'input_noarchive' => 'No permitir el archivo (noarchive):', - 'input_nosnippet' => 'No permitir fragmentos (nosnippet):' + 'input_noindex' => 'No permitir la indexación:', + 'input_nofollow' => 'No permitir lo siguiente:', + 'input_noarchive' => 'No permitir el archivo:', + 'input_nosnippet' => 'No permitir fragmentos:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.fr-fr.php b/fp-plugins/seometataginfo/lang/lang.fr-fr.php index 8c63d29..ec60934 100644 --- a/fp-plugins/seometataginfo/lang/lang.fr-fr.php +++ b/fp-plugins/seometataginfo/lang/lang.fr-fr.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'Articles, guides et plugins relatifs à FlatPress', 'input_keywords' => 'Insérez les mots-clés :', 'sample_keywords' => 'flatpress, flatpress articles, flatpress guides, flatpress plugins', - 'input_noindex' => 'Désactiver l\'indexation (noindex):', - 'input_nofollow' => 'Désactiver suivant (nofollow):', - 'input_noarchive' => 'Désactiver l\'archivage (noarchive):', - 'input_nosnippet' => 'Désactiver les snippets (nosnippet):' + 'input_noindex' => 'Désactiver l\'indexation:', + 'input_nofollow' => 'Désactiver suivant:', + 'input_noarchive' => 'Désactiver l\'archivage:', + 'input_nosnippet' => 'Désactiver les snippets:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.it-it.php b/fp-plugins/seometataginfo/lang/lang.it-it.php index fdd37bc..d429d0f 100644 --- a/fp-plugins/seometataginfo/lang/lang.it-it.php +++ b/fp-plugins/seometataginfo/lang/lang.it-it.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'Articoli, guide e plugin correlati a FlatPress', 'input_keywords' => 'Inserire le parole chiave:', 'sample_keywords' => 'flatpress, articoli flatpress, guide flatpress, plugin flatpress', - 'input_noindex' => 'Disconoscimento dell\'indicizzazione (noindex):', - 'input_nofollow' => 'Disconoscimento di quanto segue (nofollow):', - 'input_noarchive' => 'Disconoscimento dell\'archiviazione (noarchive):', - 'input_nosnippet' => 'Disconoscimento degli snippet (nosnippet):' + 'input_noindex' => 'Disconoscimento dell\'indicizzazione:', + 'input_nofollow' => 'Disconoscimento di quanto segue:', + 'input_noarchive' => 'Disconoscimento dell\'archiviazione:', + 'input_nosnippet' => 'Disconoscimento degli snippet:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.ja-jp.php b/fp-plugins/seometataginfo/lang/lang.ja-jp.php index e7edfc7..86e32ec 100644 --- a/fp-plugins/seometataginfo/lang/lang.ja-jp.php +++ b/fp-plugins/seometataginfo/lang/lang.ja-jp.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress 関連記事, ガイドとプラグイン', 'input_keywords' => 'キーワードを挿入します。', 'sample_keywords' => 'flatpress, flatpress 物品, flatpress ガイド, flatpress プラグイン', - 'input_noindex' => 'インデックスを禁止する。(noindex)', - 'input_nofollow' => 'フォローを拒否する。 (nofollow)', - 'input_noarchive' => 'アーカイブを禁止する。 (noarchive)', - 'input_nosnippet' => 'スニペットを禁止する。 (nosnippet)' + 'input_noindex' => 'インデックスを禁止する。', + 'input_nofollow' => 'フォローを拒否する。', + 'input_noarchive' => 'アーカイブを禁止する。', + 'input_nosnippet' => 'スニペットを禁止する。' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.nl-nl.php b/fp-plugins/seometataginfo/lang/lang.nl-nl.php index 7aa3d1a..1bac782 100644 --- a/fp-plugins/seometataginfo/lang/lang.nl-nl.php +++ b/fp-plugins/seometataginfo/lang/lang.nl-nl.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress-gerelateerde artikelen, gidsen en plugins', 'input_keywords' => 'Voeg de sleutelwoorden in:', 'sample_keywords' => 'flatpress, flatpress artikelen, flatpress gidsen, flatpress plugins', - 'input_noindex' => 'Indexering weigeren (noindex):', - 'input_nofollow' => 'Verbied volgen (nofollow):', - 'input_noarchive' => 'Archivering niet toestaan (noarchive):', - 'input_nosnippet' => 'Snippets niet toestaan (nosnippet):' + 'input_noindex' => 'Indexering weigeren:', + 'input_nofollow' => 'Verbied volgen:', + 'input_noarchive' => 'Archivering niet toestaan:', + 'input_nosnippet' => 'Snippets niet toestaan:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.pt-br.php b/fp-plugins/seometataginfo/lang/lang.pt-br.php index 46f296e..33b0732 100644 --- a/fp-plugins/seometataginfo/lang/lang.pt-br.php +++ b/fp-plugins/seometataginfo/lang/lang.pt-br.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'Artigos, guias e plug-ins relacionados ao FlatPress', 'input_keywords' => 'Insira as palavras-chave:', 'sample_keywords' => 'flatpress, artigos sobre flatpress, guias flatpress, flatpress plugins', - 'input_noindex' => 'Não permitir a indexação (noindex):', - 'input_nofollow' => 'Não permitir o seguinte (nofollow):', - 'input_noarchive' => 'Não permitir o arquivamento (noarchive):', - 'input_nosnippet' => 'Não permitir snippets (nosnippet):' + 'input_noindex' => 'Não permitir a indexação:', + 'input_nofollow' => 'Não permitir o seguinte:', + 'input_noarchive' => 'Não permitir o arquivamento:', + 'input_nosnippet' => 'Não permitir snippets:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.ru-ru.php b/fp-plugins/seometataginfo/lang/lang.ru-ru.php index 625e76c..1ddc85b 100644 --- a/fp-plugins/seometataginfo/lang/lang.ru-ru.php +++ b/fp-plugins/seometataginfo/lang/lang.ru-ru.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'FlatPress. Похожие статьи, руководства и плагины', 'input_keywords' => 'Добавьте ключевые слова:', 'sample_keywords' => 'flatpress, flatpress статьи, flatpress руководства, flatpress плагины', - 'input_noindex' => 'Запретить индексацию (noindex):', - 'input_nofollow' => 'Запретить сканирование (nofollow):', - 'input_noarchive' => 'Запретить архивирование (noarchive):', - 'input_nosnippet' => 'Запретить сниппеты (nosnippet):' + 'input_noindex' => 'Запретить индексацию:', + 'input_nofollow' => 'Запретить сканирование:', + 'input_noarchive' => 'Запретить архивирование:', + 'input_nosnippet' => 'Запретить сниппеты:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/lang/lang.sl-si.php b/fp-plugins/seometataginfo/lang/lang.sl-si.php index 6c0c0da..53d7cf8 100644 --- a/fp-plugins/seometataginfo/lang/lang.sl-si.php +++ b/fp-plugins/seometataginfo/lang/lang.sl-si.php @@ -6,10 +6,10 @@ $lang ['admin'] ['plugin'] ['seometataginfo'] = array( 'sample_desc' => 'Povezane novice, vodniki in vtičniki FlatPress', 'input_keywords' => 'Vnesite ključne besede:', 'sample_keywords' => 'flatpress, flatpress novice, flatpress vodniki, flatpress vtičniki', - 'input_noindex' => 'Zakleni indeksiranje (noindex):', - 'input_nofollow' => 'Zakleni sledenje (nofollow):', - 'input_noarchive' => 'Zakleni arhiviranje (noarchive):', - 'input_nosnippet' => 'Prepovedano izrezovanje (nosnippet):' + 'input_noindex' => 'Zakleni indeksiranje:', + 'input_nofollow' => 'Zakleni sledenje:', + 'input_noarchive' => 'Zakleni arhiviranje:', + 'input_nosnippet' => 'Prepovedano izrezovanje:' ); $lang ['plugin'] ['seometataginfo'] = array( diff --git a/fp-plugins/seometataginfo/plugin.seometataginfo.php b/fp-plugins/seometataginfo/plugin.seometataginfo.php index 6c42da3..d8cd65e 100644 --- a/fp-plugins/seometataginfo/plugin.seometataginfo.php +++ b/fp-plugins/seometataginfo/plugin.seometataginfo.php @@ -136,7 +136,7 @@ if (version_compare(SYSTEM_VER, '0.1010', '>=') == 1 && defined('MOD_ADMIN_PANEL echo "\n
\n"; echo " {$string['legend_desc']}\n"; echo "

{$string['description']}

\n"; - echo "

\n"; + echo "

\n"; echo ' ' . "\n"; echo "

\n"; echo '

' . "\n"; @@ -156,7 +156,7 @@ if (version_compare(SYSTEM_VER, '0.1010', '>=') == 1 && defined('MOD_ADMIN_PANEL echo " \n"; echo ' '; echo '

' . "\n"; - echo "

\n"; + echo "
\n"; echo "
\n"; return true;