Author: jonathan
Date: Tue Jan 15 15:30:56 2008
New Revision: 12294
Log:
Removed mashups.wso2.com from all page titles, normalized titles to indicate
"WSO2 Mashup Server".
Modified:
trunk/mashup/java/modules/samples/sudoku/sudoku.js
trunk/mashup/java/modules/www/about.jsp
trunk/mashup/java/modules/www/add_user.jsp
trunk/mashup/java/modules/www/allow_guests.jsp
trunk/mashup/java/modules/www/delete_user.jsp
trunk/mashup/java/modules/www/editor.jsp
trunk/mashup/java/modules/www/index.jsp
trunk/mashup/java/modules/www/infocardaccept.jsp
trunk/mashup/java/modules/www/log_reader.jsp
trunk/mashup/java/modules/www/manage_users.jsp
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/register_admin.jsp
trunk/mashup/java/modules/www/register_self.jsp
trunk/mashup/java/modules/www/register_self_infocard.jsp
trunk/mashup/java/modules/www/registration_result.jsp
trunk/mashup/java/modules/www/search.jsp
trunk/mashup/java/modules/www/signin.jsp
trunk/mashup/java/modules/www/signout.jsp
trunk/mashup/java/modules/www/stub_gen.jsp
trunk/mashup/java/modules/www/tag_cloud.jsp
trunk/mashup/java/modules/www/taskbar.jsp
trunk/mashup/java/modules/www/user.jsp
trunk/mashup/java/modules/www/validate.jsp
Modified: trunk/mashup/java/modules/samples/sudoku/sudoku.js
==============================================================================
--- trunk/mashup/java/modules/samples/sudoku/sudoku.js (original)
+++ trunk/mashup/java/modules/samples/sudoku/sudoku.js Tue Jan 15 15:30:56 2008
@@ -253,7 +253,7 @@
var result = <board>
<details>
- <source>Sudoku Web Service by Jonathan Marsh ([EMAIL
PROTECTED]) http://mashups.wso2.org/services/sudoku/</source>
+ <source>Sudoku Web Service by Jonathan Marsh ([EMAIL
PROTECTED])</source>
<created>{(new Date()).toXSdateTime()}</created>
<difficulty>{(new Array("trivial", "easy", "medium",
"difficult", "expert")[rating - 1])}</difficulty>
<symmetrical>{(symmetrical ? "true" :
"false")}</symmetrical>
Modified: trunk/mashup/java/modules/www/about.jsp
==============================================================================
--- trunk/mashup/java/modules/www/about.jsp (original)
+++ trunk/mashup/java/modules/www/about.jsp Tue Jan 15 15:30:56 2008
@@ -25,7 +25,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - About</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/add_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/add_user.jsp (original)
+++ trunk/mashup/java/modules/www/add_user.jsp Tue Jan 15 15:30:56 2008
@@ -94,7 +94,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Add User</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/allow_guests.jsp
==============================================================================
--- trunk/mashup/java/modules/www/allow_guests.jsp (original)
+++ trunk/mashup/java/modules/www/allow_guests.jsp Tue Jan 15 15:30:56 2008
@@ -61,7 +61,7 @@
%>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Allow Guests</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
@@ -78,7 +78,7 @@
</div>
<div id="content">
- <div class="mashup_title">Mashups.WSO2.org Allow Self
Registration</div>
+ <div class="mashup_title">Allow Self Registration</div>
<table width="100%" height="400" border="0" cellspacing="0"
cellpadding="5">
<tr>
Modified: trunk/mashup/java/modules/www/delete_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/delete_user.jsp (original)
+++ trunk/mashup/java/modules/www/delete_user.jsp Tue Jan 15 15:30:56 2008
@@ -67,7 +67,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Delete User</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/editor.jsp
==============================================================================
--- trunk/mashup/java/modules/www/editor.jsp (original)
+++ trunk/mashup/java/modules/www/editor.jsp Tue Jan 15 15:30:56 2008
@@ -92,8 +92,8 @@
<meta http-equiv="PRAGMA" content="NO-CACHE">
<meta http-equiv="expires" content=<%= new java.util.Date() %>>
-<title>Mashup Editor [ Editing the mashup <%=mashupName%> authored by
<%=RegistryUtils
- .getFullName(request, author)%> ]</title>
+<title>WSO2 Mashup Server - Editing <%=mashupName%> by <%=RegistryUtils
+ .getFullName(request, author)%></title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<style type="text/css">
Modified: trunk/mashup/java/modules/www/index.jsp
==============================================================================
--- trunk/mashup/java/modules/www/index.jsp (original)
+++ trunk/mashup/java/modules/www/index.jsp Tue Jan 15 15:30:56 2008
@@ -68,7 +68,7 @@
%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Home</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/infocardaccept.jsp
==============================================================================
--- trunk/mashup/java/modules/www/infocardaccept.jsp (original)
+++ trunk/mashup/java/modules/www/infocardaccept.jsp Tue Jan 15 15:30:56 2008
@@ -26,7 +26,7 @@
%>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Accept Infocard</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
@@ -55,7 +55,7 @@
}
} else {
// Unauthenticated users are trying to sign in.
- title = "Sign-in to Mashups.WSO2.org";
+ title = "Sign-in to WSO2 Mashup Server";
if (InfoCardHandler.signIn(request)) {
response.sendRedirect(bounceback);
return;
Modified: trunk/mashup/java/modules/www/log_reader.jsp
==============================================================================
--- trunk/mashup/java/modules/www/log_reader.jsp (original)
+++ trunk/mashup/java/modules/www/log_reader.jsp Tue Jan 15 15:30:56 2008
@@ -37,7 +37,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Log Reader</title>
+ <title>WSO2 Mashup Server - Log Reader</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/manage_users.jsp
==============================================================================
--- trunk/mashup/java/modules/www/manage_users.jsp (original)
+++ trunk/mashup/java/modules/www/manage_users.jsp Tue Jan 15 15:30:56 2008
@@ -62,7 +62,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Manage Users</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/mashup.jsp
==============================================================================
--- trunk/mashup/java/modules/www/mashup.jsp (original)
+++ trunk/mashup/java/modules/www/mashup.jsp Tue Jan 15 15:30:56 2008
@@ -82,7 +82,7 @@
<html>
<head>
-<title><%=mashup%> by <%=authorFullName%> on Mashups.wso2.org</title>
+<title>WSO2 Mashup Server - <%=mashup%> by <%=authorFullName%></title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
Modified: trunk/mashup/java/modules/www/register_admin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_admin.jsp (original)
+++ trunk/mashup/java/modules/www/register_admin.jsp Tue Jan 15 15:30:56 2008
@@ -42,7 +42,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - First Run</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
@@ -55,8 +55,13 @@
<%@ include file="header.jsp" %>
<div id="search"></div>
<div id="content" style="height:400px; ">
- <div class="mashup_title">Initial Server Setup</div>
- <br />
+ <div class="mashup_title">Initial configuration</div>
+ <p>Please secure the WSO2 Mashup Server by providing a user name and
password for the primary account.
+ This primary account will have administrative priveleges, and has
full control over all the resources
+ and users. Additional users can be added by this account, or
self-registration with email verification
+ can be enabled.</p>
+ <p>If no email address is provided, you will be unable to recover a
lost password for this account.</p>
+ <br />
<form name="formRegisterAdmin" method='post'
action="register_admin.jsp">
<table width="100%" border="0" cellpadding="3"
cellspacing="0" >
<tr>
Modified: trunk/mashup/java/modules/www/register_self.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self.jsp (original)
+++ trunk/mashup/java/modules/www/register_self.jsp Tue Jan 15 15:30:56 2008
@@ -81,7 +81,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Self Registration</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/register_self_infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self_infocard.jsp (original)
+++ trunk/mashup/java/modules/www/register_self_infocard.jsp Tue Jan 15
15:30:56 2008
@@ -84,7 +84,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Infocard Self Registration</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/registration_result.jsp
==============================================================================
--- trunk/mashup/java/modules/www/registration_result.jsp (original)
+++ trunk/mashup/java/modules/www/registration_result.jsp Tue Jan 15
15:30:56 2008
@@ -64,7 +64,7 @@
%>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Self Registration</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
@@ -80,7 +80,7 @@
</div>
<div id="content">
- <div class="mashup_title">Mashups.WSO2.org Self Registration</div>
+ <div class="mashup_title">WSO2 Mashup Server Self Registration</div>
<table width="100%" height="400" border="0" cellspacing="0"
cellpadding="5">
<tr>
Modified: trunk/mashup/java/modules/www/search.jsp
==============================================================================
--- trunk/mashup/java/modules/www/search.jsp (original)
+++ trunk/mashup/java/modules/www/search.jsp Tue Jan 15 15:30:56 2008
@@ -341,7 +341,7 @@
%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Search Mashups.wso2.org </title>
+ <title>WSO2 Mashup Server - Search</title>
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/signin.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signin.jsp (original)
+++ trunk/mashup/java/modules/www/signin.jsp Tue Jan 15 15:30:56 2008
@@ -100,7 +100,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Sign In</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/prototype.js"
type="text/javascript"></script>
@@ -126,8 +126,8 @@
<table width="600" border="0" align="right"
cellpadding="3" cellspacing="0"
class="box">
<tr>
- <th align="center">Sign-in to
Mashups.WSO2.org</th>
- <th align="center">Use info card to enter
Mashups.WSO2.org</th>
+ <th align="center">Sign-in to WSO2 Mashup
Server</th>
+ <th align="center">Use info card to enter WSO2
Mashup Server</th>
</tr>
<tr>
<td align="center" height="175">
Modified: trunk/mashup/java/modules/www/signout.jsp
==============================================================================
--- trunk/mashup/java/modules/www/signout.jsp (original)
+++ trunk/mashup/java/modules/www/signout.jsp Tue Jan 15 15:30:56 2008
@@ -105,7 +105,7 @@
%><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Sign Out</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css" />
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
Modified: trunk/mashup/java/modules/www/stub_gen.jsp
==============================================================================
--- trunk/mashup/java/modules/www/stub_gen.jsp (original)
+++ trunk/mashup/java/modules/www/stub_gen.jsp Tue Jan 15 15:30:56 2008
@@ -64,7 +64,7 @@
%>
<html>
<head>
- <title>Java Script Stub Generator</title>
+ <title>WSO2 Mashup Server - Javascript Stub Generator</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<link href="css/mashup-main.css" rel="stylesheet" type="text/css"/>
Modified: trunk/mashup/java/modules/www/tag_cloud.jsp
==============================================================================
--- trunk/mashup/java/modules/www/tag_cloud.jsp (original)
+++ trunk/mashup/java/modules/www/tag_cloud.jsp Tue Jan 15 15:30:56 2008
@@ -74,7 +74,7 @@
<html>
<head>
- <title><%=authorFullName%> on Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - <%=authorFullName%>'s Tags</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
Modified: trunk/mashup/java/modules/www/taskbar.jsp
==============================================================================
--- trunk/mashup/java/modules/www/taskbar.jsp (original)
+++ trunk/mashup/java/modules/www/taskbar.jsp Tue Jan 15 15:30:56 2008
@@ -39,10 +39,6 @@
<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>
Modified: trunk/mashup/java/modules/www/user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/user.jsp (original)
+++ trunk/mashup/java/modules/www/user.jsp Tue Jan 15 15:30:56 2008
@@ -93,7 +93,7 @@
<html>
<head>
- <title><%=customizedAuthor%> profile on Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - <%=customizedAuthor%>'s Profile</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
@@ -172,16 +172,28 @@
<tr>
<td>
<ul>
- <% if
(RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
+ <!--Will only be available for logged in users-->
+ <% if (RegistryUtils.isLoggedIn(registry)) { %>
<li>
- Register your <a href="infocard.jsp">infocard</a>
+ <a href="#"
+
onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=RegistryUtils.getCurrentUser(registry)%>');">Create
+ a new service</a>
</li>
- <% } %>
- <!--
<li>
- <a href="#">Add virtual directory**</a>
+ <a href="#"
+ onclick="window.open('../scraper.html', 'remote',
'width=640,height=480')">Use
+ the scraping assistant</a>
</li>
- -->
+ <li>
+ <a href="stub_gen.jsp" target="_blank">Use the Java
Script Stub
+ Generator</a>
+ </li>
+
+ <!--<li>
+ <a href="#">Use the data service assistant</a>
+ </li>-->
+ <%}%>
+
<!--Will only be available for administrators -->
<% if (RegistryUtils.isAdminRole(registry)) { %>
<li>
@@ -191,39 +203,28 @@
<a href="manage_users.jsp">Manage Users</a>
</li>
<li>
- <a href="log_reader.jsp">View Server Log</a>
- </li>
- <li>
<% if (RegistrationBean.isSelfRegistrationEnabled()) {
%>
<a href="allow_guests.jsp?enable=false">Disallow
Internet Guests</a>
<% } else { %>
<a href="allow_guests.jsp?enable=true">Allow Internet
Guests</a>
<% } %>
</li>
- <% } %>
- <!--Will only be available for logged in users-->
- <% if (RegistryUtils.isLoggedIn(registry)) { %>
<li>
- <a href="#"
-
onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=RegistryUtils.getCurrentUser(registry)%>');">Create
- a
- new service</a>
+ <a href="log_reader.jsp">View Server Log</a>
</li>
+ <% } %>
+
+ <% if
(RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
<li>
- <a href="#"
- onclick="window.open('../scraper.html', 'remote',
'width=640,height=480')">Use
- the scraping assistant</a>
+ Register your <a href="infocard.jsp">infocard</a>
</li>
+ <% } %>
+ <!--
<li>
- <a href="stub_gen.jsp" target="_blank">Use the Java
Script Stub
- Generator</a>
+ <a href="#">Add virtual directory**</a>
</li>
- <%}%>
-
- <!--<li>
- <a href="#">Use the data service assistant</a>
- </li>-->
- </ul>
+ -->
+ </ul>
</td>
</tr>
</table>
Modified: trunk/mashup/java/modules/www/validate.jsp
==============================================================================
--- trunk/mashup/java/modules/www/validate.jsp (original)
+++ trunk/mashup/java/modules/www/validate.jsp Tue Jan 15 15:30:56 2008
@@ -24,7 +24,7 @@
%>
<html>
<head>
- <title>Mashups.wso2.org</title>
+ <title>WSO2 Mashup Server - Self Registration</title>
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
@@ -37,7 +37,7 @@
<div id="search"></div>
<div id="welcome"></div>
<div id="content">
- <div class="mashup_title">Mashups.WSO2.org Self Registration</div>
+ <div class="mashup_title">WSO2 Mashup Server - Self Registration</div>
<table width="100%" height="400" border="0" cellspacing="0"
cellpadding="5">
<tr>
<td align="center" height="150">
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
