You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2006/10/18 16:24:04 UTC

svn commit: r465258 - in /incubator/activemq/trunk/activemq-web-console/src/main/webapp: decorators/ images/ js/ js/mochi/ styles/

Author: jstrachan
Date: Wed Oct 18 07:24:02 2006
New Revision: 465258

URL: http://svn.apache.org/viewvc?view=rev&rev=465258
Log:
added explicit license header to some javascript and css files - also switched to another CSS layout which is definitely creative commons

Added:
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/banner_mountains.jpg   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-left.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-right.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-left.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-right.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-left.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-right.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/logo.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menu.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuleft.png   (with props)
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuright.png   (with props)
Removed:
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/container_bg.gif
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/footer_bg.gif
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/footer_bg.jpg
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/formbg.gif
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuoff.gif
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuon.gif
Modified:
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/common.js
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/mochi/__package__.js
    incubator/activemq/trunk/activemq-web-console/src/main/webapp/styles/style.css

Modified: incubator/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp?view=diff&rev=465258&r1=465257&r2=465258
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/decorators/main.jsp Wed Oct 18 07:24:02 2006
@@ -23,54 +23,79 @@
         @import url(<c:url value="/styles/style.css"/>);
         @import url(<c:url value="/styles/sorttable.css"/>);
     </style>
-	    <c:if test="${!disableJavaScript}">
+    <c:if test="${!disableJavaScript}">
 	    <script type='text/javascript' src='<c:url value="/js/common.js"/>'/>
 	    <script type='text/javascript' src='<c:url value="/js/css.js"/>'/>
 	    <script type='text/javascript' src='<c:url value="/js/standardista-table-sorting.js"/>'/>
     </c:if>
-        
+
 	<decorator:head />
 </head>
 
-<body id="page-home">
-
-
-
-<div id="container">
-
-	<div id="header">
+<body>
 
-		<span class="sitetitle_left">ActiveMQ</span> <span class="sitetitle_right">Console</span>
-
-	</div>
-
-	<div id="chromemenu">
-		<ul>
+<div id="wrapper-menu-top">
+    <div id="menu-top">
+        <ul>
             <li><a href="<c:url value='/index.jsp'/>" title="Home<"><span>Home</span></a></li>
             <li><a href="<c:url value='/queues.jsp'/>" title="Queues"><span>Queues</span></a></li>
             <li><a href="<c:url value='/topics.jsp'/>" title="Topics"><span>Topics</span></a></li>
             <li><a href="<c:url value='/subscribers.jsp'/>" title="Subscribers"><span>Subscribers</span></a></li>
             <li><a href="<c:url value='/send.jsp'/>" title="Send"><span>Send</span></a></li>
-		</ul>
-	</div>
+        </ul>
+    </div>
+    <!--menu-top-->
+</div>
+<!--wrapper-menu-top-->
 
-	<div id="content">
+<div id="wrapper-header">
+    <div id="header">
+        <div id="wrapper-header2">
+            <div id="wrapper-header3">
+                <h1>ActiveMQ Console</h1>
+            </div>
+        </div>
+    </div>
+</div>
 
-        <div id="left">
+<div id="wrapper-content">
+    <!--
+    <div id="wrapper-menu-page">
+        <div id="menu-page">
+            <h3>Page navigation</h3>
+            <ul>
+                <li><a href="#">Example Link 1</a></li>
+            </ul>
+
+            <h3>sub page menu</h3>
+            <ul>
+                <li><a href="#">Example Link 1</a></li>
+
+                <li><a href="#">Example Link 2</a></li>
+                <li><a href="#">Example Link 3</a></li>
+                <li><a href="#">Example Link 4</a></li>
+            </ul>
+        </div>
+    </div>
+    -->
 
-<decorator:body />
+    <div id="content">
+        <decorator:body/>
 
-        </div>
     </div>
 </div>
 
+<div id="wrapper-footer">
+    <div id="footer">
+        <p>
+            Copyright 2005-2006 The Apache Software Foundation
+        </p>
+
+        <p>
+            <small>(<a href="?printable=true">printable version</a>)</small>
+        </p>
+    </div>
 
