commit 9ba9fecfeb39b8c5755a2fa540c254d7e9fb4e03
parent c058001533061c30cee675f01dd7a641f350bd51
Author: Jan Dankert <devnull@localhost>
Date: Wed, 4 Jul 2018 23:28:33 +0200
Fix: Theme-CSS mit korrekten Bildpfaden
Diffstat:
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/modules/cms-ui/action/IndexAction.class.php b/modules/cms-ui/action/IndexAction.class.php
@@ -160,7 +160,7 @@ class IndexAction extends Action
$styleFiles = \FileUtils::readDir(OR_THEMES_DIR . 'default/style');
foreach( $styleFiles as $styleFile ) {
- if (substr($styleFile,-5) == '.less')
+ if (substr($styleFile,-5) == '.less' )
$css[] = OR_THEMES_DIR . 'default/style'.'/'.substr($styleFile,0,-5);
}
@@ -261,7 +261,7 @@ class IndexAction extends Action
public function themestyleView()
{
- $themeLessFile = OR_THEMES_DIR . 'default/style/openrat-theme.less';
+ $themeLessFile = OR_THEMES_DIR . 'default/style/theme/openrat-theme.less';
$this->lastModified(filemtime($themeLessFile));
header('Content-Type: text/css');
@@ -274,7 +274,7 @@ class IndexAction extends Action
private function getThemeCSS()
{
// Je Theme die Theme-CSS-Datei ausgeben.
- $lessFile = OR_THEMES_DIR . 'default/style/openrat-theme.less';
+ $lessFile = OR_THEMES_DIR . 'default/style/theme/openrat-theme.less';
$css = '';
diff --git a/modules/cms-ui/themes/default/layout/index.php b/modules/cms-ui/themes/default/layout/index.php
@@ -24,9 +24,9 @@
<link rel="stylesheet" type="text/css" href="<?php echo OR_HTML_MODULES_DIR . 'editor/codemirror/lib/codemirror.css' ?>" />
<?php foreach( $cssFiles as $cssFile) { ?> <link rel="stylesheet" type="text/css" href="<?php echo $cssFile ?>" />
<?php } ?>
- <link rel="stylesheet" type="text/css" href="<?php echo Html::url('index','themestyle') ?>" />
+ <link rel="stylesheet" type="text/css" href="<?php echo Html::url('index','themestyle',0,array('embed'=>'1')) ?>" />
<meta name="theme-color" content="<?php echo $themeColor ?>" />
- <link rel="manifest" href="<?php echo Html::url('index','manifest') ?>" />
+ <link rel="manifest" href="<?php echo Html::url('index','manifest',0,array('embed'=>'1')) ?>" />
</head>
<body>
@@ -45,7 +45,7 @@
<header>
<a href=""></a>
</header>
- <div id="navigation" class="view view-static" data-action="tree" data-method="show">
+ <div id="navigation" class="view view-static" data-action="tree" data-method="tree">
<?php embedView('tree','tree'); ?>
</div>
@@ -55,8 +55,8 @@
<header>
<span class="title"></span>
</header>
- <div id="editor" class="view view-loader" data-method="show">
- <?php embedView($action,'show'); ?>
+ <div id="editor" class="view view-loader" data-method="edit">
+ <?php embedView($action,'edit'); ?>
</div>
</main>
diff --git a/modules/cms-ui/themes/default/style/theme/openrat-theme.less b/modules/cms-ui/themes/default/style/theme/openrat-theme.less
@@ -204,7 +204,7 @@ html.theme-@{cms-theme-id} {
ul.tree, ul.tree ul {
list-style-type: none;
- background: url(../images/tree_line.gif) repeat-y;
+ background: url(./modules/cms-ui/themes/default/images//tree_line.gif) repeat-y;
xmargin: 0;
padding: 0;
}
@@ -213,22 +213,22 @@ html.theme-@{cms-theme-id} {
xmargin: 0;
padding: 0 0px;
line-height: 18px;
- background: url(../images/tree_none.gif) no-repeat;
+ background: url(./modules/cms-ui/themes/default/images//tree_none.gif) no-repeat;
xcolor: #369;
font-weight: normal;
white-space: nowrap;
}
ul.tree li.last, ul.tree li:last-child {
- background: url(../images/tree_none_end.gif) no-repeat;
+ background: url(./modules/cms-ui/themes/default/images//tree_none_end.gif) no-repeat;
}
div.tree.open {
- background: url(../images/tree_minus.png) no-repeat;
+ background: url(./modules/cms-ui/themes/default/images//tree_minus.png) no-repeat;
}
div.tree.closed {
- background: url(../images/tree_plus.png) no-repeat;
+ background: url(./modules/cms-ui/themes/default/images//tree_plus.png) no-repeat;
}
body > div {
