qbi/additional_plugins
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

A new 2.x backend for serendipity_event_templateeditor

Browse source 
- Use a proper button for template editor
- Use proper backend messages
- Simplfy/clean up markup + CSS
- Reorder template list-form-thingy's elements
- Proper markup + styles
- Layout styles for template editor forms

References s9y/Serendipity#426
This commit is contained in:
Matthias Mees 2016-10-24 12:57:16 +02:00
parent 598c902b71
commit 7ead0d5401
2 changed files with 78 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
serendipity_event_template_editor/serendipity_event_template_editor.css
View file

@ -1,36 +1,37 @@
.templateEditorList li { .templateEditorListItem {
padding-top: 0.5em; display: inline-block;
list-style-type: none; padding: .5em;
}
.templateEditorForm {
margin: .75em 0;
} }
#template_editor { #template_editor {
width: 100%;
font-size: 1em; font-size: 1em;
width: 100%;
} }
.CodeMirror-line-numbers { .CodeMirror-line-numbers {
font-size: 1em; font-size: 1em;
} }
img {
border: 0;
}
.templateEditorHighlight { .templateEditorHighlight {
background: rgba(72,122,202,0.2); background: rgba(72, 122, 202, .2);
border: 1px solid grey; border: 1px solid grey;
} }
#templateEditorUpload { @media only screen and (min-width: 768px) {
float: right; .templateEditorForm {
margin-right: 5em; box-sizing: border-box;
margin-top: 0.5em; float: left;
} margin: 0;
padding: 0 1em 0 0;
width: 50%;
}
#templateEditorUploadButton { #startEditorUpload {
border: 1px solid grey; position: relative;
} top: 2.25em;
}
#templateEditorPath {
margin-top: 0.5em;
} }

119
serendipity_event_template_editor/serendipity_event_template_editor.php
View file