-
-<div id="footer">
-<p>
-Copyright 2005-2006 The Apache Software Foundation
-</p>
-<p><small>(<a href="?printable=true">printable version</a>)</small></p>
 </div>
 
 </body>

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/banner_mountains.jpg
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/banner_mountains.jpg?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/banner_mountains.jpg
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/banner_mountains.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-left.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-left.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-left.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-left.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-right.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-right.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-right.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-blue-right.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-left.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-left.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-left.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-left.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-right.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-right.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-right.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-right.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-left.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-left.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-left.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-left.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-right.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-right.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-right.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/bg02-white-right.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/logo.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/logo.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/logo.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/logo.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menu.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menu.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menu.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menu.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuleft.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuleft.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuleft.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuleft.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuright.png
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuright.png?view=auto&rev=465258
==============================================================================
Binary file - no diff available.

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuright.png
------------------------------------------------------------------------------
    svn:executable = *

Propchange: incubator/activemq/trunk/activemq-web-console/src/main/webapp/images/menuright.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/common.js
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/common.js?view=diff&rev=465258&r1=465257&r2=465258
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/common.js (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/common.js Wed Oct 18 07:24:02 2006
@@ -1,4 +1,7 @@
 /**
+ * This software is licensed under the Creative Commons Licence 2.5
+ * http://creativecommons.org/licenses/by/2.5/
+ *
  * addEvent written by Dean Edwards, 2005
  * with input from Tino Zijdel
  *

Modified: incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/mochi/__package__.js
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/mochi/__package__.js?view=diff&rev=465258&r1=465257&r2=465258
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/mochi/__package__.js (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/js/mochi/__package__.js Wed Oct 18 07:24:02 2006
@@ -1,2 +1,14 @@
+/***
+
+    MochiKit.MochiKit 1.3 : PACKED VERSION
+
+    THIS FILE IS AUTOMATICALLY GENERATED.  If creating patches, please
+    diff against the source tree, not this file.
+
+    See <http://mochikit.com/> for documentation, downloads, license, etc.
+
+    (c) 2005 Bob Ippolito.  All rights Reserved.
+
+***/
 dojo.hostenv.conditionalLoadModule({"common": ["MochiKit.MochiKit"]});
 dojo.hostenv.moduleLoaded("MochiKit.*");

Modified: incubator/activemq/trunk/activemq-web-console/src/main/webapp/styles/style.css
URL: http://svn.apache.org/viewvc/incubator/activemq/trunk/activemq-web-console/src/main/webapp/styles/style.css?view=diff&rev=465258&r1=465257&r2=465258
==============================================================================
--- incubator/activemq/trunk/activemq-web-console/src/main/webapp/styles/style.css (original)
+++ incubator/activemq/trunk/activemq-web-console/src/main/webapp/styles/style.css Wed Oct 18 07:24:02 2006
@@ -1,253 +1,185 @@
-/* CSS Document
-   Template Title: Inspirationally Blue
-   Author: J David Macor
-   URL: http://www.jdavidmacor.com */
-
-/* Main Body */
-body { 
-	margin-top:0;
-	padding:0;
-	font-family:Verdana, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	color:#000;
-	background-color:#efefef;
-	}
-
-#container {
-	width:740px;
-	background:url(../images/container_bg.gif) repeat-y #fff;
-	margin:0 auto;
-	padding-left:10px;
-	padding-right:10px;
-	}
-	
-a {
-	color:#2873C3;
-	text-decoration:none;
-	}
-
-a:visited {
-	color:#2873C3;
-	text-decoration:none;
-	}
+/*
+ * This CSS is licensed under the Creative Commons 2.5
+ * http://creativecommons.org/licenses/by/2.5/
+ *
+ * Css originally by mejobloggs  Design by Aran @ stuio7designs.com
+ * Please email me if you use this, as I would love to see how it is being used,
+ * also you can join my linkshare to help you with your google ranking
+ */
+
+body {
+  font-family: trebuchet ms, verdana, arial, tahoma;
+  font-size: 90%;
+  color: #888;
+  background-color: white;
+  line-height: 180%;
+  margin: 0;
+  padding: 0;
+  text-align: center;
+}
+
+/* Set the page width */
+#wrapper-menu-top, #header, #wrapper-content, #wrapper-footer {
+  width: 85%;
+  margin: 0 auto;
+  text-align: left;
+}
+
+#wrapper-menu-top {
+  background: white url( '../images/bg02-white-left.png' ) no-repeat left top;
+}
+
+#menu-top {
+  background: transparent url( '../images/bg02-white-right.png' ) no-repeat right top;
+  overflow: hidden; /* no idea why this works, but it fixes a FF problem */
+}
+
+#menu-top ul {
+  margin: 0 20px;
+  padding: 1em 0 0 0;
+  list-style: none;
+  font-size: 85%;
+  float: left;
+}
+
+#menu-top li {
+  display: inline;
+  float: left;
+}
+
+#menu-top a {
+  float: left;
+  background: url( ../images/menuleft.png ) no-repeat left top;
+  margin: 0;
+  padding: 0 0 0 4px;
+  text-decoration: none;
+  line-height: 1.5em;
+}
+
+#menu-top a span {
+  background: transparent url( ../images/menuright.png ) no-repeat right top;
+  padding: 5px 15px 4px 6px;
+  color: #5b8fbe;
+  display: block;
+  float: left;
+  cursor: pointer; /* IE doesnt display the hand when you roll over the link for some reason. This fixes it */
+}
+
+#menu-top a:hover {
+  background-position: 0% -42px;
+}
+
+#menu-top a:hover span {
+  background-position: 100% -42px;
+}
+
+#wrapper-header {
+  background: transparent url( '../images/bg.png' ) top center repeat-x;
+}
 
