diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js new file mode 100644 index 0000000000..5aa41bc09d --- /dev/null +++ b/module/bug/js/browse.js @@ -0,0 +1,24 @@ +/* Browse by module. */ +function browseByModule(active) +{ + $('#treebox').removeClass('hidden'); + $('#bymoduleTab').addClass('active'); + $('#querybox').addClass('hidden'); + $('#' + active + 'Tab').removeClass('active'); +} +/* Search bugs. */ +function browseBySearch(active) +{ + $('#treebox').addClass('hidden'); + $('#querybox').removeClass('hidden'); + $('#bymoduleTab').removeClass('active'); + $('#' + active + 'Tab').removeClass('active'); + $('#bysearchTab').addClass('active'); +} + +$(document).ready(function() +{ + $("a.iframe").colorbox({width:640, height:420, iframe:true, transition:'none'}); + $('#' + browseType + 'Tab').addClass('active'); + $('#module' + moduleID).addClass('active'); +}); diff --git a/module/bug/view/browse.custom.html.php b/module/bug/view/browse.custom.html.php index 19650e823f..93ebf39d7e 100644 --- a/module/bug/view/browse.custom.html.php +++ b/module/bug/view/browse.custom.html.php @@ -77,6 +77,4 @@ if($.browser.msie && Math.floor(parseInt($.browser.version)) == 6) $("#browsecss").attr('href', ''); } - - - + diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php index 96afc76e5d..66c96387a5 100644 --- a/module/bug/view/browse.html.php +++ b/module/bug/view/browse.html.php @@ -15,64 +15,51 @@ - -
-
-
- " . $lang->bug->moduleBugs . " "; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe¶m=0"), $lang->bug->assignToMe) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe¶m=0"), $lang->bug->openedByMe) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe¶m=0"), $lang->bug->resolvedByMe) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull¶m=0"), $lang->bug->assignToNull) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved¶m=0"), $lang->bug->unResolved) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; - echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; - echo "{$lang->bug->byQuery} "; - ?> -
-
- bug->customFields, '', "class='iframe'"); ?> - exportCSV, $lang->setFileName);?> - bug->report->common); ?> - bug->create); ?> +
+
+
+
+ " . $lang->bug->moduleBugs . " "; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToMe¶m=0"), $lang->bug->assignToMe) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=openedByMe¶m=0"), $lang->bug->openedByMe) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=resolvedByMe¶m=0"), $lang->bug->resolvedByMe) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=assignToNull¶m=0"), $lang->bug->assignToNull) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=unResolved¶m=0"), $lang->bug->unResolved) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=longLifeBugs¶m=0"), $lang->bug->longLifeBugs) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=postponedBugs¶m=0"), $lang->bug->postponedBugs) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=all¶m=0&orderBy=$orderBy&recTotal=0&recPerPage=200"), $lang->bug->allBugs) . ""; + echo "" . html::a($this->createLink('bug', 'browse', "productid=$productID&browseType=needconfirm¶m=0"), $lang->bug->needConfirm) . ""; + echo "{$lang->bug->byQuery} "; + ?> +
+
+ bug->customFields, '', "class='iframe'"); ?> + exportCSV, $lang->setFileName);?> + bug->report->common); ?> + bug->create); ?> +
+
'>
-
'>
- -
' id='mainbox'> - -
-
+ +
+ +
+
recTotal}&recPerPage={$pager->recPerPage}"; ?> @@ -125,20 +112,5 @@ $(document).ready(function() show();?> - -
' id='treebox'> -
-
- -
- createLink('tree', 'browse', "productID=$productID&view=bug"), $lang->tree->manage);?> -
-
-
- - diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php index 39fcbe964e..f7af62f042 100644 --- a/module/common/view/footer.html.php +++ b/module/common/view/footer.html.php @@ -3,16 +3,14 @@
-
+ + + + + diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 0a9c075a39..b6452fc4d1 100644 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -4,25 +4,23 @@ include 'header.lite.html.php'; include 'colorbox.html.php'; ?>