Author: chanaka
Date: Wed Jan 30 23:10:30 2008
New Revision: 13195
Log:
patch applied to trunk from branch
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/about.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/resource-properties.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/images/logo.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/about.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/about.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/about.jsp Wed Jan
30 23:10:30 2008
@@ -34,39 +34,25 @@
<jsp:include page="promotion.jsp" />
</td>
<td valign="top">
+ <h1 class="headding-recent-about">About WSO2 Registry</h1>
<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
<tr>
- <td class="leftColoumSizer" valign="top">
- <h1 class="headding-recent-about">About WSO2 Registry</h1>
- <p>
- WSO2 Registry enables you to store, catalog, index and
manage your enterprise meta data in a simple, scalable and easy-to-use model.
It is designed around community concepts such as tags, comments, ratings, users
and roles. Think of the registry as a structured wiki designed to help you
manage your meta-data in a simple business-friendly system.
- </p>
- <p>
- In addition, the registry allows you to store more
unstructured data such as Word documents, Excel spreadsheets and text formats.
Using these approaches, you can build a catalog of enterprise information
ranging from services, service descriptions to employee data and on going
projects.
- </p>
- <p>
- WSO2 Registry can be deployed in Application Servers and
access using the Web UI or the APP interface. It can also be used as a Java
library inside other Java programs as a resource store with all community
features and versioning.
- </p>
- <p>
- WSO2 Registry is released under the Apache License
v2.0Check out the project home page at <a
href="http://www.wso2.org/projects/registry";>http://www.wso2.org/projects/registry</a>
foradditional information.
- </p>
-
-
+ <td class="aboutLeft" valign="top">
+
<!-- Learning box starts here -->
<div class="box2-head">
<table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
<tr>
<td valign="top"
style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box2-lefttop.jpg" /></td>
- <td valign="top"><h2>Learn</h2></td>
+ <td valign="top"><h2>Get Help</h2></td>
<td valign="top" align="right"
style="width:14px; padding-top:0px;" ><img
src="/wso2registry/admin/images/box2-righttop.jpg" /></td>
</tr>
</table>
</div>
- <div class="box2-mid">
+ <div class="box2-mid aboutHight">
<h3>User guide</h3>
<p>
- Registry user guide is available at
- <a
href="http://wso2.org/wiki/display/registry/User+guide";
target="_blank">http://wso2.org/wiki/display/registry/WSO2+Registry+User%27s+Guide</a>
+ <a
href="http://wso2.org/wiki/display/registry/WSO2+Registry+User+Guide";
target="_blank">Registry user guide</a>
</p>
</div>
<div class="box2-bot">
@@ -78,8 +64,11 @@
</table>
</div>
<!-- Learning box ends here -->
-
- <!-- Get involove box starts here -->
+
+ </td>
+
+ <td class="aboutMiddle" valign="top">
+ <!-- Get involove box starts here -->
<div class="box2-head">
<table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
<tr>
@@ -89,7 +78,7 @@
</tr>
</table>
</div>
- <div class="box2-mid">
+ <div class="box2-mid aboutHight">
<h3>Reporting Problems</h3>
<p>
Issues can be reported using the public JIRA available
at
@@ -105,86 +94,8 @@
</table>
</div>
<!-- Get involve box ends here -->
-
- <!-- Feature List starts here -->
-
- <div class="box2-head">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
- <tr>
- <td valign="top"
style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box2-lefttop.jpg" /></td>
- <td valign="top"><h2>Features
List</h2></td>
- <td valign="top" align="right"
style="width:14px; padding-top:0px;" ><img
src="/wso2registry/admin/images/box2-righttop.jpg" /></td>
- </tr>
- </table>
- </div>
- <div class="box2-mid">
- <ul class="featureList">
- <li>Storing and managing resources and collections
- Add, edit, delete and retrieve resources
- Categorize resources using collections</li>
-
- <li>Tagging, commenting and rating resources
- Tag resources and browse other's tags
- Identify validity/weight of tags using tag clouds
- Comment on resources and see what others have to say
about your resources
- Rate resources and see how the community has rated
resources
- </li>
- <li>Managing users and roles
- Create, edit and delete users
- Add roles and assign users to roles
- </li>
-
- <li>Authentication and authorization
- Protect resources/collections by controlling the
authorization based on users and roles
- </li>
-
- <li>
- Resource / collection versioning
- Browse previous versions of resources/collections
- Restore any resource/collection to previous versions
- </li>
- <li>
- Tag based search
- Search resources by tags applied by you and others
- </li>
-
- <li>
- Advanced search
- Search resources based on advanced criteria
- </li>
-
- <li>
- Activity log and filtering support for the activity logs
- Browse all activities performed on the Registry with
date, time and the user who performed the activity.
- </li>
-
- <li>
- APP based Remote Registry
- Embed remote Registry inside Java programs and make
Java programs interact with hosted Registry servers.
- </li>
-
- <li>
- Media type handling support (experimental)
- </li>
- <li>
- Web based user interface with Web 2.0 look and feel
- </li>
- </ul>
-
- </div>
- <div class="box2-bot">
- <table cellspacing="0" cellpadding="0"
border="0" style="width:100%" >
- <tr>
- <td><img
src="/wso2registry/admin/images/box2-leftbot.jpg" /></td>
- <td align="right"><img
src="/wso2registry/admin/images/box2-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
-
-
-
</td>
- <td valign="top" style="padding-left:7px;">
+ <td valign="top" class="aboutRight" >
<div class="box1-head">
<table cellspacing="0" cellpadding="0"
border="0" style="width:100%">
<tr>
@@ -194,8 +105,8 @@
</tr>
</table>
</div>
- <div class="box1-mid">
- WSO2 offers �Live Online Training� and �Onsite
Training� training courses.
+ <div class="box1-mid aboutHight">
+ WSO2 offers Live Online Training and Onsite Training
training courses.
<h3>Live Online Training</h3>
<p>Our live online training sessions bring you all the advantages of a
classroom training no matter where you are. You can share data, ask questions
from the instructor, speak with the other participants, and even request for a
coffee break when you need one!</p>
<h3>Onsite Training</h3>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/resource-properties.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/resource-properties.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/resource-properties.jsp
Wed Jan 30 23:10:30 2008
@@ -29,9 +29,11 @@
Iterator iProps = props.keySet().iterator();
for (int i = 0; iProps.hasNext(); i++) {
- String name = (String) iProps.next();
- String value = (String) props.get(name);
-
+ String name = (String) iProps.next();
+ String value = (String) props.get(name);
+ String safeName = name.replace("\'","\\\'");
+ safeName = safeName.replace("\"","\\\"");
+ safeName = safeName.replace(";","\\;");
%>
@@ -59,7 +61,7 @@
<% if (details.isPutAllowed()) { %>
<a href="#"
onclick="showHideCommon('propViewPanel_<%=i%>');showHideCommon('propEditPanel_<%=i%>')"><img
title="Edit" border="0" align="top"
src="/wso2registry/admin/images/icon-edit.gif"/></a>
- <a href="#" onclick="removeProperty('<%=name%>')"
style="margin-left:5px;"><img title="Remove"
+ <a href="#" onclick="removeProperty('<%=safeName%>');"
style="margin-left:5px;"><img title="Remove"
style="margin-top:3px;"
border="0" align="top"
src="/wso2registry/admin/images/icon-trash.gif"/></a>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css Wed Jan
30 23:10:30 2008
@@ -565,4 +565,31 @@
}
.versionsToolBar a{
color:#6d7465;
+}
+#add-resource-div,#add-folder-div{
+padding-left:15px;
+}
+#add-resource-div input,#add-resource-div textarea,#add-resource-div
file,#add-folder-div input,#add-folder-div textarea,#add-folder-div file{
+width:98%;
+}
+#add-resource-div input[type='button'],#add-folder-div
input[type='button'],#add-folder-div input[type='submit']{
+width:70px;
+}
+#add-resource-div input[type='radio'],#add-folder-div input[type='radio']{
+width:auto;
+}
+.aboutLeft{
+padding-right:5px;
+width:33%;
+}
+.aboutMiddle{
+padding-right:5px;
+width:33%;
+}
+.aboutRight{
+padding-right:5px;
+width:33%;
+}
+.aboutHight{
+min-height:200px;
}
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/logo.jpg
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Wed Jan
30 23:10:30 2008
@@ -253,12 +253,12 @@
normal_div.style.display='none';
//edit_div.style.display='block';
edit_div.style.width="100%";
- edit_div.textContent="test";
+ edit_div.textContent=tmpNormalContent;
showHideCommon('editButton');
showHideCommon('saveButton');
tinyMCE.execCommand('mceAddControl', false, 'descEdit');
//alert("active Editor thing 2" + tmpNormalContent);
- tinyMCE.activeEditor.setContent(tmpNormalContent);
+ tinyMCE.setContent(tmpNormalContent);
}
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp Wed Jan
30 23:10:30 2008
@@ -6,7 +6,6 @@
AnnouncementsBean announcementsBean = (AnnouncementsBean)
request.getSession().getAttribute(UIConstants.ANNOUNCEMENTS_BEAN);
%>
-<h2>WSO2 Registry</h2>
<p>
WSO2 Registry enables you to store, catalog, index and manage your enterprise
meta data in a simple, scalable and easy-to-use model.
It is designed around community concepts such as tags, comments, ratings,
users and roles.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Wed Jan 30 23:10:30 2008
@@ -183,7 +183,10 @@
String name = (String) iProps.next();
String value = (String) props.get(name);
-
+ String safeName = name.replace("\'","\\\'");
+ safeName = safeName.replace("\"","\\\"");
+ //safeName = safeName.replace(";","\\;");
+ //out.print("---------" + safeName + "-------");
%>
@@ -203,7 +206,7 @@
<td>
<% if (details.isPutAllowed() && !details.isVersionView()) { %>
<a href="#"
onclick="showHideCommon('propViewPanel_<%=i%>');showHideCommon('propEditPanel_<%=i%>')"><img
title="Edit" border="0" align="top"
src="/wso2registry/admin/images/icon-edit.gif" /></a>
- <a href="#" onclick="removeProperty('<%=name%>')"
style="margin-left:5px;"><img title="Remove" border="0" align="top"
src="/wso2registry/admin/images/icon-trash.gif" /></a>
+ <a href="#" onclick="removeProperty('<%=safeName%>');"
style="margin-left:5px;"><img title="Remove" border="0" align="top"
src="/wso2registry/admin/images/icon-trash.gif" /></a>
<% } %>
</td>
</tr>
@@ -584,7 +587,7 @@
<td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box2-lefttop.jpg" /></td>
<td valign="top"><h2>Comments</h2></td>
<td align="right" valign="top">
- <table cellpadding="0" cellspacing="0" border="0"
class="toolBarTable"
style="margin-top:-15px;*margin-top:-5px;width:120px;*width:80px;">
+ <table cellpadding="0" cellspacing="0" border="0"
class="toolBarTable"
style="margin-top:-5px;display:block;*display:inline;*margin-top:-5px;width:120px;*width:80px;">
<tr>
<td>
<% if (details.isLoggedIn() &&
!details.isVersionView()) { %><a href="#"
onclick="showHideCommon('add-comment-div');expandIfNot('comments');"><img
src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top"
title="Add New Comment" /></a><% } %>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
