Skip to content

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

Updated admin console look and feel (JM-717). 

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4011 b35dd754-fafc-0310-a699-88a17e54d16e
parent 150ff51e
Show whitespace changes
Inline Side-by-side
Showing with 144 additions and 103 deletions
src/web/decorators/main.jsp
View file @ b9e8aa33
...@@ -81,55 +81,24 @@ ...@@ -81,55 +81,24 @@
<body id="jive-body"> <body id="jive-body">
<div id="jive-header"> <div id="jive-header">
<table cellpadding="0" cellspacing="0" width="100%" border="0"> <div class="info">
<tbody> <a href="#" onclick="helpwin();return false;"><img src="<%= path %>/images/header-help_new.gif" width="22" height="22" border="0" alt="Click for help"></a><br>
<tr> <%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %>
<td> </div>
<img id="jive-logo-image" src="<%= path %>/<%= AdminConsole.getLogoImage() %>" border="0" alt="<%= AdminConsole.getAppName() %> <fmt:message key="login.title" />"> <div id="jive-logo-image_new">
</td> <strong>Administration Console</strong>
<td align="right"> </div>
<table cellpadding="0" cellspacing="0" border="0"> <div id="jive-logout" style="float: right;">
<tr> <a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(webManager.getUser().getUsername()) %>]</a>
<td> </div>
<a href="#" onclick="helpwin();return false;"
><img src="<%= path %>/images/header-help.gif" width="24" height="24" border="0" alt="Click for help" hspace="10"></a>
&nbsp;
</td>
<td class="info">
<nobr><%= AdminConsole.getAppName() %> <%= AdminConsole.getVersionString() %></nobr>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td colspan="3">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tbody>
<tr>
<td width="99%" nowrap>
<div id="jive-tabs"> <div id="jive-tabs">
<admin:tabs css="" currentcss="currentlink"> <admin:tabs css="" currentcss="currentlink">
<a href="[url]" title="[description]" <a href="[url]" title="[description]" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;">[name]</a>
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
>[name]</a>
</admin:tabs> </admin:tabs>
</div> </div>
</td> <div id="sidebar-top"></div>
<td width="1%" id="jive-logout" nowrap>
<a href="<%= path %>/index.jsp?logout=true"><%= LocaleUtils.getLocalizedString("global.logout") %> [<%= StringUtils.escapeHTMLTags(webManager.getUser().getUsername()) %>]</a>
&nbsp;&nbsp;&nbsp;
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</div> </div>
<%-- <%--
<div id="jive-secondary"> <div id="jive-secondary">
<ul> <ul>
...@@ -145,7 +114,6 @@ ...@@ -145,7 +114,6 @@
<tr valign="top"> <tr valign="top">
<td width="1%" id="jive-sidebar-box"> <td width="1%" id="jive-sidebar-box">
<div id="jive-sidebar"> <div id="jive-sidebar">
<admin:sidebar css="" currentcss="currentlink" headercss="category"> <admin:sidebar css="" currentcss="currentlink" headercss="category">
<a href="[url]" title="[description]" <a href="[url]" title="[description]"
onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;" onmouseover="self.status='[description]';return true;" onmouseout="self.status='';return true;"
...@@ -156,10 +124,8 @@ ...@@ -156,10 +124,8 @@
>[name]</a> >[name]</a>
</admin:subsidebar> </admin:subsidebar>
</admin:sidebar> </admin:sidebar>
<br> <br>
<img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt=""> <img src="<%= path %>/images/blank.gif" width="150" height="1" border="0" alt="">
</div> </div>
</td> </td>
<td width="99%" id="jive-content"> <td width="99%" id="jive-content">
......
src/web/style/global.css
View file @ b9e8aa33
...@@ -9,7 +9,7 @@ BODY { ...@@ -9,7 +9,7 @@ BODY {
background-color : #fff; background-color : #fff;
} }
#jive-body { #jive-body {
background-image : url("../images/page-background.gif"); background-image : url("../images/page-background_new.gif");
background-repeat : repeat-y; background-repeat : repeat-y;
} }
P { P {
...@@ -41,13 +41,37 @@ FIELDSET LEGEND { ...@@ -41,13 +41,37 @@ FIELDSET LEGEND {
#jive-header { #jive-header {
width : 100%; width : 100%;
height : 61px; height : 90px;
border : 0px; border : 0px;
background-image : url("../images/header-background.gif"); background-image : url("../images/header-background_new.gif");
background-repeat : repeat-x; background-repeat : repeat-x;
background-color : #369; background-color : #FFFFFF;
border-bottom : 1px #369 solid; min-width: 720px;
} }
#jive-logo-image {
display: block;
position: relative;
top: 0px;
left: 0px;
color: #FFFFFF;
}
#jive-logo-image_new {
display: block;
position: absolute;
top: 0px;
left: 0px;
width: 350px;
height: 50px;
background: url("../images/header-title_new.gif") no-repeat;
color: #FFFFFF;
overflow: hidden;
}
#jive-logo-image_new strong {
display: block;
position: relative;
margin: 0px 0px 0px 130px;
padding-top: 23px;
}
#jive-secondary { #jive-secondary {
border-top : 1px #ccc solid; border-top : 1px #ccc solid;
background-color : #eee; background-color : #eee;
...@@ -56,43 +80,75 @@ FIELDSET LEGEND { ...@@ -56,43 +80,75 @@ FIELDSET LEGEND {
padding-left : 12px; padding-left : 12px;
} }
#jive-header .info { #jive-header .info {
font-size : 8pt; display: block;
color : #fff; position: absolute;
padding-right : 2em; width: 170px;
text-align : right; right: 12px;
top: 10px;
/*float: right;*/
font-size: 8pt;
color: #FFFFFF;
padding: 0px 0px 0px 0px;
text-align: right;
} }
#jive-header .info img {
margin: 0px 0px 4px 0px;
}
#jive-content { #jive-content {
padding : 1em; padding: 13px 20px 12px 20px;
} }
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Main tabs */ /* Main tabs */
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-header #jive-tabs {
display: block;
position: absolute;
top: 54px;
left: 60px;
height: 20px;
margin: 0px 0px 0px 0px;
white-space: nowrap;
}
#jive-header #jive-tabs UL, #jive-header #jive-tabs LI { #jive-header #jive-tabs UL, #jive-header #jive-tabs LI {
display : inline; display: inline;
padding : 3px; padding: 0px;
margin : 0px; margin: 0px;
white-space: nowrap;
} }
#jive-header #jive-tabs LI { #jive-header #jive-tabs LI {
font-family : verdana, arial, helvetica, sans-serif; font-family : verdana, arial, helvetica, sans-serif;
font-size : 9pt; font-size : 8pt;
font-weight : bold; font-weight : bold;
} }
#jive-header #jive-tabs LI A { #jive-header #jive-tabs LI A {
color : #CEE1FA; display: block;
float: left;
color : #FFFFFF;
text-decoration : none; text-decoration : none;
padding : 3px 5px 3px 5px; padding : 1px 7px 1px 7px;
margin-top: 2px;
margin-right: 4px;
background-color: #6788A6;
} }
#jive-header #jive-tabs LI A:hover { #jive-header #jive-tabs LI A:hover {
color : #fff; color : #fff;
text-decoration : underline; text-decoration : underline;
} }
#jive-header #jive-tabs .currentlink A { #jive-header #jive-tabs .currentlink A {
color : #fff; margin-top: 0px;
text-decoration : underline; color: #006699;
} text-decoration: none;
background-color: EAF1F8;
padding-top: 3px;
padding-bottom: 3px;
}
#jive-header #jive-tabs .currentlink A:hover {
color: #006699;
text-decoration: none;
}
/* --------------------------------------------- */ /* --------------------------------------------- */
/* Logviewer tabs */ /* Logviewer tabs */
...@@ -129,16 +185,22 @@ FIELDSET LEGEND { ...@@ -129,16 +185,22 @@ FIELDSET LEGEND {
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-header #jive-logout { #jive-header #jive-logout {
display: block;
position: absolute;
width: 175px;
right: 12px;
top: 53px;
white-space : nowrap; white-space : nowrap;
text-align: right;
} }
#jive-header #jive-logout A { #jive-header #jive-logout A {
color : #cee1fa; color : #FFFFFF;
font-size : 8pt; font-size : 8pt;
font-weight : bold; font-weight : bold;
text-decoration : none; text-decoration : none;
} }
#jive-header #jive-logout A:hover { #jive-header #jive-logout A:hover {
color : #fff; color : #FFFFFF;
text-decoration : underline; text-decoration : underline;
} }
...@@ -176,63 +238,76 @@ FIELDSET LEGEND { ...@@ -176,63 +238,76 @@ FIELDSET LEGEND {
/* Sidebar */ /* Sidebar */
/* --------------------------------------------- */ /* --------------------------------------------- */
#jive-header #sidebar-top {
display: block;
position: absolute;
width: 169px;
height: 10px;
left: 0px;
top: 80px;
background: url("../images/sidebar_top.gif") no-repeat;
overflow: hidden;
}
#jive-main #jive-sidebar-box { #jive-main #jive-sidebar-box {
/*background-color : #eef;*/ /*background-color : #eef;*/
/*border-right : 2px #ccf solid;*/ /*border-right : 2px #ccf solid;*/
} }
#jive-main #jive-sidebar { #jive-main #jive-sidebar {
padding : 0px 5px 5px 5px; width: 169px;
padding: 0px 0px 5px 0px;
margin-top: -15px;
} }
#jive-main #jive-sidebar ul { #jive-main #jive-sidebar ul {
margin: 0; /*removes indent IE and Opera*/ margin: 0px; /*removes indent IE and Opera*/
padding: 0 0 0 0; /*removes indent Mozilla and NN7*/ margin-left: 7px;
padding: 0px 0px 0px 0px; /*removes indent Mozilla and NN7*/
list-style-type: none; /*turns off display of bullet*/ list-style-type: none; /*turns off display of bullet*/
font-family: verdana, Arial, Helvetica, sans-serif; font-family: verdana, Arial, Helvetica, sans-serif;
font-size: 8pt; font-size: 8pt;
} }
#jive-main #jive-sidebar li { #jive-main #jive-sidebar li {
margin: 0 15px 2px 0px; margin: 0px 5px 1px 0px;
width : 140px; width : 151px;
} }
#jive-main #jive-sidebar a { #jive-main #jive-sidebar a {
/*/*/display: block; display: block;
padding: 2px 2px 2px 10px; padding: 2px 2px 2px 8px;
border: 1px #fff solid; border: 1px solid #EAF1F8;
width: 140px; width: 151px;
-moz-border-radius : 3px; -moz-border-radius: 3px;
background-color: #fff; /* */
} }
html>body #jive-main #jive-sidebar a {
width: 140px;
}
#jive-main #jive-sidebar a:link, #jive-main #jive-sidebar a:visited { #jive-main #jive-sidebar a:link, #jive-main #jive-sidebar a:visited {
color: #000; color: #003366;
/*/*/color: #000; text-decoration: none;
text-decoration: none; /* */
} }
#jive-main #jive-sidebar a:hover { #jive-main #jive-sidebar a:hover {
/* border: 1px solid #34679A;
border: 1px solid #369; background-color: #FFFFFF;
background-color : #CBDDEE; text-decoration: none;
color: #333;
*/
border : 1px solid #963;
background-color : #ffc;
} }
#jive-main #jive-sidebar .currentlink a, #jive-main #jive-sidebar .currentlink a,
#jive-main #jive-sidebar .currentlink a:link, #jive-main #jive-sidebar .currentlink a:link,
#jive-main #jive-sidebar .currentlink a:visited, #jive-main #jive-sidebar .currentlink a:visited,
#jive-main #jive-sidebar .currentlink a:hover #jive-main #jive-sidebar .currentlink a:hover
{ {
/*/*/border: 1px solid #369; border: 1px solid #34679A;
background-color: #CBDDEE; background-color: #5C7D9D;
color: #333; /* */ color: #FFFFFF;
font-weight: bold;
} }
#jive-main #jive-sidebar .category { #jive-main #jive-sidebar .category {
padding-top : 1.5em; padding-top : 20px;
padding-bottom : 0.5em; padding-bottom : 3px;
font-weight : bold; font-weight : bold;
} }
#jive-main #jive-sidebar .subitems LI { #jive-main #jive-sidebar .subitems LI {
margin-left : 10px; margin-left: 10px;
width : 130px; width: 130px;
} }
#jive-main #jive-sidebar .subitems LI A { #jive-main #jive-sidebar .subitems LI A {
margin-left : 10px; margin-left : 10px;
......
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