Author: jonathan Date: Thu Aug 7 10:44:39 2008 New Revision: 20554 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20554
Log: MASHUP-507: Hid delete when not allowed. Moved dashboard down and renamed to "View my Dashboard". Added some more help tips where I thought they would be valuable. Restricted managing certs to Profile page. Regularized case and clarified task names. 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=20554&r1=20553&r2=20554&view=diff ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Thu Aug 7 10:44:39 2008 @@ -97,7 +97,7 @@ var response = returnElement.firstChild.nodeValue; if (response == "true") { - alert("Initiating redeployment of the service"); + alert("Now redeploying the service"); } else { alert("Redeployment failed."); } @@ -119,11 +119,11 @@ if(mediaType.equals(MashupConstants.MASHUP_MEDIA_TYPE)){ %> - <a href="editor.jsp?action=edit&mashup=<%=paramMashup%>&author=<%=author%>&bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>">Edit this mashup</a> + <a href="editor.jsp?action=edit&mashup=<%=paramMashup%>&author=<%=author%>&bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>">Edit this Mashup</a> <% }else if (mediaType.equals(MashupConstants.DATA_SERVICE_MEDIA_TYPE)){ %> - <a href="edit_ds.jsp?serviceName=<%=author + "-" + paramMashup%>&bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>">Edit this mashup (Data Service)</a> + <a href="edit_ds.jsp?serviceName=<%=author + "-" + paramMashup%>&bounceback=<%=URLEncoder.encode(thisPage, "UTF-8")%>">Edit this Data Service</a> <% } %> @@ -141,7 +141,7 @@ "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>'; + ' <a href="#" onclick="WSO2.MashupUtils.showMashupSharingDialog(\'<%=paramMashupServiceName%>\', \'<%=currentUser%>\');">Share this Mashup</a>'; } else { document.getElementById("service-status").innerHTML = @@ -168,7 +168,7 @@ "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>'; + ' <a href="#" onclick="WSO2.MashupUtils.showMashupSharingDialog(\'<%=paramMashupServiceName%>\', \'<%=currentUser%>\');">Share this Mashup</a>'; } else { document.getElementById("service-status").innerHTML = @@ -184,46 +184,28 @@ <li id="share-mashup"> Mashup sharing is not available </li> -<% - } -%> - -<%if((paramPath != null)&&(paramMashupServiceName != null)){ -%> - <li> - <a href="<%=mashupServerURL%><%=author%>/<%=paramMashup%>?download">Download this mashup</a> +<li> + <a href="<%=mashupServerURL%><%=author%>/<%=paramMashup%>?download">Download this Mashup</a> </li> -<% -}%> <li id="delete-service"> <a href="#" - onclick="deleteService();">Delete this mashup</a> + onclick="deleteService();">Delete this Mashup</a> </li> +<% } %> <li> <a href="#" onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=currentUser%>');">Create a - new mashup</a> + new Mashup</a> </li> <li> <a href="create_ds.jsp">Create a new Data Service</a> + <a class="help" title="Map a data source into a Web Service without writing code!"><img src="images/blank.gif"/></a> </li> -<li id="dashlink" style="display:none;"> - <a href="../dashboard/index.jsp" target="_blank">Manage my Dashboard</a> -</li> - -<script type="text/javascript"> - function isDashboardAvailableCallback(){ - document.getElementById("dashlink").style.display = ''; - } - - isDashboardAvailable(isDashboardAvailableCallback); -</script> - <li> - <a href="scraper.jsp">Use the scraping assistant</a> + <a href="scraper.jsp">Use the Scraping Assistant</a> </li> <li> @@ -231,16 +213,18 @@ <a class="help" title="Generate a stub from an existing WSDL document."><img src="images/blank.gif"/></a> </li> -<li> - <a href="cert_manager.jsp" target="_blank">Manage my trusted certificates</a> -</li> - <% String linkedName = request.getParameter("name"); if (RegistryUtils.getCurrentUser(userRegistry).equals(linkedName)) { %> <li> + <a href="cert_manager.jsp" target="_blank">Manage Keys and Certificates</a> + <a class="help" title="Enable secure scenarios and mashup sharing by managing your keystores and trusted certificates."><img src="images/blank.gif"/></a> +</li> + +<li> <a href="infocard.jsp">Register your Infocard</a> </li> + <li> <a href="#" onclick="showHideCommon('openIdPrompt')">Register your OpenID</a> </li> @@ -258,6 +242,20 @@ </li> --> +<li id="dashlink" style="display:none;"> + <a href="../dashboard/index.jsp" target="_blank">View my Dashboard</a> + <a class="help" title="Show your mashups as Google Gadgets."><img src="images/blank.gif"/></a> + + <script type="text/javascript"> + function isDashboardAvailableCallback(){ + document.getElementById("dashlink").style.display = ''; + } + + isDashboardAvailable(isDashboardAvailableCallback); + </script> + +</li> + <%} else {%> @@ -331,7 +329,7 @@ <a href="http://blog.mooshup.com/";>Mashup Server blog</a> </li> <li> - <a href="docs/index.html">User guide</a> + <a href="docs/index.html">User Guide</a> and <a href="http://www.wso2.org/wiki/display/mashup/WSO2+Mashup+Server+Reference";>Documentation</a> </li> <li> @@ -342,7 +340,7 @@ or <a href="http://wso2.com/training/courses";>Training</a> </li> <li> - <a href="https://wso2.org/jira/browse/MASHUP";>File a bug</a> + <a href="https://wso2.org/jira/browse/MASHUP";>File a Bug</a> </li> </ul> </div> _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
