Author: chanaka
Date: Tue Dec 18 01:11:07 2007
New Revision: 11355
Log:
1 icon alignment fixes for IE and Firefox
2 made header look and feel little different
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-role.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-user.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment-add.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left-updown.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right-updown.gif
(contents, props changed)
trunk/registry/modules/webapps/src/main/webapp/admin/images/popback.png
(contents, props changed)
Removed:
trunk/registry/modules/webapps/src/main/webapp/admin/images/nicEditorIcons.gif
Modified:
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/box1-lefttop.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/box1-righttop.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/box1-top.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-lefttop.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-righttop.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-top.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/header-back.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-left.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-rep.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-right.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/logo.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-back.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right.jpg
trunk/registry/modules/webapps/src/main/webapp/admin/images/r00.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r01.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r02.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r03.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r04.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r44.gif
trunk/registry/modules/webapps/src/main/webapp/admin/images/r4x.gif
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/registry-resources.jsp
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 Tue Dec
18 01:11:07 2007
@@ -35,7 +35,7 @@
padding:0px;
margin:0px;
font-family:Georgia;
-font-size:15px;
+font-size:14px;
color:#575757;
}
h3{
@@ -91,16 +91,20 @@
margin:0px;
padding:0px;
height:28px;
-margin-top:5px;
-
}
-.top-menu a{
+.top-menu-table{
+margin-top:4px;
+}
+.top-menu-table a{
color:#ffffff;
text-decoration:none;
}
-.top-menu a:hover{
+.top-menu-table a:hover{
color:#fcfbb5 !important;
}
+.top-menu-table td{
+padding-right:20px;
+}
.top-menu-selected{
text-decoration:none;
color:#fcfbb5 !important;
@@ -110,9 +114,7 @@
.top-menu-selected:hover{
color:#ffffff;
}
-.top-menu td{
-padding-right:20px;
-}
+
/* Table styles */
.simple-data-table th{
text-align:left;
@@ -402,7 +404,7 @@
}
.popup{
position:absolute;
-width:400px;
+width:480px;
top:60px;
right:10px;
@@ -410,7 +412,6 @@
.popup-head{
background-color:#555555;
border:solid 1px #1c1c1c;
-height:25px;
color:#000000;
font-weight:bold;
@@ -421,7 +422,9 @@
border:solid 1px #2c2c2c;
opacity:1;
-padding:15px;
+padding-left:15px;
+padding-top:5px;
+padding-bottom:20px;
}
.login-menu{
background-image:url(../images/login-box-rep.gif);
@@ -429,7 +432,14 @@
background-position:0px 0px;
margin:0px;
padding:0px;
-height:28px;
+height:21px;
margin-top:5px;
+}
+.search-table{
+margin-top:3px;
+}
+.search-table td{
+padding-right:5px;
+
}
\ 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 Tue Dec
18 01:11:07 2007
@@ -8,7 +8,7 @@
<table cellpadding="0" cellspacing="0" border="0"
style="width:100%;border-bottom:solid 1px #989898;">
<tr>
<td align="left" style="width:8px;"><img
src="/wso2registry/admin/images/login-box-left.gif" /></td>
- <td align="left" class="login-menu" ><h2>Login</h2></td>
+ <td align="left" class="login-menu" >Login</td>
<td align="right"
style="padding-right:0px;width:8px;"><img
src="/wso2registry/admin/images/login-box-right.gif" /></td>
</tr>
</table>
@@ -57,45 +57,54 @@
<td valign="top" ><img
src="/wso2registry/admin/images/logo.jpg" style="margin:0px padding:0px;"/></td>
<td align="right" style="padding-top:5px;">
- <div>
- <a
href="/wso2registry/system/search/advanced/new"
class="advanced-search">Advanced Search <img
src="/wso2registry/admin/images/icon-go.gif" border="0" /></a>
- <form
action="/wso2registry/system/search" method="get" style="display:inline;"
name="searchForm">
-
- <input type="text"
name="criteria" class="input-text" />
- <a href="#"
onclick="document.searchForm.submit();"><img
src="/wso2registry/admin/images/icon-search.gif" border="0" style="margin:0px
padding:0px;"/></a><!-- input type="submit" class="button" value="Search" / -->
- </form>
+ <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 cellpadding="0" cellspacing="0"
border="0" class="top-menu-table">
<tr>
- <td
style="background-color:#ffffff;">
+ <td>
<%
if
(!userName.equals(RegistryConstants.ANONYMOUS_USER)) {%>
- <script
language="javascript" type="text/javascript">doGreeting();</script>
<%=userName%>! (Logged in)
+ <span>
<script language="javascript"
type="text/javascript">doGreeting();</script></span> <%=userName%>!
<% } %>
</td>
- <td align="left"><img
src="/wso2registry/admin/images/menu-left.jpg" /></td>
- <td>
+ <td align="left"
style="padding-right:0px;"><img src="/wso2registry/admin/images/menu-left.jpg"
/></td>
+ <td class="top-menu">
<a
href="<%=webPath%>">
<img
src="/wso2registry/admin/images/icon-registryResources.gif" border="0"
align="top" /> Resources
</a>
</td>
- <td>
+ <td class="top-menu">
<a
href="/wso2registry/system/people">
<img
src="/wso2registry/admin/images/icon-people-small.gif" border="0" align="top"
/> People
</a>
</td>
- <td>
+ <td class="top-menu">
<a
href="/wso2registry/system/activity/new">
<img
src="/wso2registry/admin/images/icon-recent-activity-small.gif" border="0"
align="top" /> Activity
</a>
</td>
- <td>
+ <td class="top-menu">
<a
href="/wso2registry/system/activity/new">
<img
src="/wso2registry/admin/images/icon-recent-activity-small.gif" border="0"
align="top" /> Admin
</a>
</td>
- <td>
+ <td class="top-menu">
<%
if
(userName.equals(RegistryConstants.ANONYMOUS_USER)) {
%>
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box1-lefttop.jpg
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box1-righttop.jpg
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box1-top.jpg
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-lefttop.jpg
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-righttop.jpg
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/box2-top.jpg
==============================================================================
Binary files. 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-add-role.gif
==============================================================================
Binary file. No diff available.
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-add-user.gif
==============================================================================
Binary file. No diff available.
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/icon-comment-add.gif
==============================================================================
Binary file. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-left.gif
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-rep.gif
==============================================================================
Binary files. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/login-box-right.gif
==============================================================================
Binary files. No diff available.
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/images/menu-back.jpg
==============================================================================
Binary files. No diff available.
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left-updown.gif
==============================================================================
Binary file. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-left.jpg
==============================================================================
Binary files. No diff available.
Added:
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right-updown.gif
==============================================================================
Binary file. No diff available.
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/images/menu-right.jpg
==============================================================================
Binary files. No diff available.
Added: trunk/registry/modules/webapps/src/main/webapp/admin/images/popback.png
==============================================================================
Binary file. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r00.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r01.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r02.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r03.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r04.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r44.gif
==============================================================================
Binary files. No diff available.
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/images/r4x.gif
==============================================================================
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 Tue Dec
18 01:11:07 2007
@@ -174,7 +174,7 @@
var edit_button = document.getElementById('editButton');
if (edit_button.value=='Save Description') {
- tinyMCE.triggerSave();
+ tinyMCE.triggerSave();
var desc = tinyMCE.getContent();
tinyMCE.execCommand('mceRemoveControl', false, 'descEdit');
new Ajax.Updater('descView', '/wso2registry/system/setDescription', {
method: 'post', parameters: {description: desc} });
@@ -221,24 +221,6 @@
}
-function applyTag(e) {
-
- var keyCode;
- if (window.event) {
- keyCode = window.event.keyCode;
- } else {
- keyCode = e.which;
- }
-
- if (keyCode == 13) {
-
- var resourcePath = document.getElementById('tfPath').value;
- var tag = document.getElementById('tfTag').value;
- new Ajax.Updater('cloude-text', '/wso2registry/system/applyTag', {
method: 'post', parameters: {resourcePath: resourcePath, tag: tag} });
- document.getElementById('tfTag').value = "";
- }
-}
-
// media type map to store file_extension -> media type pairs.
// these media type data will be retrieved upon the first request and stored
in memory.
var mediaTypeMap = null;
@@ -351,13 +333,13 @@
rForm.submit();
}
function doGreeting(){
- datetoday = new Date();
- timenow=datetoday.getTime();
- datetoday.setTime(timenow);
- thehour = datetoday.getHours();
- if (thehour > 18) display = "evening";
- else if (thehour >12) display = "afternoon";
- else display = "morning";
- var greeting = ("Good " + display);
- document.write(greeting);
+ datetoday = new Date();
+ timenow=datetoday.getTime();
+ datetoday.setTime(timenow);
+ thehour = datetoday.getHours();
+ if (thehour > 18) display = "evening";
+ else if (thehour >12) display = "afternoon";
+ else display = "morning";
+ var greeting = ("Good " + display);
+ document.write(greeting);
}
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
Tue Dec 18 01:11:07 2007
@@ -166,21 +166,21 @@
<td align="right" valign="top">
- <table cellpadding="0" cellspacing="0"
border="0" class="toolBarTable" style="margin-top:-13px;">
+ <table cellpadding="0" cellspacing="0"
border="0" class="toolBarTable">
<tr>
<% if (details.isCollection() &&
details.isPutAllowed()) { %>
<td>
- <a href="#" title="Add
Resource" onclick="showHide('add-resource-div')"><img
src="/wso2registry/admin/images/icon-add-resource.gif" border="0" align="top"
/></a>
+ <a href="#" title="Add
Resource" onclick="showHide('add-resource-div')"><img
src="/wso2registry/admin/images/icon-add-resource.gif" border="0" align="top"
style="margin-top:-5px;" /></a>
</td>
<td valign="top">
- <a href="#" title="Add
Collection" onclick="showHide('add-folder-div')"><img
src="/wso2registry/admin/images/icon-add-folder.gif" border="0" align="top"
style="margin-top:1px;" /></a>
+ <a href="#" title="Add
Collection" onclick="showHide('add-folder-div')"><img
src="/wso2registry/admin/images/icon-add-folder.gif" border="0" align="top"
style="margin-top:-3px;" /></a>
</td>
<% } %>
<td>
<a href="#"
onclick="showHideCommon('entriesIconExpanded');showHideCommon('entriesIconMinimized');showHideCommon('entriesExpanded');showHideCommon('entriesMinimized');">
- <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="entriesIconExpanded" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="entriesIconMinimized" style="display:none;" />
+ <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="entriesIconExpanded" style="margin-top:-4px;" />
+ <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="entriesIconMinimized" style="display:none;margin-top:-4px;" />
</a>
</td>
</tr>
@@ -296,7 +296,7 @@
<th>Created Date</th>
<th>Author</th>
<th>Rating</th>
- <th>Action</th>
+ <th></th>
</tr>
<%
@@ -317,8 +317,6 @@
(<%=resourceData.getAverageRating()%>)
</td>
<td>
- <a href="#" title="Sub Items"><img
src="/wso2registry/admin/images/icon-subitems.gif" border="0" /></a>
- <a href="#" title="Show Details"
style="margin-left:5px;"><img src="/wso2registry/admin/images/icon-details.gif"
border="0" /></a>
<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>
</td>
@@ -403,7 +401,7 @@
<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><img
src="/wso2registry/admin/images/icon-tag.gif" /> Tags</h2></td>
+ <td valign="top"><h2><img
src="/wso2registry/admin/images/icon-tag.gif" align="top" /> 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" />
@@ -460,15 +458,15 @@
<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><img
src="/wso2registry/admin/images/icon-comment.gif" /> Comments</h2></td>
+ <td valign="top"><h2><img
src="/wso2registry/admin/images/icon-comment.gif" align="top" />
Comments</h2></td>
<td align="right" valign="top">
<table cellpadding="0"
cellspacing="0" border="0" class="toolBarTable">
<tr>
- <td><a href="#"
onclick="showHideCommon('add-comment-div');"><img
src="/wso2registry/admin/images/icon-add-comment.gif" border="0" /></a></td>
+ <td><a href="#"
onclick="showHideCommon('add-comment-div');"><img
src="/wso2registry/admin/images/icon-add-comment.gif" border="0" valign="top"
style="margin-top:-7px;" /></a></td>
<td>
<a
href="#"
onclick="showHideCommon('commentsIconExpanded');showHideCommon('commentsIconMinimized');showHideCommon('commentsExpanded');showHideCommon('commentsMinimized');">
- <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="commentsIconExpanded" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="commentsIconMinimized" style="display:none;" />
+ <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="commentsIconExpanded" style="margin-top:-4px;" />
+ <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="commentsIconMinimized" style="display:none;margin-top:-4px;" />
</a>
</td>
</tr>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
