|
@@ -20,37 +20,37 @@ discard block |
|
|
block discarded – undo |
|
20
|
20
|
$body_class = '';
|
|
21
|
21
|
$theme_modes = array('', 'lightness', 'light', 'dark', 'darkness');
|
|
22
|
22
|
if (!empty($theme_modes[$_COOKIE['MODX_themeMode']])) {
|
|
23
|
|
- $body_class .= ' ' . $theme_modes[$_COOKIE['MODX_themeMode']];
|
|
|
23
|
+ $body_class .= ' '.$theme_modes[$_COOKIE['MODX_themeMode']];
|
|
24
|
24
|
} elseif (!empty($theme_modes[$modx->config['manager_theme_mode']])) {
|
|
25
|
|
- $body_class .= ' ' . $theme_modes[$modx->config['manager_theme_mode']];
|
|
|
25
|
+ $body_class .= ' '.$theme_modes[$modx->config['manager_theme_mode']];
|
|
26
|
26
|
}
|
|
27
|
27
|
|
|
28
|
|
-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;
|
|
|
28
|
+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;
|
|
29
|
29
|
|
|
30
|
30
|
if ($modx->config['manager_theme'] == 'default') {
|
|
31
|
|
- if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')
|
|
32
|
|
- && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
33
|
|
- require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
|
|
|
31
|
+ if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')
|
|
|
32
|
+ && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
|
|
|
33
|
+ require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
|
|
34
|
34
|
$minifier = new Formatter\CSSMinify();
|
|
35
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
|
|
36
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');
|
|
37
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
|
|
38
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
|
|
39
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
|
|
40
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
|
|
41
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
|
|
42
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
|
|
43
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
|
|
44
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
|
|
45
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
|
|
|
35
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');
|
|
|
36
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');
|
|
|
37
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
|
|
|
38
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
|
|
|
39
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
|
|
|
40
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
|
|
|
41
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
|
|
|
42
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
|
|
|
43
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
|
|
|
44
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
|
|
|
45
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
|
|
46
|
46
|
$css = $minifier->minify();
|
|
47
|
47
|
file_put_contents(
|
|
48
|
|
- MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',
|
|
|
48
|
+ MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',
|
|
49
|
49
|
$css
|
|
50
|
50
|
);
|
|
51
|
51
|
}
|
|
52
|
|
- if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
53
|
|
- $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
|
|
|
52
|
+ if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
|
|
|
53
|
+ $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
|
|
54
|
54
|
}
|
|
55
|
55
|
}
|
|
56
|
56
|
|
|
@@ -65,7 +65,7 @@ discard block |
|
|
block discarded – undo |
|
65
|
65
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
|
|
66
|
66
|
<link rel="stylesheet" type="text/css" href="<?= $css ?>"/>
|
|
67
|
67
|
<script type="text/javascript" src="media/script/tabpane.js"></script>
|
|
68
|
|
- <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
|
|
|
68
|
+ <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
|
|
69
|
69
|
<?php if ($modx->config['show_picker'] != "0") { ?>
|
|
70
|
70
|
<script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"
|
|
71
|
71
|
type="text/javascript"></script>
|
|
@@ -78,7 +78,7 @@ discard block |
|
|
block discarded – undo |
|
78
|
78
|
<?php } ?>
|
|
79
|
79
|
|
|
80
|
80
|
<!-- OnManagerMainFrameHeaderHTMLBlock -->
|
|
81
|
|
- <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>
|
|
|
81
|
+ <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>
|
|
82
|
82
|
|
|
83
|
83
|
<script type="text/javascript">
|
|
84
|
84
|
if (!evo) {
|
|
@@ -107,7 +107,7 @@ discard block |
|
|
block discarded – undo |
|
107
|
107
|
<script>
|
|
108
|
108
|
<?php
|
|
109
|
109
|
if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
|
|
110
|
|
- echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
|
|
|
110
|
+ echo 'doRefresh('.$_REQUEST['r'].");\n";
|
|
111
|
111
|
}
|
|
112
|
112
|
?>
|
|
113
|
113
|
</script>
|
evolution-cms /
evolution
