Author: jonathan
Date: Wed Dec 5 17:49:05 2007
New Revision: 10569
Log:
Added taskbar to main pages.
Added:
trunk/mashup/java/modules/www/org/taskbar.jsp
- copied, changed from r10559,
trunk/mashup/java/modules/www/org/header.jsp
Modified:
trunk/mashup/java/modules/www/org/index.jsp
trunk/mashup/java/modules/www/org/mashup.jsp
trunk/mashup/java/modules/www/org/user.jsp
Modified: trunk/mashup/java/modules/www/org/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/org/index.jsp (original)
+++ trunk/mashup/java/modules/www/org/index.jsp Wed Dec 5 17:49:05 2007
@@ -363,54 +363,10 @@
</td>
-<td width="250" valign="top"><img src="images/blank.gif" width="10"
height="29"/>
-
-
- <table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
- <tr>
- <th>My feeds</th>
-
- </tr>
- <tr>
- <td>
- <ul>
- <li>
- <a href="#">Download the WSO2 Mashup Server</a>
- </li>
- <li>
- <a href="#">WSO2 Oxygen Tank</a>
- </li>
- </ul>
- <table width="100%" border="0" cellpadding="2" cellspacing="0"
class="listing">
- <tr>
- <td class="headers">Name</td>
- </tr>
- <tr>
- <td><a href="#" title="link to comments page">Comments
on my services</a>
- </td>
-
- </tr>
- <tr>
- <td><a href="#" title="link to latest services
page">Latest services</a>
- </td>
- </tr>
- <tr>
- <td><a href="%5Btbd%5D" title="link to a custom feed
page">Sudoku of the
- day</a></td>
- </tr>
- </table>
- </td>
-
- </tr>
- </table>
-
+<td width="250" valign="top">
+ <%@ include file="taskbar.jsp" %>
</td>
</tr>
-<tr>
- <td colspan="2">
-
- </td>
-</tr>
</table>
</div>
Modified: trunk/mashup/java/modules/www/org/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/org/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/org/mashup.jsp Wed Dec 5 17:49:05 2007
@@ -273,16 +273,8 @@
</script>
<li><a href="/services/<%= mashup %>?tryit"
title="?tryit">Try</a> the service</li>
- <li>Read <a href="/services/<%= mashup %>?doc"
title="?doc">API documentation</a>
- </li>
-
- <!--
- <li class="tbd">View the <a href="[tbd]" title="link to
version history">version history</a> of this service</li>
- <li class="tbd">Change <a href="[tbd]" title="(author
only)">access</a> to this service (currently public)</li>
- <li class="tbd"><a href="[tbd]" title="?edit (author
only)">Edit</a> the service</li>
- <li class="tbd"><a href="[tbd]" title="(author
only)">Configure bindings</a> for this service</li>
- <li class="tbd"><a href="[tbd]" title="clone (users
only)">Clone</a> this service to my workbench</li>
- -->
+ <li>Read <a href="/services/<%= mashup %>?doc"
title="?doc">API documentation</a></li>
+ <li>View the <a href="/services/<%= mashup
%>?source&content-type=text/plain" title="?source">source code</a></li>
</ul>
</div>
@@ -428,8 +420,41 @@
</td>
+<td width="250" valign="top">
+ <table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Tasks</th>
+ </tr>
+ <tr>
+ <td>
+ <ul>
+ <li>
+ <a href="#">Start|Stop this service** ***</a>
+ </li>
+ <li>
+ <a href="#">Edit this service** ***</a>
+ </li>
+ <li>
+ <a href="#">Create a new service*</a>
+ </li>
+ <li>
+ <a href="#">Share this service *</a>
+ </li>
+ <li>
+ <a href="#">Delete this service ** ***</a>
+ </li>
+ </ul>
+ <div>* only when logged in.</div>
+ <div>** only when logged in as an admin.</div>
+ <div>*** only viewing your own page.</div>
+ </td>
+ </tr>
+ </table>
+ <%@ include file="taskbar.jsp" %>
+</td>
</tr>
</table>
+
</div>
<%@ include file="footer.jsp" %>
</div>
Copied: trunk/mashup/java/modules/www/org/taskbar.jsp (from r10559,
trunk/mashup/java/modules/www/org/header.jsp)
==============================================================================
--- trunk/mashup/java/modules/www/org/header.jsp (original)
+++ trunk/mashup/java/modules/www/org/taskbar.jsp Wed Dec 5 17:49:05 2007
@@ -13,24 +13,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
--%>
-<%@ page import="java.net.URLEncoder" %>
-<div id="banner">
- <table width="100%" border="0" cellpadding="3" cellspacing="0">
- <tr>
- <td><img src="images/logo.gif"/></td>
- <td align="right" valign="bottom">
- <a href="index.jsp">Home</a>
-<% if (!thisPage.equals("signin.jsp")) {
- if (RegistryUtils.isLoggedIn(registry)) { %>
- | Signed in as <a
href="user.jsp?name=<%=RegistryUtils.getCurrentUser(registry)%>"><%=
RegistryUtils.getCurrentUserFullName(request) %></a>
- | <a
href="signout.jsp?bounceback=signin.jsp%3Fbounceback%3D<%=
URLEncoder.encode(thisPage,"UTF-8")%>">Change user</a>
- | <a
href="signout.jsp?bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign
out</a>
-<% } else { %>
- | <a
href="signin.jsp?bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">Sign
in</a>
- | <a href="register_self.jsp">Sign up</a>
-<% }
- } %>
- </td>
- </tr>
- </table>
-</div>
+<table width="100%" border="0" class="box" cellspacing="0" cellpadding="3">
+ <tr>
+ <th>Resources</th>
+ </tr>
+ <tr>
+ <td>
+ <ul>
+ <li>
+ <a href="../about.html">About the WSO2 Mashup Server</a>
+ </li>
+ <li>
+ <a href="#">Mashup Server blog</a>
+ </li>
+ <li>
+ <a href="http://www.wso2.org/forum/226";>Mashup Server
Forum</a>
+ </li>
+ <li>
+ <a
href="http://wso2.org/project/mashup/0.2/docs/index.html";>User guide</a>
+ </li>
+ <li>
+ <a
href="http://www.wso2.org/wiki/display/mashup/WSO2+Mashup+Server+Reference";>Reference</a>
+ </li>
+ <li>
+ <a href="https://wso2.org/jira/browse/MASHUP";>File a
bug</a>
+ </li>
+ <li>
+ <a href="http://mashups.wso2.org/";>Run your mashups online
at mashups.wso2.org</a>
+ </li>
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <img src="../images/rmashup_download.gif" alt="Download WSO2
Mashup Server"/>
+ <div style="text-align:center">Download the latest version.</div>
+ </td>
+ </tr>
+</table>
\ No newline at end of file
Modified: trunk/mashup/java/modules/www/org/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/org/user.jsp (original)
+++ trunk/mashup/java/modules/www/org/user.jsp Wed Dec 5 17:49:05 2007
@@ -214,35 +214,47 @@
</div>
</td>
</tr>
- <tr>
- <td class="profile_label">
- <nobr>info card:</nobr>
- </td>
- <td>
- <div class="profile_username">Register your <a
href="infocard.jsp">infocard</a>
- </div>
- </td>
- </tr>
</table>
</div>
</td>
- <td width="210" valign="top"><br/>
-
- <div class="link"><%=customizedAuthor%> Bookmarks</div>
- <div class="link">Comments <% if
(RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>I've made<% }
else { %>made
- by <%=memberFriendlyName%><% } %></div>
- <div class="link">Comments on <%=customizedAuthor%> Mashups</div>
- <!--
- <div class="link-cloud">
- <s:iterator value="tags">
- <a href="#" class="link-cloud<s:property
value="tagCount"/>"><s:property value="tagName" /></a>
- </s:iterator>
- </div>
- -->
+ <td width="250" valign="top" rowspan="2">
+ <table width="100%" border="0" class="box" cellspacing="0"
cellpadding="3">
+ <tr>
+ <th>Tasks</th>
+ </tr>
+ <tr>
+ <td>
+ <ul>
+ <li>
+ <a href="infocard.jsp">Register your
infocard***</a>
+ </li>
+ <li>
+ <a href="#">Add virtual directory**</a>
+ </li>
+ <li>
+ <a href="#">Add user**</a>
+ </li>
+ <li>
+ <a href="#">Allow internet guests**</a>
+ </li>
+ <li>
+ <a href="#">Delete user** ***</a>
+ </li>
+ <li>
+ <a href="#">Create a new service*</a>
+ </li>
+ </ul>
+ <div>* only when logged in.</div>
+ <div>** only when logged in as an admin.</div>
+ <div>*** only viewing your own page.</div>
+ </td>
+ </tr>
+ </table>
+ <%@ include file="taskbar.jsp" %>
</td>
</tr>
<tr>
- <td colspan="2">
+ <td>
<%
String queryTitle = customizedAuthor + " Mashups";
@@ -329,10 +341,11 @@
<% } %>
</tbody>
</table>
- <br/>
-</tr>
+ </tr>
</table>
-<%@ include file="footer.jsp" %>
+
+</div>
+ <%@ include file="footer.jsp" %>
</div>
</body>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
