Tidy up file structure a little bit.

7 files changed, 82 insertions, 173 deletions

diff --git a/templates/web/default/common_header_tags.html b/templates/web/default/common_header_tags.html
index 00455b3a1..7018ecdac 100644
--- a/templates/web/default/common_header_tags.html
+++ b/templates/web/default/common_header_tags.html
@@ -1,6 +1,6 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="/yui/utilities.js"></script>
-<script type="text/javascript" src="/js.js"></script>
+<script type="text/javascript" src="/js/fixmystreet.js"></script>
 
 [% map_js %]
 
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index df97adeae..3a42ee208 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -6,7 +6,7 @@
 
 <style type="text/css">
 @import "/css/core.css";
-@import "/css/cobrands/emptyhomes/emptyhomes.css";
+@import "/cobrands/emptyhomes/css.css";
 </style>
 <!--[if LT IE 7]>
 <style type="text/css">@import url("/css/ie6.css");</style>
diff --git a/templates/web/scambs/header.html b/templates/web/scambs/header.html
index 5e25755ed..d4ada1c71 100644
--- a/templates/web/scambs/header.html
+++ b/templates/web/scambs/header.html
@@ -4,7 +4,7 @@
 <title>[% title %]Envirocrime - South Cambridgeshire District Council</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <script type="text/javascript" src="/yui/utilities.js"></script>
-<script type="text/javascript" src="/js.js"></script>
+<script type="text/javascript" src="/js/fixmystreet.js"></script>
 <style type="text/css" media="screen, projection">
 @import "/css/core.css";
 @import "/css/main-scambs.css";
