From 30cef1a739461161d3a418d2e999edd8e39088f1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Thu, 12 Jul 2018 19:18:45 +0200 Subject: [PATCH] some plugins left over (#5369) * tinymce is not used anymore, we can delete the cuson CSS file * mv the plugins_details template to addon_details * renamed template called from admin panel * some CSS classes that should be addon where still plugin * Insert a warning into the generated quattro CSS files --- mod/admin.php | 4 +- view/custom_tinymce.css | 41 ------------------- ...{plugins_details.tpl => addon_details.tpl} | 4 +- view/templates/admin/addons.tpl | 6 +-- view/theme/frio/css/style.css | 4 +- view/theme/frio/templates/admin/addons.tpl | 6 +-- view/theme/quattro/dark/Makefile | 3 +- view/theme/quattro/dark/style.css | 9 ++-- view/theme/quattro/green/Makefile | 3 +- view/theme/quattro/green/style.css | 9 ++-- view/theme/quattro/lilac/Makefile | 3 +- view/theme/quattro/lilac/style.css | 9 ++-- view/theme/quattro/quattro.less | 6 +-- 13 files changed, 36 insertions(+), 71 deletions(-) delete mode 100644 view/custom_tinymce.css rename view/templates/admin/{plugins_details.tpl => addon_details.tpl} (80%) diff --git a/mod/admin.php b/mod/admin.php index 4d4c065010..5f8e57050f 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1937,7 +1937,7 @@ function admin_page_addons(App $a) $func($a, $admin_form); } - $t = get_markup_template('admin/plugins_details.tpl'); + $t = get_markup_template('admin/addon_details.tpl'); return replace_macros($t, [ '$title' => L10n::t('Administration'), @@ -2208,7 +2208,7 @@ function admin_page_themes(App $a) $screenshot = null; } - $t = get_markup_template('admin/plugins_details.tpl'); + $t = get_markup_template('admin/addon_details.tpl'); return replace_macros($t, [ '$title' => L10n::t('Administration'), '$page' => L10n::t('Themes'), diff --git a/view/custom_tinymce.css b/view/custom_tinymce.css deleted file mode 100644 index 7932653b69..0000000000 --- a/view/custom_tinymce.css +++ /dev/null @@ -1,41 +0,0 @@ -body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:8px;} -body {background:#FFF;} -body.mceForceColors {background:#FFF; color:#000;} -h1 {font-size: 2em} -h2 {font-size: 1.5em} -h3 {font-size: 1.17em} -h4 {font-size: 1em} -h5 {font-size: .83em} -h6 {font-size: .75em} -.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;} -a.mceItemAnchor {display:inline-block; width:11px !important; height:11px !important; background:url(img/items.gif) no-repeat 0 0;} -td.mceSelected, th.mceSelected {background-color:#3399ff !important} -img {border:0;} -table {cursor:default} -table td, table th {cursor:text} -ins {border-bottom:1px solid green; text-decoration: none; color:green} -del {color:red; text-decoration:line-through} -cite {border-bottom:1px dashed blue} -acronym {border-bottom:1px dotted #CCC; cursor:help} -abbr {border-bottom:1px dashed #CCC; cursor:help} - -/* IE */ -* html body { -scrollbar-3dlight-color:#F0F0EE; -scrollbar-arrow-color:#676662; -scrollbar-base-color:#F0F0EE; -scrollbar-darkshadow-color:#DDD; -scrollbar-face-color:#E0E0DD; -scrollbar-highlight-color:#F0F0EE; -scrollbar-shadow-color:#F0F0EE; -scrollbar-track-color:#F5F5F5; -} - -img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px} -font[face=mceinline] {font-family:inherit !important} - - -object { - display: block; width: 400px; - background: #cccccc url(../images/plugin.png) no-repeat center center; -} diff --git a/view/templates/admin/plugins_details.tpl b/view/templates/admin/addon_details.tpl similarity index 80% rename from view/templates/admin/plugins_details.tpl rename to view/templates/admin/addon_details.tpl index 05e3e8aa05..fb908b7058 100644 --- a/view/templates/admin/plugins_details.tpl +++ b/view/templates/admin/addon_details.tpl @@ -2,7 +2,7 @@

{{$title}} - {{$page}}

-

{{$info.name}} - {{$info.version}} : {{$action}}

+

{{$info.name}} - {{$info.version}} : {{$action}}

{{$info.description}}

{{$str_author}} @@ -30,7 +30,7 @@ {{if $readme}}

Readme

-
+
{{$readme}}
{{/if}} diff --git a/view/templates/admin/addons.tpl b/view/templates/admin/addons.tpl index 297e132e00..93266bf145 100644 --- a/view/templates/admin/addons.tpl +++ b/view/templates/admin/addons.tpl @@ -7,10 +7,10 @@
{{else}} {{$reload}} -
{{else}} {{$reload}} -