gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-11-27 10:40:14 +01:00
commit 2dcac49363
3 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/tbl_select.js
View File

@ -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()

15
themes/original/css/theme_right.css.php
View File

@ -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
*/

15
themes/pmahomme/css/theme_right.css.php
View File

@ -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
*/