commit c789ee01f0ea4894097e69c73feadbccb7a4902c
parent 59b8fb960231c76db39f4c07c7369651877e5590
Author: Jan Dankert <devnull@localhost>
Date: Sat, 16 Dec 2017 23:41:13 +0100
Konstante OR_THEMES_EXT_DIR ist nicht mehr notwendig.
Diffstat:
8 files changed, 44 insertions(+), 45 deletions(-)
diff --git a/init.php b/init.php
@@ -45,7 +45,6 @@ define('OR_TEXTCLASSES_DIR' ,OR_MODULES_DIR.'wikiparser/' );
define('OR_PREFERENCES_DIR' ,'./config/');
define('OR_CONFIG_DIR' ,OR_PREFERENCES_DIR );
define('OR_THEMES_DIR' ,'./themes/' );
-define('OR_THEMES_EXT_DIR' ,OR_THEMES_DIR);
define('OR_TMP_DIR' ,'./tmp/' );
define('OR_CONTROLLER_FILE' ,'dispatcher');
define('START_TIME' ,time() );
diff --git a/modules/cms-core/action/Action.class.php b/modules/cms-core/action/Action.class.php
@@ -456,7 +456,7 @@ use \LogicException;
// Setzen einiger Standard-Variablen
//
$tpl_dir = OR_THEMES_DIR . $conf['interface']['theme'] . '/pages/html/';
- $image_dir = OR_THEMES_EXT_DIR . $conf['interface']['theme'] . '/images/';
+ $image_dir = OR_THEMES_DIR . $conf['interface']['theme'] . '/images/';
$user = Session::getUser();
diff --git a/modules/cms-core/action/IndexAction.class.php b/modules/cms-core/action/IndexAction.class.php
@@ -135,8 +135,8 @@ class IndexAction extends Action
$outFiles = array();
$css = array();
- $css[] = OR_THEMES_EXT_DIR . 'default/css/openrat-ui';
- $css[] = OR_THEMES_EXT_DIR . 'default/css/openrat-workbench';
+ $css[] = OR_THEMES_DIR . 'default/css/openrat-ui';
+ $css[] = OR_THEMES_DIR . 'default/css/openrat-workbench';
// Komponentenbasiertes CSS
$elements = parse_ini_file(OR_THEMES_DIR . config('interface', 'theme') . '/include/elements.ini.' . PHP_EXT);
@@ -236,7 +236,7 @@ class IndexAction extends Action
private function getThemeCSS()
{
// Je Theme die Theme-CSS-Datei ausgeben.
- $lessFile = OR_THEMES_EXT_DIR . 'default/css/openrat-theme.less';
+ $lessFile = OR_THEMES_DIR . 'default/css/openrat-theme.less';
$css = '';
@@ -293,26 +293,26 @@ class IndexAction extends Action
else
{
$js = array();
- $js[] = OR_THEMES_EXT_DIR . 'default/js/jquery-1.12.4';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/jquery-ui/js/jquery-ui-1.8.16.custom';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/jquery.scrollTo';
+ $js[] = OR_THEMES_DIR . 'default/js/jquery-1.12.4';
+ $js[] = OR_THEMES_DIR . 'default/js/jquery-ui/js/jquery-ui-1.8.16.custom';
+ $js[] = OR_THEMES_DIR . 'default/js/jquery.scrollTo';
// $js[] = OR_THEMES_EXT_DIR default/js/jquery.mjs.nestedSortable.js"></script>
// Jquery-Plugins
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orHint';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orSearch';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orLinkify';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orTree';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orLoadView';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-orAutoheight';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/plugin/jquery-plugin-svg';
- $js[] = OR_THEMES_EXT_DIR . 'default/js/jquery-qrcode';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orHint';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orSearch';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orLinkify';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orTree';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orLoadView';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-orAutoheight';
+ $js[] = OR_THEMES_DIR . 'default/js/plugin/jquery-plugin-svg';
+ $js[] = OR_THEMES_DIR . 'default/js/jquery-qrcode';
// OpenRat internal JS
- $js[] = OR_THEMES_EXT_DIR . 'default/js/openrat';
- $js[] = OR_THEMES_EXT_DIR . '../editor/markitup/markitup/jquery.markitup';
- $js[] = OR_THEMES_EXT_DIR . '../editor/editor/ckeditor';
- $js[] = OR_THEMES_EXT_DIR . '../editor/ace/src-min-noconflict/ace';
- $js[] = OR_THEMES_EXT_DIR . '../editor/editor/adapters/jquery';
+ $js[] = OR_THEMES_DIR . 'default/js/openrat';
+ $js[] = OR_THEMES_DIR . '../editor/markitup/markitup/jquery.markitup';
+ $js[] = OR_THEMES_DIR . '../editor/editor/ckeditor';
+ $js[] = OR_THEMES_DIR . '../editor/ace/src-min-noconflict/ace';
+ $js[] = OR_THEMES_DIR . '../editor/editor/adapters/jquery';
// Komponentenbasiertes Javascript
$elements = parse_ini_file(OR_THEMES_DIR . config('interface', 'theme') . '/include/elements.ini.' . PHP_EXT);
diff --git a/modules/cms-core/model/Page.class.php b/modules/cms-core/model/Page.class.php
@@ -719,7 +719,7 @@ class Page extends Object
}
if ( $this->icons )
- $src = str_replace( '{{->'.$id.'}}','<a href="javascript:parent.openNewAction(\''.$value->element->name.'\',\'pageelement\',\''.$this->objectid.'_'.$value->element->elementid.'\');" title="'.$value->element->desc.'"><img src="'.OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/images/icon_el_'.$value->element->type.IMG_ICON_EXT.'" border="0" align="left"></a>',$src );
+ $src = str_replace( '{{->'.$id.'}}','<a href="javascript:parent.openNewAction(\''.$value->element->name.'\',\'pageelement\',\''.$this->objectid.'_'.$value->element->elementid.'\');" title="'.$value->element->desc.'"><img src="'.OR_THEMES_DIR.$conf['interface']['theme'].'/images/icon_el_'.$value->element->type.IMG_ICON_EXT.'" border="0" align="left"></a>',$src );
else
$src = str_replace( '{{->'.$id.'}}','',$src );
}
diff --git a/modules/cms-core/model/Value.class.php b/modules/cms-core/model/Value.class.php
@@ -1532,7 +1532,7 @@ SQL
if ( $this->page->icons && $this->element->withIcon && $this->page->isHtml() )
{
// Anklickbaren Link voranstellen.
- $iconLink = '<a href="javascript:parent.openNewAction(\''.$this->element->name.'\',\'pageelement\',\''.$this->page->objectid.'_'.$this->element->elementid.'\');" title="'.$this->element->desc.'"><img src="'.OR_THEMES_EXT_DIR.$conf['interface']['theme'].'/images/icon_el_'.$this->element->type.IMG_ICON_EXT.'" border="0" align="left"></a>';
+ $iconLink = '<a href="javascript:parent.openNewAction(\''.$this->element->name.'\',\'pageelement\',\''.$this->page->objectid.'_'.$this->element->elementid.'\');" title="'.$this->element->desc.'"><img src="'.OR_THEMES_DIR.$conf['interface']['theme'].'/images/icon_el_'.$this->element->type.IMG_ICON_EXT.'" border="0" align="left"></a>';
$inhalt = $iconLink.$inhalt;
}
diff --git a/modules/template-engine/components/html/tree/component-tree.php b/modules/template-engine/components/html/tree/component-tree.php
@@ -13,7 +13,7 @@ function component_tree( $contents )
echo '<div class="tree" />';
echo '<div class="entry '.($selected?' selected':'').'" onclick="javascript:openNewAction( \''.$el['name'].'\',\''.$el['type'].'\',\''.$el['id'].'\',0 );">';
- echo '<img src="'.OR_THEMES_EXT_DIR.'default/images/icon_'.$el['type'].'.png" />';
+ echo '<img src="'.OR_THEMES_DIR.'default/images/icon_'.$el['type'].'.png" />';
echo $el['name'];
echo '</div>';
diff --git a/themes/default/layout/index.php b/themes/default/layout/index.php
@@ -1,24 +1,24 @@
<?php
if (!defined('OR_VERSION')) die('Forbidden');
- if (!headers_sent()) header('Content-Type: text/html; charset=UTF-8')
-?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html class="theme-<?php echo strtolower($style) ?> nojs">
+ if (!headers_sent()) header('Content-Type: text/html; charset=UTF-8')
+?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html class="theme-<?php echo strtolower($style) ?> nojs">
<head>
<?php $appName = config('application','name'); $appOperator = config('application','operator');
$title = $appName.(($appOperator!=$appName)?' - '.$appOperator:''); ?>
<title data-default="<?php echo $title ?>"><?php echo $title ?></title>
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="content-type" content="text/html; charset=UTF-8" >
-<?php if ( isset($refresh_url) ) { ?>
+<?php if ( isset($refresh_url) ) { ?>
<meta http-equiv="refresh" content="<?php echo isset($refresh_timeout)?$refresh_timeout:0 ?>; URL=<?php echo $refresh_url; if (ini_get('session.use_trans_sid')) echo '&'.session_name().'='.session_id(); ?>">
<?php } ?>
- <meta name="robots" content="noindex,nofollow" >
-<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu )
- {
- ?>
- <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" >
-<?php
- }
+ <meta name="robots" content="noindex,nofollow" >
+<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu )
+ {
+ ?>
+ <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" >
+<?php
+ }
?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta )
{
?>
@@ -32,7 +32,7 @@
<style type="text/css">
<?php echo $themeCss ?>
</style>
-</head>
+</head>
<?php
$ping_url = @$viewCache['header']['ping_url' ];
@@ -62,8 +62,8 @@ $ping_timeout = @$viewCache['header']['ping_timeout'];
<script type="text/javascript">
<!--
-// Konstanten
-var OR_THEMES_EXT_DIR = '<?php echo OR_THEMES_EXT_DIR ?>';
+// Konstanten
+var OR_THEMES_EXT_DIR = '<?php echo OR_THEMES_DIR ?>';
var OR_CONTROLLER_FILE = '<?php echo OR_CONTROLLER_FILE ?>';
var REQ_PARAM_TOKEN = '<?php echo REQ_PARAM_TOKEN ?>';
var REQ_PARAM_ACTION = '<?php echo REQ_PARAM_ACTION ?>';
@@ -81,8 +81,8 @@ var REQ_PARAM_TARGET = '<?php echo REQ_PARAM_TARGET ?>';
// -->
</script>
-
-<?php global $viewCache; /* Debug-Information */ if (@$showDuration||true) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($viewCache,true));echo "\n-->";} ?>
+
+<?php global $viewCache; /* Debug-Information */ if (@$showDuration||true) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($viewCache,true));echo "\n-->";} ?>
<div id="noticebar">
</div>
diff --git a/themes/default/layout/perspective/window.php b/themes/default/layout/perspective/window.php
@@ -30,7 +30,7 @@ function view_header( $name )
$tmp_text = langHtml('menu_'.$vn);
$liClass = 'action'.($vn==$v['default']?' active':'').(empty($action)?' dependent':' static');
- $icon_url = OR_THEMES_EXT_DIR.'default/images/icon/'.$vn.'.png';
+ $icon_url = OR_THEMES_DIR.'default/images/icon/'.$vn.'.png';
?><li data-action="<?php echo $action ?>" data-id="0" data-method="<?php echo $vn ?>" class="<?php echo $liClass?>" title="<?php echo langHtml('menu_'.$vn.'_desc'); ?>"><?php
?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php
@@ -42,7 +42,7 @@ function view_header( $name )
{
$tmp_text = $preselectobject->name;
$liClass = 'action active';
- $icon_url = OR_THEMES_EXT_DIR.'default/images/icon_'.$preselectobject->getType().'.png';
+ $icon_url = OR_THEMES_DIR.'default/images/icon_'.$preselectobject->getType().'.png';
?><li data-id="<?php echo $preselectobject->objectid ?>" data-method="edit" data-u="<?php echo $preselectobject->getType() ?>" class="<?php echo $liClass?>" title="<?php echo $preselectobject->description ?>"><?php
?><img class="icon" src="<?php echo $icon_url ?>" /><div class="tabname"><?php echo $tmp_text ?></div><?php
@@ -79,11 +79,11 @@ setTimeout( function() { openNewAction( '<?php echo $object->name; ?>','<?php ec
<?php if (!empty($viewlist) || $name=='content') { /* Fenster-Menü anzeigen (sofern Views vorhanden) */ ?>
<div class="arrow-down" />
<div class="dropdown dropdownalignright">
-<div class="entry clickable"><a href="javascript:void(0);" class="fullscreen" data-type="fullscreen"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div>
+<div class="entry clickable"><a href="javascript:void(0);" class="fullscreen" data-type="fullscreen"><img src="<?php echo OR_THEMES_DIR.'default/images/icon/window/maximize.gif' ?>" title="<?php echo langHtml('window_fullscreen') ?>" /><?php echo langHtml('window_fullscreen') ?></a></div>
<?php
if ( @$conf['help']['enabled'] )
{
- ?><div class="entry clickable"><a href="javascript:void(0);" data-type="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_EXT_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php
+ ?><div class="entry clickable"><a href="javascript:void(0);" data-type="help" data-url="<?php echo $conf['help']['url'] ?>" data-suffix="<?php echo @$conf['help']['suffix'] ?>" title="<?php echo langHtml('MENU_HELP_DESC') ?>"><img src="<?php echo OR_THEMES_DIR.'default/images/icon/help.png' ?>" /><?php echo langHtml('MENU_HELP') ?></a></div><?php
}
?>
</div>
