Merge branch 'master' of https://github.com/easysoft/zentaopms

module/common/view/header.html.php

@@ -18,10 +18,8 @@ if($extHookFiles) foreach($extHookFiles as $extHookFile) include $extHookFile;
   <div id='mainHeader'>
     <div class='container'>
       <hrgroup id='heading'>
-        <?php if(empty($config->sso->redirect)):?>
         <?php $heading = sprintf($lang->welcome, $app->company->name);?>
         <h1 id='companyname' title='<?php echo $heading;?>'<?php if(strlen($heading) > 36) echo " class='long-name'" ?>><?php echo html::a(helper::createLink('index'), $heading);?></h1>
-        <?php endif;?>
       </hrgroup>
       <nav id='navbar'><?php commonModel::printMainmenu($this->moduleName);?></nav>
       <div id='toolbar'>

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});
     });
 });

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]);

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});
     });
 });

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]);

module/project/view/all.html.php

@@ -69,25 +69,21 @@
             <?php endif;?>
             <?php printf('%03d', $project->id);?>
           </td>
-          <td class='text-left' title='<?php echo $project->name?>'><?php echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);?></td>
+          <td class='text-left' title='<?php echo $project->name?>'>
+            <?php
+            if(isset($project->delay)) echo "<span class='label label-danger label-badge'>{$lang->project->delayed}</span> ";
+            echo html::a($this->createLink('project', 'view', 'project=' . $project->id), $project->name);
+            ?>
+          </td>
           <td class='text-left'><?php echo $project->code;?></td>
           <td><?php echo $users[$project->PM];?></td>
           <td><?php echo $project->end;?></td>
-          <?php if(isset($project->delay)):?>
-          <td class='c-status' title='<?php echo $lang->project->delayed;?>'>
-            <span class="status-delayed">
-              <span class="label label-dot"></span>
-              <span class='status-text'><?php echo $lang->project->delayed;?></span>
-            </span>
-          </td>
-          <?php else:?>
           <td class='c-status' title='<?php echo zget($lang->project->statusList, $project->status);?>'>
             <span class="status-<?php echo $project->status?>">
               <span class="label label-dot"></span>
               <span class='status-text'><?php echo zget($lang->project->statusList, $project->status);?></span>
             </span>
           </td>
-          <?php endif;?>
           <td><?php echo $project->hours->totalEstimate;?></td>
           <td><?php echo $project->hours->totalConsumed;?></td>
           <td><?php echo $project->hours->totalLeft;?></td>

www/js/bindranzhi.js

@@ -20,8 +20,3 @@ function setOuterBox()
     $(window).resize(resetOuterHeight);
     resetOuterHeight();
 }
-
-$(function()
-{
-    $('#searchbox').css('right', $('#topnav').width() - 20);
-})

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;}