commit 44178e7523eac22740f25f8552bb533a456bd67f
parent 0a53509f860f325b053307dbd3572c0c747cbb38
Author: Jan Dankert <devnull@localhost>
Date: Wed, 12 Sep 2018 22:09:36 +0200
Nur ein paar Icons auf SVG geändert.
Diffstat:
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/modules/cms-ui/themes/default/html/views/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php
@@ -2,8 +2,8 @@
- <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=""><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":"" ?>"><legend><div class="arrow-right closed" /><div class="arrow-down open" /><?php echo lang('users') ?></legend><div>
+ <form name="" target="_self" data-target="view" action="./" data-method="aclform" data-action="object" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="object" data-async="" data-autosave=""><input type="submit" class="invisible" /><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="object" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="aclform" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
+ <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('users') ?></legend><div>
<div class="line">
<div class="label">
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="type" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> />
@@ -30,7 +30,7 @@
</select></div>
</div>
</div>
- <?php $if4=(!empty($groups)); if($if4){?>
+ <?php $if4=(isset($groups)); if($if4){?>
<div class="line">
<div class="label">
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_group" name="type" value="group"<?php if('group'==@$type)echo ' checked="checked"' ?> />
@@ -47,7 +47,7 @@
</div>
<?php } ?>
</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('language') ?></legend><div>
+ <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('language') ?></legend><div>
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_languageid" class="label">
@@ -61,7 +61,7 @@
</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('acl') ?></legend><div>
+ <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('acl') ?></legend><div>
<div class="line">
<div class="label">
</div>
@@ -71,13 +71,13 @@
<?php $if8=($t=='read'); if($if8){?>
<?php $$t= '1'; ?>
- <?php { $tmpname = $t;$default = '';$readonly = '1';
+ <?php { $tmpname = $t;$default = '';$readonly = '1';$required = '';
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
+ ?><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( $required ) echo ' required="required"' ?> /><?php
if ( $readonly && $checked )
{
@@ -89,13 +89,13 @@
<?php if(!$if8){?>
<?php unset($$t) ?>
- <?php { $tmpname = $t;$default = '';$readonly = '';
+ <?php { $tmpname = $t;$default = '';$readonly = '';$required = '';
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
+ ?><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( $required ) echo ' required="required"' ?> /><?php
if ( $readonly && $checked )
{
@@ -113,5 +113,5 @@
</div>
</div>
</div></fieldset>
- <div class="bottom"><div class="command "><input type="button" class="submit ok" value="OK" /></div></div></form>
+ <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form>
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/html/views/object/rights.php b/modules/cms-ui/themes/default/html/views/object/rights.php
@@ -29,7 +29,7 @@
</td>
</tr>
- <?php $if3=(empty($acls)); if($if3){?>
+ <?php $if3=(($acls)==FALSE); if($if3){?>
<tr class="data">
<td colspan="99">
<span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
@@ -37,26 +37,26 @@
</td>
</tr>
<?php } ?>
- <?php $if3=!(empty($acls)); if($if3){?>
+ <?php $if3=!(($acls)==FALSE); if($if3){?>
<?php } ?>
<?php foreach($acls as $aclid=>$acl){ ?><?php extract($acl) ?>
<tr class="data">
<td>
<?php $if6=(isset($username)); if($if6){?>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_user.png" />
+ <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/user.svg" />
<span class="text"><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span>
<?php } ?>
<?php $if6=(isset($groupname)); if($if6){?>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/group.svg" />
<span class="text"><?php echo nl2br(encodeHtml(htmlentities($groupname))); ?></span>
<?php } ?>
<?php $if6=!(isset($username)); if($if6){?>
<?php $if7=!(isset($groupname)); if($if7){?>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/group.svg" />
<span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span>
@@ -69,13 +69,13 @@
</td>
<?php foreach($show as $list_key=>$t){ ?>
<td>
- <?php { $tmpname = $t;$default = '';$readonly = '1';
+ <?php { $tmpname = $t;$default = '';$readonly = '1';$required = '';
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
+ ?><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( $required ) echo ' required="required"' ?> /><?php
if ( $readonly && $checked )
{
@@ -97,7 +97,7 @@
<tr class="data">
<td colspan="99" class="clickable">
<a target="_self" date-name="<?php echo lang('menu_aclform') ?>" name="<?php echo lang('menu_aclform') ?>" data-type="dialog" data-action="" data-method="aclform" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':null,'dialogMethod':'aclform'}" href="<?php echo Html::url('','aclform','',array('dialogAction'=>'','dialogMethod'=>'aclform')) ?>">
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon/add.png" />
+ <img class="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" />
<span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span>
diff --git a/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/object/rights.tpl.src.xml
@@ -37,16 +37,16 @@
<row class="data">
<column>
<if present="username">
- <image type="user"></image>
+ <image action="user"></image>
<text var="username"></text>
</if>
<if present="groupname">
- <image type="group"></image>
+ <image action="group"></image>
<text var="groupname"></text>
</if>
<if not="true" present="username">
<if not="true" present="groupname">
- <image type="group"></image>
+ <image action="group"></image>
<text key="global_all"></text>
</if>
</if>
@@ -69,7 +69,7 @@
<row class="data">
<column colspan="99" class="clickable">
<link type="dialog" name="message:menu_aclform" subaction="aclform">
- <image icon="add" />
+ <image method="add" />
<text text="new" />
</link>
