commit bab9bc3eac1b9998343f76940538c95e2eb6dee6
parent c07ede8a90cc75661ce9a202bf377ea0f9b7d6ed
Author: Jan Dankert <devnull@localhost>
Date: Tue, 30 Oct 2012 23:16:24 +0100
Fix für Filebrowser.
Diffstat:
3 files changed, 137 insertions(+), 7 deletions(-)
diff --git a/themes/default/include/html/link.inc.php b/themes/default/include/html/link.inc.php
@@ -35,7 +35,7 @@
#END-IF
//$tmp_url = Html::url($attr_action,$attr_subaction,!empty($attr_id)?$attr_id:$this->getRequestId(),$params);
-
+ $tmp_href = 'javascript:void(0);';
switch( $attr_type )
{
case 'post':
@@ -45,9 +45,13 @@
+$params );
$tmp_data = str_replace("\n",'',str_replace('"','"',$tmp_data));
break;
+ case 'html';
+ $tmp_href = $attr_url;
+ default:
+ $tmp_data = '';
}
// if ( substr($tmp_url,0,10) != 'javascript' )
// $tmp_url = "javascript:loadViewByName('".$attr_target."','".$tmp_url.(isset($attr_anchor)?'#'.$attr_anchor:'')."'); return false;";
-?><a data-url="<?php echo $attr_url ?>" target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="javascript:void(0);" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo $attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo $attr_action ?>" data-method="<?php echo $attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">
-\ No newline at end of file
+?><a data-url="<?php echo $attr_url ?>" target="<?php echo $attr_frame ?>"<?php if (isset($attr_name)) { ?> data-name="<?php echo $attr_name ?>" name="<?php echo $attr_name ?>"<?php }else{ ?> href="<?php echo $tmp_href ?>" <?php } ?> class="<?php echo $attr_class ?>" data-id="<?php echo @$attr_id ?>" data-type="<?php echo $attr_type ?>" data-action="<?php echo @$attr_action ?>" data-method="<?php echo @$attr_subaction ?>" data-data="<?php echo $tmp_data ?>" <?php if (isset($attr_accesskey)) echo ' accesskey="'.$attr_accesskey.'"' ?> title="<?php echo encodeHtml($attr_title) ?>">
+\ No newline at end of file
diff --git a/themes/default/include/html/page.inc.php b/themes/default/include/html/page.inc.php
@@ -1,4 +1,85 @@
+<?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>
<head>
+ <title><?php echo OR_TITLE.' '.OR_VERSION ?></title>
+ <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) ) { ?>
+ <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="MSSmartTagsPreventParsing" content="true" >
+ <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 )
+ {
+ ?>
+ <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo $meta['title'] ?>" ><?php
+ } ?>
+ <link id="userstyle" rel="stylesheet" type="text/css" href="<?php echo css_link($style) ?>" >
+
+ <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/skins/markitup/style.css" />
+ <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/sets/default/style.css" />
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-1.6.2.min.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/js/jquery-ui-1.8.16.custom.min.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.scrollTo.js"></script>
+ <!--
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery.mjs.nestedSortable.js"></script>
+ -->
+
+ <!-- OpenRat internal JS -->
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/openrat.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orHint.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orSearch.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLinkify.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orTree.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orLoadView.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>default/js/plugin/jquery-plugin-orAutoheight.js"></script>
+ <!--
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/wymeditor/wymeditor/jquery.wymeditor.min.js"></script>
+ -->
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/markitup/markitup/jquery.markitup.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/ckeditor.js"></script>
+ <script src="<?php echo OR_THEMES_EXT_DIR ?>../editor/editor/adapters/jquery.js"></script>
+ <!--
+ <script src="/~dankert/cms-test/cms09/themes/default/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>
+ <script src="/~dankert/cms/themes/default/js/xxxxxxxxxxxjquery-plugin-orSearchBox.js"></script>
+ <link rel="stylesheet" type="text/css" href="<?php echo OR_THEMES_EXT_DIR ?>default/js/jquery-ui/css/pepper-grinder/jquery-ui-1.8.9.custom.css" >
+ -->
</head>
+
+
+
<body>
+
+<script type="text/javascript">
+<!--
+// Konstanten
+var OR_THEMES_EXT_DIR = '<?php echo OR_THEMES_EXT_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 ?>';
+var REQ_PARAM_SUBACTION = '<?php echo REQ_PARAM_SUBACTION ?>';
+var REQ_PARAM_TARGETSUBACTION = '<?php echo REQ_PARAM_TARGETSUBACTION ?>';
+var REQ_PARAM_ID = '<?php echo REQ_PARAM_ID ?>';
+var REQ_PARAM_OBJECT_ID = '<?php echo REQ_PARAM_OBJECT_ID ?>';
+var REQ_PARAM_LANGUAGE_ID = '<?php echo REQ_PARAM_LANGUAGE_ID ?>';
+var REQ_PARAM_MODEL_ID = '<?php echo REQ_PARAM_MODEL_ID ?>';
+var REQ_PARAM_PROJECT_ID = '<?php echo REQ_PARAM_PROJECT_ID ?>';
+var REQ_PARAM_ELEMENT_ID = '<?php echo REQ_PARAM_ELEMENT_ID ?>';
+var REQ_PARAM_TEMPLATE_ID = '<?php echo REQ_PARAM_TEMPLATE_ID ?>';
+var REQ_PARAM_DATABASE_ID = '<?php echo REQ_PARAM_DATABASE_ID ?>';
+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-->";} ?>
+
diff --git a/themes/default/templates/filebrowser/browse.tpl.src.xml b/themes/default/templates/filebrowser/browse.tpl.src.xml
@@ -1,3 +1,48 @@
-<output xmlns="http://www.openrat.de/template"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"><page><window icon="folder"><list list="notices" extract="true"><row class="headline"><column colspan="2"><text key="var:key"></text><newline></newline></column></row></list><table><row class="headline"><column><text key="GLOBAL_TYPE"></text><text raw="_/_"></text><text key="GLOBAL_NAME"></text></column><column><text key="GLOBAL_LASTCHANGE"></text></column></row><if present="up_url"><row class="data"><column width="50%" colspan="8"><link url="var:up_url"><image type="folder"></image><text raw="__.._____________________"></text></link></column></row></if><list list="object" extract="true"><row class="data"><column><link url="var:url" title="var:desc" class="var:class"><image type="var:icon"></image><text var="name"></text><text raw="_"></text></link></column><column><date date="var:date"></date></column></row></list><if empty="object"><row><column colspan="2"><text text="GLOBAL_NOT_FOUND"></text></column></row></if><if true="var:writable"><row><column class="act" colspan="2"><newline></newline><form action="filebrowser" subaction="upload" id="var:id" enctype="multipart/form-data"><hidden name="CKEditorFuncNum"></hidden><text key="file"></text><text raw="__"></text><upload name="file"></upload><text raw="__"></text><button type="ok" text="add"></button></form><newline></newline><newline></newline><set var="name" value=""></set><form action="filebrowser" subaction="addfolder" id="var:id"><hidden name="CKEditorFuncNum"></hidden><text key="folder"></text><text raw="__"></text><input name="name"></input><text raw="__"></text><button type="ok" text="add"></button></form></column></row></if></table></window></page></output>
-\ No newline at end of file
+<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.openrat.de/template ../template.xsd">
+ <page>
+ <table>
+ <row class="headline">
+ <column>
+ <text key="GLOBAL_TYPE"></text>
+ <text raw="_/_"></text>
+ <text key="GLOBAL_NAME"></text>
+ </column>
+ <column>
+ <text key="GLOBAL_LASTCHANGE"></text>
+ </column>
+ </row>
+ <if present="up_url">
+ <row class="data">
+ <column width="50%" colspan="8">
+ <link type="html" url="var:up_url">
+ <image type="folder"></image>
+ <text raw="__.._____________________"></text>
+ </link>
+ </column>
+ </row>
+ </if>
+ <list list="object" extract="true">
+ <row class="data">
+ <column class="clickable">
+ <link type="html" url="var:url" title="var:desc" class="var:class">
+ <image type="var:icon"></image>
+ <text var="name"></text>
+ <text raw="_"></text>
+ </link>
+ </column>
+ <column>
+ <date date="var:date"></date>
+ </column>
+ </row>
+ </list>
+ <if empty="object">
+ <row>
+ <column colspan="2">
+ <text text="GLOBAL_NOT_FOUND"></text>
+ </column>
+ </row>
+ </if>
+ </table>
+ </page>
+</output>
+\ No newline at end of file
