- Committed the admin menu integration patch. Thanks Adrian, Stefan and others.

5 files changed, 10 insertions, 131 deletions

diff --git a/misc/admin.css b/misc/admin.css
deleted file mode 100644
index 219c8e8c7..000000000
--- a/misc/admin.css
+++ /dev/null
@@ -1,131 +0,0 @@
-/* $Id */
-
-body {
-  font-size: 90%;
-  margin: 0;
-  background-color: #fff;
-}
-body, th, td, h1, h2, h3, h4, #menu, #main {
-  font-family: helvetica, arial;
-}
-a:link {
-  color: #059;
-}
-a:visited {
-  color: #049;
-}
-h1 {
-  font-size: 1.3em;
-  font-weight: bold;
-  color: #006;
-}
-h2 {
-  font-size: 1.2em;
-  font-weight: bold;
-  color: #006;
-  margin: 0;
-  padding: 0.5em 0 0 0;
-}
-h3 {
-  font-size: 1.2em;
-  font-weight: bold;
-  color: #006;
-  margin: 0;
-  padding: 1em 0 0 0;
-}
-table {
-  border-collapse: collapse;
-}
-th {
-  text-align: left;
-  padding-right: 1em;
-  color: #006;
-  border-bottom: 1px solid #ccc;
-}
-td {
-  padding: 5px;
-  font-size: 0.9em;
-}
-hr {
-  clear: both;
-  margin: .5em 0;
-  height: 1px;
-  color: #ccc;
-}
-dt {
-  font-weight: bold;
-}
-dd {
-  margin-bottom: 0.5em;
-}
-#menu {
-  position: absolute;
-  left: 0px;
-  top: 0px;
-  margin: 0 0 0 0;
-  padding: 0 0 .85em 0;
-  width: 14em;
-  z-index: 1;
-  overflow: hidden;
-  background-color: #69c;
-  border-right: 1px solid #999;
-  border-bottom: 1px solid #999;
-}
-#menu h1 {
-  background-color: #369;
-  display: block;
-  margin: 0 0 .85em 0;
-  padding: 1em 0 .2em .6em;
-  border-top: 1px solid #69c;
-  border-bottom: 1px solid #90bade;
-}
-#menu h1 a {
-  color: #fff;
-  text-decoration: none;
-}
-#menu ul {
-  list-style: none;
-  margin: 0;
-  padding: 0 0 0.25em 1.5em;
-  border: none;
-}
-#menu li {
-  margin: 0;
-  padding: 0.2em 0.5em 0 0;
-}
-#menu li a {
-  display: block;
-  width: 100%;
-  color: #fff;
-  text-decoration: none;
-}
-#menu li a.current {
-  color: #000;
-}
-#menu li a:hover {
-  color: #009;
-}
-#menu li.expanded {
-  list-style-image: url(menu-expanded.gif);
-}
-#menu li.collapsed {
-  list-style-image: url(menu-collapsed.gif);
-}
-#menu li.leaf {
-  list-style-image: url(menu-leaf.gif);
-}
-#main {
-  margin: 0 0 0 16em;
-  padding: 1em 1em 1em 0;
-  z-index: 2;
-}
-#logo {
-  padding: 1em 1em 0 1em;
-  float: right;
-}
-#logo img {
-  border: 0;
-}
-#update {
-  padding: 1em 1em 1em 1em;
-}
diff --git a/misc/drupal.css b/misc/drupal.css
index 894a762b6..936715445 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -258,3 +258,13 @@ pre, code {
 .queue-user-numeral {
   color: red;
 }
+
+#menu                     {  padding: 0 0 0 0.5em; }
+#menu ul                  {  list-style: none;  margin: 0;  padding: 0 0 0.25em 1em;  border: none; text-align:left;}
+#menu li                  {  margin: 0;  padding: 0.2em 0.5em 0 0; }
+#menu li a                {  display: block;  width: 100%;  text-decoration: none; }
+#menu li a.current        {  color: #000; }
+#menu li a:hover          {  color: #009; }
+#menu li.expanded         {  list-style-image: url(menu-expanded.gif); }
+#menu li.collapsed        {  list-style-image: url(menu-collapsed.gif); }
+#menu li.leaf             {  list-style-image: url(menu-leaf.gif); }
diff --git a/misc/menu-collapsed.gif b/misc/menu-collapsed.gif
index 701839692..5ae2274fb 100644
--- a/misc/menu-collapsed.gif
+++ b/misc/menu-collapsed.gif
diff --git a/misc/menu-expanded.gif b/misc/menu-expanded.gif
index 38e54e7b8..dfe822804 100644
--- a/misc/menu-expanded.gif
+++ b/misc/menu-expanded.gif
diff --git a/misc/menu-leaf.gif b/misc/menu-leaf.gif
index e40cb3686..3b120a244 100644
--- a/misc/menu-leaf.gif
+++ b/misc/menu-leaf.gif