Changeset 20534

Timestamp:

03/05/10 09:09:08 (5 months ago)

Author:

umesha

Message:

changed breadcrumbs on Notification related pages
changed multi-line message and description for notify pop up

Files:

• trunk/core/web/jsp/notification/CreateSubscription2.jsp (modified) (1 diff)
• trunk/core/web/jsp/notification/EditSubscription.jsp (modified) (1 diff)
• trunk/core/web/jsp/notification/ManageSubscriptions.jsp (modified) (1 diff)
• trunk/core/web/jsp/notification/ViewSubscriptionProperties.jsp (modified) (1 diff)
• trunk/core/web/src/notifyPopup.js (modified) (3 diffs)

trunk/core/web/jsp/notification/CreateSubscription2.jsp

@@ -276 +276 @@
-        <tb:setAttribute name="leftTitle">
-                <history:history>
-modul
-project.setup.notifications.link
+pag
+notification.createsubscription2.channel.create.title
-                                jspPage='<%=SessionManager.getJSPRootURL() + "/notification/ManageSubscriptions.jsp"%>'
- "spaceID="+spaceID%>' />
-<history:page
-       display='<%= PropertyProvider.get("prm.notification.createtypesubscription1.module.history") %>' 
+"?spaceID="+spaceID%>' 
+       level = "1"
+
-                </history:history>
-        </tb:setAttribute>

trunk/core/web/jsp/notification/EditSubscription.jsp

@@ -166 +166 @@
-        <tb:setAttribute name="leftTitle">
-                <history:history>
-project.setup.notifications.link
+notification.editsubscription.channel.edit.title
-                          jspPage='<%=SessionManager.getJSPRootURL() + "/notification/EditSubscription.jsp"%>'
-                          queryString='<%="?subscriptionID="+id%>'
+                          level = "1"
-             />
-          <history:page display='<%=PropertyProvider.get("prm.notification.editsubscription.module.history")%>' />
-        </history:history>
-        </tb:setAttribute>

trunk/core/web/jsp/notification/ManageSubscriptions.jsp

@@ -178 +178 @@
-        <tb:setAttribute name="leftTitle">
-                <history:history>
-modul
+pag
-                                                  jspPage='<%=SessionManager.getJSPRootURL() + "/notification/ManageSubscriptions.jsp?spaceID="+spaceID%>'
-                        />

trunk/core/web/jsp/notification/ViewSubscriptionProperties.jsp

@@ -97 +97 @@
-        <tb:setAttribute name="leftTitle">
-                <history:history>
-module display='<%=PropertyProvider.get("prm.project.setup.notifications.link
+page display='<%=PropertyProvider.get("prm.notification.viewsubscription.channel.details.title
-                                                  jspPage='<%=SessionManager.getJSPRootURL() + "/notification/ManageSubscriptions.jsp"%>'
-                                                  queryString='<%= "spaceID="+spaceID%>'
+                                                  level = "1"
-                        /> 
-                        <history:page display='<%= PropertyProvider.get("prm.notification.viewsubscription.module.history") %>' />
-                </history:history>
-        </tb:setAttribute>

trunk/core/web/src/notifyPopup.js

@@ -134 +134 @@
-// Method to save notification
-function saveNotification(){
-
+
+
-        var notificationType = document.getElementsByName('notificationType');
+        var deliveryTypeID = document.getElementById('deliveryTypeID').value;
+        var deliveryInterval = document.getElementById("deliveryInterval").value; 
-        var notificationTypeValue = "";
-        var teamMembersValue = "";
@@ -141 +144 @@
-        var deliverCount = 0;
-        var otherEmail = "";
+        var customMessage = trim(document.getElementById('customMessage').value);
+        var description = trim(document.getElementById("description").value);
+        
+        // to replace \n with \\n new line character for customMessage and description
+        customMessage = customMessage.replace(new RegExp("\\n", "g" ),'\\n');
+        description = description.replace(new RegExp("\\n", "g" ),'\\n');
+        
-        if(document.getElementById("otherEmail")){
-                otherEmail = document.getElementById("otherEmail").value;
@@ -184 +194 @@
-        notificationTypeValue = notificationTypeValue.substring(0, notificationTypeValue.length-1);
-        
-getSelectedValue(document.getElementsByName("status"))
-trim(document.getElementById("name").value)
-trim(document.getElementById("description").value)
-document.getElementById('deliveryTypeID').value
-document.getElementById("deliveryInterval").value
+ status
+ name
+ description
+ deliveryTypeID
+ deliveryInterval
-                                                +'","otherEmail" : "'+ otherEmail
-                                                +'","notificationType" : "'+notificationTypeValue  
-trim(document.getElementById('customMessage').value)
+ customMessage
-                                                +'","teamMembers" : "'+teamMembersValue + '"}'; 
-