commit ed02542a62da8ea93aed1fff4f7b602c48370687
parent 77d86b812e5e6097677928badcb45d21bf242411
Author: Jan Dankert <develop@jandankert.de>
Date: Mon, 27 May 2019 23:00:10 +0200
Fix: Bilder korrigiert.
Diffstat:
4 files changed, 32 insertions(+), 45 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.php b/modules/cms-ui/themes/default/html/views/group/memberships.php
@@ -1,7 +1,7 @@
<form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="group" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form group" data-async="" data-autosave="1"><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="group" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
- <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div>
+ <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%">
<tr class="headline">
<td width="10%">
</td>
@@ -30,7 +30,7 @@
</td>
<td>
<label for="<?php echo REQUEST_ID ?>_<?php echo $var ?>" class="label">
- <img src="./modules/cms-ui/themes/default/images/icon/icon_user.png" />
+ <i class="image-icon image-icon--action-user"></i>
<span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span>
@@ -38,7 +38,7 @@
</td>
</tr>
<?php } ?>
- </table>
+ </table></div></div>
<tr>
<td colspan="2" class="act">
<div class="invisible"><input type="submit" name="ok" class="%class%"
diff --git a/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/memberships.tpl.src.xml
@@ -15,7 +15,7 @@
</column>
<column>
<label for="var:var">
- <image file="icon_user"></image>
+ <image action="user"></image>
<text var="name"></text>
</label>
</column>
diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.php b/modules/cms-ui/themes/default/html/views/user/memberships.php
@@ -1,7 +1,7 @@
- <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="" data-autosave="1"><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
- <div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div>
+ <form name="" target="_self" data-target="view" action="./" data-method="memberships" data-action="user" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form user" data-async="" data-autosave=""><input type="hidden" name="<?php echo REQ_PARAM_EMBED ?>" value="1" /><input type="hidden" name="<?php echo REQ_PARAM_TOKEN ?>" value="<?php echo token() ?>" /><input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="user" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="memberships" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
+ <div class="or-table-wrapper"><div class="or-table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><div class="or-table-area"><table width="100%">
<tr class="headline">
<td colspan="2">
<span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'group'.'')))); ?></span>
@@ -28,7 +28,7 @@
</td>
<td>
<label for="<?php echo REQUEST_ID ?>_<?php echo $var ?>" class="label">
- <img src="./modules/cms-ui/themes/default/images/icon/icon_group.png" />
+ <i class="image-icon image-icon--action-group"></i>
<span><?php echo nl2br(encodeHtml(htmlentities($name))); ?></span>
@@ -36,14 +36,6 @@
</td>
</tr>
<?php } ?>
- <tr>
- <td colspan="2" class="act">
- <div class="invisible"><input type="submit" name="ok" class="%class%"
- title="Bestätigen"
- value=" OK " />
- </div>
- </td>
- </tr>
- </table>
- <div class="or-form-actionbar"><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form>
+ </table></div></div>
+ <div class="or-form-actionbar"><input type="button" class="or-form-btn or-form-btn--secondary or-form-btn--cancel" value="<?php echo lang("CANCEL") ?>" /><input type="submit" class="or-form-btn or-form-btn--primary" value="OK" /></div></form>
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/html/views/user/memberships.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/memberships.tpl.src.xml
@@ -1,30 +1,25 @@
<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 autosave="true">
- <table>
- <row class="headline">
- <column colspan="2">
- <text key="group"></text>
- </column>
- </row>
- <list list="memberships" extract="true">
- <row class="data">
- <column width="10%">
- <checkbox name="var:var"></checkbox>
- </column>
- <column>
- <label for="var:var">
- <image file="icon_group"></image>
- <text var="name"></text>
- </label>
- </column>
- </row>
- </list>
- <row>
- <column colspan="2" class="act">
- <button type="ok"></button>
- </column>
- </row>
- </table>
- </form>
+ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd">
+ <form>
+ <table>
+ <row class="headline">
+ <column colspan="2">
+ <text key="group"></text>
+ </column>
+ </row>
+ <list list="memberships" extract="true">
+ <row class="data">
+ <column width="10%">
+ <checkbox name="var:var"></checkbox>
+ </column>
+ <column>
+ <label for="var:var">
+ <image action="group"/>
+ <text var="name"/>
+ </label>
+ </column>
+ </row>
+ </list>
+ </table>
+ </form>
</output>
\ No newline at end of file
