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

Commit babe59c

Browse files
skyhitskyhit
authored
Merge pull request #284 from deedee/magicsuggest_platform_tech
magicsuggest for platform and technology
2 parents b8be431 + 59d11eb commit babe59c

File tree

12 files changed

+190
-276
lines changed

12 files changed

+190
-276
lines changed

‎src/java/main/com/topcoder/direct/services/view/action/contest/launch/CommonAction.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,8 @@ public String getContestConfigs() throws Exception {
326326
configs.put("copilotFees", ConfigUtils.getCopilotFees());
327327
configs.put("billingInfos", getBillingProjectInfos());
328328
configs.put("groups", getAllProjectGroups());
329+
configs.put("platforms", getReferenceDataBean().getPlatforms());
330+
configs.put("technologies", getReferenceDataBean().getTechnologies());
329331
setResult(configs);
330332
return SUCCESS;
331333
}

‎src/java/main/com/topcoder/direct/services/view/ajax/SoftwareCompetitionBeanProcessor.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,13 @@
118118
* <ul>
119119
* <li>Updated {@link #getMapResult(SoftwareCompetition)}include project groups of challenge</li>
120120
* </ul>
121-
*
122-
* <p>
123-
* Version 2.4 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
124-
* <ul>
125-
* <li>Added regEndDate in response</li>
126-
* </ul>
127-
* </p>
121+
*
122+
* <p>
123+
* Version 2.4 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
124+
* <ul>
125+
* <li>Added regEndDate in response</li>
126+
* </ul>
127+
* </p>
128128
*
129129
* @author BeBetter, TCSDEVELOPER, morehappiness, bugbuka, GreatKevin, TCSCODER
130130
* @version 2.4
@@ -293,15 +293,15 @@ public Object transform(Object object) {
293293
if (isTechnologyContest(bean)) {
294294
result.put("technologyIds", CollectionUtils.collect(assetDTO.getTechnologies(), new Transformer() {
295295
public Object transform(Object object) {
296-
return ((Technology) object).getId() + "";
296+
return ((Technology) object).getId();
297297
}
298298
}));
299299
}
300300

301301
if(isPlatformContest(bean)) {
302302
result.put("platformIds", CollectionUtils.collect(bean.getProjectHeader().getPlatforms(), new Transformer() {
303303
public Object transform(Object object) {
304-
return ((ProjectPlatform) object).getId() + "";
304+
return ((ProjectPlatform) object).getId();
305305
}
306306
}));
307307
}

‎src/web/WEB-INF/includes/contest/editTabSoftware.jsp‎

Lines changed: 7 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -348,9 +348,9 @@
348348
</div>
349349
<div id="groupDisplay">
350350
<span class="name fixWidthName" title="Enter challenge groups"><strong>Group(s):</strong></span>
351-
<div id="groupDiv"><div id="groups"></div></div>
351+
<div class="groupDiv"><div id="groups"></div></div>
352352
</div>
353-
<br/><br/>
353+
<br/>
354354
<div>
355355

356356
<span class="name fixWidthName"><strong>Created By</strong></span>
@@ -894,53 +894,17 @@
894894
<!-- end .guidelines -->
895895

896896
<s:if test='result.projectHeader.projectCategory.id != 29'>
897-
898897
<div class="prizes platform" id="swPlatformDiv">
899898
<h3>Choose Your Platform:</h3>
900-
901-
<div class="prizesInner_tech">
902-
<span class="head_font">Master Platforms&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
903-
<span class="head_font_space">Your Project Platforms</span>
904-
<br />
905-
<select multiple id="masterPlatformsSelect">
906-
<s:iterator value="referenceDataBean.platforms">
907-
<option value='<s:property value="id" />'><s:property value="name" /></option>
908-
</s:iterator>
909-
</select>
910-
911-
<div id="button_platform">
912-
<img src="/images/add_tech.png" alt="add" id="addPlatforms" />
913-
<br /><br />
914-
<img src="/images/remove_tech.png" alt="remove" id="removePlatforms" />
915-
</div>
916-
917-
<select multiple id="masterPlatformsChoosenSelect">
918-
</select>
899+
<div class="techPlatformDiv">
900+
<div id="platforms"></div>
919901
</div>
920902
</div>
921903

922-
923-
<div class="prizes technology" id="swTechnologyDiv">
904+
<div class="prizes technology" id="swTechnologyDiv">
924905
<h3>Choose Your Technology:</h3>
925-
926-
<div class="prizesInner_tech">
927-
<span class="head_font">Master Technologies</span>
928-
<span class="head_font_space">Your Project Technologies</span>
929-
<br />
930-
<select multiple id="masterTechnologiesSelect">
931-
<s:iterator value="referenceDataBean.technologies">
932-
<option value='<s:property value="id" />'><s:property value="name" /></option>
933-
</s:iterator>
934-
</select>
935-
936-
<div id="button_tech">
937-
<img src="/images/add_tech.png" alt="add" id="addTechnologies" />
938-
<br /><br />
939-
<img src="/images/remove_tech.png" alt="remove" id="removeTechnologies" />
940-
</div>
941-
942-
<select multiple id="masterTechnologiesChoosenSelect">
943-
</select>
906+
<div class="techPlatformDiv">
907+
<div id="technologies"></div>
944908
</div>
945909
</div>
946910

‎src/web/WEB-INF/includes/launch/contestSelection.jsp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<%--
22
- Author: GreatKevin, bugbuka, GreatKevin, TCSCODER
3-
- Version: 2.6
3+
- Version: 2.6
44
- Copyright (C) 2010 - 2016 TopCoder Inc., All Rights Reserved.
55
-
66
- Description: Contest selection page.
@@ -45,11 +45,11 @@
4545
- - Add review type radios to choose 'community' or 'internal' review
4646
- Version 2.2 (Provide Way To Pre_register members When Launching Challenge)
4747
- - Add support pre-register member
48-
-
49-
- Version 2.6 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
50-
- Added registration and submission end date/time for design F2F
51-
- Added registration length for studio contests (excluding design F2F)
52-
- All software contests support modification of registration and submission end date/time
48+
-
49+
- Version 2.6 (Topcoder - Ability To Set End Date For Registration Phase and Submission Phase)
50+
- Added registration and submission end date/time for design F2F
51+
- Added registration length for studio contests (excluding design F2F)
52+
- All software contests support modification of registration and submission end date/time
5353
--%>
5454
<%@ include file="/WEB-INF/includes/taglibs.jsp" %>
5555

@@ -206,9 +206,9 @@
206206
<label>Assign Member(s):</label>
207207
<input name="preRegisterUsers" type="text" class="text"/>
208208
</div>
209-
<div class="row">
209+
<div class="ms-row">
210210
<label>Group(s):</label>
211-
<div id="groupDiv">
211+
<div class="groupDiv">
212212
<div id="groups"></div>
213213
</div>
214214
</div>
@@ -267,7 +267,7 @@
267267
pattern="z" timeZone="${defaultTimeZone}"/></span>
268268
</div>
269269

270-
270+
271271
<div id="subEndDateDiv" class="row software designF2F">
272272
<label>Submission End:</label>
273273
<input id="subEndDate" name="subEndDate" type="text" class="text date-pick" readonly="true"/>

‎src/web/WEB-INF/includes/launch/orderReviewSoftware.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</tr>
9898
</table>
9999

100-
<tablec lass="total">
100+
<table lass="total">
101101
<tr>
102102
<p class="note">
103103
Note: Challenge prizes, costs, and fees in this section are estimates. <br>

‎src/web/WEB-INF/includes/launch/overviewSoftware.jsp‎

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -67,49 +67,15 @@
6767

6868
<div class="prizes" id="swPlatformDiv">
6969
<h3>Choose Your Platform:</h3>
70-
71-
<div class="prizesInner_tech">
72-
<span class="head_font">Master Platforms&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
73-
<span class="head_font_space">Your Project Platforms</span>
74-
<br />
75-
<select multiple id="masterPlatformsSelect">
76-
<s:iterator value="referenceDataBean.platforms">
77-
<option value='<s:property value="id" />'><s:property value="name" /></option>
78-
</s:iterator>
79-
</select>
80-
81-
<div id="button_platform">
82-
<img src="/images/add_tech.png" alt="add" id="addPlatforms" />
83-
<br /><br />
84-
<img src="/images/remove_tech.png" alt="remove" id="removePlatforms" />
85-
</div>
86-
87-
<select multiple id="masterPlatformsChoosenSelect">
88-
</select>
70+
<div class="techPlatformDiv">
71+
<div id="platforms"></div>
8972
</div>
9073
</div>
9174

9275
<div class="prizes" id="swTechnologyDiv">
93-
<h3>Choose Your Technology:</h3>
94-
95-
<div class="prizesInner_tech">
96-
<span class="head_font">Master Technologies</span>
97-
<span class="head_font_space">Your Project Technologies</span>
98-
<br />
99-
<select multiple id="masterTechnologiesSelect">
100-
<s:iterator value="referenceDataBean.technologies">
101-
<option value='<s:property value="id" />'><s:property value="name" /></option>
102-
</s:iterator>
103-
</select>
104-
105-
<div id="button_tech">
106-
<img src="/images/add_tech.png" alt="add" id="addTechnologies" />
107-
<br /><br />
108-
<img src="/images/remove_tech.png" alt="remove" id="removeTechnologies" />
109-
</div>
110-
111-
<select multiple id="masterTechnologiesChoosenSelect">
112-
</select>
76+
<h3>Choose Your Technology:</h3>
77+
<div class="techPlatformDiv">
78+
<div id="technologies"></div>
11379
</div>
11480
</div>
11581

‎src/web/WEB-INF/includes/launch/reviewSoftware.jsp‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</tr>
6464
<tr class="rGroups">
6565
<th>Group(s) :</th>
66-
<td><a href="javascript:backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
66+
<td><a href="javascript:backOverview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a></td>
6767
</tr>
6868
</table>
6969
</div>
@@ -77,6 +77,12 @@
7777

7878
<dt>Submission Guidelines :</dt>
7979
<dd><span id="rswSoftwareGuidelines"></span><a href="javascript: showPage('overviewSoftwarePage');" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
80+
81+
<dt>Platforms :</dt>
82+
<dd id="rPlatforms"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
83+
84+
<dt>Technologies :</dt>
85+
<dd id="rTechnologies"><a href="javascript: backReview();" class="tipLink"><img src="/images/edit-icon.png" alt="Edit"/></a> </dd>
8086
</dl>
8187
</div>
8288
<!-- end .contentList -->

‎src/web/css/direct/launchcontest.css‎

Lines changed: 40 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,6 @@ span.starNotice {
505505
.selectMonth {
506506
width: 65px;
507507
float: left;
508-
padding-left;
509508
}
510509

511510
.selectYear {
@@ -3183,39 +3182,43 @@ div#winnerDiv {
31833182
padding: 10px;
31843183
}
31853184

3186-
.rGroups td span {
3185+
.rGroups td span, #rTechnologies span, #rPlatforms span {
31873186
border: #e7e7e7 solid 1px;
31883187
border-radius: 5px;
31893188
padding: 2px 5px 2px 5px;
31903189
margin-right: 5px;
31913190
}
3192-
#groupDiv{
3191+
3192+
#rTechnologies, #rPlatforms{
3193+
padding-top: 7px;
3194+
}
3195+
3196+
.groupDiv{
31933197
border: 1px solid #CCC;
3194-
border-radius: 5px;
3198+
border-radius: 4px;
31953199
margin-left: 132px;
31963200
width: 372px;
31973201
}
3198-
.ms-ctn-focus{
3199-
background-color: #ffffff;
3202+
3203+
.techPlatformDiv{
3204+
border: 1px solid #CCC;
3205+
border-radius: 5px;
3206+
width: 405px;
3207+
margin-top: 8px;
32003208
}
3201-
#groupDisplay #groupDiv{
3209+
3210+
#groupDisplay .groupDiv{
32023211
margin-left: 150px;
32033212
}
3213+
32043214
div#groupDisplay {
32053215
margin-top: 20px;
32063216
}
3207-
div#groupDisplay #groupDiv{
3217+
3218+
div#groupDisplay .groupDiv{
32083219
margin-top: 20px;
32093220
width: 293px;
32103221
}
3211-
#groupDiv .ms-res-ctn .ms-res-item{
3212-
font-size: 12px;
3213-
text-decoration: underline;
3214-
line-height: 20px;
3215-
}
3216-
#groupDiv .ms-res-ctn .ms-res-item-active {
3217-
background-color: #CCC;
3218-
}
32193222

