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 7bb8883b467f2327477bf1a1c2299fc77179d7a3..f7cc5592165f2f55a08b4ab12103a2098194d9ae 100644 (file)
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 3f8dd1494cbf8ccd30349cb9d1dbd54f90ca2445..75debbac45c665042b89bc8f23269fc577f1e65a 100644 (file)
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 f18135d1af1567f7e0c415dd006980e4278a0b7f..23dc3a0f075418384ff126ed312bcecbf3208325 100644 (file)
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 df9f70ce5e8cea4171782e22da26614d64f41f64..83ac4a29f95e039d7439b2ec0b4601c590a65320 100644 (file)
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 622c51b9e3a17552e73246c6a4878bdf5d3215a2..680cdff431efd43a446740efef50c6404d0104d4 100644 (file)
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 b1d1e9fe9487fb0241f8df3bb837c7ba5c67d7a6..a9cd6dc84b8301ed84ed347beb966a9bc0fcff38 100644 (file)
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 aaf1e489d2fc9c25659c7a42a1e0e5386353adc5..3fd9ea777a6d9e638da8ad591e32f663bbb07712 100644 (file)
--- 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 34fd3bc4a23dd3867c117c6eb5577350d29b6ba3..88094fc43bc68b8545b185600aabde56b6ce362d 100644 (file)
--- 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; }