Author: prasad Date: Thu Dec 20 23:18:50 2007 New Revision: 11636 Log:
Added styles to about.jsp and change the link to about page. Added: trunk/mashup/java/modules/www/about.jsp Removed: trunk/mashup/java/modules/www/about.html Modified: trunk/mashup/java/modules/www/add_user.jsp trunk/mashup/java/modules/www/css/styles.css trunk/mashup/java/modules/www/infocardaccept.jsp trunk/mashup/java/modules/www/taskbar.jsp trunk/mashup/java/modules/www/user.jsp Added: trunk/mashup/java/modules/www/about.jsp ============================================================================== --- (empty file) +++ trunk/mashup/java/modules/www/about.jsp Thu Dec 20 23:18:50 2007 @@ -0,0 +1,198 @@ +<%-- + * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--%> +<%@ page errorPage="error.jsp" %> +<%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %> +<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> +<%@ page import="org.wso2.registry.Registry" %> +<% + + Registry registry = RegistryUtils.getRegistry(request); + +%> +<!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> + <!-- Required CSS --> + <link href="css/styles.css" rel="stylesheet" type="text/css"/> + <script language="javascript" src="js/common.js" type="text/javascript"></script> + <script language="javascript" type="text/javascript">userLoggedOn = <%=RegistryUtils.isLoggedIn(registry) %>;</script> +</head> +<body> +<div id="page"> + <% String thisPage = "index.jsp"; %> + <%@ include file="header.jsp" %> + <div id="search"></div> + <div id="content"> + <div class="mashup_title">About WSO2 Mashup Server [EMAIL PROTECTED]@</div> + <dl style="margin: 1em; margin-right:3.5em"> +<dt><strong>About</strong></dt> + +<dd> +<p align="justify">Mashups are becoming an increasingly + important part of the information age. + They allow you to tame the raging + information flow and put it to work for + you. Rather than being forced to + consume information in the way the + publisher wishes it presented, + increasingly users are finding the + power to consume raw information, + combine it with other data sources, + customize and shape the results, and + interact with that information. Getting + information in the way you want it is + the basis of XML-based Web + Services.</p> + +<p align="justify">XML is a language for exchanging + information. It extends the valuable + characteristics of HTML, which is + limited to the domain of document + publishing, to other fields. It allows + one to use vocabularies specific to the + information domain of the data. For + instance, HTML has document-oriented + concepts such as "paragraph" and + "table", but no concept of "price" or + "temperature". XML allows you to define + your own data vocabulary. With XML, the + presentation of the information can be + separated from the content of the + information - the first step in making + that information reusable by the + consumer.</p> + +<p align="justify">But if anyone can make up their own + language, isn't that the Tower of Babel + all over again? Indeed, to communicate + effectively, two computers must agree + on the data format (with XML this is + easy since it's virtually universally + accepted as a standard format), and on + the vocabulary. Vertical industries and + communities have evolved vocabularies + that allow them to communicate within + their domains. For instance, the HTML + community can talk together in XML by + using the XHTML vocabulary (HTML + reformulated in XML). Bloggers can talk + together in XML by using the RSS or + Atom vocabularies. Thousands of formats + have emerged to enable eBusiness + transactions. But there still is a need + for some human intervention to take + disparate vocabularies and combine them + into a new information stream.</p> + +<p align="justify">Merging, or mashing-up data, thus is + a process of acquiring XML (directly + from the producers, or in some other + legacy form that can be converted to + XML), processing and combining that + data, and publishing the results. If + the result of the mashup is expressed + as new XML data, it can again be shared + with others, further mashed, and + presented to the user in a variety of + ways (including but not limited to + HTML). The WSO2 Mashup Server is based + on this model - that the central model + for customizing information to a + particular user's needs, is one of + consuming, processing, and publishing + XML.</p> + +<p align="justify">How does one acquire XML? Web + Services are a set of technologies that + helps get XML from one place to + another, providing protocols for + describing what XML is available, how + to ask for it, how to transmit the data + securely, reliably, and so forth. From + the perspective of the Mashup author, + the less one has to know about the + details of how the XML gets from one + place to another, the better. The core + functionality of the Mashup Server is + to take care of this for you, allowing + you to operate at the level of the XML + content itself as much as possible.</p> + +<p align="justify">Mashup products and frameworks all + have several pieces in common. They + provide ways to acquire data, they + provide a central abstraction and tools + for working with that data, and they + provide ways to publish the result to + the consumer. The WSO2 Mashup Server + uses Web Services as the mechanism for + acquiring data, XML as its central + abstraction, Javascript (with E4X XML + extensions) for manipulating that data, + and again Web Services as the primary + way to re-publish the new information + stream, with bridges to HTML, RSS, and + other output mechanisms.</p> +</dd> + +<dt><strong>WSO2 Profile</strong></dt> + +<dd> + <p align="justify">WSO2 Inc., is a startup technology + company building open source Web + services middleware platforms. Founded + by pioneers in Web services and open + source development, WSO2 engineers + contribute heavily to many key Apache + Web services projects. In addition to + building core components in Apache, + WSO2 is building integrated Web + services platforms which will offer + industry leading performance and + convenience for customers.</p> + + <p align="justify">For developers the WSO2 Oxygen Tank + developer portal is a one-stop-shop to + check out whats going on in the world + of Web services. Comprising of the very + latest technical information and + downloads, the portal is ideal for + developers to collaboratively build + middleware that is simple, flexible and + deliver more value based on open source + Apache Web service frameworks and + related components. Simply log in to <a href="http://www.wso2.org";>www.wso2.org</a> + and be able to air your thoughts too + via a blog, forum or even an + article. + </p> + + <p align="justify">WSO2 is based in Mountain View, CA, London and + Colombo. A truly open source entity, + The business model focuses on selling + support and other services for open + source software it helps build. For + more details see <a href="http://www.wso2.com";>www.wso2.com</a>. + </p> +</dd> +</dl> +<br/> + </div> + <%@ include file="footer.jsp" %> +</div> +</body> +</html> 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 Thu Dec 20 23:18:50 2007 @@ -111,16 +111,17 @@ <tr> <td width="130"><label><strong>User Name:<font color="#FF0000">*</font></strong></label></td> <td> - <input type="text" name="userName" - value="<%=addUserHandler.getUserName()%>" <%= "true".equals(editMode) ? "readonly" : "" %>/> - <br><font color="#FF0000"><%=addUserHandler.getErrorMessage("userName")%></font> - </td> +<input type="text" name="userName" + value="<%=addUserHandler.getUserName()%>" <%= "true".equals(editMode) ? "readonly" : "" %>/> +<br> + <div class="login-error"><%=addUserHandler.getErrorMessage("userName")%></div> + </td> </tr> <tr> <td width="130"><label><strong>Full Name:<font color="#FF0000">*</font></strong></label></td> <td><input type="text" name="fullName" value="<%=addUserHandler.getFullName()%>"/> - <br><font color="#FF0000"><%=addUserHandler.getErrorMessage("fullName")%></font> + <br><div class="login-error"><%=addUserHandler.getErrorMessage("fullName")%></div> </td> </tr> <tr> @@ -133,7 +134,7 @@ <td><label><strong>Password:<font color="#FF0000">*</font></strong></label></td> <td><input type="password" name="password" value="<%=addUserHandler.getPassword()%>"/> - <br><font color="#FF0000"><%=addUserHandler.getErrorMessage("password")%></font> + <br><div class="login-error"><%=addUserHandler.getErrorMessage("password")%></div> </td> </tr> <% } %> @@ -143,7 +144,7 @@ value="<%=addUserHandler.getBio()%>"/></td> </tr> <tr> - <td><font color="#FF0000"><%=addUserHandler.getErrorMessage("exception")%></font> + <td><div class="login-error"><%=addUserHandler.getErrorMessage("exception")%></div> </td> </tr> <tr> Modified: trunk/mashup/java/modules/www/css/styles.css ============================================================================== --- trunk/mashup/java/modules/www/css/styles.css (original) +++ trunk/mashup/java/modules/www/css/styles.css Thu Dec 20 23:18:50 2007 @@ -507,4 +507,6 @@ margin:2em; text-align:center; -} \ No newline at end of file +}.login-error { + color: #FF0000; +} Modified: trunk/mashup/java/modules/www/infocardaccept.jsp ============================================================================== --- trunk/mashup/java/modules/www/infocardaccept.jsp (original) +++ trunk/mashup/java/modules/www/infocardaccept.jsp Thu Dec 20 23:18:50 2007 @@ -1,87 +1,87 @@ -<%-- - * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. ---%> -<%@ page errorPage="error.jsp" %> -<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %> -<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> -<%@ page import="org.wso2.registry.Registry" %> -<%@ page import="java.net.URLDecoder" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<% - - Registry registry = RegistryUtils.getRegistry(request); - boolean isLoggedIn = RegistryUtils.isLoggedIn(registry); -%> -<html> -<head> - <title>Mashups.wso2.org</title> - <!-- Required CSS --> - <link href="css/styles.css" rel="stylesheet" type="text/css"/> - <script language="javascript" src="js/common.js" type="text/javascript"></script> - <script language="javascript" type="text/javascript">userLoggedOn = <%=isLoggedIn %>;</script> -</head> -<body> -<% - String thisPage = "infocardaccept.jsp"; - String bounceback = request.getParameter("bounceback"); - String title; - String message = null; - if (bounceback == null) { - bounceback = "index.jsp"; - } else { - bounceback = URLDecoder.decode(bounceback, "UTF-8"); - } - - // Check if the user is validated already. If so, this is to associate the user with the card. - if (isLoggedIn) { - title = "Associate InfoCard with user profile"; - if (InfoCardHandler.associateCardWithUser(request)) { - // Send the user back to the caling page on success - it'll show the added card ppid. - response.sendRedirect(bounceback); - } else { - message = "Could not add InfoCard to user profile."; - } - } else { - // Unauthenticated users are trying to sign in. - title = "Sign-in to Mashups.WSO2.org"; - if (InfoCardHandler.signIn(request)) { - response.sendRedirect(bounceback); - return; - } else { - message = "Infocard based login failed."; - } - } -%> -<div id="page"> - <%@ include file="header.jsp" %> - - <div id="content"> - <table width="100%" height="400" border="0" cellspacing="0" cellpadding="5"> - <tr> - <th><label><%= title %></label></th> - </tr> - <tr> - <td align="center" height="175"> - <div class="login-error"><%= message %></div> - Return to <a href="<%= bounceback %>">calling page</a> to try again. - </td> - </tr> - </table> - - </div> - <%@ include file="footer.jsp" %> -</div> -</body> +<%-- + * Copyright 2006,2007 WSO2, Inc. http://www.wso2.org + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. +--%> +<%@ page errorPage="error.jsp" %> +<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %> +<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %> +<%@ page import="org.wso2.registry.Registry" %> +<%@ page import="java.net.URLDecoder" %> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<% + + Registry registry = RegistryUtils.getRegistry(request); + boolean isLoggedIn = RegistryUtils.isLoggedIn(registry); +%> +<html> +<head> + <title>Mashups.wso2.org</title> + <!-- Required CSS --> + <link href="css/styles.css" rel="stylesheet" type="text/css"/> + <script language="javascript" src="js/common.js" type="text/javascript"></script> + <script language="javascript" type="text/javascript">userLoggedOn = <%=isLoggedIn %>;</script> +</head> +<body> +<% + String thisPage = "infocardaccept.jsp"; + String bounceback = request.getParameter("bounceback"); + String title; + String message = null; + if (bounceback == null) { + bounceback = "index.jsp"; + } else { + bounceback = URLDecoder.decode(bounceback, "UTF-8"); + } + + // Check if the user is validated already. If so, this is to associate the user with the card. + if (isLoggedIn) { + title = "Associate InfoCard with user profile"; + if (InfoCardHandler.associateCardWithUser(request)) { + // Send the user back to the caling page on success - it'll show the added card ppid. + response.sendRedirect(bounceback); + } else { + message = "Could not add InfoCard to user profile."; + } + } else { + // Unauthenticated users are trying to sign in. + title = "Sign-in to Mashups.WSO2.org"; + if (InfoCardHandler.signIn(request)) { + response.sendRedirect(bounceback); + return; + } else { + message = "Infocard based login failed."; + } + } +%> +<div id="page"> + <%@ include file="header.jsp" %> +<div id="search"></div> + <div id="content"> + <div class="mashup_title"><%= title %></div> + <table width="100%" height="400" border="0" cellspacing="0" cellpadding="5"> + + <tr> + <td align="center"> + <div class="login-error"><img src="images/error.gif" align="absmiddle"> <%= message %></div> + <br/><br/><br/> + Return to <a href="<%= bounceback %>">calling page</a> to try again. + </td> + </tr> + </table> + + </div> + <%@ include file="footer.jsp" %> +</div> +</body> </html> \ No newline at end of file Modified: trunk/mashup/java/modules/www/taskbar.jsp ============================================================================== --- trunk/mashup/java/modules/www/taskbar.jsp (original) +++ trunk/mashup/java/modules/www/taskbar.jsp Thu Dec 20 23:18:50 2007 @@ -22,7 +22,7 @@ <td> <ul> <li> - <a href="../about.html">About the WSO2 Mashup Server</a> + <a href="../about.jsp">About the WSO2 Mashup Server</a> </li> <!--<li> <a href="#">Mashup Server blog</a> Modified: trunk/mashup/java/modules/www/user.jsp ============================================================================== --- trunk/mashup/java/modules/www/user.jsp (original) +++ trunk/mashup/java/modules/www/user.jsp Thu Dec 20 23:18:50 2007 @@ -230,6 +230,7 @@ </td> </tr> </table> + <br /> <%@ include file="taskbar.jsp" %> </div> <div id="content"> _______________________________________________ Mashup-dev mailing list [email protected] http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