-a:hover {
-	text-decoration:underline;
-	}
-	
-/* Header */
 #header {
-	width:720px;
-	padding:30px 10px 10px 10px;
-	text-align:left;
-	height:70px;
-	}
-	
-.sitetitle_left {
-	color:#000;
-	font-family:Georgia, "Times New Roman", Times, serif;
-	font-size:40px;
-	margin:0;
-	}
-	
-.sitetitle_right {
-	color:#2873C3;
-	font-family:Georgia, "Times New Roman", Times, serif;
-	font-size:40px;
-	margin:0;
-	}
-	
-/* Menu */
-#chromemenu{
-	background:#2873C3;
-	font-weight: bold;
-	}
-
-#chromemenu:after{
-	content: "."; 
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-	}
-
-#chromemenu ul{
-	border: 0px solid #BBB;
-	width: 100%;
-	background: url(../images/menuoff.gif) center center repeat-x;
-	padding: 5px 0;
-	margin: 0;
-	text-align: right;
-	}
-
-#chromemenu ul li{
-	display: inline;
-	}
-
-#chromemenu ul li a{
-	color: #fff;
-	padding: 5px;
-	margin: 0;
-	text-decoration: none;
-	border-right: 0px solid #DADADA;
-	}
-
-#chromemenu ul li a:hover{
-	background: url(../images/menuon.gif) center center repeat-x;
-	}
+  background: #eee url( '../images/banner_mountains.jpg' ) no-repeat center top;
+}
+
+#wrapper-header2 {
+  background: transparent url( '../images/bg02-blue-left.png' ) top left no-repeat;
+}
+
+#wrapper-header3 {
+  background: transparent url( '../images/bg02-blue-right.png' ) top right no-repeat;
+}
+
+#header h1 {
+  margin: 0 20px;
+  padding: 0;
+  height: 192px;
+  line-height: 3em;
+  color: #ccc;
+  font-size: 130%;
+}
+
+#wrapper-content {
+  background: white url( '../images/bg02-white-left.png' ) no-repeat left top;
+}
+
+* html #wrapper-content {
+  height: 1%;
+}
 
-/* Content */
 #content {
