Permalink
Browse files

Merge pull request #1 from lmandel/master

Fixes for mixed scripting and broken bug links
  • Loading branch information...
2 parents 8857ad0 + bab34fb commit 822d6a04deb946dd8e77cb0fb1cd04b20d56539d @brandonsavage brandonsavage committed Feb 28, 2012
Showing with 1,571 additions and 6 deletions.
  1. +4 −4 Bugzilla.php
  2. +1 −0 BugzillaOutput.class.php
  3. +2 −2 templates/bug/table.tpl
  4. +18 −0 web/jquery/1.6.2/jquery.min.js
  5. +412 −0 web/jqueryui/1.8.14/jquery-ui.min.js
  6. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_flat_0_aaaaaa_40x100.png
  7. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_flat_75_ffffff_40x100.png
  8. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_glass_55_fbf9ee_1x400.png
  9. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_glass_65_ffffff_1x400.png
  10. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_glass_75_dadada_1x400.png
  11. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_glass_75_e6e6e6_1x400.png
  12. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_glass_95_fef1ec_1x400.png
  13. BIN web/jqueryui/1.8.14/themes/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  14. BIN web/jqueryui/1.8.14/themes/base/images/ui-icons_222222_256x240.png
  15. BIN web/jqueryui/1.8.14/themes/base/images/ui-icons_2e83ff_256x240.png
  16. BIN web/jqueryui/1.8.14/themes/base/images/ui-icons_454545_256x240.png
  17. BIN web/jqueryui/1.8.14/themes/base/images/ui-icons_888888_256x240.png
  18. BIN web/jqueryui/1.8.14/themes/base/images/ui-icons_cd0a0a_256x240.png
  19. +566 −0 web/jqueryui/1.8.14/themes/base/jquery-ui.css
  20. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
  21. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
  22. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
  23. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
  24. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
  25. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
  26. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
  27. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
  28. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-icons_222222_256x240.png
  29. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-icons_2e83ff_256x240.png
  30. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-icons_454545_256x240.png
  31. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-icons_888888_256x240.png
  32. BIN web/jqueryui/1.8.14/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
  33. +568 −0 web/jqueryui/1.8.14/themes/smoothness/jquery-ui.css
View
@@ -76,19 +76,19 @@ function BugzillaIncludeHTML( &$out, &$sk ) {
global $wgScriptPath;
// Use remote jquery
- $out->addScript('<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js"></script>');
+ $out->addScript('<script type="text/javascript" src="$wgScriptPath/extensions/Bugzilla/web/jquery/1.6.2/jquery.min.js"></script>');
// Use remote jquery ui
- $out->addScript('<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/jquery-ui.min.js"></script>');
+ $out->addScript('<script type="text/javascript" src="$wgScriptPath/extensions/Bugzilla/web/jqueryui/1.8.14/jquery-ui.min.js"></script>');
// Add a local script file for the datatable
$out->addScriptFile("$wgScriptPath/extensions/Bugzilla/web/js/jquery.dataTables.js" );
// Add a remote jquery css file
- $out->addStyle("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/base/jquery-ui.css");
+ $out->addStyle("$wgScriptPath/extensions/Bugzilla/web/jqueryui/1.8.14/themes/base/jquery-ui.css");
// Add a remote jquery UI theme css file
- $out->addStyle("http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.14/themes/smoothness/jquery-ui.css");
+ $out->addStyle("$wgScriptPath/extensions/Bugzilla/web/jqueryui/1.8.14/themes/smoothness/jquery-ui.css");
// Add local datatable styles
$out->addStyle("$wgScriptPath/extensions/Bugzilla/web/css/demo_page.css");
@@ -26,6 +26,7 @@ protected function _render_error() {
}
public function render() {
+ global $wgBugzillaURL;
// Get our template path
$this->template = dirname(__FILE__) . '/templates/' .
$this->config['type'] . '/' .
@@ -10,8 +10,8 @@
<tbody>
<?php foreach($response->bugs as $bug): ?>
<tr>
- <td><?php echo $bug->id ?></td>
- <td><a href="<?php echo $bug->url ?>"><?php echo $bug->summary ?></a></td>
+ <td><a href="<?php echo $wgBugzillaURL ?>/show_bug.cgi?id=<?php echo $bug->id ?>"><?php echo $bug->id ?></a></td>
+ <td><a href="<?php echo $wgBugzillaURL ?>/show_bug.cgi?id=<?php echo $bug->id ?>"><?php echo $bug->summary ?></a></td>
<td><?php echo $bug->status ?></td>
<td><?php echo $bug->priority ?></td>
</tr>
Oops, something went wrong.
Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 822d6a0

Please sign in to comment.