commit db7574035ad18c9c18b16052e017da3c4e791bec parent 38effec68e6bbc3c3d266ee0fa6bc1f2ee6e99a4 Author: Jan Dankert <devnull@localhost> Date: Tue, 26 Dec 2017 22:34:12 +0100 Neue Icons. Refactoring: Methode delete() soll jetzt überall remove() heißen. Diffstat:
34 files changed, 331 insertions(+), 606 deletions(-)
diff --git a/language/language.yml b/language/language.yml @@ -2954,9 +2954,33 @@ MENU_CREATE_DESC: MENU_CREATEFILE: de: Datei hochladen en: Upload file +MENU_CREATEFILE_DESC: + de: Neue Datei hochladen + en: Upload a file MENU_CREATEFOLDER: - de: Neuer Unterordner - en: New subfolder + de: Neuer Ordner + en: New folder +MENU_CREATEFOLDER: + de: Neuen Ordner anlegen + en: Create a new folder +MENU_CREATEIMAGE: + de: Neues Bild + en: New image +MENU_CREATEIMAGE_DESC: + de: Neues Bild hochladen + en: Upload a new image +MENU_CREATETEXT: + de: Neue Textdatei + en: New text file +MENU_CREATETEXT_DESC: + de: Neue Textdatei anlegen + en: Create a new text file +MENU_CREATEURL: + de: Neue URL + en: New URL +MENU_CREATEURL_DESC: + de: Neue Verknüpfung zu einer URL anlegen + en: Create a new URL MENU_CREATE_KEY: de: 'N' en: 'N' @@ -2972,6 +2996,9 @@ MENU_CREATE: MENU_CREATEPAGE: de: Neue Seite en: New page +MENU_CREATEPAGE_DESC: + de: Neue Seite anlegen + en: Create a new page MENU_DELETE: de: Löschen en: Delete diff --git a/modules/cms-core/action/ElementAction.class.php b/modules/cms-core/action/ElementAction.class.php @@ -75,7 +75,7 @@ class ElementAction extends Action /** * Umbenennen des Elementes */ - function deleteView() + public function removeView() { $this->setTemplateVar( 'name' ,$this->element->name ); } @@ -84,7 +84,7 @@ class ElementAction extends Action /** * Entfernen des Elementes */ - function deletePost() + public function removePost() { if ( !$this->hasRequestVar('confirm') ) { @@ -111,7 +111,7 @@ class ElementAction extends Action /** * Aendern des Element-Typs */ - function typePost() + public function advancedPost() { if ( !$this->userIsAdmin() && $this->getRequestVar('type') == 'code' ) { @@ -141,7 +141,7 @@ class ElementAction extends Action - function typeView + public function advancedView () { // Die verschiedenen Element-Typen diff --git a/themes/default/images/icon/method/addgroup.svg b/themes/default/images/icon/method/addgroup.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M8 10H5V7H3v3H0v2h3v3h2v-3h3v-2zm10 1c1.66 0 2.99-1.34 2.99-3S19.66 5 18 5c-.32 0-.63.05-.91.14.57.81.9 1.79.9 2.86s-.34 2.04-.9 2.86c.28.09.59.14.91.14zm-5 0c1.66 0 2.99-1.34 2.99-3S14.66 5 13 5c-1.66 0-3 1.34-3 3s1.34 3 3 3zm6.62 2.16c.83.73 1.38 1.66 1.38 2.84v2h3v-2c0-1.54-2.37-2.49-4.38-2.84zM13 13c-2 0-6 1-6 3v2h12v-2c0-2-4-3-6-3z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/advanced.svg b/themes/default/images/icon/method/advanced.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 17v2h6v-2H3zM3 5v2h10V5H3zm10 16v-2h8v-2h-8v-2h-2v6h2zM7 9v2H3v2h4v2h2V9H7zm14 4v-2H11v2h10zm-6-4h2V7h4V5h-4V3h-2v6z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/applications.svg b/themes/default/images/icon/method/applications.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M4 8h4V4H4v4zm6 12h4v-4h-4v4zm-6 0h4v-4H4v4zm0-6h4v-4H4v4zm6 0h4v-4h-4v4zm6-10v4h4V4h-4zm-6 4h4V4h-4v4zm6 6h4v-4h-4v4zm0 6h4v-4h-4v4z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/code.svg b/themes/default/images/icon/method/code.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/compress.svg b/themes/default/images/icon/method/compress.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.54 5.23l-1.39-1.68C18.88 3.21 18.47 3 18 3H6c-.47 0-.88.21-1.16.55L3.46 5.23C3.17 5.57 3 6.02 3 6.5V19c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6.5c0-.48-.17-.93-.46-1.27zM12 17.5L6.5 12H10v-2h4v2h3.5L12 17.5zM5.12 5l.81-1h12l.94 1H5.12z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/decompress.svg b/themes/default/images/icon/method/decompress.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.55 5.22l-1.39-1.68C18.88 3.21 18.47 3 18 3H6c-.47 0-.88.21-1.15.55L3.46 5.22C3.17 5.57 3 6.01 3 6.5V19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V6.5c0-.49-.17-.93-.45-1.28zM12 9.5l5.5 5.5H14v2h-4v-2H6.5L12 9.5zM5.12 5l.82-1h12l.93 1H5.12z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/delete.svg b/themes/default/images/icon/method/delete.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm5 11H7v-2h10v2z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/export.svg b/themes/default/images/icon/method/export.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M2.01 21L23 12 2.01 3 2 10l15 2-15 2z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/extension.svg b/themes/default/images/icon/method/extension.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M18 17H6v-2h12v2zm0-4H6v-2h12v2zm0-4H6V7h12v2zM3 22l1.5-1.5L6 22l1.5-1.5L9 22l1.5-1.5L12 22l1.5-1.5L15 22l1.5-1.5L18 22l1.5-1.5L21 22V2l-1.5 1.5L18 2l-1.5 1.5L15 2l-1.5 1.5L12 2l-1.5 1.5L9 2 7.5 3.5 6 2 4.5 3.5 3 2v20z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/extract.svg b/themes/default/images/icon/method/extract.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.55 5.22l-1.39-1.68C18.88 3.21 18.47 3 18 3H6c-.47 0-.88.21-1.15.55L3.46 5.22C3.17 5.57 3 6.01 3 6.5V19c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V6.5c0-.49-.17-.93-.45-1.28zM12 9.5l5.5 5.5H14v2h-4v-2H6.5L12 9.5zM5.12 5l.82-1h12l.93 1H5.12z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/help.svg b/themes/default/images/icon/method/help.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/license.svg b/themes/default/images/icon/method/license.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 7h-6v13h-2v-6h-2v6H9V9H3V7h18v2z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/mail.svg b/themes/default/images/icon/method/mail.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 4l-8 5-8-5V6l8 5 8-5v2z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/maintenance.svg b/themes/default/images/icon/method/maintenance.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M22.7 19l-9.1-9.1c.9-2.3.4-5-1.5-6.9-2-2-5-2.4-7.4-1.3L9 6 6 9 1.6 4.7C.4 7.1.9 10.1 2.9 12.1c1.9 1.9 4.6 2.4 6.9 1.5l9.1 9.1c.4.4 1 .4 1.4 0l2.3-2.3c.5-.4.5-1.1.1-1.4z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/membership.svg b/themes/default/images/icon/method/membership.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/order.svg b/themes/default/images/icon/method/order.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 15h18v-2H3v2zm0 4h18v-2H3v2zm0-8h18V9H3v2zm0-6v2h18V5H3z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/refresh.svg b/themes/default/images/icon/method/refresh.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17.65 6.35C16.2 4.9 14.21 4 12 4c-4.42 0-7.99 3.58-7.99 8s3.57 8 7.99 8c3.73 0 6.84-2.55 7.73-6h-2.08c-.82 2.33-3.04 4-5.65 4-3.31 0-6-2.69-6-6s2.69-6 6-6c1.66 0 3.14.69 4.22 1.78L13 11h7V4l-2.35 2.35z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/size.svg b/themes/default/images/icon/method/size.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/source.svg b/themes/default/images/icon/method/source.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M14 17H4v2h10v-2zm6-8H4v2h16V9zM4 15h16v-2H4v2zM4 5v2h16V5H4z"/></svg>+ \ No newline at end of file diff --git a/themes/default/images/icon/method/value.svg b/themes/default/images/icon/method/value.svg @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M17.75 7L14 3.25l-10 10V17h3.75l10-10zm2.96-2.96c.39-.39.39-1.02 0-1.41L18.37.29c-.39-.39-1.02-.39-1.41 0L15 2.25 18.75 6l1.96-1.96z"/><path fill-opacity=".36" d="M0 20h24v4H0z"/></svg>+ \ No newline at end of file diff --git a/themes/default/templates/element/advanced.tpl.out.php b/themes/default/templates/element/advanced.tpl.out.php @@ -0,0 +1,19 @@ + + + + + <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="" onSubmit="formSubmit( $(this) ); return false;"><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":"" ?>"><div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_TYPE')))); ?></span> + + </div> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_type" name="type" title="" class=""<?php if (count($types)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($types,$type,0,1) ?><?php if (count($types)==0) { ?><input type="hidden" name="type" value="" /><?php } ?><?php if (count($types)==1) { ?><input type="hidden" name="type" value="<?php echo array_keys($types)[0] ?>" /><?php } ?> + </select></div> + </div> + </div> + </div></fieldset> + <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /></div></div></form> + + \ No newline at end of file diff --git a/themes/default/templates/element/advanced.tpl.src.xml b/themes/default/templates/element/advanced.tpl.src.xml @@ -0,0 +1,17 @@ +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> + <header back="true"></header> + <form> + <group> + <part class="line"> + <part class="label"> + <text text="ELEMENT_TYPE"></text> + </part> + <part class="input"> + <selectbox name="type" list="types" lang="true"></selectbox> + </part> + </part> + </group> + + </form> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/element/delete.tpl.out.php b/themes/default/templates/element/delete.tpl.out.php diff --git a/themes/default/templates/element/delete.tpl.src.xml b/themes/default/templates/element/delete.tpl.src.xml @@ -1,48 +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.xsd"> - <header back="true"></header> - <form> - <group> - <part class="line"> - <part class="label"> - <text key="ELEMENT_NAME"></text> - </part> - <part class="input"> - <text var="name" class="name"></text> - </part> - </part> - </group> - <group title="message:options"> - - <part class="line"> - <part class="label"> - </part> - <part class="input"> - <checkbox name="confirm"></checkbox> - <label for="confirm"> - <text text="CONFIRM_DELETE"></text> - </label> - </part> - </part> - - <part class="line"> - <part class="label"> - </part> - <part class="input"> - <text raw="_____"></text> - <radio name="type" value="value"></radio> - <label for="type_value"> - <text text="ELEMENT_DELETE_VALUES"></text> - </label> - <newline></newline> - <text raw="_____"></text> - <radio name="type" value="all"></radio> - <label for="type_all"> - <text text="DELETE"></text> - </label> - </part> - </part> - </group> - - </form> -</output>- \ No newline at end of file diff --git a/themes/default/templates/element/edit.tpl.out.php b/themes/default/templates/element/edit.tpl.out.php @@ -1,42 +1,16 @@ -<!-- Compiling output/output-begin --> - - - <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="<?php echo OR_METHOD ?>" - enctype="application/x-www-form-urlencoded" - class="<?php echo OR_ACTION ?>" - data-async="" - data-autosave="" - onSubmit="formSubmit( $(this) ); return false;"><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 ?>" /> -<?php - if ( $conf['interface']['url_sessionid'] ) - echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?> + + <div class="headermenu"><div class="toolbar-icon clickable"><a href="javascript:void(0);" title="<?php echo lang('MENU_ADVANCED') ?>" data-type="dialog" data-name="<?php echo lang('MENU_ADVANCED') ?>" data-method="advanced"><img src="./themes/default/images/icon/action/advanced.svg" title="<?php echo lang('MENU_advanced_DESC') ?>" /><?php echo lang('MENU_advanced') ?></a></div><div class="toolbar-icon clickable"><a href="javascript:void(0);" title="<?php echo lang('MENU_REMOVE') ?>" data-type="dialog" data-name="<?php echo lang('MENU_REMOVE') ?>" data-method="remove"><img src="./themes/default/images/icon/action/remove.svg" title="<?php echo lang('MENU_remove_DESC') ?>" /><?php echo lang('MENU_remove') ?></a></div></div> + + <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="" onSubmit="formSubmit( $(this) ); return false;"><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 ?>" /> <div class="line"> <div class="label"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a5_class='focus';$a5_default='';$a5_type='text';$a5_name='name';$a5_size='';$a5_maxlength='256';$a5_onchange='';$a5_readonly=false;$a5_hint='';$a5_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a5_readonly=true; - if ($a5_readonly && empty($$a5_name)) $$a5_name = '- '.lang('EMPTY').' -'; - if(!isset($a5_default)) $a5_default=''; - $tmp_value = Text::encodeHtml(isset($$a5_name)?$$a5_name:$a5_default); -?><?php if (!$a5_readonly || $a5_type=='hidden') { -?><div class="<?php echo $a5_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a5_readonly) echo ' disabled="true"' ?><?php if ($a5_hint) echo ' data-hint="'.$a5_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a5_name ?><?php if ($a5_readonly) echo '_disabled' ?>" name="<?php echo $a5_name ?><?php if ($a5_readonly) echo '_disabled' ?>" type="<?php echo $a5_type ?>" maxlength="<?php echo $a5_maxlength ?>" class="<?php echo str_replace(',',' ',$a5_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a5_icon) echo '<img src="'.$image_dir.'icon_'.$a5_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a5_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a5_name ?>" name="<?php echo $a5_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a5_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a5_class,$a5_default,$a5_type,$a5_name,$a5_size,$a5_maxlength,$a5_onchange,$a5_readonly,$a5_hint,$a5_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div> + </div> </div> <div class="line"> @@ -44,16 +18,10 @@ if ($a5_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_DESCRIPTION')))); ?></span> </div> - <div class="input"><!-- Compiling inputarea/inputarea-begin --><?php $a5_name='description';$a5_rows='5';$a5_cols='40';$a5_class='inputarea';$a5_default=''; ?><div class="inputholder"><textarea class="<?php echo $a5_class ?>" name="<?php echo $a5_name ?>" ><?php echo Text::encodeHtml(isset($$a5_name)?$$a5_name:$a5_default) ?></textarea></div><?php unset($a5_name,$a5_rows,$a5_cols,$a5_class,$a5_default) ?> + <div class="input"> + <div class="inputholder"><textarea class="inputarea" name="description"><?php echo Text::encodeHtml($description) ?></textarea></div> + </div> </div> - -<div class="bottom"> - <div class="command "> - - <input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /> - - <!-- Cancel-Button nicht anzeigen, wenn cancel==false. --> </div> -</div> - -</form> + <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /></div></div></form> + + \ No newline at end of file diff --git a/themes/default/templates/element/edit.tpl.src.xml b/themes/default/templates/element/edit.tpl.src.xml @@ -1,6 +1,6 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <header views="type,delete"></header> + <header views="advanced,remove"></header> <form> <part class="line"> <part class="label"> diff --git a/themes/default/templates/element/prop.tpl.out.php b/themes/default/templates/element/prop.tpl.out.php @@ -1,36 +1,16 @@ -<!-- Compiling output/output-begin --> + + <?php $if2=(@$conf['security']['disable_dynamic_code']); if($if2){?> - <?php $if3=(!true); if($if3){?> + <?php $if3=(!'1'); if($if3){?> <div class="message warn"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'NOTICE_CODE_DISABLED'.'')))); ?></span> </div> <?php } ?> <?php } ?> - <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="<?php echo OR_METHOD ?>" - enctype="application/x-www-form-urlencoded" - class="<?php echo OR_ACTION ?>" - data-async="" - data-autosave="" - onSubmit="formSubmit( $(this) ); return false;"><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 ?>" /> -<?php - if ( $conf['interface']['url_sessionid'] ) - echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?> - + <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="" onSubmit="formSubmit( $(this) ); return false;"><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":"" ?>"><div> <?php $if4=(!empty($subtype)); if($if4){?> <div class="line"> @@ -39,70 +19,13 @@ </div> <div class="input"> - <?php $if7=(!empty($subtypes)); if($if7){?><!-- Compiling selectbox/selectbox-begin --><?php $a8_list='subtypes';$a8_name='subtype';$a8_onchange='';$a8_title='';$a8_class='';$a8_addempty=true;$a8_multiple=false;$a8_size='1';$a8_lang=false; ?><?php -$a8_readonly=false; -$a8_tmp_list = $$a8_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a8_name)?'- '.lang('EMPTY').' -':$a8_tmp_list[$$a8_name]; -} -else -{ -if ( $a8_addempty!==FALSE ) -{ - if ($a8_addempty===TRUE) - $a8_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a8_tmp_list; - else - $a8_tmp_list = array(''=>'- '.lang($a8_addempty).' -')+$a8_tmp_list; -} -?><div class="inputholder"><select<?php if ($a8_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a8_name ?>" name="<?php echo $a8_name; if ($a8_multiple) echo '[]'; ?>" onchange="<?php echo $a8_onchange ?>" title="<?php echo $a8_title ?>" class="<?php echo $a8_class ?>"<?php -if (count($$a8_list)<=1) echo ' disabled="disabled"'; -if ($a8_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a8_size).'"'; -?>><?php - if ( isset($$a8_name) && isset($a8_tmp_list[$$a8_name]) ) - $a8_tmp_default = $$a8_name; - elseif ( isset($a8_default) ) - $a8_tmp_default = $a8_default; - else - $a8_tmp_default = ''; - foreach( $a8_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a8_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a8_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a8_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a8_list)==0) echo '<input type="hidden" name="'.$a8_name.'" value="" />'; -if (count($$a8_list)==1) echo '<input type="hidden" name="'.$a8_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a8_list,$a8_name,$a8_onchange,$a8_title,$a8_class,$a8_addempty,$a8_multiple,$a8_size,$a8_lang) ?> + <?php $if7=(!empty($subtypes)); if($if7){?> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_subtype" name="subtype" title="" class=""<?php if (count($subtypes)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($subtypes,$subtype,1,0) ?><?php if (count($subtypes)==0) { ?><input type="hidden" name="subtype" value="" /><?php } ?><?php if (count($subtypes)==1) { ?><input type="hidden" name="subtype" value="<?php echo array_keys($subtypes)[0] ?>" /><?php } ?> + </select></div> <?php } ?> - <?php $if7=!(!empty($subtypes)); if($if7){?><!-- Compiling input/input-begin --><?php $a8_class='text';$a8_default='';$a8_type='text';$a8_name='subtype';$a8_size='';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false;$a8_hint='';$a8_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; - if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; - if(!isset($a8_default)) $a8_default=''; - $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); -?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><div class="<?php echo $a8_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a8_readonly) echo ' disabled="true"' ?><?php if ($a8_hint) echo ' data-hint="'.$a8_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo str_replace(',',' ',$a8_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a8_icon) echo '<img src="'.$image_dir.'icon_'.$a8_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a8_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly,$a8_hint,$a8_icon) ?> + <?php $if7=!(!empty($subtypes)); if($if7){?> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_subtype" name="subtype<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$subtype) ?>" /><?php if ('') { ?><input type="hidden" name="subtype" value="<?php $subtype ?>"/><?php } ?></div> + <?php } ?> </div> </div> @@ -125,10 +48,11 @@ if ($a8_readonly) { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> - <!-- Compiling label/label-begin --><?php $a7_for='with_icon'; ?><label<?php if (isset($a7_for)) { ?> for="<?php echo REQUEST_ID ?>_<?php echo $a7_for ?><?php if (!empty($a7_value)) echo '_'.$a7_value ?>" <?php if(hasLang(@$a7_key.'_desc')) { ?> title="<?php echo lang(@$a7_key.'_desc')?>"<?php } ?> class="label"<?php } ?>> -<?php if (isset($a7_key)) { echo lang($a7_key); ?><?php if (isset($a7_text)) { echo $a7_text; } ?><?php } ?><?php unset($a7_for) ?> + + <label for="<?php echo REQUEST_ID ?>_with_icon" class="label"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_WITH_ICON')))); ?></span> - <!-- Compiling label/label-end --></label> + + </label> </div> </div> <?php } ?> @@ -150,10 +74,11 @@ if ($a8_readonly) { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> - <!-- Compiling label/label-begin --><?php $a7_for='all_languages'; ?><label<?php if (isset($a7_for)) { ?> for="<?php echo REQUEST_ID ?>_<?php echo $a7_for ?><?php if (!empty($a7_value)) echo '_'.$a7_value ?>" <?php if(hasLang(@$a7_key.'_desc')) { ?> title="<?php echo lang(@$a7_key.'_desc')?>"<?php } ?> class="label"<?php } ?>> -<?php if (isset($a7_key)) { echo lang($a7_key); ?><?php if (isset($a7_text)) { echo $a7_text; } ?><?php } ?><?php unset($a7_for) ?> + + <label for="<?php echo REQUEST_ID ?>_all_languages" class="label"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_ALL_LANGUAGES')))); ?></span> - <!-- Compiling label/label-end --></label> + + </label> </div> </div> <?php } ?> @@ -175,10 +100,11 @@ if ($a8_readonly) { ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php } } ?> - <!-- Compiling label/label-begin --><?php $a7_for='writable'; ?><label<?php if (isset($a7_for)) { ?> for="<?php echo REQUEST_ID ?>_<?php echo $a7_for ?><?php if (!empty($a7_value)) echo '_'.$a7_value ?>" <?php if(hasLang(@$a7_key.'_desc')) { ?> title="<?php echo lang(@$a7_key.'_desc')?>"<?php } ?> class="label"<?php } ?>> -<?php if (isset($a7_key)) { echo lang($a7_key); ?><?php if (isset($a7_text)) { echo $a7_text; } ?><?php } ?><?php unset($a7_for) ?> + + <label for="<?php echo REQUEST_ID ?>_writable" class="label"> <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_writable')))); ?></span> - <!-- Compiling label/label-end --></label> + + </label> </div> </div> <?php } ?> @@ -188,15 +114,9 @@ if ($a8_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('width')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='width';$a7_size='10';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_width" name="width<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$width) ?>" /><?php if ('') { ?><input type="hidden" name="width" value="<?php $width ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -206,15 +126,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('height')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='height';$a7_size='10';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_height" name="height<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$height) ?>" /><?php if ('') { ?><input type="hidden" name="height" value="<?php $height ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -224,60 +138,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DATEFORMAT')))); ?></span> </div> - <div class="input"><!-- Compiling selectbox/selectbox-begin --><?php $a7_list='dateformats';$a7_name='dateformat';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=false;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php -$a7_readonly=false; -$a7_tmp_list = $$a7_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a7_name)?'- '.lang('EMPTY').' -':$a7_tmp_list[$$a7_name]; -} -else -{ -if ( $a7_addempty!==FALSE ) -{ - if ($a7_addempty===TRUE) - $a7_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a7_tmp_list; - else - $a7_tmp_list = array(''=>'- '.lang($a7_addempty).' -')+$a7_tmp_list; -} -?><div class="inputholder"><select<?php if ($a7_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name; if ($a7_multiple) echo '[]'; ?>" onchange="<?php echo $a7_onchange ?>" title="<?php echo $a7_title ?>" class="<?php echo $a7_class ?>"<?php -if (count($$a7_list)<=1) echo ' disabled="disabled"'; -if ($a7_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a7_size).'"'; -?>><?php - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a7_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a7_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a7_list)==0) echo '<input type="hidden" name="'.$a7_name.'" value="" />'; -if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class,$a7_addempty,$a7_multiple,$a7_size,$a7_lang) ?> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_dateformat" name="dateformat" title="" class=""<?php if (count($dateformats)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($dateformats,$dateformat,0,0) ?><?php if (count($dateformats)==0) { ?><input type="hidden" name="dateformat" value="" /><?php } ?><?php if (count($dateformats)==1) { ?><input type="hidden" name="dateformat" value="<?php echo array_keys($dateformats)[0] ?>" /><?php } ?> + </select></div> </div> </div> <?php } ?> @@ -287,23 +150,9 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_FORMAT')))); ?></span> </div> - <div class="input"><!-- Compiling radiobox/radiobox-begin --><?php $a7_list='formatlist';$a7_name='format';$a7_onchange='';$a7_title='';$a7_class=''; ?><?php $a7_tmp_list = $$a7_list; - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - $box_value = is_array($box_value)?(isset($box_value['lang'])?langHtml($box_value['lang']):$box_value['value']):$box_value; - $id = REQUEST_ID.'_'.$a7_name.'_'.$box_key; - echo '<input id="'.$id.'" name="'.$a7_name.'" type="radio" class="'.$a7_class.'" value="'.$box_key.'"'; - if ($box_key==$a7_tmp_default) - echo ' checked="checked"'; - echo ' /> <label for="'.$id.'">'.$box_value.'</label><br />'; - } -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class) ?> + <div class="input"> + <?php include_once( 'modules/template-engine/components/html/radiobox/component-radio-box.php') ?><?php component_radio_box('format',$formatlist,$format) ?> + </div> </div> <?php } ?> @@ -313,15 +162,9 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DECIMALS')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='decimals';$a7_size='10';$a7_maxlength='2';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_decimals" name="decimals<?php if ('') echo '_disabled' ?>" type="text" maxlength="2" class="text" value="<?php echo Text::encodeHtml(@$decimals) ?>" /><?php if ('') { ?><input type="hidden" name="decimals" value="<?php $decimals ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -331,15 +174,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEC_POINT')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='dec_point';$a7_size='10';$a7_maxlength='5';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_dec_point" name="dec_point<?php if ('') echo '_disabled' ?>" type="text" maxlength="5" class="text" value="<?php echo Text::encodeHtml(@$dec_point) ?>" /><?php if ('') { ?><input type="hidden" name="dec_point" value="<?php $dec_point ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -349,15 +186,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_thousand_sep')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='thousand_sep';$a7_size='10';$a7_maxlength='1';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_thousand_sep" name="thousand_sep<?php if ('') echo '_disabled' ?>" type="text" maxlength="1" class="text" value="<?php echo Text::encodeHtml(@$thousand_sep) ?>" /><?php if ('') { ?><input type="hidden" name="thousand_sep" value="<?php $thousand_sep ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -367,15 +198,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_text')))); ?></span> </div> - <div class="input"><!-- Compiling input/input-begin --><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='default_text';$a7_size='40';$a7_maxlength='255';$a7_onchange='';$a7_readonly=false;$a7_hint='';$a7_icon=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; - $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><div class="<?php echo $a7_type!='hidden'?'inputholder':'inputhidden' ?>"><input<?php if ($a7_readonly) echo ' disabled="true"' ?><?php if ($a7_hint) echo ' data-hint="'.$a7_hint.'"'; ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo str_replace(',',' ',$a7_class) ?>" value="<?php echo $tmp_value ?>" /><?php if ($a7_icon) echo '<img src="'.$image_dir.'icon_'.$a7_icon.IMG_ICON_EXT.'" width="16" height="16" />'; ?></div><?php -if ($a7_readonly) { -?><input type="hidden" id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php - } } else { ?><a title="<?php echo langHtml('EDIT') ?>" href="<?php echo Html::url($actionName,$subActionName,0,array('mode'=>'edit')) ?>"><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span></a><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly,$a7_hint,$a7_icon) ?> + <div class="input"> + <div class="inputholder"><input<?php if ('') echo ' disabled="true"' ?> id="<?php echo REQUEST_ID ?>_default_text" name="default_text<?php if ('') echo '_disabled' ?>" type="text" maxlength="255" class="text" value="<?php echo Text::encodeHtml(@$default_text) ?>" /><?php if ('') { ?><input type="hidden" name="default_text" value="<?php $default_text ?>"/><?php } ?></div> + </div> </div> <?php } ?> @@ -385,7 +210,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_default_longtext')))); ?></span> </div> - <div class="input"><!-- Compiling inputarea/inputarea-begin --><?php $a7_name='default_longtext';$a7_rows='10';$a7_cols='40';$a7_class='inputarea';$a7_default=''; ?><div class="inputholder"><textarea class="<?php echo $a7_class ?>" name="<?php echo $a7_name ?>" ><?php echo Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default) ?></textarea></div><?php unset($a7_name,$a7_rows,$a7_cols,$a7_class,$a7_default) ?> + <div class="input"> + <div class="inputholder"><textarea class="inputarea" name="default_longtext"><?php echo Text::encodeHtml($default_longtext) ?></textarea></div> + </div> </div> <?php } ?> @@ -395,32 +222,16 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DYNAMIC_PARAMETERS')))); ?></span> </div> - <div class="input"><!-- Compiling inputarea/inputarea-begin --><?php $a7_name='parameters';$a7_rows='15';$a7_cols='40';$a7_class='inputarea';$a7_default=''; ?><div class="inputholder"><textarea class="<?php echo $a7_class ?>" name="<?php echo $a7_name ?>" ><?php echo Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default) ?></textarea></div><?php unset($a7_name,$a7_rows,$a7_cols,$a7_class,$a7_default) ?> + <div class="input"> + <div class="inputholder"><textarea class="inputarea" name="parameters"><?php echo Text::encodeHtml($parameters) ?></textarea></div> + </div> </div> <div class="line"> <div class="label"> </div> - <div class="input"><!-- Compiling list/list-begin --><?php $a7_list='dynamic_class_parameters';$a7_extract=false;$a7_key='paramName';$a7_value='defaultValue'; ?><?php - $a7_list_tmp_key = $a7_key; - $a7_list_tmp_value = $a7_value; - $a7_list_extract = $a7_extract; - unset($a7_key); - unset($a7_value); - if ( !isset($$a7_list) || !is_array($$a7_list) ) - $$a7_list = array(); - foreach( $$a7_list as $$a7_list_tmp_key => $$a7_list_tmp_value ) - { - if ( $a7_list_extract ) - { - if ( !is_array($$a7_list_tmp_value) ) - { - print_r($$a7_list_tmp_value); - die( 'not an array at key: '.$$a7_list_tmp_key ); - } - extract($$a7_list_tmp_value); - } -?><?php unset($a7_list,$a7_extract,$a7_key,$a7_value) ?> + <div class="input"> + <?php foreach($dynamic_class_parameters as $paramName=>$defaultValue){ ?> <span class="text"><?php echo nl2br(encodeHtml(htmlentities($paramName))); ?></span> <span class="text"><?php echo nl2br(' ('); ?></span> @@ -430,7 +241,10 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(') = '); ?></span> <span class="text"><?php echo nl2br(encodeHtml(htmlentities($defaultValue))); ?></span> - <!-- Compiling newline/newline-begin --><br/><!-- Compiling list/list-end --><?php } ?> + + <br/> + + <?php } ?> </div> </div> <?php } ?> @@ -440,7 +254,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_select_items')))); ?></span> </div> - <div class="input"><!-- Compiling inputarea/inputarea-begin --><?php $a7_name='select_items';$a7_rows='15';$a7_cols='40';$a7_class='inputarea';$a7_default=''; ?><div class="inputholder"><textarea class="<?php echo $a7_class ?>" name="<?php echo $a7_name ?>" ><?php echo Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default) ?></textarea></div><?php unset($a7_name,$a7_rows,$a7_cols,$a7_class,$a7_default) ?> + <div class="input"> + <div class="inputholder"><textarea class="inputarea" name="select_items"><?php echo Text::encodeHtml($select_items) ?></textarea></div> + </div> </div> <?php } ?> @@ -450,60 +266,9 @@ if ($a7_readonly) { <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_LINK')))); ?></span> </div> - <div class="input"><!-- Compiling selectbox/selectbox-begin --><?php $a7_list='linkelements';$a7_name='linkelement';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=false;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php -$a7_readonly=false; -$a7_tmp_list = $$a7_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a7_name)?'- '.lang('EMPTY').' -':$a7_tmp_list[$$a7_name]; -} -else -{ -if ( $a7_addempty!==FALSE ) -{ - if ($a7_addempty===TRUE) - $a7_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a7_tmp_list; - else - $a7_tmp_list = array(''=>'- '.lang($a7_addempty).' -')+$a7_tmp_list; -} -?><div class="inputholder"><select<?php if ($a7_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name; if ($a7_multiple) echo '[]'; ?>" onchange="<?php echo $a7_onchange ?>" title="<?php echo $a7_title ?>" class="<?php echo $a7_class ?>"<?php -if (count($$a7_list)<=1) echo ' disabled="disabled"'; -if ($a7_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a7_size).'"'; -?>><?php - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a7_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a7_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a7_list)==0) echo '<input type="hidden" name="'.$a7_name.'" value="" />'; -if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class,$a7_addempty,$a7_multiple,$a7_size,$a7_lang) ?> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_linkelement" name="linkelement" title="" class=""<?php if (count($linkelements)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($linkelements,$linkelement,0,0) ?><?php if (count($linkelements)==0) { ?><input type="hidden" name="linkelement" value="" /><?php } ?><?php if (count($linkelements)==1) { ?><input type="hidden" name="linkelement" value="<?php echo array_keys($linkelements)[0] ?>" /><?php } ?> + </select></div> </div> </div> <?php } ?> @@ -513,60 +278,9 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_NAME')))); ?></span> </div> - <div class="input"><!-- Compiling selectbox/selectbox-begin --><?php $a7_list='names';$a7_name='name';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=false;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php -$a7_readonly=false; -$a7_tmp_list = $$a7_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a7_name)?'- '.lang('EMPTY').' -':$a7_tmp_list[$$a7_name]; -} -else -{ -if ( $a7_addempty!==FALSE ) -{ - if ($a7_addempty===TRUE) - $a7_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a7_tmp_list; - else - $a7_tmp_list = array(''=>'- '.lang($a7_addempty).' -')+$a7_tmp_list; -} -?><div class="inputholder"><select<?php if ($a7_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name; if ($a7_multiple) echo '[]'; ?>" onchange="<?php echo $a7_onchange ?>" title="<?php echo $a7_title ?>" class="<?php echo $a7_class ?>"<?php -if (count($$a7_list)<=1) echo ' disabled="disabled"'; -if ($a7_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a7_size).'"'; -?>><?php - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a7_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a7_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a7_list)==0) echo '<input type="hidden" name="'.$a7_name.'" value="" />'; -if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class,$a7_addempty,$a7_multiple,$a7_size,$a7_lang) ?> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_name" name="name" title="" class=""<?php if (count($names)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($names,$name,0,0) ?><?php if (count($names)==0) { ?><input type="hidden" name="name" value="" /><?php } ?><?php if (count($names)==1) { ?><input type="hidden" name="name" value="<?php echo array_keys($names)[0] ?>" /><?php } ?> + </select></div> </div> </div> <?php } ?> @@ -576,60 +290,9 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_FOLDEROBJECT')))); ?></span> </div> - <div class="input"><!-- Compiling selectbox/selectbox-begin --><?php $a7_list='folders';$a7_name='folderobjectid';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=false;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php -$a7_readonly=false; -$a7_tmp_list = $$a7_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a7_name)?'- '.lang('EMPTY').' -':$a7_tmp_list[$$a7_name]; -} -else -{ -if ( $a7_addempty!==FALSE ) -{ - if ($a7_addempty===TRUE) - $a7_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a7_tmp_list; - else - $a7_tmp_list = array(''=>'- '.lang($a7_addempty).' -')+$a7_tmp_list; -} -?><div class="inputholder"><select<?php if ($a7_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name; if ($a7_multiple) echo '[]'; ?>" onchange="<?php echo $a7_onchange ?>" title="<?php echo $a7_title ?>" class="<?php echo $a7_class ?>"<?php -if (count($$a7_list)<=1) echo ' disabled="disabled"'; -if ($a7_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a7_size).'"'; -?>><?php - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a7_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a7_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a7_list)==0) echo '<input type="hidden" name="'.$a7_name.'" value="" />'; -if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class,$a7_addempty,$a7_multiple,$a7_size,$a7_lang) ?> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_folderobjectid" name="folderobjectid" title="" class=""<?php if (count($folders)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($folders,$folderobjectid,0,0) ?><?php if (count($folders)==0) { ?><input type="hidden" name="folderobjectid" value="" /><?php } ?><?php if (count($folders)==1) { ?><input type="hidden" name="folderobjectid" value="<?php echo array_keys($folders)[0] ?>" /><?php } ?> + </select></div> </div> </div> <?php } ?> @@ -639,60 +302,9 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_DEFAULT_OBJECT')))); ?></span> </div> - <div class="input"><!-- Compiling selectbox/selectbox-begin --><?php $a7_list='objects';$a7_name='default_objectid';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=true;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php -$a7_readonly=false; -$a7_tmp_list = $$a7_list; -if ($this->isEditable() && !$this->isEditMode()) -{ - echo empty($$a7_name)?'- '.lang('EMPTY').' -':$a7_tmp_list[$$a7_name]; -} -else -{ -if ( $a7_addempty!==FALSE ) -{ - if ($a7_addempty===TRUE) - $a7_tmp_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$a7_tmp_list; - else - $a7_tmp_list = array(''=>'- '.lang($a7_addempty).' -')+$a7_tmp_list; -} -?><div class="inputholder"><select<?php if ($a7_readonly) echo ' disabled="disabled"' ?> id="<?php echo REQUEST_ID ?>_<?php echo $a7_name ?>" name="<?php echo $a7_name; if ($a7_multiple) echo '[]'; ?>" onchange="<?php echo $a7_onchange ?>" title="<?php echo $a7_title ?>" class="<?php echo $a7_class ?>"<?php -if (count($$a7_list)<=1) echo ' disabled="disabled"'; -if ($a7_multiple) echo ' multiple="multiple"'; -echo ' size="'.intval($a7_size).'"'; -?>><?php - if ( isset($$a7_name) && isset($a7_tmp_list[$$a7_name]) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - foreach( $a7_tmp_list as $box_key=>$box_value ) - { - if ( is_array($box_value) ) - { - $box_key = $box_value['key' ]; - $box_title = $box_value['title']; - $box_value = $box_value['value']; - } - elseif( $a7_lang ) - { - $box_title = lang( $box_value.'_DESC'); - $box_value = lang( $box_value ); - } - else - { - $box_title = ''; - } - echo '<option class="'.$a7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; - if ((string)$box_key==$a7_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select></div><?php -if (count($$a7_list)==0) echo '<input type="hidden" name="'.$a7_name.'" value="" />'; -if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="'.$box_key.'" />'; -} -?><?php unset($a7_list,$a7_name,$a7_onchange,$a7_title,$a7_class,$a7_addempty,$a7_multiple,$a7_size,$a7_lang) ?> + <div class="input"> + <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_default_objectid" name="default_objectid" title="" class=""<?php if (count($objects)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($objects,$default_objectid,1,0) ?><?php if (count($objects)==0) { ?><input type="hidden" name="default_objectid" value="" /><?php } ?><?php if (count($objects)==1) { ?><input type="hidden" name="default_objectid" value="<?php echo array_keys($objects)[0] ?>" /><?php } ?> + </select></div> </div> </div> <?php } ?> @@ -702,18 +314,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('EL_PROP_code')))); ?></span> </div> - <div class="input"><!-- Compiling inputarea/inputarea-begin --><?php $a7_name='code';$a7_rows='35';$a7_cols='40';$a7_class='inputarea';$a7_default=''; ?><div class="inputholder"><textarea class="<?php echo $a7_class ?>" name="<?php echo $a7_name ?>" ><?php echo Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default) ?></textarea></div><?php unset($a7_name,$a7_rows,$a7_cols,$a7_class,$a7_default) ?> + <div class="input"> + <div class="inputholder"><textarea class="inputarea" name="code"><?php echo Text::encodeHtml($code) ?></textarea></div> + </div> </div> <?php } ?> </div></fieldset> - -<div class="bottom"> - <div class="command "> - - <input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /> - - <!-- Cancel-Button nicht anzeigen, wenn cancel==false. --> </div> -</div> - -</form> + <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /></div></div></form> + + \ No newline at end of file diff --git a/themes/default/templates/element/remove.tpl.out.php b/themes/default/templates/element/remove.tpl.out.php @@ -0,0 +1,69 @@ + + + + + <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="" onSubmit="formSubmit( $(this) ); return false;"><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":"" ?>"><div> + <div class="line"> + <div class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'ELEMENT_NAME'.'')))); ?></span> + + </div> + <div class="input"> + <span class="name"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span> + + </div> + </div> + </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('options') ?></legend><div> + <div class="line"> + <div class="label"> + </div> + <div class="input"> + <?php { $tmpname = 'confirm';$default = '';$readonly = ''; + 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 ( $readonly && $checked ) + { + ?><input type="hidden" name="<?php echo $tmpname ?>" value="1" /><?php + } + } ?> + + <label for="<?php echo REQUEST_ID ?>_confirm" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('CONFIRM_DELETE')))); ?></span> + + </label> + </div> + </div> + <div class="line"> + <div class="label"> + </div> + <div class="input"> + <span class="text"><?php echo nl2br(' '); ?></span> + + <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_value" name="type" value="value"<?php if('value'==@$type)echo ' checked="checked"' ?> /> + + <label for="<?php echo REQUEST_ID ?>_type_value" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('ELEMENT_DELETE_VALUES')))); ?></span> + + </label> + <br/> + + <span class="text"><?php echo nl2br(' '); ?></span> + + <input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="type" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> /> + + <label for="<?php echo REQUEST_ID ?>_type_all" class="label"> + <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('DELETE')))); ?></span> + + </label> + </div> + </div> + </div></fieldset> + <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" onclick="$(this).closest('div.sheet').find('form').submit(); " /></div></div></form> + + \ No newline at end of file diff --git a/themes/default/templates/element/remove.tpl.src.xml b/themes/default/templates/element/remove.tpl.src.xml @@ -0,0 +1,48 @@ +<output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> + <header back="true"></header> + <form> + <group> + <part class="line"> + <part class="label"> + <text key="ELEMENT_NAME"></text> + </part> + <part class="input"> + <text var="name" class="name"></text> + </part> + </part> + </group> + <group title="message:options"> + + <part class="line"> + <part class="label"> + </part> + <part class="input"> + <checkbox name="confirm"></checkbox> + <label for="confirm"> + <text text="CONFIRM_DELETE"></text> + </label> + </part> + </part> + + <part class="line"> + <part class="label"> + </part> + <part class="input"> + <text raw="_____"></text> + <radio name="type" value="value"></radio> + <label for="type_value"> + <text text="ELEMENT_DELETE_VALUES"></text> + </label> + <newline></newline> + <text raw="_____"></text> + <radio name="type" value="all"></radio> + <label for="type_all"> + <text text="DELETE"></text> + </label> + </part> + </part> + </group> + + </form> +</output>+ \ No newline at end of file diff --git a/themes/default/templates/element/type.tpl.out.php b/themes/default/templates/element/type.tpl.out.php diff --git a/themes/default/templates/element/type.tpl.src.xml b/themes/default/templates/element/type.tpl.src.xml @@ -1,17 +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.xsd"> - <header back="true"></header> - <form> - <group> - <part class="line"> - <part class="label"> - <text text="ELEMENT_TYPE"></text> - </part> - <part class="input"> - <selectbox name="type" list="types" lang="true"></selectbox> - </part> - </part> - </group> - - </form> -</output>- \ No newline at end of file diff --git a/themes/default/templates/title/show.tpl.src.xml b/themes/default/templates/title/show.tpl.src.xml @@ -1,7 +1,7 @@ <output xmlns="http://www.openrat.de/template" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openrat.de/template ../template.xsd"> - <!-- Info-Meldung anzeigen (sofern vorhanden --> + <!-- Info-Meldung anzeigen (sofern vorhanden) --> <if present="var:dbname"> <part class="toolbar-icon"> <image action="database"></image> @@ -187,7 +187,7 @@ </link> </part> - <part class="entry clickable filtered on-action-language"> + <part class="entry clickable filtered on-action-language on-action-element"> <link type="dialog" title="message:menu_advanced_desc" subaction="advanced"> <image method="advanced" align="left"></image> @@ -195,14 +195,6 @@ </link> </part> - <part class="entry clickable filtered on-action-element"> - <link type="dialog" title="message:menu_type_desc" - subaction="type"> - <image method="type" align="left"></image> - <text key="menu_type"></text> - </link> - </part> - <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"> @@ -216,7 +208,7 @@ <part class="entry clickable filtered on-action-template"> <link type="dialog" title="message:menu_src_desc" subaction="src"> - <image method="src" align="left"></image> + <image method="code" align="left"></image> <text key="menu_src"></text> </link> </part> @@ -298,7 +290,7 @@ <part class="entry clickable filtered on-action-user on-action-group"> <link type="dialog" title="message:menu_memberships_desc" subaction="memberships"> - <image method="memberships" align="left"></image> + <image method="membership" align="left"></image> <text key="menu_memberships"></text> </link> </part> @@ -309,7 +301,7 @@ <!-- Menü: Projekt --> <if true="var:isLoggedIn"> - <part class="toolbar-icon projects"> + <part class="toolbar-icon projects menu"> <image action="project" align="left"></image> <text class="titletext" key="GLOBAL_PROJECT"></text> <part class="dropdown"> @@ -415,7 +407,7 @@ </part> <!-- Benutzer --> - <part class="toolbar-icon user"> + <part class="toolbar-icon user menu"> <image action="user" align="left"></image> <text class="titletext" var="userfullname" maxlength="25"></text> <image method="arrow_down" align="left"></image> @@ -430,13 +422,13 @@ </part> <part class="entry clickable"> <link type="dialog" title="message:menu_password_DESC" action="profile" subaction="pw"> - <image action="user" align="left"></image> + <image method="password" align="left"></image> <text key="menu_password"></text> </link> </part> <part class="entry clickable"> <link type="dialog" title="message:menu_mail_DESC" action="profile" subaction="mail"> - <image action="user" align="left"></image> + <image method="mail" align="left"></image> <text key="menu_mail"></text> </link> </part>
