diff --git a/module/bug/css/browse.css b/module/bug/css/browse.css index ad9760e3e5..f0bd370a0f 100644 --- a/module/bug/css/browse.css +++ b/module/bug/css/browse.css @@ -13,6 +13,3 @@ .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} - -#treebox{position:fixed;margin-left:20px;} -.outer.hide-side #treebox{margin-left:0px;} diff --git a/module/bug/js/browse.js b/module/bug/js/browse.js index 73f248ac03..b939022371 100644 --- a/module/bug/js/browse.js +++ b/module/bug/js/browse.js @@ -19,10 +19,4 @@ $(document).ready(function() }); setTimeout(function(){fixedTfootAction('#bugForm')}, 100); setTimeout(function(){fixedTheadOfList('#bugList')}, 100); - - var treeMaxHeight = document.documentElement.clientHeight - $('#header').height() - $('#featurebar').height() - $('#footer').height() - $('#treebox .side-body .panel-heading').height() - 120; - if($('#treebox').height() > $('#bugList').height()) treeMaxHeight -= 20; - $('#treebox .side-body .panel-body').children().each(function(){if(!$(this).hasClass('tree')) treeMaxHeight -= $(this).height()}); - $('#treebox .tree').css({'max-height':treeMaxHeight, 'overflow-y': 'auto', 'overflow-x':'hidden'}) - if(moduleID > 0)$('#treebox .tree').scrollTop($('#treebox .tree #module' + moduleID).offset().top - $('#treebox .tree li[data-id="1"]').offset().top); }); diff --git a/module/product/css/browse.css b/module/product/css/browse.css index 24cf2f530a..7e6f398628 100644 --- a/module/product/css/browse.css +++ b/module/product/css/browse.css @@ -6,8 +6,6 @@ .dropdown-list > li > a {display: block; padding: 3px 20px; clear: both; font-weight: normal; line-height: 1.53846154; color: #141414; white-space: nowrap;} .dropdown-list > li > a:hover, .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} -#treebox{position:fixed;margin-left:20px;} -.outer.hide-side #treebox{margin-left:0px;} .pl-5px{padding-left:5px;} a.removeModule{color:#ddd} diff --git a/module/product/js/browse.js b/module/product/js/browse.js index 5aadb90943..aed4662921 100644 --- a/module/product/js/browse.js +++ b/module/product/js/browse.js @@ -23,10 +23,4 @@ $(function() $('.popoverStage').mouseout(function(){$(this).popover('hide')}); setTimeout(function(){fixedTfootAction('#productStoryForm')}, 100); setTimeout(function(){fixedTheadOfList('#storyList')}, 100); - - var treeMaxHeight = document.documentElement.clientHeight - $('#header').height() - $('#featurebar').height() - $('#footer').height() - $('#treebox .side-body .panel-heading').height() - 120; - if($('#treebox').height() > $('#storyList').height()) treeMaxHeight -= 20; - $('#treebox .side-body .panel-body').children().each(function(){if(!$(this).hasClass('tree')) treeMaxHeight -= $(this).height()}); - $('#treebox .tree').css({'max-height':treeMaxHeight, 'overflow-y': 'auto', 'overflow-x':'hidden'}) - if(moduleID > 0)$('#treebox .tree').scrollTop($('#treebox .tree #module' + moduleID).offset().top - $('#treebox .tree li[data-id="1"]').offset().top); }) diff --git a/module/project/css/task.css b/module/project/css/task.css index 720ed1ad17..8881756cd2 100644 --- a/module/project/css/task.css +++ b/module/project/css/task.css @@ -21,7 +21,4 @@ .pl-5px{padding-left:5px;} -#taskTree{position:fixed;margin-left:20px;} -.outer.hide-side #taskTree{margin-left:0px;} - tbody > tr > td > .btn-icon {margin-right: 2px} diff --git a/module/project/js/task.js b/module/project/js/task.js index 01a717d5c8..fc2fc74f7c 100644 --- a/module/project/js/task.js +++ b/module/project/js/task.js @@ -20,12 +20,6 @@ $(function() $option.toggleClass('hide', $option.text().toString().toLowerCase().indexOf(val) < 0 && $option.data('key').toString().toLowerCase().indexOf(val) < 0); }); }); - - var treeMaxHeight = document.documentElement.clientHeight - $('#header').height() - $('#featurebar').height() - $('#footer').height() - $('#taskTree .side-body .panel-heading').height() - 120; - if($('#taskTree').height() > $('#taskList').height()) treeMaxHeight -= 20; - $('#taskTree .side-body .panel-body').children().each(function(){if(!$(this).hasClass('tree')) treeMaxHeight -= $(this).height()}); - $('#taskTree .tree').css({'max-height':treeMaxHeight, 'overflow-y': 'auto', 'overflow-x':'hidden'}) - if(moduleID > 0)$('#taskTree .tree').scrollTop($('#taskTree .tree #module' + moduleID).offset().top - $('#taskTree .tree li[data-id="1"]').offset().top); }); $('#module' + moduleID).addClass('active'); diff --git a/module/testcase/css/browse.css b/module/testcase/css/browse.css index ab3f5b3a06..e3768a108e 100644 --- a/module/testcase/css/browse.css +++ b/module/testcase/css/browse.css @@ -10,5 +10,3 @@ .dropdown-list > li > a:focus {color: #1a4f85;text-decoration: none;background-color: #ddd;} .pl-5px{padding-left:5px;} -#treebox{position:fixed;margin-left:20px;} -.outer.hide-side #treebox{margin-left:0px;} diff --git a/module/testcase/js/browse.js b/module/testcase/js/browse.js index ad48a68ae6..dbb1877696 100644 --- a/module/testcase/js/browse.js +++ b/module/testcase/js/browse.js @@ -44,10 +44,4 @@ $(document).ready(function() }); setModal4List('runCase', 'caseList'); - - var treeMaxHeight = document.documentElement.clientHeight - $('#header').height() - $('#featurebar').height() - $('#footer').height() - $('#treebox .side-body .panel-heading').height() - 120; - if($('#treebox').height() > $('#caseList').height()) treeMaxHeight -= 20; - $('#treebox .side-body .panel-body').children().each(function(){if(!$(this).hasClass('tree')) treeMaxHeight -= $(this).height()}); - $('#treebox .tree').css({'max-height':treeMaxHeight, 'overflow-y': 'auto', 'overflow-x':'hidden'}) - if(moduleID > 0)$('#treebox .tree').scrollTop($('#treebox .tree #module' + moduleID).offset().top - $('#treebox .tree li[data-id="1"]').offset().top); }); diff --git a/module/testtask/css/cases.css b/module/testtask/css/cases.css index b8d0c0e1b1..dedb675c81 100644 --- a/module/testtask/css/cases.css +++ b/module/testtask/css/cases.css @@ -1,4 +1,2 @@ tfoot .table-actions #assignedTo_chosen a.chosen-default{height:26px;line-height:15px} tfoot .table-actions .input-group-addon{padding:5px 12px;} -#casesbox{position:fixed;margin-left:20px;} -.outer.hide-side #casesbox{margin-left:0px;} diff --git a/module/testtask/js/cases.js b/module/testtask/js/cases.js index 0042463579..1ab327db05 100644 --- a/module/testtask/js/cases.js +++ b/module/testtask/js/cases.js @@ -4,10 +4,4 @@ $(document).ready(function() if(browseType == 'bysearch') ajaxGetSearchForm(); setTimeout(function(){fixedTfootAction('#casesForm')}, 100); setTimeout(function(){fixedTheadOfList('#caseList')}, 100); - - var treeMaxHeight = document.documentElement.clientHeight - $('#header').height() - $('#featurebar').height() - $('#footer').height() - $('#casesbox .side-body .panel-heading').height() - 120; - if($('#casesbox').height() > $('#caseList').height()) treeMaxHeight -= 20; - $('#casesbox .side-body .panel-body').children().each(function(){if(!$(this).hasClass('tree')) treeMaxHeight -= $(this).height()}); - $('#casesbox .tree').css({'max-height':treeMaxHeight, 'overflow-y': 'auto', 'overflow-x':'hidden'}); - if(moduleID > 0)$('#casesbox .tree').scrollTop($('#casesbox .tree #module' + moduleID).offset().top - $('#casesbox .tree li[data-id="1"]').offset().top); });