Skip to content

O
Openfire
Commit 21968d3f authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

Redid JM-1218 for 3.5.0. 


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9802 b35dd754-fafc-0310-a699-88a17e54d16e
parent b4c14493
Expand all Show whitespace changes
Inline Side-by-side
Showing with 466 additions and 296 deletions
src/i18n/openfire_i18n_en.properties
View file @ 21968d3f
......@@ -256,29 +256,32 @@
## Added key: 'setup.ldap.user.vcard.avatardb'
##
## 3.4.5
# Added key: 'server.db.pool_info'
# Added key: 'server.db.house_keeping_sleep'
# Added key: 'server.db.house_keeping_sql'
# Added key: 'server.db.connection_lifetime'
# Added key: 'server.db.connection_max'
# Added key: 'server.db.connection_min'
# Added key: 'server.db.test_after_use'
# Added key: 'server.db.test_before_use'
# Added key: 'server.db.connections'
# Added key: 'server.db.connections.active'
# Added key: 'server.db.connections.available'
# Added key: 'server.db.connections.max'
# Added key: 'server.db.connections_served'
# Added key: 'server.db.connections_refused'
# Added key: 'server.db.connection_details'
# Added key: 'server.db.connection_details.id'
# Added key: 'server.db.connection_details.when_created'
# Added key: 'server.db.connection_details.last_used'
# Added key: 'server.db.connection_details.thread'
# Added key: 'index.certificate-error'
# Added key: 'ssl.certificates.io_error'
# Added key: 'ssl.certificates.generated'
# Added key: 'ssl.certificates.uninstalled'
## Added key: 'server.db.pool_info'
## Added key: 'server.db.house_keeping_sleep'
## Added key: 'server.db.house_keeping_sql'
## Added key: 'server.db.connection_lifetime'
## Added key: 'server.db.connection_max'
## Added key: 'server.db.connection_min'
## Added key: 'server.db.test_after_use'
## Added key: 'server.db.test_before_use'
## Added key: 'server.db.connections'
## Added key: 'server.db.connections.active'
## Added key: 'server.db.connections.available'
## Added key: 'server.db.connections.max'
## Added key: 'server.db.connections_served'
## Added key: 'server.db.connections_refused'
## Added key: 'server.db.connection_details'
## Added key: 'server.db.connection_details.id'
## Added key: 'server.db.connection_details.when_created'
## Added key: 'server.db.connection_details.last_used'
## Added key: 'server.db.connection_details.thread'
## Added key: 'index.certificate-error'
## Added key: 'ssl.certificates.io_error'
## Added key: 'ssl.certificates.generated'
## Added key: 'ssl.certificates.uninstalled'
##
## 3.5.0
## Added key: 'admin.logged_in_as'
# Openfire
......@@ -470,6 +473,7 @@ admin.console.restarting=Restarting admin console...
admin.console.listening=Admin console listening at
admin.console.devmode=Using development mode
admin.console=Administration Console
admin.logged_in_as=Logged in as {0}
# Server messages (to users)
......
src/java/org/jivesoftware/admin/TabsTag.java
View file @ 21968d3f
......@@ -54,6 +54,7 @@ public class TabsTag extends BodyTagSupport {
private String bean;
private String css;
private String currentcss;
private Boolean justlinks = false;
/**
* The name of the request attribute which holds a {@link AdminPageBean} instance.
......@@ -98,6 +99,20 @@ public class TabsTag extends BodyTagSupport {
this.currentcss = currentcss;
}
/**
* Returns whether we are in just links mode.
*/
public Boolean getJustlinks() {
return justlinks;
}
/**
* Sets whether we are just to display links, no list.
*/
public void setJustlinks(Boolean justlinks) {
this.justlinks = justlinks;
}
/**
* Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
*/
......@@ -124,7 +139,7 @@ public class TabsTag extends BodyTagSupport {
JspWriter out = pageContext.getOut();
// Build up the output in a buffer (is probably faster than a bunch of out.write's)
StringBuilder buf = new StringBuilder();
buf.append("<ul>");
if (!justlinks) { buf.append("<ul>"); }
String body = getBodyContent().getString();
// For each tab, print out an <LI>.
Element currentTab = null;
......@@ -150,12 +165,13 @@ public class TabsTag extends BodyTagSupport {
if (tab.equals(currentTab)) {
css = getCurrentcss();
}
buf.append("<li class=\"").append(css).append("\">");
if (!justlinks) { buf.append("<li class=\"").append(css).append("\">"); }
if (justlinks && i > 0) { buf.append(" | "); }
buf.append(value);
buf.append("</li>");
if (!justlinks) { buf.append("</li>"); }
}
buf.append("</ul>");
if (!justlinks) { buf.append("</ul>"); }
try {
out.write(buf.toString());
}
......
src/web/WEB-INF/admin.tld
View file @ 21968d3f
......@@ -34,6 +34,11 @@
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
<attribute>
<name>justlinks</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag>
<name>sidebar</name>
......
src/web/available-plugins.jsp
View file @ 21968d3f
......@@ -252,7 +252,7 @@
<div class="light-gray-border" style="padding:10px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<thead>
<tr style="background:#f3f7fa;">
<tr style="background:#eee;">
<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>
......
src/web/decorators/main.jsp
View file @ 21968d3f
......@@ -79,19 +79,23 @@
<div id="main">
<div id="jive-header">
<div id="jive-logo-image_new">
<strong>Administration Console</strong>
<div id="jive-logo">
<a href="/index.jsp"><img src="/images/login_logo.gif" alt="Openfire" width="179" height="53" /></a>
</div>
<div id="jive-logout" style="float: right;">
<a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(JID.unescapeNode(webManager.getUser().getUsername())) %>]</a>
<div id="jive-userstatus">
<%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %><br/>
<fmt:message key="admin.logged_in_as"><fmt:param value="<%= "<strong>"+StringUtils.escapeHTMLTags(JID.unescapeNode(webManager.getUser().getUsername()))+"</strong>" %>"/></fmt:message> - <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %></a>
</div>
<div id="jive-tabs">
<div id="jive-nav">
<div id="jive-nav-left"></div>
<admin:tabs css="" currentcss="currentlink">
<a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
</admin:tabs>
<div id="jive-nav-right"></div>
</div>
<div id="jive-subnav">
&nbsp;
</div>
<div id="sidebar-top"></div>
</div>
<%--
......@@ -107,7 +111,9 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%" id="jive-sidebar-box">
<td width="1%">
<div id="jive-sidebar-container">
<div id="jive-sidebar-box">
<div id="jive-sidebar">
<admin:sidebar css="" currentcss="currentlink" headercss="category">
<a href="[url]" title="[description]"
......@@ -122,6 +128,8 @@
<br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div>
</div>
</div>
</td>
<td width="99%" id="jive-content">
......@@ -131,12 +139,13 @@
<% } %>
<div id="jive-title">
<h1>
<decorator:title default="&nbsp;"/>
</div>
</h1>
<div id="jive-main-content">
<decorator:body/>
</div>
</td>
</tr>
</tbody>
......@@ -147,11 +156,14 @@
<!-- END main -->
<!-- BEGIN footer -->
<div id="footer">
<div id="footer_padding">
<div id="footer_content">
<span><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %>, built by <a href="http://www.jivesoftware.com">Jive Software</a> and the <a href="http://www.igniterealtime.org">IgniteRealtime.org</a> community</span>
<div id="jive-footer">
<div class="jive-footer-nav">
<admin:tabs css="" currentcss="currentlink" justlinks="true">
<a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
</admin:tabs>
</div>
<div class="jive-footer-copyright">
Built by <a href="http://www.jivesoftware.com">Jive Software</a> and the <a href="http://www.igniterealtime.org">IgniteRealtime.org</a> community
</div>
</div>
<!-- END footer -->
......
src/web/index.jsp
View file @ 21968d3f
......@@ -171,7 +171,7 @@
padding-top: 10px;
}
.info-header {
background-color: #f3f6fa;
background-color: #eee;
font-size: 10pt;
}
.info-table {
......
src/web/login.jsp
View file @ 21968d3f
......@@ -153,13 +153,12 @@
<!-- BEGIN login box -->
<div id="jive-loginBox">
<div id="jive-loginLogo"></div>
<div id="jive-loginHeader"><fmt:message key="admin.console" /></div>
<div align="center" id="jive-loginTable">
<span id="jive-login-header" style="background: transparent url(images/login_logo.gif) no-repeat left; padding: 29px 0px 10px 205px;">
<fmt:message key="admin.console" />
</span>
<div style="text-align: center; width: 380px;">
<table cellpadding="0" cellspacing="0" border="0" align="center">
<tr>
......@@ -223,11 +222,6 @@
<!-- END login box -->
</div>
<!-- old login log image
<img src="<%= AdminConsole.getLoginLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %>">
-->
</form>
<script language="JavaScript" type="text/javascript">
......
src/web/plugin-admin.jsp
View file @ 21968d3f
......@@ -463,7 +463,7 @@ else if ("false".equals(request.getParameter("uploadsuccess"))) { %>
<div class="light-gray-border" style="padding:10px;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr style="background:#f3f7fa;">
<tr style="background:#eee;">
<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/style/global.css
View file @ 21968d3f
This diff is collapsed.
src/web/style/login.css
View file @ 21968d3f
......@@ -5,27 +5,11 @@
text-align: left;
top: 148px;
}
#jive-loginLogo {
display: block;
position: relative;
width: 179px;
height: 53px;
margin: 12px 0px 0px 7px;
background: url('../images/login_logo.gif') no-repeat;
float: left;
overflow: hidden;
}
#jive-loginHeader {
display: block;
position: relative;
width: 300px;
height: 40px;
margin: 25px 0px 10px 0px;
padding-top: 9px;
font-size: 20px;
color: #255480;
float: left;
overflow: hidden;
font-size: 14pt;
font-weight: bold;
color: #06698c;
margin: 0px;
}
#jive-loginTable {
display: block;
......@@ -34,32 +18,47 @@
width: auto;
margin: 10px 0px 0px 0px;
padding: 0px;
}
#jive-loginTable table {
clear: both;
margin-top: 20px;
}
#jive-loginTable td.loginFormTable {
padding: 17px 17px 7px 18px;
background-color: #e1eaf1;
padding: 17px 17px 7px 55px;
background: #d8e4e9 url(../images/jive-login-form-bg.gif) repeat-x top;
border: 1px solid #b6c5d3;
-moz-border-radius: 4px;
-moz-border-radius: 5px;
}
.loginFormTable TD {
text-align : left;
}
#jive-loginTable td.loginFormTable table {
margin-top: 0px;
}
#jive-loginVersion {
color: #999999;
font-weight: normal;
font-size: 11px;
padding-top: 8px;
font-size: 10px;
padding-top: 4px;
}
.jive-login-label {
font-size : 12px;
font-size: 11px;
font-weight: bold;
color: #214c74;
color: #515151;
text-align : left;
}
#jive-login-header {
font-size: 14pt;
font-weight: bold;
color: #06698c;
margin: 0px;
}
BODY {
background-image : url(../images/login_background.png);
background-repeat : repeat-x;
background-color : #fff;
padding : 0px;
margin : 0px;
background: #b6b6b6 url(../images/jive-login-bg.gif) repeat-x top;
padding: 0px;
margin: 0px;
}
\ 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