Return-Path: 
 <commits-return-14243-apmail-activemq-commits-archive=activemq.apache.org@activemq.apache.org>
Delivered-To: apmail-activemq-commits-archive@www.apache.org
Received: (qmail 68814 invoked from network); 13 Jul 2010 13:27:04 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 13 Jul 2010 13:27:04 -0000
Received: (qmail 87591 invoked by uid 500); 13 Jul 2010 13:27:04 -0000
Delivered-To: apmail-activemq-commits-archive@activemq.apache.org
Received: (qmail 87530 invoked by uid 500); 13 Jul 2010 13:27:02 -0000
Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@activemq.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@activemq.apache.org>
List-Post: <mailto:commits@activemq.apache.org>
List-Id: <commits.activemq.apache.org>
Reply-To: dev@activemq.apache.org
Delivered-To: mailing list commits@activemq.apache.org
Received: (qmail 87523 invoked by uid 99); 13 Jul 2010 13:27:02 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jul 2010 13:27:02 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jul 2010 13:26:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 138DC23888D2; Tue, 13 Jul 2010 13:26:05 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r963707 - in /activemq/trunk:
 activemq-web-console/src/main/webapp/ assembly/src/release/webapps/styles/
Date: Tue, 13 Jul 2010 13:26:04 -0000
To: commits@activemq.apache.org
From: dejanb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100713132605.138DC23888D2@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: dejanb
Date: Tue Jul 13 13:26:04 2010
New Revision: 963707

URL: http://svn.apache.org/viewvc?rev=963707&view=rev
Log:
https://issues.apache.org/activemq/browse/AMQ-2570 - make web console 404 and 500 pages use proper styling

Added:
    activemq/trunk/assembly/src/release/webapps/styles/
    activemq/trunk/assembly/src/release/webapps/styles/site.css
    activemq/trunk/assembly/src/release/webapps/styles/type-settings.css
Modified:
    activemq/trunk/activemq-web-console/src/main/webapp/404.html
    activemq/trunk/activemq-web-console/src/main/webapp/500.html

