summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-07-13 00:43:00 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:22:58 -0500
commitb4f6a348bb512071af685f4c9e0fe86f6eb81a75 (patch)
tree58498dcc3f14043e13afc47f90a3fe43379d54f9
parent54433c747ad771340cd4ac2cf22bbfba69c9ab02 (diff)
downloadsamba-b4f6a348bb512071af685f4c9e0fe86f6eb81a75.tar.gz
samba-b4f6a348bb512071af685f4c9e0fe86f6eb81a75.tar.bz2
samba-b4f6a348bb512071af685f4c9e0fe86f6eb81a75.zip
r8403: Reinstate linkpad.gif at Deryck's suggestion.
Install *.gif from swat/images when installing swat. (This used to be commit 156e090c2c0ec2c7bdf66405c3742839b82fe757)
-rw-r--r--source4/script/installswat.sh2
-rw-r--r--swat/images/linkpad.gifbin0 -> 270 bytes
-rw-r--r--swat/images/linkpad.pngbin205 -> 0 bytes
-rw-r--r--swat/scripting/common.js2
-rw-r--r--swat/scripting/header_columns.esp2
-rw-r--r--swat/scripting/header_plain.esp2
6 files changed, 4 insertions, 4 deletions
diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
index f3a0ceb258..8244abb804 100644
--- a/source4/script/installswat.sh
+++ b/source4/script/installswat.sh
@@ -22,7 +22,7 @@ installdir() {
installdir *.esp
installdir esptest/*.esp esptest/*.js
-installdir images/*.png images/*.ico
+installdir images/*.png images/*.ico images/*.gif
installdir scripting/*.ejs scripting/*.esp scripting/*.js
installdir style/*.css
installdir docs/*.js
diff --git a/swat/images/linkpad.gif b/swat/images/linkpad.gif
new file mode 100644
index 0000000000..613b4f55ef
--- /dev/null
+++ b/swat/images/linkpad.gif
Binary files differ
diff --git a/swat/images/linkpad.png b/swat/images/linkpad.png
deleted file mode 100644
index 022a3fde4b..0000000000
--- a/swat/images/linkpad.png
+++ /dev/null
Binary files differ
diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index 0e297d7d99..631efcacb7 100644
--- a/swat/scripting/common.js
+++ b/swat/scripting/common.js
@@ -71,7 +71,7 @@ function page_footer() {
*/
function always_allowed(uri) {
var allowed = new Array("/images/favicon.ico",
- "/images/linkpad.png",
+ "/images/linkpad.gif",
"/images/logo.png",
"/style/main.css",
"/style/common.css");
diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 0986966c6f..3bcdc4abe9 100644
--- a/swat/scripting/header_columns.esp
+++ b/swat/scripting/header_columns.esp
@@ -49,7 +49,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
</div>
<div id="logo">
- <div class="logo_hack"><a href="/@@global.SESSIONURI"><img src="/images/linkpad.png" alt="SWAT" /></a></div>
+ <div class="logo_hack"><a href="/@@global.SESSIONURI"><img src="/images/linkpad.gif" alt="SWAT" /></a></div>
</div>
<div class="slogan">
diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp
index e07bf88541..69bd0cd718 100644
--- a/swat/scripting/header_plain.esp
+++ b/swat/scripting/header_plain.esp
@@ -40,7 +40,7 @@ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/images/logo.png'
</div>
<div id="logo">
- <div class="logo_hack"><a href="/"><img src="/images/linkpad.png" alt="SWAT" /></a></div>
+ <div class="logo_hack"><a href="/"><img src="/images/linkpad.gif" alt="SWAT" /></a></div>
</div>
<div class="slogan">