commit 5c5c88e4151d6ad44971aca6c023e4020e0d277f parent 5722d959f88575fc02f96e3a02d5f4b9cedf0448 Author: Jan Dankert <devnull@localhost> Date: Sat, 30 Dec 2017 01:43:43 +0100 Fix: Bei der HTML-Ausgabe dürfen die Links auf Bilder nur relativ zum Root-Dir sein. Diffstat:
15 files changed, 161 insertions(+), 158 deletions(-)
diff --git a/dev-helper/create-output-files.sh b/dev-helper/create-output-files.sh @@ -9,7 +9,7 @@ # # echo "Start ("as `whoami` ")" -for jsfile in `find themes -name "*.js" -not -name "*.min.js"`; do +for jsfile in `find modules/cms-ui/themes -name "*.js" -not -name "*.min.js"`; do jsfile="${jsfile%.*}" echo "JS found: $jsfile" if [ ! -f $jsfile.min.js ]; then cp -v $jsfile.js $jsfile.min.js; @@ -26,7 +26,7 @@ for jsfile in `find modules/editor/codemirror -name "*.js" -not -name "*.min.js" done -for tplfile in `find themes -name "*.src.xml"`; do +for tplfile in `find modules/cms-ui/themes -name "*.src.xml"`; do tplfile="${tplfile%.*}" tplfile="${tplfile%.*}" @@ -37,7 +37,7 @@ for tplfile in `find themes -name "*.src.xml"`; do done # CSS-Files -for lessfile in `find themes -name "*.less"`; do +for lessfile in `find modules/cms-ui/themes -name "*.less"`; do lessfile="${lessfile%.*}" echo "LESS found: $lessfile" if [ ! -f $lessfile.css ]; then touch -d '2000-01-01' $lessfile.css; @@ -48,8 +48,8 @@ for lessfile in `find themes -name "*.less"`; do chmod a+rw -v $lessfile.min.css done -touch themes/default/production/combined.min.css -chmod a+w themes/default/production/combined.min.css +touch modules/cms-ui/themes/default/production/combined.min.css +chmod a+w modules/cms-ui/themes/default/production/combined.min.css -touch themes/default/production/combined.min.js -chmod a+w themes/default/production/combined.min.js +touch modules/cms-ui/themes/default/production/combined.min.js +chmod a+w modules/cms-ui/themes/default/production/combined.min.js diff --git a/modules/cms-core/action/IndexAction.class.php b/modules/cms-core/action/IndexAction.class.php @@ -139,14 +139,14 @@ class IndexAction extends Action $css = array(); $css[] = OR_THEMES_DIR . 'default/css/openrat-ui'; $css[] = OR_THEMES_DIR . 'default/css/openrat-workbench'; - //$css[] = OR_MODULES_DIR . 'editor/codemirror/lib/codemirror'; + //$css[] = OR_HTML_MODULES_DIR . 'editor/codemirror/lib/codemirror'; // Komponentenbasiertes CSS $elements = parse_ini_file(OR_THEMES_DIR . config('interface', 'theme') . '/include/elements.ini.' . PHP_EXT); foreach (array_keys($elements) as $c) { - $componentCssFile = OR_MODULES_DIR . 'template-engine/components/html/' . $c . '/' . $c; + $componentCssFile = OR_HTML_MODULES_DIR . 'template-engine/components/html/' . $c . '/' . $c; if (is_file($componentCssFile . '.less')) $css[] = $componentCssFile; } @@ -318,128 +318,128 @@ class IndexAction extends Action // Codemirror Source Editor - $js[] = OR_MODULES_DIR . 'editor/codemirror/lib/codemirror'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/handlebars/handlebars'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/smalltalk/smalltalk'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/php/php'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/cobol/cobol'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/haskell/haskell'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mathematica/mathematica'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/pug/pug'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/livescript/livescript'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/yaml-frontmatter/yaml-frontmatter'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/stylus/stylus'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/markdown/markdown'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/jsx/jsx'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/velocity/velocity'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/fortran/fortran'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mirc/mirc'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/xquery/xquery'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/elm/elm'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/vhdl/vhdl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/verilog/verilog'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/spreadsheet/spreadsheet'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/coffeescript/coffeescript'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/tiddlywiki/tiddlywiki'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mumps/mumps'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/eiffel/eiffel'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/webidl/webidl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ebnf/ebnf'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/http/http'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/textile/textile'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/r/r'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/haml/haml'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ecl/ecl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/cypher/cypher'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/sieve/sieve'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/soy/soy'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/pig/pig'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/apl/apl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/crystal/crystal'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/clike/clike'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/oz/oz'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/modelica/modelica'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/gherkin/gherkin'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/swift/swift'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/scheme/scheme'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/idl/idl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/yaml/yaml'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/vue/vue'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/twig/twig'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/cmake/cmake'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/asciiarmor/asciiarmor'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/pegjs/pegjs'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/solr/solr'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/tiki/tiki'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/slim/slim'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/puppet/puppet'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/meta'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/go/go'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/commonlisp/commonlisp'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/rust/rust'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/powershell/powershell'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/stex/stex'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/q/q'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/htmlembedded/htmlembedded'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/d/d'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/protobuf/protobuf'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mscgen/mscgen'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/django/django'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/toml/toml'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/yacas/yacas'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/dockerfile/dockerfile'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/python/python'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/vb/vb'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/octave/octave'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/tcl/tcl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/clojure/clojure'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/sass/sass'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/gas/gas'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/sas/sas'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/julia/julia'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/fcl/fcl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/tornado/tornado'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/asterisk/asterisk'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/sql/sql'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/gfm/gfm'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mllike/mllike'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/rst/rst'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ntriples/ntriples'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/sparql/sparql'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/properties/properties'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/rpm/rpm'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/htmlmixed/htmlmixed'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/xml/xml'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ttcn-cfg/ttcn-cfg'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ttcn/ttcn'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/z80/z80'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/brainfuck/brainfuck'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/forth/forth'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/nginx/nginx'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/javascript/javascript'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/pascal/pascal'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/haxe/haxe'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/perl/perl'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/factor/factor'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/smarty/smarty'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/vbscript/vbscript'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/dylan/dylan'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/asn.1/asn.1'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/ruby/ruby'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/nsis/nsis'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/css/css'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/haskell-literate/haskell-literate'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/mbox/mbox'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/dtd/dtd'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/erlang/erlang'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/turtle/turtle'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/troff/troff'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/jinja2/jinja2'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/diff/diff'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/dart/dart'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/shell/shell'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/lua/lua'; - $js[] = OR_MODULES_DIR . 'editor/codemirror/mode/groovy/groovy'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/lib/codemirror'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/handlebars/handlebars'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/smalltalk/smalltalk'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/php/php'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/cobol/cobol'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/haskell/haskell'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mathematica/mathematica'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/pug/pug'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/livescript/livescript'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/yaml-frontmatter/yaml-frontmatter'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/stylus/stylus'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/markdown/markdown'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/jsx/jsx'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/velocity/velocity'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/fortran/fortran'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mirc/mirc'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/xquery/xquery'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/elm/elm'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/vhdl/vhdl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/verilog/verilog'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/spreadsheet/spreadsheet'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/coffeescript/coffeescript'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/tiddlywiki/tiddlywiki'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mumps/mumps'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/eiffel/eiffel'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/webidl/webidl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ebnf/ebnf'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/http/http'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/textile/textile'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/r/r'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/haml/haml'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ecl/ecl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/cypher/cypher'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/sieve/sieve'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/soy/soy'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/pig/pig'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/apl/apl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/crystal/crystal'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/clike/clike'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/oz/oz'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/modelica/modelica'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/gherkin/gherkin'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/swift/swift'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/scheme/scheme'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/idl/idl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/yaml/yaml'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/vue/vue'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/twig/twig'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/cmake/cmake'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/asciiarmor/asciiarmor'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/pegjs/pegjs'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/solr/solr'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/tiki/tiki'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/slim/slim'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/puppet/puppet'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/meta'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/go/go'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/commonlisp/commonlisp'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/rust/rust'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/powershell/powershell'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/stex/stex'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/q/q'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/htmlembedded/htmlembedded'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/d/d'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/protobuf/protobuf'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mscgen/mscgen'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/django/django'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/toml/toml'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/yacas/yacas'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/dockerfile/dockerfile'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/python/python'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/vb/vb'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/octave/octave'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/tcl/tcl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/clojure/clojure'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/sass/sass'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/gas/gas'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/sas/sas'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/julia/julia'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/fcl/fcl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/tornado/tornado'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/asterisk/asterisk'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/sql/sql'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/gfm/gfm'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mllike/mllike'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/rst/rst'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ntriples/ntriples'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/sparql/sparql'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/properties/properties'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/rpm/rpm'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/htmlmixed/htmlmixed'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/xml/xml'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ttcn-cfg/ttcn-cfg'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ttcn/ttcn'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/z80/z80'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/brainfuck/brainfuck'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/forth/forth'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/nginx/nginx'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/javascript/javascript'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/pascal/pascal'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/haxe/haxe'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/perl/perl'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/factor/factor'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/smarty/smarty'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/vbscript/vbscript'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/dylan/dylan'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/asn.1/asn.1'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/ruby/ruby'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/nsis/nsis'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/css/css'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/haskell-literate/haskell-literate'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/mbox/mbox'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/dtd/dtd'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/erlang/erlang'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/turtle/turtle'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/troff/troff'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/jinja2/jinja2'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/diff/diff'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/dart/dart'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/shell/shell'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/lua/lua'; + $js[] = OR_HTML_MODULES_DIR . 'editor/codemirror/mode/groovy/groovy'; //$js[] = OR_THEMES_DIR . '../editor/markitup/markitup/jquery.markitup'; @@ -452,7 +452,7 @@ class IndexAction extends Action foreach (array_keys($elements) as $c) { - $componentJsFile = OR_MODULES_DIR . '/template-engine/components/html/' . $c . '/' . $c; + $componentJsFile = OR_HTML_MODULES_DIR . '/template-engine/components/html/' . $c . '/' . $c; if (is_file($componentJsFile . '.js')) $js[] = $componentJsFile; } diff --git a/modules/cms-core/init.php b/modules/cms-core/init.php @@ -46,12 +46,15 @@ define('OR_DYNAMICCLASSES_DIR',OR_MODULES_DIR.'cms-macros/macro/' ); define('OR_TEXTCLASSES_DIR' ,OR_MODULES_DIR.'wikiparser/' ); define('OR_PREFERENCES_DIR' ,CMS_ROOT_DIR.'config/'); define('OR_CONFIG_DIR' ,OR_PREFERENCES_DIR ); -define('OR_THEMES_DIR' ,OR_MODULES_DIR.'cms-ui/themes/' ); define('OR_TMP_DIR' ,CMS_ROOT_DIR.'tmp/' ); define('OR_CONTROLLER_FILE' ,'dispatcher'); define('START_TIME' ,time() ); define('REQUEST_ID' ,'req'.time().rand() ); +// Must be relative to HTML-Path! +define('OR_HTML_MODULES_DIR' ,'./modules/' ); +define('OR_THEMES_DIR' ,OR_HTML_MODULES_DIR.'cms-ui/themes/'); + define('SECURITY_GUEST',1); // Jeder (auch nicht angemeldete) dürfen diese Aktion ausführen define('SECURITY_USER' ,2); // Angemeldete Benutzer dürfen diese Aktion ausführen define('SECURITY_ADMIN',3); // Nur Administratoren dürfen diese Aktion ausführen diff --git a/modules/cms-ui/themes/default/layout/index.php b/modules/cms-ui/themes/default/layout/index.php @@ -27,7 +27,7 @@ <?php foreach( $jsFiles as $jsFile ) { ?> <script src="<?php echo $jsFile ?>" defer></script> <?php } ?> - <link rel="stylesheet" type="text/css" href="<?php echo OR_MODULES_DIR . 'editor/codemirror/lib/codemirror.css' ?>" /> + <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 } ?> <style type="text/css"> diff --git a/modules/cms-ui/themes/default/templates/folder/edit.tpl.out.php b/modules/cms-ui/themes/default/templates/folder/edit.tpl.out.php @@ -57,7 +57,7 @@ <td class="clickable"> <label for="<?php echo REQUEST_ID ?>_<?php echo $id ?>" class="label"> <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo $objectid ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon_<?php echo $icon ?>.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,40,'..',constant('STR_PAD_BOTH') )))); ?></span> @@ -84,7 +84,7 @@ </td> <td class="clickable" colspan="2"> <a target="_self" data-type="view" data-action="folder" data-method="createfolder" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/icon/create.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/icon/create.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> @@ -99,7 +99,7 @@ </td> <td class="clickable" colspan="2"> <a target="_self" data-type="view" data-action="folder" data-method="createpage" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/icon/create.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/icon/create.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> @@ -114,7 +114,7 @@ </td> <td class="clickable" colspan="2"> <a target="_self" data-type="view" data-action="folder" data-method="createfile" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/icon/create.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/icon/create.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> @@ -129,7 +129,7 @@ </td> <td class="clickable" colspan="2"> <a target="_self" data-type="view" data-action="folder" data-method="createlink" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/icon/create.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/icon/create.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/image/edit.tpl.out.php b/modules/cms-ui/themes/default/templates/image/edit.tpl.out.php @@ -9,7 +9,7 @@ <div class="input"> <br/> - <input size="40" id="req1514324525958008610_file" type="file" name="file" class="upload" /> + <input size="40" id="req15145078411938795353_file" type="file" name="file" class="upload" /> <br/> diff --git a/modules/cms-ui/themes/default/templates/languagelist/show.tpl.out.php b/modules/cms-ui/themes/default/templates/languagelist/show.tpl.out.php @@ -22,7 +22,7 @@ <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> <tr class="data"> <td class="clickable"> - <img class="" title="" src="./themes/default/images/icon/icon_language.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_language.png" /> <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="language" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo $id ?>" href="javascript:void(0);"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> @@ -72,8 +72,8 @@ <?php } ?> <tr class="data"> <td class="clickable" colspan="4"> - <a target="_self" data-type="view" data-action="<?php echo OR_ACTION ?>" data-method="add" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/add.png" /> + <a target="_self" data-type="view" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/add.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/modellist/show.tpl.out.php b/modules/cms-ui/themes/default/templates/modellist/show.tpl.out.php @@ -18,7 +18,7 @@ <?php foreach($el as $list_key=>$list_value){ ?><?php extract($list_value) ?> <tr class="data"> <td class="clickable"> - <img class="" title="" src="./themes/default/images/icon/icon_model.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_model.png" /> <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="model" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo $id ?>" href="javascript:void(0);"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,25,'..',constant('STR_PAD_BOTH') )))); ?></span> @@ -64,8 +64,8 @@ <?php } ?> <tr class="data"> <td class="clickable" colspan="3"> - <a target="_self" data-type="view" data-action="<?php echo OR_ACTION ?>" data-method="add" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/add.png" /> + <a target="_self" data-type="view" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/add.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/page/changetemplate.tpl.out.php b/modules/cms-ui/themes/default/templates/page/changetemplate.tpl.out.php @@ -8,7 +8,7 @@ </div> <div class="input"> <a target="_self" data-url="<?php echo $template_url ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon_template.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_template.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/page/edit.tpl.out.php b/modules/cms-ui/themes/default/templates/page/edit.tpl.out.php @@ -25,7 +25,7 @@ <tr class="data"> <td class="clickable"> <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="pageelement" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo $pageelementid ?>" href="javascript:void(0);"> - <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $type ?>.svg" /> + <img class="image-icon image-icon--element" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/element/<?php echo $type ?>.svg" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/page/preview.tpl.out.php b/modules/cms-ui/themes/default/templates/page/preview.tpl.out.php @@ -3,7 +3,7 @@ <iframe name="preview" src="<?php echo $preview_url ?>"></iframe> <div class="clickable"> - <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="<?php echo OR_ACTION ?>" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> + <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_open_in_new_window'.'')))); ?></span> </a> diff --git a/modules/cms-ui/themes/default/templates/pageelement/edit.tpl.out.php b/modules/cms-ui/themes/default/templates/pageelement/edit.tpl.out.php @@ -17,7 +17,7 @@ <tr> <td class="help" colspan="8"> <a target="_self" data-url="<?php echo $lastmonthurl ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/left.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/left.png" /> </a> @@ -28,14 +28,14 @@ <span class="text"><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $nextmonthurl ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/right.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/right.png" /> </a> <span class="text"><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $lastyearurl ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/left.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/left.png" /> </a> @@ -46,7 +46,7 @@ <span class="text"><?php echo nl2br(' '); ?></span> <a target="_self" data-url="<?php echo $nextyearurl ?>" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/right.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon/right.png" /> </a> diff --git a/modules/cms-ui/themes/default/templates/start/projectmenu.tpl.out.php b/modules/cms-ui/themes/default/templates/start/projectmenu.tpl.out.php @@ -33,7 +33,7 @@ <a title="<?php echo lang('TREE_CHOOSE_PROJECT') ?>" target="_self" data-type="post" data-action="" data-method="<?php echo OR_METHOD ?>" data-id="<?php echo $id ?>" data-data="{"action":"<?php echo OR_ACTION ?>","subaction":"<?php echo OR_METHOD ?>","id":"<?php echo $id ?>","token":"<?php echo token() ?>","none":"0"}"> <?php $project= 'project'; ?> - <img class="" title="" src="./themes/default/images/icon_project.png" /> + <img class="" title="" src="/mnt/data/dankert/public_html/cms/cms09/modules/cms-core/../../modules/cms-ui/themes/default/images/icon_project.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,30,'..',constant('STR_PAD_BOTH') )))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/template/edit.tpl.out.php b/modules/cms-ui/themes/default/templates/template/edit.tpl.out.php @@ -16,7 +16,7 @@ <?php foreach($elements as $list_key=>$list_value){ ?><?php extract($list_value) ?> <tr class="data"> <td onclick="javascript:openNewAction('<?php echo $name ?>','element','<?php echo $id ?>');"> - <img class="image-icon image-icon--element" title="" src="./themes/default/images/icon/element/<?php echo $type ?>.svg" /> + <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $type ?>.svg" /> <span class="text" title="<?php echo $description ?>"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> @@ -38,7 +38,7 @@ <tr class="data"> <td class="clickable" colspan="2"> <a target="_self" data-type="view" data-action="" data-method="addel" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/add.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/add.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_template_addel'.'')))); ?></span> @@ -52,7 +52,7 @@ <tr class="data"> <td class="clickable"> <a target="_self" data-type="view" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/template.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/template.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'edit'.'')))); ?></span> diff --git a/modules/cms-ui/themes/default/templates/templatelist/show.tpl.out.php b/modules/cms-ui/themes/default/templates/templatelist/show.tpl.out.php @@ -24,7 +24,7 @@ <tr class="data"> <td class="clickable" colspan="1"> <a target="_self" data-type="view" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" href="javascript:void(0);"> - <img class="" title="" src="./themes/default/images/icon/add.png" /> + <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/add.png" /> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span>