commit 4b58e940283198e7b2c20fdedf9c7b7340e73f60
parent 3cc056e1eca1b06d450c86e390d10bbcb00e2ed6
Author: Jan Dankert <devnull@localhost>
Date: Fri, 30 Nov 2018 22:16:21 +0100
Nachbereitung zum Wiederinstandsetzen der Löschfunktionen.
Diffstat:
14 files changed, 93 insertions(+), 86 deletions(-)
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="req15435230991959855702_file" type="file" name="file" class="upload" />
+ <input size="40" id="req15435248281521096038_file" type="file" name="file" class="upload" />
<br/>
diff --git a/modules/cms-ui/themes/default/html/views/folder/pub.php b/modules/cms-ui/themes/default/html/views/folder/pub.php
@@ -28,9 +28,9 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_pages" class="label">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_pages')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_pages')))); ?></span>
</label>
</div>
@@ -58,9 +58,9 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_files" class="label">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span>
</label>
</div>
@@ -88,9 +88,9 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_subdirs" class="label">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_PUBLISH_WITH_SUBDIRS')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_PUBLISH_WITH_SUBDIRS')))); ?></span>
</label>
</div>
@@ -116,9 +116,9 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_clean" class="label">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_CLEAN_AFTER_PUBLISH')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_CLEAN_AFTER_PUBLISH')))); ?></span>
</label>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/page/pub.php b/modules/cms-ui/themes/default/html/views/page/pub.php
@@ -27,7 +27,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_files" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('global_files')))); ?></span>
</label>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/edit.php b/modules/cms-ui/themes/default/html/views/pageelement/edit.php
@@ -23,29 +23,29 @@
</a>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <strong class="text"><?php echo nl2br(encodeHtml(htmlentities($monthname))); ?></strong>
+ <strong><?php echo nl2br(encodeHtml(htmlentities($monthname))); ?></strong>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<a target="_self" data-url="<?php echo $nextmonthurl ?>" data-action="" data-method="edit" 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/right.png" />
</a>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<a target="_self" data-url="<?php echo $lastyearurl ?>" data-action="" data-method="edit" 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/left.png" />
</a>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <strong class="text"><?php echo nl2br(encodeHtml(htmlentities($yearname))); ?></strong>
+ <strong><?php echo nl2br(encodeHtml(htmlentities($yearname))); ?></strong>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<a target="_self" data-url="<?php echo $nextyearurl ?>" data-action="" data-method="edit" 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/right.png" />
@@ -56,12 +56,12 @@
</tr>
<tr>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'week'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'week'.'')))); ?></span>
</td>
<?php foreach($weekdays as $list_key=>$weekday){ ?>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($weekday))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($weekday))); ?></span>
</td>
<?php } ?>
@@ -69,32 +69,32 @@
<?php foreach($weeklist as $weeknr=>$week){ ?>
<tr>
<td width="12%">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($weeknr))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($weeknr))); ?></span>
</td>
<?php foreach($week as $list_key=>$list_value){ ?><?php extract($list_value) ?>
<td width="12%">
<?php $if12=(($url)==FALSE); if($if12){?>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <strong class="text"><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></strong>
+ <strong><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></strong>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
<?php } ?>
<?php $if12=!(($url)==FALSE); if($if12){?>
<a target="_self" data-url="<?php echo $url ?>" data-action="" data-method="edit" data-id="<?php echo OR_ID ?>" data-extra="[]" href="<?php echo Html::url('','','',array()) ?>">
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($nr))); ?></span>
- <span class="text"><?php echo nl2br(' '); ?></span>
+ <span><?php echo nl2br(' '); ?></span>
</a>
<?php } ?>
<?php $if12=($today); if($if12){?>
- <span class="text"><?php echo nl2br('*'); ?></span>
+ <span><?php echo nl2br('*'); ?></span>
<?php } ?>
</td>
@@ -107,32 +107,32 @@
<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('date') ?></legend><div>
<div>
<label for="<?php echo REQUEST_ID ?>_year" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date'.'')))); ?></span>
</label>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_year" name="year" title="" class=""<?php if (count($all_years)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_years,$year,0,0) ?><?php if (count($all_years)==0) { ?><input type="hidden" name="year" value="" /><?php } ?><?php if (count($all_years)==1) { ?><input type="hidden" name="year" value="<?php echo array_keys($all_years)[0] ?>" /><?php } ?>
</select></div>
- <span class="text"><?php echo nl2br(' - '); ?></span>
+ <span><?php echo nl2br(' - '); ?></span>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_month" name="month" title="" class=""<?php if (count($all_months)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_months,$month,0,0) ?><?php if (count($all_months)==0) { ?><input type="hidden" name="month" value="" /><?php } ?><?php if (count($all_months)==1) { ?><input type="hidden" name="month" value="<?php echo array_keys($all_months)[0] ?>" /><?php } ?>
</select></div>
- <span class="text"><?php echo nl2br(' - '); ?></span>
+ <span><?php echo nl2br(' - '); ?></span>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_day" name="day" title="" class=""<?php if (count($all_days)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_days,$day,0,0) ?><?php if (count($all_days)==0) { ?><input type="hidden" name="day" value="" /><?php } ?><?php if (count($all_days)==1) { ?><input type="hidden" name="day" value="<?php echo array_keys($all_days)[0] ?>" /><?php } ?>
</select></div>
</div>
<div>
<label for="<?php echo REQUEST_ID ?>_hour" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date_time'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'date_time'.'')))); ?></span>
</label>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_hour" name="hour" title="" class=""<?php if (count($all_hours)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_hours,$hour,0,0) ?><?php if (count($all_hours)==0) { ?><input type="hidden" name="hour" value="" /><?php } ?><?php if (count($all_hours)==1) { ?><input type="hidden" name="hour" value="<?php echo array_keys($all_hours)[0] ?>" /><?php } ?>
</select></div>
- <span class="text"><?php echo nl2br(' - '); ?></span>
+ <span><?php echo nl2br(' - '); ?></span>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_minute" name="minute" title="" class=""<?php if (count($all_minutes)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_minutes,$minute,0,0) ?><?php if (count($all_minutes)==0) { ?><input type="hidden" name="minute" value="" /><?php } ?><?php if (count($all_minutes)==1) { ?><input type="hidden" name="minute" value="<?php echo array_keys($all_minutes)[0] ?>" /><?php } ?>
</select></div>
- <span class="text"><?php echo nl2br(' - '); ?></span>
+ <span><?php echo nl2br(' - '); ?></span>
<div class="inputholder"><select id="<?php echo REQUEST_ID ?>_second" name="second" title="" class=""<?php if (count($all_seconds)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($all_seconds,$second,0,0) ?><?php if (count($all_seconds)==0) { ?><input type="hidden" name="second" value="" /><?php } ?><?php if (count($all_seconds)==1) { ?><input type="hidden" name="second" value="<?php echo array_keys($all_seconds)[0] ?>" /><?php } ?>
</select></div>
@@ -151,7 +151,7 @@
<?php $if5=(isset($preview)); if($if5){?>
<div class="preview">
<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('page_preview') ?></legend><div>
- <span class="text"><?php echo nl2br($preview); ?></span>
+ <span><?php echo nl2br($preview); ?></span>
</div></fieldset>
</div>
@@ -167,7 +167,7 @@
<?php $if5=($editor=='wiki'); if($if5){?>
<?php $if6=(isset($languagetext)); if($if6){?>
<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 $languagename ?></legend><div>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($languagetext))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($languagetext))); ?></span>
</div></fieldset>
<br/>
@@ -180,79 +180,79 @@
<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('help') ?></legend><div>
<div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-begin')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-begin')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_strong'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_strong'.'')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-end')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','strong-end')))); ?></span>
<br/>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-begin')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_emphatic'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_emphatic'.'')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-end')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','emphatic-end')))); ?></span>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_numbered_list'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_numbered_list'.'')))); ?></span>
<br/>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-numbered')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
<br/>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_unnumbered_list'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_unnumbered_list'.'')))); ?></span>
<br/>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','list-unnumbered')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
<br/>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_table'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'text_markup_table'.'')))); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
<br/>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
- <span class="text"><?php echo nl2br('...'); ?></span>
+ <span><?php echo nl2br('...'); ?></span>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(config('editor','text-markup','table-cell-sep')))); ?></span>
<br/>
@@ -272,7 +272,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_linkobjectid" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_target'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_target'.'')))); ?></span>
</label>
</div>
@@ -289,7 +289,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_link_url" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_url'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'link_url'.'')))); ?></span>
</label>
</div>
@@ -347,7 +347,7 @@
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_otherlanguageid_<?php echo $languageid ?>" name="otherlanguageid" value="<?php echo $languageid ?>"<?php if($languageid==@$otherlanguageid)echo ' checked="checked"' ?> />
<label for="<?php echo REQUEST_ID ?>_<?php echo 'otherlanguageid_'.$languageid.'' ?>" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span>
</label>
<br/>
@@ -373,7 +373,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_preview" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PAGE_PREVIEW'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'PAGE_PREVIEW'.'')))); ?></span>
</label>
</div>
@@ -398,7 +398,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_release" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_RELEASE')))); ?></span>
</label>
</div>
@@ -420,7 +420,7 @@
} ?>
<label for="<?php echo REQUEST_ID ?>_publish" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('PAGE_PUBLISH_AFTER_SAVE')))); ?></span>
</label>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/info.php b/modules/cms-ui/themes/default/html/views/pageelement/info.php
@@ -3,63 +3,63 @@
<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="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('name')))); ?></span>
</td>
<td class="name">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span>
</td>
</tr>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('description')))); ?></span>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($description))); ?></span>
</td>
</tr>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('type')))); ?></span>
</td>
<td class="filename">
<img class="image-icon image-icon--element" title="" src="./modules/cms-ui/themes/default/images/icon/element/<?php echo $element_type ?>.svg" />
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'el_'.$element_type.''.'')))); ?></span>
</td>
</tr>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'template'.'')))); ?></span>
</td>
<td data-name="<?php echo $template_name ?>" data-action="template" data-id="<?php echo $template_id ?>" class="clickable">
<img class="" title="" src="./modules/cms-ui/themes/default/images/icon/icon_template.png" />
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($template_name))); ?></span>
</td>
</tr>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'element'.'')))); ?></span>
</td>
<td data-name="<?php echo $element_name ?>" data-action="element" data-id="<?php echo $element_id ?>" class="clickable">
<img class="" title="" src="./modules/cms-ui/themes/default/images/icon_<?php echo $element_type ?>.png" />
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($element_name))); ?></span>
</td>
</tr>
<tr class="data">
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('lastchange')))); ?></span>
</td>
<td>
@@ -67,7 +67,7 @@
<?php include_once( 'modules/template-engine/components/html/date/component-date.php') ?><?php component_date($lastchange_date) ?>
- <span class="text"><?php echo nl2br(', '); ?></span>
+ <span><?php echo nl2br(', '); ?></span>
<img class="" title="" src="./modules/cms-ui/themes/default/images/icon/user.png" />
diff --git a/modules/cms-ui/themes/default/html/views/pageelement/preview.php b/modules/cms-ui/themes/default/html/views/pageelement/preview.php
@@ -2,7 +2,7 @@
<div class="preview">
<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('page_preview') ?></legend><div>
- <span class="text"><?php echo nl2br($preview); ?></span>
+ <span><?php echo nl2br($preview); ?></span>
</div></fieldset>
</div>
diff --git a/modules/language/lang-cn.php b/modules/language/lang-cn.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Default text",
'GLOBAL_DELETED'=>"Object was deleted",
'GLOBAL_DELETE'=>"Delete",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Description",
'GLOBAL_DIFFERENCES_DESC'=>"Show differences between 2 Revisions",
'GLOBAL_DIFFERENCES'=>"Differences",
diff --git a/modules/language/lang-de.php b/modules/language/lang-de.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Text Vorbelegung",
'GLOBAL_DELETED'=>"Objekt wurde gelöscht",
'GLOBAL_DELETE'=>"Löschen",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Löschen mit Unterelementen",
'GLOBAL_DESCRIPTION'=>"Beschreibung",
'GLOBAL_DIFFERENCES_DESC'=>"Sie können sich die Unterschiede zwischen 2 Versionen anzeigen lassen",
'GLOBAL_DIFFERENCES'=>"Unterschiede",
diff --git a/modules/language/lang-en.php b/modules/language/lang-en.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Default text",
'GLOBAL_DELETED'=>"Object was deleted",
'GLOBAL_DELETE'=>"Delete",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Description",
'GLOBAL_DIFFERENCES_DESC'=>"Show differences between 2 Revisions",
'GLOBAL_DIFFERENCES'=>"Differences",
diff --git a/modules/language/lang-es.php b/modules/language/lang-es.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Texte de défaut",
'GLOBAL_DELETED'=>"L'objet a été supprimé",
'GLOBAL_DELETE'=>"Effacement",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Description",
'GLOBAL_DIFFERENCES_DESC'=>"Montrer les différences entre 2 révisions",
'GLOBAL_DIFFERENCES'=>"Différences",
diff --git a/modules/language/lang-fr.php b/modules/language/lang-fr.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Texte de défaut",
'GLOBAL_DELETED'=>"L'objet a été supprimé",
'GLOBAL_DELETE'=>"Effacement",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Description",
'GLOBAL_DIFFERENCES_DESC'=>"Montrer les différences entre 2 révisions",
'GLOBAL_DIFFERENCES'=>"Différences",
diff --git a/modules/language/lang-it.php b/modules/language/lang-it.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Texto del defecto",
'GLOBAL_DELETED'=>"El objeto fue suprimido",
'GLOBAL_DELETE'=>"Cancelación",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Descripción",
'GLOBAL_DIFFERENCES_DESC'=>"Demostrar las diferencias entre 2 revisiones",
'GLOBAL_DIFFERENCES'=>"Diferencias",
diff --git a/modules/language/lang-ru.php b/modules/language/lang-ru.php
@@ -395,6 +395,7 @@ function language() { return array(
'GLOBAL_DEFAULT_TEXT'=>"Default text",
'GLOBAL_DELETED'=>"Object was deleted",
'GLOBAL_DELETE'=>"Delete",
+'GLOBAL_DELETE_WITH_CHILDREN'=>"Delete with children",
'GLOBAL_DESCRIPTION'=>"Description",
'GLOBAL_DIFFERENCES_DESC'=>"Show differences between 2 Revisions",
'GLOBAL_DIFFERENCES'=>"Differences",
diff --git a/version.ini b/version.ini
@@ -1,5 +1,5 @@
-rev="3498"
-node="eeb9bb27d178441219ae0a968dc944fd50b85932"
-date="Tue May 22 22:39:49 2018 +0200"
-description="Fix für PHP 7.2: 'Object' darf nun nicht mehr als Klassennamen verwendet werden. AUCH NICHT IN EINEM NAMESPACE! WTF, wozu habe ich das in einen verfickten Namespace gepackt? Wozu soll der sonst da sein??? Amateure. Daher nun notgedrungen unbenannt in 'BaseObject'."
+rev="3757"
+node="a7b818089994f1438d155929615eeb1df493271c"
+date="Thu Nov 29 21:52:32 2018 +0100"
+description="Das Löschen von Ordnern, Seiten, Links, URLs, Dateien, Bildern, Texten funktioniert jetzt wieder."
author="Jan Dankert"
