[Registry-dev] svn commit r13222 - in
trunk/registry/modules/webapps/src/main/webapp/admin: . css
images js
svn at wso2.org
svn at wso2.org
Fri Feb 1 04:53:40 PST 2008
Author: chanaka
Date: Fri Feb 1 04:52:31 2008
New Revision: 13222
Log:
new theme added
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/colSep.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-about.gif (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-about.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-folder.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-resource.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-arrow-about.gif (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-arrow-about.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-home-big.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-resource.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tag.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/lock.jpg (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-back.gif (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left.gif (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right.gif (contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/resources.gif (contents, props changed)
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/css/main.css
trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/images/header-back.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-go.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-logout.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-people-small.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-big.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-big.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-small.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-registryResources.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-search.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-search.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-user-mange.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-user-mange.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/logo.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/promotionBackground.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/promotion.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/advanced-search.jsp Fri Feb 1 04:52:31 2008
@@ -64,24 +64,9 @@
</td>
<td valign="top">
<h1 class="headding-search">Advanced Search</h1>
-<!-- Hear comes the box1 table -->
-<div class="box1-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/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2>Search Activities</h2>
- </td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
-</div>
+
+<h2>Search Activities</h2>
+
<div class="box1-mid" id="userExpanded">
<form id="advancedSearchForm" name="advancedSearch" onsubmit="return true;" action="/wso2registry/system/search/advanced" method="get">
<%--<table cellpadding="0" cellspacing="0" border="0" class="form-table">--%>
@@ -319,14 +304,6 @@
</table>
</div>
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
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 Fri Feb 1 04:52:31 2008
@@ -15,18 +15,42 @@
.leftColoumSizer{
width:65%;
}
+.rightColumnSizer{
+padding-left:0px;
+}
.promotionDiv{
-width:165px;
-background-image:url(../images/promotionBackground.jpg);
+width:145px;
+/*background-image:url(../images/promotionBackground.jpg);
background-repeat:no-repeat;
-background-position:0px 0px;
+background-position:0px 0px; */
margin-right:8px;
-padding-right:10px;
+padding-right:5px;
padding-left:8px;
-padding-top:3px;
+padding-top:0px;
}
-.promotionDiv p{
-padding-right:3px;
+.promotionDivContent {
+border:solid 1px #7e7e7e;
+}
+.promotionDiv a.area{
+background-image:url(../images/icon-arrow-about.gif);
+background-repeat:no-repeat;
+background-position:150px 4px;
+display:block;
+color:#ffffff;
+background-color:#b88e44;
+line-height:20px;
+border-bottom:solid 1px #202020;
+text-indent:5px;
+}
+.promotionDiv a.normal{
+color:#ffffff;
+}
+.promotionDiv div.aboutBack{
+background-image:url(../images/promotionBackground.jpg);
+background-repeat:repeat-y;
+background-position:0px 0px;
+margin:0px;
+padding:3px;
}
.promotionDiv h2{
font-family:verdana;
@@ -48,7 +72,6 @@
text-indent:12px;
}
.promotionDiv span{
-background-color:#e7e7e7;
padding:5px;
display:block;
}
@@ -70,10 +93,11 @@
h2{
padding:0px;
margin:0px;
-font-family:Georgia;
-font-size:14px;
-color:#575757;
+font-size:16px;
+color:#6e6b66;
+font-weight:bold;
}
+
h3{
font-size:13px;
padding:0px;
@@ -108,6 +132,13 @@
text-indent:40px;
line-height:35px;
}
+.headding-resource{
+background-image:url(../images/resources.gif);
+background-repeat:no-repeat;
+background-position:3px 2px;
+text-indent:40px;
+line-height:35px;
+}
.headding-user-manage{
background-image:url(../images/icon-user-mange.jpg);
background-repeat:no-repeat;
@@ -119,7 +150,7 @@
background-image:url(../images/icon-recent-activity-big.jpg);
background-repeat:no-repeat;
background-position:3px 6px;
-text-indent:30px;
+text-indent:40px;
line-height:35px;
}
.headding-recent-about{
@@ -136,9 +167,54 @@
text-indent:40px;
line-height:35px;
}
+.sub-headding-about{
+background-image:url(../images/icon-about.gif);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:32px;
+line-height:40px;
+}
+.sub-headding-entries{
+background-image:url(../images/icon-resource.jpg);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:28px;
+line-height:32px;
+}
+.sub-headding-permisions{
+background-image:url(../images/lock.jpg);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:28px;
+line-height:32px;
+}
+.sub-headding-tags{
+background-image:url(../images/icon-tag.jpg);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:28px;
+line-height:32px;
+}
+.sub-headding-comments{
+background-image:url(../images/icon-comment.jpg);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:28px;
+line-height:32px;
+}
+.sub-headding-resources{
+background-image:url(../images/icon-home-big.jpg);
+background-repeat:no-repeat;
+background-position:0px 7px;
+text-indent:28px;
+line-height:32px;
+}
+.sub-headding-resources a{
+color:#6e6b66;
+}
/* Top menu styles */
.top-menu{
-background-image:url(../images/menu-back.jpg);
+background-image:url(../images/menu-back.gif);
background-repeat:repeat-x;
background-position:0px 0px;
margin:0px;
@@ -146,28 +222,37 @@
height:28px;
}
.top-menu-table{
-margin-top:4px;
+margin-top:40px;
+margin-right:10px;
}
.top-menu-table a{
-color:#ffffff;
+color:#000000;
text-decoration:none;
}
.top-menu-table a:hover{
-color:#fcfbb5 !important;
+color:#4a4a4a !important;
}
.top-menu-table td{
padding-right:20px;
}
.top-menu-selected{
text-decoration:none;
-color:#fcfbb5 !important;
+color:#4a4a4a !important;
text-decoration:none;
font-weight:bold;
}
.top-menu-selected:hover{
color:#ffffff;
}
-
+/* page content styles */
+.content{
+background-color:#ffffff;
+padding:10px;
+padding-left:15px;
+margin-top:10px;
+margin-left:10px;
+margin-right:10px;
+}
/* Table styles */
.simple-data-table th{
text-align:left;
@@ -188,16 +273,18 @@
}
/* Box1 styles */
.box1-head{
-background-image:url(../images/box1-top.jpg);
-background-repeat:repeat-x;
-background-position:0px;
height:35px;
}
.box1-mid{
-border-left:solid 2px #cdb488;
-border-right:solid 2px #cdb488;
-padding-left:15px;
+/* border:solid 1px #7e7e7e; */
+border-top:solid 1px #dedede;
+padding-left:25px;
padding-right:5px;
+padding-bottom:10px;
+padding-top:10px;
+min-height:20px;
+
+margin-bottom:20px;
}
.box1-mid p,.box2-mid p{
margin:0px;
@@ -215,16 +302,17 @@
/* Box2 styles */
.box2-head{
-background-image:url(../images/box2-top.jpg);
-background-repeat:repeat-x;
background-position:0px;
height:35px;
}
.box2-mid{
-border-left:solid 2px #ced8bf;
-border-right:solid 2px #ced8bf;
-padding-left:15px;
+/* border:solid 1px #7e7e7e; */
+border-top:solid 1px #dedede;
+padding-left:25px;
padding-right:5px;
+padding-bottom:10px;
+padding-top:10px;
+margin-bottom:20px;
}
.box2-head td{
padding-top:4px;
@@ -303,7 +391,7 @@
}
/* Icons */
.add-resource{
-background-image:url(../images/icon-add-resource.gif);
+background-image:url(../images/icon-add-resource.jpg);
background-repeat:no-repeat;
background-position:0px 0px;
display:block;
@@ -313,7 +401,7 @@
margin-bottom:2px;
}
.add-folder{
-background-image:url(../images/icon-add-folder.gif);
+background-image:url(../images/icon-add-folder.jpg);
background-repeat:no-repeat;
background-position:0px 0px;
display:block;
@@ -453,12 +541,14 @@
display:inline;
width:100px;
*width:60px;
-
}
.toolBarTable td{
padding-left:10px;
*padding-left:0px;
}
+.toolBarTable img{
+*margin-top:0px;
+}
.helpText{
color:#444444;
font-size:90%;
@@ -539,14 +629,15 @@
margin-top:3px;
}
.search-table td{
-padding-right:5px;
+padding-right:15px;
+line-height:20px;
}
.top-toolbar-back{
-background-image:url(../images/top-toolbar-back.jpg);
+/*background-image:url(../images/top-toolbar-back.jpg); */
background-repeat:no-repeat;
background-position:0px 0px;
margin-left:0px;
-padding-left:10px;
+padding-left:0px;
}
.featureList{
padding:0px;
@@ -592,4 +683,8 @@
}
.aboutHight{
min-height:200px;
+}
+.greetingStyle{
+margin-top:-25px;
+font-size:13px;
}
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/header.jsp Fri Feb 1 04:52:31 2008
@@ -73,53 +73,23 @@
<table cellpadding="0" cellspacing="0" border="0" class="search-table">
<tr>
- <td>
- <a href="/wso2registry/system/search/advanced/new" class="advanced-search">Advanced Search <img src="/wso2registry/admin/images/icon-go.gif" border="0" /></a>
- </td>
-
- <form action="/wso2registry/system/search" method="get" style="display:inline;" name="searchForm">
- <td>
- <input type="text" name="criteria" class="input-text" />
- </td>
- <td valign="bottom">
- <a href="#" onclick="document.searchForm.submit();" title="Search"><img src="/wso2registry/admin/images/icon-search.gif" border="0" style="margin:0px padding:0px;"/></a><!-- input type="submit" class="button" value="Search" / -->
- </td>
- </form>
- </tr>
- </table>
-</div>
-<table cellpadding="0" cellspacing="0" border="0" class="top-menu-table">
- <tr>
- <td>
-
- <%
- if (!userName.equals(RegistryConstants.ANONYMOUS_USER)) {%>
- <span> <script language="javascript" type="text/javascript">doGreeting();</script></span> <%=userName%>!
- <% } %>
- </td>
- <td align="left" style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-left.jpg" /></td>
- <td class="top-menu">
+ <td>
<a href="<%=webPath%>">
<img src="/wso2registry/admin/images/icon-registryResources.gif" border="0" align="top" /> Resources
</a>
</td>
- <td class="top-menu">
+ <td>
<a href="/wso2registry/system/people">
<img src="/wso2registry/admin/images/icon-people-small.gif" border="0" align="top" /> People
</a>
</td>
<% if (!userName.equals(RegistryConstants.ANONYMOUS_USER)) { %>
- <td class="top-menu">
+ <td>
<a href="/wso2registry/system/activity/new">
<img src="/wso2registry/admin/images/icon-recent-activity-small.gif" border="0" align="top" /> Activity
</a>
</td>
<% } %>
- <td class="top-menu">
- <a href="/wso2registry/system/about">
- <img src="/wso2registry/admin/images/icon-about-small.gif" border="0" align="top" /> About
- </a>
- </td>
<!--Add this after figuring out a better way to do the config-->
<%--<% if (isLogged) { %>--%>
<!--<td class="top-menu">-->
@@ -128,7 +98,7 @@
<!--</a>-->
<!--</td>-->
<%--<% } %>--%>
- <td class="top-menu">
+ <td>
<%
if (userName.equals(RegistryConstants.ANONYMOUS_USER)) {
%>
@@ -142,8 +112,34 @@
<% } %>
+ </td>
+ </tr>
+ </table>
+</div>
+<table cellpadding="0" cellspacing="0" border="0" class="top-menu-table">
+ <tr>
+ <td>
+
+ <%
+ if (!userName.equals(RegistryConstants.ANONYMOUS_USER)) {%>
+ <div class="greetingStyle"> <script language="javascript" type="text/javascript">doGreeting();</script> <%=userName%>! </div>
+ <% } %>
</td>
- <td align="right" style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-right.jpg" /></td>
+ <td align="left" style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-left.gif" /></td>
+ <td class="top-menu">
+ <a href="/wso2registry/system/search/advanced/new" class="advanced-search">Advanced Search <img src="/wso2registry/admin/images/icon-go.gif" border="0" /></a>
+ </td>
+
+ <form action="/wso2registry/system/search" method="get" style="display:inline;" name="searchForm">
+ <td class="top-menu">
+ <input type="text" name="criteria" class="input-text" />
+ </td>
+ <td valign="middle" class="top-menu" style="margin-top:-50px;">
+ <a href="#" onclick="document.searchForm.submit();" title="Search" ><img src="/wso2registry/admin/images/icon-search.gif" border="0" /></a><!-- input type="submit" class="button" value="Search" / -->
+ </td>
+ </form>
+
+ <td align="right" style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-right.gif" /></td>
</tr>
</table>
</td>
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/colSep.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/header-back.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-about.gif
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-about.jpg
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-folder.jpg
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-resource.jpg
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-arrow-about.gif
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-arrow-about.jpg
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-go.gif
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-home-big.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-logout.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-people-small.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-big.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-big.jpg
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-recent-activity-small.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-registryResources.gif
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-resource.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-search.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-search.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-tag.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-user-mange.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-user-mange.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/lock.jpg
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/logo.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-back.gif
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left.gif
==============================================================================
Binary file. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right.gif
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/promotionBackground.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/resources.gif
==============================================================================
Binary file. 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 Fri Feb 1 04:52:31 2008
@@ -207,6 +207,10 @@
divx.style.display='inline';
if(divx.nodeName == 'INPUT')
divx.style.display='inline';
+ if(divx.nodeName == 'P')
+ divx.style.display='block';
+ if(divx.nodeName == 'TABLE')
+ divx.style.display='block';
//link.innerHTML=textHidden;
}
/* hide the initaly shown object */
@@ -324,8 +328,8 @@
function loginProgress() {
- document.getElementById('loginProgress').innerHTML = "User authenticated successfully.<br/>Signing in to the WSO2 Registry ...";
- document.getElementById('loginProgress').style.display='block';
+ //document.getElementById('loginProgress').innerHTML = "User authenticated successfully.<br/>Signing in to the WSO2 Registry ...";
+ //document.getElementById('loginProgress').style.display='block';
}
/* Ajax Rating Functions */
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/people.jsp Fri Feb 1 04:52:31 2008
@@ -28,8 +28,6 @@
%>
<!-- START header content -->
<jsp:include page="header.jsp" />
-
-<div class="content">
<!--This is the START of main table which seperates 2 coloums for promotions and content of the site -->
<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
<tr>
@@ -37,6 +35,8 @@
<jsp:include page="promotion.jsp" />
</td>
<td valign="top">
+<div class="content">
+
<h1 class="headding-user-manage">People</h1>
<% if (errorMessage != null) { %>
<div class="error-message"><%=errorMessage%></div>
@@ -46,30 +46,28 @@
<td style="width:50%;" valign="top">
<!-- Hear comes the box1 table -->
- <div class="box1-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/box1-lefttop.jpg" /></td>
<td valign="top">
<h2>Users </h2>
</td>
- <td align="right" valign="top">
+ <td align="right" valign="bottom">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolBarTable">
<tr>
- <td><% if (userManagementAction.isAddAllowed()) { %><a href="#" onclick="showHideCommon('userAddBox');expandIfNot('user');" title="Add New User"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" style="margin-top:-5px;" /></a><% } %></td>
+ <td><% if (userManagementAction.isAddAllowed()) { %><a href="#" onclick="showHideCommon('userAddBox');expandIfNot('user');" title="Add New User"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" /></a><% } %></td>
<td>
<a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" style="margin-top:-3px;" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;margin-top:-3px;" />
+ <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" style="" />
+ <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
</a>
</td>
</tr>
</table>
</td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
</tr>
</table>
- </div>
+
<div class="box1-mid" id="userMinimized" style="display:none;">
Expand to view details
</div>
@@ -169,47 +167,37 @@
<!-- End box1-mid div -->
</div>
- <div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
-
-
-
</td>
- <td style="width:50%;padding-left:10px;" valign="top">
+ <td valign="top" style="width:5px;" align="center">
+ <img src="/wso2registry/admin/images/colSep.jpg" border="0" hspace="10" />
+ </td>
+ <td style="width:50%;" valign="top">
<!-- Hear comes the roles box -->
<!-- Hear comes the box1 table -->
- <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>Roles </h2>
</td>
<td align="right" valign="top">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="toolBarTable">
<tr>
- <td valign="top"><% if (userManagementAction.isAddAllowed()) { %><a href="#" onclick="showHideCommon('addRoleBox');expandIfNot('role');" title="Add New Role"><img src="/wso2registry/admin/images/universal-add.gif" style="margin-top:-5px;" border="0" align="top" /></a><% } %></td>
+ <td valign="top"><% if (userManagementAction.isAddAllowed()) { %><a href="#" onclick="showHideCommon('addRoleBox');expandIfNot('role');" title="Add New Role"><img src="/wso2registry/admin/images/universal-add.gif" border="0" align="top" /></a><% } %></td>
<td>
<a href="#" onclick="showHideCommon('roleIconExpanded');showHideCommon('roleIconMinimized');showHideCommon('roleExpanded');showHideCommon('roleMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="roleIconExpanded" style="margin-top:-3px;" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="roleIconMinimized" style="display:none;margin-top:-3px;" />
+ <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="roleIconExpanded" />
+ <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="roleIconMinimized" style="display:none;" />
</a>
</td>
</tr>
</table>
</td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box2-righttop.jpg" /></td>
- </tr>
+ </tr>
</table>
- </div>
+
<div class="box2-mid" id="roleMinimized" style="display:none;">
Expand to view details
</div>
@@ -268,24 +256,17 @@
<!-- End box2-mid div -->
</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>
+
<!-- Roles box ends -->
+
+</div>
</td>
</tr>
</table>
-</div>
-
<!-- START footer content -->
<jsp:include page="footer.jsp" />
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/permisions.jsp Fri Feb 1 04:52:31 2008
@@ -48,7 +48,7 @@
<td>
<input type="radio" id="permissionAllow" name="permissionType" value="1" checked="checked" />Allow <input type="radio" id="permissionDeny" name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="button" class="button" value="Add Permision" onclick="addUserPermission('<%=resource.getPath()%>')"/></td>
+ <td align="right"><input type="button" class="button" value="Add Permission" onclick="addUserPermission('<%=resource.getPath()%>')"/></td>
</tr>
</table>
</form>
@@ -102,7 +102,7 @@
<h3 style="padding-top:20px;">Role Permissions</h3>
<div id="rolePermisionsDiv" class="rolePermisionsDiv leftSpace">
-<h4>New Role Permisions</h4>
+<h4>New Role Permissions</h4>
<form theme="simple">
<table width="100%" border="0" cellpadding="5" cellspacing="0">
<tr>
@@ -132,7 +132,7 @@
<td>
<input type="radio" id="rolePermissionAllow" name="permissionType" value="1" checked="checked" />Allow <input type="radio" id="rolePermissionDeny" name="permissionType" value="2" />Deny
</td>
- <td align="right"><input type="button" class="button" value="Add Permision" onclick="addRolePermission('<%=resource.getPath()%>')"/></td>
+ <td align="right"><input type="button" class="button" value="Add Permission" onclick="addRolePermission('<%=resource.getPath()%>')"/></td>
</tr>
</table>
</form>
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 Fri Feb 1 04:52:31 2008
@@ -5,16 +5,27 @@
<%
AnnouncementsBean announcementsBean = (AnnouncementsBean) request.getSession().getAttribute(UIConstants.ANNOUNCEMENTS_BEAN);
%>
+<h2 class="sub-headding-about">About</h2>
+<div class="promotionDivContent">
+<a href="#" class="area" onclick="showHideCommon('getHelpDiv');">GET HELP</a>
+ <div id="getHelpDiv" class="aboutBack">
+ <h3>User guide</h3>
+ <a href="http://wso2.org/wiki/display/registry/WSO2+Registry+User+Guide" target="_blank">Registry user guide</a>
+ </div>
+ <a href="#" class="area" onclick="showHideCommon('getInvolvedDiv');">GET INVOLVED</a>
+ <div id="getInvolvedDiv" class="aboutBack">
+ <h3>Reporting Problems</h3>
+ Issues can be reported using the public JIRA.
+ <a href="https://wso2.org/jira/browse/REGISTRY " target="_blank">Registry jira</a>
+ </div>
+<a href="#" class="area" onclick="showHideCommon('getTrainingDiv');">NEWS</a>
+ <div id="getTrainingDiv" class="aboutBack">
+ <% if (announcementsBean != null) { %>
+ <%=announcementsBean.getAnnouncements()%>
+ <% } %>
+ </div>
+</div>
-<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 resources and meta-data in a simple and a business-friendly manner.
-</p>
-
-<% if (announcementsBean != null) { %>
-<%=announcementsBean.getAnnouncements()%>
-<% } %>
<!--<h3>WSO2 Registry Training</h3>-->
<!--<span>-->
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/recent-activity.jsp Fri Feb 1 04:52:31 2008
@@ -60,27 +60,13 @@
<!-- Hear comes the box1 table -->
- <div class="box1-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/box1-lefttop.jpg" /></td>
- <td valign="top">
+
+
<h2>Search Activities</h2>
- </td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
- </div>
- <div class="box1-mid" id="userMinimized" style="display:none;">
- Expand to view details
- </div>
- <div class="box1-mid" id="userExpanded">
+
+
+
+ <div class="box1-mid">
<!-- all the content goes here -->
<form action="/wso2registry/system/activity" method="get">
@@ -165,14 +151,7 @@
<!-- End box1-mid div -->
</div>
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
+
</td>
</tr>
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 Fri Feb 1 04:52:31 2008
@@ -51,12 +51,6 @@
<jsp:include page="header.jsp" />
-
-<div class="content">
-
-<% if (errorMessage != null) { %>
-<div class="error-message"><%=errorMessage%></div>
-<% } %>
<!--This is the START of main table which seperates 2 coloums for promotions and content of the site -->
<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
<tr>
@@ -64,54 +58,84 @@
<jsp:include page="promotion.jsp" />
</td>
<td valign="top">
-<div style="height:40px;" class="top-toolbar-back">
+<div class="content">
+
+<% if (errorMessage != null) { %>
+<div class="error-message"><%=errorMessage%></div>
+<% } %>
+
+ <h1 class="headding-resource"><% if (!details.isVersionView()) { %>Resource<% } %><% if (details.isVersionView()) { %>Version<% } %></h1>
+
+
+<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+<tr>
+<td class="leftColoumSizer" valign="top">
+
+<div class="box1-head">
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+ <tr>
+
+ <td valign="top">
+<h2 class="sub-headding-resources">
+<!-- Page resource path prints here -->
+<div class="top-toolbar-back">
<% if (details.isCollection()) { %>
- <h1>
+
<% } else { %>
- <h1>
- <% } %>
- <a href="/wso2registry/atom<%=details.getPath()%>" target="_blank" "Add to feed"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif" /></a>
- <%
+
+ <% }
List iNavPaths = details.getNavigatablePaths();
if (iNavPaths.size() > 0) {
ResourcePath rootPath = (ResourcePath) iNavPaths.get(0);
%>
- <a href="/wso2registry/web<%=rootPath.getNavigatePath()%>" title="root"><img border="0" src="/wso2registry/admin/images/icon-home.gif" /></a>
- <%
+ <a href="/wso2registry/web<%=rootPath.getNavigatePath()%>" title="root"><root></a>/<%
if (iNavPaths.size() > 1) {
ResourcePath childPath = (ResourcePath) iNavPaths.get(1);
- %>
- <a href="/wso2registry/web<%=childPath.getNavigatePath()%>"><%=childPath.getNavigateName()%></a>
- <%
+ %><a href="/wso2registry/web<%=childPath.getNavigatePath()%>"><%=childPath.getNavigateName()%></a><%
}
if (iNavPaths.size() > 2) {
for (int i = 2; i < iNavPaths.size(); i++) {
ResourcePath resourcePath = (ResourcePath) iNavPaths.get(i);
- %>
- /<a href="/wso2registry/web<%=resourcePath.getNavigatePath()%>"><%=resourcePath.getNavigateName()%></a>
+ %>/<a href="/wso2registry/web<%=resourcePath.getNavigatePath()%>"><%=resourcePath.getNavigateName()%></a>
<% }
}
} %>
- </h1>
+ </h2>
- <!-- a href="#" style="float:right; display:inline;margin-top:10px;margin-right:5px;"><img src="/wso2registry/admin/images/icon-folder-up.jpg" border="0" /></a-->
<span style="clear:both;" />
</div>
-
-<table cellspacing="0" cellpadding="0" border="0" style="width:100%">
-<tr>
-<td class="leftColoumSizer" valign="top">
-
-<!-- Page main information Starts here -->
-<div style="margin-bottom:10px;">
+ </h2></td>
+ <td align="right" valign="bottom">
+ <table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
+ <tr>
+ <td>
+ <a href="/wso2registry/atom<%=details.getPath()%>" target="_blank" title="Subscribe to this feed"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif" /></a>
+ </td>
+ <td>
+ <a href="#" onclick="showHideCommon('mainDetailsIconExpanded');showHideCommon('mainDetailsIconMinimized');showHideCommon('resourceMainDetails');showHideCommon('resourceMainDetailsMin');">
+ <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="mainDetailsIconExpanded" />
+ <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="mainDetailsIconMinimized" style="display:none;" />
+ </a>
+ </td>
+ </tr>
+ </table>
+ </td>
+
+ </tr>
+ </table>
+</div>
+<div class="box1-mid" id="resourceMainDetailsMin" style="display:none;" >
+</div>
+<div class="box1-mid" id="resourceMainDetails">
<% if (details.isVersionView()) { %>
<div class="versionsToolBar"><img src="/wso2registry/admin/images/back.gif" align="top" vspace="2" /> <a href="/wso2registry/versions<%=details.getActiveResourcePath()%>">Back to Versions of <%=details.getActiveResourcePath()%></a> | <img src="/wso2registry/admin/images/icon-restore.gif" border="0" align="top" vspace="2" /> <a href="/wso2registry/system/restore?versionPath=<%=details.getPath()%>" title="Restore" style="margin-left:5px;"> Restore to this version </a></div>
<% } %>
- <!-- all the content goes here -->
+
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
+
<tr><th style="width:140px;">Created:</th><td style="width:170px;"><%=details.getFormattedCreatedOn()%></td><th>Author:</th><td><%=details.getAuthor()%></td></tr>
<tr><th>Last Updated:</th><td><%=details.getFormattedLastModified()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
<tr><th>Media Type:</th><td colspan="3"><% if (details.getMediaType() != null) { %><%=details.getMediaType()%><% } else { %>Unknown<% } %></td> </tr>
@@ -120,7 +144,7 @@
<% } else { %>
<tr><th>Permalink:</th><td colspan="3"><a target="_blank" href="/wso2registry/resources<%=details.getPermalink()%>"><%=details.getServerBaseURL()%>/wso2registry/resources<%=details.getPermalink()%></a></td></tr>
<% } %>
- <% if (!details.isVersionView()) { %><tr><th>Versions</th><td colspan="3"><a href="/wso2registry/versions<%=details.getPath()%>">View versions</a></td> </tr><% } %>
+ <% if (!details.isVersionView()) { %><tr><th>Versions:</th><td colspan="3"><a href="/wso2registry/versions<%=details.getPath()%>">View versions</a></td> </tr><% } %>
</table>
<div id="ratingDiv"><img src="/wso2registry/admin/images/ajax-loader.gif" /></div>
@@ -132,11 +156,11 @@
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table">
<tr>
<th style="width:140px;height:25px;">
- Properties
+ Properties:
</th>
<td>
<% if (!details.isPutAllowed()) { %>
- <!-- span class="helpText">Sorry. You don't have permisions to add new properties.</span -->
+ <!-- span class="helpText">Sorry. You don't have Permissions to add new properties.</span -->
<%
} else if (details.isVersionView()) {
%>
@@ -257,22 +281,21 @@
<div class="box1-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/box1-lefttop.jpg" /></td>
<td valign="top">
- <h2> Entries </h2>
+ <h2 class="sub-headding-entries"> Entries </h2>
</td>
- <td align="right" valign="top">
+ <td align="right" valign="bottom">
<table cellpadding="0" cellspacing="0" border="0" class="toolBarTable" style="widht:120px;*width:80px;">
<tr>
<% if (details.isCollection() && details.isPutAllowed() && !details.isVersionView()) { %>
<td>
- <a href="#resources" title="Add Resource" onclick="showHide('add-resource-div');expandIfNot('entries');"><img src="/wso2registry/admin/images/icon-add-resource.gif" border="0" align="top" style="margin-top:-5px;" /></a>
+ <a href="#resources" title="Add Resource" onclick="showHide('add-resource-div');expandIfNot('entries');"><img src="/wso2registry/admin/images/icon-add-resource.jpg" border="0" align="top" style="margin-top:-5px;" /></a>
</td>
<td valign="top">
- <a href="#resources" name="resources" title="Add Collection" onclick="showHide('add-folder-div');expandIfNot('entries');"><img src="/wso2registry/admin/images/icon-add-folder.gif" border="0" align="top" style="margin-top:-3px;" /></a>
+ <a href="#resources" name="resources" title="Add Collection" onclick="showHide('add-folder-div');expandIfNot('entries');"><img src="/wso2registry/admin/images/icon-add-folder.jpg" border="0" align="top" style="margin-top:-3px;" /></a>
</td>
<% } %>
<td>
@@ -283,18 +306,15 @@
</td>
</tr>
</table>
-
-
-
+
</td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
+
</tr>
</table>
</div>
<div class="box1-mid" id="entriesMinimized" style="display:none;">
- Expand to view entries
</div>
-<div class="box1-mid" id="entriesExpanded" style="padding-left:5px;">
+<div class="box1-mid" id="entriesExpanded">
<!-- all the content goes here -->
@@ -392,7 +412,7 @@
if(!collection.getResourceDataList().isEmpty()) {
%>
<tr>
- <th></th>
+ <th>Name</th>
<th>Created Date</th>
<th>Author</th>
<th>Rating</th>
@@ -432,7 +452,7 @@
<img src="/wso2registry/admin/images/r<%=resourceData.getAverageStars()[4]%>.gif" align="top" />
(<%=resourceData.getAverageRating()%>)
</td>
- <td><a href="/wso2registry/atom<%=resourceData.getResourcePath()%>" target="_blank"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif"/></a>
+ <td><a href="/wso2registry/atom<%=resourceData.getResourcePath()%>" target="_blank" title="Subscribe to this feed"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif"/></a>
</td>
<td>
<% if (resourceData.isDeleteAllowed() && !details.isVersionView()) { %><a href="/wso2registry/system/deleteResource?resourcePath=<%=resourceData.getResourcePath()%>" title="Delete" style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-trash.gif" border="0" /></a> <% } %>
@@ -458,42 +478,29 @@
<!-- End box1-mid div -->
</div>
-
-
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
<!-- End Entries -->
-<!-- Start Permisions -->
+<!-- Start Permissions -->
<!-- Hear comes the box1 table -->
<% if (details.isAuthorizeAllowed() && !details.isVersionView()) { %>
<div class="box1-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/box1-lefttop.jpg" /></td>
<td valign="top">
- <h2>Permisions</h2>
+ <h2 class="sub-headding-permisions">Permissions</h2>
</td>
- <td align="right" valign="top">
+ <td align="right" valign="middle">
<a href="#" onclick="showHideCommon('perIconExpanded');showHideCommon('perIconMinimized');showHideCommon('perExpanded');showHideCommon('perMinimized');">
<img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="perIconExpanded" style="display:none;" />
<img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="perIconMinimized" />
</a>
</td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
</tr>
</table>
</div>
<div class="box1-mid" id="perMinimized" >
- Expand to view permisions
</div>
<div class="box1-mid" id="perExpanded" style="display:none;">
<!-- all the content goes here -->
@@ -502,39 +509,44 @@
<!-- End box1-mid div -->
</div>
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
<% } %>
</td>
-<td style="padding-left:10px;" valign="top">
+<td valign="top" style="width:5px;" align="center">
+<img src="/wso2registry/admin/images/colSep.jpg" border="0" hspace="10" />
+</td>
+<td class="rightColumnSizer" valign="top">
<!-- Tag cloude box starts here -->
<!-- Hear comes the box2 table -->
<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>Tags</h2></td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('tagIconExpanded');showHideCommon('tagIconMinimized');showHideCommon('tagExpanded');showHideCommon('tagMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="tagIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="tagIconMinimized" style="display:none;" />
- </a>
+
+ <td valign="top"><h2 class="sub-headding-tags">Tags</h2></td>
+ <td align="right" valign="bottom">
+ <table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
+ <tr>
+ <td>
+ <% if (details.isLoggedIn() && !details.isVersionView()) { %><a href="#" onclick="showHideCommon('tagAddTable');expandIfNot('comments');"><img src="/wso2registry/admin/images/universal-add.gif" border="0" valign="top" title="Add New Tag" /></a><% } %>
+ </td>
+
+ <td>
+ <a href="#" onclick="showHideCommon('tagIconExpanded');showHideCommon('tagIconMinimized');showHideCommon('tagExpanded');showHideCommon('tagMinimized');">
+ <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="tagIconExpanded" />
+ <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="tagIconMinimized" style="display:none;" />
+ </a>
+ </td>
+ </tr>
+ </table>
+
</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" id="tagMinimized" style="display:none;">
- Expand to view details
</div>
<div class="box2-mid" id="tagExpanded">
<div id="cloude-text" class="cloude-text">
@@ -548,12 +560,11 @@
</div>
<% if (!details.isLoggedIn()) { %>
- Sign in to add tags
<% } else if (details.isVersionView()) { %>
Go to the current version to add tags
<% } else { %>
- <table cellpadding="0" cellspacing="0" border="0" style="width:100%" class="form-table">
+ <table cellpadding="0" cellspacing="0" border="0" style="width:100%; display:none;" class="form-table" id="tagAddTable">
<tr>
<td>
<input id="tfPath" type="hidden" name="resourcePath" value="<%=details.getPath()%>"/>
@@ -572,28 +583,21 @@
<% } %>
</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>
+
<!-- Here comes the comments box -->
<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>Comments</h2></td>
- <td align="right" valign="top">
- <table cellpadding="0" cellspacing="0" border="0" class="toolBarTable" style="margin-top:-5px;display:block;*display:inline;*margin-top:-5px;width:120px;*width:80px;">
+
+ <td valign="top"><h2 class="sub-headding-comments">Comments</h2></td>
+ <td align="right" valign="bottom">
+ <table cellpadding="0" cellspacing="0" border="0" class="toolBarTable">
<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><% } %>
</td>
<td>
- <a href="/wso2registry/atom<%=details.getPath()%>;comments" target="_blank"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif" /></a>
+ <a href="/wso2registry/atom<%=details.getPath()%>;comments" target="_blank" title="Subscribe to this feed"><img border="0" src="/wso2registry/admin/images/icon-feed-small.gif" /></a>
</td>
<td>
<a href="#" onclick="showHideCommon('commentsIconExpanded');showHideCommon('commentsIconMinimized');showHideCommon('commentsExpanded');showHideCommon('commentsMinimized');">
@@ -604,12 +608,11 @@
</tr>
</table>
</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" id="commentsMinimized" style="display:none;">
- Expand to view details
</div>
<div class="box2-mid" id="commentsExpanded">
@@ -644,77 +647,16 @@
<!-- END comment listing box -->
</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>
</tr>
</table>
+</div>
<!--This is the END of main table which seperates 2 coloums for promotions and content of the site -->
</td>
</tr>
</table>
-<!-- Version box starts -->
-<!-- Hear comes the box2 table -->
-<%--<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>Versions</h2></td>--%>
-<%--<td align="right" valign="top">--%>
-<%--<a href="#" onclick="showHideCommon('versionsIconExpanded');showHideCommon('versionsIconMinimized');showHideCommon('versionsExpanded');showHideCommon('versionsMinimized');">--%>
-<%--<img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="versionsIconExpanded" style="display:none;" />--%>
-<%--<img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="versionsIconMinimized" />--%>
-<%--</a>--%>
-<%--</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" id="versionsMinimized">--%>
-<%--<a href="/wso2registry/versions<%=details.getPath()%>">View versions</a>--%>
-<%--</div>--%>
-<%--<div class="box2-mid" id="versionsExpanded" style="display:none;">--%>
-
-<%--<%--%>
-<%--Iterator iVersions = details.getVersionPaths().iterator();--%>
-<%--while (iVersions.hasNext()) {--%>
-<%--VersionPath versionPath = (VersionPath) iVersions.next();--%>
-<%--%>--%>
-
-<%--<h3>Version <%=versionPath.getVersionNumber()%></h3>--%>
-
-<%--<strong style="color:#696969;">Last Modified:</strong><br>--%>
-<%--<%=versionPath.getUpdatedOn().toString()%>--%>
-<%--<br><strong style="color:#696969;">By:</strong> <%=versionPath.getUpdater()%>--%>
-<%--<br>--%>
-<%--<div style="margin-bottom:10px;">--%>
-<%--<a href="/wso2registry/web<%=versionPath.getCompleteVersionPath()%>" title="Details">Details <img src="/wso2registry/admin/images/icon-details.gif" border="0" hspace="3" /></a>--%>
-<%--<a href="#" title="Restore" style="margin-left:5px;">Restore <img src="/wso2registry/admin/images/icon-restore.gif" border="0" /></a>--%>
-<%--</div>--%>
-
-
-<%--<% } %>--%>
-<%--</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>--%>
-
-<%--</tr>--%>
-<%--</table>--%>
-<%--</div>--%>
+
<!-- START footer content -->
<jsp:include page="footer.jsp" />
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/search.jsp Fri Feb 1 04:52:31 2008
@@ -27,30 +27,20 @@
<! START body content -->
<div class="content">
+ <!--This is the START of main table which seperates 2 coloums for promotions and content of the site -->
+<table cellpadding="0" cellspacing="0" border="0" style="width:100%;">
+ <tr>
+ <td class="promotionDiv" valign="top">
+ <jsp:include page="promotion.jsp" />
+ </td>
+ <td valign="top">
<h1 class="headding-search">Search</h1>
<!-- Hear comes the box1 table -->
-<div class="box1-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/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2>Search Results</h2>
- </td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
-</div>
-<div class="box1-mid" id="userMinimized" style="display:none;">
- Expand to view details
-</div>
-<div class="box1-mid" id="userExpanded">
+
+<h2>Search Results</h2>
+
+<div class="box1-mid">
<!-- all the content goes here -->
<!-- Search results display -->
@@ -110,18 +100,10 @@
</table>
<!-- End box1-mid div -->
</div>
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
-
-
-
+</td>
+</tr>
+</table>
</div>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp Fri Feb 1 04:52:31 2008
@@ -42,27 +42,12 @@
<% } %>
<!-- Hear comes the box1 table -->
-<div class="box1-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/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2><%=userDetailsAction.getDisplayUserName()%></h2>
- </td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
-</div>
-<div class="box1-mid" id="userMinimized" style="display:none;">
- Expand to view details
-</div>
-<div class="box1-mid" id="userExpanded">
+
+<h2><%=userDetailsAction.getDisplayUserName()%></h2>
+
+
+
+<div class="box1-mid">
<!-- all the content goes here -->
<div id="friendlyNameDiv">
<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table" style="width:400px;margin-bottom:10px;">
@@ -175,14 +160,7 @@
</table>
<!-- End box1-mid div -->
</div>
-<div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
-</div>
+
<!--This is the END of main table which seperates 2 coloums for promotions and content of the site -->
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp (original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/versions.jsp Fri Feb 1 04:52:31 2008
@@ -35,29 +35,10 @@
<jsp:include page="promotion.jsp" />
</td>
<td valign="top">
- <h1 class="headding-recent-activity">Versions of <%=versionBean.getResourcePath()%></h1>
+ <h1 class="headding-resource">Versions of <%=versionBean.getResourcePath()%></h1>
- <!-- Hear comes the box1 table -->
- <div class="box1-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/box1-lefttop.jpg" /></td>
- <td valign="top">
- </td>
- <td align="right" valign="top">
- <a href="#" onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top" id="userIconExpanded" />
- <img src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top" id="userIconMinimized" style="display:none;" />
- </a>
- </td>
- <td valign="top" align="right" style="width:14px; padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg" /></td>
- </tr>
- </table>
- </div>
- <div class="box1-mid" id="userMinimized" style="display:none;">
- Expand to view details
- </div>
- <div class="box1-mid" id="userExpanded">
+
+ <div class="box1-mid">
<!-- all the content goes here -->
@@ -107,14 +88,6 @@
<!-- End box1-mid div -->
</div>
- <div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
- <td align="right"><img src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
</td>
More information about the Registry-dev
mailing list