upstream patch by ian

This commit is contained in:
Garvin Hicking 2016-09-23 11:21:00 +02:00
parent 38acbfb011
commit 8bfdd891b2
3 changed files with 12 additions and 12 deletions

View file

@ -4,13 +4,13 @@
<!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]--> <!--[if gt IE 8]><!--> <html class="no-js" lang="{$lang}"> <!--<![endif]-->
<head> <head>
<meta charset="{$CONST.LANG_CHARSET}"> <meta charset="{$CONST.LANG_CHARSET}">
<title>{$CONST.PLUGIN_EVENT_AMAZONCHOOSER_MEDIA_BUTTON}</title> <title>{$CONST.PLUGIN_LINKTRIMMER_NAME}</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="{$serendipityBaseURL}serendipity.css.php?serendipity[css_mode]=serendipity_admin.css"> <link rel="stylesheet" href="{$serendipityBaseURL}serendipity.css.php?serendipity[css_mode]=serendipity_admin.css">
<!--[if lte IE 8]> <!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file='admin/oldie.css'}"> <link rel="stylesheet" href="{serendipity_getFile file='admin/oldie.css'}">
<![endif]--> <![endif]-->
<script src="{serendipity_getFile file='admin/js/modernizr-2.8.3.min.js'}"></script> <script src="{serendipity_getFile file='admin/js/modernizr.min.js'}"></script>
<style>{* popup only classes *} <style>{* popup only classes *}
.serendipity_linktrimmer_page .linktrimmer { .serendipity_linktrimmer_page .linktrimmer {

View file

@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html> <html>
<head> <head>
<title>{$CONST.PLUGIN_EVENT_AMAZONCHOOSER_MEDIA_BUTTON}</title> <title>{$CONST.PLUGIN_LINKTRIMMER_NAME}</title>
<meta http-equiv="Content-Type" content="text/html; charset={$CONST.LANG_CHARSET}" /> <meta http-equiv="Content-Type" content="text/html; charset={$CONST.LANG_CHARSET}" />
<link rel="stylesheet" type="text/css" href="{$serendipityBaseURL}serendipity.css.php?serendipity[css_mode]=serendipity_admin.css" /> <link rel="stylesheet" type="text/css" href="{$serendipityBaseURL}serendipity.css.php?serendipity[css_mode]=serendipity_admin.css" />

View file

@ -210,7 +210,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
'linktrimmer_txtarea' => $_REQUEST['txtarea'] 'linktrimmer_txtarea' => $_REQUEST['txtarea']
)); ));
if ($serendipity['version'][0] > '1') { if ($serendipity['version'][0] > 1) {
echo $this->parseTemplate('plugin_linktrimmer.tpl'); echo $this->parseTemplate('plugin_linktrimmer.tpl');
} else { } else {
echo $this->parseTemplate('plugin_linktrimmer_old.tpl'); echo $this->parseTemplate('plugin_linktrimmer_old.tpl');
@ -223,7 +223,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
$txtarea = 'body'; $txtarea = 'body';
} }
$link = ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/linktrimmer' . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . $txtarea; $link = ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/linktrimmer' . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . $txtarea;
if ($serendipity['version'][0] > '1') { if ($serendipity['version'][0] > 1) {
?> ?>
<input type="button" class="input_button" name="insLinktrimmer" value="<?php echo PLUGIN_LINKTRIMMER_NAME; ?>" style="" onclick="serendipity.openPopup('<?php echo $link; ?>', 'linktrimmerSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');"> <input type="button" class="input_button" name="insLinktrimmer" value="<?php echo PLUGIN_LINKTRIMMER_NAME; ?>" style="" onclick="serendipity.openPopup('<?php echo $link; ?>', 'linktrimmerSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');">
<?php <?php
@ -251,7 +251,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
switch($event) { switch($event) {
case 'backend_entry_toolbar_extended': case 'backend_entry_toolbar_extended':
if (isset($eventData['backend_entry_toolbar_extended:textarea'])) { if (isset($eventData['backend_entry_toolbar_extended:textarea'])) {
$txtarea = $serendipity['version'][0] < '2' ? $eventData['backend_entry_toolbar_extended:textarea'] : $eventData['backend_entry_toolbar_extended:nugget']; $txtarea = $serendipity['version'][0] < 2 ? $eventData['backend_entry_toolbar_extended:textarea'] : $eventData['backend_entry_toolbar_extended:nugget'];
} else { } else {
$txtarea = 'extended'; $txtarea = 'extended';
} }
@ -265,7 +265,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
case 'backend_entry_toolbar_body': case 'backend_entry_toolbar_body':
if (isset($eventData['backend_entry_toolbar_body:textarea'])) { if (isset($eventData['backend_entry_toolbar_body:textarea'])) {
$txtarea = $serendipity['version'][0] < '2' ? $eventData['backend_entry_toolbar_body:textarea'] : $eventData['backend_entry_toolbar_body:nugget']; $txtarea = $serendipity['version'][0] < 2 ? $eventData['backend_entry_toolbar_body:textarea'] : $eventData['backend_entry_toolbar_body:nugget'];
} else { } else {
$txtarea = 'body'; $txtarea = 'body';
} }
@ -278,10 +278,10 @@ class serendipity_event_linktrimmer extends serendipity_event {
break; break;
case 'backend_wysiwyg': case 'backend_wysiwyg':
$link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/linktrimmer' . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . ($serendipity['version'][0] > '1' ? 'linktrimmer'.$eventData['item'] : $eventData['jsname']); $link = $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/linktrimmer' . ($serendipity['rewrite'] != 'none' ? '?' : '&amp;') . 'txtarea=' . ($serendipity['version'][0] > 1 ? 'linktrimmer'.$eventData['item'] : $eventData['jsname']);
$open = $serendipity['version'][0] > '1' ? 'serendipity.openPopup' : 'window.open'; $open = $serendipity['version'][0] > 1 ? 'serendipity.openPopup' : 'window.open';
$eventData['buttons'][] = array( $eventData['buttons'][] = array(
'id' => 'linktrimmer' . ($serendipity['version'][0] > '1' ? $eventData['item'] : $eventData['jsname']), 'id' => 'linktrimmer' . ($serendipity['version'][0] > 1 ? $eventData['item'] : $eventData['jsname']),
'name' => PLUGIN_LINKTRIMMER_NAME, 'name' => PLUGIN_LINKTRIMMER_NAME,
'javascript' => 'function() { '.$open.'(\'' . $link . '\', \'LinkTrimmer\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\') }', 'javascript' => 'function() { '.$open.'(\'' . $link . '\', \'LinkTrimmer\', \'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1\') }',
'img_url' => $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/plugin_linktrimmer.gif', 'img_url' => $serendipity['serendipityHTTPPath'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'plugin/plugin_linktrimmer.gif',
@ -312,7 +312,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
break; break;
case 'backend_frontpage_display': case 'backend_frontpage_display':
if (serendipity_db_bool($this->get_config('frontpage', true) && $serendipity['version'][0] <= '1') ) $this->show(); if (serendipity_db_bool($this->get_config('frontpage', true) && $serendipity['version'][0] <= 1) ) $this->show();
break; break;
case 'external_plugin': case 'external_plugin':
@ -364,7 +364,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
if (!strpos($eventData, '.linktrimmer')) { if (!strpos($eventData, '.linktrimmer')) {
// class exists in CSS, so a user has customized it and we don't need default // class exists in CSS, so a user has customized it and we don't need default
echo file_get_contents(dirname(__FILE__) . '/linktrimmer.css'); echo file_get_contents(dirname(__FILE__) . '/linktrimmer.css');
if ($serendipity['version'][0] < '2') echo '#linktrimmer_url.input_textbox { width: inherit; }'; if ($serendipity['version'][0] < 2) echo '#linktrimmer_url.input_textbox { width: inherit; }';
} }
break; break;