Author: jonathan Date: Wed Aug 6 17:57:09 2008 New Revision: 20500 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20500
Log: MASHUP-507: Reorganized taskbar. Modified: trunk/mashup/java/modules/www/taskbar.jsp Modified: trunk/mashup/java/modules/www/taskbar.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=20500&r1=20499&r2=20500&view=diff ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Wed Aug 6 17:57:09 2008 @@ -97,7 +97,7 @@ var response = returnElement.firstChild.nodeValue; if (response == "true") { - alert("Successfully redeployed the service"); + alert("Initiating redeployment of the service"); } else { alert("Redeployment failed."); } @@ -112,10 +112,6 @@ } </script> <script language="javascript" src="js/utils.js" type="text/javascript"></script> -<li id="redeploy-service"> - <a href="#" - onclick="redeployService();">Redeploy this service</a> -</li> <li id="edit-service"> <% @@ -134,11 +130,6 @@ </li> -<li id="delete-service"> - <a href="#" - onclick="deleteService();">Delete this mashup</a> -</li> - <script type="text/javascript"> //Getting the Current status of the service function handleServiceStartStopCallback() { @@ -147,7 +138,7 @@ if (serviceState) { document.getElementById("service-status").innerHTML = - "Service started. [<a href='#' onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\", false, handleServiceStartStopCallback)'>Stop</a>]"; + "Service started. [<a href='#' onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\", false, handleServiceStartStopCallback)'>Stop</a> | <a href='#' onclick='redeployService();'>Restart</a>]"; //Enabling service sharing document.getElementById("share-mashup").innerHTML = ' <a href="#" onclick="WSO2.MashupUtils.showMashupSharingDialog(\'<%=paramMashupServiceName%>\', \'<%=currentUser%>\');">Share this mashup</a>'; @@ -174,7 +165,7 @@ if (serviceMashupObject.getServiceStatus() == "true") { document.getElementById("service-status").innerHTML = - "Service started. [<a href='#' onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\", false, handleServiceStartStopCallback)'>Stop</a>]"; + "Service started. [<a href='#' onclick='WSO2.MashupUtils.handleServiceStartStop(\"<%=paramMashupServiceName%>\", false, handleServiceStartStopCallback)'>Stop</a> | <a href='#'' onclick='redeployService();''>Restart</a>]"; //Enabling service sharing document.getElementById("share-mashup").innerHTML = ' <a href="#" onclick="WSO2.MashupUtils.showMashupSharingDialog(\'<%=paramMashupServiceName%>\', \'<%=currentUser%>\');">Share this mashup</a>'; @@ -197,6 +188,18 @@ } %> +<%if((paramPath != null)&&(paramMashupServiceName != null)){ +%> + <li> + <a href="<%=mashupServerURL%><%=author%>/<%=paramMashup%>?download">Download this mashup</a> +</li> +<% +}%> + +<li id="delete-service"> + <a href="#" + onclick="deleteService();">Delete this mashup</a> +</li> <li> <a href="#" onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=currentUser%>');">Create a @@ -224,7 +227,7 @@ </li> <li> - <a href="stub_gen.jsp" target="_blank">Use the Java Script Stub Generator</a> + <a href="stub_gen.jsp" target="_blank">Use the Javascript Stub Generator</a> <a class="help" title="Generate a stub from an existing WSDL document."><img src="images/blank.gif"/></a> </li> @@ -260,13 +263,6 @@ <li><a href="signin.jsp?bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>">Sign in</a> to create/manage mashups</li> <%}%> - <%if((paramPath != null)&&(paramMashupServiceName != null)){ - %> - <li> - <a href="<%=mashupServerURL%><%=author%>/<%=paramMashup%>?download">Download this mashup</a> - </li> - <% -}%> </ul> _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
