openrat-cms

commit 3203d85a0dd914a519778801b33c751b56059271
parent 8838e560d8b190e2bda05d4278e6c13cd320d0fc
Author: Jan Dankert <develop@jandankert.de>
Date:   Thu, 10 Sep 2020 23:48:56 +0200

Confirming actions is UI logic and not a task for the action layer.

Diffstat:
modules/cms/ui/themes/default/html/views/file/remove.php
 | 
2
+-
modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml
 | 
2
+-
modules/cms/ui/themes/default/html/views/image/remove.php
 | 
38
--------------------------------------
modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml
 | 
28
----------------------------
modules/cms/ui/themes/default/html/views/text/remove.php
 | 
38
--------------------------------------
modules/cms/ui/themes/default/html/views/text/remove.tpl.src.xml
 | 
28
----------------------------

6 files changed, 2 insertions(+), 134 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/file/remove.php b/modules/cms/ui/themes/default/html/views/file/remove.php
@@ -14,7 +14,7 @@
       <label class="<?php echo escapeHtml('or-form-row or-form-checkbox') ?>"><?php echo escapeHtml('') ?>
         <span class="<?php echo escapeHtml('or-form-label') ?>"><?php echo escapeHtml(''.@lang('DELETE').'') ?>
         </span>
-        <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?>
+        <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> required="<?php echo escapeHtml('required') ?>" /><?php echo escapeHtml('') ?>
       </label>
     </div>
     <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?>
diff --git a/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/file/remove.tpl.src.xml
@@ -4,6 +4,6 @@
     <form>
         <text label="NAME" value="${name}"></text>
 
-        <checkbox label="${message:DELETE}" name="delete"></checkbox>
+        <checkbox label="${message:DELETE}" name="delete" required="true"></checkbox>
     </form>
 </output> 
\ No newline at end of file
diff --git a/modules/cms/ui/themes/default/html/views/image/remove.php b/modules/cms/ui/themes/default/html/views/image/remove.php
@@ -1,37 +0,0 @@
-<?php if (!defined('OR_TITLE')) exit(); ?>
-  <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('image') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form image') ?>"><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('image') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?>
-    <div><?php echo escapeHtml('') ?>
-      <tr><?php echo escapeHtml('') ?>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@lang('NAME').'') ?>
-          </span>
-        </td>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@$name.'') ?>
-          </span>
-        </td>
-      </tr>
-      <tr><?php echo escapeHtml('') ?>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@lang('DELETE').'') ?>
-          </span>
-        </td>
-        <td><?php echo escapeHtml('') ?>
-          <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?>
-        </td>
-      </tr>
-      <tr><?php echo escapeHtml('') ?>
-        <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?>
-          
-        </td>
-      </tr>
-    </div>
-    <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?>
-      <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?>
-      <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?>
-    </div>
-  </form>-
\ No newline at end of file
diff --git a/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/image/remove.tpl.src.xml
@@ -1,27 +0,0 @@
-<output xmlns="http://www.openrat.de/template"
-		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd">
-	<form>
-		<row>
-			<column>
-				<text value="${message:NAME}"></text>
-			</column>
-			<column>
-				<text value="${name}"></text>
-			</column>
-		</row>
-		<row>
-			<column>
-				<text value="${message:DELETE}"></text>
-			</column>
-			<column>
-				<checkbox name="delete"></checkbox>
-			</column>
-		</row>
-		<row>
-			<column colspan="2">
-				<button type="ok"></button>
-			</column>
-		</row>
-	</form>
-</output>-
\ No newline at end of file
diff --git a/modules/cms/ui/themes/default/html/views/text/remove.php b/modules/cms/ui/themes/default/html/views/text/remove.php
@@ -1,37 +0,0 @@
-<?php if (!defined('OR_TITLE')) exit(); ?>
-  <form name="<?php echo escapeHtml('') ?>" target="<?php echo escapeHtml('_self') ?>" data-target="<?php echo escapeHtml('view') ?>" action="<?php echo escapeHtml('./') ?>" data-method="<?php echo escapeHtml('remove') ?>" data-action="<?php echo escapeHtml('text') ?>" data-id="<?php echo escapeHtml(''.@$_id.'') ?>" method="<?php echo escapeHtml('POST') ?>" enctype="<?php echo escapeHtml('application/x-www-form-urlencoded') ?>" data-async="<?php echo escapeHtml('') ?>" data-autosave="<?php echo escapeHtml('') ?>" class="<?php echo escapeHtml('or-form text') ?>"><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('token') ?>" value="<?php echo escapeHtml(''.@$_token.'') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('action') ?>" value="<?php echo escapeHtml('text') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('subaction') ?>" value="<?php echo escapeHtml('remove') ?>" /><?php echo escapeHtml('') ?>
-    <input type="<?php echo escapeHtml('hidden') ?>" name="<?php echo escapeHtml('id') ?>" value="<?php echo escapeHtml(''.@$_id.'') ?>" /><?php echo escapeHtml('') ?>
-    <div><?php echo escapeHtml('') ?>
-      <tr><?php echo escapeHtml('') ?>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@lang('NAME').'') ?>
-          </span>
-        </td>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@$name.'') ?>
-          </span>
-        </td>
-      </tr>
-      <tr><?php echo escapeHtml('') ?>
-        <td><?php echo escapeHtml('') ?>
-          <span><?php echo escapeHtml(''.@lang('DELETE').'') ?>
-          </span>
-        </td>
-        <td><?php echo escapeHtml('') ?>
-          <input type="<?php echo escapeHtml('checkbox') ?>" name="<?php echo escapeHtml('delete') ?>" value="<?php echo escapeHtml('1') ?>" <?php if(@$delete){ ?>checked="<?php echo escapeHtml('1') ?>"<?php } ?> /><?php echo escapeHtml('') ?>
-        </td>
-      </tr>
-      <tr><?php echo escapeHtml('') ?>
-        <td colspan="<?php echo escapeHtml('2') ?>"><?php echo escapeHtml('') ?>
-          
-        </td>
-      </tr>
-    </div>
-    <div class="<?php echo escapeHtml('or-form-actionbar') ?>"><?php echo escapeHtml('') ?>
-      <input type="<?php echo escapeHtml('button') ?>" value="<?php echo escapeHtml(''.@lang('CANCEL').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--secondary or-form-btn--cancel') ?>" /><?php echo escapeHtml('') ?>
-      <input type="<?php echo escapeHtml('submit') ?>" value="<?php echo escapeHtml(''.@lang('button_ok').'') ?>" class="<?php echo escapeHtml('or-form-btn or-form-btn--primary or-form-btn--save') ?>" /><?php echo escapeHtml('') ?>
-    </div>
-  </form>-
\ No newline at end of file
diff --git a/modules/cms/ui/themes/default/html/views/text/remove.tpl.src.xml b/modules/cms/ui/themes/default/html/views/text/remove.tpl.src.xml
@@ -1,27 +0,0 @@
-<output xmlns="http://www.openrat.de/template"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.openrat.de/template ../../../../../../../template_engine/components/template.xsd">
-    <form>
-        <row>
-            <column>
-                <text value="${message:NAME}"></text>
-            </column>
-            <column>
-                <text value="${name}"></text>
-            </column>
-        </row>
-        <row>
-            <column>
-                <text value="${message:DELETE}"></text>
-            </column>
-            <column>
-                <checkbox name="delete"></checkbox>
-            </column>
-        </row>
-        <row>
-            <column colspan="2">
-                <button type="ok"></button>
-            </column>
-        </row>
-    </form>
-</output>-
\ No newline at end of file