-	width:720px;
-	margin-top:20px;
-	text-align:left;
-	padding-top: 0px;
-	padding-right: 10px;
-	padding-bottom: 20px;
-	padding-left: 10px;
-	}
-	
-#left {
-	width:710px;
-	padding-right:10px;
-	}
-	
-#left h1 {
-	margin:0;
-	font-weight:normal;
-	color:#DFEFFF;
-	font-size:3.2em;
-	}
-
-#left h2 {
-	margin:0;
-/*	display:inline;
-	position:relative; */
-	top:-1.3em;
-	left:1.5em;
-	font-size:2.5em;
-	font-weight:normal;
-	color:#2873C3;
-	}
-	
-#left h3 {
-	font-family:"Times New Roman", Times, serif;
-	font-size:2em;
-	font-weight:normal;
-	margin:0px 0px 10px 0px;
-	border-bottom:1px solid #efefef;
-	padding:1px 0;
-	color:#444;
-	}
-
-#left p {
-	line-height:2em;
-	margin-bottom:30px;
-	}
-
-	
-/* Sidebar */
-#right {
-	float:right;
-	width:210px;
-	}
-	
-#right h1 {
-	margin:0;
-	font-weight:normal;
-	color:#DFEFFF;
-	font-size:2.5em;
-	margin-bottom:0px;
-	margin-top:10px;
-	}
-
-#right h2 {
-	margin:0;
-	display:inline;
-	position:relative;
-	top:-1.3em;
-	left:1.5em;
-	font-size:1.8em;
-	font-weight:normal;
-	color:#2873C3;
-	margin-bottom:0px;
-	margin-top:10px;
-	}
-	
-p.news {
-	padding:10px;
-	background:#DFEFFF;
-	margin:0px 0px 15px 0px;
-	color:#2873C3;
-	border-bottom:2px solid #1D5F9F;
-	border-top:2px solid #1D5F9F;
-	font-size:9px;
-	}
-
-p.news a {
-	color:#14426F;
-	text-decoration:none;
-	}
-	
-p.news a:visited {
-	color:#14426F;
-	text-decoration:none;
-	}
-
-p.news a:hover {
-	text-decoration:underline;
-	}
-	
-a.more {
-	display:block;
-	text-align:right;
-	color:#14426F;
-	text-decoration:none;
-	margin:10px 0 0 0 ;
-	}
-a.more:hover {
-	text-decoration:underline;
-	}
-	
-p.form {
-	padding:2px;
-	text-align:center;
-	}
-	
-.formbutton{
-	cursor:pointer;
-	border:outset 1px #ccc;
-	background:#999;
-	color:#666;
-	font-weight:bold;
-	padding: 1px 2px;
-	background:url(../images/formbg.gif) repeat-x left top;
-	}
-	
-/* Footer */
+  background: transparent url( '../images/bg02-white-right.png' ) no-repeat right top;
+  padding: 5px 245px 5px 40px;
+}
+
+#wrapper-menu-page {
+  float: right;
+  width: 180px;
+  margin: 20px 30px 3em 2em;
+  background: transparent url( '../images/menu.png' ) no-repeat;
+  text-align: center;
+  line-height: 140%;
+  font-family: "Lucida Grande", "Lucida Sans Unicode", arial, sans-serif;
+}
+
+* html #wrapper-menu-page {
+  margin-right: 15px;
+}
+
+#menu-page {
+  padding-top: 5px;
+}
+
+#menu-page ul {
+  margin: 0;
+  padding: 0;
+  list-style: none;
+  font-size: 90%;
+}
+
+#menu-page h3 {
+  font-size: 75%;
+  text-transform: uppercase;
+  margin: 1em 0 0.3em 0;
+  color: #5b8fbe;
+  font-weight: normal;
+  letter-spacing: 0.15em;
+}
+
+#menu-page a:link, #menu-page a:visited {
+  color: #888;
+}
+
+#menu-page a:hover {
+  color: #5b8fbe;
+}
+
+#wrapper-footer {
+  margin-top: 1em;
+  text-align: center;
+}
+
 #footer {
-	width:690px;
-	height:40px;
-	clear:both;
-	margin:0 auto;
-	padding:35px;
-	background:url(../images/footer_bg.jpg) no-repeat;
-	background-color:#ccc;
-	color:#666666;
-	font-size:9px;
-	}
-	
-#footer a {
-	color:#2873C3;
-	text-decoration:none;
-	}
-	
-#footer a:visited {
-	color:#2873C3;
-	text-decoration:none;
-	}
-
-#footer a:hover {
-	text-decoration:underline;
-	}
\ No newline at end of file
+  margin: 0 20px;
+  background-color: #e5f0fc;
+  border: 1px solid #ccc;
+  border-bottom: 0;
+  clear: both;
+}
+
+h2 {
+  font-size: 110%;
+}
+
+h3 {
+  font-size: 100%;
+}
+
+a:link, a:visited {
+  color: #5b8fbe;
+  text-decoration: none;
+}
+
+a:hover {
+  color: #666;
+  text-decoration: none;
+}
\ No newline at end of file