openrat-cms

commit 3b5b867969cd9dd5bf299d80e6f40f3c44043997
parent f8fd61aff94d0da6da33056703fe2b4f8e6be6f3
Author: Jan Dankert <develop@jandankert.de>
Date:   Sat, 27 Nov 2021 22:29:22 +0100

UI-Cleanup: Display action buttons in a column.

Diffstat:
M
modules/cms/ui/themes/default/html/views/pageelement/history.php
 | 
9
+++++++++
M
modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml
 | 
20
++++++++++++--------
M
modules/cms/ui/themes/default/html/views/template/history.php
 | 
9
+++++++++
M
modules/cms/ui/themes/default/html/views/template/history.tpl.src.xml
 | 
12
++++++++++++

4 files changed, 42 insertions(+), 8 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.php b/modules/cms/ui/themes/default/html/views/pageelement/history.php
@@ -81,9 +81,15 @@
                         <?php $if9=($publish); if($if9) {  ?>
                           <i title="<?php echo O::escapeHtml(''.@O::lang('PAGEELEMENT_RELEASED').'') ?>" class="<?php echo O::escapeHtml('or-image-icon or-image-icon--status-released') ?>"><?php echo O::escapeHtml('') ?></i>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                         <?php $if9=($active); if($if9) {  ?>
                           <i title="<?php echo O::escapeHtml(''.@O::lang('active').'') ?>" class="<?php echo O::escapeHtml('or-image-icon or-image-icon--status-active') ?>"><?php echo O::escapeHtml('') ?></i>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                       </td>
                       <td><?php echo O::escapeHtml('') ?>
                         <?php $if9=($releasable); if($if9) {  ?>
@@ -91,6 +97,9 @@
                             <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-release') ?>"><?php echo O::escapeHtml('') ?></i>
                           </a>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                         <?php $if9=($usable); if($if9) {  ?>
                           <a title="<?php echo O::escapeHtml(''.@O::lang('RESTORE_DESC').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('post') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('restore') ?>" data-id="<?php echo O::escapeHtml(''.@$objectid.'') ?>" data-extra-valueid="<?php echo O::escapeHtml(''.@$id.'') ?>" data-extra="<?php echo O::escapeHtml('{&quot;valueid&quot;:&quot;'.@$id.'&quot;}') ?>" data-data="<?php echo O::escapeHtml('{"action":"pageelement","subaction":"restore","id":"'.@$objectid.'","token":"'.@$_token.'","valueid":"'.@$id.'","none":0}') ?>" class="<?php echo O::escapeHtml('or-link or-act-clickable') ?>"><?php echo O::escapeHtml('') ?>
                             <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-restore') ?>"><?php echo O::escapeHtml('') ?></i>
diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml
@@ -8,10 +8,6 @@
 				<table>
 					<row header="true">
 
-						<!--
-						<column class="help">
-							<text value="${message:NR}"/>
-						</column>-->
 						<column class="table-column-action" colspan="2">
 							<text value="${message:COMPARE}"/>
 						</column>
@@ -42,10 +38,6 @@
 					</if>
 					<list list="${values}" extract="true">
 						<row class="data">
-							<!--
-							<column>
-								<text value="${lfd_nr}"/>
-							</column>-->
 							<column class="table-column-action">
 								<if true="${comparable}">
 									<radio name="compareid" value="${id}"/>
@@ -77,9 +69,17 @@
 								<if true="${publish}">
 									<image symbol="status-released" title="${message:PAGEELEMENT_RELEASED}"/>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 								<if true="${active}">
 									<image symbol="status-active" title="${message:active}"/>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 							</column>
 
 							<!-- Actions -->
@@ -90,6 +90,10 @@
 										<image method="release"/>
 									</link>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 								<if true="${usable}">
 									<link clickable="true" type="post" subaction="restore" var1="valueid" value1="${id}"
 										  id="${objectid}" title="${message:RESTORE_DESC}">
diff --git a/modules/cms/ui/themes/default/html/views/template/history.php b/modules/cms/ui/themes/default/html/views/template/history.php
@@ -79,9 +79,15 @@
                         <?php $if9=($publish); if($if9) {  ?>
                           <i title="<?php echo O::escapeHtml(''.@O::lang('PAGEELEMENT_RELEASED').'') ?>" class="<?php echo O::escapeHtml('or-image-icon or-image-icon--status-released') ?>"><?php echo O::escapeHtml('') ?></i>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                         <?php $if9=($active); if($if9) {  ?>
                           <i title="<?php echo O::escapeHtml(''.@O::lang('active').'') ?>" class="<?php echo O::escapeHtml('or-image-icon or-image-icon--status-active') ?>"><?php echo O::escapeHtml('') ?></i>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                       </td>
                       <td><?php echo O::escapeHtml('') ?>
                         <?php $if9=(!$publish); if($if9) {  ?>
@@ -89,6 +95,9 @@
                             <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-release') ?>"><?php echo O::escapeHtml('') ?></i>
                           </a>
                          <?php } ?>
+                        <?php if(!$if9) {  ?>
+                          <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--blank') ?>"><?php echo O::escapeHtml('') ?></i>
+                         <?php } ?>
                         <?php $if9=(!$active); if($if9) {  ?>
                           <a title="<?php echo O::escapeHtml(''.@O::lang('RESTORE_DESC').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('post') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('restore') ?>" data-id="<?php echo O::escapeHtml('') ?>" data-extra-valueid="<?php echo O::escapeHtml(''.@$id.'') ?>" data-extra="<?php echo O::escapeHtml('{&quot;valueid&quot;:&quot;'.@$id.'&quot;}') ?>" data-data="<?php echo O::escapeHtml('{"action":"template","subaction":"restore","id":"","token":"'.@$_token.'","valueid":"'.@$id.'","none":0}') ?>" class="<?php echo O::escapeHtml('or-link or-act-clickable') ?>"><?php echo O::escapeHtml('') ?>
                             <i class="<?php echo O::escapeHtml('or-image-icon or-image-icon--method-restore') ?>"><?php echo O::escapeHtml('') ?></i>
diff --git a/modules/cms/ui/themes/default/html/views/template/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/template/history.tpl.src.xml
@@ -68,9 +68,17 @@
 								<if true="${publish}">
 									<image symbol="status-released" title="${message:PAGEELEMENT_RELEASED}"/>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 								<if true="${active}">
 									<image symbol="status-active" title="${message:active}"/>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 							</column>
 
 							<!-- Actions -->
@@ -81,6 +89,10 @@
 										<image method="release"/>
 									</link>
 								</if>
+								<else>
+									<image symbol="blank" />
+								</else>
+
 								<if false="${active}">
 									<link clickable="true" type="post" subaction="restore" var1="valueid" value1="${id}"
 										  title="${message:RESTORE_DESC}">