Author: chanaka
Date: Mon Dec 3 09:33:23 2007
New Revision: 10452
Log:
ui fixes
Added:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/images/icon-back.jpg
(contents, props changed)
trunk/solutions/identity/modules/admin-ui/src/main/webapp/images/icon-report-statistics.jpg
(contents, props changed)
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/css/styles.css
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statcardbyuser.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticsmain.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticusage.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycard.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycardanduser.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbyuser.jsp
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/usermanagement.jsp
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/css/styles.css
==============================================================================
--- trunk/solutions/identity/modules/admin-ui/src/main/webapp/css/styles.css
(original)
+++ trunk/solutions/identity/modules/admin-ui/src/main/webapp/css/styles.css
Mon Dec 3 09:33:23 2007
@@ -76,6 +76,28 @@
line-height:18px;
width:300px;
}
+.report-statistics-link{
+background-image:url(../images/icon-report-statistics.jpg);
+background-repeat:no-repeat;
+background-position:left 0px;
+text-indent:25px;
+height:20px;
+display:block;
+margin-top:10px;
+line-height:15px;
+width:300px;
+}
+.back-link{
+background-image:url(../images/icon-back.jpg);
+background-repeat:no-repeat;
+background-position:left 0px;
+text-indent:25px;
+height:20px;
+display:block;
+margin-top:10px;
+line-height:15px;
+width:60px;
+}
.revoke-link{
background-image:url(../images/icon-revoke.jpg);
background-repeat:no-repeat;
@@ -364,6 +386,12 @@
background-position:0px 0px;
height:24px;
}
+.headding-statistics{
+background-image:url(../images/icon-statistics-normal.gif);
+background-repeat:no-repeat;
+background-position:0px 0px;
+height:24px;
+}
/* Page styles */
.page{
background-color:#000000;
Added:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/images/icon-back.jpg
==============================================================================
Binary file. No diff available.
Added:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/images/icon-report-statistics.jpg
==============================================================================
Binary file. No diff available.
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp
==============================================================================
--- trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp
(original)
+++ trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/claims.jsp
Mon Dec 3 09:33:23 2007
@@ -85,7 +85,7 @@
</table>
</div>
- <div class="addclaim-form"><a
class="newitem-link" style="margin-top:0px;" href="#"
onclick="showhideForm(<s:property value="#stat.index" />)">Click here to add a
new claim</a></div>
+ <div class="addclaim-form"><a
class="newitem-link" style="margin-top:0px;" href="#addClaim"
onclick="showhideForm(<s:property value="#stat.index" />)">Click here to add a
new claim</a></div>
<div class="addclaim-form"
id="<s:property value="#stat.index" />-form" style="display:none;">
<form
action="AddNewClaim.action?dialectUri=<s:property value="dialectUri"/>"
method="post">
<table
cellpadding="0" cellspacing="10" border="0" class="fom-table">
@@ -95,6 +95,7 @@
<tr><td></td><td><s:submit value="Add" align="left" cssClass="button"
/></td></tr>
</table>
</form>
+ <a name="addClaim"></a>
</div>
<div id="<s:property
value="#stat.index" />-content" style="display:block;">
<table cellpadding="0"
cellspacing="0" border="0" class="data-table">
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statcardbyuser.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statcardbyuser.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statcardbyuser.jsp
Mon Dec 3 09:33:23 2007
@@ -46,9 +46,9 @@
</div>
</td>
<td class="content" valign="top">
- <div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> | Issued
Cards</div>
- <p></p>
- <h3>Downloaded Information Cards grouped by
user</h3>
+ <div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> |
Downloaded Information Cards grouped by user</div>
+ <h1 class="headding-statistics">Downloaded
Information Cards grouped by user</h1>
+
<p><s:property value="description" /></p>
<s:set name="type" value="cardsByUser"/>
<table cellpadding="0" cellspacing="0" border="0"
class="data-table">
@@ -69,7 +69,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statfailure.jsp
Mon Dec 3 09:33:23 2007
@@ -47,8 +47,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> |
Failures</div>
- <p></p>
- <h3>Failure Report</h3>
+ <h1 class="headding-statistics">Failure
Report</h1>
+
<table cellpadding="0" cellspacing="0" border="0"
class="data-table">
<tr>
<th>User Name</th>
@@ -63,7 +63,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticsmain.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticsmain.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticsmain.jsp
Mon Dec 3 09:33:23 2007
@@ -47,23 +47,23 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | Statistics</div>
- <p></p>
- <table>
- <!-- <tr><td>Total number of registered
users</td><td><s:property value="userCount" /></td></tr> -->
- <tr><td>Total number of card
downloads</td><td><s:property value="cardCount" /></td></tr>
- <tr><td>Total number of token issuence
requests</td><td><s:property value="tokenCount" /></td></tr>
+ <h1 class="headding-statistics">Statistics</h1>
+ <table cellpadding="0" cellspacing="0"
border="0" class="data-table">
+ <!-- <tr><th>Total number of registered
users</th><td><s:property value="userCount" /></td></tr> -->
+ <tr><th style="width:300px;">Total number of
card downloads</th><td><s:property value="cardCount" /></td></tr>
+ <tr><th>Total number of token issuence
requests</th><td><s:property value="tokenCount" /></td></tr>
</table>
<s:url id="urlUserReport" namespace="/"
action="GenerateUserReport">
</s:url>
-
- <s:a href="ReportSTSUsage.action"
cssClass="newitem-link" >User Behavior Report</s:a>
- <s:a href="ReportSTSHistory.action?type=cifail"
cssClass="newitem-link" >Failed Card Issuences</s:a>
- <s:a href="ReportSTSHistory.action?type=tifail"
cssClass="newitem-link" >Failed Token Issuences</s:a>
+ <s:a href="ShowAllUsers.action"
cssClass="report-statistics-link">View All users</s:a>
+ <s:a href="ReportSTSUsage.action"
cssClass="report-statistics-link" >User Behavior Report</s:a>
+ <s:a href="ReportSTSHistory.action?type=cifail"
cssClass="report-statistics-link" >Failed Card Issuences</s:a>
+ <s:a href="ReportSTSHistory.action?type=tifail"
cssClass="report-statistics-link" >Failed Token Issuences</s:a>
- <s:a
href="ReportTokenByUser.action?type=tokensByUser" cssClass="newitem-link"
>Tokens by User</s:a> <!--tokenCount, userId -->
- <s:a
href="ReportTokenByCard.action?type=tokensByCard" cssClass="newitem-link"
>Tokens by Card</s:a> <!--tokenCount,cardId -->
- <s:a
href="ReportTokenByCardAndUser.action?type=tokensByCardAndUser"
cssClass="newitem-link" >Tokens by User and Card</s:a><!--tokenCount, userId,
cardId -->
- <s:a
href="ReportInfoCardByUser.action?type=cardsByUser" cssClass="newitem-link"
>Info Cards by User</s:a> <!--cardCount, userId -->
+ <s:a
href="ReportTokenByUser.action?type=tokensByUser"
cssClass="report-statistics-link" >Tokens by User</s:a> <!--tokenCount, userId
-->
+ <s:a
href="ReportTokenByCard.action?type=tokensByCard"
cssClass="report-statistics-link" >Tokens by Card</s:a> <!--tokenCount,cardId
-->
+ <s:a
href="ReportTokenByCardAndUser.action?type=tokensByCardAndUser"
cssClass="report-statistics-link" >Tokens by User and Card</s:a><!--tokenCount,
userId, cardId -->
+ <s:a
href="ReportInfoCardByUser.action?type=cardsByUser"
cssClass="report-statistics-link" >Info Cards by User</s:a> <!--cardCount,
userId -->
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticusage.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticusage.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/statisticusage.jsp
Mon Dec 3 09:33:23 2007
@@ -31,8 +31,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a class="breadcrumb-link"
href="ShowMain.action">Home</a> | <a class="breadcrumb-link"
href="ShowStatistics.action">Statistics</a> | User Behavior</div>
- <p></p>
- <h3>Usage Report</h3>
+ <h1 class="headding-statistics">Usage Report</h1>
+
<s:form theme="simple">
<table>
<tr>
@@ -44,7 +44,7 @@
</tr>
</table>
</s:form>
- <p> ============================== </p>
+
<p><s:property value="description" /></p>
@@ -62,7 +62,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
</table>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycard.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycard.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycard.jsp
Mon Dec 3 09:33:23 2007
@@ -47,8 +47,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> | Issued
tokens</div>
- <p></p>
- <h3>Issued tokens grouped by Information
Card</h3>
+ <h1 class="headding-statistics">Issued tokens
grouped by Information Card</h1>
+
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>CardId</th>
@@ -67,7 +67,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycardanduser.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycardanduser.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbycardanduser.jsp
Mon Dec 3 09:33:23 2007
@@ -47,8 +47,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> | Issued
tokens</div>
- <p></p>
- <h3>Issued tokens grouped by user and
Information Card</h3>
+ <h1 class="headding-statistics">Issued tokens
grouped by user and Information Card</h1>
+
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>UserId</th>
@@ -70,7 +70,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbyuser.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbyuser.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/stattokenbyuser.jsp
Mon Dec 3 09:33:23 2007
@@ -47,8 +47,8 @@
</td>
<td class="content" valign="top">
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | <a
class="breadcrumb-link" href="ShowStatistics.action">Statistics</a> | Issued
tokens</div>
- <p></p>
- <h3>Issued tokens grouped by User</h3>
+ <h1 class="headding-statistics">Issued tokens
grouped by User</h1>
+
<table cellpadding="0" cellspacing="0"
border="0" class="data-table">
<tr>
<th>UserId</th>
@@ -67,7 +67,7 @@
</tr>
</s:iterator>
</table>
- <s:a href="ShowStatistics.action" cssClass="newitem-link"
>Back</s:a>
+ <s:a href="ShowStatistics.action" cssClass="back-link"
>Back</s:a>
</td>
</tr>
Modified:
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/usermanagement.jsp
==============================================================================
---
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/usermanagement.jsp
(original)
+++
trunk/solutions/identity/modules/admin-ui/src/main/webapp/jsp/usermanagement.jsp
Mon Dec 3 09:33:23 2007
@@ -33,12 +33,19 @@
<div class="breadcrumb"><a
class="breadcrumb-link" href="ShowMain.action">Home</a> | User Management</div>
<h1 class="headding-userstores">User
Management</h1>
- <a href="ShowAllUsers.action">View All users</a>
+
- <s:form action="UpdateGlobalUserManagementProperties"
method="post" enctype="multipart/form-data" theme="simple">
- Allow User Registration : <s:checkbox
name="allowUserRegistration" value="allowUserRegistration"
fieldValue="true"/><br/>
- Enable Email Verification : <s:checkbox
name="enableEmailVerification" value="enableEmailVerification"
fieldValue="true"/><br/>
- <s:submit cssClass="button" type="button" label="Update"
value="Update"/>
+ <s:form action="UpdateGlobalUserManagementProperties"
method="post" enctype="multipart/form-data" theme="simple">
+ <table cellpadding="0" cellspacing="0" border="0"
class="form-table">
+ <tr>
+ <td>Allow User Registration :</td><td>
<s:checkbox name="allowUserRegistration" value="allowUserRegistration"
fieldValue="true"/></td></tr>
+ <tr>
+ <td>Enable Email Verification
:</td><td><s:checkbox name="enableEmailVerification"
value="enableEmailVerification" fieldValue="true"/></td></tr>
+ <tr>
+ <td><s:submit cssClass="button" type="button"
label="Update" value="Update"/></td><td></td>
+ </tr>
+ </table>
+
</s:form>
</td>
_______________________________________________
Identity-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/identity-dev
