diff --git a/module/block/css/dashboard.css b/module/block/css/dashboard.css index 8adcba58c8..ae824b730d 100644 --- a/module/block/css/dashboard.css +++ b/module/block/css/dashboard.css @@ -1,3 +1,4 @@ .block-statistic .nav-stacked {overflow: auto; max-height: 220px;} .nav > li > .btn {padding: 0 5px; line-height: 24px; margin: 3px; color: #3C4353;} .dashboard .panel-body {max-height: 400px; overflow: auto;} +.dashboard .panel.table-scrolled .table-header-fixed {border-bottom: 1px solid #ddd; box-shadow: 0 1px 1px rgba(0,0,0,.05), 0 2px 4px 0 rgba(0,0,0,0.025);} \ No newline at end of file diff --git a/module/block/js/dashboard.js b/module/block/js/dashboard.js index 6640349725..2cd3dfb6a0 100644 --- a/module/block/js/dashboard.js +++ b/module/block/js/dashboard.js @@ -69,10 +69,10 @@ function resizeBlock(event) */ function initTableHeader() { - $('#dashboard .panel-block').each(function() + $('#dashboard .table-fixed-head').each(function() { - var $panel = $(this); - var $table = $panel.find('.table:first'); + var $table = $(this); + var $panel = $table.closest('.panel'); if(!$table.length || !$table.children('thead').length || ($panel.find('#assigntomeBlock').length && $panel.find('#assigntomeBlock > div').length > 1)) return; var isFixed = $panel.find('.panel-body').height() < $table.outerHeight(); @@ -87,7 +87,7 @@ function initTableHeader() var tableWidth = $table.width(); if(!$header.length) { - $header = $('
').css('right', $panel.width() - tableWidth).css('min-width', tableWidth); + $header = $('
').css('right', $panel.width() - tableWidth - 20).css('min-width', tableWidth); var $oldTableHead = $table.find('thead'); $oldTableHead.find('th').each(function(idx) { @@ -123,6 +123,16 @@ function initTableHeader() $fixedTh.eq(idx).width($(this).width()); }); } + + var timeoutCall = null; + $table.parent().off('scroll.initTableHeader').on('scroll.initTableHeader', function() + { + clearTimeout(timeoutCall); + var $tableContainer = $(this); + timeoutCall = setTimeout(function() { + $panel.toggleClass('table-scrolled', $tableContainer.scrollTop() > 0); + }, 200); + }); }); } @@ -182,5 +192,7 @@ $(function() // // $dashboard.find('ul.dashboard-actions').addClass('hide').children('li').addClass('right').appendTo($('#modulemenu > .nav')); // $dashboard.find('[data-toggle=tooltip]').tooltip({container: 'body'}); -// initTableHeader(); + initTableHeader(); }); + + diff --git a/module/block/view/bugblock.html.php b/module/block/view/bugblock.html.php index 0c4dd41dff..dac3ec7a15 100644 --- a/module/block/view/bugblock.html.php +++ b/module/block/view/bugblock.html.php @@ -12,7 +12,7 @@ ?>
- '> +
'> @@ -44,7 +44,9 @@ - +
idAB?> bug->priList, $bug->pri)?> + + title?> diff --git a/module/block/view/buildblock.html.php b/module/block/view/buildblock.html.php index fcef57fe14..6c8dadb479 100644 --- a/module/block/view/buildblock.html.php +++ b/module/block/view/buildblock.html.php @@ -11,7 +11,7 @@ */ ?>
- +
diff --git a/module/block/view/caseblock.html.php b/module/block/view/caseblock.html.php index df7f4b929f..102eb93d9d 100644 --- a/module/block/view/caseblock.html.php +++ b/module/block/view/caseblock.html.php @@ -21,7 +21,7 @@ .case-status-investigate {color: #a6aab8;} .case-status-investigate > .label-dot {background-color: #006af1;} -
idAB?>
'> +
'> diff --git a/module/block/view/planblock.html.php b/module/block/view/planblock.html.php index 7902f9833b..fe4555749c 100644 --- a/module/block/view/planblock.html.php +++ b/module/block/view/planblock.html.php @@ -11,7 +11,7 @@ */ ?>
-
+
diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index 592898198d..5386772740 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -11,13 +11,22 @@ */ ?>
- $bool):?> -
- + +
+ $bool):?> +
+ +
+
-
\ No newline at end of file diff --git a/module/block/view/productblock.html.php b/module/block/view/productblock.html.php index 92ac619a35..ab88be85f1 100644 --- a/module/block/view/productblock.html.php +++ b/module/block/view/productblock.html.php @@ -18,7 +18,7 @@ .block-products.block-sm .c-project {display: none;}
-
+
diff --git a/module/block/view/projectblock.html.php b/module/block/view/projectblock.html.php index 1d8d3617d0..36b521a553 100644 --- a/module/block/view/projectblock.html.php +++ b/module/block/view/projectblock.html.php @@ -11,7 +11,7 @@ */ ?>
-
product->name;?>
+
diff --git a/module/block/view/releaseblock.html.php b/module/block/view/releaseblock.html.php index 06e1c1a02c..14bc3a6131 100644 --- a/module/block/view/releaseblock.html.php +++ b/module/block/view/releaseblock.html.php @@ -11,7 +11,7 @@ */ ?>
-
project->name;?>
+
diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index 0a009dddf5..e052ee3cf8 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -22,7 +22,7 @@ .block-stories.block-sm .c-status {text-align: center;}
-
'> +
'> diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index c531b65391..17c781abe3 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -13,7 +13,7 @@
-
'> +
'> diff --git a/module/block/view/testtaskblock.html.php b/module/block/view/testtaskblock.html.php index 6d2a42c749..f0130c1016 100644 --- a/module/block/view/testtaskblock.html.php +++ b/module/block/view/testtaskblock.html.php @@ -11,7 +11,7 @@ */ ?>
-
idAB;?>
+
diff --git a/module/block/view/todoblock.html.php b/module/block/view/todoblock.html.php index 3c7dcd3602..8aca1ecd82 100644 --- a/module/block/view/todoblock.html.php +++ b/module/block/view/todoblock.html.php @@ -11,13 +11,13 @@ */ ?>