Browse Source

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
pull/5367/merge
Tobias Diekershoff 4 years ago
committed by Hypolite Petovan
parent
commit
30cef1a739
  1. 4
      mod/admin.php
  2. 41
      view/custom_tinymce.css
  3. 4
      view/templates/admin/addon_details.tpl
  4. 6
      view/templates/admin/addons.tpl
  5. 4
      view/theme/frio/css/style.css
  6. 6
      view/theme/frio/templates/admin/addons.tpl
  7. 3
      view/theme/quattro/dark/Makefile
  8. 9
      view/theme/quattro/dark/style.css
  9. 3
      view/theme/quattro/green/Makefile
  10. 9
      view/theme/quattro/green/style.css
  11. 3
      view/theme/quattro/lilac/Makefile
  12. 9
      view/theme/quattro/lilac/style.css
  13. 6
      view/theme/quattro/quattro.less

4
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'),

41
view/custom_tinymce.css

@ -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;
}

4
view/templates/admin/plugins_details.tpl → view/templates/admin/addon_details.tpl

@ -2,7 +2,7 @@
<div id='adminpage'>
<h1>{{$title}} - {{$page}}</h1>
<p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$addon}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
<p><span class='toggleaddon icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$addon}}/?a=t&amp;t={{$form_security_token}}">{{$action}}</a></p>
<p>{{$info.description}}</p>
<p class="author">{{$str_author}}
@ -30,7 +30,7 @@
{{if $readme}}
<h3>Readme</h3>
<div id="plugin_readme">
<div id="addon_readme">
{{$readme}}
</div>
{{/if}}

6
view/templates/admin/addons.tpl

@ -7,10 +7,10 @@
</div>
{{else}}
<a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
<ul id='pluginslist'>
<ul id='addonslist'>
{{foreach $addons as $p}}
<li class='plugin {{$p.1}}'>
<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
<li class='addon {{$p.1}}'>
<a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}

4
view/theme/frio/css/style.css

@ -2948,7 +2948,7 @@ section.help-content-wrapper li {
#admin-summary-wrapper {
padding-top: 10px;
}
#adminpage ul#pluginslist, li.plugin {
#adminpage ul#addonslist, li.addon {
list-style: none;
}
#adminpage li .icon {
@ -2989,7 +2989,7 @@ section.help-content-wrapper li {
font-size: 11px;
color: #555555;
}
#adminpage .plugin .desc {
#adminpage .addon .desc {
padding-left: 10px;
}
.adminpage .admin-settings-action-link,

6
view/theme/frio/templates/admin/addons.tpl

@ -7,11 +7,11 @@
</div>
{{else}}
<a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{$reload}}</a>
<ul id='pluginslist'>
<ul id='addonslist'>
{{foreach $addons as $p}}
<li class="plugin {{$p.1}}">
<li class="addon {{$p.1}}">
<span class="offset-anchor" id="{{$p.0}}"></span>
<a class='toggleplugin' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}#{{$p.0}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
<a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}#{{$p.0}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
{{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
<div class='desc'>{{$p.2.description}}</div>

3
view/theme/quattro/dark/Makefile

@ -1,4 +1,5 @@
##
style.css : style.less colors.less ../icons.less ../quattro.less
lessc style.less > style.css
echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
lessc style.less >> style.css

9
view/theme/quattro/dark/style.css

@ -1,3 +1,4 @@
/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
/**
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
**/
@ -2514,11 +2515,11 @@ footer {
clear: left;
text-align: right;
}
#adminpage #pluginslist {
#adminpage #addonslist {
margin: 0;
padding: 0;
}
#adminpage .plugin {
#adminpage .addon {
list-style: none;
display: block;
border: 1px solid #888888;
@ -2526,10 +2527,10 @@ footer {
margin-bottom: 5px;
clear: left;
}
#adminpage .plugin desc {
#adminpage .addon desc {
margin-left: 2.5em;
}
#adminpage .toggleplugin {
#adminpage .toggleaddon {
float: left;
margin-right: 1em;
}

3
view/theme/quattro/green/Makefile

@ -1,4 +1,5 @@
##
style.css : style.less colors.less ../icons.less ../quattro.less
lessc style.less > style.css
echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
lessc style.less >> style.css

9
view/theme/quattro/green/style.css

@ -1,3 +1,4 @@
/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
/**
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
**/
@ -2514,11 +2515,11 @@ footer {
clear: left;
text-align: right;
}
#adminpage #pluginslist {
#adminpage #addonslist {
margin: 0;
padding: 0;
}
#adminpage .plugin {
#adminpage .addon {
list-style: none;
display: block;
border: 1px solid #888888;
@ -2526,10 +2527,10 @@ footer {
margin-bottom: 5px;
clear: left;
}
#adminpage .plugin desc {
#adminpage .addon desc {
margin-left: 2.5em;
}
#adminpage .toggleplugin {
#adminpage .toggleaddon {
float: left;
margin-right: 1em;
}

3
view/theme/quattro/lilac/Makefile

@ -1,4 +1,5 @@
##
style.css : style.less colors.less ../icons.less ../quattro.less
lessc style.less > style.css
echo "/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */" > style.css
lessc style.less >> style.css

9
view/theme/quattro/lilac/style.css

@ -1,3 +1,4 @@
/* THIS FILE IS GENERATED FROM THE less SOURCE DO NOT EDIT MANUALLY */
/**
* Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
**/
@ -2514,11 +2515,11 @@ footer {
clear: left;
text-align: right;
}
#adminpage #pluginslist {
#adminpage #addonslist {
margin: 0;
padding: 0;
}
#adminpage .plugin {
#adminpage .addon {
list-style: none;
display: block;
border: 1px solid #888888;
@ -2526,10 +2527,10 @@ footer {
margin-bottom: 5px;
clear: left;
}
#adminpage .plugin desc {
#adminpage .addon desc {
margin-left: 2.5em;
}
#adminpage .toggleplugin {
#adminpage .toggleaddon {
float: left;
margin-right: 1em;
}

6
view/theme/quattro/quattro.less

@ -1710,10 +1710,10 @@ footer { height: 100px; display: table-row; }
clear:left;
text-align: right;
}
#pluginslist {
#addonslist {
margin: 0; padding: 0;
}
.plugin {
.addon {
list-style: none;
display: block;
border: 1px solid #888888;
@ -1724,7 +1724,7 @@ footer { height: 100px; display: table-row; }
margin-left: 2.5em;
}
}
.toggleplugin {
.toggleaddon {
float:left;
margin-right: 1em;
}

Loading…
Cancel
Save