summaryrefslogtreecommitdiff
path: root/swat/scripting
diff options
context:
space:
mode:
authorDeryck Hodge <deryck@samba.org>2005-07-14 19:21:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:23:07 -0500
commitcac606ed8eee2c1b1c96579145afe9ccc8fcff2f (patch)
treec907240c367315326dabe3954d1d1cd72fe6a6ec /swat/scripting
parent3b18fe06d6001bfd9ad67f3b903a26720f628a4a (diff)
downloadsamba-cac606ed8eee2c1b1c96579145afe9ccc8fcff2f.tar.gz
samba-cac606ed8eee2c1b1c96579145afe9ccc8fcff2f.tar.bz2
samba-cac606ed8eee2c1b1c96579145afe9ccc8fcff2f.zip
r8479: * Sync CSS with current samba.org stylesheets.
* Add wide.css so it's availble for future pages. * Move SWAT specific styles to swat.css to make future syncs easier. deryck (This used to be commit 7ddc3ed5b87687a66995d2555c683efcb93be7e2)
Diffstat (limited to 'swat/scripting')
-rw-r--r--swat/scripting/common.js4
-rw-r--r--swat/scripting/header_columns.esp5
-rw-r--r--swat/scripting/header_plain.esp3
3 files changed, 8 insertions, 4 deletions
diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index 631efcacb7..c431c8c1b0 100644
--- a/swat/scripting/common.js
+++ b/swat/scripting/common.js
@@ -73,7 +73,9 @@ function always_allowed(uri) {
var allowed = new Array("/images/favicon.ico",
"/images/linkpad.gif",
"/images/logo.png",
- "/style/main.css",
+ "/images/stripes.png",
+ "/style/columns.css",
+ "/style/swat.css",
"/style/common.css");
for (i in allowed) {
if (allowed[i] == uri) {
diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 3d92bb9522..e870a1110a 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -6,7 +6,8 @@
<title>@@global.page.title</title>
<link rel="stylesheet" href="/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/style/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/columns.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/swat.css" type="text/css" media="all" />
<link rel="shortcut icon" href="/images/favicon.ico" />
<!--[if gte IE 5.5]>
@@ -59,7 +60,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
<h4>Samba Web Administration Tool</h4>
</div>
-<div class="nav">
+<div id="nav">
<%
include("/docs/menu.js");
include("/esptest/menu.js");
diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp
index f9eaae9b96..8dd378910e 100644
--- a/swat/scripting/header_plain.esp
+++ b/swat/scripting/header_plain.esp
@@ -6,7 +6,8 @@
<title>@@global.page.title</title>
<link rel="stylesheet" href="/style/common.css" type="text/css" media="all" />
-<link rel="stylesheet" href="/style/main.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/columns.css" type="text/css" media="all" />
+<link rel="stylesheet" href="/style/swat.css" type="text/css" media="all" />
<link rel="shortcut icon" href="/images/favicon.ico" />
<!--[if gte IE 5.5]>