commit 38b38164323f0089f639e1de498411131b51b3b2 parent 7e07bc9e80d97aecb7a33b06f231ac9e10029a93 Author: Jan Dankert <devnull@localhost> Date: Wed, 28 Nov 2018 22:11:03 +0100 In den "Einstellungen" werden jetzt auch die Gültigkeitszeiträume erfasst. Diffstat:
16 files changed, 125 insertions(+), 143 deletions(-)
diff --git a/modules/cms-core/action/ObjectAction.class.php b/modules/cms-core/action/ObjectAction.class.php @@ -497,14 +497,6 @@ class ObjectAction extends Action public function propPost() { - if ($this->getRequestVar( 'valid_from_date' )) - $this->baseObject->validFromDate = strtotime( $this->getRequestVar( 'valid_from_date' ).' '.$this->getRequestVar( 'valid_from_time' ) ); - else - $this->baseObject->validFromDate = null; - if ($this->getRequestVar( 'valid_until_date')) - $this->baseObject->validToDate = strtotime( $this->getRequestVar( 'valid_until_date').' '.$this->getRequestVar( 'valid_until_time') ); - else - $this->baseObject->validToDate = null; if ( $this->hasRequestVar('creationTimestamp') && $this->userIsAdmin() ) $this->baseObject->createDate = $this->getRequestVar('creationTimestamp',OR_FILTER_NUMBER); @@ -531,7 +523,19 @@ class ObjectAction extends Action throw new \ValidationException( 'settings' ); } - $this->baseObject->objectSave(false); + // Gültigkeitszeiträume speichern. + if ($this->getRequestVar( 'valid_from_date' )) + $this->baseObject->validFromDate = strtotime( $this->getRequestVar( 'valid_from_date' ).' '.$this->getRequestVar( 'valid_from_time' ) ); + else + $this->baseObject->validFromDate = null; + if ($this->getRequestVar( 'valid_until_date')) + $this->baseObject->validToDate = strtotime( $this->getRequestVar( 'valid_until_date').' '.$this->getRequestVar( 'valid_until_time') ); + else + $this->baseObject->validToDate = null; + + + $this->baseObject->save(); + $this->addNotice($this->baseObject->getType(),$this->baseObject->filename,'SAVED',OR_NOTICE_OK); } diff --git a/modules/cms-core/model/BaseObject.class.php b/modules/cms-core/model/BaseObject.class.php @@ -652,24 +652,30 @@ SQL /** * Laden des Objektes - * @deprecated bitte objectLoad() benutzen */ public function load() { - return $this->objectLoad(); + return self::objectLoad(); } /** * Eigenschaften des Objektes in Datenbank speichern + * @deprecated */ - public function objectSave( $withName = true ) + public function objectSave( $ignored = true ) { - $db = db_connection(); + self::save(); + } + /** + * Eigenschaften des Objektes in Datenbank speichern + */ + public function save() + { $this->checkFilename(); - $stmt = $db->sql( <<<SQL + $stmt = db()->sql( <<<SQL UPDATE {{object}} SET parentid = {parentid}, lastchange_date = {time} , @@ -702,14 +708,7 @@ SQL $stmt->query(); - // Nur wenn nicht Wurzelordner - if ( !$this->isRoot && $withName ) - { - if ( $this->name == '' ) - $this->name = $this->filename; - - $this->objectSaveName(); - } + $this->setTimestamp(); } @@ -717,7 +716,7 @@ SQL /** * Aenderungsdatum auf Systemzeit setzen */ - function setTimestamp() + public function setTimestamp() { $db = db_connection(); diff --git a/modules/cms-ui/themes/default/html/views/file/edit.php b/modules/cms-ui/themes/default/html/views/file/edit.php @@ -9,7 +9,7 @@ <div class="input"> <br/> - <input size="40" id="req1543270168648183047_file" type="file" name="file" class="upload" /> + <input size="40" id="req15434390431432155717_file" type="file" name="file" class="upload" /> <br/> diff --git a/modules/cms-ui/themes/default/html/views/include/validity.inc.xml b/modules/cms-ui/themes/default/html/views/include/validity.inc.xml @@ -1,27 +1,4 @@ <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"> - <group title="message:validity"> - <part class="line"> - <part class="label"> - <label for="validity_from_date"> - <text key="from"></text> - </label> - </part> - <part class="input"> - <input type="date" name="valid_from_date" /> - <input type="time" name="valid_from_time" /> - </part> - </part> - <part class="line"> - <part class="label"> - <label for="validity_until_date"> - <text key="until"></text> - </label> - </part> - <part class="input"> - <input type="date" name="valid_until_date" /> - <input type="time" name="valid_until_time" /> - </part> - </part> - </group> + </output> diff --git a/modules/cms-ui/themes/default/html/views/link/prop.php b/modules/cms-ui/themes/default/html/views/link/prop.php @@ -0,0 +1,31 @@ + + + <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/object/settings.php b/modules/cms-ui/themes/default/html/views/object/settings.php @@ -1,6 +1,36 @@ <form name="" target="_self" data-target="view" action="./" data-method="settings" 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="settings" /><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('validity') ?></legend><div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_validity_from_date" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'from'.'')))); ?></span> + + </label> + </div> + <div class="input"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_date" name="<?php if ('') echo ''.'_' ?>valid_from_date<?php if ('') echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_date) ?>" /><?php if ('') { ?><input type="hidden" name="valid_from_date" value="<?php $valid_from_date ?>"/><?php } ?></div> + + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_from_time" name="<?php if ('') echo ''.'_' ?>valid_from_time<?php if ('') echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_from_time) ?>" /><?php if ('') { ?><input type="hidden" name="valid_from_time" value="<?php $valid_from_time ?>"/><?php } ?></div> + + </div> + </div> + <div class="line"> + <div class="label"> + <label for="<?php echo REQUEST_ID ?>_validity_until_date" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'until'.'')))); ?></span> + + </label> + </div> + <div class="input"> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_date" name="<?php if ('') echo ''.'_' ?>valid_until_date<?php if ('') echo '_disabled' ?>" type="date" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_date) ?>" /><?php if ('') { ?><input type="hidden" name="valid_until_date" value="<?php $valid_until_date ?>"/><?php } ?></div> + + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_valid_until_time" name="<?php if ('') echo ''.'_' ?>valid_until_time<?php if ('') echo '_disabled' ?>" type="time" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$valid_until_time) ?>" /><?php if ('') { ?><input type="hidden" name="valid_until_time" value="<?php $valid_until_time ?>"/><?php } ?></div> + + </div> + </div> + </div></fieldset> <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('settings') ?></legend><div> <div class="line"> <div class="label"> @@ -10,7 +40,7 @@ </label> </div> <div class="input"> - <textarea name="settings" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo ${'settings'} ?></textarea> + <textarea name="<?php if ('') echo ''.'_' ?>settings<?php if ('') echo '_disabled' ?>" data-extension="" data-mimetype="" data-mode="yaml" class="editor code-editor"><?php echo ${'settings'} ?></textarea> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/settings.tpl.src.xml @@ -2,6 +2,31 @@ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> + <group title="message:validity"> + <part class="line"> + <part class="label"> + <label for="validity_from_date"> + <text key="from"></text> + </label> + </part> + <part class="input"> + <input type="date" name="valid_from_date" /> + <input type="time" name="valid_from_time" /> + </part> + </part> + <part class="line"> + <part class="label"> + <label for="validity_until_date"> + <text key="until"></text> + </label> + </part> + <part class="input"> + <input type="date" name="valid_until_date" /> + <input type="time" name="valid_until_time" /> + </part> + </part> + </group> + <group title="message:settings"> <part class="line"> 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 @@ -33,7 +33,5 @@ </part> </part> - <include file="../include/validity" /> - </form> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.php b/modules/cms-ui/themes/default/html/views/profile/edit.php @@ -45,7 +45,7 @@ </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_fullname" name="fullname<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="text" value="<?php echo Text::encodeHtml(@$fullname) ?>" /><?php if ('') { ?><input type="hidden" name="fullname" value="<?php $fullname ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_fullname" name="<?php if ('') echo ''.'_' ?>fullname<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$fullname) ?>" /><?php if ('') { ?><input type="hidden" name="fullname" value="<?php $fullname ?>"/><?php } ?></div> </div> </div> @@ -55,7 +55,7 @@ </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_tel" name="tel<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="text" value="<?php echo Text::encodeHtml(@$tel) ?>" /><?php if ('') { ?><input type="hidden" name="tel" value="<?php $tel ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_tel" name="<?php if ('') echo ''.'_' ?>tel<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$tel) ?>" /><?php if ('') { ?><input type="hidden" name="tel" value="<?php $tel ?>"/><?php } ?></div> </div> </div> @@ -65,7 +65,7 @@ </label> </div> <div class="input"> - <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_desc" name="desc<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="text" value="<?php echo Text::encodeHtml(@$desc) ?>" /><?php if ('') { ?><input type="hidden" name="desc" value="<?php $desc ?>"/><?php } ?></div> + <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_desc" name="<?php if ('') echo ''.'_' ?>desc<?php if ('') echo '_disabled' ?>" type="text" maxlength="128" class="" value="<?php echo Text::encodeHtml(@$desc) ?>" /><?php if ('') { ?><input type="hidden" name="desc" value="<?php $desc ?>"/><?php } ?></div> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/profile/settings.php b/modules/cms-ui/themes/default/html/views/profile/settings.php diff --git a/modules/cms-ui/themes/default/html/views/profile/settings.tpl.src.xml b/modules/cms-ui/themes/default/html/views/profile/settings.tpl.src.xml @@ -1,26 +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 method="post"> - <part class="line"> - <part class="label"> - <label for="timezone_offset"> - <text key="timezone" /> - </label> - </part> - <part class="input"> - <selectbox name="timezone_offset" list="timezone_list" - addempty="true"></selectbox> - </part> - </part> - <part class="line"> - <part class="label"> - <label for=""> - <text key="language" /> - </label> - </part> - <part class="input"> - <selectbox name="language" list="language_list" addempty="true"></selectbox> - </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 +1,15 @@ <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="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">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="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">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="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">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="description"><?php echo Text::encodeHtml($description) ?></textarea></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/title/show.php b/modules/cms-ui/themes/default/html/views/title/show.php @@ -192,7 +192,7 @@ </a> </div> - <div class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-url on-action-image"> + <div class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-text on-action-url on-action-image"> <a title="<?php echo lang('menu_settings_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="settings" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'settings'}" href="<?php echo Html::url('','settings','',array('dialogAction'=>'','dialogMethod'=>'settings')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/settings.svg" /> 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 @@ -226,7 +226,7 @@ </link> </part> <part - class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-url on-action-image"> + class="entry clickable filtered on-action-link on-action-folder on-action-page on-action-file on-action-text on-action-url on-action-image"> <link type="dialog" title="message:menu_settings_desc" subaction="settings"> <image method="settings"></image> <text key="menu_settings"></text> diff --git a/modules/cms-ui/themes/default/html/views/tree/settings.php b/modules/cms-ui/themes/default/html/views/tree/settings.php @@ -1,29 +0,0 @@ - - - <form name="" target="_self" action="<?php echo OR_ACTION ?>" data-method="<?php echo OR_METHOD ?>" data-action="<?php echo OR_ACTION ?>" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="<?php echo OR_ACTION ?>" data-async="" data-autosave=""><input type="submit" class="invisible" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo OR_ACTION ?>" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo OR_METHOD ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" /> - <fieldset class="<?php echo '1'?" open":"" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow-right closed" /><div class="arrow-down open" /><?php echo lang('languages') ?></legend><div> - <?php foreach($languages as $id=>$name){ ?> - <div> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_languageid_<?php echo $id ?>" name="languageid" value="<?php echo $id ?>"<?php if($id==@$languageid)echo ' checked="checked"' ?> /> - - <label for="<?php echo REQUEST_ID ?>_languageid_<?php echo $id ?>" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - - </label> - </div> - <?php } ?> - </div></fieldset> - <fieldset class="<?php echo '1'?" open":"" ?><?php echo '1'?" show":"" ?>"><legend><div class="arrow-right closed" /><div class="arrow-down open" /><?php echo lang('models') ?></legend><div> - <?php foreach($models as $id=>$name){ ?> - <div> - <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_modelid_<?php echo $id ?>" name="modelid" value="<?php echo $id ?>"<?php if($id==@$modelid)echo ' checked="checked"' ?> /> - - <label for="<?php echo REQUEST_ID ?>_modelid_<?php echo $id ?>" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - - </label> - </div> - <?php } ?> - </div></fieldset> - <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" /></div></div></form> - - \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/tree/settings.tpl.src.xml b/modules/cms-ui/themes/default/html/views/tree/settings.tpl.src.xml @@ -1,25 +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:languages"> - <list list="languages" key="id" value="name"> - <part> - <radio name="languageid" value="var:id"></radio> - <label for="languageid" value="var:id"> - <text var="name"></text> - </label> - </part> - </list> - </group> - <group title="message:models"> - <list list="models" key="id" value="name"> - <part> - <radio name="modelid" value="var:id"></radio> - <label for="modelid" value="var:id"> - <text var="name"></text> - </label> - </part> - </list> - </group> - </form> -</output>- \ No newline at end of file