32203223
.copilotFeeDiv {
32213224
height: 16px;
@@ -3243,4 +3246,25 @@ div#groupDisplay #groupDiv{
32433246
font-size: 11px;
32443247
border: 1px solid #e7e7e7;
32453248
border-radius: 4px;
3249+
}
3250+
3251+
.ms-row{
3252+
margin-top: 17px;
3253+
}
3254+
3255+
.dropdown-menu {
3256+
position: absolute;
3257+
top: 100%;
3258+
left: -1px;
3259+
z-index: 1000;
3260+
float: left;
3261+
min-width: 160px;
3262+
padding: 5px 0;
3263+
list-style: none;
3264+
font-size: 14px;
3265+
background-color: #fff;
3266+
border: 1px solid #ccc;
3267+
border: 1px solid rgba(0,0,0,.15);
3268+
background-clip: padding-box;
3269+
margin-top: -2px;
32463270
}

‎src/web/css/direct/magicsuggest.css‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,6 @@
3333
border-bottom-left-radius: 0;
3434
border-bottom-right-radius: 0;
3535
}
36-
.ms-ctn-focus{
37-
border-color: #66afe9;
38-
outline: 0;
39-
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
40-
box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
41-
}
4236
.ms-ctn input{
4337
border: 0;
4438
box-shadow: none;
@@ -124,11 +118,13 @@
124118
color: #333;
125119
}
126120
.ms-res-ctn .ms-res-item{
127-
line-height: 25px;
128121
text-align: left;
129122
padding: 2px 5px;
130123
color: #666;
131124
cursor: pointer;
125+
font-size: 12px;
126+
text-decoration: underline;
127+
line-height: 20px;
132128
}
133129
.ms-res-ctn .ms-res-item-grouped{
134130
padding-left: 15px;
@@ -137,7 +133,7 @@
137133
background: #FAFAFA;
138134
}
139135
.ms-res-ctn .ms-res-item-active{
140-
background-color: #F5F5F5;
136+
background-color: #CCC;
141137
}
142138
.ms-res-ctn .ms-res-item-disabled{
143139
color: #CCC;
@@ -260,7 +256,6 @@
260256
margin-left: -7px;
261257
}
262258
.ms-ctn .ms-trigger:hover {
263-
width:24px;
264-
right: 1px;
265-
border-radius: 0 3px 3px 0;
259+
width:25px;
260+
border-radius: 0 4px 4px 0;
266261
}

0 commit comments

Comments
 (0)