commit c9f80fa5546c22e368737ce32c58cc7599e682ca
parent ed02542a62da8ea93aed1fff4f7b602c48370687
Author: Jan Dankert <develop@jandankert.de>
Date: Mon, 27 May 2019 23:16:57 +0200
Fix: Bilder korrigiert.
Diffstat:
5 files changed, 111 insertions(+), 131 deletions(-)
diff --git a/modules/cms-core/action/GroupAction.class.php b/modules/cms-core/action/GroupAction.class.php
@@ -303,28 +303,4 @@ class GroupAction extends Action
- /**
- * Men�.
- *
- * @param String $menu Men�eintrag.
- * @return boolean TRUE, wenn Men�eintrag aktiv ist.
- */
- function checkMenu( $menu )
- {
- switch( $menu )
- {
- case 'remove':
- case 'add':
- return !readonly();
-
- case 'users':
- return true;
- case 'adduser':
- // Benutzer k�nnen nur hinzugef�gt werden, wenn noch nicht alle
- // in der Gruppe sind.
- return !readonly() && count($this->group->getOtherUsers()) > 0;
- default:
- return true;
- }
- }
}
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/html/views/group/rights.php b/modules/cms-ui/themes/default/html/views/group/rights.php
@@ -1,54 +1,54 @@
- <table width="100%">
+ <div class="or-table-wrapper"><div class="or-table-area"><table width="100%">
<?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?>
<tr>
<td>
- <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 $projectname ?></legend><div>
- <?php $if7=(($acls)==FALSE); if($if7){?>
+ <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 $projectname ?></legend><div class="closable">
+ <?php $if7=(($rights)==FALSE); if($if7){?>
<tr>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
</td>
</tr>
<?php } ?>
- <?php $if7=!(($acls)==FALSE); if($if7){?>
- <table width="100%">
+ <?php $if7=!(($rights)==FALSE); if($if7){?>
+ <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 class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span>
</td>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
</td>
<?php foreach($show as $list_key=>$t){ ?>
<td class="help">
- <span class="text" title="<?php echo lang('acl_'.$t.'') ?>"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span>
+ <span title="<?php echo lang('acl_'.$t.'') ?>"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span>
</td>
<?php } ?>
</tr>
<?php foreach($rights as $aclid=>$acl){ ?><?php extract($acl) ?>
- <tr class="data">
+ <tr class="data clickable">
<td>
<?php $if12=(isset($groupname)); if($if12){?>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <i class="image-icon image-icon--action-group"></i>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
<?php } ?>
<?php $if12=!(isset($username)); if($if12){?>
<?php $if13=!(isset($groupname)); if($if13){?>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <i class="image-icon image-icon--action-group"></i>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span>
<?php } ?>
<?php } ?>
@@ -57,17 +57,17 @@
<?php unset($groupname) ?>
</td>
- <td>
- <img class="" title="" src="./modules/cms-ui/themes/default/images/icon_<?php echo $objecttype ?>.png" />
+ <td title="<?php echo $objectname ?>">
+ <i class="image-icon image-icon--action-<?php echo $objecttype ?>"></i>
- <a target="_self" data-action="<?php echo $objecttype ?>" data-method="" data-id="<?php echo $objectid ?>" data-extra="[]" href="<?php echo Html::url($objecttype,'',$objectid,array()) ?>">
- <span class="text" title="<?php echo lang('select') ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $objectname,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
+ <a target="_self" data-type="open" data-action="<?php echo $objecttype ?>" data-method="" data-id="<?php echo $objectid ?>" data-extra="[]" href="<?php echo Html::url($objecttype,'',$objectid,array()) ?>">
+ <span><?php echo nl2br(encodeHtml(htmlentities($objectname))); ?></span>
</a>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
</td>
<?php foreach($show as $list_key=>$list_value){ ?>
@@ -92,11 +92,11 @@
<?php } ?>
</tr>
<?php } ?>
- </table>
+ </table></div></div>
<?php } ?>
</div></fieldset>
</td>
</tr>
<?php } ?>
- </table>
+ </table></div></div>
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/group/rights.tpl.src.xml
@@ -1,73 +1,74 @@
<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">
- <table>
- <list list="projects" extract="true">
- <row>
- <column>
- <group title="var:projectname">
- <if empty="acls">
- <row>
- <column>
- <text text="GLOBAL_NOT_FOUND"></text>
- </column>
- </row>
- </if>
- <if not="true" empty="acls">
- <table>
- <row class="headline">
- <column class="help">
- <text text="GLOBAL_USER"></text>
- </column>
- <column class="help">
- <text text="GLOBAL_NAME"></text>
- </column>
- <column class="help">
- <text text="GLOBAL_LANGUAGE"></text>
- </column>
- <list list="show" value="t">
- <column class="help">
- <text key="var:t" prefix="acl_" suffix="_abbrev" title="message:acl_{t}"></text>
- </column>
- </list>
- </row>
- <list list="rights" key="aclid" value="acl" extract="true">
- <row class="data">
- <column>
- <if present="groupname">
- <image type="group"></image>
- <text var="groupname" maxlength="20"></text>
- </if>
- <if not="true" present="username">
- <if not="true" present="groupname">
- <image type="group"></image>
- <text key="global_all"></text>
- </if>
- </if>
- <set var="username"></set>
- <set var="groupname"></set>
- </column>
- <column>
- <image type="var:objecttype"></image>
- <link action="var:objecttype" subaction="" id="var:objectid">
- <text var="objectname" maxlength="20" title="message:select"></text>
- </link>
- </column>
- <column>
- <text var="languagename" maxlength="20"></text>
- </column>
- <list list="show">
- <column>
- <set var="var:list_value" value="var:bits" key="var:list_value"></set>
- <checkbox name="var:list_value" readonly="true"></checkbox>
- </column>
- </list>
- </row>
- </list>
- </table>
- </if>
- </group>
- </column>
- </row>
- </list>
- </table>
+ xsi:schemaLocation="http://www.openrat.de/template ../../../../../../template-engine/components/template.xsd">
+ <table filter="false">
+ <list list="projects" extract="true">
+ <row>
+ <column>
+ <group title="var:projectname">
+ <if empty="rights">
+ <row>
+ <column>
+ <text text="GLOBAL_NOT_FOUND"></text>
+ </column>
+ </row>
+ </if>
+ <if not="true" empty="rights">
+ <table>
+ <row class="headline">
+ <column class="help">
+ <text text="GLOBAL_USER"></text>
+ </column>
+ <column class="help">
+ <text text="GLOBAL_NAME"></text>
+ </column>
+ <column class="help">
+ <text text="GLOBAL_LANGUAGE"></text>
+ </column>
+ <list list="show" value="t">
+ <column class="help">
+ <text key="var:t" prefix="acl_" suffix="_abbrev"
+ title="message:acl_{t}"></text>
+ </column>
+ </list>
+ </row>
+ <list list="rights" key="aclid" value="acl" extract="true">
+ <row class="data clickable">
+ <column>
+ <if present="groupname">
+ <image action="group"></image>
+ <text var="groupname" maxlength="20"></text>
+ </if>
+ <if not="true" present="username">
+ <if not="true" present="groupname">
+ <image action="group"></image>
+ <text key="global_all"></text>
+ </if>
+ </if>
+ <set var="username"></set>
+ <set var="groupname"></set>
+ </column>
+ <column title="var:objectname">
+ <image action="var:objecttype"></image>
+ <link type="open" action="var:objecttype" subaction="" id="var:objectid">
+ <text var="objectname"></text>
+ </link>
+ </column>
+ <column>
+ <text var="languagename" maxlength="20"></text>
+ </column>
+ <list list="show">
+ <column>
+ <set var="var:list_value" value="var:bits" key="var:list_value"></set>
+ <checkbox name="var:list_value" readonly="true"></checkbox>
+ </column>
+ </list>
+ </row>
+ </list>
+ </table>
+ </if>
+ </group>
+ </column>
+ </row>
+ </list>
+ </table>
</output>
\ No newline at end of file
diff --git a/modules/cms-ui/themes/default/html/views/user/rights.php b/modules/cms-ui/themes/default/html/views/user/rights.php
@@ -1,7 +1,7 @@
<?php foreach($projects as $list_key=>$list_value){ ?><?php extract($list_value) ?>
- <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 $projectname ?></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 $projectname ?></legend><div class="closable">
<?php $if4=(($rights)==FALSE); if($if4){?>
<div>
<span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
@@ -9,7 +9,7 @@
</div>
<?php } ?>
<?php $if4=!(($rights)==FALSE); if($if4){?>
- <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 class="help">
<span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
@@ -31,23 +31,23 @@
<?php } ?>
</tr>
<?php foreach($rights as $aclid=>$acl){ ?><?php extract($acl) ?>
- <tr class="data">
+ <tr class="data clickable">
<td>
<?php $if9=(isset($username)); if($if9){?>
- <img src="./modules/cms-ui/themes/default/images/icon_user.png" />
+ <i class="image-icon image-icon--action-user"></i>
<span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $username,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
<?php } ?>
<?php $if9=(isset($groupname)); if($if9){?>
- <img src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <i class="image-icon image-icon--action-group"></i>
<span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $groupname,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
<?php } ?>
<?php $if9=!(isset($username)); if($if9){?>
<?php $if10=!(isset($groupname)); if($if10){?>
- <img src="./modules/cms-ui/themes/default/images/icon_group.png" />
+ <i class="image-icon image-icon--action-group"></i>
<span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_all'.'')))); ?></span>
@@ -59,7 +59,7 @@
</td>
<td>
- <img src="./modules/cms-ui/themes/default/images/icon_<?php echo $objecttype ?>.png" />
+ <i class="image-icon image-icon--action-<?php echo $objecttype ?>"></i>
<a target="_self" data-type="open" data-action="<?php echo $objecttype ?>" data-method="rights" data-id="<?php echo $objectid ?>" data-extra="[]" href="<?php echo Html::url($objecttype,'',$objectid,array()) ?>">
<span title="<?php echo lang('select') ?>"><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $objectname,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
@@ -68,6 +68,8 @@
</td>
<td>
+ <i class="image-icon image-icon--action-language"></i>
+
<span><?php echo nl2br(encodeHtml(htmlentities(Text::maxLength( $languagename,20,'..',constant('STR_PAD_BOTH') )))); ?></span>
</td>
@@ -93,7 +95,7 @@
<?php } ?>
</tr>
<?php } ?>
- </table>
+ </table></div></div>
<?php } ?>
</div></fieldset>
<?php } ?>
diff --git a/modules/cms-ui/themes/default/html/views/user/rights.tpl.src.xml b/modules/cms-ui/themes/default/html/views/user/rights.tpl.src.xml
@@ -27,19 +27,19 @@
</list>
</row>
<list list="rights" key="aclid" value="acl" extract="true">
- <row class="data">
+ <row class="data clickable">
<column>
<if present="username">
- <image type="user"></image>
+ <image action="user"></image>
<text var="username" maxlength="20"></text>
</if>
<if present="groupname">
- <image type="group"></image>
+ <image action="group"></image>
<text var="groupname" maxlength="20"></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>
@@ -47,12 +47,13 @@
<set var="groupname"></set>
</column>
<column>
- <image type="var:objecttype"></image>
+ <image action="var:objecttype"></image>
<link type="open" action="var:objecttype" id="var:objectid">
- <text var="objectname" maxlength="20" title="message:select"></text>
+ <text var="objectname" title="message:select"></text>
</link>
</column>
<column>
+ <image action="language"></image>
<text var="languagename" maxlength="20"></text>
</column>
<list list="show">
