commit 90f80d23b5d226a05875f3dd8d1383cf68f77efa parent 88849b6cc8571e8dcf5c05b029b1fd5c15ae1855 Author: Jan Dankert <devnull@localhost> Date: Sat, 22 Dec 2018 22:51:24 +0100 Cleanup: Reading/Writing Propertes is now a base method in base object. This saves much space ;) Diffstat:
27 files changed, 133 insertions(+), 770 deletions(-)
diff --git a/modules/cms-core/action/FileAction.class.php b/modules/cms-core/action/FileAction.class.php @@ -7,6 +7,7 @@ use cms\model\BaseObject; use cms\model\File; use cms\publish\PublishPreview; +use cms\publish\PublishPublic; use Http; use \Html; use Upload; @@ -92,26 +93,22 @@ class FileAction extends ObjectAction $this->addNotice($this->file->getType(),$this->file->name,'VALUE_SAVED','ok'); } - /** - * Abspeichern der Eigenschaften zu dieser Datei. - * - */ - function propPost() - { - // Eigenschaften speichern - $this->file->filename = $this->getRequestVar('filename' ,OR_FILTER_FILENAME); - $this->file->name = $this->getRequestVar('name' ,OR_FILTER_FULL ); - $this->file->extension = $this->getRequestVar('extension' ,OR_FILTER_FILENAME); - $this->file->desc = $this->getRequestVar('description',OR_FILTER_FULL ); - - $this->file->save(); - $this->file->setTimestamp(); - $this->addNotice($this->file->getType(),$this->file->name,'PROP_SAVED','ok'); - } - - - /** + /** + * Abspeichern der Eigenschaften zu dieser Datei. + * + */ + function advancedPost() + { + $this->file->extension = $this->getRequestVar('extension' ,OR_FILTER_FILENAME); + $this->file->save(); + + $this->addNotice($this->file->getType(),$this->file->filename,'PROP_SAVED','ok'); + } + + + + /** * Anzeigen des Inhaltes, der Inhalt wird samt Header direkt * auf die Standardausgabe geschrieben */ @@ -196,41 +193,12 @@ class FileAction extends ObjectAction } - function propView() - { - - global $conf; - - if ( $this->file->filename == $this->file->objectid ) - $this->file->filename = ''; - - // Eigenschaften der Datei uebertragen - $this->setTemplateVars( $this->file->getProperties() ); - $this->setTemplateVar('size',number_format($this->file->size/1000,0,',','.').' kB' ); - $this->setTemplateVar('full_filename',$this->file->full_filename()); - - if ( is_file($this->file->tmpfile())) - { - $this->setTemplateVar('cache_filename' ,$this->file->tmpfile()); - $this->setTemplateVar('cache_filemtime',@filemtime($this->file->tmpfile())); - } - // Alle Seiten mit dieser Datei ermitteln - $pages = $this->file->getDependentObjectIds(); - - $list = array(); - foreach( $pages as $id ) - { - $o = new BaseObject( $id ); - $o->load(); - $list[$id] = array(); - $list[$id]['url' ] = Html::url('main','page',$id); - $list[$id]['name'] = $o->name; - } - asort( $list ); - $this->setTemplateVar('pages',$list); - $this->setTemplateVar('edit_filename',$conf['filename']['edit']); + public function advancedView() + { + // Eigenschaften der Datei uebertragen + $this->setTemplateVar( 'extension',$this->file->extension ); } @@ -549,6 +517,7 @@ class FileAction extends ObjectAction */ function pubPost() { + $this->file->publisher = new PublishPublic( $this->file->projectid ); $this->file->publish(); $this->file->publish->close(); diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -401,47 +401,6 @@ class FolderAction extends ObjectAction /** - * Abspeichern der Ordner-Eigenschaften. - */ - public function propPost() - { - // Ordnereigenschaften speichern - if ( $this->getRequestVar('name') != '' ) - $this->folder->name = $this->getRequestVar('name' ,'full'); - elseif ($this->getRequestVar('filename') != '' ) - $this->folder->name = $this->getRequestVar('filename',OR_FILTER_ALPHANUM); - else - { - $this->addValidationError('name'); - $this->addValidationError('filename'); - //$this->callSubAction('prop'); - return; - } - - $this->folder->filename = $this->getRequestVar('filename' ,OR_FILTER_ALPHANUM); - $this->folder->desc = $this->getRequestVar('description','full' ); - $this->folder->save(); - - - // Name/Beschreibung für alle Sprachen speichern. - foreach( $this->folder->getNames() as $name ) - { - $language = new Language( $name->languageid ); - $language->load(); - - if ( $this->hasRequestVar( 'name_'.$language->name ) ) - $name->name = $this->getRequestVar( 'name_'.$language->name ); - if ( $this->hasRequestVar( 'description_'.$language->name ) ) - $name->description = $this->getRequestVar( 'description_'.$language->name ); - - $name->save(); - } - - $this->addNotice($this->folder->getType(),$this->folder->name,'PROP_SAVED','ok'); - } - - - /** * Reihenfolge von Objekten aendern. */ public function orderPost() @@ -1452,28 +1411,6 @@ class FolderAction extends ObjectAction /** - * Eigenschaften anzeigen. - */ - public function propView() - { - $this->setTemplateVars( $this->folder->getProperties() ); - - $nameProps = array(); - foreach( $this->folder->getNames() as $name ) - { - $nameProps[ $name->languageid ] = get_object_vars( $name ); - $language = new Language( $name->languageid ); - $language->load(); - $nameProps[ $name->languageid ]['languageName' ] = $language->name; - $nameProps[ $name->languageid ]['languageIsDefault'] = $language->isDefault; - $nameProps[ $name->languageid ]['languageIsoCode' ] = $language->isoCode; - } - $this->setTemplateVar('names',$nameProps); - - - } - - /** * Infos anzeigen. */ public function infoView() diff --git a/modules/cms-core/action/LinkAction.class.php b/modules/cms-core/action/LinkAction.class.php @@ -64,32 +64,12 @@ class LinkAction extends ObjectAction /** * Abspeichern der Eigenschaften */ - function propPost() - { - // Wenn Name gefuellt, dann Datenbank-Update - if ( $this->getRequestVar('name') != '' ) - { - // Eigenschaften speichern - $this->link->name = $this->getRequestVar('name' ,'full'); - $this->link->desc = $this->getRequestVar('description','full'); - - $this->link->save(); - $this->link->setTimestamp(); - } - } - - - /** - * Abspeichern der Eigenschaften - */ function editPost() { - $this->link->linkedObjectId = $this->getRequestVar('targetobjectid'); - - $this->link->save(); - $this->link->setTimestamp(); + $this->link->linkedObjectId = $this->getRequestVar('targetobjectid'); + $this->link->save(); - $this->addNotice('link',$this->link->name,'SAVED',OR_NOTICE_OK); + $this->addNotice('link',$this->link->name,'SAVED',OR_NOTICE_OK); } @@ -106,14 +86,6 @@ class LinkAction extends ObjectAction - function propView() - { - $this->setTemplateVars( $this->link->getProperties() ); - $this->setTemplateVar('act_linkobjectid',$this->link->linkedObjectId); - } - - - function infoView() { $this->setTemplateVars( $this->link->getProperties() ); diff --git a/modules/cms-core/action/ObjectAction.class.php b/modules/cms-core/action/ObjectAction.class.php @@ -15,29 +15,10 @@ use cms\model\Link; use Http; use Session; -// OpenRat Content Management System -// Copyright (C) 2002-2012 Jan Dankert, cms@jandankert.de -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - /** - * Action-Klasse zum Bearbeiten eines Ordners - * @author $Author$ - * @version $Revision$ - * @package openrat.actions + * Basis-Action-Klasse zum Bearbeiten des Basis-Objektes. + * @author Jan Dankert */ class ObjectAction extends Action @@ -487,13 +468,60 @@ class ObjectAction extends Action } - public function propView() + /** + * Abspeichern der Ordner-Eigenschaften. + */ + public function propPost() { + if ( ! $this->hasRequestVar('filename' ) ) + throw new \ValidationException('filename'); + + $this->baseObject->filename = BaseObject::urlify( $this->getRequestVar('filename') ); + $this->baseObject->save(); + + // Name/Beschreibung für alle Sprachen speichern. + foreach( $this->baseObject->getNames() as $name ) + { + $language = new Language( $name->languageid ); + $language->load(); + + if ( $this->hasRequestVar( 'name_'.$language->name ) ) + $name->name = $this->getRequestVar( 'name_'.$language->name ); + if ( $this->hasRequestVar( 'description_'.$language->name ) ) + $name->description = $this->getRequestVar( 'description_'.$language->name ); + + $name->save(); + } + + $this->addNotice($this->baseObject->getType(),$this->baseObject->filename,'PROP_SAVED','ok'); } - public function propPost() + + + + + + /** + * Eigenschaften anzeigen. + */ + public function propView() { + $this->setTemplateVar( 'filename', $this->baseObject->filename ); + + $nameProps = array(); + foreach( $this->baseObject->getNames() as $name ) + { + $nameProps[ $name->languageid ] = get_object_vars( $name ); + $language = new Language( $name->languageid ); + $language->load(); + $nameProps[ $name->languageid ]['languageName' ] = $language->name; + $nameProps[ $name->languageid ]['languageIsDefault'] = $language->isDefault; + $nameProps[ $name->languageid ]['languageIsoCode' ] = $language->isoCode; + } + $this->setTemplateVar('names',$nameProps); + + // Should we do this? if ( $this->hasRequestVar('creationTimestamp') && $this->userIsAdmin() ) $this->baseObject->createDate = $this->getRequestVar('creationTimestamp',OR_FILTER_NUMBER); $this->baseObject->setCreationTimestamp(); diff --git a/modules/cms-core/action/PageAction.class.php b/modules/cms-core/action/PageAction.class.php @@ -309,86 +309,6 @@ class PageAction extends ObjectAction /** - * Eigenschaften der Seite speichern - */ - function propPost() - { - if ( $this->getRequestVar('name')!='' ) - { - $this->page->name = $this->getRequestVar('name' ,OR_FILTER_FULL ); - $this->page->filename = BaseObject::urlify($this->getRequestVar('filename' ,OR_FILTER_FULL)); - $this->page->desc = $this->getRequestVar('description',OR_FILTER_FULL ); - } - else - { - $this->addValidationError('name'); - } - - parent::propPost(); - - $this->page->save(); - $this->addNotice($this->page->getType(),$this->page->name,'PROP_SAVED','ok'); - } - - - - /** - * Die Eigenschaften der Seite anzeigen - */ - function propView() - { - $this->setTemplateVar('id',$this->page->objectid); - - $this->page->public = true; - $this->page->load(); - $this->page->full_filename(); - - if ( $this->page->filename == $this->page->objectid ) - $this->page->filename = ''; - - $this->setTemplateVars( $this->page->getProperties() ); - - if ( $this->userIsAdmin() ) - { - $this->setTemplateVar('template_url',Html::url('main','template',$this->page->templateid,array(REQ_PARAM_MODEL_ID=>$this->page->modelid))); - } - - $template = new Template( $this->page->templateid ); - $template->load(); - $this->setTemplateVar('template_name',$template->name); - - // Alle Ordner ermitteln -// $this->setTemplateVar('act_folderobjectid',$this->page->parentid); -// -// $folders = array(); -// $folder = new Folder( $this->page->parentid ); - -// foreach( $folder->getOtherFolders() as $oid ) -// { -// $f = new Folder( $oid ); -// $folders[$oid] = implode( FILE_SEP,$f->parentObjectNames(true,true) ); -// } -// asort( $folders ); -// $this->setTemplateVar('folder',$folders); - - $templates = Array(); - $project = new Project( $this->page->projectid ); - foreach( $project->getTemplates() as $id=>$name ) - { - if ( $id != $this->page->templateid ) - $templates[$id]=$name; - } - $this->setTemplateVar('templates',$templates); - - - $this->setTemplateVar( 'languageid' ,$this->page->languageid ); - - parent::propView(); - } - - - - /** * Die Eigenschaften der Seite anzeigen */ function infoView() diff --git a/modules/cms-core/action/UrlAction.class.php b/modules/cms-core/action/UrlAction.class.php @@ -100,24 +100,6 @@ class UrlAction extends ObjectAction } - /** - * Abspeichern der Eigenschaften - */ - function propPost() - { - // Wenn Name gefuellt, dann Datenbank-Update - if ( $this->getRequestVar('name') != '' ) - { - // Eigenschaften speichern - $this->url->name = $this->getRequestVar('name' ,'full'); - $this->url->desc = $this->getRequestVar('description','full'); - - $this->url->save(); - $this->url->setTimestamp(); - } - } - - /** * Abspeichern der Eigenschaften */ @@ -142,15 +124,9 @@ class UrlAction extends ObjectAction } - - function propView() - { - $this->setTemplateVars( $this->url->getProperties() ); - } - - function infoView() + public function infoView() { $this->setTemplateVars( $this->url->getProperties() ); } diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php @@ -689,6 +689,7 @@ SQL */ public function save() { + $this->setTimestamp(); $this->checkFilename(); $stmt = db()->sql( <<<SQL diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.php b/modules/cms-ui/themes/default/html/views/file/advanced.php diff --git a/modules/cms-ui/themes/default/html/views/file/advanced.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/advanced.tpl.src.xml @@ -0,0 +1,6 @@ +<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"> + <form> + <input label="file_extension" name="extension" size="10" class="extension"></input> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/prop.php b/modules/cms-ui/themes/default/html/views/file/prop.php @@ -1,55 +0,0 @@ - - - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="file" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form file" 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="file" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_extension" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if ('') { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> - - </div> - </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/file/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/prop.tpl.src.xml @@ -1,47 +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"> - <header views="size,compress,uncompress,extract"></header> - <form> - <part class="line"> - <part class="label"> - <label for="name"> - <text text="global_name"></text> - </label> - </part> - <part class="input"> - <input name="name" size="50" class="name"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="filename"> - <text text="global_filename"></text> - </label> - </part> - <part class="input"> - <input name="filename" class="filename" maxlength="150"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="extension"> - <text text="file_extension"></text> - </label> - </part> - <part class="input"> - <input name="extension" size="10" class="extension"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="description"> - <text text="global_description"></text> - </label> - </part> - <part class="input"> - <inputarea name="description" class="description"></inputarea> - </part> - </part> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/prop.php b/modules/cms-ui/themes/default/html/views/folder/prop.php @@ -1,21 +0,0 @@ - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" 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="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <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('global_prop') ?></legend><div> - <label class="or-form-row"><span class="or-form-label">Dateiname</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if ('') echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div></span></label> - - </div></fieldset> - <?php foreach($names as $list_key=>$list_value){ ?><?php extract($list_value) ?> - <fieldset class="toggle-open-close<?php echo $languageIsDefault?" 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 $languageName ?></legend><div> - <?php $$languageName= $name; ?> - - <label class="or-form-row"><span class="or-form-label">Name</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $languageName ?>" name="<?php if ('name') echo 'name'.'_' ?><?php echo $languageName ?><?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="filename" value="<?php echo Text::encodeHtml(@$$languageName) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $languageName ?>" value="<?php $$languageName ?>"/><?php } ?></div></span></label> - - <?php $$languageName= $description; ?> - - <label class="or-form-row"><span class="or-form-label">Beschreibung</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('description') echo 'description'.'_' ?><?php echo $languageName ?><?php if ('') echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($$languageName) ?></textarea></div></span></label> - - </div></fieldset> - <?php } ?> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('global_save') ?>" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/prop.tpl.src.xml @@ -1,24 +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"> - <form label="message:global_save"> - - <group title="message:global_prop"> - - <input name="filename" label="global_filename" class="filename" maxlength="150" focus="true" /> - </group> - - <list list="names" extract="true"> - - <group title="var:languageName" open="var:languageIsDefault"> - - <set var="var:languageName" value="var:name" /> - <input label="global_name" name="var:languageName" class="filename" prefix="name" maxlength="255" /> - - <set var="var:languageName" value="var:description" /> - <inputarea label="global_description" prefix="description" name="var:languageName" class="description" maxlength="255" /> - - </group> - </list> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/prop.php b/modules/cms-ui/themes/default/html/views/image/prop.php @@ -1,55 +0,0 @@ - - - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="image" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="image" data-async="" data-autosave=""><input type="submit" class="invisible" /><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="image" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="filename<?php if ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_extension" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="extension<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if ('') { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><textarea class="description" name="description"><?php echo Text::encodeHtml($description) ?></textarea></div> - - </div> - </div> - <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/image/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/image/prop.tpl.src.xml @@ -1,47 +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"> - <header views="size,compress,uncompress,extract"></header> - <form> - <part class="line"> - <part class="label"> - <label for="name"> - <text text="global_name"></text> - </label> - </part> - <part class="input"> - <input name="name" size="50" class="name"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="filename"> - <text text="global_filename"></text> - </label> - </part> - <part class="input"> - <input name="filename" class="filename" maxlength="150"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="extension"> - <text text="file_extension"></text> - </label> - </part> - <part class="input"> - <input name="extension" size="10" class="extension"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="description"> - <text text="global_description"></text> - </label> - </part> - <part class="input"> - <inputarea name="description" class="description"></inputarea> - </part> - </part> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/prop.php b/modules/cms-ui/themes/default/html/views/link/prop.php @@ -1,31 +0,0 @@ - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="link" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form link" 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="link" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <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('global_prop') ?></legend><div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="name,focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> - - </div> - </div> - </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/prop.tpl.src.xml @@ -1,29 +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"> - <form> - <group title="message:global_prop"> - <part class="line"> - <part class="label"> - <label for="name"> - <text text="GLOBAL_name"></text> - </label> - </part> - <part class="input"> - <input name="name" class="name,focus"></input> - </part> - </part> - - <part class="line"> - <part class="label"> - <label for="description"> - <text text="GLOBAL_description"></text> - </label> - </part> - <part class="input"> - <inputarea name="description" class="description"></inputarea> - </part> - </part> - </group> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/prop.php b/modules/cms-ui/themes/default/html/views/object/prop.php @@ -0,0 +1,21 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form object" 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="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> + <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('global_prop') ?></legend><div> + <label class="or-form-row"><span class="or-form-label">Dateiname</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if ('') echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div></span></label> + + </div></fieldset> + <?php foreach($names as $list_key=>$list_value){ ?><?php extract($list_value) ?> + <fieldset class="toggle-open-close<?php echo $languageIsDefault?" 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 $languageName ?></legend><div> + <?php $$languageName= $name; ?> + + <label class="or-form-row"><span class="or-form-label">Name</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_<?php echo $languageName ?>" name="<?php if ('name') echo 'name'.'_' ?><?php echo $languageName ?><?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="filename" value="<?php echo Text::encodeHtml(@$$languageName) ?>" /><?php if ('') { ?><input type="hidden" name="<?php echo $languageName ?>" value="<?php $$languageName ?>"/><?php } ?></div></span></label> + + <?php $$languageName= $description; ?> + + <label class="or-form-row"><span class="or-form-label">Beschreibung</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('description') echo 'description'.'_' ?><?php echo $languageName ?><?php if ('') echo '_disabled' ?>" maxlength="255"><?php echo Text::encodeHtml($$languageName) ?></textarea></div></span></label> + + </div></fieldset> + <?php } ?> + <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="<?php echo lang('global_save') ?>" /></div></form> + + \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/prop.tpl.src.xml @@ -0,0 +1,24 @@ +<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"> + <form label="message:global_save"> + + <group title="message:global_prop"> + + <input name="filename" label="global_filename" class="filename" maxlength="150" focus="true" /> + </group> + + <list list="names" extract="true"> + + <group title="var:languageName" open="var:languageIsDefault"> + + <set var="var:languageName" value="var:name" /> + <input label="global_name" name="var:languageName" class="filename" prefix="name" maxlength="255" /> + + <set var="var:languageName" value="var:description" /> + <inputarea label="global_description" prefix="description" name="var:languageName" class="description" maxlength="255" /> + + </group> + </list> + + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/prop.php b/modules/cms-ui/themes/default/html/views/page/prop.php @@ -1,43 +0,0 @@ - - - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="page" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form page" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="languageid" value="<?php echo $languageid ?>" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="page" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_filename" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> - - </div> - </div> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/prop.tpl.src.xml @@ -1,37 +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"> - <header views="changetemplate"></header> - <form languageid="var:languageid"> - <part class="line"> - <part class="label"> - <label for="name"> - <text text="global_name"></text> - </label> - </part> - <part class="input"> - <input name="name" size="50" class="name"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="filename"> - <text text="global_filename"></text> - </label> - </part> - <part class="input"> - <input name="filename" class="filename" maxlength="150"></input> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="description"> - <text text="global_description"></text> - </label> - </part> - <part class="input"> - <inputarea name="description" class="description"></inputarea> - </part> - </part> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/prop.php b/modules/cms-ui/themes/default/html/views/text/prop.php @@ -1,15 +0,0 @@ - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="text" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form text" 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="text" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <label class="or-form-row"><span class="or-form-label">Name</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div></span></label> - - <label class="or-form-row"><span class="or-form-label">Dateiname</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_filename" name="<?php if ('') echo ''.'_' ?>filename<?php if ('') echo '_disabled' ?>" type="text" maxlength="150" class="filename" value="<?php echo Text::encodeHtml(@$filename) ?>" /><?php if ('') { ?><input type="hidden" name="filename" value="<?php $filename ?>"/><?php } ?></div></span></label> - - <label class="or-form-row"><span class="or-form-label">Dateiendung</span><span class="or-form-input"><div class="inputholder"><input id="<?php echo REQUEST_ID ?>_extension" name="<?php if ('') echo ''.'_' ?>extension<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="extension" value="<?php echo Text::encodeHtml(@$extension) ?>" /><?php if ('') { ?><input type="hidden" name="extension" value="<?php $extension ?>"/><?php } ?></div></span></label> - - <label class="or-form-row"><span class="or-form-label">?filter?</span><span class="or-form-input"><div class="inputholder"><select id="<?php echo REQUEST_ID ?>_filterid" name="filterid" title="" class="" size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($filterlist,$filterid,1,1) ?><?php if (count($filterlist)==0) { ?><input type="hidden" name="filterid" value="" /><?php } ?><?php if (count($filterlist)==1) { ?><input type="hidden" name="filterid" value="<?php echo array_keys($filterlist)[0] ?>" /><?php } ?> - </select></div></span></label> - <label class="or-form-row"><span class="or-form-label">Beschreibung</span><span class="or-form-input"><div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div></span></label> - - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/text/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/prop.tpl.src.xml @@ -1,16 +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"> - <form> - - <input label="global_name" name="name" size="50" class="name"/> - - <input label="global_filename" name="filename" class="filename" maxlength="150"/> - - <input label="file_extension" name="extension" size="10" class="extension"/> - - <selectbox label="filter" name="filterid" size="1" list="filterlist" addempty="true" lang="true"/> - - <inputarea label="global_description" name="description" class="description"/> - - </form> -</output>- \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/title/show.php b/modules/cms-ui/themes/default/html/views/title/show.php @@ -295,7 +295,7 @@ </a> </div> - <div class="entry clickable filtered on-action-element"> + <div class="entry clickable filtered on-action-element on-action-file on-action-image on-action-text"> <a title="<?php echo lang('menu_advanced_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="advanced" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'advanced'}" href="<?php echo Html::url('','advanced','',array('dialogAction'=>'','dialogMethod'=>'advanced')) ?>"> <i class="image-icon image-icon--method-advanced"></i> diff --git a/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml b/modules/cms-ui/themes/default/html/views/title/show.tpl.src.xml @@ -316,7 +316,7 @@ </link> </part> - <part class="entry clickable filtered on-action-element"> + <part class="entry clickable filtered on-action-element on-action-file on-action-image on-action-text"> <link type="dialog" title="message:menu_advanced_desc" subaction="advanced"> <image method="advanced"></image> diff --git a/modules/cms-ui/themes/default/html/views/url/prop.php b/modules/cms-ui/themes/default/html/views/url/prop.php @@ -1,31 +0,0 @@ - - - <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="url" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form url" 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="url" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <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('global_prop') ?></legend><div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_name" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" autofocus="autofocus" type="text" maxlength="256" class="name" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> - - </div> - </div> - <div class="line"> - <div class="label"> - <label for="<?php echo REQUEST_ID ?>_description" class="label"> - <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> - - </label> - </div> - <div class="input"> - <div class="inputholder"><textarea class="description" name="<?php if ('') echo ''.'_' ?>description<?php if ('') echo '_disabled' ?>"><?php echo Text::encodeHtml($description) ?></textarea></div> - - </div> - </div> - </div></fieldset> - <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/url/prop.tpl.src.xml b/modules/cms-ui/themes/default/html/views/url/prop.tpl.src.xml @@ -1,29 +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"> - <form> - <group title="message:global_prop"> - <part class="line"> - <part class="label"> - <label for="name"> - <text text="GLOBAL_name"></text> - </label> - </part> - <part class="input"> - <input name="name" focus="true" class="name"></input> - </part> - </part> - - <part class="line"> - <part class="label"> - <label for="description"> - <text text="GLOBAL_description"></text> - </label> - </part> - <part class="input"> - <inputarea name="description" class="description"></inputarea> - </part> - </part> - </group> - - </form> -</output>- \ No newline at end of file