diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index 848f5a7c9b..b282f082ab 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -18,10 +18,8 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
- sso->redirect)):?> welcome, $app->company->name);?>

36) echo " class='long-name'" ?>>

-
diff --git a/module/product/js/all.js b/module/product/js/all.js index f35f9625b9..71d1772bca 100644 --- a/module/product/js/all.js +++ b/module/product/js/all.js @@ -3,7 +3,7 @@ $(function() $('#productTableList').on('sort.sortable', function(e, data) { var list = ''; - for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; + for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; $.post(createLink('product', 'updateOrder'), {'products' : list, 'orderBy' : orderBy}); }); }); diff --git a/module/productplan/js/view.js b/module/productplan/js/view.js index 1be3e6820c..27a3defb47 100644 --- a/module/productplan/js/view.js +++ b/module/productplan/js/view.js @@ -42,7 +42,7 @@ $(function() $('#storyList').on('sort.sortable', function(e, data) { var list = ''; - for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; + for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; $.post(createLink('productplan', 'ajaxStorySort', 'planID=' + planID), {'storys' : list, 'orderBy' : orderBy}, function() { var $target = $(data.element[0]); diff --git a/module/project/js/all.js b/module/project/js/all.js index fb9fcb5107..057d4360c4 100644 --- a/module/project/js/all.js +++ b/module/project/js/all.js @@ -3,7 +3,7 @@ $(function() $('#projectTableList').on('sort.sortable', function(e, data) { var list = ''; - for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; + for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy}); }); }); diff --git a/module/project/js/story.js b/module/project/js/story.js index f84b695355..75bac77fec 100644 --- a/module/project/js/story.js +++ b/module/project/js/story.js @@ -3,7 +3,7 @@ $(function() $('#storyList').on('sort.sortable', function(e, data) { var list = ''; - for(i = 0; i < data.list.length; i++) list += $(data.list[i]).attr('data-id') + ','; + for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ','; $.post(createLink('project', 'storySort', 'projectID=' + projectID), {'storys' : list, 'orderBy' : orderBy}, function() { var $target = $(data.element[0]); diff --git a/module/project/view/all.html.php b/module/project/view/all.html.php index ba6bbe6115..bcd9f0200f 100644 --- a/module/project/view/all.html.php +++ b/module/project/view/all.html.php @@ -69,25 +69,21 @@ id);?> - createLink('project', 'view', 'project=' . $project->id), $project->name);?> + + delay)) echo "{$lang->project->delayed} "; + echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name); + ?> + code;?> PM];?> end;?> - delay)):?> - - - - project->delayed;?> - - - project->statusList, $project->status);?> - hours->totalEstimate;?> hours->totalConsumed;?> hours->totalLeft;?> diff --git a/www/js/bindranzhi.js b/www/js/bindranzhi.js index f939718792..e013a11ada 100644 --- a/www/js/bindranzhi.js +++ b/www/js/bindranzhi.js @@ -20,8 +20,3 @@ function setOuterBox() $(window).resize(resetOuterHeight); resetOuterHeight(); } - -$(function() -{ - $('#searchbox').css('right', $('#topnav').width() - 20); -}) diff --git a/www/theme/default/bindranzhi.css b/www/theme/default/bindranzhi.css index 2a7feae98d..3048060e89 100644 --- a/www/theme/default/bindranzhi.css +++ b/www/theme/default/bindranzhi.css @@ -1,12 +1,3 @@ body{padding-bottom:0px;} #header{padding-top:0px;} -#mainmenu{margin-top:0px;margin-left:-20px;} -#mainmenu .nav li a{height:40px; line-height:25px;} -#mainmenu .nav > li > a{margin-right:0px;} -#searchbox{top:8px;right:50px} -#topnav{position: absolute; top:6px;right: -35px} -#topnav > a {display:none;} -#topnav > .dropdown{display:none;} -#topnav > a:first-of-type {display:block;} -#topnav > #userMenu{display:block;} #footer{display:none;}