Author: jonathan Date: Mon Jun 2 16:15:32 2008 New Revision: 17800 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17800
Log: Mashup items layout improvements. Added help icons where most needed. Modified: trunk/mashup/java/modules/www/js/utils.js trunk/mashup/java/modules/www/mashup.jsp trunk/mashup/java/modules/www/taskbar.jsp Modified: trunk/mashup/java/modules/www/js/utils.js URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/utils.js?rev=17800&r1=17799&r2=17800&view=diff ============================================================================== --- trunk/mashup/java/modules/www/js/utils.js (original) +++ trunk/mashup/java/modules/www/js/utils.js Mon Jun 2 16:15:32 2008 @@ -20,8 +20,8 @@ //Make sure the XMLHttpRequest object was instantiated if (xmlHttpRequest4ui) { - //Check for index.html - xmlHttpRequest4ui.open("GET", serviceLocation + "/index.html", true); + //Check for requested web-accesible artifact (e.g. index.html, gadget.xml) + xmlHttpRequest4ui.open("GET", serviceLocation, true); xmlHttpRequest4ui.onreadystatechange = function () { if (xmlHttpRequest4ui.readyState == 4) { @@ -33,7 +33,7 @@ } } else { //Check for index.htm - xmlHttpRequest4ui.open("GET", serviceLocation + "/index.htm", true); + xmlHttpRequest4ui.open("GET", serviceLocation, true); xmlHttpRequest4ui.onreadystatechange = function () { if (xmlHttpRequest4ui.readyState == 4) { Modified: trunk/mashup/java/modules/www/mashup.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/mashup.jsp?rev=17800&r1=17799&r2=17800&view=diff ============================================================================== --- trunk/mashup/java/modules/www/mashup.jsp (original) +++ trunk/mashup/java/modules/www/mashup.jsp Mon Jun 2 16:15:32 2008 @@ -451,7 +451,7 @@ <input type="hidden" value="<%=currentUser%>" id="addtag_tagger"/> <input type="text" size="30" value="" id="addtag_tag" onkeydown="checkEnter(event)"/> <input type="submit" id="addtag_submit" value="Tag" onClick="addTag()"/> - <span class="hint">(separate tags with commas)</span> + <a class="help" title="Separate tags with commas to enter more than one at a time. Unless you are an administrator or the author of this mashup, you will only be able to delete the tags you've added."><img src="images/blank.gif"/></a> </div> </div> <% } %> @@ -466,38 +466,53 @@ <td> <div class="mashup_details"> <ul> - <li id="custom_ui_link">A HTML interface is not available for this service.</li> + <li id="custom_ui_link">A custom HTML interface has not been provided for this service.</li> <!--Checking whether a custom UI is available for this Mashup--> <script type="text/javascript"> function customUiCallback() { document.getElementById("custom_ui_link").innerHTML = - 'View the <a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>/" target="_blank">HTML Interface</a> to the service.' + 'View the custom <a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>/" target="_blank">HTML Interface</a> to this service.'; } - isCustomUiAvailable('<%=mashupServerURL%><%=author%>/<%= mashup %>', customUiCallback); + isCustomUiAvailable('<%=mashupServerURL%><%=author%>/<%= mashup %>/index.html', customUiCallback); </script> - <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?tryit" title="?tryit" - target="_blank">Try</a> the - service. - </li> - <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?gadget" title="?gadget" - target="_blank">Try</a> the - service as a Google Gadget. + <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?tryit" + target="_blank">Try-it</a> page for this service. + </li> + + <li id="custom_gadget_link" style="display:none"></li> + + <!--Checking whether a custom Google Gadget is available for this Mashup--> + <script type="text/javascript"> + function customGadgetCallback() { + document.getElementById("custom_gadget_link").innerHTML = + 'View the custom <a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>/gadget.xml" target="_blank">Google Gadget</a> for this service.' + + ' <a class="help" title="Copy this link into a Google Gadget container such as iGoogle.com."><img src="images/blank.gif"/></a>'; + document.getElementById("custom_gadget_link").style.display = "list-item"; + } + + isCustomUiAvailable('<%=mashupServerURL%><%=author%>/<%= mashup %>/gadget.xml', customGadgetCallback); + </script> + + <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?gadget" + target="_blank">Try-it</a> Google Gadget for this services. + <a class="help" title="Copy this link into a Google Gadget container such as iGoogle.com."><img src="images/blank.gif"/></a> </li> <li>Read <a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?doc" title="?doc" - target="_blank">API - documentation</a>. + target="_blank">API documentation</a> for this service. </li> <li>View the <a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?source&content-type=text/plain" title="?source" target="_blank">source code</a>.</li> <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?template&flavor=html">Source code template</a> - for an HTML interface for this service. + for building an HTML interface for this service. + <a class="help" title="Get started on a custom interface to this service with this HTML template."><img src="images/blank.gif"/></a> </li> <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?template&flavor=googlegadget">Source code template</a> - for a Google Gadget for this service. + for building a Google Gadget for this service. + <a class="help" title="Get started on a Google Gadget interface to this service with this template."><img src="images/blank.gif"/></a> </li> </ul> @@ -524,13 +539,16 @@ href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?xsd">raw</a>) </li> <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?stub&content-type=text/plain">Javascript - (DOM) stub</a> - optimum for a cross-browser web page + (DOM) stub</a> + <a class="help" title="This stub exposes XML elements as DOM objects, and is optimum for use in a cross-browser Web page."><img src="images/blank.gif"/></a> </li> <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?stub&lang=e4x&content-type=text/plain">Javascript - (E4X) stub</a> - optimum for a Firefox web page or Mashup with a fixed IP address + (E4X) stub</a> + <a class="help" title="This stub exposes XML elements as E4X XML objects, and is optimum for a Web page for use in Firefox, or for importing into a Mashup with a fixed IP address."><img src="images/blank.gif"/></a> </li> <li><a href="<%=httpUrl%><%=mashupServerURL%><%=author%>/<%= mashup %>?stub&lang=e4x&localhost=true&content-type=text/plain">Javascript - (E4X) stub using "localhost" endpoints</a> - optimum for a Mashup hosted on this server + (E4X) stub using "localhost" endpoints</a> + <a class="help" title="This stub exposes XML elements as E4X XML objects, and is optimum for importing into a Mashup hosted on this Mashup Server."><img src="images/blank.gif"/></a> </li> </ul> </div> Modified: trunk/mashup/java/modules/www/taskbar.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/taskbar.jsp?rev=17800&r1=17799&r2=17800&view=diff ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Mon Jun 2 16:15:32 2008 @@ -200,6 +200,7 @@ <li> <a href="stub_gen.jsp" target="_blank">Use the Java Script Stub Generator</a> + <a class="help" title="Generate a stub from an existing WSDL document."><img src="images/blank.gif"/></a> </li> <li> @@ -270,7 +271,7 @@ <a class="help" title="Your account has Administrator priveleges, but you are currently acting in the role of a normal user. Change to the role of an Administrator by selecting 'Act as an Administrator'."><img src="images/blank.gif" /></a> <% } else { %> <a href="admin_act_user.jsp?enable=true&bounceback=<%=thisPage%>">Act as a User</a> - <a class="help" title="Your account has Administrator priveleges, which has great power but consequently demands great responsibility. You can act safely in the role of a normal User by selecting 'Act as a User'."><img src="images/blank.gif"/></a> + <a class="help" title="Your account has Administrator priveleges, which has great power but also allows you to accidentally modify or delete someone else's work. You can perform day-to-day activities safely in the role of a normal User by selecting 'Act as a User'."><img src="images/blank.gif"/></a> <% } %> </li> <% if (RegistryUtils.isAdminRole(userRegistry)) { %> @@ -286,6 +287,7 @@ <% } else { %> <a href="allow_guests.jsp?enable=true">Allow Internet Guests</a> <% } %> + <a class="help" title="Allow or disallow users from self-registering for an account on this Mashup Server."><img src="images/blank.gif" /></a> </li> <li> <a href="log_reader.jsp">View Server Log</a> _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
