The branch, master has been updated via 3c4e231867e0ea547ad7447696bbf253a64f2899 (commit) via e095e926c1462c78ff82f7e3d964dd83be5ec655 (commit) from 3dce618b7bd49c275584169882de61ce079eebdb (commit)

- Log ----------------------------------------------------------------- commit 3c4e231867e0ea547ad7447696bbf253a64f2899 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Nov 27 14:17:07 2011 +0530

A forgotten change in making JS files load dynamically.

commit e095e926c1462c78ff82f7e3d964dd83be5ec655 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Nov 27 14:13:57 2011 +0530

styles for #popup_background is still needed for gis data editor

-----------------------------------------------------------------------

Summary of changes: js/tbl_select.js | 7 ++++++- themes/original/css/theme_right.css.php | 15 ++++++++++++++- themes/pmahomme/css/theme_right.css.php | 15 ++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/js/tbl_select.js b/js/tbl_select.js index faffeef..03d611a 100644 --- a/js/tbl_select.js +++ b/js/tbl_select.js @@ -173,7 +173,12 @@ $(document).ready(function() { //Token var token = $("input[name='token']").val();

- openGISEditor(value, field, type, input_name, token); + openGISEditor(); + if (!gisEditorLoaded) { + loadJSAndGISEditor(value, field, type, input_name, token); + } else { + loadGISEditor(value, field, type, input_name, token); + } });

}, 'top.frame_content'); // end $(document).ready() diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 1284ae1..2b30f3a 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1618,7 +1618,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -1645,6 +1645,19 @@ a.close_gis_editor { width: 75px; }

+#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */ diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 5d4c3f3..e47b4fd 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -1999,7 +1999,7 @@ a.close_gis_editor { display: none; position: fixed; _position: absolute; /* hack for IE */ - z-index: 101; + z-index: 1001; overflow-y: auto; overflow-x: hidden; } @@ -2026,6 +2026,19 @@ a.close_gis_editor { width: 75px; }

+#popup_background { + display: none; + position: fixed; + _position: absolute; /* hack for IE6 */ + width: 100%; + height: 100%; + top: 0; + left: 0; + background: #000; + z-index: 1000; + overflow: hidden; +} + /** * ENUM/SET editor styles */

hooks/post-receive