Skip to content

O
Openfire
Commit 2fd05b84 authored by Daniel Henninger's avatar Daniel Henninger Committed by dhenninger
Browse files
Options

Undid JM-1218 as it was moved to 3.5.0. 


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@9781 b35dd754-fafc-0310-a699-88a17e54d16e
parent 1dbe2e49
Hide whitespace changes
Inline Side-by-side
Showing with 273 additions and 441 deletions
src/i18n/openfire_i18n_en.properties
View file @ 2fd05b84
...@@ -275,7 +275,6 @@ ...@@ -275,7 +275,6 @@
# Added key: 'server.db.connection_details.when_created' # Added key: 'server.db.connection_details.when_created'
# Added key: 'server.db.connection_details.last_used' # Added key: 'server.db.connection_details.last_used'
# Added key: 'server.db.connection_details.thread' # Added key: 'server.db.connection_details.thread'
# Added key: 'admin.logged_in_as'
# Openfire # Openfire
...@@ -467,7 +466,6 @@ admin.console.restarting=Restarting admin console... ...@@ -467,7 +466,6 @@ admin.console.restarting=Restarting admin console...
admin.console.listening=Admin console listening at admin.console.listening=Admin console listening at
admin.console.devmode=Using development mode admin.console.devmode=Using development mode
admin.console=Administration Console admin.console=Administration Console
admin.logged_in_as=Logged in as {0}
# Server messages (to users) # Server messages (to users)
......
src/java/org/jivesoftware/admin/TabsTag.java
View file @ 2fd05b84
...@@ -54,7 +54,6 @@ public class TabsTag extends BodyTagSupport { ...@@ -54,7 +54,6 @@ public class TabsTag extends BodyTagSupport {
private String bean; private String bean;
private String css; private String css;
private String currentcss; private String currentcss;
private Boolean justlinks = false;
/** /**
* The name of the request attribute which holds a {@link AdminPageBean} instance. * The name of the request attribute which holds a {@link AdminPageBean} instance.
...@@ -99,20 +98,6 @@ public class TabsTag extends BodyTagSupport { ...@@ -99,20 +98,6 @@ public class TabsTag extends BodyTagSupport {
this.currentcss = currentcss; 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. * Does nothing, returns {@link #EVAL_BODY_BUFFERED} always.
*/ */
...@@ -139,7 +124,7 @@ public class TabsTag extends BodyTagSupport { ...@@ -139,7 +124,7 @@ public class TabsTag extends BodyTagSupport {
JspWriter out = pageContext.getOut(); JspWriter out = pageContext.getOut();
// Build up the output in a buffer (is probably faster than a bunch of out.write's) // Build up the output in a buffer (is probably faster than a bunch of out.write's)
StringBuilder buf = new StringBuilder(); StringBuilder buf = new StringBuilder();
if (!justlinks) { buf.append("<ul>"); } buf.append("<ul>");
String body = getBodyContent().getString(); String body = getBodyContent().getString();
// For each tab, print out an <LI>. // For each tab, print out an <LI>.
Element currentTab = null; Element currentTab = null;
...@@ -165,13 +150,12 @@ public class TabsTag extends BodyTagSupport { ...@@ -165,13 +150,12 @@ public class TabsTag extends BodyTagSupport {
if (tab.equals(currentTab)) { if (tab.equals(currentTab)) {
css = getCurrentcss(); css = getCurrentcss();
} }
if (!justlinks) { buf.append("<li class=\"").append(css).append("\">"); } buf.append("<li class=\"").append(css).append("\">");
if (justlinks && i > 0) { buf.append(" | "); }
buf.append(value); buf.append(value);
if (!justlinks) { buf.append("</li>"); } buf.append("</li>");
} }
if (!justlinks) { buf.append("</ul>"); } buf.append("</ul>");
try { try {
out.write(buf.toString()); out.write(buf.toString());
} }
......
src/web/WEB-INF/admin.tld
View file @ 2fd05b84
...@@ -34,12 +34,7 @@ ...@@ -34,12 +34,7 @@
<required>false</required> <required>false</required>
<rtexprvalue>true</rtexprvalue> <rtexprvalue>true</rtexprvalue>
</attribute> </attribute>
<attribute> </tag>
<name>justlinks</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
</attribute>
</tag>
<tag> <tag>
<name>sidebar</name> <name>sidebar</name>
<tagclass>org.jivesoftware.admin.SidebarTag</tagclass> <tagclass>org.jivesoftware.admin.SidebarTag</tagclass>
......
src/web/available-plugins.jsp
View file @ 2fd05b84
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,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:#eee;"> <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>
......
src/web/decorators/main.jsp
View file @ 2fd05b84
...@@ -79,23 +79,19 @@ ...@@ -79,23 +79,19 @@
<div id="main"> <div id="main">
<div id="jive-header"> <div id="jive-header">
<div id="jive-logo"> <div id="jive-logo-image_new">
<a href="/index.jsp"><img src="/images/login_logo.gif" alt="Openfire" width="179" height="53" /></a> <strong>Administration Console</strong>
</div> </div>
<div id="jive-userstatus"> <div id="jive-logout" style="float: right;">
<%= 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> <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(JID.unescapeNode(webManager.getUser().getUsername())) %>]</a>
</div> </div>
<div id="jive-nav"> <div id="jive-tabs">
<div id="jive-nav-left"></div>
<admin:tabs css="" currentcss="currentlink"> <admin:tabs css="" currentcss="currentlink">
<a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a> <a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
</admin:tabs> </admin:tabs>
<div id="jive-nav-right"></div>
</div>
<div id="jive-subnav">
&nbsp;
</div> </div>
<div id="sidebar-top"></div>
</div> </div>
<%-- <%--
...@@ -111,24 +107,20 @@ ...@@ -111,24 +107,20 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%"> <table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody> <tbody>
<tr valign="top"> <tr valign="top">
<td width="1%"> <td width="1%" id="jive-sidebar-box">
<div id="jive-sidebar-container"> <div id="jive-sidebar">
<div id="jive-sidebar-box"> <admin:sidebar css="" currentcss="currentlink" headercss="category">
<div id="jive-sidebar"> <a href="[url]" title="[description]"
<admin:sidebar css="" currentcss="currentlink" headercss="category"> onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
<a href="[url]" title="[description]" >[name]</a>
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;" <admin:subsidebar css="" currentcss="currentlink">
>[name]</a> <a href="[url]" title="[description]"
<admin:subsidebar css="" currentcss="currentlink"> onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
<a href="[url]" title="[description]" >[name]</a>
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;" </admin:subsidebar>
>[name]</a> </admin:sidebar>
</admin:subsidebar> <br>
</admin:sidebar> <img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
<br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div>
</div>
</div> </div>
</td> </td>
<td width="99%" id="jive-content"> <td width="99%" id="jive-content">
...@@ -139,13 +131,12 @@ ...@@ -139,13 +131,12 @@
<% } %> <% } %>
<h1> <div id="jive-title">
<decorator:title default="&nbsp;"/> <decorator:title default="&nbsp;"/>
</h1>
<div id="jive-main-content">
<decorator:body/>
</div> </div>
<decorator:body/>
</td> </td>
</tr> </tr>
</tbody> </tbody>
...@@ -156,14 +147,11 @@ ...@@ -156,14 +147,11 @@
<!-- END main --> <!-- END main -->
<!-- BEGIN footer --> <!-- BEGIN footer -->
<div id="jive-footer"> <div id="footer">
<div class="jive-footer-nav"> <div id="footer_padding">
<admin:tabs css="" currentcss="currentlink" justlinks="true"> <div id="footer_content">
<a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a> <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>
</admin:tabs> </div>
</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>
</div> </div>
<!-- END footer --> <!-- END footer -->
......
src/web/index.jsp
View file @ 2fd05b84
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
padding-top: 10px; padding-top: 10px;
} }
.info-header { .info-header {
background-color: #eee; background-color: #f3f6fa;
font-size: 10pt; font-size: 10pt;
} }
.info-table { .info-table {
......
src/web/login.jsp
View file @ 2fd05b84
...@@ -152,12 +152,13 @@ ...@@ -152,12 +152,13 @@
<div align="center"> <div align="center">
<!-- BEGIN login box --> <!-- BEGIN login box -->
<div id="jive-loginBox"> <div id="jive-loginBox">
<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;"> <div id="jive-loginLogo"></div>
<fmt:message key="admin.console" /> <div id="jive-loginHeader"><fmt:message key="admin.console" /></div>
</span>
<div align="center" id="jive-loginTable">
<div style="text-align: center; width: 380px;"> <div style="text-align: center; width: 380px;">
<table cellpadding="0" cellspacing="0" border="0" align="center"> <table cellpadding="0" cellspacing="0" border="0" align="center">
...@@ -222,6 +223,11 @@ ...@@ -222,6 +223,11 @@
<!-- END login box --> <!-- END login box -->
</div> </div>
<!-- old login log image
<img src="<%= AdminConsole.getLoginLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %>">
-->
</form> </form>
<script language="JavaScript" type="text/javascript"> <script language="JavaScript" type="text/javascript">
......
src/web/plugin-admin.jsp
View file @ 2fd05b84
...@@ -463,7 +463,7 @@ else if ("false".equals(request.getParameter("uploadsuccess"))) { %> ...@@ -463,7 +463,7 @@ else if ("false".equals(request.getParameter("uploadsuccess"))) { %>
<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:#eee;"> <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/style/global.css
View file @ 2fd05b84
* html #footer {
margin: -30px 0 0 0;
}
* html #main {
height: 100%;
}
html {
height: 100%;
}
body { body {
padding: 0; padding: 0;
margin: 0; margin: 0;
} height: 100%;
}
#main {
min-height:100%;
}
#jive-main { #jive-main {
padding-bottom: 20px; padding-bottom: 20px;
...@@ -9,27 +24,21 @@ body { ...@@ -9,27 +24,21 @@ body {
BODY, DIV, P, TD, TH { BODY, DIV, P, TD, TH {
font-family : arial, helvetica, sans-serif; font-family : arial, helvetica, sans-serif;
font-size : 9pt; font-size : 100%;
font-size : 10pt;
} }
BODY { BODY {
margin : 0px; margin : 0px;
padding : 0px; padding : 0px;
color: #333;
background-color : #fff; background-color : #fff;
} }
/*
#jive-body { #jive-body {
background-image : url("../images/page-background_new.gif"); background-image : url("../images/page-background_new.gif");
background-repeat : repeat-y; background-repeat : repeat-y;
} }
*/
a { a {
color: #06698c; color: #34679a;
}
a:hover {
text-decoration: underline;
} }
P { P {
...@@ -55,82 +64,20 @@ FIELDSET LEGEND { ...@@ -55,82 +64,20 @@ FIELDSET LEGEND {
color : #000; color : #000;
} }
h1 {
font-size: 14pt;
margin: 12px 0 15px 0;
padding: 0;
color: #06698c;
}
h1 select {
color: #06698c;
}
h2 {
font-size: 11pt;
margin: 18px 0 5px 0;
padding: 0;
}
h3 {
font-size: 10pt;
margin: 18px 0 5px 0;
padding: 0;
}
h4 {
font-size: 10pt;
margin: 8px 0 3px 0;
padding: 0 0 4px 0;
}
h5 {
font-size: 10pt;
margin: 18px 0 -8px 0;
padding: 0;
}
p {
margin-top: 0;
}
ul {
margin: 0;
padding: 0 0 12px 26px;
}
hr {
width: 100%;
height: 1px;
background-color: #dcdcdc;
border: none;
}
form {
margin: 0;
padding: 0;
}
select, input {
font-family : verdana, arial;
font-size : 8pt;
}
iframe {
border : 1px #999 solid;
}
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Header */ /* Header */
/* --------------------------------------------- */ /* --------------------------------------------- */
/*#jive-header { #jive-header {
width : 100%; width : 100%;
height : 90px; height : 90px;
border : 0px; border : 0px;
background-image : url("../images/header-background_new.gif");
background-repeat : repeat-x; background-repeat : repeat-x;
background-color : #FFFFFF; background-color : #FFFFFF;
min-width: 720px; min-width: 720px;
} */ }
#jive-header {
width: 100%;
float: left;
clear: both;
padding: 0;
margin: 0;
overflow: hidden;
}
#jive-logo-image { #jive-logo-image {
display: block; display: block;
position: relative; position: relative;
...@@ -178,181 +125,112 @@ iframe { ...@@ -178,181 +125,112 @@ iframe {
margin: 0px 0px 4px 0px; margin: 0px 0px 4px 0px;
} }
#jive-content { #jive-content {
padding: 10px 20px 12px 32px; padding: 13px 20px 12px 20px;
} }
/* name and logo image */
#jive-logo {
height: 76px;
/* height can NOT be more than 90 pixels */
float: left;
/* padding: 21px 0 0 15px;*/
overflow: hidden;
}
#jive-logo h1 {
float: left;
clear: none;
font-size: 14pt;
color: #90b9c8;
padding: 0 0 0 0;
/* margin: 10px 0 0 10px;*/
}
#jive-logo img {
float: left;
border: none;
padding-top: 7px;
padding-left: 10px;
}
/* version, login and site link */
#jive-userStatus {
width: 275px;
float: right;
margin: 0;
padding: 15px 15px 0 0;
font-size: 8pt;
line-height: 11pt;
text-align: right;
color: #999;
}
#jive-userStatus a {
font-weight: bold;
}
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Main nav */ /* Main tabs */
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-header #jive-nav { #jive-header #jive-tabs {
background: #f7f7f7 url(../images/jive-nav-bg.gif) repeat-x; display: block;
clear: both; position: absolute;
height: 27px; top: 54px;
margin: 0; left: 60px;
padding: 0; height: 20px;
} margin: 0px 0px 0px 0px;
white-space: nowrap;
#jive-header #jive-nav-left, #jive-header #jive-nav-right { }
width: 15px;
height: 27px;
}
#jive-header #jive-nav-left {
float: left;
background: transparent url(../images/jive-nav-div.gif) no-repeat right;
}
#jive-header #jive-nav-right {
float: right;
}
#jive-header #jive-nav UL { #jive-header #jive-tabs UL, #jive-header #jive-tabs LI {
margin: 0 0 0 5px; display: inline;
padding: 0; padding: 0px;
list-style-type: none; margin: 0px;
white-space: nowrap;
} }
#jive-header #jive-nav UL LI { #jive-header #jive-tabs LI {
float: left; font-family : verdana, arial, helvetica, sans-serif;
margin: 0 0 0 0; font-size : 8pt;
padding: 4px 2px 5px 0; font-weight : bold;
color: #fff;
font-size: 11pt;
background: transparent url(../images/jive-nav-div.gif) no-repeat right;
} }
#jive-header #jive-nav UL LI A, #jive-header #jive-nav UL LI A:visited { #jive-header #jive-tabs LI A {
margin: 0; display: block;
padding: 6px 13px 6px 13px; float: left;
color: #333; color : #FFFFFF;
font-size: 10pt; text-decoration : none;
font-weight: bold; padding : 1px 7px 1px 7px;
text-decoration: none; margin-top: 2px;
/*background-color: #6788A6;*/ margin-right: 4px;
background-color: #6788A6;
} }
#jive-header #jive-nav UL LI A:hover, #jive-header #jive-nav UL LI A:active { #jive-header #jive-tabs LI A:hover {
color : #fff;
text-decoration : underline; text-decoration : underline;
background: transparent url(../images/jive-nav-bg-over.gif) repeat-x right;
} }
#jive-header #jive-nav UL LI.currentlink A, #jive-header #jive-nav UL LI.currentlink A:hover { #jive-header #jive-tabs .currentlink A {
background: transparent url(../images/jive-nav-bg-on.gif) repeat-x right; margin-top: 0px;
color: #fff; color: #006699;
}
/* Subnav */
#jive-subnav {
height: 28px;
clear: both;
width: 100%;
margin: 0;
padding: 0;
background: #f7f7f7 url(../images/jive-subnav-bg.gif) repeat-x;
}
#jive-subnav .subnav-community {
background: #f7f7f7 url(../images/jive-subnav-bg.gif) repeat-x 100px;
}
#jive-subnav ul {
margin: 0 0 0 13px;
padding: 0;
list-style-type: none;
}
#jive-subnav ul li {
float: left;
margin: 9px 0 0 0;
padding: 0 1px 2px 0;
color: #fff;
font-size: 11pt;
background: transparent url(../images/jive-subnav-div.gif) no-repeat right;
}
#jive-subnav ul li a,
#jive-subnav ul li a:visited {
margin: 0 0 0 0;
padding: 3px 15px 3px 15px;
font-size: 8pt;
font-weight: bold;
font-family: verdana, sans-serif;
text-decoration: none; text-decoration: none;
} background-color: #EAF1F8;
#jive-subnav ul li a:hover, padding-top: 3px;
#jive-subnav ul li a:active { padding-bottom: 3px;
text-decoration: underline;
background-color: #c8d7dd;
}
#jive-subnav ul li.current {
background: none;
}
#jive-subnav ul li.current a {
background-color: #f2f8fa;
border: 1px solid #c2cfd5;
border-bottom : 1px #f2f8fa solid;
} }
#jive-header #jive-tabs .currentlink A:hover {
color: #006699;
text-decoration: none;
}
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Logviewer tabs */ /* Logviewer tabs */
/* --------------------------------------------- */ /* --------------------------------------------- */
#logviewer .jive-nav TD { #logviewer .jive-tabs TD {
font-family : verdana, sans-serif; font-family : verdana;
font-size : 8pt; font-size : 8pt;
} }
#logviewer .jive-nav .jive-tab, .jive-nav .jive-tab-active { #logviewer .jive-tabs .jive-tab, .jive-tabs .jive-tab-active {
border : 1px #ccc solid; border : 1px #ccc solid;
white-space : nowrap; white-space : nowrap;
padding : 4px 1em 4px 1em; padding : 4px 1em 4px 1em;
background-color : #ddd; background-color : #ddd;
} }
#logviewer .jive-nav .jive-tab-active { #logviewer .jive-tabs .jive-tab-active {
border-bottom : 1px #fff solid; border-bottom : 1px #fff solid;
background-color : #fff; background-color : #fff;
} }
#logviewer .jive-nav .jive-spacer, .jive-nav .jive-stretch { #logviewer .jive-tabs .jive-spacer, .jive-tabs .jive-stretch {
border-bottom : 1px #ccc solid; border-bottom : 1px #ccc solid;
} }
#logviewer .jive-nav .jive-tab A, #logviewer .jive-nav .jive-tab-active A { #logviewer .jive-tabs .jive-tab A, #logviewer .jive-tabs .jive-tab-active A {
text-decoration : none; text-decoration : none;
font-weight : bold; font-weight : bold;
color : #000; color : #000;
} }
#logviewer .jive-nav .jive-tab A:hover, #logviewer .jive-nav .jive-tab-active A:hover { #logviewer .jive-tabs .jive-tab A:hover, #logviewer .jive-tabs .jive-tab-active A:hover {
text-decoration : underline;
}
/* --------------------------------------------- */
/* Logout link */
/* --------------------------------------------- */
#jive-header #jive-logout {
display: block;
position: absolute;
width: 175px;
right: 12px;
top: 53px;
white-space : nowrap;
text-align: right;
}
#jive-header #jive-logout A {
color : #FFFFFF;
font-size : 8pt;
font-weight : bold;
text-decoration : none;
}
#jive-header #jive-logout A:hover {
color : #FFFFFF;
text-decoration : underline; text-decoration : underline;
} }
...@@ -373,7 +251,7 @@ iframe { ...@@ -373,7 +251,7 @@ iframe {
#jive-main #jive-breadcrumbs { #jive-main #jive-breadcrumbs {
font-size : 8pt; font-size : 8pt;
/* font-weight : bold; */ /* font-weight : bold; */
font-family : verdana, sans-serif; font-family : verdana;
white-space : nowrap; white-space : nowrap;
padding-top : 2px; padding-top : 2px;
} }
...@@ -390,107 +268,118 @@ iframe { ...@@ -390,107 +268,118 @@ iframe {
/* Sidebar */ /* Sidebar */
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-main { #jive-header #sidebar-top {
position: relative; display: block;
float: left; position: absolute;
clear: both; width: 169px;
display: block; height: 10px;
padding: 0; left: 0px;
margin: 0; top: 80px;
width: 100%; background: url("../images/sidebar_top.gif") no-repeat;
background: #fff url(../images/jive-body-bg.gif) repeat-x top; overflow: hidden;
}
#jive-sidebar-container {
margin: 0px;
padding: 0px;
width: 200px;
float: left;
font-size: 9pt;
overflow: hidden;
}
#jive-sidebar-box {
width: 200px;
overflow: hidden;
margin: 0px;
padding: 0px;
}
#jive-sidebar {
padding-top: 0px;
margin-bottom: 12px;
background: transparent url(../images/jive-tertnav-top.gif) no-repeat top right;
} }
#jive-sidebar ul { #jive-main #jive-sidebar-box {
background-color: #f2f8fa; /*background-color : #eef;*/
border-right: 1px solid #e2eff4; /*border-right : 2px #ccf solid;*/
border-bottom: 1px solid #e2eff4; }
-moz-border-radius: 0 0 5px 0; #jive-main #jive-sidebar {
list-style-type: none; width: 169px;
margin: 0 5px 0 0; padding: 0px 0px 5px 0px;
padding: 8px 22px 15px 22px; margin-top: -15px;
}
#jive-main #jive-sidebar ul {
margin: 0px; /*removes indent IE and Opera*/
margin-left: 7px;
padding: 0px 0px 0px 0px; /*removes indent Mozilla and NN7*/
list-style-type: none; /*turns off display of bullet*/
font-family: verdana, Arial, Helvetica, sans-serif;
font-size: 8pt;
} }
#jive-sidebar ul li { #jive-main #jive-sidebar li {
padding: 0 0 0 0; margin: 0px 5px 1px 0px;
border-bottom: 1px solid #e2ecee; width : 151px;
} }
#jive-sidebar ul li a { #jive-main #jive-sidebar a {
display: block; display: block;
padding: 4px 0 4px 10px; padding: 2px 2px 2px 8px;
color: #06698c; border: 1px solid #EAF1F8;
text-decoration: none; width: 151px;
-moz-border-radius: 3px;
} }
html>body #jive-main #jive-sidebar a {
width: 140px;
}
#jive-sidebar ul li a:link, #jive-sidebar ul li a:visited { #jive-main #jive-sidebar a:link, #jive-main #jive-sidebar a:visited {
color: #06698c; color: #003366;
text-decoration: none; text-decoration: none;
} }
#jive-sidebar ul li a:hover { #jive-main #jive-sidebar a:hover {
text-decoration: underline; border: 1px solid #34679A;
background-color: #FFFFFF;
text-decoration: none;
} }
#jive-sidebar ul li.currentlink { #jive-main #jive-sidebar .currentlink a,
background: transparent url(../images/jive-tertnav-arrow.gif) no-repeat left; #jive-main #jive-sidebar .currentlink a:link,
font-weight: bold; #jive-main #jive-sidebar .currentlink a:visited,
#jive-main #jive-sidebar .currentlink a:hover
{
border: 1px solid #34679A;
background-color: #5C7D9D;
color: #FFFFFF;
font-weight: bold;
} }
#jive-sidebar .category { #jive-main #jive-sidebar .category {
padding-top : 20px; padding-top : 20px;
padding-bottom : 3px; padding-bottom : 3px;
font-weight : bold; font-weight : bold;
} }
#jive-sidebar ul.subitems { #jive-main #jive-sidebar ul.subitems {
background-color: #f2f8fa; width: 150px;
border-right: 1px solid #e2eff4; background-color: #d4e1ed;
border-bottom: 1px solid #e2eff4; border: 1px solid #34679a;
list-style-type: none; list-style-type: disc;
margin: 0 0 0 10px; -moz-border-radius: 4px;
padding: 0; margin: 0px 0px 1px 0px;
overflow: hidden;
} }
#jive-sidebar ul.subitems li.category { #jive-main #jive-sidebar ul.subitems br {
padding: 4px 0 4px 0; display: none;
font-weight : bold; }
color: #06698c; #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-sidebar ul.subitems li { #jive-main #jive-sidebar ul.subitems li {
padding: 0 0 0 0; margin-left: 25px;
border-bottom: 1px solid #e2ecee;
} }
#jive-sidebar ul.subitems li a { #jive-main #jive-sidebar ul.subitems li a {
display: block; margin: 2px 0px 2px 0px;
padding: 4px 0 4px 10px; padding: 1px 0px 1px 0px;
color: #06698c; border: none;
text-decoration: none;
} }
#jive-sidebar ul.subitems li a:hover { #jive-main #jive-sidebar ul.subitems li a:hover {
text-decoration: underline; background-color: transparent;
border: none;
text-decoration: underline;
} }
#jive-sidebar ul.subitems li.currentlink a, #jive-main #jive-sidebar ul.subitems li.currentlink a,
#jive-sidebar ul.subitems li.currentlink a:visited , #jive-main #jive-sidebar ul.subitems li.currentlink a:visited ,
#jive-sidebar ul.subitems li.currentlink a:hover { #jive-main #jive-sidebar ul.subitems li.currentlink a:hover {
color: #06698c; font-weight: bold;
text-decoration: none; color: #003366;
background: transparent url(../images/jive-tertnav-arrow.gif) no-repeat left; background-color: transparent;
font-weight: bold; border: none;
} }
/* --------------------------------------------- */ /* --------------------------------------------- */
...@@ -589,7 +478,7 @@ PRE, TT { ...@@ -589,7 +478,7 @@ PRE, TT {
padding : 0 5px 0 3px; padding : 0 5px 0 3px;
} }
.jive-table TH { .jive-table TH {
background-color : #eee; background-color : #f3f7fa;
border-bottom : 1px #ccc 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;
...@@ -825,7 +714,7 @@ A.cal:Hover { ...@@ -825,7 +714,7 @@ A.cal:Hover {
margin: 8px 0px 0px 0px; margin: 8px 0px 0px 0px;
font-size: 9pt; font-size: 9pt;
font-weight: bold; font-weight: bold;
background-color: #eee; background-color: #f3f7fa;
border: 1px solid #ccc; border: 1px solid #ccc;
border-bottom: none; border-bottom: none;
} }
...@@ -999,26 +888,6 @@ th.jive-table-th-center { ...@@ -999,26 +888,6 @@ th.jive-table-th-center {
padding-left: 20px; padding-left: 20px;
} }
#jive-footer {
width: 100%;
clear: both;
border-top: 1px solid #dcdcdc;
margin: 10px 0 0 0;
padding: 5px 0 40px 0;
font-size: 8pt;
color: #666;
}
.jive-footer-nav {
float: left;
padding-left: 5px;
}
.jive-footer-nav a {
padding: 0 5px 0 5px;
}
.jive-footer-copyright {
float: right;
padding-right: 12px;
}
#footer { #footer {
position: relative; position: relative;
...@@ -1046,13 +915,4 @@ th.jive-table-th-center { ...@@ -1046,13 +915,4 @@ th.jive-table-th-center {
#footer_content span { #footer_content span {
display: block; display: block;
padding: 7px; padding: 7px;
} }
\ No newline at end of file
#jive-main-content {
margin: 15px 0 20px 0;
padding: 18px 20px 18px 20px;
border: 1px solid #dcdcdc;
background: #f5f5f5 url(../images/jive-body-contentbox-bg.gif) repeat-x top;
-moz-border-radius: 4px;
}
src/web/style/login.css
View file @ 2fd05b84
...@@ -5,11 +5,27 @@ ...@@ -5,11 +5,27 @@
text-align: left; text-align: left;
top: 148px; 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 { #jive-loginHeader {
font-size: 14pt; display: block;
font-weight: bold; position: relative;
color: #06698c; width: 300px;
margin: 0px; height: 40px;
margin: 25px 0px 10px 0px;
padding-top: 9px;
font-size: 20px;
color: #255480;
float: left;
overflow: hidden;
} }
#jive-loginTable { #jive-loginTable {
display: block; display: block;
...@@ -18,47 +34,32 @@ ...@@ -18,47 +34,32 @@
width: auto; width: auto;
margin: 10px 0px 0px 0px; margin: 10px 0px 0px 0px;
padding: 0px; padding: 0px;
} }
#jive-loginTable table {
clear: both;
margin-top: 20px;
}
#jive-loginTable td.loginFormTable { #jive-loginTable td.loginFormTable {
padding: 17px 17px 7px 55px; padding: 17px 17px 7px 18px;
background: #d8e4e9 url(../images/jive-login-form-bg.gif) repeat-x top; background-color: #e1eaf1;
border: 1px solid #b6c5d3; border: 1px solid #b6c5d3;
-moz-border-radius: 5px; -moz-border-radius: 4px;
}
.loginFormTable TD {
text-align : left;
} }
#jive-loginTable td.loginFormTable table {
margin-top: 0px;
}
#jive-loginVersion { #jive-loginVersion {
color: #999999; color: #999999;
font-weight: normal; font-weight: normal;
font-size: 10px; font-size: 11px;
padding-top: 4px; padding-top: 8px;
} }
.jive-login-label { .jive-login-label {
font-size: 11px; font-size : 12px;
font-weight: bold; font-weight: bold;
color: #515151; color: #214c74;
text-align : left;
} }
#jive-login-header {
font-size: 14pt;
font-weight: bold;
color: #06698c;
margin: 0px;
}
BODY { BODY {
background: #b6b6b6 url(../images/jive-login-bg.gif) repeat-x top; background-image : url(../images/login_background.png);
padding: 0px; background-repeat : repeat-x;
margin: 0px; background-color : #fff;
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