Skip to content

O
Openfire
Commit bca29228 authored by Matt Tucker's avatar Matt Tucker Committed by matt
Browse files
Options

Updates. 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6898 b35dd754-fafc-0310-a699-88a17e54d16e
parent 16ee51eb
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 86 deletions
src/java/org/jivesoftware/wildfire/container/AdminConsolePlugin.java
View file @ bca29228
......@@ -203,6 +203,22 @@ public class AdminConsolePlugin implements Plugin {
return adminSecurePort;
}
/**
* Returns the collection of Jetty contexts used in the admin console. A root context "/"
* is where the admin console lives. Additional contexts can be added dynamically for
* other web applications that should be run as part of the admin console server
* process. The following pseudo code demonstrates how to do this:
*
* <pre>
* ContextHandlerCollection contexts = ((AdminConsolePlugin)pluginManager.getPlugin("admin")).getContexts();
* context = new WebAppContext(SOME_DIRECTORY, "/CONTEXT_NAME");
* contexts.addHandler(context);
* context.setWelcomeFiles(new String[]{"index.jsp"});
* context.start();
* </pre>
*
* @return the Jetty handlers.
*/
public ContextHandlerCollection getContexts() {
return contexts;
}
......
src/web/decorators/main.jsp
View file @ bca29228
......@@ -75,96 +75,86 @@
<body id="jive-body">
<div id="jive-header">
<div id="jive-logo-image_new">
<strong>Administration Console</strong>
</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>
<div id="jive-tabs">
<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>
<div id="sidebar-top"></div>
</div>
<!-- BEGIN main -->
<div id="main">
<div id="jive-header">
<div id="jive-logo-image_new">
<strong>Administration Console</strong>
</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>
<div id="jive-tabs">
<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>
<div id="sidebar-top"></div>
</div>
<%--
<div id="jive-secondary">
<ul>
<li><a href="">Server Manager</a></li>
<li><a href="">Server Settings</a></li>
</ul>
</div>
--%>
<div id="jive-main">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%" id="jive-sidebar-box">
<div id="jive-sidebar">
<admin:sidebar css="" currentcss="currentlink" headercss="category">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
<admin:subsidebar css="" currentcss="currentlink">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
</admin:subsidebar>
</admin:sidebar>
<br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div>
</td>
<td width="99%" id="jive-content">
<%--
<div id="jive-secondary">
<ul>
<li><a href="">Server Manager</a></li>
<li><a href="">Server Settings</a></li>
</ul>
</div>
--%>
<% if (message != null) { %>
<div id="jive-main">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr valign="top">
<td width="1%" id="jive-sidebar-box">
<div id="jive-sidebar">
<admin:sidebar css="" currentcss="currentlink" headercss="category">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
<admin:subsidebar css="" currentcss="currentlink">
<a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
</admin:subsidebar>
</admin:sidebar>
<br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div>
</td>
<td width="99%" id="jive-content">
<% if (message != null) { %>
<%= message %>
<% } %>
<div id="jive-title">
<decorator:title default="&nbsp;"/>
</div>
<decorator:body/>
<%-- Show bottom footer --%>
<br/><br/>
<div width="100%" style="position:fixed;left:0;bottom:0;">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td width="164">
<img src="/images/blank.gif" width="164" height="1" alt="">
</td>
<td align="center">
<div style="border-left:#B3D3F4 1px solid;
border-right:#B3D3F4 1px solid;
border-top:#B3D3F4 1px solid;
width:500px;
padding:5px;
background-color:#EAF1F8;
font-size:smaller;"
>
<%= 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
<%= message %>
<% } %>
<div id="jive-title">
<decorator:title default="&nbsp;"/>
</div>
</td>
</tr>
</table>
</div>
</td>
</tr>
</tbody>
</table>
<decorator:body/>
</td>
</tr>
</tbody>
</table>
</div>
</div>
<!-- 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>
</div>
</div>
<!-- END footer -->
</body>
</html>
\ No newline at end of file
src/web/style/global.css
View file @ bca29228
* html #footer {
margin: -30px 0 0 0;
}
* html #main {
height: 100%;
}
html {
height: 100%;
}
body {
padding: 0;
margin: 0;
height: 100%;
}
#main {
min-height:100%;
}
#jive-main {
padding-bottom: 20px;
}
BODY, DIV, P, TD, TH {
font-family : arial, helvetica, sans-serif;
font-size : 100%;
......@@ -863,3 +887,32 @@ th.jive-table-th-center {
color: #106600;
padding-left: 20px;
}
#footer {
position: relative;
width: 100%;
height: 30px;
background-image : url("../images/page-background_new.gif");
background-repeat : repeat-y;
margin-top: -30px;
}
#footer_padding {
text-align: center;
padding-left: 165px;
}
#footer_content {
width: 500px;
padding: 0;
height: 29px;
margin: 0 auto;
background-color: #eaf1f8;
border: 1px solid #b3d3f4;
border-bottom: none;
font-size: 8pt;
}
#footer_content span {
display: block;
padding: 7px;
}
\ 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