Modified: activemq/trunk/activemq-web-console/src/main/webapp/404.html
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/404.html?rev=963707&r1=963706&r2=963707&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/404.html (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/404.html Tue Jul 13 13:26:04 2010
@@ -28,18 +28,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
     <title>Apache ActiveMQ</title> 
     <style type="text/css" media="screen"> 
-        @import url(/admin/styles/sorttable.css);
-        @import url(/admin/styles/type-settings.css);
-        @import url(/admin/styles/site.css);
-        @import url(/admin/styles/prettify.css);
+        @import url(styles/type-settings.css);
+        @import url(styles/site.css);
     </style> 
     
-        <script type='text/javascript' src='/js/common.js'></script> 
-        <script type='text/javascript' src='/js/css.js'></script> 
-        <script type='text/javascript' src='/js/standardista-table-sorting.js'></script> 
-        <script type='text/javascript' src='/js/prettify.js'></script> 
-        <script>addEvent(window, 'load', prettyPrint)</script> 
-    
  
     
 </head> 

Modified: activemq/trunk/activemq-web-console/src/main/webapp/500.html
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/500.html?rev=963707&r1=963706&r2=963707&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/500.html (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/500.html Tue Jul 13 13:26:04 2010
@@ -28,18 +28,10 @@
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> 
     <title>Apache ActiveMQ</title> 
     <style type="text/css" media="screen"> 
-        @import url(/admin/styles/sorttable.css);
-        @import url(/admin/styles/type-settings.css);
-        @import url(/admin/styles/site.css);
-        @import url(/admin/styles/prettify.css);
+        @import url(styles/type-settings.css);
+        @import url(styles/site.css);
     </style> 
     
-        <script type='text/javascript' src='/js/common.js'></script> 
-        <script type='text/javascript' src='/js/css.js'></script> 
-        <script type='text/javascript' src='/js/standardista-table-sorting.js'></script> 
-        <script type='text/javascript' src='/js/prettify.js'></script> 
-        <script>addEvent(window, 'load', prettyPrint)</script> 
-    
  
     
 </head> 

Added: activemq/trunk/assembly/src/release/webapps/styles/site.css
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/webapps/styles/site.css?rev=963707&view=auto
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/styles/site.css (added)
+++ activemq/trunk/assembly/src/release/webapps/styles/site.css Tue Jul 13 13:26:04 2010
@@ -0,0 +1,206 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+body {
+    padding: 20px;
+}
+
+/* ====================================================== */
+/*  Rounded Box Styles */
+/* ====================================================== */
+div.white_box div.header   {background: transparent url("../images/white-header-top.png") repeat-x 0pt;}
+div.white_box div.header_l {background: transparent url("../images/white-header-left.png") no-repeat 0pt;}
+div.white_box div.header_r {background: transparent url("../images/white-header-right.png") no-repeat 100% 0pt;}
+div.white_box div.header_r {height: 18px;}
+
+div.white_box div.content   {background: #ffffff; } 
+div.white_box div.content_l {background: transparent url("../images/content-left.png") repeat-y 0pt;}
+div.white_box div.content_r {background: transparent url("../images/content-right.png") repeat-y 100% 0pt;}
+div.white_box div.content_r {padding-left: 6px; padding-right: 9px;}
+
+div.white_box div.footer {background: transparent url("../images/white-footer-bottom.png") repeat-x 0pt;}
+div.white_box div.footer_l {background: transparent url("../images/white-footer-left.png") no-repeat 0pt;}
+div.white_box div.footer_r {background: transparent url("../images/white-footer-right.png") no-repeat 100% 0pt;}
+div.white_box div.footer_r {color: #ffffff; height:37px; padding:0px;}
+div.white_box div.footer_r {padding-left: 6px;padding-right: 9px;}
+
+div.black_box div.footer {background: transparent url("../images/black-footer-bottom.png") repeat-x 0pt;}
+div.black_box div.footer_l {background: transparent url("../images/black-footer-left.png") no-repeat 0pt;}
+div.black_box div.footer_r {background: transparent url("../images/black-footer-right.png") no-repeat right bottom;}
+div.black_box div.footer_r {color: #ffffff; height:37; padding:0px;}
+div.black_box div.footer_r {padding-left: 6px;padding-right: 9px;}
+
+/* ====================================================== */
+/*  Logo Positioning */
+/* ====================================================== */
+div#activemq_logo{background: transparent url("../images/activemq-logo.png") no-repeat left top; height: 100px; }
+div#activemq_logo{margin-left: 20px; overflow: hidden;}
+div#asf_logo {background: transparent url("../images/asf-logo.png") no-repeat right center; height: 100px; }
+
+/* ====================================================== */
+/*  Top and Bottom Bar Styling */
+/* ====================================================== */
+div.top_red_bar {
+  background: transparent url("../images/top-red-bar.png") repeat 0pt; 
+  overflow: hidden;
+}
+div.bottom_red_bar {
+  background: transparent url("../images/bottom-red-bar.png") repeat 0pt; height: 11px;
+  overflow: hidden;
+}
+
+div#site-breadcrumbs {
+  margin: 0px;
+  padding: 0px;
+  float:left;
+  padding: 2px;
+  padding-left: 20px;
+}
+div#site-quicklinks {
+  margin: 0px;
+  padding: 2px;
+  padding-right: 20px;
+}
+div#site-quicklinks p {
+  text-align: right;
+  padding: 0px; 
+  margin: 0px;
+}
+
+div#site-quicklinks, div#site-breadcrumbs, div#site-quicklinks p, div#site-breadcrumbs p,
+div#site-quicklinks a:link, div#site-quicklinks a:visited,
+div#site-breadcrumbs a:link, div#site-breadcrumbs a:visited {
+  font-family: Verdana, arial, sans-serif;
+  font-size: 11px;
+  font-weight: bold;	
+  line-height: 16px;
+  color: #ffffff;
+  text-decoration: none;
+}
+div#site-quicklinks a:active, div#site-quicklinks a:hover,
+div#site-breadcrumbs a:active, div#site-breadcrumbs a:hover {
+  font-family: Verdana, arial, sans-serif;
+  font-size: 11px;
+  font-weight: bold;	
+  line-height: 13px;
+  color: #c0c0c0;
+  text-decoration: underline;
+}
+div#site-quicklinks sup img {
+  height: 0px;
+  width: 0px;
+}
+
+/* ====================================================== */
+/*  Navigation Styling */
+/* ====================================================== */
+div.navigation {background: #ffffff url("../images/right-box-left.png") repeat-y left 0pt; width:200px;}
+div.navigation_top {background: transparent url("../images/right-box-top.png") no-repeat left top;} 
+div.navigation_bottom {background: transparent url("../images/right-box-bottom.png") no-repeat left bottom;}
+div.navigation_bottom {padding-left: 5px;padding-right:11px; padding-top:17px; padding-bottom:17px;}
+
+/* div.navigation {float:right;} */
+div.navigation_bottom ol, 
+div.navigation_bottom ul, 
+div.navigation_bottom {
+  font-family: Verdana, arial, sans-serif;
+  font-size: 11px;
+  font-weight: bold;	
+  line-height: 13px;
+  text-align: left;
+  padding-left: 11px;
+}
+
+div.navigation {
+  text-align: left;
+  clear: left;
+}
+
+
+div.navigation h3, 
+div.navigation h3 a:link, div.navigation h3 a:visited, div.navigation h3 a:active, div.navigation h3 a:hover { 
+  font-family: Verdana, arial, sans-serif;
+  font-size: 11px;
+  font-weight: bold;	
+  line-height: 120%;
+
+  border: none;
+  font-size: 15px; 
+  text-decoration: none;
+  color: #660033;
+  margin:5px;
+}
+
+div.navigation h3 {
+  background: url("../images/big-bullet.png") no-repeat 0pt;
+  background-position:left center;
+  margin-left:15px;
+  padding-left: 20px;
+}
+
+div.navigation a:link, div.navigation a:visited, div.navigation a:active, div.navigation a:hover {
+  text-decoration: none;
+  color: #000000;
+}
+div.navigation a:active, div.navigation a:hover {
+  text-decoration: underline;
+  color: #880055;
+}
+
+div.navigation ul {
+  padding-left: 25px;
+  list-style: none; 
+  padding-bottom: 10px;
+  border-bottom:1px solid #CACACA;
+  margin: 0px;
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+
+div.navigation_bottom div { 
+  margin-left:10px;
+  padding-left:25px;
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+  border-bottom:1px solid #CACACA;
+}
+
+div.navigation img {
+  margin-left:15px;
+  padding-left: 20px;
+}
+
+div.navigation sup img { height: 0px; width: 0px; }
+
+/* ====================================================== */
+/*  Footer Styling */
+/* ====================================================== */
+div.black_box div.footer_r div {
+  font-family: Verdana, arial, sans-serif;
+  font-size: 10px;
+  font-weight: normal;	
+  line-height: normal;
+  padding:5px;
+  padding-left:20px;
+}
+
+div.design_attribution, div.design_attribution a {
+  font-family: Verdana, arial, sans-serif;
+  font-size: 10px;
+  text-align:center;
+  color: #a0a0a0;
+}

Added: activemq/trunk/assembly/src/release/webapps/styles/type-settings.css
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/release/webapps/styles/type-settings.css?rev=963707&view=auto
==============================================================================
--- activemq/trunk/assembly/src/release/webapps/styles/type-settings.css (added)
+++ activemq/trunk/assembly/src/release/webapps/styles/type-settings.css Tue Jul 13 13:26:04 2010
@@ -0,0 +1,177 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+body, p, ul, ol {
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 14px;
+    font-size-adjust: none;
+    font-style: normal;
+    font-font-variant: normal;
+    font-weight: normal;
+    line-height: 140%;
+    color: #000000;
+}
+
+div.body-content {
+    padding-left: 25px;
+}
+
+td, table, tr {
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 10px;
+    font-size-adjust: none;
+    font-style: normal;
+    font-font-variant: normal;
+    font-weight: normal;
+    line-height: normal; 
+    color: #000000;
+}
+
+a:link, a:visited, a:active, a:hover {
+   color: #880055;
+   text-decoration: none;
+}
+
+a:active, a:hover {
+   text-decoration: underline;
+   color: #202020;
+}
+
+ul, ol {
+    margin-left: 15px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    padding: 0px;
+    font-size: 12px;
+}
+
+ul li {
+    list-style-image: url("../images/small-bullet-red.png");
+}
+ul li ul li{
+    list-style-image: url("../images/small-bullet-gray.png");
+}
+
+pre {
+    padding: 0px;
+    margin-top: 5px;
+    margin-left: 15px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    text-align: left;
+}
+
+hr {
+    color: #3c78b5;
+    height: 1;
+}
+
+input {
+    font-family: verdana, geneva, arial, sans-serif;
+    font-size: 11px;
+    color: #000000;
+}
+
+textarea {
+    font-family: verdana, geneva, arial, sans-serif;
+    font-size: 11px;
+    color: #333333;
+}
+
+h1, h2, h3, h4, h5, h6  {
+  font-family: Georgia,'Times New Roman',serif;
+  line-height: normal;
+  font-weight: bold;
+}
+
+h1 {
+  border-bottom: 1px solid #808080;
+  padding: 2px;
+  margin: 36px 0px 4px -25px;
+  font-size: 20px;
+}
+h1 a:link, h1 a:visited, h1 a:active {
+    text-decoration: none;
+}
+
+h1 a:hover {
+    border-bottom: 1px dotted #660033;
+}
+
+h2 {
+  border-bottom: 1px solid #a0a0a0;
+  padding: 2px;
+  margin: 27px 0px 4px -20px;
+  font-size: 18px;
+}
+
+h3 {
+  border-bottom: 1px solid #c0c0c0;
+  padding: 2px;
+  margin: 21px 0px 4px -15px;
+  font-size: 16px;
+}
+
+h4 {
+  border-bottom: 1px solid #c0c0c0;
+  padding: 2px;
+  margin: 18px 0px 4px -10px;
+  font-size: 15px;
+}
+
+h5 {
+  padding: 2px;
+  margin: 14px 0px 4px -5px;
+  font-size: 14px;
+}
+
+h6 {
+  padding: 2px;
+  margin: 14px 0px 4px -5px;
+  font-size: 13px;
+}
+
+blockquote {
+    padding-left: 10px;
+    padding-right: 10px;
+    margin-left: 5px;
+    margin-right: 0px;
+    border-left: 1px solid #3c78b5;
+}
+
+.tooltip {  position: relative;
+    text-decoration: none;
+}
+
+.tooltip span {
+    display: none;
+}
+
+.tooltip:hover span {
+    position: absolute;
+    top: 10px;
+    left: 25px;
+    display: block;
+    background: #ccc;
+    color: #880055;
+    border: 1px solid #880055;
+}
+
+div.message {
+    width: 1000px;
+    height: 750px;
+    overflow : scroll;
+}
\ No newline at end of file