r8353: Use a PNG instead of a GIF for padding. Also fixes a file not found

error as only PNG files were being installed by 'make installswat'.
(This used to be commit eaf9c455de3025155fb502fb4c93eefa4eb13f7e)

diff --git a/swat/images/linkpad.gif b/swat/images/linkpad.gif
deleted file mode 100755 (executable)
index 613b4f5..0000000
Binary files a/swat/images/linkpad.gif and /dev/null differ

diff --git a/swat/images/linkpad.png b/swat/images/linkpad.png
new file mode 100644 (file)
index 0000000..022a3fd
Binary files /dev/null and b/swat/images/linkpad.png differ

diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index 3321cfb77229375c74f8a6a338e6a1f0916f7865..cdf18d1c9b31774be8a142aeca038833deda4e3e 100644 (file)
--- a/swat/scripting/common.js
+++ b/swat/scripting/common.js
@@ -55,9 +55,8 @@ function page_footer() {
 */
 function always_allowed(uri) {
        var allowed = new Array("/images/favicon.ico", 
-                               "/images/linkpad.gif",
+                               "/images/linkpad.png",
                                "/images/logo.png",
-                               "/images/logo.gif",
                                "/style/main.css",
                                "/style/common.css");
        for (i in allowed) {

diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 3bcdc4abe913d160e3769438d1f0265d99ca2cb9..0986966c6f154ac76f453d07e7d50d2ecd6cf326 100644 (file)
--- 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.gif" alt="SWAT" /></a></div>
+  <div class="logo_hack"><a href="/@@global.SESSIONURI"><img src="/images/linkpad.png" alt="SWAT" /></a></div>
 </div>
 
 <div class="slogan">

diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp
index 69bd0cd718383c180e188e7808cc235ce5209e97..e07bf88541a45e15c7c899a607a79b2c94a5e047 100644 (file)
--- 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.gif" alt="SWAT" /></a></div>
+  <div class="logo_hack"><a href="/"><img src="/images/linkpad.png" alt="SWAT" /></a></div>
 </div>
 
 <div class="slogan">