Changeset 20464
- Timestamp:
- 02/24/10 08:44:03 (5 months ago)
- Files:
-
- trunk/core/web/css/global.css (modified) (1 diff)
- trunk/core/web/jsp/notification/CreateSubscription2.jsp (modified) (5 diffs)
- trunk/core/web/src/notifyPopup.js (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/core/web/css/global.css
r20311 r20464 255 255 font-size: 12px; 256 256 text-decoration: none; 257 vertical-align: middle; 257 258 } 258 259 trunk/core/web/jsp/notification/CreateSubscription2.jsp
r20445 r20464 29 29 net.project.util.StringUtils, 30 30 net.project.space.Space, 31 net.project.space.SpaceFactory"%> 31 net.project.space.SpaceFactory, 32 net.project.space.ISpaceTypes"%> 32 33 <%@ include file="/base/taglibInclude.jsp"%> 33 34 … … 112 113 <title><display:get name="prm.global.application.title" /></title> 113 114 <template:getSpaceCSS/> 114 <%if(StringUtils.isNotEmpty(moduleType) ){%>115 <%if(StringUtils.isNotEmpty(moduleType) && "project".equals(moduleType)){%> 115 116 <template:getSpaceCSS space="project"/> 116 117 <%} %> … … 129 130 deliverToRequiredErrorMessage = '<%=PropertyProvider.get("prm.notification.createsubscription2.delivertorequired.message")%>'; 130 131 savingMessage = '<%=PropertyProvider.get("prm.global.saving.message")%>'; 132 isPersonalSpace = '<%=user.getCurrentSpace().getType().equals(ISpaceTypes.PERSONAL_SPACE) %>'; 131 133 132 134 function setup() { … … 359 361 <%-- Get the notification types for the object type; calling 360 362 this method sets the notification type count --%> 361 <div style="overflow: auto; height: 70px;">363 <div id ="notifyEventsDiv"> 362 364 <table width="100%" cellpadding="0" cellspacing="0"> 363 365 <%=domainListBean.getNotificationTypesCheckList(objectType, isCreateType, moduleType)%> … … 448 450 <% if (isUserSpaceAdministrator) { %> 449 451 <%-- Space Admins can send to any group --%> 450 < % if (StringUtils.isEmpty(checkPopup)) { %>451 <tr>452 <td class="notifyFieldRequired" valign="top" colspan="2"><%=PropertyProvider.get("prm.notification.createsubscription2.deliverto.label")%></td>453 </tr>454 <% }%>455 <tr><td></td>452 <tr id="delivertoTR"> 453 <td class="notifyFieldRequired" valign="middle"> 454 <% if (StringUtils.isEmpty(checkPopup)) { %> 455 <%=PropertyProvider.get("prm.notification.createsubscription2.deliverto.label")%> 456 <% }%> 457 </td> 456 458 <td> 457 <div style="overflow: auto; height: 70px;">459 <div id="spaceParticipantDiv"> 458 460 <table width="100%" cellpadding="0" cellspacing="0"><%=spaceParticipantGroupCheckBoxList%></table> 459 461 </div> trunk/core/web/src/notifyPopup.js
r20418 r20464 7 7 uploadDialogue.style.display = 'none'; 8 8 var uploadBody = document.createElement('div'); 9 var notifyEventsDiv; 10 var spaceParticipantDiv; 11 var isPersonalSpace; 9 12 uploadBody.id = 'uploadBody'; 10 13 … … 105 108 } 106 109 document.getElementById("name").focus(); 110 setCheckBoxListDivHeight(document.getElementById('notifyEventsDiv'), 'input', 4, 'auto'); 111 if(!checkIsPersonalSpace(isPersonalSpace)){ 112 setCheckBoxListDivHeight(document.getElementById('spaceParticipantDiv'), 'input', 4, 'auto'); 113 } 107 114 }, 108 115 failure: function(result, response){ … … 219 226 } 220 227 } 228 229 // Method to set size of div containing single or multiple check boxes 230 function setCheckBoxListDivHeight(DivObject ,type , noOfCheckBox , overFlowStyle){ 231 if(DivObject && DivObject.getElementsByTagName(type).length > noOfCheckBox){ 232 DivObject.style.overflow = overFlowStyle; 233 DivObject.style.height = (noOfCheckBox * 22) + 'px'; 234 } 235 } 236 237 function checkIsPersonalSpace(isPersonalSpace){ 238 if(isPersonalSpace && document.getElementById('spaceParticipantDiv') && (isPersonalSpace == 'true') && (document.getElementById('spaceParticipantDiv').getElementsByTagName('input').length == 1) ){ 239 document.getElementById('spaceParticipantDiv').getElementsByTagName('input')[0].checked = 'checked'; 240 document.getElementById('delivertoTR').style.display = 'none'; 241 return true; 242 } 243 return false; 244 }
