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
Show 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 @@
<style type="text/css">
.light-gray-border {
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 1px;
padding: 5px;
-moz-border-radius: 3px;
}
......@@ -73,7 +74,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 0px 1px 0px;
padding: 5px;
......@@ -84,7 +85,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 0px 1px 0px;
padding: 5px;
......@@ -95,7 +96,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0px;
padding: 5px;
......@@ -106,7 +107,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 0px 1px 1px;
padding: 5px;
......@@ -118,7 +119,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0px;
padding: 5px;
......@@ -127,7 +128,7 @@
.line-bottom-border {
font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt;
border-color: #bbb;
border-color: #e3e3e3;
border-style: solid;
border-width: 0px 0px 1px 0px;
padding: 5px;
......@@ -250,7 +251,7 @@
<div class="light-gray-border" style="padding:10px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr style="background:#F7F7FF;">
<tr style="background:#f3f7fa;">
<td class="table-header-left">&nbsp;</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>
......@@ -350,7 +351,7 @@
}
%>
<tr><td><br/></td></tr>
<tr style="background:#F7F7FF;">
<tr style="background:#f3f7fa;">
<td class="table-header-left">&nbsp;</td>
<td nowrap colspan="7" class="row-header"><fmt:message key="plugin.available.commercial_plugins" /></td>
</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.
<fmt:message key="group.create.new_group_title" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<table cellpadding="3" cellspacing="0" border="0">
<tr valign="top">
<td width="1%" nowrap>
<label for="gname"><fmt:message key="group.create.group_name" /></label> *
......
src/web/group-edit.jsp
View file @ d361268c
......@@ -315,7 +315,7 @@
group roster with all users or members of other groups.
</p>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr>
<td width="1%">
......
src/web/muc-create-permission.jsp
View file @ d361268c
......@@ -79,12 +79,12 @@
%>
<html>
<head>
<title><fmt:message key="muc.create.permission.title"/></title>
<meta name="pageID" content="muc-perms"/>
<meta name="helpPage" content="set_group_chat_room_creation_permissions.html"/>
</head>
<body>
<head>
<title><fmt:message key="muc.create.permission.title"/></title>
<meta name="pageID" content="muc-perms"/>
<meta name="helpPage" content="set_group_chat_room_creation_permissions.html"/>
</head>
<body>
<p>
<fmt:message key="muc.create.permission.info" />
......@@ -130,12 +130,13 @@
<% } %>
<!-- BEGIN 'Permission Policy' -->
<form action="muc-create-permission.jsp?save" method="post">
<fieldset>
<legend><fmt:message key="muc.create.permission.policy" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="muc.create.permission.policy" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr>
<td width="1%">
......@@ -161,19 +162,19 @@
<br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div>
</fieldset>
</form>
<!-- END 'Permission Policy' -->
<br>
<% if (mucServer.isRoomCreationRestricted()) { %>
<form action="muc-create-permission.jsp?add" method="post">
<fieldset>
<legend><fmt:message key="muc.create.permission.allowed_users" /></legend>
<div>
<% if (mucServer.isRoomCreationRestricted()) { %>
<!-- BEGIN 'Allowed Users' -->
<form action="muc-create-permission.jsp?add" method="post">
<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>
<input type="text" name="userJID" size="30" maxlength="100" value="<%= (userJID != null ? userJID : "") %>"
......@@ -220,11 +221,11 @@
</table>
</div>
</div>
</fieldset>
</form>
</form>
<!-- END 'Allowed Users' -->
<% } %>
</body>
</body>
</html>
\ No newline at end of file
src/web/muc-history-settings.jsp
View file @ d361268c
......@@ -84,12 +84,12 @@
%>
<html>
<head>
<title><fmt:message key="groupchat.history.settings.title"/></title>
<meta name="pageID" content="muc-history"/>
<meta name="helpPage" content="edit_group_chat_history_settings.html"/>
</head>
<body>
<head>
<title><fmt:message key="groupchat.history.settings.title"/></title>
<meta name="pageID" content="muc-history"/>
<meta name="helpPage" content="edit_group_chat_history_settings.html"/>
</head>
<body>
<p>
<fmt:message key="groupchat.history.settings.introduction" />
......@@ -110,12 +110,13 @@
<% } %>
<!-- BEGIN 'History Settings' -->
<form action="muc-history-settings.jsp" method="post">
<fieldset>
<legend><fmt:message key="groupchat.history.settings.legend" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="groupchat.history.settings.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" >
<tbody>
<tr valign="middle" class="">
<td width="1%" nowrap>
......@@ -155,14 +156,11 @@
</tr>
</tbody>
</table>
<input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
</div>
</fieldset>
<br><br>
<input type="submit" name="update" value="<fmt:message key="groupchat.history.settings.save" />"/>
</form>
<!-- END 'History Settings' -->
</body>
</body>
</html>
\ No newline at end of file
src/web/muc-server-props-edit-form.jsp
View file @ d361268c
......@@ -62,12 +62,12 @@
%>
<html>
<head>
<title><fmt:message key="groupchat.service.properties.title"/></title>
<meta name="pageID" content="muc-server-props"/>
<meta name="helpPage" content="edit_group_chat_service_properties.html"/>
</head>
<body>
<head>
<title><fmt:message key="groupchat.service.properties.title"/></title>
<meta name="pageID" content="muc-server-props"/>
<meta name="helpPage" content="edit_group_chat_service_properties.html"/>
</head>
<body>
<p>
<fmt:message key="groupchat.service.properties.introduction" />
......@@ -101,12 +101,13 @@
<% } %>
<!-- BEGIN 'Service Name'-->
<form action="muc-server-props-edit-form.jsp" method="post">
<input type="hidden" name="save" value="true">
<fieldset>
<legend><fmt:message key="groupchat.service.properties.legend" /></legend>
<div>
<div class="jive-contentBoxHeader">
<fmt:message key="groupchat.service.properties.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tr>
......@@ -126,14 +127,11 @@
</td>
</tr>
</table>
<input type="submit" value="<fmt:message key="groupchat.service.properties.save" />">
</div>
</fieldset>
<br><br>
<input type="submit" value="<fmt:message key="groupchat.service.properties.save" />">
</form>
<!-- END 'Service Name'-->
</body>
</body>
</html>
\ No newline at end of file
src/web/muc-sysadmins.jsp
View file @ d361268c
......@@ -51,12 +51,12 @@
%>
<html>
<head>
<title><fmt:message key="groupchat.admins.title"/></title>
<meta name="pageID" content="muc-sysadmin"/>
<meta name="helpPage" content="edit_group_chat_service_administrators.html"/>
</head>
<body>
<head>
<title><fmt:message key="groupchat.admins.title"/></title>
<meta name="pageID" content="muc-sysadmin"/>
<meta name="helpPage" content="edit_group_chat_service_administrators.html"/>
</head>
<body>
<p>
<fmt:message key="groupchat.admins.introduction" />
......@@ -103,11 +103,13 @@
<% } %>
<form action="muc-sysadmins.jsp?add" method="post">
<fieldset>
<legend><fmt:message key="groupchat.admins.legend" /></legend>
<div>
<!-- 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">
......@@ -152,9 +154,9 @@
</table>
</div>
</div>
</fieldset>
</form>
<!-- END 'Administrators' -->
</body>
</body>
</html>
\ No newline at end of file
src/web/muc-tasks.jsp
View file @ d361268c
......@@ -104,12 +104,12 @@
%>
<html>
<head>
<title><fmt:message key="muc.tasks.title"/></title>
<meta name="pageID" content="muc-tasks"/>
<meta name="helpPage" content="edit_idle_user_settings.html"/>
</head>
<body>
<head>
<title><fmt:message key="muc.tasks.title"/></title>
<meta name="pageID" content="muc-tasks"/>
<meta name="helpPage" content="edit_idle_user_settings.html"/>
</head>
<body>
<p>
<fmt:message key="muc.tasks.info" />
......@@ -159,12 +159,14 @@
<% } %>
<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%">
<!-- 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>
......@@ -190,23 +192,20 @@
</tr>
</tbody>
</table>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div>
</fieldset>
<br><br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END 'Idle User Settings' -->
<br>
<!-- BEGIN 'Conversation Logging' -->
<form action="muc-tasks.jsp?logSettings" method="post">
<fieldset>
<legend><fmt:message key="muc.tasks.conversation.logging" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="muc.tasks.conversation.logging" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0" >
<tr valign="middle">
<td width="1%" nowrap class="c1">
<fmt:message key="muc.tasks.flush" />
......@@ -226,14 +225,11 @@
</td>
</tr>
</table>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div>
</fieldset>
<br><br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END 'Conversation Logging' -->
</body>
</body>
</html>
\ No newline at end of file
src/web/plugin-admin.jsp
View file @ d361268c
......@@ -166,11 +166,7 @@
</script>
<style type="text/css">
.content {
border-color: #bbb;
border-style: solid;
border-width: 0px 0px 1px 0px;
}
.textfield {
font-size: 11px;
......@@ -198,14 +194,15 @@
}
.light-gray-border {
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 1px;
padding: 5px;
-moz-border-radius: 3px;
}
.light-gray-border-bottom {
border-color: #bbb;
border-color: #dcdcdc;
border-style: solid;
border-width: 0px 0px 1px 0px;
}
......@@ -215,7 +212,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 0px 1px 0px;
padding: 5px;
......@@ -226,7 +223,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 0px 1px 1px;
padding: 5px;
......@@ -238,7 +235,7 @@
font-family: verdana, arial, helvetica, sans-serif;
font-size: 8pt;
font-weight: bold;
border-color: #bbb;
border-color: #ccc;
border-style: solid;
border-width: 1px 1px 1px 0px;
padding: 5px;
......@@ -253,7 +250,6 @@
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt;
background: #E7FBDE;
border-color: #73CB73;
border-style: solid;
......@@ -335,7 +331,7 @@
text-align: left;
font-family: verdana, arial, helvetica, sans-serif;
font-size: 9pt;
border-color: #bbb;
border-color: #e3e3e3;
border-style: solid;
border-width: 0px 0px 1px 0px;
padding: 5px;
......@@ -397,7 +393,7 @@ else if ("false".equals(request.getParameter("deletesuccess"))) { %>
<div class="light-gray-border" style="padding:10px;">
<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 class="table-header"><fmt:message key="plugin.admin.description"/></td>
......
src/web/server-db-stats.jsp
View file @ d361268c
......@@ -74,10 +74,13 @@
<fmt:message key="server.db_stats.description" />
</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">
<ul>
<table cellpadding="3" cellspacing="1" border="0">
<tr>
<td>
......@@ -95,16 +98,14 @@
</td>
</tr>
</table>
</ul>
</form>
<% if (showQueryStats) { %>
<p><b><fmt:message key="server.db_stats.settings" /></b></p>
<br>
<h3><fmt:message key="server.db_stats.settings" /></h3>
<form action="server-db-stats.jsp">
<ul>
<table cellpadding="3" cellspacing="1" border="0">
<table cellpadding="3" cellspacing="1" border="0" width="730">
<tr>
<td>
<fmt:message key="server.db_stats.refresh" />:
......@@ -133,18 +134,16 @@
</td>
</tr>
</table>
</ul>
</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>
<table bgcolor="#aaaaaa" cellpadding="3" cellspacing="1" border="0" width="100%">
<tr bgcolor="#ffffff">
......@@ -181,11 +180,11 @@
<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>
<table bgcolor="#aaaaaa" cellpadding="3" cellspacing="0" border="0" width="100%">
<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 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>");
......@@ -205,7 +204,7 @@
</td></tr>
</table>
</ul>
<b><fmt:message key="server.db_stats.insert_stats" /></b>
......
src/web/server-locale.jsp
View file @ d361268c
......@@ -71,12 +71,13 @@
<fmt:message key="locale.title.info" />
</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;">
<!-- 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) %> /
<%= LocaleUtils.getTimeZoneName(JiveGlobals.getTimeZone().getID(), locale) %>
......@@ -196,13 +197,9 @@
<% } %>
</select>
</div>
</fieldset>
<br><br>
<input type="submit" name="save" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END locale settings -->
</body>
......
src/web/server2server-settings.jsp
View file @ d361268c
......@@ -175,16 +175,16 @@
%>
<html>
<head>
<title><fmt:message key="server2server.settings.title"/></title>
<meta name="pageID" content="server2server-settings"/>
</head>
<body>
<head>
<title><fmt:message key="server2server.settings.title"/></title>
<meta name="pageID" content="server2server-settings"/>
</head>
<body>
<p>
<fmt:message key="server2server.settings.info">
<fmt:param value="<%= "<a href='server-session-summary.jsp'>" %>" />
<fmt:param value="<%= "</a>" %>" />
<fmt:param value="<%= "<a href='server-session-summary.jsp'>" %>" />
<fmt:param value="<%= "</a>" %>" />
</fmt:message>
</p>
......@@ -208,8 +208,7 @@
</tr>
</tbody>
</table>
</div>
<br>
</div><br>
<% } else if (closeSettingsSuccess || updateSucess || allowSuccess || blockSuccess || deleteSuccess) { %>
......@@ -238,12 +237,13 @@
<% } %>
<!-- BEGIN 'Service Enabled' -->
<form action="server2server-settings.jsp" method="post">
<fieldset>
<legend><fmt:message key="server2server.settings.enabled.legend" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.enabled.legend" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
......@@ -269,22 +269,20 @@
</tr>
</tbody>
</table>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</div>
</fieldset>
<br>
<input type="submit" name="update" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END 'Service Enabled' -->
<br>
<!-- BEGIN 'Idle Connection Settings' -->
<form action="server2server-settings.jsp?closeSettings" method="post">
<fieldset>
<legend><fmt:message key="server2server.settings.close_settings" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.close_settings" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
<td width="1%" nowrap>
......@@ -310,22 +308,20 @@
</tr>
</tbody>
</table>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</div>
</fieldset>
<br>
<input type="submit" value="<fmt:message key="global.save_settings" />">
</form>
<!-- END 'Idle Connection Settings' -->
<br>
<fieldset>
<legend><fmt:message key="server2server.settings.allowed" /></legend>
<div>
<!-- BEGIN 'Allowed to Connect' -->
<div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.allowed" />
</div>
<div class="jive-contentBox">
<form action="server2server-settings.jsp" method="post">
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr valign="middle">
......@@ -354,9 +350,10 @@
</table>
<br>
<input type="submit" name="permissionUpdate" value="<fmt:message key="global.save_settings" />">
<br><br>
</form>
<table class="jive-table" cellpadding="0" cellspacing="0" border="0" width="100%">
<table class="jive-table" cellpadding="0" cellspacing="0" border="0" >
<thead>
<tr>
<th width="1%">&nbsp;</th>
......@@ -399,7 +396,7 @@
</tbody>
</table>
<br>
<table cellpadding="3" cellspacing="1" border="0" width="100%">
<table cellpadding="3" cellspacing="1" border="0" >
<form action="server2server-settings.jsp" method="post">
<tr>
<td nowrap>
......@@ -413,15 +410,17 @@
</tr>
</form>
</table>
</div>
</fieldset>
<!-- END 'Allowed to Connect' -->
<br>
<br><br>
<fieldset>
<legend><fmt:message key="server2server.settings.disallowed" /></legend>
<div>
<!-- BEGIN 'Not Allowed to Connect' -->
<div class="jive-contentBoxHeader">
<fmt:message key="server2server.settings.disallowed" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="1" border="0" width="100%"><tr><td>
<fmt:message key="server2server.settings.disallowed.info" />
</td></tr></table>
......@@ -479,7 +478,8 @@
</form>
</table>
</div>
</fieldset>
<!-- END 'Not Allowed to Connect' -->
</body>
</body>
</html>
src/web/style/global.css
View file @ d361268c
......@@ -306,14 +306,51 @@ html>body #jive-main #jive-sidebar a {
padding-bottom : 3px;
font-weight : bold;
}
#jive-main #jive-sidebar .subitems LI {
margin-left: 10px;
width: 130px;
#jive-main #jive-sidebar ul.subitems {
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 {
margin-left : 10px;
padding : 2px 2px 2px 5px;
width : 120px;
#jive-main #jive-sidebar ul.subitems li a:hover {
background-color: transparent;
border: none;
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 {
/* tables */
.jive-table {
border-color : #bbb;
border-color : #ccc;
border-style : solid;
border-width : 1px 1px 0px 1px;
}
......@@ -412,8 +449,8 @@ PRE, TT {
padding : 0 5px 0 3px;
}
.jive-table TH {
background-color : #EAF1F8;
border-bottom : 1px #bbb solid;
background-color : #f3f7fa;
border-bottom : 1px #ccc solid;
text-align : left;
font-family : verdana, arial, helvetica, sans-serif;
font-size : 8pt;
......@@ -429,7 +466,7 @@ PRE, TT {
}
.jive-table TR TD {
border-bottom : 1px #ccc solid;
border-bottom : 1px #e3e3e3 solid;
}
.jive-table TD {
font-family : arial, helvetica, sans-serif;
......@@ -442,8 +479,9 @@ PRE, TT {
background-color : #fbfbfb;
}
.jive-table TFOOT TD {
background-color : #ddd;
background-color : #eee;
font-family : verdana;
border-bottom: 1px solid #ccc;
font-size : 8pt;
}
.jive-table TD TD {
......@@ -637,7 +675,7 @@ A.cal:Hover {
display: block;
margin: 0px 0px 20px 0px;
padding: 12px 10px 12px 10px;
border: 1px solid #dcdcdc;
border: 1px solid #ccc;
background-color: #fff;
-moz-border-radius:0px 0px 4px 4px ;
}
......@@ -648,7 +686,7 @@ A.cal:Hover {
font-size: 9pt;
font-weight: bold;
background-color: #f3f7fa;
border: 1px solid #dcdcdc;
border: 1px solid #ccc;
border-bottom: none;
}
.jive-contentBoxGrey {
......@@ -710,7 +748,7 @@ th.jive-table-th-center {
/* --------------------------------------------- */
/* Roster box (in Group Settings page */
/* Roster box (in Group Settings page) */
/* --------------------------------------------- */
#jive-roster {
......@@ -729,3 +767,4 @@ th.jive-table-th-center {
color: #09345b;
padding: 0px 0px 3px 0px;
}
src/web/system-email.jsp
View file @ d361268c
......@@ -123,18 +123,19 @@
<p>
<!-- BEGIN SMTP settings -->
<form action="system-email.jsp" name="f" method="post">
<fieldset>
<legend><fmt:message key="system.email.name" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0">
<div class="jive-contentBoxHeader">
<fmt:message key="system.email.name" />
</div>
<div class="jive-contentBox">
<table width="80%" cellpadding="3" cellspacing="0" border="0">
<tr>
<td width="1%" nowrap>
<td width="30%" nowrap>
<fmt:message key="system.email.mail_host" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="text" name="host" value="<%= (host != null)?host:"" %>" size="40" maxlength="150">
</td>
</tr>
......@@ -142,10 +143,10 @@
<% if (errors.containsKey("host")) { %>
<tr>
<td width="1%" nowrap>
<td nowrap>
&nbsp;
</td>
<td width="1%" nowrap class="jive-error-text">
<td nowrap class="jive-error-text">
<fmt:message key="system.email.valid_host_name" />
</td>
</tr>
......@@ -153,18 +154,18 @@
<% } %>
<tr>
<td width="1%" nowrap>
<td nowrap>
<fmt:message key="system.email.server_port" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="text" name="port" value="<%= (port > 0) ? String.valueOf(port) : "" %>" size="10" maxlength="15">
</td>
</tr>
<tr>
<td width="1%" nowrap>
<td nowrap>
<fmt:message key="system.email.mail_debugging" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="radio" name="debug" value="true"<%= (debug ? " checked" : "") %> id="rb01"> <label for="rb01">On</label>
&nbsp;
<input type="radio" name="debug" value="false"<%= (debug ? "" : " checked") %> id="rb02"> <label for="rb02">Off</label>
......@@ -176,41 +177,37 @@
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td width="1%" nowrap>
<td nowrap>
<fmt:message key="system.email.server_username" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="text" name="server_username" value="<%= (username != null) ? username : "" %>" size="40" maxlength="150">
</td>
</tr>
<tr>
<td width="1%" nowrap>
<td nowrap>
<fmt:message key="system.email.server_password" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="password" name="server_password" value="<%= (password != null) ? StringUtils.hash(password) : "" %>" size="40" maxlength="150">
</td>
</tr>
<tr>
<td width="1%" nowrap>
<td nowrap>
<fmt:message key="system.email.ssl" />:
</td>
<td width="1%" nowrap>
<td nowrap>
<input type="checkbox" name="ssl"<%= (ssl) ? " checked" : "" %>>
</td>
</tr>
</table>
</div>
</fieldset>
<br>
<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" />">
</form>
<!-- END SMTP settings -->
</body>
</body>
</html>
\ No newline at end of file
src/web/user-create.jsp
View file @ d361268c
......@@ -165,10 +165,11 @@
<form name="f" action="user-create.jsp" method="get">
<fieldset>
<legend><fmt:message key="user.create.new_user" /></legend>
<div>
<table cellpadding="3" cellspacing="0" border="0" width="100%">
<div class="jive-contentBoxHeader">
<fmt:message key="user.create.new_user" />
</div>
<div class="jive-contentBox">
<table cellpadding="3" cellspacing="0" border="0">
<tbody>
<tr>
<td width="1%" nowrap><label for="usernametf"><fmt:message key="user.create.username" />:</label> *</td>
......@@ -212,20 +213,22 @@
id="confpasstf">
</td>
</tr>
<tr>
<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>
<br>
</div>
<span class="jive-description">
* <fmt:message key="user.create.requied" />
</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>
......
src/web/user-message.jsp
View file @ d361268c
......@@ -115,12 +115,12 @@
<html>
<head>
<title><fmt:message key="user.message.title"/></title>
<meta name="pageID" content="user-message"/>
<meta name="helpPage" content="send_an_administrative_message_to_users.html"/>
</head>
<body>
<head>
<title><fmt:message key="user.message.title"/></title>
<meta name="pageID" content="user-message"/>
<meta name="helpPage" content="send_an_administrative_message_to_users.html"/>
</head>
<body>
<% if (success) { %>
......@@ -165,20 +165,25 @@ function updateSelect(el) {
<% } %>
<table cellpadding="3" cellspacing="1" border="0" width="600">
<tr class="tableHeader"><td colspan="3" align="left"><fmt:message key="user.message.send_admin_msg" /></td></tr>
<tr><td colspan=3 class="text">
<% if (user == null) { %>
<!-- BEGIN send message block -->
<!--<div class="jive-contentBoxHeader">
<fmt:message key="user.message.send_admin_msg" />
</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 { %>
<% } %>
</td></tr>
<tr>
<p><fmt:message key="user.message.specified_user_info" /></p>
<% } %>
</td></tr>
<tr>
<td class="jive-label">
<fmt:message key="user.message.to" />:
</td>
......@@ -225,8 +230,8 @@ function updateSelect(el) {
<% } %>
</td>
</tr>
<tr valign="top">
</tr>
<tr valign="top">
<td class="jive-label">
<fmt:message key="user.message.message" />:
</td>
......@@ -241,11 +246,10 @@ function updateSelect(el) {
<% } %>
<textarea name="message" cols="55" rows="5" wrap="virtual"></textarea>
</td>
</tr>
</table>
</div>
<br>
</tr>
</table>
</div>
<!-- END send message block -->
<input type="submit" value="<fmt:message key="user.message.send_message" />">
<input type="submit" name="cancel" value="<fmt:message key="global.cancel" />">
......@@ -256,5 +260,6 @@ function updateSelect(el) {
document.f.message.focus();
</script>
</body>
</body>
</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