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

move project permission and notification input to use magicsuggest #296

Merged
merged 1 commit into from
Aug 10, 2017
Merged

move project permission and notification input to use magicsuggest #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/web/WEB-INF/contest-details2.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
- Author: BeBetter, isv, GreatKevin, Ghost_141, Veve, TCSCODER
- Version: 1.11
- Version: 1.13
- Copyright (C) 2010 - 2017 TopCoder Inc., All Rights Reserved.
-
- Description: Contest Detail page
Expand Down Expand Up @@ -32,6 +32,8 @@
- - Add CANCEL and CLOSE button on active private challenge
- Version 1.12 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
- - Split jquery import to other file
- Version 1.13 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
- - Move redundant code
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
Expand All @@ -40,9 +42,6 @@

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
<jsp:include page="includes/jq_1_11_1.jsp"/>
<jsp:include page="includes/htmlhead.jsp"/>
<!--[if IE 7]>
Expand Down
15 changes: 11 additions & 4 deletions src/web/WEB-INF/editCockpitProject.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%--
- Author: GreatKevin, freegod, Veve
- Version: 1.7
- Copyright (C) 2011 - 2014 TopCoder Inc., All Rights Reserved.
- Author: GreatKevin, freegod, Veve, TCSCODER
- Version: 1.8
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
-
- Description: This JSP page is the edit project page.
-
Expand Down Expand Up @@ -37,6 +37,8 @@
-
- Version 1.7 (TopCoder Direct - Add Appirio Manager)
- - Add Appirio Manager
- Version 1.8 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
- - Add magicsuggest control for permission and notiification
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
Expand All @@ -45,9 +47,11 @@

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<jsp:include page="includes/jq_1_11_1.jsp"/>
<jsp:include page="includes/htmlhead.jsp"/>
<script type="text/javascript" src="/scripts/jquery.tools.min.js?v=222286"></script>
<link rel="stylesheet" href="/css/direct/editProject.css?v=213353" media="all" type="text/css"/>
<link rel="stylesheet" href="/css/direct/magicsuggest.css" media="all" type="text/css"/>
<script type="text/javascript">
var groupIds = [];
var group;
Expand Down Expand Up @@ -523,6 +527,9 @@
<div class="permissionsNotifications">
<a name="permissionsNotifications"/>
<h3>Project Permissions &amp; Notifications</h3>
<div class="userInputRow">
<div id="permissionsNotificationsInput"></div>
</div>
<table border="0" cellpadding="0" cellspacing="0" class="tableHeader">
<colgroup>
<col width="15%" />
Expand All @@ -544,7 +551,7 @@
</th>
<th>Project Forum Notification</th>
<th>Challenge Notifications</th>
<th><a name="addUserModal" class="buttonRed1 newButtonGreen triggerModal" href="javascript:;" id="addUser"><span>ADD USER</span></a></th>
<th></th>
</tr>
</thead>
<tbody>
Expand Down
8 changes: 7 additions & 1 deletion src/web/WEB-INF/includes/jq_1_11_1.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
<%--
- Version: 1.0
- Version: 1.1
- Copyright (C) 2017 TopCoder Inc., All Rights Reserved.
-
- Description: Html fragment to import jquery 1.11.1 and setup other variable
-
- Version 1.1 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
- - Move some redundant code related to jquery 1.11 and magicsuggest to here
--%>
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
<script type="text/javascript">
var jQuery_1_11_1 = $.noConflict(true);
var member_api_url = "@memberSearchApiUrl@";
Expand Down
83 changes: 6 additions & 77 deletions src/web/WEB-INF/includes/project/edit/editProjectPageModals.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
<%--
- Author: GreatKevin, Ghost_141, GreatKevin
- Version: 1.4
- Copyright (C) 2011 - 2013 TopCoder Inc., All Rights Reserved.
- Author: GreatKevin, Ghost_141, GreatKevin, TCSCODER
- Version: 1.5
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
-
- Description: This page fragment contains all the modal windows of the edit project page.
-
- Version 1.5 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
- - Remove permission and notification modal
-
- Version 1.4 (Release Assembly - TopCoder Direct Cockpit Release Assembly Ten)
- - Add management modal for add / remove TopCoder Account Managers in edit cockpit project jsp page.
-
Expand Down Expand Up @@ -393,80 +396,6 @@
</div>
<!-- end #addCustomeMeta -->

