move stylesheets into dedicated directory

diff --git a/net/systemeD/halcyon/connection/Trace.as b/net/systemeD/halcyon/connection/Trace.as
index 55baa01d75c7f48f4375937c98b3f4fddd8a80b4..5c4402fd0b2de1b2d44d3b13c331346ad199f6f1 100644 (file)
--- a/net/systemeD/halcyon/connection/Trace.as
+++ b/net/systemeD/halcyon/connection/Trace.as
@@ -26,7 +26,7 @@ package net.systemeD.halcyon.connection {
         private var _layer:VectorLayer;
         private var simplify:Boolean = false;
 
-        private static const STYLESHEET:String="gpx.css";
+        private static const STYLESHEET:String="stylesheets/gpx.css";
 
         public function Trace() {
             map = Globals.vars.root;

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/VectorSourceDialog.mxml
index ea11ab44fa142caec7eca23163a14eea3ab9e837..776753a6907b46f0fe045d4da94807595ee1abb1 100644 (file)
--- a/net/systemeD/potlatch2/VectorSourceDialog.mxml
+++ b/net/systemeD/potlatch2/VectorSourceDialog.mxml
@@ -142,8 +142,8 @@
 
        private function loadFiles(url:String,type:String,simplify:Boolean):void {
                var names:Array=url.split('/'); var name:String=names[names.length-1];
-               var stylesheet:String="potlatch.css";
-               if (type=='gpx') { stylesheet="gpx.css"; }
+               var stylesheet:String="stylesheets/potlatch.css";
+               if (type=='gpx') { stylesheet="stylesheets/gpx.css"; }
                var vectorlayer:VectorLayer=new VectorLayer(name,map,stylesheet);
                vectorlayer.url=url;
 

diff --git a/net/systemeD/potlatch2/collections/Stylesheets.as b/net/systemeD/potlatch2/collections/Stylesheets.as
index 50c261450a2445457844c103c3f20a8d033ef92a..29c5038b593066488c81d39402191272dd18f8ee 100644 (file)
--- a/net/systemeD/potlatch2/collections/Stylesheets.as
+++ b/net/systemeD/potlatch2/collections/Stylesheets.as
@@ -49,7 +49,7 @@ package net.systemeD.potlatch2.collections {
 
             // pick a stylesheet to be set. It should be the saved one, if it is in the menu
             // or alternatively the first one on the menu,
-            // or finally try 'potlatch.css'
+            // or finally try 'stylesheets/potlatch.css'
                        for each (var ss:Object in collection) {
                                if (ss.name==saved_name || ss.url==saved_url) {
                                        setStylesheet(ss.name, ss.url);
@@ -63,8 +63,8 @@ package net.systemeD.potlatch2.collections {
                 setStylesheet(s.name, s.url);
               } else {
                 //hit and hope. FIXME should this be an error state?
-                collection.push({ name:'Potlatch', url:'potlatch.css'});
-                setStylesheet('Potlatch','potlatch.css');
+                collection.push({ name:'Potlatch', url:'stylesheets/potlatch.css'});
+                setStylesheet('Potlatch','stylesheets/potlatch.css');
               }
             }
                        FunctionKeyManager.instance().registerListener('Map style',

diff --git a/net/systemeD/potlatch2/collections/VectorBackgrounds.as b/net/systemeD/potlatch2/collections/VectorBackgrounds.as
index 9cf74039fa2570c3b5f5d58ccd15cafb8c884d4d..6646e3d83d2ee3935600d7241f15a1675a235ac5 100644 (file)
--- a/net/systemeD/potlatch2/collections/VectorBackgrounds.as
+++ b/net/systemeD/potlatch2/collections/VectorBackgrounds.as
@@ -47,7 +47,7 @@ package net.systemeD.potlatch2.collections {
                   if (set.url) {
                     if (set.@loaded == "true") {
                       name ||= 'GPX file';
-                      var layer:VectorLayer = new VectorLayer(name, _map, 'gpx.css');
+                      var layer:VectorLayer = new VectorLayer(name, _map, 'stylesheets/gpx.css');
                       _map.addVectorLayer(layer);
                       var gpxImporter:GpxImporter = new GpxImporter(layer, layer.paint, [String(set.url)]);
                     } else {

diff --git a/net/systemeD/potlatch2/utils/BikeShopLoader.as b/net/systemeD/potlatch2/utils/BikeShopLoader.as
index 7b396dbf9adf2622576a9cacb42dcb51d6bf34b5..89e4d9f059bb1155dff69dcc5fbc95a5f27651cb 100644 (file)
--- a/net/systemeD/potlatch2/utils/BikeShopLoader.as
+++ b/net/systemeD/potlatch2/utils/BikeShopLoader.as
@@ -26,7 +26,7 @@ package net.systemeD.potlatch2.utils {
         private var bikeShopBaseURL:String;
         private var name:String;
         private var _layer:VectorLayer;
-        private static const STYLESHEET:String="bikeshops.css";
+        private static const STYLESHEET:String="stylesheets/bikeshops.css";
 
         public function BikeShopLoader(map:Map, url:String, name:String) {
             this.map = map;

diff --git a/net/systemeD/potlatch2/utils/BugLoader.as b/net/systemeD/potlatch2/utils/BugLoader.as
index 509c84acc90349fa47a45fc42502011d7e758634..3ba731fa2262f1f77839e2f77e45a1227400ac93 100644 (file)
--- a/net/systemeD/potlatch2/utils/BugLoader.as
+++ b/net/systemeD/potlatch2/utils/BugLoader.as
@@ -16,7 +16,7 @@ package net.systemeD.potlatch2.utils {
         private var bugDetailsURL:String;
         private var _layer:VectorLayer;
         private var name:String;
-        private static const STYLESHEET:String="bugs.css";
+        private static const STYLESHEET:String="stylesheets/bugs.css";
 
 
         public function BugLoader(map:Map, url:String, bugApiKey:String, name:String, details:String = ''):void {

diff --git a/net/systemeD/potlatch2/utils/TrackLoader.as b/net/systemeD/potlatch2/utils/TrackLoader.as
index f11dcd3150c0c1bcdcc474dc0ac007397c5503d6..7dee3cf1da3c6d641c46c14bfc1024b4cf1e56c4 100644 (file)
--- a/net/systemeD/potlatch2/utils/TrackLoader.as
+++ b/net/systemeD/potlatch2/utils/TrackLoader.as
@@ -22,7 +22,7 @@ package net.systemeD.potlatch2.utils {
                private var map:Map;
                private var apiBaseURL:String;
 
-               private static const STYLESHEET:String="gpx.css";
+               private static const STYLESHEET:String="stylesheets/gpx.css";
                
                public function TrackLoader(map:Map, url:String) {
                        this.map=map;

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 44ab22ca4780ea23aad5ee7955011c79a0cf9b1d..81dfce445ab65d8eb563773e9da429e2489bc205 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -243,7 +243,7 @@
 
                        // Load arbitrary GPX from provided URL
                        if (loaderInfo.parameters['gpx_url']) {
-                               var vectorlayer:VectorLayer=new VectorLayer(name,theMap,"gpx.css");
+                               var vectorlayer:VectorLayer=new VectorLayer(name,theMap,"stylesheets/gpx.css");
                                vectorlayer.url=loaderInfo.parameters['gpx_url'];
                                var gpx:GpxImporter=new GpxImporter(vectorlayer, vectorlayer.paint, [vectorlayer.url], 
                                                                    function(success:Boolean,message:String=null):void {

diff --git a/resources/stylesheets.xml b/resources/stylesheets.xml
index c9abed15aeb152bf789e801de6b809d92b113e58..18da7c50ac7b58a5f6f9e36c9e8b9c62d1cce0a8 100644 (file)
--- a/resources/stylesheets.xml
+++ b/resources/stylesheets.xml
@@ -3,22 +3,22 @@
 <stylesheets>
        <stylesheet>
                <name>Potlatch</name>
-               <url>potlatch.css</url>
+               <url>stylesheets/potlatch.css</url>
        </stylesheet>
        <stylesheet>
                <name>Wireframe</name>
-               <url>wireframe.css</url>
+               <url>stylesheets/wireframe.css</url>
        </stylesheet>
     <stylesheet>
         <name>OpenCycleMap</name>
-        <url>opencyclemap.css</url>
+        <url>stylesheets/opencyclemap.css</url>
     </stylesheet>
     <stylesheet>
         <name>GPS</name>
-        <url>gpx.css</url>
+        <url>stylesheets/gpx.css</url>
     </stylesheet>
     <stylesheet>
         <name>Bugs</name>
-        <url>bugs.css</url>
+        <url>stylesheets/bugs.css</url>
     </stylesheet>
 </stylesheets>

diff --git a/resources/bikeshops.css b/resources/stylesheets/bikeshops.css
similarity index 100%
rename from resources/bikeshops.css
rename to resources/stylesheets/bikeshops.css

diff --git a/resources/bugs.css b/resources/stylesheets/bugs.css
similarity index 100%
rename from resources/bugs.css
rename to resources/stylesheets/bugs.css

diff --git a/resources/gpx.css b/resources/stylesheets/gpx.css
similarity index 100%
rename from resources/gpx.css
rename to resources/stylesheets/gpx.css

diff --git a/resources/opencyclemap.css b/resources/stylesheets/opencyclemap.css
similarity index 100%
rename from resources/opencyclemap.css
rename to resources/stylesheets/opencyclemap.css

diff --git a/resources/potlatch.css b/resources/stylesheets/potlatch.css
similarity index 100%
rename from resources/potlatch.css
rename to resources/stylesheets/potlatch.css

diff --git a/resources/wireframe.css b/resources/stylesheets/wireframe.css
similarity index 100%
rename from resources/wireframe.css
rename to resources/stylesheets/wireframe.css