Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
PERFORMA_REPLICA
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Muhammad Usman
PERFORMA_REPLICA
Commits
70b82518
Commit
70b82518
authored
Oct 04, 2018
by
Saliya Randunu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ui fixes in manage users page
parent
2f68fcfe
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
7 deletions
+26
-7
common.css
cmsWebApp/webroot/css/common.css
+15
-2
manage_users.jsp
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
+11
-5
No files found.
cmsWebApp/webroot/css/common.css
View file @
70b82518
...
@@ -4171,7 +4171,9 @@ span.right-img {
...
@@ -4171,7 +4171,9 @@ span.right-img {
box-shadow
:
0
2px
3px
0
rgba
(
0
,
0
,
0
,
0.02
);
box-shadow
:
0
2px
3px
0
rgba
(
0
,
0
,
0
,
0.02
);
margin-bottom
:
15px
;
margin-bottom
:
15px
;
}
}
.user-list-row.invite-row
{
margin-bottom
:
-3px
;
}
.user-list-row.disabled
{
.user-list-row.disabled
{
background
:
#f3f4f6
;
background
:
#f3f4f6
;
}
}
...
@@ -4198,7 +4200,8 @@ span.right-img {
...
@@ -4198,7 +4200,8 @@ span.right-img {
.m-user-right
{
.m-user-right
{
float
:
right
;
float
:
right
;
width
:
22%
;
width
:
22%
;
padding
:
15px
17px
;
padding
:
17px
17px
;
border-left
:
1px
solid
#f9f9fa
;
}
}
.m-user-right-padlock
{
.m-user-right-padlock
{
float
:
right
;
float
:
right
;
...
@@ -4262,6 +4265,15 @@ span.right-img {
...
@@ -4262,6 +4265,15 @@ span.right-img {
border-width
:
6px
;
border-width
:
6px
;
margin-left
:
6px
;
margin-left
:
6px
;
}
}
.seperator-dots
{
text-align
:
center
}
.seperator-dots
.dot
{
height
:
10px
;
height
:
4px
;
width
:
4px
;
background-color
:
#bbb
;
display
:
inline-block
;
margin
:
0
3px
15px
;
}
.m-user-icon
,
.m-user-info
{
.m-user-icon
,
.m-user-info
{
float
:
left
;
float
:
left
;
...
@@ -4313,6 +4325,7 @@ span.right-img {
...
@@ -4313,6 +4325,7 @@ span.right-img {
display
:
inline-block
;
display
:
inline-block
;
padding
:
15px
80px
;
padding
:
15px
80px
;
width
:
100%
;
width
:
100%
;
margin-bottom
:
15px
;
}
}
.manage-user-right
label
{
.manage-user-right
label
{
color
:
#ffffff
;
color
:
#ffffff
;
...
...
cmsWebApp/webroot/extensions/adminportal/manage_users.jsp
View file @
70b82518
...
@@ -151,8 +151,9 @@
...
@@ -151,8 +151,9 @@
</div>
</div>
</div>
</div>
</div>
</div>
<oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>">
<div class="m-user-right-padlock">
<div class="m-user-right-padlock">
<oneit:recalcClass htmlTag="div" classScript="companyUser.isOwner() ? 'hide': 'show'" companyUser="<%= companyUser %>">
<div class="arrow_box disble" >DISABLE</div>
<div class="arrow_box disble" >DISABLE</div>
<div class="arrow_box enable" >ENABLE</div>
<div class="arrow_box enable" >ENABLE</div>
<oneit:button value=" " name="saveCompanyUser" skin="link"
<oneit:button value=" " name="saveCompanyUser" skin="link"
...
@@ -162,8 +163,9 @@
...
@@ -162,8 +163,9 @@
.toMap() %>">
.toMap() %>">
<span class="m-user-right-padlockicon"><span class="padlock"></span></span>
<span class="m-user-right-padlockicon"><span class="padlock"></span></span>
</oneit:button>
</oneit:button>
</oneit:recalcClass>
</div>
</div>
</oneit:recalcClass>
<div class="m-user-right">
<div class="m-user-right">
<oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
<oneit:ormEnum obj="<%= companyUser %>" attributeName="Role" cssClass="form-control user-role" enums="<%= Arrays.asList(new RoleType[]{RoleType.ADMIN, RoleType.STANDARD}) %>"/>
</div>
</div>
...
@@ -188,6 +190,8 @@
...
@@ -188,6 +190,8 @@
</div>
</div>
</div>
</div>
-->
-->
<div class="seperator-dots"><span class="dot"></span><span class="dot"></span><span class="dot"></span></div>
<%
<%
for(CompanyUser pendingUser : sortedPendingUsers)
for(CompanyUser pendingUser : sortedPendingUsers)
{
{
...
@@ -195,7 +199,7 @@
...
@@ -195,7 +199,7 @@
String name = StringUtils.subBlanks(user.getName())!=null ? user.getName() : user.getUserName();
String name = StringUtils.subBlanks(user.getName())!=null ? user.getName() : user.getUserName();
String resendTxt = "Re-send invitation to " + (StringUtils.subBlanks(user.getFirstName())!=null ? user.getFirstName() : StringUtils.subBlanks(user.getLastName())!=null ? user.getLastName() : user.getUserName());
String resendTxt = "Re-send invitation to " + (StringUtils.subBlanks(user.getFirstName())!=null ? user.getFirstName() : StringUtils.subBlanks(user.getLastName())!=null ? user.getLastName() : user.getUserName());
%>
%>
<div class="user-list-row" id="<%= pendingUser.getID() %>">
<div class="user-list-row
invite-row
" id="<%= pendingUser.getID() %>">
<div class="m-user-left">
<div class="m-user-left">
<div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-icon"><img src="images/user-list-icon.png"></div>
<div class="m-user-info">
<div class="m-user-info">
...
@@ -207,19 +211,21 @@
...
@@ -207,19 +211,21 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="m-user-right invite-combo">
<div class="m-user-right invite-combo">
<select class="form-control" disabled="">
<select class="form-control" disabled="">
<option>Invitation sent</option>
<option>Invitation sent</option>
</select>
</select>
</div>
</div>
<div class="resend-link">
</div>
<div class="resend-link">
<oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link"
<oneit:button value="<%= resendTxt %>" name="sendUserInvites" skin="link"
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
requestAttribs="<%= CollectionUtils.mapEntry("nextPage", currentPage)
.mapEntry ("ResendUser", pendingUser)
.mapEntry ("ResendUser", pendingUser)
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.mapEntry(NotificationUtils.NOTIFICATION_MSG_PARAM, "invitationSent")
.toMap() %>" />
.toMap() %>" />
</div>
</div>
</div>
<%
<%
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment