Skip to content
This repository was archived by the owner on Jan 23, 2025. It is now read-only.

Commit 9998f61

Browse files
ajeftsajefts
authored
Merge pull request #298 from appirio-tech/dev
move project permission and notification input to use magicsuggest
2 parents 43234fe + 7adceae commit 9998f61

File tree

9 files changed

+146
-145
lines changed

9 files changed

+146
-145
lines changed

‎src/web/WEB-INF/contest-details2.jsp

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
22
- Author: BeBetter, isv, GreatKevin, Ghost_141, Veve, TCSCODER
3-
- Version: 1.11
3+
- Version: 1.13
44
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest Detail page
@@ -32,6 +32,8 @@
3232
- - Add CANCEL and CLOSE button on active private challenge
3333
- Version 1.12 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
3434
- - Split jquery import to other file
35+
- Version 1.13 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
36+
- - Move redundant code
3537
--%>
3638
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
3739
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -40,9 +42,6 @@
4042

4143
<html xmlns="http://www.w3.org/1999/xhtml">
4244
<head>
43-
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
44-
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
45-
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
4645
<jsp:include page="includes/jq_1_11_1.jsp"/>
4746
<jsp:include page="includes/htmlhead.jsp"/>
4847
<!--[if IE 7]>

‎src/web/WEB-INF/editCockpitProject.jsp

+11-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%--
2-
- Author: GreatKevin, freegod, Veve
3-
- Version: 1.7
4-
- Copyright (C) 2011 - 2014 TopCoder Inc., All Rights Reserved.
2+
- Author: GreatKevin, freegod, Veve, TCSCODER
3+
- Version: 1.8
4+
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: This JSP page is the edit project page.
77
-
@@ -37,6 +37,8 @@
3737
-
3838
- Version 1.7 (TopCoder Direct - Add Appirio Manager)
3939
- - Add Appirio Manager
40+
- Version 1.8 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
41+
- - Add magicsuggest control for permission and notiification
4042
--%>
4143
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
4244
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -45,9 +47,11 @@
4547

4648
<html xmlns="http://www.w3.org/1999/xhtml">
4749
<head>
50+
<jsp:include page="includes/jq_1_11_1.jsp"/>
4851
<jsp:include page="includes/htmlhead.jsp"/>
4952
<script type="text/javascript" src="/scripts/jquery.tools.min.js?v=222286"></script>
5053
<link rel="stylesheet" href="/css/direct/editProject.css?v=213353" media="all" type="text/css"/>
54+
<link rel="stylesheet" href="/css/direct/magicsuggest.css" media="all" type="text/css"/>
5155
<script type="text/javascript">
5256
var groupIds = [];
5357
var group;
@@ -523,6 +527,9 @@
523527
<div class="permissionsNotifications">
524528
<a name="permissionsNotifications"/>
525529
<h3>Project Permissions &amp; Notifications</h3>
530+
<div class="userInputRow">
531+
<div id="permissionsNotificationsInput"></div>
532+
</div>
526533
<table border="0" cellpadding="0" cellspacing="0" class="tableHeader">
527534
<colgroup>
528535
<col width="15%" />
@@ -544,7 +551,7 @@
544551
</th>
545552
<th>Project Forum Notification</th>
546553
<th>Challenge Notifications</th>
547-
<th><a name="addUserModal" class="buttonRed1 newButtonGreen triggerModal" href="javascript:;" id="addUser"><span>ADD USER</span></a></th>
554+
<th></th>
548555
</tr>
549556
</thead>
550557
<tbody>

‎src/web/WEB-INF/includes/jq_1_11_1.jsp

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
<%--
2-
- Version: 1.0
2+
- Version: 1.1
33
- Copyright (C) 2017 TopCoder Inc., All Rights Reserved.
44
-
55
- Description: Html fragment to import jquery 1.11.1 and setup other variable
6+
-
7+
- Version 1.1 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
8+
- - Move some redundant code related to jquery 1.11 and magicsuggest to here
69
--%>
10+
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
11+
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
12+
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
713
<script type="text/javascript">
814
var jQuery_1_11_1 = $.noConflict(true);
915
var member_api_url = "@memberSearchApiUrl@";

‎src/web/WEB-INF/includes/project/edit/editProjectPageModals.jsp

+6-77
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
<%--
2-
- Author: GreatKevin, Ghost_141, GreatKevin
3-
- Version: 1.4
4-
- Copyright (C) 2011 - 2013 TopCoder Inc., All Rights Reserved.
2+
- Author: GreatKevin, Ghost_141, GreatKevin, TCSCODER
3+
- Version: 1.5
4+
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: This page fragment contains all the modal windows of the edit project page.
77
-
8+
- Version 1.5 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
9+
- - Remove permission and notification modal
10+
-
811
- Version 1.4 (Release Assembly - TopCoder Direct Cockpit Release Assembly Ten)
912
- - Add management modal for add / remove TopCoder Account Managers in edit cockpit project jsp page.
1013
-
@@ -393,80 +396,6 @@
393396
</div>
394397
<!-- end #addCustomeMeta -->
395398

396-
<!-- add user permission -->
397-
<div id="addUserModal" class="outLay userManagementModal">
398-
<div class="inner">
399-
<div class="modalHeader">
400-
<div class="modalHeaderRight">
401-
<div class="modalHeaderCenter">
402-
<span>Add Users To Permission List</span>
403-
<a href="javascript:;" class="closeModal" title="Close">Close</a>
404-
</div>
405-
</div>
406-
</div>
407-
<!-- end .modalHeader -->
408-
409-
<!-- content -->
410-
<div class="modalBody">
411-
<div class="addUserForm">
412-
<div class="addUserLeft">
413-
<!-- title -->
414-
<div class="addUserTitle">
415-
<p>Users</p>
416-
<a href="javascript:;" class="selectAll">Select All</a>
417-
</div>
418-
<!-- End .addUserTitle -->
419-
<!-- search -->
420-
<div class="searchBox">
421-
<input type="text" class="text" value="" />
422-
<a href="javascript:;" class="downloadProfile"><span class="profileLeft">Search</span></a>
423-
</div>
424-
<!-- End .searchBox -->
425-
<!-- list -->
426-
<div class="addUserList">
427-
<ul>
428-
429-
</ul>
430-
</div>
431-
<!-- End .addUserList -->
432-
</div>
433-
<div class="addUserButton">
434-
<a href="javascript:;" class="addItem">Add</a>
435-
</div>
436-
<div class="addUserRight">
437-
<!-- title -->
438-
<div class="addUserTitle">
439-
<p>Existing Users</p>
440-
</div>
441-
<!-- End .addUserTitle -->
442-
<!-- list -->
443-
<div class="addUserList">
444-
<ul>
445-
446-
</ul>
447-
</div>
448-
<!-- End .addUserList -->
449-
</div>
450-
<div class="clear"></div>
451-
</div>
452-
<div class="buttonArea">
453-
<a href="javascript:;" title="SAVE" class="button6 saveButton"><span class="left"><span class="right">SAVE</span></span></a>
454-
<a href="javascript:;" title="CANCEL" class="closebutton button6 cancelButton"><span class="left"><span class="right">CANCEL</span></span></a>
455-
<div class="clearFix"></div>
456-
</div>
457-
</div>
458-
<!-- End .content -->
459-
460-
<div class="modalFooter">
461-
<div class="modalFooterRight">
462-
<div class="modalFooterCenter"></div>
463-
</div>
464-
</div>
465-
<!-- end .modalFooter -->
466-
</div>
467-
</div>
468-
<!-- end user permission -->
469-
470399
<!-- add group permission -->
471400
<div id="addGroupModal" class="outLay">
472401
<div class="inner">

‎src/web/WEB-INF/launch-contest.jsp

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
22
- Author: bugbuka, TCSCODER
3-
- Version: 1.4
3+
- Version: 1.5
44
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: This page provides function of creating project in dashboard.
@@ -15,6 +15,9 @@
1515
-
1616
- Version 1.4 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
1717
- - Split jquery import to other file
18+
-
19+
- Version 1.5 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
20+
- - Move redundant code
1821
--%>
1922
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
2023
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
@@ -23,9 +26,6 @@
2326

2427
<html xmlns="http://www.w3.org/1999/xhtml">
2528
<head>
26-
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
27-
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
28-
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
2929
<jsp:include page="includes/jq_1_11_1.jsp"/>
3030
<jsp:include page="includes/htmlhead.jsp"/>
3131
<link rel="stylesheet" href="/css/direct/projectMilestone.css" media="all" type="text/css" />

‎src/web/css/direct/editProject.css

+24-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (C) 2011 - 2014 TopCoder Inc., All Rights Reserved.
2+
* Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
33
*
44
* This css used to render edit project page.
55
*
@@ -21,8 +21,11 @@
2121
* Version 1.6 (TC Direct Rebranding Assembly Project and Contest related pages)
2222
* - Rebranding the edit direct project page
2323
*
24-
* Author: GreatKevin, Ghost_141, TCSASSEMBLER
25-
* Version 1.6
24+
* Version 1.7 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
25+
* - Add style for magicsuggest control
26+
*
27+
* Author: GreatKevin, Ghost_141, TCSASSEMBLER, TCSCODER
28+
* Version 1.7
2629
*/
2730
.editPage #header .logo {
2831
font-size: 18px;
@@ -2384,3 +2387,21 @@ a.saveSetting:hover,
23842387
border-bottom: 3px solid #81bc02;
23852388
}
23862389

2390+
.permissionsNotifications .userInputRow{
2391+
border: 1px solid #CCC;
2392+
border-radius: 4px;
2393+
margin-bottom: 10px;
2394+
width: 372px;
2395+
}
2396+
2397+
.permissionsNotifications .ms-stacked{
2398+
display: none;
2399+
}
2400+
2401+
.permissionsNotifications td sup{
2402+
background-color: #ff0001;
2403+
color: #fff;
2404+
border-radius: 4px;
2405+
padding: 0px 2px 1px 2px;
2406+
margin-left: 5px;
2407+
}

0 commit comments

Comments
 (0)