r8403: Reinstate linkpad.gif at Deryck's suggestion.

Install *.gif from swat/images when installing swat.
(This used to be commit 156e090c2c0ec2c7bdf66405c3742839b82fe757)

diff --git a/source4/script/installswat.sh b/source4/script/installswat.sh
index f3a0ceb2589d57ea4a76f9aa4c72b760a6b89d5d..8244abb80404ab1c0528396961cb199a4229f829 100644 (file)
--- a/source4/script/installswat.sh
+++ b/source4/script/installswat.sh
@@ -22,7 +22,7 @@ installdir() {
 
 installdir *.esp
 installdir esptest/*.esp esptest/*.js
 
 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
 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 (file)
index 0000000..613b4f5
Binary files /dev/null and b/swat/images/linkpad.gif differ

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

diff --git a/swat/scripting/common.js b/swat/scripting/common.js
index 0e297d7d995cfff2156fc8284003ad2b244e871a..631efcacb7749724d6092bd802694f41c0671333 100644 (file)
--- 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", 
 */
 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");
                                "/images/logo.png",
                                "/style/main.css",
                                "/style/common.css");

diff --git a/swat/scripting/header_columns.esp b/swat/scripting/header_columns.esp
index 0986966c6f154ac76f453d07e7d50d2ecd6cf326..3bcdc4abe913d160e3769438d1f0265d99ca2cb9 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>
 
 <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">
 </div>
 
 <div class="slogan">

diff --git a/swat/scripting/header_plain.esp b/swat/scripting/header_plain.esp
index e07bf88541a45e15c7c899a607a79b2c94a5e047..69bd0cd718383c180e188e7808cc235ce5209e97 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>
 
 <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">
 </div>
 
 <div class="slogan">