From: Tom Hughes <tom@compton.nu>
Date: Mon, 3 Oct 2011 14:09:49 +0000 (+0100)
Subject: Update Potlatch 2 to 2.3-27-gb6d4754 build
X-Git-Tag: live~6189
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/027bcbd32903713ae5bffae0c932ece1a20d225a?hp=35cbcdedd2e4fc343b807750d9e710d9ea0ea505

Update Potlatch 2 to 2.3-27-gb6d4754 build
---

diff --git a/public/potlatch2/locales/de_DE.swf b/public/potlatch2/locales/de_DE.swf
index 7bb8883b4..f7cc55921 100644
Binary files a/public/potlatch2/locales/de_DE.swf and b/public/potlatch2/locales/de_DE.swf differ
diff --git a/public/potlatch2/locales/en_GB.swf b/public/potlatch2/locales/en_GB.swf
index 3f8dd1494..75debbac4 100644
Binary files a/public/potlatch2/locales/en_GB.swf and b/public/potlatch2/locales/en_GB.swf differ
diff --git a/public/potlatch2/locales/en_US.swf b/public/potlatch2/locales/en_US.swf
index f18135d1a..23dc3a0f0 100644
Binary files a/public/potlatch2/locales/en_US.swf and b/public/potlatch2/locales/en_US.swf differ
diff --git a/public/potlatch2/locales/fr_FR.swf b/public/potlatch2/locales/fr_FR.swf
index df9f70ce5..83ac4a29f 100644
Binary files a/public/potlatch2/locales/fr_FR.swf and b/public/potlatch2/locales/fr_FR.swf differ
diff --git a/public/potlatch2/locales/pl_PL.swf b/public/potlatch2/locales/pl_PL.swf
index 622c51b9e..680cdff43 100644
Binary files a/public/potlatch2/locales/pl_PL.swf and b/public/potlatch2/locales/pl_PL.swf differ
diff --git a/public/potlatch2/potlatch2.swf b/public/potlatch2/potlatch2.swf
index b1d1e9fe9..a9cd6dc84 100644
Binary files a/public/potlatch2/potlatch2.swf and b/public/potlatch2/potlatch2.swf differ
diff --git a/public/potlatch2/stylesheets/core_interactive.css b/public/potlatch2/stylesheets/core_interactive.css
index aaf1e489d..3fd9ea777 100644
--- a/public/potlatch2/stylesheets/core_interactive.css
+++ b/public/potlatch2/stylesheets/core_interactive.css
@@ -18,7 +18,8 @@ way :tiger { casing-color: #ff00ff;}
 
 node :dupe { z-index: 9; icon-image: circle; icon-width:8; color: white; opacity: 0.4; casing-opacity: 0.4; casing-color: red; casing-width: 3; }
 node :hoverway { z-index: 9; icon-image: square; icon-width: 7; color: blue; layer: 5; }
-node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :hasTags :poi { z-index: 2; icon-image: circle; icon-width: 4; color: green; casing-color: black; casing-width: 1; }
+node !:drawn :poi { z-index: 2; icon-image: circle; icon-width: 4; color: #BBB; casing-color: #333; casing-width: 1; }
 node !:drawn :hasTags :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: black; layer: 5; }
 node !:drawn :hasTags { z-index: 9; icon-image: circle; icon-width: 4; color: black; }
 node !:drawn :selectedway { z-index: 9; icon-image: square; icon-width: 8; color: red; casing-color: #cc0000; casing-width: 1; layer: 5; }
diff --git a/public/potlatch2/stylesheets/potlatch.css b/public/potlatch2/stylesheets/potlatch.css
index 34fd3bc4a..88094fc43 100644
--- a/public/potlatch2/stylesheets/potlatch.css
+++ b/public/potlatch2/stylesheets/potlatch.css
@@ -18,11 +18,11 @@
 way .area_small_name {text-color: black; font-size: 9; text: name; text-halo: #ffffaa; text-halo-radius: 2; text-position: center;}
 @import("stylesheets/core_interactive.css");
 
-/* Test rendering for licence status */
+/* Rendering for licence status */
 
-way[_status=no]::status       { z-index: 0; width: 20; color: red; }
-way[_status=partial]::status  { z-index: 0; width: 20; color: red; opacity: 0.4; }
-way[_status=unsure]::status   { z-index: 0; width: 20; color: orange; opacity: 0.4; }
-node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: 15; color: red; }
-node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: 15; color: red; opacity: 0.4; }
-node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: 15; color: orange; opacity: 0.4; }
+way[_status=no]::status       { z-index: 0; width: eval('_width+7'); color: red; }
+way[_status=partial]::status  { z-index: 0; width: eval('_width+7'); color: red; opacity: 0.4; }
+way[_status=unsure]::status   { z-index: 0; width: eval('_width+7'); color: orange; opacity: 0.4; }
+node[_status=no]::status      { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: red; }
+node[_status=partial]::status { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: red; opacity: 0.4; }
+node[_status=unsure]::status  { z-index: 0; icon-image: square; icon-width: eval('_width+7'); color: orange; opacity: 0.4; }