Navigation

Changeset 18322

Timestamp:

11/11/08 09:48:11 (2 months ago)

Author:

avinash

Message:

bug 445 and 460 and one other fix

Files:

r18132	r18322
106	106	{
107	107	var m_url = JSPRootURL + "/business/BusinessPortfolioDelete.jsp?selected="+ getSelection(theForm) +"&module=<%= Module.BUSINESS_SPACE %>"+"&action=<%= net.project.security.Action.VIEW %>&portfolio=true";
108		var link_win = openwin_linker(m_url);
	108	var redirect_url = JSPRootURL +"/business/Main.jsp?id="+ getSelectedValueLocal()+"&page="+ escape(m_url);
	109	var link_win = openwin_linker(redirect_url);
109	110	link_win.focus();
110	111	}
111	112	}
112	113
	114	function getSelectedValueLocal() {
	115	var field = theForm.elements["selected"];
	116	if(!field) {
	117	field = document.getElementById('channelIFrame').contentWindow.document.getElementById('iFrameForm').elements['selected'];
	118	var idval = field.value;
	119	for (var i = 0; i < field.length; i++) {
	120	if (field[i].checked == true) {
	121	idval = field[i].value;
	122	break;
	123	}
	124	}
	125	return idval;
	126	} else {
	127	return getSelection(theForm);
	128	}
	129	}
	130
113	131	function help()
114	132	{

r18306	r18322
320	320	<div id="toolbox-item" class="toolbox-item">
321	321	<span>
322		<a href="<%= SessionManager.getJSPRootURL() + "/form/CSVImport.jsp?module=" + net.project.base.Module.FORM + "&action=" + net.project.security.Action.VIEW + "&id=" + form.getID()%>'"><%= PropertyProvider.get("prm.global.form.list.import.label") %></a>
	322	<a href="<%= SessionManager.getJSPRootURL() + "/form/CSVImport.jsp?module=" + net.project.base.Module.FORM + "&action=" + net.project.security.Action.VIEW + "&id=" + form.getID()%>"><%= PropertyProvider.get("prm.global.form.list.import.label") %></a>
323	323	</span>
324	324	<br/>

r17326	r18322
21	21	Message: <xsl:value-of disable-output-escaping="yes" select="TeamMemberWizard/inviteeMessage"/><xsl:if test="TeamMemberWizard/inviteeMessage=''">(None)</xsl:if>
22	22
23		<xsl:choose>
24		<xsl:when test="TeamMemberWizard/IsAutoAcceptInvite='1'">
25		<!-- Automatic acceptance. Display appropriate message -->
26		There is no need to accept this invitation. This workspace will be listed on your Personal page the next time you login to Project.net. To visit the workspace, click on the link below:
	23	This workspace will be listed on your Personal page the next time you login to Project.net. To visit the workspace, click on the link below:
27	24	<xsl:value-of select="url:formatAppURL(spaceUrl)"/>
28		</xsl:when>
29		<xsl:otherwise>
30		<!-- User is required to accept. Display appropriate message -->
31		To accept this invitation, please login to the Project.net application and see the "New Items" list on your Personal Workspace Dashboard page.
32		</xsl:otherwise>
33		</xsl:choose>
	25
34	26
35	27	If you have questions about this workspace, please contact the sender of this email. If you have questions about Project.net, or have technical difficulties with this invitation please see <xsl:value-of select="url:formatAppURL('/help/HelpDesk.jsp')"/>.

r18316	r18322
213	213	menuString += " <div class='menu-one-selected-resources'> ";
214	214	<%}%>
215		menuString += " <a href='<%=SessionManager.getJSPRootURL()%>/personal/Main.jsp?module=~~&<%=Module.PERSONAL_SPACE%>~~page=<%=SessionManager.getJSPRootURL()%>/resource/management/viewsummary?module=<%=Module.RESOURCES_SPACE%>' class='menu-projects'><%=PropertyProvider.get("prm.application.nav.space.resource")%></a> ";
	215	menuString += " <a href='<%=SessionManager.getJSPRootURL()%>/personal/Main.jsp?module=<%=Module.PERSONAL_SPACE%>&page=<%=SessionManager.getJSPRootURL()%>/resource/management/viewsummary?module=<%=Module.RESOURCES_SPACE%>' class='menu-projects'><%=PropertyProvider.get("prm.application.nav.space.resource")%></a> ";
216	216	<% if (isResourceMenuSelected ) { %>
217	217	menuString += " </div> ";