diff --git a/web/css/cobrands/emptyhomes/emptyhomes.css b/web/cobrands/emptyhomes/css.css
index f6047ebe5..f6047ebe5 100644
--- a/web/css/cobrands/emptyhomes/emptyhomes.css
+++ b/web/cobrands/emptyhomes/css.css
diff --git a/web/js.js b/web/js.js
deleted file mode 100644
index 07bede2d7..000000000
--- a/web/js.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * js.js
- * FixMyStreet JavaScript
- */
-
-
-YAHOO.util.Event.onContentReady('pc', function() {
-    if (this.id && this.value == this.defaultValue) {
-        this.focus();
-    }
-});
-
-YAHOO.util.Event.onContentReady('mapForm', function() {
-    this.onsubmit = function() {
-       if (this.submit_problem) {
-            this.onsubmit = function() { return false; };
-        }
-
-        /* XXX Should be in Tilma code only */
-        if (this.x) {
-            this.x.value = fixmystreet.x + 3;
-            this.y.value = fixmystreet.y + 3;
-        }
-
-        /*
-        if (swfu && swfu.getStats().files_queued > 0) {
-            swfu.startUpload();
-            return false;
-        }
-        */
-        return true;
-    }
-});
-
-YAHOO.util.Event.onContentReady('another_qn', function() {
-    if (!document.getElementById('been_fixed_no').checked && !document.getElementById('been_fixed_unknown').checked) {
-        YAHOO.util.Dom.setStyle(this, 'display', 'none');
-    }
-    YAHOO.util.Event.addListener('been_fixed_no', 'click', function(e) {
-        YAHOO.util.Dom.setStyle('another_qn', 'display', 'block');
-    });
-    YAHOO.util.Event.addListener('been_fixed_unknown', 'click', function(e) {
-        YAHOO.util.Dom.setStyle('another_qn', 'display', 'block');
-    });
-    YAHOO.util.Event.addListener('been_fixed_yes', 'click', function(e) {
-        YAHOO.util.Dom.setStyle('another_qn', 'display', 'none');
-    });
-});
-
-var timer;
-function email_alert_close() {
-    YAHOO.util.Dom.setStyle('email_alert_box', 'display', 'none');
-}
-YAHOO.util.Event.onContentReady('email_alert', function() {
-    YAHOO.util.Event.addListener(this, 'click', function(e) {
-        if (!document.getElementById('email_alert_box'))
-            return true;
-        YAHOO.util.Event.preventDefault(e);
-        if (YAHOO.util.Dom.getStyle('email_alert_box', 'display') == 'block') {
-            email_alert_close();
-        } else {
-            var pos = YAHOO.util.Dom.getXY(this);
-            pos[0] -= 20; pos[1] += 20;
-            YAHOO.util.Dom.setStyle('email_alert_box', 'display', 'block');
-            YAHOO.util.Dom.setXY('email_alert_box', pos);
-            document.getElementById('alert_rznvy').focus();
-        }
-    });
-    YAHOO.util.Event.addListener(this, 'mouseout', function(e) {
-        timer = window.setTimeout(email_alert_close, 2000);        
-    });
-    YAHOO.util.Event.addListener(this, 'mouseover', function(e) {
-        window.clearTimeout(timer);
-    });
-});
-YAHOO.util.Event.onContentReady('email_alert_box', function() {
-    YAHOO.util.Event.addListener(this, 'mouseout', function(e) {
-        timer = window.setTimeout(email_alert_close, 2000);        
-    });
-    YAHOO.util.Event.addListener(this, 'mouseover', function(e) {
-        window.clearTimeout(timer);
-    });
-});
-
-/* File upload */
-/*
-function doSubmit(e) {
-    e = e || window.event;
-    if (e.stopPropagation) e.stopPropagation();
-    e.cancelBubble = true;
-    try {
-        if (swfu.getStats().files_queued > 0)
-            swfu.startUpload();
-        else
-            return true;
-    } catch (e) {}
-    return false;
-}
-
-function uploadDone() {
-    var m = document.getElementById('mapForm');
-    if (m) {
-        m.submit();
-    } else {
-        document.getElementById('fieldset').submit();
-    }
-}
-
-var swfu;
-var swfu_settings = {
-    upload_url : "http://matthew.bci.mysociety.org/upload.cgi",
-    flash_url : "http://matthew.bci.mysociety.org/jslib/swfupload/swfupload_f9.swf",
-    file_size_limit : "10240",
-    file_types : "*.jpg;*.jpeg;*.pjpeg",
-    file_types_description : "JPEG files",
-    file_upload_limit : "0",
-
-    swfupload_loaded_handler : function() {
-        var d = document.getElementById("fieldset");
-        if (d) d.onsubmit = doSubmit;
-    },
-    file_queued_handler : function(obj) {
-        document.getElementById('txtfilename').value = obj.name;
-    },
-    file_queue_error_handler : fileQueueError,
-//upload_start_handler : uploadStartEventHandler,
-    upload_progress_handler : function(obj, bytesLoaded, bytesTotal) {
-        var percent = Math.ceil((bytesLoaded / bytesTotal) * 100);
-        obj.id = "singlefile";
-        var progress = new FileProgress(obj, this.customSettings.progress_target);
-        progress.setProgress(percent);
-        progress.setStatus("Uploading...");
-    },
-    upload_success_handler : function(obj, server_data) {
-        obj.id = "singlefile";
-        var progress = new FileProgress(obj, this.customSettings.progress_target);
-        progress.setComplete();
-        progress.setStatus("Complete!");
-        if (server_data == ' ') {
-            this.customSettings.upload_successful = false;
-        } else {
-            this.customSettings.upload_successful = true;
-            document.getElementById('upload_fileid').value = server_data;
-        }
-    },
-    upload_complete_handler : function(obj) {
-        if (this.customSettings.upload_successful) {
-            var d = document.getElementById('update_post');
-            if (d) d.disabled = 'true';
-            uploadDone();
-        } else {
-            obj.id = 'singlefile';
-            var progress = new FileProgress(obj, this.customSettings.progress_target);
-            progress.setError();
-            progress.setStatus("File rejected");
-            document.getElementById('txtfilename').value = '';
-        }
-        
-    },
-    upload_error_handler : uploadError,
-
-    swfupload_element_id : "fileupload_flashUI",
-    degraded_element_id : "fileupload_normalUI",
-    custom_settings : {
-        upload_successful : false,
-        progress_target : 'fileupload_flashUI'
-    }
-};
-*/
diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js
new file mode 100644
index 000000000..7f6014c6c
--- /dev/null
+++ b/web/js/fixmystreet.js
@@ -0,0 +1,78 @@
+/*
+ * fixmystreet.js
+ * FixMyStreet JavaScript
+ */
+
+
+YAHOO.util.Event.onContentReady('pc', function() {
+    if (this.id && this.value == this.defaultValue) {
+        this.focus();
+    }
+});
+
+YAHOO.util.Event.onContentReady('mapForm', function() {
+    this.onsubmit = function() {
+       if (this.submit_problem) {
+            this.onsubmit = function() { return false; };
+        }
+
+        /* XXX Should be in Tilma code only */
+        if (this.x) {
+            this.x.value = fixmystreet.x + 3;
+            this.y.value = fixmystreet.y + 3;
+        }
+
+        return true;
+    }
+});
+
+YAHOO.util.Event.onContentReady('another_qn', function() {
+    if (!document.getElementById('been_fixed_no').checked && !document.getElementById('been_fixed_unknown').checked) {
+        YAHOO.util.Dom.setStyle(this, 'display', 'none');
+    }
+    YAHOO.util.Event.addListener('been_fixed_no', 'click', function(e) {
+        YAHOO.util.Dom.setStyle('another_qn', 'display', 'block');
+    });
+    YAHOO.util.Event.addListener('been_fixed_unknown', 'click', function(e) {
+        YAHOO.util.Dom.setStyle('another_qn', 'display', 'block');
+    });
+    YAHOO.util.Event.addListener('been_fixed_yes', 'click', function(e) {
+        YAHOO.util.Dom.setStyle('another_qn', 'display', 'none');
+    });
+});
+
+var timer;
+function email_alert_close() {
+    YAHOO.util.Dom.setStyle('email_alert_box', 'display', 'none');
+}
+YAHOO.util.Event.onContentReady('email_alert', function() {
+    YAHOO.util.Event.addListener(this, 'click', function(e) {
+        if (!document.getElementById('email_alert_box'))
+            return true;
+        YAHOO.util.Event.preventDefault(e);
+        if (YAHOO.util.Dom.getStyle('email_alert_box', 'display') == 'block') {
+            email_alert_close();
+        } else {
+            var pos = YAHOO.util.Dom.getXY(this);
+            pos[0] -= 20; pos[1] += 20;
+            YAHOO.util.Dom.setStyle('email_alert_box', 'display', 'block');
+            YAHOO.util.Dom.setXY('email_alert_box', pos);
+            document.getElementById('alert_rznvy').focus();
+        }
+    });
+    YAHOO.util.Event.addListener(this, 'mouseout', function(e) {
+        timer = window.setTimeout(email_alert_close, 2000);        
+    });
+    YAHOO.util.Event.addListener(this, 'mouseover', function(e) {
+        window.clearTimeout(timer);
+    });
+});
+YAHOO.util.Event.onContentReady('email_alert_box', function() {
+    YAHOO.util.Event.addListener(this, 'mouseout', function(e) {
+        timer = window.setTimeout(email_alert_close, 2000);        
+    });
+    YAHOO.util.Event.addListener(this, 'mouseover', function(e) {
+        window.clearTimeout(timer);
+    });
+});
+
diff --git a/web/xsl.eha.xsl b/web/xsl.eha.xsl
index 14015cfd9..41b86ea07 100644
--- a/web/xsl.eha.xsl
+++ b/web/xsl.eha.xsl
@@ -8,7 +8,7 @@
     <head>
         <title><xsl:value-of select="$title"/> RSS Feed</title>
         <link rel="stylesheet" href="/css/core.css"/>
-        <link rel="stylesheet" href="/css/cobrands/emptyhomes/emptyhomes.css"/>
+        <link rel="stylesheet" href="/cobrands/emptyhomes/css.css"/>
     </head>
     <body>
     <div id="header"><a href="http://www.emptyhomes.com/"><img border="0" src="/i/eha.png" alt="Empty Homes Agency" width="272" height="71"/></a></div>