|
@@ -32,32 +32,32 @@ discard block |
|
|
block discarded – undo |
|
32
|
32
|
break;
|
|
33
|
33
|
}
|
|
34
|
34
|
|
|
35
|
|
-$css = 'media/style/' . $modx->config['manager_theme'] . '/style.css?v=' . $lastInstallTime;
|
|
|
35
|
+$css = 'media/style/'.$modx->config['manager_theme'].'/style.css?v='.$lastInstallTime;
|
|
36
|
36
|
|
|
37
|
37
|
if ($modx->config['manager_theme'] == 'default') {
|
|
38
|
|
- if (!file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')
|
|
39
|
|
- && is_writable(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css')) {
|
|
40
|
|
- require_once MODX_BASE_PATH . 'assets/lib/Formatter/CSSMinify.php';
|
|
|
38
|
+ if (!file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')
|
|
|
39
|
+ && is_writable(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css')) {
|
|
|
40
|
+ require_once MODX_BASE_PATH.'assets/lib/Formatter/CSSMinify.php';
|
|
41
|
41
|
$minifier = new Formatter\CSSMinify();
|
|
42
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/bootstrap/css/bootstrap.min.css');
|
|
43
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/common/font-awesome/css/font-awesome.min.css');
|
|
44
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/fonts.css');
|
|
45
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/forms.css');
|
|
46
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/mainmenu.css');
|
|
47
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tree.css');
|
|
48
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/custom.css');
|
|
49
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/tabpane.css');
|
|
50
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/contextmenu.css');
|
|
51
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/index.css');
|
|
52
|
|
- $minifier->addFile(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/main.css');
|
|
|
42
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/bootstrap/css/bootstrap.min.css');
|
|
|
43
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/common/font-awesome/css/font-awesome.min.css');
|
|
|
44
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/fonts.css');
|
|
|
45
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/forms.css');
|
|
|
46
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/mainmenu.css');
|
|
|
47
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tree.css');
|
|
|
48
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/custom.css');
|
|
|
49
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/tabpane.css');
|
|
|
50
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/contextmenu.css');
|
|
|
51
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/index.css');
|
|
|
52
|
+ $minifier->addFile(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/main.css');
|
|
53
|
53
|
$css = $minifier->minify();
|
|
54
|
54
|
file_put_contents(
|
|
55
|
|
- MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css',
|
|
|
55
|
+ MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css',
|
|
56
|
56
|
$css
|
|
57
|
57
|
);
|
|
58
|
58
|
}
|
|
59
|
|
- if (file_exists(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css')) {
|
|
60
|
|
- $css = 'media/style/' . $modx->config['manager_theme'] . '/css/styles.min.css?v=' . $lastInstallTime;
|
|
|
59
|
+ if (file_exists(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css')) {
|
|
|
60
|
+ $css = 'media/style/'.$modx->config['manager_theme'].'/css/styles.min.css?v='.$lastInstallTime;
|
|
61
|
61
|
}
|
|
62
|
62
|
}
|
|
63
|
63
|
|
|
@@ -72,7 +72,7 @@ discard block |
|
|
block discarded – undo |
|
72
|
72
|
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
|
|
73
|
73
|
<link rel="stylesheet" type="text/css" href="<?= $css ?>"/>
|
|
74
|
74
|
<script type="text/javascript" src="media/script/tabpane.js"></script>
|
|
75
|
|
- <?= sprintf('<script type="text/javascript" src="%s"></script>' . "\n", $modx->config['mgr_jquery_path']) ?>
|
|
|
75
|
+ <?= sprintf('<script type="text/javascript" src="%s"></script>'."\n", $modx->config['mgr_jquery_path']) ?>
|
|
76
|
76
|
<?php if ($modx->config['show_picker'] != "0") { ?>
|
|
77
|
77
|
<script src="media/style/<?= $modx->config['manager_theme'] ?>/js/color.switcher.js"
|
|
78
|
78
|
type="text/javascript"></script>
|
|
@@ -85,7 +85,7 @@ discard block |
|
|
block discarded – undo |
|
85
|
85
|
<?php } ?>
|
|
86
|
86
|
|
|
87
|
87
|
<!-- OnManagerMainFrameHeaderHTMLBlock -->
|
|
88
|
|
- <?= $onManagerMainFrameHeaderHTMLBlock . "\n" ?>
|
|
|
88
|
+ <?= $onManagerMainFrameHeaderHTMLBlock."\n" ?>
|
|
89
|
89
|
|
|
90
|
90
|
<script type="text/javascript">
|
|
91
|
91
|
if (!evo) {
|
|
@@ -114,7 +114,7 @@ discard block |
|
|
block discarded – undo |
|
114
|
114
|
<script>
|
|
115
|
115
|
<?php
|
|
116
|
116
|
if (isset($_REQUEST['r']) && preg_match('@^[0-9]+$@', $_REQUEST['r'])) {
|
|
117
|
|
- echo 'doRefresh(' . $_REQUEST['r'] . ");\n";
|
|
|
117
|
+ echo 'doRefresh('.$_REQUEST['r'].");\n";
|
|
118
|
118
|
}
|
|
119
|
119
|
?>
|
|
120
|
120
|
</script>
|
evolution-cms /
evolution
