openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 4a2e71d23f05d22e554b32bea84dd83ae1de5515
parent 54b77b8763d168aac3249491555dee079cb0caa0
Author: Jan Dankert <devnull@localhost>
Date:   Mon, 14 Jan 2019 21:48:08 +0100

Ordnerinhalte ├╝bersichtlicher anzeigen

Diffstat:
modules/cms-ui/themes/default/html/views/folder/edit.php | 141+++++++++++++++++++++++++------------------------------------------------------
modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml | 44+++-----------------------------------------
modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml | 28++--------------------------
3 files changed, 50 insertions(+), 163 deletions(-)

diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.php b/modules/cms-ui/themes/default/html/views/folder/edit.php @@ -1,7 +1,5 @@ - - <form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="folder" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form folder" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="folder" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div> <tr class="headline"> @@ -83,88 +81,42 @@ </td> <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'createfolder'}" href="<?php echo Html::url('folder','createfolder','',array('dialogAction'=>'folder','dialogMethod'=>'createfolder')) ?>"> - <i class="image-icon image-icon--method-add"></i> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> - - </a> - - </td> - </tr> - <tr class="data"> - <td> - <span><?php echo nl2br('&nbsp;'); ?></span> - - </td> - <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'createpage'}" href="<?php echo Html::url('folder','createpage','',array('dialogAction'=>'folder','dialogMethod'=>'createpage')) ?>"> + <a target="_self" data-type="dialog" data-action="folder" data-method="create" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'create'}" href="<?php echo Html::url('folder','create','',array('dialogAction'=>'folder','dialogMethod'=>'create')) ?>"> <i class="image-icon image-icon--method-add"></i> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_create'.'')))); ?></span> </a> </td> </tr> - <tr class="data"> - <td> - <span><?php echo nl2br('&nbsp;'); ?></span> - - </td> - <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'createfile'}" href="<?php echo Html::url('folder','createfile','',array('dialogAction'=>'folder','dialogMethod'=>'createfile')) ?>"> - <i class="image-icon image-icon--method-add"></i> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> + </table> + <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div> + <?php $type= $defaulttype; ?> + + <?php foreach($actionlist as $list_key=>$actiontype){ ?> + <div class="line"> + <div class="label"> + </div> + <div class="input"> + <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" name="type" value="<?php echo $actiontype ?>"<?php if($actiontype==@$type)echo ' checked="checked"' ?> /> - </a> - - </td> - </tr> - <tr class="data"> - <td> - <span><?php echo nl2br('&nbsp;'); ?></span> + <label for="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" class="label"> + <span><?php echo nl2br('&nbsp;'); ?></span> + + <span><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> + + </label> + </div> + </div> + <?php } ?> + <div class="line"> + <div class="label"> + </div> + <div class="input"> + <span><?php echo nl2br('&nbsp;&nbsp;&nbsp;&nbsp;'); ?></span> - </td> - <td colspan="2" class="clickable"> - <a target="_self" data-type="dialog" data-action="folder" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'folder','dialogMethod':'createlink'}" href="<?php echo Html::url('folder','createlink','',array('dialogAction'=>'folder','dialogMethod'=>'createlink')) ?>"> - <i class="image-icon image-icon--method-add"></i> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> - - </a> - - </td> - </tr> - <tr> - <td colspan="2"> - <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><legend class="on-click-open-close"><div class="arrow arrow-right on-closed"></div><div class="arrow arrow-down on-open"></div><?php echo lang('options') ?></legend><div> - <?php $type= $defaulttype; ?> - - <?php foreach($actionlist as $list_key=>$actiontype){ ?> - <div class="line"> - <div class="label"> - </div> - <div class="input"> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" name="type" value="<?php echo $actiontype ?>"<?php if($actiontype==@$type)echo ' checked="checked"' ?> /> - - <label for="<?php echo REQUEST_ID ?>_type_<?php echo $actiontype ?>" class="label"> - <span><?php echo nl2br('&nbsp;'); ?></span> - - <span><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> - - </label> - </div> - </div> - <?php } ?> - <div class="line"> - <div class="label"> - </div> - <div class="input"> - <span><?php echo nl2br('&nbsp;&nbsp;&nbsp;&nbsp;'); ?></span> - - <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = '1'; + <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = '1'; if ( isset($$tmpname) ) $checked = $$tmpname; else @@ -177,32 +129,29 @@ ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> - - <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> - - </label> - </div> - </div> - <div class="line"> - <div class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> - - </div> - <div class="input"> - <div class="selector"> + + <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> + + </label> + </div> + </div> + <div class="line"> + <div class="label"> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> + + </div> + <div class="input"> + <div class="selector"> <div class="inputholder or-droppable"> <input type="hidden" class="or-selector-link-value" name="targetobjectid" value="<?php echo $rootfolderid ?>" /> <input type="text" class="or-selector-link-name" disabled="disabled" value="<?php echo $rootfoldername ?>" /> </div> <div class="tree selector" data-types="{types}" data-init-id="<?php echo $rootfolderid ?>" data-init-folderid="<?php echo $rootfolderid ?>"> - - </div> - </div> - </div></fieldset> - </td> - </tr> - </table> + + </div> + </div> + </div></fieldset> <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/edit.tpl.src.xml @@ -1,6 +1,5 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> - <header views="order"></header> <form action="folder" subaction="edit"> <table> <row class="headline"> @@ -50,47 +49,13 @@ <text raw="_" /> </column> <column colspan="2" class="clickable"> - <link type="dialog" action="folder" subaction="createfolder"> + <link type="dialog" action="folder" subaction="create"> <image method="add"></image> - <text key="menu_folder_createfolder"></text> + <text key="menu_folder_create"></text> </link> </column> </row> - <row class="data"> - <column> - <text raw="_" /> - </column> - <column colspan="2" class="clickable"> - <link type="dialog" action="folder" subaction="createpage"> - <image method="add"></image> - <text key="menu_folder_createpage"></text> - </link> - </column> - </row> - <row class="data"> - <column> - <text raw="_" /> - </column> - <column colspan="2" class="clickable"> - <link type="dialog" action="folder" subaction="createfile"> - <image method="add"></image> - <text key="menu_folder_createfile"></text> - </link> - </column> - </row> - <row class="data"> - <column> - <text raw="_" /> - </column> - <column colspan="2" class="clickable"> - <link type="dialog" action="folder" subaction="createlink"> - <image method="add"></image> - <text key="menu_folder_createlink"></text> - </link> - </column> - </row> - <row> - <column colspan="2"> + </table> <group title="message:options"> <set var="type" value="var:defaulttype"></set> <list list="actionlist" value="actiontype"> @@ -128,9 +93,6 @@ </part> </part> </group> - </column> - </row> - </table> </form> <insert script="mark" inline="true"></insert> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/show.tpl.src.xml @@ -43,33 +43,9 @@ </if> <row class="data"> <column colspan="2"> - <link type="view" action="folder" subaction="createfolder"> + <link type="view" action="folder" subaction="create"> <image file="icon/create"></image> - <text key="menu_folder_createfolder"></text> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="createpage"> - <image file="icon/create"></image> - <text key="menu_folder_createpage"></text> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="createfile"> - <image file="icon/create"></image> - <text key="menu_folder_createfile"></text> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="modal" action="folder" subaction="createlink"> - <image file="icon/create"></image> - <text key="menu_folder_createlink"></text> + <text key="menu_folder_create"></text> </link> </column> </row>