| Index: trunk/extensions/SemanticDrilldown/specials/SD_BrowseData.php |
| — | — | @@ -1059,27 +1059,18 @@ |
| 1060 | 1060 | |
| 1061 | 1061 | $out->addHTML( $html ); |
| 1062 | 1062 | |
| 1063 | | - // TODO: this issue has probably been fixed in Maps 0.6. |
| 1064 | | - // If it's not - all mapping service identifiers can be obtained by getting the array keys |
| 1065 | | - // of $egMapsServices, and the aliases element (which is an array) of each item. |
| 1066 | | - |
| 1067 | | - // add Ext library, to enable combobox, unless a map is being |
| 1068 | | - // displayed - the Javascript for Ext conflicts with the |
| 1069 | | - // Javascript for the maps |
| 1070 | | - if ( $format != 'openlayers' || strpos( $format, 'map' ) !== false ) { |
| 1071 | | - global $sdgScriptPath; |
| 1072 | | - $out->addLink( array( |
| 1073 | | - 'rel' => 'stylesheet', |
| 1074 | | - 'type' => 'text/css', |
| 1075 | | - 'media' => "screen", |
| 1076 | | - 'href' => $sdgScriptPath . '/skins/ext-all.css' |
| 1077 | | - ) ); |
| 1078 | | - // overwrite style from ext-all.css, to set the correct |
| 1079 | | - // image for the combobox arrow |
| 1080 | | - $out->addScript( "<style>.x-form-field-wrap .x-form-trigger{background:transparent url($sdgScriptPath/skins/trigger.gif) no-repeat 0 0;}</style>" ); |
| 1081 | | - $out->addScript( '<script type="text/javascript" src="' . $sdgScriptPath . '/libs/ext-base.js"></script>' ); |
| 1082 | | - $out->addScript( '<script type="text/javascript" src="' . $sdgScriptPath . '/libs/ext-all.js"></script>' ); |
| 1083 | | - } |
| | 1063 | + global $sdgScriptPath; |
| | 1064 | + $out->addLink( array( |
| | 1065 | + 'rel' => 'stylesheet', |
| | 1066 | + 'type' => 'text/css', |
| | 1067 | + 'media' => "screen", |
| | 1068 | + 'href' => $sdgScriptPath . '/skins/ext-all.css' |
| | 1069 | + ) ); |
| | 1070 | + // overwrite style from ext-all.css, to set the correct |
| | 1071 | + // image for the combobox arrow |
| | 1072 | + $out->addScript( "<style>.x-form-field-wrap .x-form-trigger{background:transparent url($sdgScriptPath/skins/trigger.gif) no-repeat 0 0;}</style>" ); |
| | 1073 | + $out->addScript( '<script type="text/javascript" src="' . $sdgScriptPath . '/libs/ext-base.js"></script>' ); |
| | 1074 | + $out->addScript( '<script type="text/javascript" src="' . $sdgScriptPath . '/libs/ext-all.js"></script>' ); |
| 1084 | 1075 | } |
| 1085 | 1076 | |
| 1086 | 1077 | // Take non-semantic result set returned by Database->query() method, and |