<!-- add user permission -->
<div id="addUserModal" class="outLay userManagementModal">
<div class="inner">
<div class="modalHeader">
<div class="modalHeaderRight">
<div class="modalHeaderCenter">
<span>Add Users To Permission List</span>
<a href="javascript:;" class="closeModal" title="Close">Close</a>
</div>
</div>
</div>
<!-- end .modalHeader -->

<!-- content -->
<div class="modalBody">
<div class="addUserForm">
<div class="addUserLeft">
<!-- title -->
<div class="addUserTitle">
<p>Users</p>
<a href="javascript:;" class="selectAll">Select All</a>
</div>
<!-- End .addUserTitle -->
<!-- search -->
<div class="searchBox">
<input type="text" class="text" value="" />
<a href="javascript:;" class="downloadProfile"><span class="profileLeft">Search</span></a>
</div>
<!-- End .searchBox -->
<!-- list -->
<div class="addUserList">
<ul>

</ul>
</div>
<!-- End .addUserList -->
</div>
<div class="addUserButton">
<a href="javascript:;" class="addItem">Add</a>
</div>
<div class="addUserRight">
<!-- title -->
<div class="addUserTitle">
<p>Existing Users</p>
</div>
<!-- End .addUserTitle -->
<!-- list -->
<div class="addUserList">
<ul>

</ul>
</div>
<!-- End .addUserList -->
</div>
<div class="clear"></div>
</div>
<div class="buttonArea">
<a href="javascript:;" title="SAVE" class="button6 saveButton"><span class="left"><span class="right">SAVE</span></span></a>
<a href="javascript:;" title="CANCEL" class="closebutton button6 cancelButton"><span class="left"><span class="right">CANCEL</span></span></a>
<div class="clearFix"></div>
</div>
</div>
<!-- End .content -->

<div class="modalFooter">
<div class="modalFooterRight">
<div class="modalFooterCenter"></div>
</div>
</div>
<!-- end .modalFooter -->
</div>
</div>
<!-- end user permission -->

<!-- add group permission -->
<div id="addGroupModal" class="outLay">
<div class="inner">
Expand Down
8 changes: 4 additions & 4 deletions src/web/WEB-INF/launch-contest.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%--
- Author: bugbuka, TCSCODER
- Version: 1.4
- Version: 1.5
- Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
-
- Description: This page provides function of creating project in dashboard.
Expand All @@ -15,6 +15,9 @@
-
- Version 1.4 (TOPCODER - SUPPORT TYPEAHEAD FOR TASK ASSIGNEES IN DIRECT APP):
- - Split jquery import to other file
-
- Version 1.5 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
- - Move redundant code
--%>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
Expand All @@ -23,9 +26,6 @@

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript" src="/scripts/jquery-1.11.1.min.js"></script>
<script type="text/javascript" src="/scripts/bootstrap.min.js"></script>
<script type="text/javascript" src="/scripts/magicsuggest.js"></script>
<jsp:include page="includes/jq_1_11_1.jsp"/>
<jsp:include page="includes/htmlhead.jsp"/>
<link rel="stylesheet" href="/css/direct/projectMilestone.css" media="all" type="text/css" />
Expand Down
27 changes: 24 additions & 3 deletions src/web/css/direct/editProject.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2011 - 2014 TopCoder Inc., All Rights Reserved.
* Copyright (C) 2011 - 2017 TopCoder Inc., All Rights Reserved.
*
* This css used to render edit project page.
*
Expand All @@ -21,8 +21,11 @@
* Version 1.6 (TC Direct Rebranding Assembly Project and Contest related pages)
* - Rebranding the edit direct project page
*
* Author: GreatKevin, Ghost_141, TCSASSEMBLER
* Version 1.6
* Version 1.7 (TOPCODER - IMPROVE USER MANAGEMENT BEHAVIOR FOR PROJECT PERMISSIONS & NOTIFICATIONS)
* - Add style for magicsuggest control
*
* Author: GreatKevin, Ghost_141, TCSASSEMBLER, TCSCODER
* Version 1.7
*/
.editPage #header .logo {
font-size: 18px;
Expand Down Expand Up @@ -2384,3 +2387,21 @@ a.saveSetting:hover,
border-bottom: 3px solid #81bc02;
}

.permissionsNotifications .userInputRow{
border: 1px solid #CCC;
border-radius: 4px;
margin-bottom: 10px;
width: 372px;
}

.permissionsNotifications .ms-stacked{
display: none;
}

.permissionsNotifications td sup{
background-color: #ff0001;
color: #fff;
border-radius: 4px;
padding: 0px 2px 1px 2px;
margin-left: 5px;
}
Loading