commit 3cc056e1eca1b06d450c86e390d10bbcb00e2ed6 parent 15bb8b6e7f8660ab90ff70121993c9862fbc7785 Author: Jan Dankert <devnull@localhost> Date: Thu, 29 Nov 2018 21:52:32 +0100 Das Löschen von Ordnern, Seiten, Links, URLs, Dateien, Bildern, Texten funktioniert jetzt wieder. Diffstat:
38 files changed, 465 insertions(+), 209 deletions(-)
diff --git a/modules/cms-core/action/FileAction.class.php b/modules/cms-core/action/FileAction.class.php @@ -652,6 +652,26 @@ class FileAction extends ObjectAction $this->setTemplateVar('outline',$structure); } + + + public function removeView() + { + $this->setTemplateVar( 'name',$this->file->filename ); + } + + + public function removePost() + { + if ( $this->getRequestVar('delete') != '' ) + { + $this->file->delete(); + $this->addNotice('template',$this->file->filename,'DELETED',OR_NOTICE_OK); + } + else + { + $this->addNotice('template',$this->file->filename,'CANCELED',OR_NOTICE_WARN); + } + } } ?> \ No newline at end of file diff --git a/modules/cms-core/action/FolderAction.class.php b/modules/cms-core/action/FolderAction.class.php @@ -1645,4 +1645,30 @@ class FolderAction extends ObjectAction public function showView() { $this->nextSubAction('edit'); } + + + + public function removeView() + { + $this->setTemplateVar( 'name',$this->folder->filename ); + $this->setTemplateVar( 'hasChildren', $this->folder->hasChildren() ); + } + + + public function removePost() + { + if ( !$this->hasRequestVar('delete') ) + throw new \ValidationException("delete"); + + if ( $this->hasRequestVar( 'withChildren')) + $this->folder->deleteAll(); // Delete with children + else + if ( $this->folder->hasChildren() ) + throw new \ValidationException("withChildren"); + else + $this->folder->delete(); // Only delete current folder. + + $this->addNotice('folder',$this->folder->filename,'DELETED',OR_NOTICE_OK); + } + } \ No newline at end of file diff --git a/modules/cms-core/action/LinkAction.class.php b/modules/cms-core/action/LinkAction.class.php @@ -61,24 +61,6 @@ class LinkAction extends ObjectAction - function remove() - { - $this->setTemplateVars( $this->link->getProperties() ); - } - - - - function delete() - { - if ( $this->hasRequestVar("delete") ) - { - $this->link->delete(); - $this->addNotice('link',$this->link->name,'DELETED'); - } - } - - - /** * Abspeichern der Eigenschaften */ @@ -195,4 +177,20 @@ class LinkAction extends ObjectAction $this->setTemplateVar('outline',$structure); } -}- \ No newline at end of file + + public function removeView() + { + $this->setTemplateVar( 'name',$this->link->filename ); + } + + + public function removePost() + { + if ($this->getRequestVar('delete') != '') { + $this->link->delete(); + $this->addNotice('link', $this->link->filename, 'DELETED', OR_NOTICE_OK); + } else { + $this->addNotice('link', $this->link->filename, 'CANCELED', OR_NOTICE_WARN); + } + } +} diff --git a/modules/cms-core/action/PageAction.class.php b/modules/cms-core/action/PageAction.class.php @@ -876,6 +876,27 @@ class PageAction extends ObjectAction + public function removeView() + { + $this->setTemplateVar( 'name',$this->page->filename ); + } + + + public function removePost() + { + if ( $this->getRequestVar('delete') != '' ) + { + $this->page->delete(); + $this->addNotice('page',$this->page->filename,'DELETED',OR_NOTICE_OK); + } + else + { + $this->addNotice('page',$this->page->filename,'CANCELED',OR_NOTICE_WARN); + } + } + + + } ?> \ No newline at end of file diff --git a/modules/cms-core/action/UrlAction.class.php b/modules/cms-core/action/UrlAction.class.php @@ -77,10 +77,30 @@ class UrlAction extends ObjectAction $this->addNotice('url',$this->url->name,'DELETED'); } } - - /** + + public function removeView() + { + $this->setTemplateVar( 'name',$this->url->filename ); + } + + + public function removePost() + { + if ( $this->getRequestVar('delete') != '' ) + { + $this->url->delete(); + $this->addNotice('url',$this->url->filename,'DELETED',OR_NOTICE_OK); + } + else + { + $this->addNotice('url',$this->url->filename,'CANCELED',OR_NOTICE_WARN); + } + } + + + /** * Abspeichern der Eigenschaften */ function propPost() diff --git a/modules/cms-core/model/Folder.class.php b/modules/cms-core/model/Folder.class.php @@ -606,6 +606,8 @@ class Folder extends BaseObject * Loeschen dieses Ordners. * Der Ordner wird nur geloescht, wenn er keine Unterelemente mehr enth?lt. * Zum Loeschen inklusive Unterelemente dient die Methode deleteAll() + * + * @throws \Exception if folder contains elements */ function delete() { @@ -627,6 +629,9 @@ class Folder extends BaseObject $this->objectDelete(); } + else { + throw new \RuntimeException('There are children in the folder '.$this->objectid.'.'); + } } @@ -750,6 +755,15 @@ SQL } + /** + * Stellt fest, ob der Ordner Unterelemente besitzt. + * @return bool + */ + public function hasChildren() + { + return count($this->getObjectIds()) > 0; + } + } 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="req1543449177373010490_file" type="file" name="file" class="upload" /> + <input size="40" id="req15435230991959855702_file" type="file" name="file" class="upload" /> <br/> diff --git a/modules/cms-ui/themes/default/html/views/file/info.php b/modules/cms-ui/themes/default/html/views/file/info.php @@ -4,7 +4,7 @@ <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> </div> <div class="input"> @@ -14,7 +14,7 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> </div> <div class="input"> @@ -24,7 +24,7 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('file_extension')))); ?></span> </div> <div class="input"> @@ -34,11 +34,11 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span> </div> </div> @@ -47,41 +47,41 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> </div> </div> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_size" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_SIZE')))); ?></span> </label> </div> <div class="input"> </div> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($size))); ?></span> </div> <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_mimetype" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_mimetype')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($mimetype))); ?></span> <br/> <a class="action" target="_self" data-action="file" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('file','size','',array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_file_size'.'')))); ?></span> </a> @@ -89,11 +89,11 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(lang('id'))))); ?></span> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> </div> </div> @@ -101,12 +101,12 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_cache_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('CACHE_FILENAME')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($cache_filename))); ?></span> <br/> @@ -120,7 +120,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_pages" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('FILE_PAGES')))); ?></span> </label> </div> @@ -132,7 +132,7 @@ <a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="info" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_page.png" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> </a> @@ -141,7 +141,7 @@ <?php } ?> </table> <?php $if6=(($pages)==FALSE); if($if6){?> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> <?php } ?> </div> @@ -150,7 +150,7 @@ <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('prop_userinfo') ?></legend><div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> </div> <div class="input"> @@ -168,7 +168,7 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> </div> <div class="input"> @@ -187,7 +187,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> </label> </div> diff --git a/modules/cms-ui/themes/default/html/views/file/preview.php b/modules/cms-ui/themes/default/html/views/file/preview.php @@ -2,7 +2,7 @@ <div class="clickable"> <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LINK_OPEN_IN_NEW_WINDOW'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'LINK_OPEN_IN_NEW_WINDOW'.'')))); ?></span> </a> diff --git a/modules/cms-ui/themes/default/html/views/file/remove.php b/modules/cms-ui/themes/default/html/views/file/remove.php @@ -0,0 +1,21 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="remove" 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="remove" /><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"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + + <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = '';$readonly = '';$required = ''; + if ( isset($$tmpname) ) + $checked = $$tmpname; + else + $checked = $default; + + ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + + if ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> Löschen </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/file/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/file/remove.tpl.src.xml @@ -1,3 +1,9 @@ <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"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name"></text></column></row><row><column><text text="GLOBAL_DELETE"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> + <form> + <text label="GLOBAL_NAME" var="name"></text> + + <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/folder/edit.php b/modules/cms-ui/themes/default/html/views/folder/edit.php @@ -22,11 +22,11 @@ </td> <td class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span class="text"><?php echo nl2br(' / '); ?></span> + <span><?php echo nl2br(' / '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> </td> </tr> @@ -50,7 +50,7 @@ <?php } ?> <?php $if7=(!'writable'); if($if7){?> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> <?php } ?> </td> @@ -59,9 +59,9 @@ <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="edit" data-id="<?php echo $objectid ?>" data-extra="[]" href="<?php echo Html::url($type,'',$objectid,array()) ?>"> <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,40,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $name,40,'..',constant('STR_PAD_BOTH') )))); ?></span> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> </a> @@ -72,21 +72,21 @@ <?php $if4=(($object)==FALSE); if($if4){?> <tr> <td colspan="2"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> </td> </tr> <?php } ?> <tr class="data"> <td> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> </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')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfolder'.'')))); ?></span> </a> @@ -94,14 +94,14 @@ </tr> <tr class="data"> <td> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></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')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createpage'.'')))); ?></span> </a> @@ -109,14 +109,14 @@ </tr> <tr class="data"> <td> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></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')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createfile'.'')))); ?></span> </a> @@ -124,14 +124,14 @@ </tr> <tr class="data"> <td> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></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')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_folder_createlink'.'')))); ?></span> </a> @@ -150,9 +150,9 @@ <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 class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('FOLDER_SELECT_'.$actiontype.'')))); ?></span> </label> </div> @@ -162,7 +162,7 @@ <div class="label"> </div> <div class="input"> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> <?php { $tmpname = 'confirm';$default = '';$readonly = '';$required = '1'; if ( isset($$tmpname) ) @@ -179,14 +179,14 @@ } ?> <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'CONFIRM_DELETE'.'')))); ?></span> </label> </div> </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FOLDER_SELECT_TARGET_FOLDER'.'')))); ?></span> </div> <div class="input"> diff --git a/modules/cms-ui/themes/default/html/views/folder/info.php b/modules/cms-ui/themes/default/html/views/folder/info.php @@ -18,7 +18,7 @@ </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> </div> </div> @@ -40,7 +40,7 @@ </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($full_filename))); ?></span> </div> </div> @@ -50,7 +50,7 @@ </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/folder/preview.php b/modules/cms-ui/themes/default/html/views/folder/preview.php @@ -3,15 +3,15 @@ <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"> <td class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span class="text"><?php echo nl2br(' / '); ?></span> + <span><?php echo nl2br(' / '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> </td> <td class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_LASTCHANGE'.'')))); ?></span> </td> </tr> @@ -20,11 +20,11 @@ <td> <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_folder_up.png" /> - <span class="text"><?php echo nl2br('..'); ?></span> + <span><?php echo nl2br('..'); ?></span> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> </td> </tr> @@ -35,9 +35,9 @@ <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="preview" data-id="<?php echo $id ?>" data-extra="[]" href="<?php echo Html::url($type,'',$id,array()) ?>"> <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_<?php echo $icon ?>.png" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> </a> @@ -51,7 +51,7 @@ <?php $if3=(($object)==FALSE); if($if3){?> <tr> <td colspan="2"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/folder/remove.php b/modules/cms-ui/themes/default/html/views/folder/remove.php @@ -0,0 +1,35 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="remove" 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="remove" /><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"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + + <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = '';$readonly = '';$required = ''; + if ( isset($$tmpname) ) + $checked = $$tmpname; + else + $checked = $default; + + ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + + if ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> Löschen </span></label> + + <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'withChildren';$default = '';$readonly = !$hasChildren;$required = ''; + if ( isset($$tmpname) ) + $checked = $$tmpname; + else + $checked = $default; + + ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + + if ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> ?GLOBAL_DELETE_WITH_CHILDREN? </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/folder/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/folder/remove.tpl.src.xml @@ -2,31 +2,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> <form> - <row> - <column> - <text text="GLOBAL_NAME"></text> - </column> - <column> - <text var="name"></text> - </column> - </row> - <row> - <column> - <text text="GLOBAL_DELETE"></text> - </column> - <column> - <checkbox name="delete" required="true"></checkbox> - </column> - </row> - <row> - <column colspan="2" class="help"> - <text text="GROUP_DELETE_DESC"></text> - </column> - </row> - <row> - <column colspan="2"> - <button type="ok"></button> - </column> - </row> + <text label="GLOBAL_NAME" var="name"></text> + + <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + + <checkbox label="GLOBAL_DELETE_WITH_CHILDREN" name="withChildren" readonly="not:var:hasChildren"></checkbox> </form> </output> \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/link/edit.php b/modules/cms-ui/themes/default/html/views/link/edit.php @@ -4,7 +4,7 @@ <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('link_target')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_target')))); ?></span> </div> <div class="input"> diff --git a/modules/cms-ui/themes/default/html/views/link/info.php b/modules/cms-ui/themes/default/html/views/link/info.php @@ -4,7 +4,7 @@ <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"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> </div> <div class="input"> @@ -14,7 +14,7 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> </div> <div class="input"> @@ -27,12 +27,12 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> </div> </div> @@ -41,7 +41,7 @@ <div class="line"> <div class="label"> <label class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> </label> </div> @@ -61,7 +61,7 @@ <div class="line"> <div class="label"> <label class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> </label> </div> diff --git a/modules/cms-ui/themes/default/html/views/link/remove.php b/modules/cms-ui/themes/default/html/views/link/remove.php @@ -0,0 +1,21 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="remove" 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="remove" /><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"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + + <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = '';$readonly = '';$required = ''; + if ( isset($$tmpname) ) + $checked = $$tmpname; + else + $checked = $default; + + ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + + if ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> Löschen </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/link/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/link/remove.tpl.src.xml @@ -0,0 +1,9 @@ +<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> + <text label="GLOBAL_NAME" var="name"></text> + + <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/page/edit.php b/modules/cms-ui/themes/default/html/views/page/edit.php @@ -4,11 +4,11 @@ <?php $if3=!(($el)==FALSE); if($if3){?> <tr class="headline"> <td class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_NAME')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_NAME')))); ?></span> </td> <td class="help"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_VALUE')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_ELEMENT_VALUE')))); ?></span> </td> </tr> @@ -16,7 +16,7 @@ <?php $if3=(($el)==FALSE); if($if3){?> <tr> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span> </td> </tr> @@ -27,15 +27,15 @@ <a title="<?php echo $desc ?>" target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="pageelement" data-method="edit" data-id="<?php echo $pageelementid ?>" data-extra="{'languageid':'<?php echo $languageid ?>','modelid':'<?php echo $modelid ?>'}" href="<?php echo Html::url('pageelement','',$pageelementid,array('languageid'=>$languageid,'modelid'=>$modelid)) ?>"> <img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $type ?>.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> </a> </td> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $value,50,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $value,50,'..',constant('STR_PAD_BOTH') )))); ?></span> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> </td> </tr> diff --git a/modules/cms-ui/themes/default/html/views/page/info.php b/modules/cms-ui/themes/default/html/views/page/info.php @@ -6,7 +6,7 @@ <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> </div> <div class="input"> @@ -16,17 +16,17 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($filename))); ?></span> </div> </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> </div> <div class="input"> @@ -39,7 +39,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> </label> </div> @@ -51,7 +51,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_full_filename" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_full_filename')))); ?></span> </label> </div> @@ -63,7 +63,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_template_name" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_template')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_template')))); ?></span> </label> </div> @@ -73,7 +73,7 @@ <a target="_self" data-type="open" data-action="template" data-method="info" data-id="<?php echo $templateid ?>" data-extra="[]" href="<?php echo Html::url('template','',$templateid,array()) ?>"> <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/template.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> </a> @@ -82,7 +82,7 @@ <?php if(!$if6){?> <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/template.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span> <?php } ?> </div> @@ -90,7 +90,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_mime_type" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FILE_MIMETYPE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'FILE_MIMETYPE'.'')))); ?></span> </label> </div> @@ -102,12 +102,12 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> </div> </div> @@ -117,7 +117,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_create_date" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> </label> </div> @@ -137,7 +137,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_lastchange_date" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> </label> </div> @@ -157,7 +157,7 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_published_date" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_published')))); ?></span> </label> </div> diff --git a/modules/cms-ui/themes/default/html/views/page/preview.php b/modules/cms-ui/themes/default/html/views/page/preview.php @@ -8,7 +8,7 @@ <a class="action" target="_self" data-url="<?php echo $preview_url ?>" data-type="popup" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>"> <img class="image-icon image-icon--menu" title="" src="./modules/cms-ui/themes/default/images/icon/menu/open_in_new.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_open_in_new_window'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_open_in_new_window'.'')))); ?></span> </a> diff --git a/modules/cms-ui/themes/default/html/views/page/prop.php b/modules/cms-ui/themes/default/html/views/page/prop.php @@ -6,7 +6,7 @@ <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> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_name')))); ?></span> </label> </div> @@ -18,7 +18,7 @@ <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> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_filename')))); ?></span> </label> </div> @@ -30,7 +30,7 @@ <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> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_description')))); ?></span> </label> </div> diff --git a/modules/cms-ui/themes/default/html/views/page/remove.php b/modules/cms-ui/themes/default/html/views/page/remove.php diff --git a/modules/cms-ui/themes/default/html/views/page/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/page/remove.tpl.src.xml @@ -0,0 +1,9 @@ +<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> + <text label="GLOBAL_NAME" var="name"></text> + + <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + </form> +</output>+ \ No newline at end of file diff --git a/modules/cms-ui/themes/default/html/views/project/edit.php b/modules/cms-ui/themes/default/html/views/project/edit.php @@ -3,11 +3,11 @@ <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"> <td> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_TYPE'.'')))); ?></span> - <span class="text"><?php echo nl2br(' / '); ?></span> + <span><?php echo nl2br(' / '); ?></span> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_NAME'.'')))); ?></span> </td> </tr> @@ -16,7 +16,7 @@ <td> <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_folder_up.png" /> - <span class="text"><?php echo nl2br('..'); ?></span> + <span><?php echo nl2br('..'); ?></span> </td> </tr> @@ -27,9 +27,9 @@ <a target="_self" date-name="<?php echo $name ?>" name="<?php echo $name ?>" data-type="open" data-action="<?php echo $type ?>" data-method="edit" data-id="<?php echo $id ?>" data-extra="[]" href="<?php echo Html::url($type,'',$id,array()) ?>"> <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/<?php echo $type ?>.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.$name.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.$name.'')))); ?></span> - <span class="text"><?php echo nl2br(' '); ?></span> + <span><?php echo nl2br(' '); ?></span> </a> diff --git a/modules/cms-ui/themes/default/html/views/project/info.php b/modules/cms-ui/themes/default/html/views/project/info.php @@ -4,12 +4,12 @@ <div class="line"> <div class="label"> <label class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('project_info_'.$list_key.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('project_info_'.$list_key.'')))); ?></span> </label> </div> <div class="input"> - <strong class="text"><?php echo nl2br(encodeHtml(htmlentities($list_value))); ?></strong> + <strong><?php echo nl2br(encodeHtml(htmlentities($list_value))); ?></strong> </div> </div> diff --git a/modules/cms-ui/themes/default/html/views/text/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/text/remove.tpl.src.xml @@ -1,3 +1,27 @@ <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"><dummy><form><window icon="group" name="GLOBAL_GROUPS"><row><column><text text="GLOBAL_NAME"></text></column><column><text var="name"></text></column></row><row><column><text text="GLOBAL_DELETE"></text></column><column><checkbox name="delete"></checkbox></column></row><row><column colspan="2"><button type="ok"></button></column></row></window></form><focus field="delete"></focus></dummy></output>- \ No newline at end of file + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd"> + <form> + <row> + <column> + <text text="GLOBAL_NAME"></text> + </column> + <column> + <text var="name"></text> + </column> + </row> + <row> + <column> + <text text="GLOBAL_DELETE"></text> + </column> + <column> + <checkbox name="delete"></checkbox> + </column> + </row> + <row> + <column colspan="2"> + <button type="ok"></button> + </column> + </row> + </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 @@ -20,7 +20,7 @@ </div> <div class="dropdown"> <div class="entry"> - <span class="text" title="<?php echo $dbid ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $dbname,50,'..',constant('STR_PAD_BOTH') )))); ?></span> + <span title="<?php echo $dbid ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $dbname,50,'..',constant('STR_PAD_BOTH') )))); ?></span> </div> </div> @@ -57,7 +57,7 @@ <a title="<?php echo lang('menu_new_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="add" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'add'}" href="<?php echo Html::url('','add','',array('dialogAction'=>'','dialogMethod'=>'add')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_new'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_new'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','add')))); ?></span> @@ -70,7 +70,7 @@ <a title="<?php echo lang('menu_createfolder_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createfolder" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfolder'}" href="<?php echo Html::url('','createfolder','',array('dialogAction'=>'','dialogMethod'=>'createfolder')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfolder'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfolder'.'')))); ?></span> </a> @@ -79,7 +79,7 @@ <a title="<?php echo lang('menu_createpage_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createpage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createpage'}" href="<?php echo Html::url('','createpage','',array('dialogAction'=>'','dialogMethod'=>'createpage')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createpage'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createpage'.'')))); ?></span> </a> @@ -88,7 +88,7 @@ <a title="<?php echo lang('menu_createfile_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createfile" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createfile'}" href="<?php echo Html::url('','createfile','',array('dialogAction'=>'','dialogMethod'=>'createfile')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfile'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createfile'.'')))); ?></span> </a> @@ -97,7 +97,7 @@ <a title="<?php echo lang('menu_createimage_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createimage" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createimage'}" href="<?php echo Html::url('','createimage','',array('dialogAction'=>'','dialogMethod'=>'createimage')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createimage'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createimage'.'')))); ?></span> </a> @@ -106,7 +106,7 @@ <a title="<?php echo lang('menu_createtext_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createtext" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createtext'}" href="<?php echo Html::url('','createtext','',array('dialogAction'=>'','dialogMethod'=>'createtext')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createtext'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createtext'.'')))); ?></span> </a> @@ -115,7 +115,7 @@ <a title="<?php echo lang('menu_createlink_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createlink" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createlink'}" href="<?php echo Html::url('','createlink','',array('dialogAction'=>'','dialogMethod'=>'createlink')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createlink'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createlink'.'')))); ?></span> </a> @@ -124,7 +124,7 @@ <a title="<?php echo lang('menu_createurl_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="createurl" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'createurl'}" href="<?php echo Html::url('','createurl','',array('dialogAction'=>'','dialogMethod'=>'createurl')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createurl'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_createurl'.'')))); ?></span> </a> @@ -135,7 +135,7 @@ <a title="<?php echo lang('menu_compress_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="compress" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'compress'}" href="<?php echo Html::url('','compress','',array('dialogAction'=>'','dialogMethod'=>'compress')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/compress.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_compress'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_compress'.'')))); ?></span> </a> @@ -144,7 +144,7 @@ <a title="<?php echo lang('menu_decompress_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="decompress" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'decompress'}" href="<?php echo Html::url('','decompress','',array('dialogAction'=>'','dialogMethod'=>'decompress')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/decompress.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_decompress'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_decompress'.'')))); ?></span> </a> @@ -153,7 +153,7 @@ <a title="<?php echo lang('menu_extract_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="extract" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'extract'}" href="<?php echo Html::url('','extract','',array('dialogAction'=>'','dialogMethod'=>'extract')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/extract.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extract'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extract'.'')))); ?></span> </a> @@ -164,7 +164,7 @@ <a class="entry" title="<?php echo lang('USER_LOGOUT_DESC') ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="<?php echo OR_ID ?>" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","none":"0"}"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/logout.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> </a> @@ -185,7 +185,7 @@ <a title="<?php echo lang('menu_prop_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="prop" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'prop'}" href="<?php echo Html::url('','prop','',array('dialogAction'=>'','dialogMethod'=>'prop')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/prop.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_prop'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_prop'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','prop')))); ?></span> @@ -196,7 +196,7 @@ <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" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_settings'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_settings'.'')))); ?></span> </a> @@ -205,7 +205,7 @@ <a title="<?php echo lang('menu_pub_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="pub" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'pub'}" href="<?php echo Html::url('','pub','',array('dialogAction'=>'','dialogMethod'=>'pub')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/publish.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_pub'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_pub'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','pub')))); ?></span> @@ -216,7 +216,7 @@ <a class="entry" title="<?php echo lang('menu_archive_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="archive" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'archive'}" href="<?php echo Html::url('','archive','',array('dialogAction'=>'','dialogMethod'=>'archive')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/archive.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_archive'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_archive'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','archive')))); ?></span> @@ -227,7 +227,7 @@ <a title="<?php echo lang('menu_rights_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="rights" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'rights'}" href="<?php echo Html::url('','rights','',array('dialogAction'=>'','dialogMethod'=>'rights')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/rights.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_rights'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_rights'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','method','rights')))); ?></span> @@ -238,18 +238,18 @@ <a title="<?php echo lang('menu_history_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="history" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'history'}" href="<?php echo Html::url('','history','',array('dialogAction'=>'','dialogMethod'=>'history')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/history.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> </a> </div> <div class="divide"> </div> - <div class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-link on-action-language on-action-model on-action-user on-action-group"> + <div class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-url on-action-image on-action-text on-action-link on-action-language on-action-model on-action-user on-action-group"> <a title="<?php echo lang('menu_delete_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="remove" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'remove'}" href="<?php echo Html::url('','remove','',array('dialogAction'=>'','dialogMethod'=>'remove')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/delete.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_delete'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_delete'.'')))); ?></span> </a> @@ -260,7 +260,7 @@ <a title="<?php echo lang('menu_preview_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="preview" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'preview'}" href="<?php echo Html::url('','preview','',array('dialogAction'=>'','dialogMethod'=>'preview')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/preview.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_preview'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_preview'.'')))); ?></span> </a> @@ -281,7 +281,7 @@ <a title="<?php echo lang('menu_password_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'pw'}" href="<?php echo Html::url('','pw','',array('dialogAction'=>'','dialogMethod'=>'pw')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/password.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> </a> @@ -290,7 +290,7 @@ <a title="<?php echo lang('menu_memberships_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="memberships" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'memberships'}" href="<?php echo Html::url('','memberships','',array('dialogAction'=>'','dialogMethod'=>'memberships')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/membership.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_memberships'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_memberships'.'')))); ?></span> </a> @@ -299,7 +299,7 @@ <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')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/advanced.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_advanced'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_advanced'.'')))); ?></span> </a> @@ -310,7 +310,7 @@ <a title="<?php echo lang('menu_changetemplate_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="changetemplate" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'changetemplate'}" href="<?php echo Html::url('','changetemplate','',array('dialogAction'=>'','dialogMethod'=>'changetemplate')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/changetemplate.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_changetemplate'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_changetemplate'.'')))); ?></span> </a> @@ -319,7 +319,7 @@ <a title="<?php echo lang('menu_src_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="src" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'src'}" href="<?php echo Html::url('','src','',array('dialogAction'=>'','dialogMethod'=>'src')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/code.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_src'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_src'.'')))); ?></span> </a> @@ -328,7 +328,7 @@ <a title="<?php echo lang('menu_extension_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="extension" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'extension'}" href="<?php echo Html::url('','extension','',array('dialogAction'=>'','dialogMethod'=>'extension')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/extension.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extension'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_extension'.'')))); ?></span> </a> @@ -339,7 +339,7 @@ <a title="<?php echo lang('menu_value_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="value" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'value'}" href="<?php echo Html::url('','value','',array('dialogAction'=>'','dialogMethod'=>'value')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/value.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_value'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_value'.'')))); ?></span> </a> @@ -348,7 +348,7 @@ <a title="<?php echo lang('menu_order_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="order" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'order'}" href="<?php echo Html::url('','order','',array('dialogAction'=>'','dialogMethod'=>'order')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/order.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_order'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_order'.'')))); ?></span> </a> @@ -359,7 +359,7 @@ <a title="<?php echo lang('menu_size_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="size" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'size'}" href="<?php echo Html::url('','size','',array('dialogAction'=>'','dialogMethod'=>'size')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/size.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_size'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_size'.'')))); ?></span> </a> @@ -370,7 +370,7 @@ <a title="<?php echo lang('menu_maintenance_desc') ?>" target="_self" data-type="dialog" data-action="" data-method="maintenance" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'maintenance'}" href="<?php echo Html::url('','maintenance','',array('dialogAction'=>'','dialogMethod'=>'maintenance')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/maintenance.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_maintenance'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_maintenance'.'')))); ?></span> </a> @@ -393,7 +393,7 @@ <a title="<?php echo lang('menu_PROFILE_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'edit'}" href="<?php echo Html::url('profile','edit','',array('dialogAction'=>'profile','dialogMethod'=>'edit')) ?>"> <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/user.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_profile'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_profile'.'')))); ?></span> <span class="keystroke"><?php echo nl2br(encodeHtml(htmlentities(config('ui','keybinding','action','profile')))); ?></span> @@ -404,7 +404,7 @@ <a title="<?php echo lang('menu_password_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="pw" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'pw'}" href="<?php echo Html::url('profile','pw','',array('dialogAction'=>'profile','dialogMethod'=>'pw')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/password.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_password'.'')))); ?></span> </a> @@ -413,7 +413,7 @@ <a title="<?php echo lang('menu_mail_DESC') ?>" target="_self" data-type="dialog" data-action="profile" data-method="mail" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'mail'}" href="<?php echo Html::url('profile','mail','',array('dialogAction'=>'profile','dialogMethod'=>'mail')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/mail.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_mail'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_mail'.'')))); ?></span> </a> @@ -422,7 +422,7 @@ <a title="<?php echo lang('menu_license_DESC') ?>" target="_self" data-type="dialog" data-action="login" data-method="license" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'login','dialogMethod':'license'}" href="<?php echo Html::url('login','license','',array('dialogAction'=>'login','dialogMethod'=>'license')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/info.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_info'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_info'.'')))); ?></span> </a> @@ -433,7 +433,7 @@ <a title="<?php echo lang('menu_history_desc') ?>" target="_self" data-type="dialog" data-action="profile" data-method="history" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'history'}" href="<?php echo Html::url('profile','history','',array('dialogAction'=>'profile','dialogMethod'=>'history')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/history.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'menu_history'.'')))); ?></span> </a> @@ -444,7 +444,7 @@ <a class="entry" title="<?php echo lang('USER_LOGOUT_DESC') ?>" target="_self" data-type="post" data-action="login" data-method="logout" data-id="<?php echo OR_ID ?>" data-extra="[]" data-data="{"action":"login","subaction":"logout","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","none":"0"}"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/logout.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGOUT'.'')))); ?></span> </a> @@ -455,7 +455,7 @@ <a title="<?php echo lang('USER_LOGIN_DESC') ?>" target="_self" data-type="dialog" data-action="login" data-method="login" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'login','dialogMethod':'login'}" href="<?php echo Html::url('login','login','',array('dialogAction'=>'login','dialogMethod'=>'login')) ?>"> <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/user.svg" /> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGIN'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'USER_LOGIN'.'')))); ?></span> </a> @@ -472,7 +472,7 @@ <div class="arrow arrow-down"> </div> <div class="dropdown"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(''))); ?></span> </div> </div> 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 @@ -269,7 +269,7 @@ <part class="divide"/> - <part class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-link on-action-language on-action-model on-action-user on-action-group"> + <part class="entry clickable filtered on-action-project on-action-template on-action-page on-action-element on-action-image on-action-file on-action-folder on-action-url on-action-image on-action-text on-action-link on-action-language on-action-model on-action-user on-action-group"> <link type="dialog" title="message:menu_delete_desc" subaction="remove"> <image method="delete"></image> diff --git a/modules/cms-ui/themes/default/html/views/url/edit.php b/modules/cms-ui/themes/default/html/views/url/edit.php @@ -4,7 +4,7 @@ <fieldset class="toggle-open-close<?php echo '1'?" open":" closed" ?><?php echo '1'?" show":"" ?>"><div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('link_url')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('link_url')))); ?></span> </div> <div class="input"> diff --git a/modules/cms-ui/themes/default/html/views/url/info.php b/modules/cms-ui/themes/default/html/views/url/info.php @@ -4,7 +4,7 @@ <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"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_name')))); ?></span> </div> <div class="input"> @@ -14,7 +14,7 @@ </div> <div class="line"> <div class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_description')))); ?></span> </div> <div class="input"> @@ -27,12 +27,12 @@ <div class="line"> <div class="label"> <label for="<?php echo REQUEST_ID ?>_objectid" class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'id'.'')))); ?></span> </label> </div> <div class="input"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities($objectid))); ?></span> </div> </div> @@ -41,7 +41,7 @@ <div class="line"> <div class="label"> <label class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_created')))); ?></span> </label> </div> @@ -61,7 +61,7 @@ <div class="line"> <div class="label"> <label class="label"> - <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> + <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_lastchange')))); ?></span> </label> </div> diff --git a/modules/cms-ui/themes/default/html/views/url/remove.php b/modules/cms-ui/themes/default/html/views/url/remove.php @@ -0,0 +1,21 @@ + + + <form name="" target="_self" data-target="view" action="./" data-method="remove" 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="remove" /><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"><span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span></span></label> + + <label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input"><?php { $tmpname = 'delete';$default = '';$readonly = '';$required = ''; + if ( isset($$tmpname) ) + $checked = $$tmpname; + else + $checked = $default; + + ?><input class="checkbox" type="checkbox" id="<?php echo REQUEST_ID ?>_<?php echo $tmpname ?>" name="<?php echo $tmpname ?>" <?php if ($readonly) echo ' disabled="disabled"' ?> value="1"<?php if( $checked ) echo ' checked="checked"' ?><?php if( $required ) echo ' required="required"' ?> /><?php + + if ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> Löschen </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/url/remove.tpl.src.xml b/modules/cms-ui/themes/default/html/views/url/remove.tpl.src.xml @@ -0,0 +1,9 @@ +<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> + <text label="GLOBAL_NAME" var="name"></text> + + <checkbox label="GLOBAL_DELETE" name="delete"></checkbox> + </form> +</output>+ \ No newline at end of file diff --git a/modules/language/language.yml b/modules/language/language.yml @@ -1945,6 +1945,9 @@ GLOBAL_DELETE: es: Effacement fr: Effacement it: Cancelación +GLOBAL_DELETE_WITH_CHILDREN: + de: Löschen mit Unterelementen + en: Delete with children GLOBAL_DESCRIPTION: de: Beschreibung en: Description @@ -6118,4 +6121,4 @@ CMS: en: Content Management System SEARCH_FILTER: de: Filter - en: Filter- \ No newline at end of file + en: Filter diff --git a/modules/template-engine/components/html/checkbox/Checkbox.class.php b/modules/template-engine/components/html/checkbox/Checkbox.class.php @@ -9,10 +9,15 @@ class CheckboxComponent extends Component public $name; public $readonly = false; public $required = false; - + public $label; + protected function begin(){ - - echo '<?php { '; + + if ( $this->label ) + echo '<label class="or-form-row"><span class="or-form-label"></span><span class="or-form-input">'; + + + echo '<?php { '; echo '$tmpname = '.$this->value($this->name).';'; echo '$default = '.$this->value($this->default).';'; echo '$readonly = '.$this->value($this->readonly).';'; @@ -33,7 +38,11 @@ class CheckboxComponent extends Component } } ?> HTML; - } + + if ( $this->label ) + echo ' '.lang($this->label).' </span></label>'; + + } } diff --git a/modules/template-engine/components/html/text/Text.class.php b/modules/template-engine/components/html/text/Text.class.php @@ -2,13 +2,12 @@ namespace template_engine\components; -class TextComponent extends Component +class TextComponent extends HtmlComponent { public $prefix = ''; public $suffix = ''; public $title; public $type; - public $class = 'text'; public $escape = true; public $var; public $text; @@ -18,10 +17,14 @@ class TextComponent extends Component public $maxlength; public $accesskey; public $cut = 'both'; - + public $label; + public function begin() { - if ( $this->raw ) + if ( $this->label ) + echo '<label class="or-form-row"><span class="or-form-label">'.lang($this->label).'</span><span class="or-form-input">'; + + if ( $this->raw ) $this->escape = false; switch( $this->type ) @@ -117,7 +120,10 @@ class TextComponent extends Component echo "echo $value;"; echo ' ?></'.$tag.'>'; // Tag schliessen. - } + + if ( $this->label ) + echo '</span></label>'; + } }