openrat-cms

OpenRat Content Management System
git clone http://git.code.weiherhei.de/openrat-cms.git
Log | Files | Refs | README

commit 559a46410ae1225c4721203c97a0b4cf1d8ec481
parent 2097f71a80363c153d8cf8cc3cb2405358a707d5
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu,  4 Mar 2021 02:40:48 +0100

New: Link parent folder.

Diffstat:
Dmodules/cms/action/folder/FolderContentAction.class.php | 69---------------------------------------------------------------------
Dmodules/cms/ui/themes/default/html/views/folder/content.php | 84-------------------------------------------------------------------------------
Dmodules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml | 76----------------------------------------------------------------------------
Mmodules/cms/ui/themes/default/html/views/folder/edit.php | 7+++----
Mmodules/cms/ui/themes/default/html/views/folder/edit.tpl.src.xml | 8++++----
5 files changed, 7 insertions(+), 237 deletions(-)

diff --git a/modules/cms/action/folder/FolderContentAction.class.php b/modules/cms/action/folder/FolderContentAction.class.php @@ -1,69 +0,0 @@ -<?php -namespace cms\action\folder; -use cms\action\FolderAction; -use cms\action\Method; -use cms\model\Permission; -use cms\model\BaseObject; -use cms\model\File; -use util\Html; - - -class FolderContentAction extends FolderAction implements Method { - public function view() { - if ( ! $this->folder->isRoot ) - $this->setTemplateVar('up_url',Html::url('folder','show',$this->folder->parentid)); - - $this->setTemplateVar('writable',$this->folder->hasRight(Permission::ACL_WRITE) ); - - $list = array(); - - // Schleife ueber alle Objekte in diesem Ordner - foreach( $this->folder->getObjects() as $o ) - { - /* @var $o BaseObject */ - $id = $o->objectid; - - if ( $o->hasRight(Permission::ACL_READ) ) - { - $list[$id]['name'] = \util\Text::maxLength($o->name, 30); - $list[$id]['filename'] = \util\Text::maxLength($o->filename, 20); - $list[$id]['desc'] = \util\Text::maxLength($o->desc, 30); - if ( $list[$id]['desc'] == '' ) - $list[$id]['desc'] = \cms\base\Language::lang('NO_DESCRIPTION_AVAILABLE'); - $list[$id]['desc'] = $list[$id]['desc'].' - '.\cms\base\Language::lang('IMAGE').' '.$id; - - $list[$id]['type'] = $o->getType(); - $list[$id]['id' ] = $id; - - $list[$id]['icon' ] = $o->getType(); - $list[$id]['class'] = $o->getType(); - $list[$id]['url' ] = Html::url($o->getType(),'',$id); - - if ( $o->getType() == 'file' ) - { - $file = new File( $id ); - $file->load(); - $list[$id]['desc'] .= ' - '.intval($file->size/1000).'kB'; - - if ( $file->isImage() ) - { - $list[$id]['icon' ] = 'image'; - $list[$id]['class'] = 'image'; - //$list[$id]['url' ] = Html::url('file','show',$id) nur sinnvoll bei Lightbox-Anzeige - } -// if ( substr($file->mimeType(),0,5) == 'text/' ) -// $list[$id]['icon'] = 'text'; - } - - $list[$id]['date'] = $o->lastchangeDate; - $list[$id]['user'] = $o->lastchangeUser; - } - } - - $this->setTemplateVar('object' ,$list ); - } - - - public function post() { - } -} diff --git a/modules/cms/ui/themes/default/html/views/folder/content.php b/modules/cms/ui/themes/default/html/views/folder/content.php @@ -1,83 +0,0 @@ -<?php /* THIS FILE IS GENERATED from content.tpl.src.xml - DO NOT CHANGE */ defined('APP_STARTED') || die('Forbidden'); use \template_engine\Output as O; ?> - <div class="<?php echo O::escapeHtml('or-table-wrapper') ?>"><?php echo O::escapeHtml('') ?> - <div class="<?php echo O::escapeHtml('or-table-filter') ?>"><?php echo O::escapeHtml('') ?> - <input type="<?php echo O::escapeHtml('search') ?>" name="<?php echo O::escapeHtml('filter') ?>" placeholder="<?php echo O::escapeHtml(''.@O::lang('SEARCH_FILTER').'') ?>" class="<?php echo O::escapeHtml('or-input or-table-filter-input') ?>" /><?php echo O::escapeHtml('') ?> - </div> - <div class="<?php echo O::escapeHtml('or-table-area') ?>"><?php echo O::escapeHtml('') ?> - <table width="<?php echo O::escapeHtml('100%') ?>" class="<?php echo O::escapeHtml('or-table') ?>"><?php echo O::escapeHtml('') ?> - <tr class="<?php echo O::escapeHtml('or-headline') ?>"><?php echo O::escapeHtml('') ?> - <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('TYPE').'') ?></span> - <span><?php echo O::escapeHtml(' / ') ?></span> - <span><?php echo O::escapeHtml(''.@O::lang('NAME').'') ?></span> - </td> - <td class="<?php echo O::escapeHtml('or-help') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('LASTCHANGE').'') ?></span> - </td> - </tr> - <?php $if3=(isset($up_url)); if($if3) { ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon_folder.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml('..') ?></span> - </td> - <td><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml('') ?></span> - </td> - </tr> - <?php } ?> - <?php foreach((array)@$object as $list_key=>$list_value) { extract($list_value); ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td title="<?php echo O::escapeHtml(''.@$desc.'') ?>" data-name="<?php echo O::escapeHtml(''.@$name.'') ?>" data-action="<?php echo O::escapeHtml(''.@$type.'') ?>" data-id="<?php echo O::escapeHtml(''.@$id.'') ?>" class="<?php echo O::escapeHtml('or-'.@$class.'') ?>"><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon_'.@$icon.'.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@$name.'') ?></span> - <span><?php echo O::escapeHtml(' ') ?></span> - </td> - <td><?php echo O::escapeHtml('') ?> - <?php include_once( 'modules/template_engine/components/html/component_date/component-date.php'); { component_date($date); ?> - <?php } ?> - </td> - </tr> - <?php } ?> - <?php $if3=(($object)==FALSE); if($if3) { ?> - <tr><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('NOT_FOUND').'') ?></span> - </td> - </tr> - <?php } ?> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('createfolder') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('menu_folder_createfolder').'') ?></span> - </a> - </td> - </tr> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('createpage') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('menu_folder_createpage').'') ?></span> - </a> - </td> - </tr> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('view') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('createfile') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('menu_folder_createfile').'') ?></span> - </a> - </td> - </tr> - <tr class="<?php echo O::escapeHtml('or-data') ?>"><?php echo O::escapeHtml('') ?> - <td colspan="<?php echo O::escapeHtml('2') ?>"><?php echo O::escapeHtml('') ?> - <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('modal') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('createlink') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/folder') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> - <img src="<?php echo O::escapeHtml('./modules/cms/ui/themes/default/images/icon/icon/create.png') ?>" /><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml(''.@O::lang('menu_folder_createlink').'') ?></span> - </a> - </td> - </tr> - </table> - </div> - </div>- \ No newline at end of file diff --git a/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml b/modules/cms/ui/themes/default/html/views/folder/content.tpl.src.xml @@ -1,76 +0,0 @@ -<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"> - <table> - <row class="headline"> - <column class="help"> - <text value="${message:TYPE}"/> - <text value=" / "/> - <text value="${message:NAME}"/> - </column> - <column class="help"> - <text value="${message:LASTCHANGE}"/> - </column> - </row> - <if present="up_url"> - <row class="data"> - <column url="${up_url}"> - <image type="folder"/> - <text value=".."/> - </column> - <column> - <text value=""/> - </column> - </row> - </if> - <list list="${object}" extract="true"> - <row class="data"> - <column id="${id}" name="${name}" action="${type}" title="${desc}" class="${class}"> - <image type="${icon}"/> - <text value="${name}"/> - <text value=" "/> - </column> - <column> - <date date="${date}"/> - </column> - </row> - </list> - <if empty="${object}"> - <row> - <column colspan="2"> - <text value="${message:NOT_FOUND}"/> - </column> - </row> - </if> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="createfolder"> - <image file="icon/create"/> - <text value="${message:menu_folder_createfolder}"/> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="createpage"> - <image file="icon/create"/> - <text value="${message:menu_folder_createpage}"/> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="view" action="folder" subaction="createfile"> - <image file="icon/create"/> - <text value="${message:menu_folder_createfile}"/> - </link> - </column> - </row> - <row class="data"> - <column colspan="2"> - <link type="modal" action="folder" subaction="createlink"> - <image file="icon/create"/> - <text value="${message:menu_folder_createlink}"/> - </link> - </column> - </row> - </table> -</output> diff --git a/modules/cms/ui/themes/default/html/views/folder/edit.php b/modules/cms/ui/themes/default/html/views/folder/edit.php @@ -16,17 +16,17 @@ <span><?php echo O::escapeHtml(''.@O::lang('LASTCHANGE').'') ?></span> </th> </tr> - <?php $if3=(isset($up_url)); if($if3) { ?> + <?php $if3=(isset($parentid)); if($if3) { ?> <tr class="<?php echo O::escapeHtml('or-data or-act-clickable') ?>"><?php echo O::escapeHtml('') ?> <td><?php echo O::escapeHtml('') ?> <a target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('open') ?>" data-action="<?php echo O::escapeHtml('folder') ?>" data-method="<?php echo O::escapeHtml('') ?>" data-id="<?php echo O::escapeHtml(''.@$parentid.'') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/folder/'.@$parentid.'') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--action-folder') ?>"><?php echo O::escapeHtml('') ?></i> - <span><?php echo O::escapeHtml('..') ?></span> </a> </td> <td><?php echo O::escapeHtml('') ?> - <span><?php echo O::escapeHtml('') ?></span> + <span><?php echo O::escapeHtml('..') ?></span> </td> + <td><?php echo O::escapeHtml('') ?></td> </tr> <?php } ?> <?php foreach((array)@$object as $list_key=>$list_value) { extract($list_value); ?> @@ -37,7 +37,6 @@ <td><?php echo O::escapeHtml('') ?> <a title="<?php echo O::escapeHtml(''.@$desc.'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-name="<?php echo O::escapeHtml(''.@$name.'') ?>" name="<?php echo O::escapeHtml(''.@$name.'') ?>" data-type="<?php echo O::escapeHtml('open') ?>" data-action="<?php echo O::escapeHtml(''.@$type.'') ?>" data-method="<?php echo O::escapeHtml('') ?>" data-id="<?php echo O::escapeHtml(''.@$id.'') ?>" data-extra="<?php echo O::escapeHtml('[]') ?>" href="<?php echo O::escapeHtml('#/'.@$type.'/'.@$id.'') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?> <span><?php echo O::escapeHtml(''.@$name.'') ?></span> - <span><?php echo O::escapeHtml(' ') ?></span> </a> </td> <td><?php echo O::escapeHtml('') ?> 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 @@ -11,17 +11,17 @@ <text value="${message:LASTCHANGE}"/> </column> </row> - <if present="up_url"> + <if present="parentid"> <row class="data,act-clickable"> <column> <link type="open" id="${parentid}" name="" action="folder"> <image action="folder"/> - <text value=".."/> </link> </column> <column> - <text value=""/> + <text value=".."/> </column> + <column /> </row> </if> <list list="${object}" extract="true"> @@ -32,7 +32,6 @@ <column class=""> <link type="open" id="${id}" name="${name}" action="${type}" title="${desc}"> <text value="${name}"/> - <text value=" "/> </link> </column> <column> @@ -48,6 +47,7 @@ </row> </if> </table> + <part class="act-clickable"> <link type="dialog" action="folder" subaction="create" class="btn"> <image action="new"/>