@ -177,11 +177,7 @@ class serendipity_event_template_editor extends serendipity_event {
if (! (serendipity_checkPermission('siteConfiguration'))) { if (! (serendipity_checkPermission('siteConfiguration'))) {
return; return;
} }
echo '<h3> echo '<a class="button_link template_editor_start" href="?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor">'. PLUGIN_EVENT_TEMPLATE_EDITOR_START .'</a>';
<a href="?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor">
'. PLUGIN_EVENT_TEMPLATE_EDITOR_START .' <img class="serendipityImageButton" title="Bearbeiten" alt="" src="'.serendipity_getTemplateFile('admin/img/configure.png').'" />
</a>
</h3>';
return true; return true;
break; break;
case 'backend_sidebar_entries_event_display_template_editor': case 'backend_sidebar_entries_event_display_template_editor':
@ -190,17 +186,15 @@ class serendipity_event_template_editor extends serendipity_event {
} }
if (isset($serendipity['GET']['message'])) { if (isset($serendipity['GET']['message'])) {
echo '<p class="serendipityAdminMsgNote">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)).'</p>'; echo '<span class="msg_notice"><span class="icon-info-circled"></span>' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['message']) : htmlspecialchars($serendipity['GET']['message'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
if (isset($serendipity['GET']['success'])) { if (isset($serendipity['GET']['success'])) {
echo '<p class="serendipityAdminMsgSuccess">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)).'</p>'; echo '<span class="msg_success"><span class="icon-ok-circled"></span> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['success']) : htmlspecialchars($serendipity['GET']['success'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
if (isset($serendipity['GET']['error'])) { if (isset($serendipity['GET']['error'])) {
echo '<p class="serendipityAdminMsgError">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)).'</p>'; echo '<span class="msg_error"><span class="icon-attention-circled"></span> ' . (function_exists('serendipity_specialchars') ? serendipity_specialchars($serendipity['GET']['error']) : htmlspecialchars($serendipity['GET']['error'], ENT_COMPAT, LANG_CHARSET)) . '</span>';
} }
#only necessary for delivering the javascript and css #only necessary for delivering the javascript and css
$pluginPath = $this->pluginPath = $this->get_config('path', ''); $pluginPath = $this->pluginPath = $this->get_config('path', '');
if (empty($pluginPath) || $pluginPath == 'default' || $pluginPath == 'none' || $pluginPath == 'empty') { if (empty($pluginPath) || $pluginPath == 'default' || $pluginPath == 'none' || $pluginPath == 'empty') {
@ -223,13 +217,13 @@ class serendipity_event_template_editor extends serendipity_event {
$path = $serendipity['GET']['template_editor_path']; $path = $serendipity['GET']['template_editor_path'];
} }
if ($this->forkTemplate()) { if ($this->forkTemplate()) {
$this->showFiles($path);
$this->showDirectories($path);
if (isset($serendipity['GET']['template_editor_upload'])) { if (isset($serendipity['GET']['template_editor_upload'])) {
$this->showUploader($path, true); $this->showUploader($path, true);
} else { } else {
$this->showUploader($path, false); $this->showUploader($path, false);
} }
$this->showFiles($path);
$this->showDirectories($path);
$this->showCreator($path); $this->showCreator($path);
} }
@ -260,21 +254,22 @@ class serendipity_event_template_editor extends serendipity_event {
$path = $template_path . $cur_template . '/'; $path = $template_path . $cur_template . '/';
} }
if ($form) { if ($form) {
echo '<div id="templateEditorUpload"><h3>'.PLUGIN_EVENT_TEMPLATE_EDITOR_UPLOAD.'</h3> echo '<form id="templateEditorUpload" class="templateEditorForm" enctype="multipart/form-data" action="' . $serendipity ['baseURL'] . 'index.php?/plugin/template_editor_upload" method="post">
<form enctype="multipart/form-data" action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_upload" method="post"> <input type="hidden" name="path" value="' . $path . '">
<input type="hidden" name="path" value="'.$path.'" /> <div class="form_field">
<input name="userfile" type="file" /> <label for="userfile" class="block_level">' . PLUGIN_EVENT_TEMPLATE_EDITOR_UPLOAD . '</label>
<input class="serendipityPrettyButton input_button" type="submit" value="'.GO.'" /> <input id="userfile" name="userfile" type="file">
</form></div>'; <input type="submit" value="' . GO . '">
</div>
</form>';
} else { } else {
echo '<div id="templateEditorUpload"> echo '<form id="templateEditorUpload" class="templateEditorForm" action="serendipity_admin.php" method="get">
<form action="serendipity_admin.php" method="get"> <input type="hidden" name="serendipity[adminModule]" value="event_display">
<input type="hidden" name="serendipity[adminModule]" value="event_display" /> <input type="hidden" name="serendipity[adminAction]" value="template_editor">
<input type="hidden" name="serendipity[adminAction]" value="template_editor" /> <input type="hidden" name="serendipity[template_editor_path]" value="' . $path . '">
<input type="hidden" name="serendipity[template_editor_path]" value="'.$path.'" /> <input type="hidden" name="serendipity[template_editor_upload]" value="">
<input type="hidden" name="serendipity[template_editor_upload]" value="" /> <input type="submit" id="startEditorUpload" value="' . PLUGIN_EVENT_TEMPLATE_EDITOR_UPLOAD . '">
<input class="serendipityPrettyButton input_button" type="submit" value="'.PLUGIN_EVENT_TEMPLATE_EDITOR_UPLOAD.'" /> </form>';
</form></div>';
} }
} }
@ -286,12 +281,14 @@ class serendipity_event_template_editor extends serendipity_event {
if (!$path) { if (!$path) {
$path = $template_path . $cur_template . '/'; $path = $template_path . $cur_template . '/';
} }
echo '<h3>'.CREATE.'</h3> echo '<form id="templateEditorCreate" class="templateEditorForm" action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_create" method="post">
<form action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_create" method="post"> <input type="hidden" name="path" value="' . $path . '">
<input type="hidden" name="path" value="'.$path.'" /> <div class="form_field">
<input type="text" name="file" value="" /> <label for="create_file" class="block_level">' . CREATE . '</label>
<input class="serendipityPrettyButton input_button" type="submit" value="'.GO.'" /> <input id="create_file" type="text" name="file" value="">
</form>'; <input type="submit" value="' . GO . '">
</div>
</form>';
} }
function showEditor($path , $temp=false) { function showEditor($path , $temp=false) {
@ -313,11 +310,13 @@ class serendipity_event_template_editor extends serendipity_event {
$heading = $this->linkify("?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]=", $path, $serendipity['template']); $heading = $this->linkify("?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]=", $path, $serendipity['template']);
echo '<h3>'.$heading.'</h3> echo '<h2>' . $heading . '</h2>
<form action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_save" method="post"> <form action="'.$serendipity ['baseURL'] . 'index.php?/plugin/template_editor_save" method="post">
<input type="hidden" name="path" value="'.$path.'" /> <input type="hidden" name="path" value="' . $path . '">
<textarea name="content" id="template_editor" cols="80" rows="38">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET)).'</textarea> <textarea id="template_editor" name="content" rows="30">'.(function_exists('serendipity_specialchars') ? serendipity_specialchars($content) : htmlspecialchars($content, ENT_COMPAT, LANG_CHARSET)).'</textarea>
<input class="serendipityPrettyButton input_button" type="submit" value="'.SAVE.'" /> <div class="form_buttons">
<input type="submit" value="' . SAVE . '">
</div>
</form>'; </form>';
} }
@ -334,31 +333,31 @@ class serendipity_event_template_editor extends serendipity_event {
$heading = $this->linkify("?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]=", $path, $cur_template); $heading = $this->linkify("?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]=", $path, $cur_template);
echo '<h3 id="templateEditorPath">'. $heading.'</h3>'; echo '<h2 id="templateEditorPath">' . $heading . '</h2>';
if (empty($files)) { if (empty($files)) {
return; return;
} }
echo '<ul id="templateEditorFileList" class="templateEditorList">'; echo '<ul id="templateEditorFileList" class="plainList zebra_list templateEditorList">';
$filecount = 0;
foreach ($files as $file) { foreach ($files as $file) {
if (getimagesize("{$path}{$file}")) { if (getimagesize("{$path}{$file}")) {
#images shouldn't end in the textarea #images shouldn't end in the textarea
echo "<li> echo "<li class=\"clearfix " . (++$filecount%2 ? "odd" : "even") . "\">
<span class=\"templateEditorListItem\">$file</span> <span class=\"templateEditorListItem\">$file</span>
<a href=\"{$serendipity['baseURL']}index.php?/plugin/template_editor_delete&template_editor_path={$path}{$file}\"> <ul class=\"plainList clearfix edit_actions\">
<img class=\"serendipityImageButton templateEditorDelete\" title=\"".DELETE."\" alt=\"".DELETE."\" src=\"".serendipity_getTemplateFile('admin/img/delete.png')."\" /> <li><a class=\"button_link\" href=\"{$serendipity['baseURL']}index.php?/plugin/template_editor_delete&template_editor_path={$path}{$file}\" title=\"" . DELETE . "\"><span class=\"icon-trash\"></span><span class=\"visuallyhidden\">" . DELETE . "</span></a></li>
</a> </ul>
</li>"; </li>";
$jsDeleteDialogs .= sprintf('var DELETE_SURE_'.str_replace('.', '_', $file).'="'.DELETE_SURE.'";', $file); $jsDeleteDialogs .= sprintf('var DELETE_SURE_'.str_replace('.', '_', $file).'="'.DELETE_SURE.'";', $file);
} else { } else {
echo "<li> echo "<li class=\"clearfix " . (++$filecount%2 ? "odd" : "even") . "\">
<a href=\"?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&amp;serendipity[template_editor_path]={$path}{$file}\"> <span class=\"templateEditorListItem\">$file</span>
<span class=\"templateEditorListItem\">$file</span> <ul class=\"plainList clearfix edit_actions\">
<img class=\"serendipityImageButton\" title=\"Datei bearbeiten\" alt=\"Datei bearbeiten\" src=\"".serendipity_getTemplateFile('admin/img/edit.png')."\" /> <li><a class=\"button_link\" href=\"?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&amp;serendipity[template_editor_path]={$path}{$file}\" title=\"" . EDIT . "\"><span class=\"icon-edit\"></span><span class=\"visuallyhidden\">" . EDIT . "</span></a></li>
</a> <li><a class=\"button_link\" href=\"{$serendipity['baseURL']}index.php?/plugin/template_editor_delete&template_editor_path={$path}{$file}\" title=\"" . DELETE . "\"><span class=\"icon-trash\"></span><span class=\"visuallyhidden\">" . DELETE . "</span></a></li>
<a href=\"{$serendipity['baseURL']}index.php?/plugin/template_editor_delete&template_editor_path={$path}{$file}\"> </ul>
<img class=\"serendipityImageButton templateEditorDelete\" title=\"".DELETE."\" alt=\"".DELETE."\" src=\"".serendipity_getTemplateFile('admin/img/delete.png')."\" /> </li>";
</a>
</li>";
$jsDeleteDialogs .= sprintf('var DELETE_SURE_'.str_replace('.', '_', $file).'="'.DELETE_SURE.'";', $file); $jsDeleteDialogs .= sprintf('var DELETE_SURE_'.str_replace('.', '_', $file).'="'.DELETE_SURE.'";', $file);
} }
} }
@ -378,16 +377,12 @@ class serendipity_event_template_editor extends serendipity_event {
if (empty($dirs)) { if (empty($dirs)) {
return; return;
} }
echo '<h3>'.PLUGIN_EVENT_TEMPLATE_SUBFOLDERS.'</h3>'; echo '<h3>' . PLUGIN_EVENT_TEMPLATE_SUBFOLDERS . '</h3>';
echo '<ul id="templateEditorFolderList" class="templateEditorList" >'; echo '<ul id="templateEditorFolderList" class="plainList zebra_list templateEditorList">';
$dircount = 0;
foreach ($dirs as $dir) { foreach ($dirs as $dir) {
echo "<li> echo "<li class=\"" . (++$dircount%2 ? "odd" : "even") . "\"><span class=\"icon-folder-open\"></span> <a class=\"templateEditorListItem\" href=\"?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]={$path}{$dir}/\">$dir</a></li>";
<a class=\"templateEditorListItem\" href=\"?&amp;serendipity[adminModule]=event_display&amp;serendipity[adminAction]=template_editor&serendipity[template_editor_path]={$path}{$dir}/\">
$dir
<img class=\"serendipityImageButton\" title=\"Ordner\" alt=\"Ordner öffnen\" src=\"".serendipity_getTemplateFile('admin/img/folder.png')."\" />
</a>
</li>";
} }
echo '</ul>'; echo '</ul>';
@ -541,4 +536,4 @@ class serendipity_event_template_editor extends serendipity_event {
} }
/* vim: set sts=4 ts=4 expandtab : */ /* vim: set sts=4 ts=4 expandtab : */
?> ?>