move tree.css to main css files

6 files changed, 138 insertions, 139 deletions

diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/bootstrap/css/pfSense-dark.css
index 62cfa9c..57ce484 100644
--- a/src/usr/local/www/bootstrap/css/pfSense-dark.css
+++ b/src/usr/local/www/bootstrap/css/pfSense-dark.css
@@ -342,4 +342,9 @@ button.close {
 
 input, select, textarea {
     color: #212121;
+}
+
+/* tree css */
+ul.tree li A:link, ul.tree li A:hover, ul.tree li A:visited {
+    color : #ffffff;
 }
\ No newline at end of file
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css
index e210bdf..ae05eac 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/bootstrap/css/pfSense.css
@@ -601,6 +601,139 @@ textarea
     -o-tab-size: 4;
 }
 
+/*
+ * CSS for Standard tree layout
+ * Copyright (C) 2005 SilverStripe Limited
+ * Feel free to use this on your websites, but please leave this message in the fies
+ * http://www.silverstripe.com/blog
+ */
+ 
+ul.tree{
+    width: auto;
+    padding-left : 0px;
+    margin-left : 0px;
+}
+
+ul.tree img{
+    border : none;
+}
+
+ul.tree, ul.tree ul {
+    padding-left: 0;
+}
+
+ul.tree ul {
+    margin-left: 16px;
+        
+}
+
+ul.tree li.closed ul {
+    display: none;
+}
+
+ul.tree li {
+    list-style: none;
+    background: url(../../tree/i-repeater.gif) 0 0 repeat-y;
+    display: block;
+    width: auto;
+}
+
+ul.tree li.last {
+    list-style: none;
+    background-image: none;
+}
+
+/* Span-A: I/L/I glpyhs */
+ul.tree span.a {
+    background: url(../../tree/t.gif) 0 50% no-repeat;
+    display: block;
+}
+
+ul.tree span.a.last {
+    background: url(../../tree/l.gif) 0 50% no-repeat;
+}
+
+/* Span-B: Plus/Minus icon */
+ul.tree span.b {
+
+}
+
+ul.tree span.a.children span.b {
+    background: url(../../tree/minus.gif) 0 50% no-repeat;
+    cursor: pointer;
+}
+
+ul.tree li.closed span.a.children span.b {
+    background: url(../../tree/plus.gif) 0 50% no-repeat;
+    cursor: pointer;
+}
+
+/* Span-C: Spacing and extending tree line below the icon */
+ul.tree span.c {
+    margin-left: 16px;
+}
+
+ul.tree span.a.children span.c {
+    background: url(../../tree/i-bottom.gif) 0 50% no-repeat;
+}
+
+ul.tree span.a.spanClosed span.c {
+    background-image: none;
+}
+
+/* Anchor tag: Page icon */
+ul.tree a  {
+    white-space: nowrap;
+    overflow: hidden;
+    padding: 3px 0px 3px 18px;
+    line-height: 16px;
+    background: url(../../tree/page-file.png) 0 0 no-repeat;
+}
+
+ul.tree span.a.children a {
+    background-image: url(../../tree/page-openfoldericon.png);
+}
+
+ul.tree span.a.children.spanClosed a {
+    background-image: url(../../tree/page-foldericon.png);
+}
+
+/* Unformatted tree */
+ul.tree.unformatted li {
+    background-image: none;
+    padding-left: 16px;
+}
+
+ul.tree.unformatted li li {
+    background-image: none;
+    padding-left: 0px;
+}
+
+/* Divs, by default store vertically aligned data */
+
+ul.tree li div {
+    float: right;
+    clear: right;
+    height: 1em;
+    margin-top: -26px;
+}
+
+/* As inside DIVs should be treated normally */
+ul.tree div a  {
+    padding: 0;
+    background-image: none;
+    min-height: auto;
+    height: auto;
+}
+
+ul.tree li .over{
+    background-color : pink;
+}
+
+/*
+ * End of CSS for Standard tree layout
+ */
+
 @media (max-width: 1199px) {
     .nav>li>a {
         padding: 14px 9px 10px 9px;
diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php
index 94eeba2..43fd55d 100644
--- a/src/usr/local/www/firewall_shaper.php
+++ b/src/usr/local/www/firewall_shaper.php
@@ -439,7 +439,6 @@ $tab_array[] = array(gettext("Wizards"), false, "firewall_shaper_wizards.php");
 display_top_tabs($tab_array);
 
 ?>
-<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" property="stylesheet" />
 <script type="text/javascript" src="./tree/tree.js"></script>
 
 <div class="table-responsive">
diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php
index 6b2f888..364ac51 100644
--- a/src/usr/local/www/firewall_shaper_queues.php
+++ b/src/usr/local/www/firewall_shaper_queues.php
@@ -223,7 +223,6 @@ $closehead = false;
 include("head.inc");
 ?>
 
-<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" />
 <script type="text/javascript" src="./tree/tree.js"></script>
 
 <?php
diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php
index cf37663..c327a1f 100644
--- a/src/usr/local/www/firewall_shaper_vinterface.php
+++ b/src/usr/local/www/firewall_shaper_vinterface.php
@@ -368,7 +368,6 @@ $output .= $output_form;
 $closehead = false;
 include("head.inc");
 ?>
-<link rel="stylesheet" type="text/css" media="all" href="./tree/tree.css" property="stylesheet" />
 <script type="text/javascript" src="./tree/tree.js"></script>
 
 <script type="text/javascript">
diff --git a/src/usr/local/www/tree/tree.css b/src/usr/local/www/tree/tree.css
deleted file mode 100755
index f3ed323..0000000
--- a/src/usr/local/www/tree/tree.css
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * CSS for Standard tree layout
- * Copyright (C) 2005 SilverStripe Limited
- * Feel free to use this on your websites, but please leave this message in the fies
- * http://www.silverstripe.com/blog
- */
- 
-ul.tree{
-	width: auto;
-	padding-left : 0px;
-	margin-left : 0px;
-}
-
-ul.tree img{
- 	border : none;
-}
- 
-
-ul.tree, ul.tree ul {
-	padding-left: 0;
-}
-
-ul.tree ul {
-	margin-left: 16px;
-		
-}
-ul.tree li.closed ul {
-	display: none;
-}
-
-
-ul.tree li {
-	list-style: none;
-	background: url(i-repeater.gif) 0 0 repeat-y;
-	display: block;
-	width: auto;
-	/* background-color:#FFFFFF; */
-}
-
-
-
-ul.tree li.last {
-	list-style: none;
-	background-image: none;
-}
-
-
-
-/* Span-A: I/L/I glpyhs */
-ul.tree span.a {
-	background: url(t.gif) 0 50% no-repeat;
-	display: block;
-}
-ul.tree span.a.last {
-	background: url(l.gif) 0 50% no-repeat;
-}
-
-/* Span-B: Plus/Minus icon */
-ul.tree span.b {
-}
-ul.tree span.a.children span.b {
-	background: url(minus.gif) 0 50% no-repeat;
-	cursor: pointer;
-}
-ul.tree li.closed span.a.children span.b {
-	background: url(plus.gif) 0 50% no-repeat;
-	cursor: pointer;
-}
-
-/* Span-C: Spacing and extending tree line below the icon */
-ul.tree span.c {
-	margin-left: 16px;
-}
-ul.tree span.a.children span.c {
-	background: url(i-bottom.gif) 0 50% no-repeat;
-}
-ul.tree span.a.spanClosed span.c {
-	background-image: none;
-}
-
-
-/* Anchor tag: Page icon */
-ul.tree a  {
-	white-space: nowrap;
-	overflow: hidden;
-	
-/*	padding: 10px 0px 10px 18px; */
-	padding: 3px 0px 3px 18px;
-	line-height: 16px;
-
-/*	background: url(page-file.png) 0 50% no-repeat; */
-	background: url(page-file.png) 0 0 no-repeat;
-}
-ul.tree span.a.children a {
-	background-image: url(page-openfoldericon.png);
-}
-ul.tree span.a.children.spanClosed a {
-	background-image: url(page-foldericon.png);
-}
-
-/* Unformatted tree */
-ul.tree.unformatted li {
-	background-image: none;
-	padding-left: 16px;
-}
-ul.tree.unformatted li li {
-	background-image: none;
-	padding-left: 0px;
-}
-
-/*
- * Divs, by default store vertically aligned data
- */
-
-ul.tree li div {
-	float: right;
-	clear: right;
-	height: 1em;
-	margin-top: -26px;
-}
-/* As inside DIVs should be treated normally */
-ul.tree div a  {
-	padding: 0;
-	background-image: none;
-	min-height: auto;
-	height: auto;
-}
-
-ul.tree li A:link, ul.tree li A:hover, ul.tree li A:visited {
-	color : #ffffff;
-}
-
-
-ul.tree li .over{
-	background-color : pink;
-}