Author: tyrell
Date: Tue Jan 15 03:22:45 2008
New Revision: 12256
Log:
Removing unnecessary javascript and css dependencies.
Modified:
trunk/mashup/java/modules/www/mashup.jsp
trunk/mashup/java/modules/www/user.jsp
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 03:22:45 2008
@@ -106,7 +106,6 @@
<script type="text/javascript" src="js/services.js"></script>
<script type="text/javascript" src="js/mashup.js"></script>
<script type="text/javascript" src="js/mashup-utils.js"></script>
-<script type="text/javascript" src="js/make-editable.js"></script>
<script language="javascript" type="text/javascript">
userLoggedOn = <%=RegistryUtils.isLoggedIn(registry) %>;
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 03:22:45 2008
@@ -14,24 +14,26 @@
* limitations under the License.
--%>
<%@ page errorPage="error.jsp" %>
-<%@ page import="com.sun.syndication.feed.synd.SyndContent"%>
-<%@ page import="com.sun.syndication.feed.synd.SyndContentImpl"%>
-<%@ page import="com.sun.syndication.feed.synd.SyndEntry"%>
+<%@ page import="com.sun.syndication.feed.synd.SyndContent" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndContentImpl" %>
+<%@ page import="com.sun.syndication.feed.synd.SyndEntry" %>
<%@ page import="com.sun.syndication.feed.synd.SyndEntryImpl" %>
<%@ page import="com.sun.syndication.feed.synd.SyndFeed" %>
<%@ page import="com.sun.syndication.feed.synd.SyndFeedImpl" %>
<%@ page import="com.sun.syndication.io.SyndFeedOutput" %>
+<%@ page import="org.apache.axis2.context.ConfigurationContext" %>
<%@ page import="org.wso2.mashup.MashupConstants" %>
+<%@ page import="org.wso2.mashup.utils.MashupUtils" %>
<%@ page import="org.wso2.mashup.utils.QueryResult" %>
<%@ page import="org.wso2.mashup.utils.QueryResults" %>
<%@ page import="org.wso2.mashup.webapp.identity.InfoCardHandler" %>
<%@ page import="org.wso2.mashup.webapp.identity.RegistrationBean" %>
+<%@ page import="org.wso2.mashup.webapp.userprofile.ManageUsers" %>
<%@ page import="org.wso2.mashup.webapp.userprofile.User" %>
<%@ page import="org.wso2.mashup.webapp.userprofile.UserQuery" %>
<%@ page import="org.wso2.mashup.webapp.utils.QueryParamUtils" %>
<%@ page import="org.wso2.mashup.webapp.utils.RegistryUtils" %>
<%@ page import="org.wso2.registry.Comment" %>
-<%@ page import="org.wso2.registry.LogEntry" %>
<%@ page import="org.wso2.registry.Registry" %>
<%@ page import="org.wso2.registry.RegistryConstants" %>
<%@ page import="org.wso2.registry.RegistryException" %>
@@ -41,8 +43,11 @@
<%@ page import="org.wso2.registry.secure.SecureRegistry" %>
<%@ page import="org.wso2.usermanager.Realm" %>
<%@ page import="org.wso2.usermanager.UserManagerException" %>
-<%@ page import="org.wso2.usermanager.verification.email.EmailVerifier" %>
+<%@ page import="org.wso2.usermanager.UserStoreAdmin" %>
+<%@ page import="org.wso2.wsas.ServerManager" %>
<%@ page import="javax.servlet.ServletContext" %>
+<%@ page import="java.io.BufferedReader" %>
+<%@ page import="java.io.FileReader" %>
<%@ page import="java.net.URL" %>
<%@ page import="java.net.URLDecoder" %>
<%@ page import="java.util.ArrayList" %>
@@ -92,39 +97,25 @@
<!-- Required CSS -->
<link href="css/styles.css" rel="stylesheet" type="text/css"/>
- <link rel="stylesheet" type="text/css"
href="js/yui/tabview/assets/tabview.css">
- <link rel="stylesheet" type="text/css"
href="js/yui/tabview/assets/border_tabs.css">
<link rel="stylesheet" type="text/css" href="css/container.css">
<link rel="stylesheet" type="text/css" href="css/mashup-main.css">
+
<!--Required JavaScript-->
<script language="javascript" src="js/common.js"
type="text/javascript"></script>
<script language="javascript" src="js/prototype.js"
type="text/javascript"></script>
- <!-- YUI dependencies -->
- <script type="text/javascript" src="js/yui/yahoo/yahoo.js"></script>
- <script type="text/javascript" src="js/yui/event/event.js"></script>
- <script type="text/javascript" src="js/yui/dom/dom.js"></script>
- <script type="text/javascript"
src="js/yui/animation/animation.js"></script>
- <script type="text/javascript"
src="js/yui/container/container_core.js"></script>
- <script type="text/javascript"
src="js/yui/container/container.js"></script>
- <script type="text/javascript"
src="js/yui/element/element-beta.js"></script>
- <script type="text/javascript" src="js/yui/tabview/tabview.js"></script>
- <script type="text/javascript"
src="js/yui/yahoo-dom-event/yahoo-dom-event.js"></script>
- <script type="text/javascript"
src="js/yui/utilities/utilities.js"></script>
- <!--YUI-EXT Dependencies-->
- <script type="text/javascript" src="js/yui-ext/yui-utilities.js"></script>
- <script type="text/javascript"
src="js/yui-ext/ext-yui-adapter.js"></script>
- <script type="text/javascript" src="js/yui-ext/ext-all.js"></script>
- <script type="text/javascript"
src="js/yui-ext/ext-back-compat.js"></script>
+
+ <!--YUI Dependencies-->
+ <script language="javascript"
src="js/yui/yahoo-dom-event/yahoo-dom-event.js"
+ type="text/javascript"></script>
+
<!--WSO2 Dependencies-->
<script type="text/javascript"
src="../wsasadmin/global_params.js"></script>
<script type="text/javascript" src="../wsasadmin/js/main.js"></script>
<script type="text/javascript" src="js/wso2/WSRequest.js"></script>
<script type="text/javascript" src="js/mashup-main.js"></script>
- <script type="text/javascript" src="js/services.js"></script>
- <script type="text/javascript" src="js/mashup.js"></script>
- <script type="text/javascript" src="js/mashup-editor.js"></script>
+ <script type="text/javascript" src="js/services.js"></script>
<script type="text/javascript" src="js/mashup-utils.js"></script>
- <script type="text/javascript" src="js/make-editable.js"></script>
+
<script language="javascript" type="text/javascript">
userLoggedOn = <%=RegistryUtils.isLoggedIn(registry) %>;
@@ -213,7 +204,9 @@
<!--Will only be available for logged in users-->
<% if (RegistryUtils.isLoggedIn(registry)) { %>
<li>
- <a href="#"
onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=RegistryUtils.getCurrentUser(registry)%>');">Create
a
+ <a href="#"
+
onclick="WSO2.MashupUtils.showCreateMashupDialog('<%=RegistryUtils.getCurrentUser(registry)%>');">Create
+ a
new service</a>
</li>
<li>
@@ -222,7 +215,8 @@
the scraping assistant</a>
</li>
<li>
- <a href="stub_gen.jsp" target="_blank">Use the Java
Script Stub Generator</a>
+ <a href="stub_gen.jsp" target="_blank">Use the Java
Script Stub
+ Generator</a>
</li>
<%}%>
@@ -233,21 +227,22 @@
</td>
</tr>
</table>
- <br />
+ <br/>
<%@ include file="taskbar.jsp" %>
</div>
<div id="content">
<table height="400" width="70%" border="0" cellspacing="0" cellpadding="5">
<tr>
-<td valign="top">
+ <td valign="top">
- <div class="profile">
- <div class="profile_title">
+ <div class="profile">
+ <div class="profile_title">
<span id="editFullName">
<span id="editFullName_value"><%=memberFullName%></span>
<% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
- <span class="edit-link">[<a href="#"
onclick="makeEditable('editFullName')">edit</a>]</span>
+ <span class="edit-link">[<a href="#"
+
onclick="makeEditable('editFullName')">edit</a>]</span>
<% } %>
</span>
<span id="editFullName_input" style="display:none">
@@ -257,24 +252,24 @@
<span class="edit-link">[<a href="#"
onclick="saveEditable('editFullName', 'fullName',
'<%=RegistryUtils.getCurrentUser(registry)%>')">save</a>]</span>
</span>
- </div>
- <table>
- <tr>
- <td class="profile_label">
- <nobr>user name:</nobr>
- </td>
- <td>
- <div class="profile_username"><%=memberName%>
- </div>
- </td>
- </tr>
- <% if (RegistryUtils.getCurrentUser(registry).equals(memberName))
{ %>
- <tr>
- <td class="profile_label">
- <nobr>email:</nobr>
- </td>
- <td>
- <div class="profile_email">
+ </div>
+ <table>
+ <tr>
+ <td class="profile_label">
+ <nobr>user name:</nobr>
+ </td>
+ <td>
+ <div class="profile_username"><%=memberName%>
+ </div>
+ </td>
+ </tr>
+ <% if
(RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
+ <tr>
+ <td class="profile_label">
+ <nobr>email:</nobr>
+ </td>
+ <td>
+ <div class="profile_email">
<span id="editEmail">
<span id="editEmail_value"><%=email%></span>
<span class="edit-link">[<a href="#"
@@ -288,16 +283,16 @@
<span class="edit-link">[<a href="#"
onclick="saveEditable('editEmail', 'email',
'<%=RegistryUtils.getCurrentUser(registry)%>')">save</a>]</span>
</span>
- </div>
- </td>
- </tr>
- <% } %>
- <tr>
- <td class="profile_label">
- <nobr>bio:</nobr>
- </td>
- <td>
- <div class="profile_bio">
+ </div>
+ </td>
+ </tr>
+ <% } %>
+ <tr>
+ <td class="profile_label">
+ <nobr>bio:</nobr>
+ </td>
+ <td>
+ <div class="profile_bio">
<span id="editBio">
<span id="editBio_value"><%=memberBio%></span>
<% if (RegistryUtils.getCurrentUser(registry).equals(memberName)) { %>
@@ -315,16 +310,16 @@
<br/>
<span class="profile_label">(accepts some html
markup)</span>
</span>
- </div>
- </td>
- </tr>
- <% if (userCards != null) { %>
- <tr>
- <td class="profile_label">
- <nobr>Registered Cards:</nobr>
- </td>
- <td>
- <div class="profile_username">
+ </div>
+ </td>
+ </tr>
+ <% if (userCards != null) { %>
+ <tr>
+ <td class="profile_label">
+ <nobr>Registered Cards:</nobr>
+ </td>
+ <td>
+ <div class="profile_username">
<span id="listInfocards">
<div class="profile_username">
<% for (String cardId : userCards) { %>
@@ -332,92 +327,94 @@
<% } %>
</div>
</span>
- </div>
- </td>
- </tr>
- <% } %>
- </table>
- </div>
-</td>
+ </div>
+ </td>
+ </tr>
+ <% } %>
+ </table>
+ </div>
+ </td>
</tr>
<tr>
-<td>
-<%
+ <td>
+ <%
+
- String queryTitle = customizedAuthor + " Mashups";
- String queryPath = MashupConstants.MY_MASHUPS_QUERY_PATH;
- String [] queryParams = new String[] {memberName};
- QueryResults results = RegistryUtils.doQuery(registry, queryTitle,
queryPath, queryParams, MashupConstants.SHOW_RESULTS_COUNT);
+ String queryTitle = customizedAuthor + " Mashups";
+ String queryPath = MashupConstants.MY_MASHUPS_QUERY_PATH;
+ String [] queryParams = new String[] {memberName};
+ QueryResults results = RegistryUtils.doQuery(registry, queryTitle,
queryPath, queryParams, MashupConstants.SHOW_RESULTS_COUNT);
-%>
-<div class="heading"><%= queryTitle%>
+
+ %>
+ <div class="heading"><%= queryTitle%>
<span class="edit-link" title="RSS feed">[<a
href="search.jsp?<%=QueryParamUtils.paramsFromQuery(queryPath,
queryParams)%>&format=rss"
target="_blank">RSS</a>]</span>
<span class="edit-link" title="Atom feed">[<a
href="search.jsp?<%=QueryParamUtils.paramsFromQuery(queryPath,
queryParams)%>&format=atom"
target="_blank">Atom</a>]</span>
-</div>
-<table width="100%" border="0" cellpadding="3" cellspacing="0" class="data">
- <tbody>
- <tr>
- <td width="12%" class="headers">Name</td>
- <td width="12%" class="headers">Author</td>
- <td class="headers">Description</td>
-
- <td width="95" class="headers">Rating</td>
- </tr>
- <%
- Iterator iter = results.getResults().iterator();
- int nextId = 0;
-
- if (!iter.hasNext()) { %>
-<tr class="noresults">
- <td valign="top" colspan="5">
- No results found.
- </td>
-</tr>
-<% }
-
- while (iter.hasNext()) {
- QueryResult result = (QueryResult) iter.next();
- String id = "id" + nextId;
- String path = result.getPath();
- %>
- <tr class="results">
- <td width="1" nowrap>
- <a
href="mashup.jsp?path=<%=result.getPath()%>"><%=result.getName()%>
- </a>
- </td>
- <td nowrap>
- <a class="updatableName"
-
href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils
- .getFullName(request, result.getAuthor())%>
- </a>
- </td>
- <td><%=result.getDescription() %>
- </td>
- <td nowrap>
- <%@ include file="rating.jsp" %>
- </td>
- </tr>
- <% nextId++;
- }
- if (results.getResultCount() > MashupConstants.SHOW_RESULTS_COUNT)
{ %>
- <tr>
- <td colspan="3"></td>
-
- <td>
- <div class="more"><a
-
href="search.jsp?query=mashups&scope=<%=memberName%>&controls=false">more
- results...</a></div>
- </td>
- </tr>
- <% } %>
- </tbody>
-</table>
+ </div>
+ <table width="100%" border="0" cellpadding="3" cellspacing="0"
class="data">
+ <tbody>
+ <tr>
+ <td width="12%" class="headers">Name</td>
+ <td width="12%" class="headers">Author</td>
+ <td class="headers">Description</td>
+
+ <td width="95" class="headers">Rating</td>
+ </tr>
+ <%
+ Iterator iter = results.getResults().iterator();
+ int nextId = 0;
+
+ if (!iter.hasNext()) { %>
+ <tr class="noresults">
+ <td valign="top" colspan="5">
+ No results found.
+ </td>
+ </tr>
+ <% }
+
+ while (iter.hasNext()) {
+ QueryResult result = (QueryResult) iter.next();
+ String id = "id" + nextId;
+ String path = result.getPath();
+ %>
+ <tr class="results">
+ <td width="1" nowrap>
+ <a
href="mashup.jsp?path=<%=result.getPath()%>"><%=result.getName()%>
+ </a>
+ </td>
+ <td nowrap>
+ <a class="updatableName"
+
href="user.jsp?name=<%=result.getAuthor()%>"><%=RegistryUtils
+ .getFullName(request, result.getAuthor())%>
+ </a>
+ </td>
+ <td><%=result.getDescription() %>
+ </td>
+ <td nowrap>
+ <%@ include file="rating.jsp" %>
+ </td>
+ </tr>
+ <% nextId++;
+ }
+ if (results.getResultCount() >
MashupConstants.SHOW_RESULTS_COUNT) { %>
+ <tr>
+ <td colspan="3"></td>
+
+ <td>
+ <div class="more"><a
+
href="search.jsp?query=mashups&scope=<%=memberName%>&controls=false">more
+ results...</a></div>
+ </td>
+ </tr>
+ <% } %>
+ </tbody>
+ </table>
</tr>
</table>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
