Author: chanaka
Date: Fri Dec 21 01:29:20 2007
New Revision: 11653
Log:
1 Made "edit description" button less prominent
2 fixed some alignment issues
3 Advanced search, Recent activity page calendar control fixes
4 Download icon made bigger
Added:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/icon-edit.gif
(contents, props changed)
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/icon-search.jpg
(contents, props changed)
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/save-button.gif
(contents, props changed)
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
branches/registry/0_1/modules/webapps/src/main/webapp/admin/css/main.css
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/CodeThatCalendar/codethatcalendar.html
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/common.js
branches/registry/0_1/modules/webapps/src/main/webapp/admin/recent-activity.jsp
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
(original)
+++
branches/registry/0_1/modules/webapps/src/main/webapp/admin/advanced-search.jsp
Fri Dec 21 01:29:20 2007
@@ -22,12 +22,14 @@
<script language="javascript1.2"
src="/wso2registry/admin/js/CodeThatCalendar/dt_ex.js"></script>
<link type="text/css" href="/wso2registry/admin/css/main.css"
rel="stylesheet" />
- <link rel=stylesheet type="text/css"
href="/wso2registry/admin/js/CodeThatCalendar/s.css">
+
<script language="javascript1.2">
<!--
var c1 = new CodeThatCalendar(caldef3);
var c2 = new CodeThatCalendar(caldef3);
+ var c3 = new CodeThatCalendar(caldef3);
+ var c4 = new CodeThatCalendar(caldef3);
//-->
</script>
</head>
@@ -96,20 +98,20 @@
<tr>
<td valign="top">Date</td>
<td>
- <div style="width:200px;">Only find resource created</div>
- From: <input type="text" name="createdAfter" value=""
id="#_cfromDate" style="width:100px;"/> <a href="#cal1" name="cal1"
onclick="c1.popup('createdAfter');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ <div style="width:200px;" class="helpTextTop">Only find
resource created</div>
+ From: <input type="text" name="createdAfter" value=""
id="#_cfromDate" style="width:140px;"/> <a href="#cal1" name="cal1"
onclick="c1.popup('createdAfter');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
- To: <input type="text" name="createdBefore" value=""
id="#_ctoDate" style="width:100px;"/> <a href="#cal1"
onclick="c2.popup('createdBefore');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ To: <input type="text" name="createdBefore" value=""
id="#_ctoDate" style="width:140px;"/> <a href="#cal1"
onclick="c2.popup('createdBefore');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
</td>
</tr>
<tr>
<td valign="top">Date</td>
<td>
- <div style="width:200px;">Only find resources updated</div>
- From: <input type="text" name="updatedAfter" value=""
id="#_ufromDate" style="width:100px;"/>
+ <div style="width:200px;" class="helpTextTop">Only find
resources updated</div>
+ From: <input type="text" name="updatedAfter" value=""
id="#_ufromDate" style="width:140px;"/> <a href="#cal1" name="cal1"
onclick="c3.popup('updatedAfter');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
- To: <input type="text" name="updatedBefore" value=""
id="#_utoDate" style="width:100px;"/>
+ To: <input type="text" name="updatedBefore" value=""
id="#_utoDate" style="width:140px;"/> <a href="#cal1" name="cal1"
onclick="c4.popup('updatedBefore');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
</td>
</tr>
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/ajax_rating.jsp
Fri Dec 21 01:29:20 2007
@@ -54,7 +54,7 @@
</tr>
<% } %>
<tr>
- <th valign="top">Avarage Rating:</th>
+ <th valign="top" style="width:140px;">Avarage Rating:</th>
<td>
<div id="ratingDivAvg">
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/css/main.css
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/css/main.css
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/css/main.css
Fri Dec 21 01:29:20 2007
@@ -352,10 +352,15 @@
}
/* editing panel */
#descView{
+border:solid 1px #e5daca;
+
+width:98%;
+padding-left:5px;
}
#descEdit{
border:solid 1px #e5daca;
}
+
.resource-content{
width:100%;
height:60px;
@@ -383,6 +388,10 @@
font-size:90%;
margin-bottom:15px;
}
+.helpTextTop{
+color:#444444;
+font-size:90%;
+}
.comments-bottom{
background-color:#f6f6e8;
padding:5px;
Added:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/icon-edit.gif
==============================================================================
Binary file. No diff available.
Added:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/icon-search.jpg
==============================================================================
Binary file. No diff available.
Added:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/images/save-button.gif
==============================================================================
Binary file. No diff available.
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/CodeThatCalendar/codethatcalendar.html
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/CodeThatCalendar/codethatcalendar.html
(original)
+++
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/CodeThatCalendar/codethatcalendar.html
Fri Dec 21 01:29:20 2007
@@ -1,6 +1,7 @@
<html>
<head>
<title>CodeThat Calendar STD</title>
+<link rel=stylesheet type="text/css" href="s.css">
</head>
<link href="ctcstd.css" rel="stylesheet" type="text/css">
<script language=javascript src="Scripts/codethatcalendarstd.js"></script>
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ branches/registry/0_1/modules/webapps/src/main/webapp/admin/js/common.js
Fri Dec 21 01:29:20 2007
@@ -173,7 +173,7 @@
var edit_div=document.getElementById('descEdit');
var edit_button = document.getElementById('editButton');
- if (edit_button.value=='Save Description') {
+ if (edit_button.title=='Save Description') {
tinyMCE.triggerSave();
var desc = tinyMCE.getContent();
tinyMCE.execCommand('mceRemoveControl', false, 'descEdit');
@@ -185,12 +185,15 @@
normal_div.style.display='none';
edit_div.style.display='block';
tinyMCE.execCommand('mceAddControl', false, 'descEdit');
- edit_button.value= 'Save Description';
+ edit_button.title= 'Save Description';
+ document.editButtonImage.src=
'/wso2registry/admin/images/save-button.gif';
}
else {
normal_div.style.display='block';
edit_div.style.display='none'
- edit_button.value= 'Edit Description';
+ edit_button.title= 'Edit Description';
+ document.editButtonImage.src=
'/wso2registry/admin/images/icon-edit.gif';
+
}
}
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/recent-activity.jsp
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/webapp/admin/recent-activity.jsp
(original)
+++
branches/registry/0_1/modules/webapps/src/main/webapp/admin/recent-activity.jsp
Fri Dec 21 01:29:20 2007
@@ -21,7 +21,6 @@
<script language="javascript1.2"
src="/wso2registry/admin/js/CodeThatCalendar/dt_ex.js"></script>
<link type="text/css" href="/wso2registry/admin/css/main.css"
rel="stylesheet" />
- <link rel=stylesheet type="text/css"
href="/wso2registry/admin/js/CodeThatCalendar/s.css">
<script language="javascript1.2">
<!--
@@ -89,9 +88,9 @@
<tr>
<td valign="top">Date</td>
<td>
- <div style="width:200px;
font-style:italic;">Only find results updated</div>
- From<input type="text" name="fromDate"
disabled/> <a href="#cal1" name="cal1" onclick="c1.popup('fromDate');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
- To: <input type="text" name="toDate"
disabled/> <a href="#cal1" onclick="c2.popup('toDate');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ <div class="helpTextTop">Only find results
updated</div>
+ From: <input type="text" name="fromDate"
style="widht:140px;" /> <a href="#cal1" name="cal1"
onclick="c1.popup('fromDate');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
+ To: <input type="text" name="toDate"
style="widht:140px;" /> <a href="#cal1" onclick="c2.popup('toDate');"><img
src="/wso2registry/admin/images/calendar.jpg" border="0" align="top" /></a>
</td>
</tr>
Modified:
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
==============================================================================
---
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
(original)
+++
branches/registry/0_1/modules/webapps/src/main/webapp/admin/registry-resources.jsp
Fri Dec 21 01:29:20 2007
@@ -22,7 +22,8 @@
<script language="javascript" type="text/javascript">
tinyMCE.init({
mode : "none",
- theme : "advanced"
+ theme : "advanced",
+ theme_advanced_toolbar_location : "top"
});
</script>
@@ -119,30 +120,40 @@
<table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
<tr><th style="width:140px;">Created:</th><td
style="width:170px;"><%=details.getCreatedOn().toString()%></td><th>Author:</th><td><%=details.getAuthor()%></td></tr>
<tr><th>Last
Updated:</th><td><%=details.getLastModified().toString()%></td><th>By:</th><td><%=details.getLastUpdater()%></td></tr>
- <tr><td colspan="4"><a
href="/wso2registry/versions<%=details.getPath()%>">View versions</a></td> </tr>
+ <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>
- <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table">
+
+ <!-- Description editing will goes here -->
+ <script type="text/javascript" xml:space="preserve">
+ new Ajax.Updater('ratingDiv', '/wso2registry/system/getInitialRating',
{ method: 'get', parameters: {resourcePath: '<%=details.getPath()%>'} });
+ </script>
+
+
+
+
+ <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table" style="width:100%">
<tr>
- <th style="width:140px; padding-bottom:10px; padding-top:10px;"
valign="top">Description:</th>
+ <th style="width:120px; padding-bottom:10px; "
valign="top">Description:</th>
+ <td valign="top" style="width:17px;">
+ <% if (details.isPutAllowed()) { %>
+ <a href="#editButton" id="editButton" name="editButton"
title="Edit Description" onclick="processDescription();"><img
src="/wso2registry/admin/images/icon-edit.gif" name="editButtonImage"
border="0" align="top" id="mainIconExpanded" /></a>
+ <% } %>
+ </td>
+
<td valign="top">
<div id="descView" style="display:block;">
description...
</div>
+
+ <textarea class="resource-content" id="descEdit"
style="display:none;">
+ description...
+ </textarea>
</td>
</tr>
</table>
- <!-- Description editing will goes here -->
- <script type="text/javascript" xml:space="preserve">
- new Ajax.Updater('ratingDiv', '/wso2registry/system/getInitialRating',
{ method: 'get', parameters: {resourcePath: '<%=details.getPath()%>'} });
- </script>
-
-
- <textarea class="resource-content" id="descEdit" style="display:none;">
- description...
- </textarea>
<script type="text/javascript" xml:space="preserve">
new Ajax.Updater('descView', '/wso2registry/system/getDescription', {
method: 'get', parameters: {resourcePath: '<%=details.getPath()%>'} });
@@ -150,7 +161,7 @@
</script>
- <input id="editButton" type="button" class="button" value="Edit
Description" onclick="processDescription();" style="margin-top:5px;" />
+
<!-- End box1-mid div -->
@@ -222,16 +233,16 @@
<h3>Add Resource</h3>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
- <td valign="top"><input id="contentFile" type="radio"
name="contentMethod" value="file" checked="checked"
onClick="disableFields('fetchURLID','resourceFile')" /><span
id="contentFileText">Import content from file</span></td>
+ <td valign="top"><input id="contentFile" type="radio"
name="contentMethod" value="file" checked="checked" /><span
id="contentFileText">Import content from file</span></td>
<td>
<input id="resourceFile" type="file" name="upload"
onchange="fillResourceDetails()"/>
<div class="helpText">Give the url of a file to fetch
content (xml,wsdl,jar etc..)</div>
</td>
</tr>
<tr>
- <td valign="top" style="width:180px;"><input id="contentURL"
type="radio" name="contentMethod" value="url"
onClick="disableFields('resourceFile','fetchURLID')"/><span
id="contentURLText">Import content from URL</span></td>
+ <td valign="top" style="width:180px;"><input id="contentURL"
type="radio" name="contentMethod" value="url" /><span
id="contentURLText">Import content from URL</span></td>
<td>
- <input id="fetchURLID" type="text" disabled="disabled"
name="fetchURL" onchange="fillResourceDetailsForURLs()"/>
+ <input id="fetchURLID" type="text" name="fetchURL"
onchange="fillResourceDetailsForURLs()"/>
<div class="helpText">Give the full url of the resource to
fetch content from URL</div>
</td>
</tr>
@@ -342,7 +353,7 @@
<% } else { %>
<br/>
-<a href="/wso2registry/resources<%=details.getContentPath()%>"
target="_blank">Download</a>
+<a href="/wso2registry/resources<%=details.getContentPath()%>" target="_blank"
class="download-link"><img src="/wso2registry/admin/images/icon-download.jpg"
border="0" align="middle" /> Download</a>
<br/>
<% } %>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
