Skip to content

O
Openfire
Commit d361268c authored by Ryan Graham's avatar Ryan Graham Committed by ryan
Browse files
Options

Cleaning up the UI through a batch of pages, making things consistent, getting... 

Cleaning up the UI through a batch of pages, making things consistent, getting rid of the fieldsets and labels, etc. More to come...

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@5292 b35dd754-fafc-0310-a699-88a17e54d16e
parent dd0a10d5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 836 additions and 804 deletions
src/web/available-plugins.jsp
View file @ d361268c
...@@ -60,10 +60,11 @@ ...@@ -60,10 +60,11 @@
<style type="text/css"> <style type="text/css">
.light-gray-border { .light-gray-border {
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 1px; border-width: 1px 1px 1px 1px;
padding: 5px; padding: 5px;
-moz-border-radius: 3px;
} }
...@@ -73,7 +74,7 @@ ...@@ -73,7 +74,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 0px 1px 0px; border-width: 1px 0px 1px 0px;
padding: 5px; padding: 5px;
...@@ -84,7 +85,7 @@ ...@@ -84,7 +85,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 0px 1px 0px; border-width: 1px 0px 1px 0px;
padding: 5px; padding: 5px;
...@@ -95,7 +96,7 @@ ...@@ -95,7 +96,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 0px; border-width: 1px 1px 1px 0px;
padding: 5px; padding: 5px;
...@@ -106,7 +107,7 @@ ...@@ -106,7 +107,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 0px 1px 1px; border-width: 1px 0px 1px 1px;
padding: 5px; padding: 5px;
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 0px; border-width: 1px 1px 1px 0px;
padding: 5px; padding: 5px;
...@@ -127,7 +128,7 @@ ...@@ -127,7 +128,7 @@
.line-bottom-border { .line-bottom-border {
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt; font-size: 9pt;
border-color: #bbb; border-color: #e3e3e3;
border-style: solid; border-style: solid;
border-width: 0px 0px 1px 0px; border-width: 0px 0px 1px 0px;
padding: 5px; padding: 5px;
...@@ -250,7 +251,7 @@ ...@@ -250,7 +251,7 @@
<div class="light-gray-border" style="padding:10px;"> <div class="light-gray-border" style="padding:10px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr style="background:#F7F7FF;"> <tr style="background:#f3f7fa;">
<td class="table-header-left">&nbsp;</td> <td class="table-header-left">&nbsp;</td>
<td nowrap colspan="2" class="table-header"><fmt:message key="plugin.available.open_source"/></td> <td nowrap colspan="2" class="table-header"><fmt:message key="plugin.available.open_source"/></td>
<td nowrap class="table-header"><fmt:message key="plugin.available.description"/></td> <td nowrap class="table-header"><fmt:message key="plugin.available.description"/></td>
...@@ -350,7 +351,7 @@ ...@@ -350,7 +351,7 @@
} }
%> %>
<tr><td><br/></td></tr> <tr><td><br/></td></tr>
<tr style="background:#F7F7FF;"> <tr style="background:#f3f7fa;">
<td class="table-header-left">&nbsp;</td> <td class="table-header-left">&nbsp;</td>
<td nowrap colspan="7" class="row-header"><fmt:message key="plugin.available.commercial_plugins" /></td> <td nowrap colspan="7" class="row-header"><fmt:message key="plugin.available.commercial_plugins" /></td>
</tr> </tr>
......
src/web/group-create.jsp
View file @ d361268c
...@@ -169,7 +169,7 @@ screen where you can add members and set up group contact list. ...@@ -169,7 +169,7 @@ screen where you can add members and set up group contact list.
<fmt:message key="group.create.new_group_title" /> <fmt:message key="group.create.new_group_title" />
</div> </div>
<div class="jive-contentBox"> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<label for="gname"><fmt:message key="group.create.group_name" /></label> * <label for="gname"><fmt:message key="group.create.group_name" /></label> *
......
src/web/group-edit.jsp
View file @ d361268c
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
group roster with all users or members of other groups. group roster with all users or members of other groups.
</p> </p>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr> <tr>
<td width="1%"> <td width="1%">
......
src/web/muc-create-permission.jsp
View file @ d361268c
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="muc.create.permission.title"/></title> <title><fmt:message key="muc.create.permission.title"/></title>
<meta name="pageID" content="muc-perms"/> <meta name="pageID" content="muc-perms"/>
<meta name="helpPage" content="set_group_chat_room_creation_permissions.html"/> <meta name="helpPage" content="set_group_chat_room_creation_permissions.html"/>
</head> </head>
<body> <body>
<p> <p>
<fmt:message key="muc.create.permission.info" /> <fmt:message key="muc.create.permission.info" />
...@@ -130,12 +130,13 @@ ...@@ -130,12 +130,13 @@
<% } %> <% } %>
<!-- BEGIN 'Permission Policy' -->
<form action="muc-create-permission.jsp?save" method="post"> <form action="muc-create-permission.jsp?save" method="post">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="muc.create.permission.policy" />
<legend><fmt:message key="muc.create.permission.policy" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0">
<tbody> <tbody>
<tr> <tr>
<td width="1%"> <td width="1%">
...@@ -160,21 +161,21 @@ ...@@ -160,21 +161,21 @@
</table> </table>
<br> <br>
<input type="submit" value="<fmt:message key="global.save_settings" />"> <input type="submit" value="<fmt:message key="global.save_settings" />">
</div> </div>
</fieldset>
</form> </form>
<!-- END 'Permission Policy' -->
<br> <br>
<% if (mucServer.isRoomCreationRestricted()) { %>
<form action="muc-create-permission.jsp?add" method="post">
<fieldset> <% if (mucServer.isRoomCreationRestricted()) { %>
<legend><fmt:message key="muc.create.permission.allowed_users" /></legend> <!-- BEGIN 'Allowed Users' -->
<div> <form action="muc-create-permission.jsp?add" method="post">
<p> <div class="jive-contentBoxHeader">
<fmt:message key="muc.create.permission.allowed_users" />
</div>
<div class="jive-contentBox">
<p>
<label for="userJIDtf"><fmt:message key="muc.create.permission.add_jid" /></label> <label for="userJIDtf"><fmt:message key="muc.create.permission.add_jid" /></label>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>" <input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
onclick="this.form.openPerms[1].checked=true;" id="userJIDtf"> onclick="this.form.openPerms[1].checked=true;" id="userJIDtf">
...@@ -182,49 +183,49 @@ ...@@ -182,49 +183,49 @@
</p> </p>
<div class="jive-table" style="width:400px;"> <div class="jive-table" style="width:400px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead> <thead>
<tr> <tr>
<th width="99%">User</th> <th width="99%">User</th>
<th width="1%">Remove</th> <th width="1%">Remove</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<% if (mucServer.getUsersAllowedToCreate().size() == 0) { %> <% if (mucServer.getUsersAllowedToCreate().size() == 0) { %>
<tr> <tr>
<td colspan="2"> <td colspan="2">
<fmt:message key="muc.create.permission.no_allowed_users" /> <fmt:message key="muc.create.permission.no_allowed_users" />
</td> </td>
</tr> </tr>
<% } %> <% } %>
<% for (Object obj : mucServer.getUsersAllowedToCreate()) { <% for (Object obj : mucServer.getUsersAllowedToCreate()) {
String user = (String)obj; String user = (String)obj;
%> %>
<tr> <tr>
<td width="99%"> <td width="99%">
<%= user %> <%= user %>
</td> </td>
<td width="1%" align="center"> <td width="1%" align="center">
<a href="muc-create-permission.jsp?userJID=<%= user %>&delete=true" <a href="muc-create-permission.jsp?userJID=<%= user %>&delete=true"
title="<fmt:message key="muc.create.permission.click_title" />" title="<fmt:message key="muc.create.permission.click_title" />"
onclick="return confirm('<fmt:message key="muc.create.permission.confirm_remove" />');" onclick="return confirm('<fmt:message key="muc.create.permission.confirm_remove" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a> ><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td> </td>
</tr> </tr>
<% } %> <% } %>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</fieldset> </div>
</form>
</form> <!-- END 'Allowed Users' -->
<% } %> <% } %>
</body>
</body>
</html> </html>
\ No newline at end of file
src/web/muc-history-settings.jsp
View file @ d361268c
...@@ -84,12 +84,12 @@ ...@@ -84,12 +84,12 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="groupchat.history.settings.title"/></title> <title><fmt:message key="groupchat.history.settings.title"/></title>
<meta name="pageID" content="muc-history"/> <meta name="pageID" content="muc-history"/>
<meta name="helpPage" content="edit_group_chat_history_settings.html"/> <meta name="helpPage" content="edit_group_chat_history_settings.html"/>
</head> </head>
<body> <body>
<p> <p>
<fmt:message key="groupchat.history.settings.introduction" /> <fmt:message key="groupchat.history.settings.introduction" />
...@@ -110,59 +110,57 @@ ...@@ -110,59 +110,57 @@
<% } %> <% } %>
<!-- BEGIN 'History Settings' -->
<form action="muc-history-settings.jsp" method="post"> <form action="muc-history-settings.jsp" method="post">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="groupchat.history.settings.legend" />
<legend><fmt:message key="groupchat.history.settings.legend" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" >
<tbody> <tbody>
<tr valign="middle" class=""> <tr valign="middle" class="">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= NONE %>" id="rb01" <%= ((policy==NONE) ? "checked" : "") %> /> <input type="radio" name="policy" value="<%= NONE %>" id="rb01" <%= ((policy==NONE) ? "checked" : "") %> />
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb01"> <label for="rb01">
<b><fmt:message key="groupchat.history.settings.label1_no_history" /></b> <b><fmt:message key="groupchat.history.settings.label1_no_history" /></b>
</label><fmt:message key="groupchat.history.settings.label2_no_history" /> </label><fmt:message key="groupchat.history.settings.label2_no_history" />
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= ALL %>" id="rb02" <%= ((policy==ALL) ? "checked" : "") %>/> <input type="radio" name="policy" value="<%= ALL %>" id="rb02" <%= ((policy==ALL) ? "checked" : "") %>/>
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb02"> <label for="rb02">
<b><fmt:message key="groupchat.history.settings.label1_entire_history" /></b> <b><fmt:message key="groupchat.history.settings.label1_entire_history" /></b>
</label><fmt:message key="groupchat.history.settings.label2_entire_history" /> </label><fmt:message key="groupchat.history.settings.label2_entire_history" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td width="1%" nowrap> <td width="1%" nowrap>
<input type="radio" name="policy" value="<%= NUMBER %>" id="rb03" <%= ((policy==NUMBER) ? "checked" : "") %> /> <input type="radio" name="policy" value="<%= NUMBER %>" id="rb03" <%= ((policy==NUMBER) ? "checked" : "") %> />
</td> </td>
<td width="99%"> <td width="99%">
<label for="rb03"> <label for="rb03">
<b><fmt:message key="groupchat.history.settings.label1_number_messages" /></b> <b><fmt:message key="groupchat.history.settings.label1_number_messages" /></b>
</label><fmt:message key="groupchat.history.settings.label2_number_messages" /> </label><fmt:message key="groupchat.history.settings.label2_number_messages" />
</td> </td>
</tr> </tr>
<tr valign="middle" class=""> <tr valign="middle" class="">
<td width="1%" nowrap>&nbsp;</td> <td width="1%" nowrap>&nbsp;</td>
<td width="99%"> <td width="99%">
<input type="text" name="numMessages" size="5" maxlength="10" onclick="this.form.policy[2].checked=true;" value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"/> <fmt:message key="groupchat.history.settings.messages" /> <input type="text" name="numMessages" size="5" maxlength="10" onclick="this.form.policy[2].checked=true;" value="<%= ((numMessages > 0) ? ""+numMessages : "") %>"/> <fmt:message key="groupchat.history.settings.messages" />
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> <input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
</fieldset> </div>
<br><br>
<input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
</form> </form>
<!-- END 'History Settings' -->
</body> </body>
</html> </html>
\ No newline at end of file
src/web/muc-server-props-edit-form.jsp
View file @ d361268c
...@@ -62,12 +62,12 @@ ...@@ -62,12 +62,12 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="groupchat.service.properties.title"/></title> <title><fmt:message key="groupchat.service.properties.title"/></title>
<meta name="pageID" content="muc-server-props"/> <meta name="pageID" content="muc-server-props"/>
<meta name="helpPage" content="edit_group_chat_service_properties.html"/> <meta name="helpPage" content="edit_group_chat_service_properties.html"/>
</head> </head>
<body> <body>
<p> <p>
<fmt:message key="groupchat.service.properties.introduction" /> <fmt:message key="groupchat.service.properties.introduction" />
...@@ -101,39 +101,37 @@ ...@@ -101,39 +101,37 @@
<% } %> <% } %>
<!-- BEGIN 'Service Name'-->
<form action="muc-server-props-edit-form.jsp" method="post"> <form action="muc-server-props-edit-form.jsp" method="post">
<input type="hidden" name="save" value="true"> <input type="hidden" name="save" value="true">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="groupchat.service.properties.legend" />
<legend><fmt:message key="groupchat.service.properties.legend" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table cellpadding="3" cellspacing="0" border="0">
<tr> <tr>
<td class="c1"> <td class="c1">
<fmt:message key="groupchat.service.properties.label_service_name" /> <fmt:message key="groupchat.service.properties.label_service_name" />
</td> </td>
<td> <td>
<input type="text" size="30" maxlength="150" name="mucname" value="<%= (muc != null ? muc : "") %>"> <input type="text" size="30" maxlength="150" name="mucname" value="<%= (muc != null ? muc : "") %>">
<% if (errors.get("mucname") != null) { %> <% if (errors.get("mucname") != null) { %>
<span class="jive-error-text"> <span class="jive-error-text">
<br><fmt:message key="groupchat.service.properties.error_service_name" /> <br><fmt:message key="groupchat.service.properties.error_service_name" />
</span> </span>
<% } %> <% } %>
</td> </td>
</tr> </tr>
</table> </table>
</div> <input type="submit" value="<fmt:message key="groupchat.service.properties.save" />">
</fieldset> </div>
<br><br>
<input type="submit" value="<fmt:message key="groupchat.service.properties.save" />">
</form> </form>
<!-- END 'Service Name'-->
</body> </body>
</html> </html>
\ No newline at end of file
src/web/muc-sysadmins.jsp
View file @ d361268c
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="groupchat.admins.title"/></title> <title><fmt:message key="groupchat.admins.title"/></title>
<meta name="pageID" content="muc-sysadmin"/> <meta name="pageID" content="muc-sysadmin"/>
<meta name="helpPage" content="edit_group_chat_service_administrators.html"/> <meta name="helpPage" content="edit_group_chat_service_administrators.html"/>
</head> </head>
<body> <body>
<p> <p>
<fmt:message key="groupchat.admins.introduction" /> <fmt:message key="groupchat.admins.introduction" />
...@@ -103,58 +103,60 @@ ...@@ -103,58 +103,60 @@
<% } %> <% } %>
<form action="muc-sysadmins.jsp?add" method="post">
<fieldset>
<legend><fmt:message key="groupchat.admins.legend" /></legend>
<div>
<label for="userJIDtf"><fmt:message key="groupchat.admins.label_add_admin" /></label>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
id="userJIDtf">
<input type="submit"s value="<fmt:message key="groupchat.admins.add" />">
<br><br>
<div class="jive-table" style="width:400px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th width="99%"><fmt:message key="groupchat.admins.column_user" /></th>
<th width="1%" nowrap><fmt:message key="groupchat.admins.column_remove" /></th>
</tr>
</thead>
<tbody>
<% if (mucServer.getSysadmins().size() == 0) { %>
<tr>
<td colspan="2">
<fmt:message key="groupchat.admins.no_admins" />
</td>
</tr>
<% } %>
<% for (String user : mucServer.getSysadmins()) { %>
<tr>
<td width="99%">
<%= user %>
</td>
<td width="1%" align="center">
<a href="muc-sysadmins.jsp?userJID=<%= user %>&delete=true"
title="<fmt:message key="groupchat.admins.dialog.title" />"
onclick="return confirm('<fmt:message key="groupchat.admins.dialog.text" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>
</div>
</fieldset>
<!-- BEGIN 'Administrators' -->
<form action="muc-sysadmins.jsp?add" method="post">
<div class="jive-contentBoxHeader">
<fmt:message key="groupchat.admins.legend" />
</div>
<div class="jive-contentBox">
<label for="userJIDtf"><fmt:message key="groupchat.admins.label_add_admin" /></label>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
id="userJIDtf">
<input type="submit"s value="<fmt:message key="groupchat.admins.add" />">
<br><br>
<div class="jive-table" style="width:400px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr>
<th width="99%"><fmt:message key="groupchat.admins.column_user" /></th>
<th width="1%" nowrap><fmt:message key="groupchat.admins.column_remove" /></th>
</tr>
</thead>
<tbody>
<% if (mucServer.getSysadmins().size() == 0) { %>
<tr>
<td colspan="2">
<fmt:message key="groupchat.admins.no_admins" />
</td>
</tr>
<% } %>
<% for (String user : mucServer.getSysadmins()) { %>
<tr>
<td width="99%">
<%= user %>
</td>
<td width="1%" align="center">
<a href="muc-sysadmins.jsp?userJID=<%= user %>&delete=true"
title="<fmt:message key="groupchat.admins.dialog.title" />"
onclick="return confirm('<fmt:message key="groupchat.admins.dialog.text" />');"
><img src="images/delete-16x16.gif" width="16" height="16" border="0"></a>
</td>
</tr>
<% } %>
</tbody>
</table>
</div>
</div>
</form> </form>
<!-- END 'Administrators' -->
</body> </body>
</html> </html>
\ No newline at end of file
src/web/muc-tasks.jsp
View file @ d361268c
...@@ -104,12 +104,12 @@ ...@@ -104,12 +104,12 @@
%> %>
<html> <html>
<head> <head>
<title><fmt:message key="muc.tasks.title"/></title> <title><fmt:message key="muc.tasks.title"/></title>
<meta name="pageID" content="muc-tasks"/> <meta name="pageID" content="muc-tasks"/>
<meta name="helpPage" content="edit_idle_user_settings.html"/> <meta name="helpPage" content="edit_idle_user_settings.html"/>
</head> </head>
<body> <body>
<p> <p>
<fmt:message key="muc.tasks.info" /> <fmt:message key="muc.tasks.info" />
...@@ -159,81 +159,77 @@ ...@@ -159,81 +159,77 @@
<% } %> <% } %>
<form action="muc-tasks.jsp?kickSettings" method="post">
<fieldset>
<legend><fmt:message key="muc.tasks.user_setting" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="kickEnabled" value="false" id="rb01"
<%= ((mucServer.getUserIdleTime() < 0) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01"><fmt:message key="muc.tasks.never_kick" /></label>
</td>
</tr>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="kickEnabled" value="true" id="rb02"
<%= ((mucServer.getUserIdleTime() > -1) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02"><fmt:message key="muc.tasks.kick_user" /></label>
<input type="text" name="idletime" size="5" maxlength="5"
onclick="this.form.kickEnabled[1].checked=true;"
value="<%= mucServer.getUserIdleTime() == -1 ? 30 : mucServer.getUserIdleTime() / 1000 / 60 %>">
<fmt:message key="global.minutes" />.
</td>
</tr>
</tbody>
</table>
</div>
</fieldset>
<br><br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
<!-- BEGIN 'Idle User Settings' -->
<form action="muc-tasks.jsp?kickSettings" method="post">
<div class="jive-contentBoxHeader">
<fmt:message key="muc.tasks.user_setting" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="kickEnabled" value="false" id="rb01"
<%= ((mucServer.getUserIdleTime() < 0) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb01"><fmt:message key="muc.tasks.never_kick" /></label>
</td>
</tr>
<tr valign="middle">
<td width="1%" nowrap>
<input type="radio" name="kickEnabled" value="true" id="rb02"
<%= ((mucServer.getUserIdleTime() > -1) ? "checked" : "") %>>
</td>
<td width="99%">
<label for="rb02"><fmt:message key="muc.tasks.kick_user" /></label>
<input type="text" name="idletime" size="5" maxlength="5"
onclick="this.form.kickEnabled[1].checked=true;"
value="<%= mucServer.getUserIdleTime() == -1 ? 30 : mucServer.getUserIdleTime() / 1000 / 60 %>">
<fmt:message key="global.minutes" />.
</td>
</tr>
</tbody>
</table>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div>
</form> </form>
<!-- END 'Idle User Settings' -->
<br> <br>
<!-- BEGIN 'Conversation Logging' -->
<form action="muc-tasks.jsp?logSettings" method="post"> <form action="muc-tasks.jsp?logSettings" method="post">
<div class="jive-contentBoxHeader">
<fieldset> <fmt:message key="muc.tasks.conversation.logging" />
<legend><fmt:message key="muc.tasks.conversation.logging" /></legend> </div>
<div> <div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <table cellpadding="3" cellspacing="0" border="0" >
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
<fmt:message key="muc.tasks.flush" /> <fmt:message key="muc.tasks.flush" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="logfreq" size="15" maxlength="50" <input type="text" name="logfreq" size="15" maxlength="50"
value="<%= mucServer.getLogConversationsTimeout() / 1000 %>"> value="<%= mucServer.getLogConversationsTimeout() / 1000 %>">
</td> </td>
</tr> </tr>
<tr valign="middle"> <tr valign="middle">
<td width="1%" nowrap class="c1"> <td width="1%" nowrap class="c1">
<fmt:message key="muc.tasks.batch" /> <fmt:message key="muc.tasks.batch" />
</td> </td>
<td width="99%"> <td width="99%">
<input type="text" name="logbatchsize" size="15" maxlength="50" <input type="text" name="logbatchsize" size="15" maxlength="50"
value="<%= mucServer.getLogConversationBatchSize() %>"> value="<%= mucServer.getLogConversationBatchSize() %>">
</td> </td>
</tr> </tr>
</table> </table>
</div> <input type="submit" value="<fmt:message key="global.save_settings" />">
</fieldset> </div>
<br><br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END 'Conversation Logging' -->
</body> </body>
</html> </html>
\ No newline at end of file
src/web/plugin-admin.jsp
View file @ d361268c
...@@ -166,11 +166,7 @@ ...@@ -166,11 +166,7 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.content {
border-color: #bbb;
border-style: solid;
border-width: 0px 0px 1px 0px;
}
.textfield { .textfield {
font-size: 11px; font-size: 11px;
...@@ -198,14 +194,15 @@ ...@@ -198,14 +194,15 @@
} }
.light-gray-border { .light-gray-border {
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 1px; border-width: 1px 1px 1px 1px;
padding: 5px; padding: 5px;
-moz-border-radius: 3px;
} }
.light-gray-border-bottom { .light-gray-border-bottom {
border-color: #bbb; border-color: #dcdcdc;
border-style: solid; border-style: solid;
border-width: 0px 0px 1px 0px; border-width: 0px 0px 1px 0px;
} }
...@@ -215,7 +212,7 @@ ...@@ -215,7 +212,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 0px 1px 0px; border-width: 1px 0px 1px 0px;
padding: 5px; padding: 5px;
...@@ -226,7 +223,7 @@ ...@@ -226,7 +223,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 0px 1px 1px; border-width: 1px 0px 1px 1px;
padding: 5px; padding: 5px;
...@@ -238,7 +235,7 @@ ...@@ -238,7 +235,7 @@
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
font-weight: bold; font-weight: bold;
border-color: #bbb; border-color: #ccc;
border-style: solid; border-style: solid;
border-width: 1px 1px 1px 0px; border-width: 1px 1px 1px 0px;
padding: 5px; padding: 5px;
...@@ -253,7 +250,6 @@ ...@@ -253,7 +250,6 @@
text-align: left; text-align: left;
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt; font-size: 9pt;
background: #E7FBDE; background: #E7FBDE;
border-color: #73CB73; border-color: #73CB73;
border-style: solid; border-style: solid;
...@@ -335,7 +331,7 @@ ...@@ -335,7 +331,7 @@
text-align: left; text-align: left;
font-family: verdana, arial, helvetica, sans-serif; font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt; font-size: 9pt;
border-color: #bbb; border-color: #e3e3e3;
border-style: solid; border-style: solid;
border-width: 0px 0px 1px 0px; border-width: 0px 0px 1px 0px;
padding: 5px; padding: 5px;
...@@ -397,7 +393,7 @@ else if ("false".equals(request.getParameter("deletesuccess"))) { %> ...@@ -397,7 +393,7 @@ else if ("false".equals(request.getParameter("deletesuccess"))) { %>
<div class="light-gray-border" style="padding:10px;"> <div class="light-gray-border" style="padding:10px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr style="background:#F7F7FF;"> <tr style="background:#f3f7fa;">
<td nowrap colspan="3" class="table-header-left"><fmt:message key="plugin.admin.name"/></td> <td nowrap colspan="3" class="table-header-left"><fmt:message key="plugin.admin.name"/></td>
<td nowrap class="table-header"><fmt:message key="plugin.admin.description"/></td> <td nowrap class="table-header"><fmt:message key="plugin.admin.description"/></td>
......
src/web/server-db-stats.jsp
View file @ d361268c
...@@ -74,10 +74,13 @@ ...@@ -74,10 +74,13 @@
<fmt:message key="server.db_stats.description" /> <fmt:message key="server.db_stats.description" />
</p> </p>
<p><b><fmt:message key="server.db_stats.status" /></b></p>
<div class="jive-contentBox jive-contentBoxGrey" style="width: 732px;">
<h3><fmt:message key="server.db_stats.status" /></h3>
<form action="server-db-stats.jsp"> <form action="server-db-stats.jsp">
<ul>
<table cellpadding="3" cellspacing="1" border="0"> <table cellpadding="3" cellspacing="1" border="0">
<tr> <tr>
<td> <td>
...@@ -95,16 +98,14 @@ ...@@ -95,16 +98,14 @@
</td> </td>
</tr> </tr>
</table> </table>
</ul>
</form> </form>
<% if (showQueryStats) { %> <% if (showQueryStats) { %>
<br>
<p><b><fmt:message key="server.db_stats.settings" /></b></p> <h3><fmt:message key="server.db_stats.settings" /></h3>
<form action="server-db-stats.jsp"> <form action="server-db-stats.jsp">
<ul> <table cellpadding="3" cellspacing="1" border="0" width="730">
<table cellpadding="3" cellspacing="1" border="0">
<tr> <tr>
<td> <td>
<fmt:message key="server.db_stats.refresh" />: <fmt:message key="server.db_stats.refresh" />:
...@@ -133,18 +134,16 @@ ...@@ -133,18 +134,16 @@
</td> </td>
</tr> </tr>
</table> </table>
</ul>
</form> </form>
<br /> </div>
<p>
<b><fmt:message key="server.db_stats.select_stats" /></b>
</p>
<ul> <h3><fmt:message key="server.db_stats.select_stats" /></h3>
<table bgcolor="#aaaaaa" cellpadding="0" cellspacing="0" border="0" width="600">
<table bgcolor="#aaaaaa" cellpadding="0" cellspacing="0" border="0" width="730">
<tr><td> <tr><td>
<table bgcolor="#aaaaaa" cellpadding="3" cellspacing="1" border="0" width="100%"> <table bgcolor="#aaaaaa" cellpadding="3" cellspacing="1" border="0" width="100%">
<tr bgcolor="#ffffff"> <tr bgcolor="#ffffff">
...@@ -181,11 +180,11 @@ ...@@ -181,11 +180,11 @@
<br /> <br />
<table bgcolor="#aaaaaa" cellpadding="0" cellspacing="0" border="0" width="600"> <table bgcolor="#aaaaaa" cellpadding="0" cellspacing="0" border="0" width="730">
<tr><td> <tr><td>
<table bgcolor="#aaaaaa" cellpadding="3" cellspacing="0" border="0" width="100%"> <table bgcolor="#aaaaaa" cellpadding="3" cellspacing="0" border="0" width="100%">
<tr bgcolor="#ffffff"><td> <tr bgcolor="#ffffff"><td>
<% out.println("<table width=\"100%\" cellpadding=\"3\" cellspacing=\"1\" border=\"0\" bgcolor=\"#aaaaaa\"><tr><td bgcolor=\"#ffffff\" align=\"middle\"><b>" + LocaleUtils.getLocalizedString("server.db_stats.query") + "</b></td>"); <% out.println("<table width=\"100%\" cellpadding=\"3\" cellspacing=\"1\" border=\"0\" bgcolor=\"#aaaaaa\"><tr><td bgcolor=\"#ffffff\" align=\"left\"><b>" + LocaleUtils.getLocalizedString("server.db_stats.query") + "</b></td>");
out.println("<td bgcolor=\"#ffffff\"><b><a href=\"javascript:location.href='server-db-stats.jsp?doSortByTime=false&refresh=" + refresh + ";'\">" + LocaleUtils.getLocalizedString("server.db_stats.count") + "</a></b></td>"); out.println("<td bgcolor=\"#ffffff\"><b><a href=\"javascript:location.href='server-db-stats.jsp?doSortByTime=false&refresh=" + refresh + ";'\">" + LocaleUtils.getLocalizedString("server.db_stats.count") + "</a></b></td>");
out.println("<td nowrap bgcolor=\"#ffffff\"><b>" + LocaleUtils.getLocalizedString("server.db_stats.time") + "</b></td>"); out.println("<td nowrap bgcolor=\"#ffffff\"><b>" + LocaleUtils.getLocalizedString("server.db_stats.time") + "</b></td>");
out.println("<td nowrap bgcolor=\"#ffffff\"><b><a href=\"javascript:location.href='server-db-stats.jsp?doSortByTime=true&refresh=" + refresh + ";'\">" + LocaleUtils.getLocalizedString("server.db_stats.average_time") + "</a></b></td></tr>"); out.println("<td nowrap bgcolor=\"#ffffff\"><b><a href=\"javascript:location.href='server-db-stats.jsp?doSortByTime=true&refresh=" + refresh + ";'\">" + LocaleUtils.getLocalizedString("server.db_stats.average_time") + "</a></b></td></tr>");
...@@ -205,7 +204,7 @@ ...@@ -205,7 +204,7 @@
</td></tr> </td></tr>
</table> </table>
</ul>
<b><fmt:message key="server.db_stats.insert_stats" /></b> <b><fmt:message key="server.db_stats.insert_stats" /></b>
......
src/web/server-locale.jsp
View file @ d361268c
...@@ -71,13 +71,14 @@ ...@@ -71,13 +71,14 @@
<fmt:message key="locale.title.info" /> <fmt:message key="locale.title.info" />
</p> </p>
<form action="server-locale.jsp" method="post" name="sform">
<fieldset>
<legend><fmt:message key="locale.system.set" /></legend>
<div style="padding-top:0.5em;">
<p> <!-- BEGIN locale settings -->
<form action="server-locale.jsp" method="post" name="sform">
<div class="jive-contentBoxHeader">
<fmt:message key="locale.system.set" />
</div>
<div class="jive-contentBox">
<p>
<b><fmt:message key="locale.current" />:</b> <%= locale.getDisplayName(locale) %> / <b><fmt:message key="locale.current" />:</b> <%= locale.getDisplayName(locale) %> /
<%= LocaleUtils.getTimeZoneName(JiveGlobals.getTimeZone().getID(), locale) %> <%= LocaleUtils.getTimeZoneName(JiveGlobals.getTimeZone().getID(), locale) %>
</p> </p>
...@@ -195,14 +196,10 @@ ...@@ -195,14 +196,10 @@
<option value="<%= timeZones[i][0] %>"<%= selected %>><%= timeZones[i][1] %> <option value="<%= timeZones[i][0] %>"<%= selected %>><%= timeZones[i][1] %>
<% } %> <% } %>
</select> </select>
</div> </div>
</fieldset>
<br><br>
<input type="submit" name="save" value="<fmt:message key="global.save_settings" />"> <input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
</form> </form>
<!-- END locale settings -->
</body> </body>
......
src/web/server2server-settings.jsp
View file @ d361268c
This diff is collapsed.
src/web/style/global.css
View file @ d361268c
...@@ -306,14 +306,51 @@ html>body #jive-main #jive-sidebar a { ...@@ -306,14 +306,51 @@ html>body #jive-main #jive-sidebar a {
padding-bottom : 3px; padding-bottom : 3px;
font-weight : bold; font-weight : bold;
} }
#jive-main #jive-sidebar .subitems LI {
margin-left: 10px; #jive-main #jive-sidebar ul.subitems {
width: 130px; width: 150px;
background-color: #d4e1ed;
border: 1px solid #34679a;
list-style-type: disc;
-moz-border-radius: 4px;
margin: 0px 0px 1px 0px;
overflow: hidden;
}
#jive-main #jive-sidebar ul.subitems br {
display: none;
}
#jive-main #jive-sidebar ul.subitems li.category {
list-style-type: none;
display: block;
width: 150px;
padding: 2px 2px 2px 8px;
margin-left: 0px;
background-color: #5C7D9D;
border-bottom: 1px solid #34679a;
color: #FFFFFF;
font-weight: bold;
-moz-border-radius: 3px 3px 0px 0px;
}
#jive-main #jive-sidebar ul.subitems li {
margin-left: 25px;
}
#jive-main #jive-sidebar ul.subitems li a {
margin: 2px 0px 2px 0px;
padding: 1px 0px 1px 0px;
border: none;
} }
#jive-main #jive-sidebar .subitems LI A { #jive-main #jive-sidebar ul.subitems li a:hover {
margin-left : 10px; background-color: transparent;
padding : 2px 2px 2px 5px; border: none;
width : 120px; text-decoration: underline;
}
#jive-main #jive-sidebar ul.subitems li.currentlink a,
#jive-main #jive-sidebar ul.subitems li.currentlink a:visited ,
#jive-main #jive-sidebar ul.subitems li.currentlink a:hover {
font-weight: bold;
color: #003366;
background-color: transparent;
border: none;
} }
/* --------------------------------------------- */ /* --------------------------------------------- */
...@@ -395,7 +432,7 @@ PRE, TT { ...@@ -395,7 +432,7 @@ PRE, TT {
/* tables */ /* tables */
.jive-table { .jive-table {
border-color : #bbb; border-color : #ccc;
border-style : solid; border-style : solid;
border-width : 1px 1px 0px 1px; border-width : 1px 1px 0px 1px;
} }
...@@ -412,8 +449,8 @@ PRE, TT { ...@@ -412,8 +449,8 @@ PRE, TT {
padding : 0 5px 0 3px; padding : 0 5px 0 3px;
} }
.jive-table TH { .jive-table TH {
background-color : #EAF1F8; background-color : #f3f7fa;
border-bottom : 1px #bbb solid; border-bottom : 1px #ccc solid;
text-align : left; text-align : left;
font-family : verdana, arial, helvetica, sans-serif; font-family : verdana, arial, helvetica, sans-serif;
font-size : 8pt; font-size : 8pt;
...@@ -429,7 +466,7 @@ PRE, TT { ...@@ -429,7 +466,7 @@ PRE, TT {
} }
.jive-table TR TD { .jive-table TR TD {
border-bottom : 1px #ccc solid; border-bottom : 1px #e3e3e3 solid;
} }
.jive-table TD { .jive-table TD {
font-family : arial, helvetica, sans-serif; font-family : arial, helvetica, sans-serif;
...@@ -442,8 +479,9 @@ PRE, TT { ...@@ -442,8 +479,9 @@ PRE, TT {
background-color : #fbfbfb; background-color : #fbfbfb;
} }
.jive-table TFOOT TD { .jive-table TFOOT TD {
background-color : #ddd; background-color : #eee;
font-family : verdana; font-family : verdana;
border-bottom: 1px solid #ccc;
font-size : 8pt; font-size : 8pt;
} }
.jive-table TD TD { .jive-table TD TD {
...@@ -637,7 +675,7 @@ A.cal:Hover { ...@@ -637,7 +675,7 @@ A.cal:Hover {
display: block; display: block;
margin: 0px 0px 20px 0px; margin: 0px 0px 20px 0px;
padding: 12px 10px 12px 10px; padding: 12px 10px 12px 10px;
border: 1px solid #dcdcdc; border: 1px solid #ccc;
background-color: #fff; background-color: #fff;
-moz-border-radius:0px 0px 4px 4px ; -moz-border-radius:0px 0px 4px 4px ;
} }
...@@ -648,7 +686,7 @@ A.cal:Hover { ...@@ -648,7 +686,7 @@ A.cal:Hover {
font-size: 9pt; font-size: 9pt;
font-weight: bold; font-weight: bold;
background-color: #f3f7fa; background-color: #f3f7fa;
border: 1px solid #dcdcdc; border: 1px solid #ccc;
border-bottom: none; border-bottom: none;
} }
.jive-contentBoxGrey { .jive-contentBoxGrey {
...@@ -710,7 +748,7 @@ th.jive-table-th-center { ...@@ -710,7 +748,7 @@ th.jive-table-th-center {
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Roster box (in Group Settings page */ /* Roster box (in Group Settings page) */
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-roster { #jive-roster {
...@@ -729,3 +767,4 @@ th.jive-table-th-center { ...@@ -729,3 +767,4 @@ th.jive-table-th-center {
color: #09345b; color: #09345b;
padding: 0px 0px 3px 0px; padding: 0px 0px 3px 0px;
} }
src/web/system-email.jsp
View file @ d361268c
...@@ -123,94 +123,91 @@ ...@@ -123,94 +123,91 @@
<p> <p>
<!-- BEGIN SMTP settings -->
<form action="system-email.jsp" name="f" method="post"> <form action="system-email.jsp" name="f" method="post">
<fieldset> <div class="jive-contentBoxHeader">
<legend><fmt:message key="system.email.name" /></legend> <fmt:message key="system.email.name" />
<div> </div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0"> <table width="80%" cellpadding="3" cellspacing="0" border="0">
<tr> <tr>
<td width="1%" nowrap> <td width="30%" nowrap>
<fmt:message key="system.email.mail_host" />: <fmt:message key="system.email.mail_host" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="text" name="host" value="<%= (host != null)?host:"" %>" size="40" maxlength="150"> <input type="text" name="host" value="<%= (host != null)?host:"" %>" size="40" maxlength="150">
</td> </td>
</tr> </tr>
<% if (errors.containsKey("host")) { %> <% if (errors.containsKey("host")) { %>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
&nbsp; &nbsp;
</td> </td>
<td width="1%" nowrap class="jive-error-text"> <td nowrap class="jive-error-text">
<fmt:message key="system.email.valid_host_name" /> <fmt:message key="system.email.valid_host_name" />
</td> </td>
</tr> </tr>
<% } %> <% } %>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
<fmt:message key="system.email.server_port" />: <fmt:message key="system.email.server_port" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="text" name="port" value="<%= (port > 0) ? String.valueOf(port) : "" %>" size="10" maxlength="15"> <input type="text" name="port" value="<%= (port > 0) ? String.valueOf(port) : "" %>" size="10" maxlength="15">
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
<fmt:message key="system.email.mail_debugging" />: <fmt:message key="system.email.mail_debugging" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="radio" name="debug" value="true"<%= (debug ? " checked" : "") %> id="rb01"> <label for="rb01">On</label> <input type="radio" name="debug" value="true"<%= (debug ? " checked" : "") %> id="rb01"> <label for="rb01">On</label>
&nbsp; &nbsp;
<input type="radio" name="debug" value="false"<%= (debug ? "" : " checked") %> id="rb02"> <label for="rb02">Off</label> <input type="radio" name="debug" value="false"<%= (debug ? "" : " checked") %> id="rb02"> <label for="rb02">Off</label>
&nbsp; (<fmt:message key="system.email.restart_possible" />) &nbsp; (<fmt:message key="system.email.restart_possible" />)
</td> </td>
</tr> </tr>
<%-- spacer --%> <%-- spacer --%>
<tr><td colspan="2">&nbsp;</td></tr> <tr><td colspan="2">&nbsp;</td></tr>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
<fmt:message key="system.email.server_username" />: <fmt:message key="system.email.server_username" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="text" name="server_username" value="<%= (username != null) ? username : "" %>" size="40" maxlength="150"> <input type="text" name="server_username" value="<%= (username != null) ? username : "" %>" size="40" maxlength="150">
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
<fmt:message key="system.email.server_password" />: <fmt:message key="system.email.server_password" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="password" name="server_password" value="<%= (password != null) ? StringUtils.hash(password) : "" %>" size="40" maxlength="150"> <input type="password" name="server_password" value="<%= (password != null) ? StringUtils.hash(password) : "" %>" size="40" maxlength="150">
</td> </td>
</tr> </tr>
<tr> <tr>
<td width="1%" nowrap> <td nowrap>
<fmt:message key="system.email.ssl" />: <fmt:message key="system.email.ssl" />:
</td> </td>
<td width="1%" nowrap> <td nowrap>
<input type="checkbox" name="ssl"<%= (ssl) ? " checked" : "" %>> <input type="checkbox" name="ssl"<%= (ssl) ? " checked" : "" %>>
</td> </td>
</tr> </tr>
</table>
</table> </div>
</div>
</fieldset>
<br>
<input type="submit" name="save" value="<fmt:message key="system.email.save" />"> <input type="submit" name="save" value="<fmt:message key="system.email.save" />">
<input type="submit" name="test" value="<fmt:message key="system.email.send_test" />"> <input type="submit" name="test" value="<fmt:message key="system.email.send_test" />">
</form> </form>
<!-- END SMTP settings -->
</body> </body>
</html> </html>
\ No newline at end of file
src/web/user-create.jsp
View file @ d361268c
...@@ -165,67 +165,70 @@ ...@@ -165,67 +165,70 @@
<form name="f" action="user-create.jsp" method="get"> <form name="f" action="user-create.jsp" method="get">
<fieldset> <div class="jive-contentBoxHeader">
<legend><fmt:message key="user.create.new_user" /></legend> <fmt:message key="user.create.new_user" />
<div> </div>
<table cellpadding="3" cellspacing="0" border="0" width="100%"> <div class="jive-contentBox">
<tbody> <table cellpadding="3" cellspacing="0" border="0">
<tr> <tbody>
<td width="1%" nowrap><label for="usernametf"><fmt:message key="user.create.username" />:</label> *</td> <tr>
<td width="99%"> <td width="1%" nowrap><label for="usernametf"><fmt:message key="user.create.username" />:</label> *</td>
<input type="text" name="username" size="30" maxlength="75" value="<%= ((username!=null) ? username : "") %>" <td width="99%">
id="usernametf" autocomplete="off"> <input type="text" name="username" size="30" maxlength="75" value="<%= ((username!=null) ? username : "") %>"
</td> id="usernametf" autocomplete="off">
</tr> </td>
<tr> </tr>
<td width="1%" nowrap> <tr>
<label for="nametf"><fmt:message key="user.create.name" />:</label> <td width="1%" nowrap>
</td> <label for="nametf"><fmt:message key="user.create.name" />:</label>
<td width="99%"> </td>
<input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>" <td width="99%">
id="nametf"> <input type="text" name="name" size="30" maxlength="75" value="<%= ((name!=null) ? name : "") %>"
</td> id="nametf">
</tr> </td>
<tr> </tr>
<td width="1%" nowrap> <tr>
<label for="emailtf"><fmt:message key="user.create.email" />:</label></td> <td width="1%" nowrap>
<td width="99%"> <label for="emailtf"><fmt:message key="user.create.email" />:</label></td>
<input type="text" name="email" size="30" maxlength="75" value="<%= ((email!=null) ? email : "") %>" <td width="99%">
id="emailtf"> <input type="text" name="email" size="30" maxlength="75" value="<%= ((email!=null) ? email : "") %>"
</td> id="emailtf">
</tr> </td>
<tr> </tr>
<td nowrap> <tr>
<label for="passtf"><fmt:message key="user.create.pwd" />:</label> * <td nowrap>
</td> <label for="passtf"><fmt:message key="user.create.pwd" />:</label> *
<td width="99%"> </td>
<input type="password" name="password" value="" size="20" maxlength="75" <td width="99%">
id="passtf"> <input type="password" name="password" value="" size="20" maxlength="75"
</td> id="passtf">
</tr> </td>
<tr> </tr>
<td width="1%" nowrap> <tr>
<label for="confpasstf"><fmt:message key="user.create.confirm_pwd" />:</label> * <td width="1%" nowrap>
</td> <label for="confpasstf"><fmt:message key="user.create.confirm_pwd" />:</label> *
<td width="99%"> </td>
<input type="password" name="passwordConfirm" value="" size="20" maxlength="75" <td width="99%">
id="confpasstf"> <input type="password" name="passwordConfirm" value="" size="20" maxlength="75"
</td> id="confpasstf">
</tr> </td>
</tbody> </tr>
</table> <tr>
<br>
<span class="jive-description"> <td colspan="2" style="padding-top: 10px;">
<input type="submit" name="create" value="<fmt:message key="user.create.create" />">
<input type="submit" name="another" value="<fmt:message key="user.create.create_another" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"></td>
</tr>
</tbody>
</table>
</div>
<span class="jive-description">
* <fmt:message key="user.create.requied" /> * <fmt:message key="user.create.requied" />
</span> </span>
</div>
</fieldset>
<br><br>
<input type="submit" name="create" value="<fmt:message key="user.create.create" />">
<input type="submit" name="another" value="<fmt:message key="user.create.create_another" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
</form> </form>
......
src/web/user-message.jsp
View file @ d361268c
...@@ -115,12 +115,12 @@ ...@@ -115,12 +115,12 @@
<html> <html>
<head> <head>
<title><fmt:message key="user.message.title"/></title> <title><fmt:message key="user.message.title"/></title>
<meta name="pageID" content="user-message"/> <meta name="pageID" content="user-message"/>
<meta name="helpPage" content="send_an_administrative_message_to_users.html"/> <meta name="helpPage" content="send_an_administrative_message_to_users.html"/>
</head> </head>
<body> <body>
<% if (success) { %> <% if (success) { %>
...@@ -165,87 +165,91 @@ function updateSelect(el) { ...@@ -165,87 +165,91 @@ function updateSelect(el) {
<% } %> <% } %>
<table cellpadding="3" cellspacing="1" border="0" width="600"> <!-- BEGIN send message block -->
<tr class="tableHeader"><td colspan="3" align="left"><fmt:message key="user.message.send_admin_msg" /></td></tr> <!--<div class="jive-contentBoxHeader">
<tr><td colspan=3 class="text"> <fmt:message key="user.message.send_admin_msg" />
<% if (user == null) { %> </div>-->
<div class="jive-contentBox" style="-moz-border-radius: 3px;">
<table cellpadding="3" cellspacing="1" border="0" width="600">
<fmt:message key="user.message.info" /> <tr><td colspan=3 class="text" style="padding-bottom: 10px;">
<% if (user == null) { %>
<% } else { %> <p><fmt:message key="user.message.info" /></p>
<fmt:message key="user.message.specified_user_info" /> <% } else { %>
<% } %> <p><fmt:message key="user.message.specified_user_info" /></p>
</td></tr>
<tr>
<td class="jive-label">
<fmt:message key="user.message.to" />:
</td>
<td>
<% if (user == null) { %>
<fmt:message key="user.message.all_online_user" /> <% } %>
</td></tr>
<tr>
<td class="jive-label">
<fmt:message key="user.message.to" />:
</td>
<td>
<% if (user == null) { %>
<% } else { %> <fmt:message key="user.message.all_online_user" />
<% if (sess != null && numSessions == 1) { %> <% } else { %>
<%= sess.getAddress().toString() %> <% if (sess != null && numSessions == 1) { %>
<input type="hidden" name="jid" value="<%= sess.getAddress().toString() %>">
<% } else { %> <%= sess.getAddress().toString() %>
<input type="hidden" name="jid" value="<%= sess.getAddress().toString() %>">
<select size="2" name="jid" multiple> <% } else { %>
<% Iterator<ClientSession> iter = sessions.iterator(); <select size="2" name="jid" multiple>
while (iter.hasNext()) {
sess = iter.next();
%>
<option value="<%= sess.getAddress().toString() %>"><%= sess.getAddress().toString() %></option>
<% } %> <% Iterator<ClientSession> iter = sessions.iterator();
while (iter.hasNext()) {
sess = iter.next();
%>
<option value="<%= sess.getAddress().toString() %>"><%= sess.getAddress().toString() %></option>
</select> <% } %>
<input type="checkbox" name="sendToAll" value="true" id="cb01" </select>
onfocus="updateSelect(this);" onclick="updateSelect(this);">
<label for="cb01"><fmt:message key="user.message.send_session" /></label>
<% } %> <input type="checkbox" name="sendToAll" value="true" id="cb01"
onfocus="updateSelect(this);" onclick="updateSelect(this);">
<label for="cb01"><fmt:message key="user.message.send_session" /></label>
<% if (errors.get("jid") != null) { %> <% } %>
<br> <% if (errors.get("jid") != null) { %>
<span class="jive-error-text">
<fmt:message key="user.message.valid_address" />
</span>
<% } %> <br>
<span class="jive-error-text">
<fmt:message key="user.message.valid_address" />
</span>
<% } %> <% } %>
</td>
</tr>
<tr valign="top">
<td class="jive-label">
<fmt:message key="user.message.message" />:
</td>
<td>
<% if (errors.get("message") != null) { %>
<span class="jive-error-text"> <% } %>
<fmt:message key="user.message.valid_message" /> </td>
</span> </tr>
<br> <tr valign="top">
<td class="jive-label">
<fmt:message key="user.message.message" />:
</td>
<td>
<% if (errors.get("message") != null) { %>
<% } %> <span class="jive-error-text">
<textarea name="message" cols="55" rows="5" wrap="virtual"></textarea> <fmt:message key="user.message.valid_message" />
</td> </span>
</tr> <br>
</table>
</div>
<br> <% } %>
<textarea name="message" cols="55" rows="5" wrap="virtual"></textarea>
</td>
</tr>
</table>
</div>
<!-- END send message block -->
<input type="submit" value="<fmt:message key="user.message.send_message" />"> <input type="submit" value="<fmt:message key="user.message.send_message" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />"> <input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
...@@ -256,5 +260,6 @@ function updateSelect(el) { ...@@ -256,5 +260,6 @@ function updateSelect(el) {
document.f.message.focus(); document.f.message.focus();
</script> </script>
</body>
</body>
</html> </html>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023