mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Remove Advanced-JS option

Browse Source
This commit is contained in:
onli 2013-06-23 20:10:55 +02:00
parent ae2ff8a3b2
commit 9a989dddb3
6 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/admin/images.inc.php
View File

@ -18,12 +18,6 @@ switch ($serendipity['GET']['adminAction']) {
case 'imgedit': case 'imgedit':
$data['case_imgedit'] = true; $data['case_imgedit'] = true;
if (!isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy'])) {
// what??
} else {
return true;
}
include_once(S9Y_INCLUDE_PATH . "include/functions_images_crop.inc.php"); include_once(S9Y_INCLUDE_PATH . "include/functions_images_crop.inc.php");
$media['is_imgedit'] = true; $media['is_imgedit'] = true;
$media['css_imgedit'] = serendipity_getTemplateFile('admin/imgedit.css'); $media['css_imgedit'] = serendipity_getTemplateFile('admin/imgedit.css');

6
include/admin/plugins.inc.php
View File

@ -382,11 +382,7 @@ if (isset($_GET['serendipity']['plugin_to_conf'])) {
$data['timestamp'] = serendipity_strftime('%H:%M:%S'); $data['timestamp'] = serendipity_strftime('%H:%M:%S');
} }
if (!isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy'])) { serendipity_plugin_api::hook_event("backend_pluginlisting_header", $null);
$data['eyecandy'] = true;
}
serendipity_plugin_api::hook_event("backend_pluginlisting_header" ,$eyecandy);
ob_start(); ob_start();
serendipity_plugin_api::hook_event('backend_plugins_sidebar_header', $serendipity); serendipity_plugin_api::hook_event('backend_plugins_sidebar_header', $serendipity);

9
include/functions_plugins_admin.inc.php
View File

@ -90,14 +90,11 @@ function show_plugins($event_only = false, $sidebars = null)
} }
} }
$eyecandy = !isset($serendipity['eyecandy']) || serendipity_db_bool($serendipity['eyecandy']);
$data['event_only'] = $event_only; $data['event_only'] = $event_only;
$data['eyecandy'] = $eyecandy; if (!$event_only) {
if (!$eyecandy) {
$data['eyecandy'] = false;
} elseif (!$event_only) {
$data['event_only'] = false; $data['event_only'] = false;
$data['is_first'] = $is_first = true; $data['is_first'] = true;
} }
$data['serendipity_setFormToken'] = serendipity_setFormToken(); $data['serendipity_setFormToken'] = serendipity_setFormToken();

8
include/tpl/config_personal.inc.php
View File

@ -77,14 +77,6 @@
'permission' => 'personalConfiguration', 'permission' => 'personalConfiguration',
'flags' => array('config')), 'flags' => array('config')),
array('var' => 'eyecandy',
'title' => PREFERENCE_USE_JS,
'description' => PREFERENCE_USE_JS_DESC,
'type' => 'bool',
'default' => true,
'permission' => 'personalConfiguration',
'flags' => array('config')),
array('var' => 'mail_comments', array('var' => 'mail_comments',
'title' => USERCONF_SENDCOMMENTS, 'title' => USERCONF_SENDCOMMENTS,
'description' => USERCONF_SENDCOMMENTS_DESC, 'description' => USERCONF_SENDCOMMENTS_DESC,

2
templates/2k11/admin/plugins.inc.tpl
View File

@ -117,11 +117,9 @@
<span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.DONE}:{$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}</span> <span class="msg_success"><span class="icon-ok-circled"></span> {$CONST.DONE}:{$CONST.SETTINGS_SAVED_AT|sprintf:"$timestamp"}</span>
{/if} {/if}
<h2>{$CONST.BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS}</h2> <h2>{$CONST.BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS}</h2>
{if $eyecandy}
<script src="{serendipity_getFile file="admin/js/jquery.autoscroll.js"}"></script> <script src="{serendipity_getFile file="admin/js/jquery.autoscroll.js"}"></script>
<script src="{serendipity_getFile file="admin/js/jquery.sortable.js"}"></script> <script src="{serendipity_getFile file="admin/js/jquery.sortable.js"}"></script>
<script src="{serendipity_getFile file="admin/js/dragdrop.js"}"></script> <script src="{serendipity_getFile file="admin/js/dragdrop.js"}"></script>
{/if}
<section id="pluginlist_sidebar"> <section id="pluginlist_sidebar">
<h3>{$CONST.SIDEBAR_PLUGINS}</h3> <h3>{$CONST.SIDEBAR_PLUGINS}</h3>

8
templates/2k11/admin/show_plugins.fnc.tpl
View File

@ -1,9 +1,7 @@
{* functions_plugins_admin.inc.php::function_show_plugins() including output of functions_plugins_admin.inc.php::function ownership() *} {* functions_plugins_admin.inc.php::function_show_plugins() including output of functions_plugins_admin.inc.php::function ownership() *}
{if !$eyecandy}
<form action="?serendipity[adminModule]=plugins" method="post">
{elseif !$event_only}
{if !$event_only}
<form action="?serendipity[adminModule]=plugins" method="post"> <form action="?serendipity[adminModule]=plugins" method="post">
<input id="order" name="serendipity[pluginorder]" type="hidden" value=""> <input id="order" name="serendipity[pluginorder]" type="hidden" value="">
{else} {else}
@ -65,7 +63,7 @@
{/if} {/if}
</li> </li>
{($eyecandy) ? '<noscript>' : ''} <noscript>
<li class="pluginmanager_place"> <li class="pluginmanager_place">
<select name="serendipity[placement][{$plugin_data['name']}]"> <select name="serendipity[placement][{$plugin_data['name']}]">
{foreach $plugin_data.gopts as $k => $v} {foreach $plugin_data.gopts as $k => $v}
@ -93,7 +91,7 @@
</a> </a>
{/if} {/if}
</li> </li>
{($eyecandy) ? '</noscript>' : ''} </noscript>
</ul> </ul>
</li> </li>
{/foreach} {/foreach}