commit 717d3c07581a3e476e55c09f12577359aba136c9
parent f75b97273b96f4c9f5d28a287fb9224b9140d02b
Author: Jan Dankert <devnull@localhost>
Date: Mon, 14 Jan 2019 21:28:55 +0100
Fixes für Nicht-Administratoren.
Diffstat:
12 files changed, 85 insertions(+), 97 deletions(-)
diff --git a/modules/cms-core/action/LanguagelistAction.class.php b/modules/cms-core/action/LanguagelistAction.class.php
@@ -69,7 +69,9 @@ class LanguagelistAction extends Action
$list = array();
$this->setTemplateVar('act_languageid',0 );
-
+
+
+
foreach( $this->project->getLanguageIds() as $id )
{
$l = new Language( $id );
@@ -80,9 +82,7 @@ class LanguagelistAction extends Action
$list[$id] = array();
$list[$id]['name' ] = $l->name;
$list[$id]['isocode'] = $l->isoCode;
-
- if ( $this->userIsAdmin() )
- $list[$id]['id' ] = $id;
+ $list[$id]['id' ] = $id;
$list[$id]['is_default'] = $l->isDefault;
diff --git a/modules/cms-core/action/ModellistAction.class.php b/modules/cms-core/action/ModellistAction.class.php
@@ -64,14 +64,11 @@ class ModellistAction extends Action
$m = new Model( $id );
$m->load();
- $list[$id]['name'] = $m->name;
-
- if ( $this->userIsAdmin() )
- $list[$id]['id' ] = $id;
+ $list[$id]['id' ] = $id;
+ $list[$id]['name'] = $m->name;
- $list[$id]['is_default'] = $m->isDefault;
-
- $list[$id]['select_url' ] = Html::url('index','model',$id);
+ $list[$id]['is_default'] = $m->isDefault;
+ $list[$id]['select_url'] = Html::url('index','model',$id);
}
$this->setTemplateVar( 'el',$list );
$this->setTemplateVar( 'add',$this->userIsAdmin() );
diff --git a/modules/cms-ui/themes/default/html/views/language/edit.php b/modules/cms-ui/themes/default/html/views/language/edit.php
@@ -5,7 +5,7 @@
<form name="" target="_self" data-target="view" action="./" data-method="edit" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" 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="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="edit" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
</div>
<div class="input">
diff --git a/modules/cms-ui/themes/default/html/views/language/prop.php b/modules/cms-ui/themes/default/html/views/language/prop.php
@@ -2,24 +2,24 @@
- <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="language" 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="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
+ <form name="" target="_self" data-target="view" action="./" data-method="prop" data-action="language" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form language" 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="language" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="prop" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NAME')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="50" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="50" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
</div>
</div>
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_isocode" name="isocode<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$isocode) ?>" /><?php if ('') { ?><input type="hidden" name="isocode" value="<?php $isocode ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_isocode" name="<?php if ('') echo ''.'_' ?>isocode<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$isocode) ?>" /><?php if ('') { ?><input type="hidden" name="isocode" value="<?php $isocode ?>"/><?php } ?></div>
</div>
</div>
@@ -45,5 +45,5 @@
</label>
</div>
</div>
- <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form>
+ <div class="or-form-actionbar"><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/languagelist/add.php b/modules/cms-ui/themes/default/html/views/languagelist/add.php
@@ -3,7 +3,7 @@
<form name="" target="_self" data-target="view" action="./" data-method="add" data-action="languagelist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form languagelist" 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="languagelist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('LANGUAGE_ISOCODE')))); ?></span>
</div>
<div class="input">
diff --git a/modules/cms-ui/themes/default/html/views/modellist/add.php b/modules/cms-ui/themes/default/html/views/modellist/add.php
@@ -2,16 +2,16 @@
- <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="modellist" 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="modellist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
+ <form name="" target="_self" data-target="view" action="./" data-method="add" data-action="modellist" data-id="<?php echo OR_ID ?>" method="post" enctype="application/x-www-form-urlencoded" class="or-form modellist" 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="modellist" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="add" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<div class="line">
<div class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_name'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_name'.'')))); ?></span>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_name" name="<?php if ('') echo ''.'_' ?>name<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="focus" value="<?php echo Text::encodeHtml(@$name) ?>" /><?php if ('') { ?><input type="hidden" name="name" value="<?php $name ?>"/><?php } ?></div>
</div>
</div>
- <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form>
+ <div class="or-form-actionbar"><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/object/aclform.php b/modules/cms-ui/themes/default/html/views/object/aclform.php
@@ -9,7 +9,7 @@
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_all" name="type" value="all"<?php if('all'==@$type)echo ' checked="checked"' ?> />
<label for="<?php echo REQUEST_ID ?>_type_all" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ALL')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_ALL')))); ?></span>
</label>
</div>
@@ -21,7 +21,7 @@
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_user" name="type" value="user"<?php if('user'==@$type)echo ' checked="checked"' ?> />
<label for="<?php echo REQUEST_ID ?>_type_user" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_USER')))); ?></span>
</label>
</div>
@@ -36,7 +36,7 @@
<input class="radio" type="radio" id="<?php echo REQUEST_ID ?>_type_group" name="type" value="group"<?php if('group'==@$type)echo ' checked="checked"' ?> />
<label for="<?php echo REQUEST_ID ?>_type_group" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_GROUP')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_GROUP')))); ?></span>
</label>
</div>
@@ -51,7 +51,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_languageid" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_LANGUAGE')))); ?></span>
</label>
</div>
@@ -105,7 +105,7 @@
<?php } ?>
<label for="<?php echo REQUEST_ID ?>_<?php echo $t ?>_" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'')))); ?></span>
</label>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/object/rights.php b/modules/cms-ui/themes/default/html/views/object/rights.php
@@ -11,28 +11,28 @@
<div class="table-wrapper"><div class="table-filter"><input type="search" name="filter" placeholder="<?php echo lang('SEARCH_FILTER') ?>" /></div><table width="100%"></div>
<tr class="headline">
<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"><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('acl_'.$t.'_abbrev')))); ?></span>
</td>
<?php } ?>
<td class="help">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_delete'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'global_delete'.'')))); ?></span>
</td>
</tr>
<?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>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('GLOBAL_NOT_FOUND')))); ?></span>
</td>
</tr>
@@ -43,41 +43,41 @@
<tr class="data">
<td>
<?php $if6=(isset($username)); if($if6){?>
- <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/user.svg" />
+ <i class="image-icon image-icon--action-user"></i>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($username))); ?></span>
<?php } ?>
<?php $if6=(isset($groupname)); if($if6){?>
- <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/group.svg" />
+ <i class="image-icon image-icon--action-group"></i>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($groupname))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($groupname))); ?></span>
<?php } ?>
<?php $if6=!(isset($username)); if($if6){?>
<?php $if7=!(isset($groupname)); if($if7){?>
- <img class="image-icon image-icon--action" title="" src="./modules/cms-ui/themes/default/images/icon/action/group.svg" />
+ <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 } ?>
</td>
<td>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities($languagename))); ?></span>
</td>
<?php foreach($show as $list_key=>$t){ ?>
<td>
<?php $if7=($$t); if($if7){?>
- <span class="text"><?php echo nl2br('✓'); ?></span>
+ <span><?php echo nl2br('✓'); ?></span>
<?php } ?>
</td>
<?php } ?>
<td class="clickable">
<a target="_self" data-type="post" data-action="" data-method="delacl" data-id="<?php echo OR_ID ?>" data-extra="{'aclid':'<?php echo $aclid ?>'}" data-data="{"action":"object","subaction":"delacl","id":"<?php echo OR_ID ?>","token":"<?php echo token() ?>","aclid":"<?php echo $aclid ?>","none":"0"}">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DELETE'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'GLOBAL_DELETE'.'')))); ?></span>
</a>
@@ -87,9 +87,9 @@
<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="image-icon image-icon--method" title="" src="./modules/cms-ui/themes/default/images/icon/method/add.svg" />
+ <i class="image-icon image-icon--method-add"></i>
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('new')))); ?></span>
</a>
diff --git a/modules/cms-ui/themes/default/html/views/profile/edit.php b/modules/cms-ui/themes/default/html/views/profile/edit.php
@@ -75,7 +75,7 @@
</label>
</div>
<div class="input">
- <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class="theme-chooser"<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,config('interface','style','default'),0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?>
+ <div class="inputholder"><select id="<?php echo REQUEST_ID ?>_style" name="style" title="" class="or-theme-chooser"<?php if (count($allstyles)<=1) echo ' disabled="disabled"'; ?> size=1"><?php include_once( 'modules/template-engine/components/html/selectbox/component-select-box.php') ?><?php component_select_option_list($allstyles,config('interface','style','default'),0,0) ?><?php if (count($allstyles)==0) { ?><input type="hidden" name="style" value="" /><?php } ?><?php if (count($allstyles)==1) { ?><input type="hidden" name="style" value="<?php echo array_keys($allstyles)[0] ?>" /><?php } ?>
</select></div>
</div>
</div>
diff --git a/modules/cms-ui/themes/default/html/views/profile/mail.php b/modules/cms-ui/themes/default/html/views/profile/mail.php
@@ -21,19 +21,19 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_mail" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_mail')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_mail')))); ?></span>
</label>
</div>
<div class="input">
- <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="mail<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="text" value="<?php echo Text::encodeHtml(@$mail) ?>" /><?php if ('') { ?><input type="hidden" name="mail" value="<?php $mail ?>"/><?php } ?></div>
+ <div class="inputholder"><input id="<?php echo REQUEST_ID ?>_mail" name="<?php if ('') echo ''.'_' ?>mail<?php if ('') echo '_disabled' ?>" type="text" maxlength="256" class="" value="<?php echo Text::encodeHtml(@$mail) ?>" /><?php if ('') { ?><input type="hidden" name="mail" value="<?php $mail ?>"/><?php } ?></div>
</div>
</div>
</div></fieldset>
<div class="clickable">
<a target="_self" data-type="dialog" data-action="profile" data-method="confirmmail" data-id="<?php echo OR_ID ?>" data-extra="{'dialogAction':'profile','dialogMethod':'confirmmail'}" href="<?php echo Html::url('profile','confirmmail','',array('dialogAction'=>'profile','dialogMethod'=>'confirmmail')) ?>">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'mail_code'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'mail_code'.'')))); ?></span>
</a>
diff --git a/modules/cms-ui/themes/default/html/views/profile/pw.php b/modules/cms-ui/themes/default/html/views/profile/pw.php
@@ -1,6 +1,6 @@
- <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="profile" 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="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pw" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
+ <form name="" target="_self" data-target="view" action="./" data-method="pw" data-action="profile" data-id="<?php echo OR_ID ?>" method="POST" enctype="application/x-www-form-urlencoded" class="or-form profile" 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="profile" /><input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="pw" /><input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo OR_ID ?>" />
<?php $if3=($pwchange_enabled); if($if3){?>
<div class="line logo">
<div class="label">
@@ -22,7 +22,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_act_password" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('user_password')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_password')))); ?></span>
</label>
</div>
@@ -36,7 +36,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_password1" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password')))); ?></span>
</label>
</div>
@@ -48,7 +48,7 @@
<div class="line">
<div class="label">
<label for="<?php echo REQUEST_ID ?>_password2" class="label">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password_repeat')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang('user_new_password_repeat')))); ?></span>
</label>
</div>
@@ -61,9 +61,9 @@
<?php } ?>
<?php if(!$if3){?>
<div class="message warn">
- <span class="text"><?php echo nl2br(encodeHtml(htmlentities(lang(''.'pwchange_not_allowed'.'')))); ?></span>
+ <span><?php echo nl2br(encodeHtml(htmlentities(lang(''.'pwchange_not_allowed'.'')))); ?></span>
</div>
<?php } ?>
- <div class="bottom"><div class="command "><input type="submit" class="submit ok" value="OK" /></div></div></form>
+ <div class="or-form-actionbar"><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/util/Tree.class.php b/modules/util/Tree.class.php
@@ -151,8 +151,7 @@ class Tree
// Ermitteln, ob der Benutzer Projektadministrator ist
// Projektadministratoren haben das Recht, im Root-Ordner die Eigenschaften zu aendern.
- if ($folder->hasRight(ACL_PROP))
- $userIsProjectAdmin = true;
+ $userIsProjectAdmin = $folder->hasRight(ACL_PROP);
if ($folder->hasRight(ACL_READ)) {
$treeElement = new TreeElement();
@@ -172,7 +171,8 @@ class Tree
// Templates
- if ($userIsProjectAdmin) {
+ if ($userIsProjectAdmin)
+ {
$treeElement = new TreeElement();
$treeElement->id = $projectid;
$treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
@@ -190,54 +190,45 @@ class Tree
// Sprachen
- $treeElement = new TreeElement();
- $treeElement->description = '';
- $treeElement->id = $projectid;
- $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
- $treeElement->internalId = $projectid;
- $treeElement->action = 'languagelist';
- $treeElement->text = lang('GLOBAL_LANGUAGES');
+ if ($userIsProjectAdmin) {
+ $treeElement = new TreeElement();
+ $treeElement->description = '';
+ $treeElement->id = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
+ $treeElement->internalId = $projectid;
+ $treeElement->action = 'languagelist';
+ $treeElement->text = lang('GLOBAL_LANGUAGES');
// $treeElement->url = Html::url('language','listing',0,array(REQ_PARAM_TARGETSUBACTION=>'listing',REQ_PARAM_TARGET=>'content'));
- $treeElement->icon = 'languagelist';
- $treeElement->description = lang('GLOBAL_LANGUAGES_DESC');
+ $treeElement->icon = 'languagelist';
+ $treeElement->description = lang('GLOBAL_LANGUAGES_DESC');
- // Nur fuer Projekt-Administratoren aufklappbar
- if ($userIsProjectAdmin)
- $treeElement->type = 'languages';
+ // Nur fuer Projekt-Administratoren aufklappbar
+ if ($userIsProjectAdmin)
+ $treeElement->type = 'languages';
- $this->addTreeElement($treeElement);
+ $this->addTreeElement($treeElement);
+ }
+ if ($userIsProjectAdmin) {
- // Projektmodelle
- $treeElement = new TreeElement();
- $treeElement->description = '';
+ // Projektmodelle
+ $treeElement = new TreeElement();
+ $treeElement->description = '';
- // Nur fuer Projekt-Administratoren aufklappbar
- if ($userIsProjectAdmin)
- $treeElement->type = 'models';
+ // Nur fuer Projekt-Administratoren aufklappbar
+ if ($userIsProjectAdmin)
+ $treeElement->type = 'models';
- $treeElement->id = $projectid;
- $treeElement->internalId = $projectid;
- $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
- $treeElement->description = lang('GLOBAL_MODELS_DESC');
- $treeElement->text = lang('GLOBAL_MODELS');
+ $treeElement->id = $projectid;
+ $treeElement->internalId = $projectid;
+ $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
+ $treeElement->description = lang('GLOBAL_MODELS_DESC');
+ $treeElement->text = lang('GLOBAL_MODELS');
// $treeElement->url = Html::url('model','listing',0,array(REQ_PARAM_TARGETSUBACTION=>'listing',REQ_PARAM_TARGET=>'content'));
- $treeElement->action = 'modellist';
- $treeElement->icon = 'modellist';
- $this->addTreeElement($treeElement);
-
-
-/* // Suche
- $treeElement = new TreeElement();
- $treeElement->id = $projectid;
- $treeElement->internalId = $projectid;
- $treeElement->extraId[REQ_PARAM_PROJECT_ID] = $projectid;
- $treeElement->text = lang('GLOBAL_SEARCH');
-// $treeElement->url = Html::url('search','',0,array(REQ_PARAM_TARGET=>'content'));
- $treeElement->action = 'search';
- $treeElement->icon = 'search';
- $treeElement->description = lang('GLOBAL_SEARCH_DESC');
- $this->addTreeElement($treeElement);*/
+ $treeElement->action = 'modellist';
+ $treeElement->icon = 'modellist';
+ $this->addTreeElement($treeElement);
+ }
}
