Commit 939a3da5 by Eva Gächter

Merge branch 'feature/PLAY-181' into 'master'

Resolve PLAY-181 "Feature/" Closes PLAY-181 See merge request !346
parents 2f720b49 68425efb
@import "_emailTemplates";
@import "_customNotify";
@import "_editbars";
.nav.nav-tabs > li > a:hover,
.nav.nav-tabs > li > a:focus {
background-color: #f9f9f9;
}
\ No newline at end of file
......@@ -37,15 +37,15 @@
<input type="hidden" name="id" value="@user.getId">
<fieldset>
@if(partyNameExtenstion.toString().isEmpty) {
@Option(partyNameExtenstion).map(_.toString()).filter(_.nonEmpty).map { _ =>
@partyNameExtenstion
}.getOrElse {
@inputText(
userForm("name"),
'class -> "form-control",
'placeholder -> Messages("backend.user.name"),
'_label -> Messages("backend.user.name")
)
} else {
@partyNameExtenstion
}
@inputText(
......
......@@ -32,50 +32,39 @@
<div class="tabbable tabbable-full-width">
<ul class="nav nav-tabs">
<li class="active"><a href="#tabbed-user-edit" data-toggle="tab">@Messages("backend.user.profile")</a></li>
<li @if( request.path.equals(ch.insign.cms.controllers.routes.PartyController.showProfile(user.getId).toString()) ){ class="active" }>
<a href="@ch.insign.cms.controllers.routes.PartyController.showProfile(user.getId)">
@Messages("backend.user.profile")
</a>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.editParty(user.getId).toString()) ){ class="active" }>
<a href="@CMS.getRouteResolver.editParty(user.getId)">
@Messages("backend.user.edit")
</a>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.listRole(user.getId).toString()) ){ class="active"}>
<a href="@CMS.getRouteResolver.listRole(user.getId)">
@Messages("backend.user.roles")
</a>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.changePassword(user.getId).toString()) ){ class="active" }>
<a href="@CMS.getRouteResolver.changePassword(user.getId)">
@Messages("backend.user.password.change")
</a>
</li>
@extraMenuItems
</ul>
<div class="tab-content">
<div class="tab-pane active" id="tabbed-user-edit">
<div class="row profile-account">
<div class="col-md-3">
<ul class="ver-inline-menu tabbable margin-bottom-10">
<li @if( request.path.equals(ch.insign.cms.controllers.routes.PartyController.showProfile(user.getId).toString()) ){ class="active" }>
<a href="@ch.insign.cms.controllers.routes.PartyController.showProfile(user.getId)">
<i class="fa fa-info"></i>
@Messages("backend.user.profile")
</a>
<span class="after"></span>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.editParty(user.getId).toString()) ){ class="active" }>
<a href="@CMS.getRouteResolver.editParty(user.getId)">
<i class="fa fa-cog"></i>
@Messages("backend.user.edit")
</a>
<span class="after"></span>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.changePassword(user.getId).toString()) ){ class="active" }>
<a href="@CMS.getRouteResolver.changePassword(user.getId)">
<i class="fa fa-lock"></i>
@Messages("backend.user.password.change")
</a>
</li>
<li @if( request.path.equals(CMS.getRouteResolver.listRole(user.getId).toString()) ){ class="active"}>
<a href="@CMS.getRouteResolver.listRole(user.getId)">
<i class="fa fa-group"></i>
@Messages("backend.user.roles")
</a>
</li>
@extraMenuItems
</ul>
</div>
<div class="col-md-9">
<div class="col-md-12">
<div class="tab-content">
@content
</div>
......
......@@ -186,9 +186,9 @@ language.name.en=English
language.name.de=German
language.name.fr=French
backend.user.info=Informations
backend.user.profile=User''s profile
backend.user.edit.title=Edit user
backend.user.edit=Edit user
backend.user.profile=Profile
backend.user.edit.title=Edit
backend.user.edit=Edit
backend.user.send.email.label=send E-Mail
backend.user.edit.message.success=The user has been updated
backend.user.edit.message.email.sent=The selected message was sent to the user via e-mail
......
......@@ -152,9 +152,9 @@ roles.permissions.revoke.forbidden=Sie sind nicht berechtigt, Rechte zu entziehe
language.name.en=Englisch
language.name.de=Deutsch
language.name.fr=Französisch
backend.user.profile=Benutzer-Profil
backend.user.edit.title=Benutzer bearbeiten
backend.user.edit=Benutzer bearbeiten
backend.user.profile=Profil
backend.user.edit.title=Bearbeiten
backend.user.edit=Bearbeiten
backend.user.edit.message.success=Der Benutzer wurde aktualisiert.
backend.user.edit.message.email.sent=Dem Benutzer wurde die gewählte Nachricht per E-Mail gesendet.
backend.user.success.role.updated=Der Benutzer wurde aktualisiert.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment