Merge branch 'master' of https://git.zcorp.cc/zentaopms

module/common/model.php

@@ -614,7 +614,7 @@ class commonModel extends model
      * @access public
      * @return void
      */
-    public static function printRecentMemu()
+    public static function printRecentMenu()
     {
         global $lang;
         echo "<li class='divider'></li>";

module/doc/view/side.html.php

@@ -32,8 +32,15 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
             <?php if(empty($sideLibs[$tabValue])):?>
             <li>
             <?php
-            $text = zget($lang->doclib->create, $tabValue, '');
-            if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'");
+            if($lang->navGroup->doc == 'doc' and $tabValue == 'project')
+            {
+                echo $lang->noData;
+            }
+            else
+            {
+                $text = zget($lang->doclib->create, $tabValue, '');
+                if($text and common::hasPriv($tabValue, 'create')) echo html::a($this->createLink($tabValue, 'create', ''), $text, '', "class='text-ellipsis'");
+            }
             ?>
             </li>
             <?php else:?>

module/index/view/index.html.php

@@ -27,7 +27,7 @@ js::set('defaultOpen', $open);
     <ul class='nav nav-default' id='menuMainNav'>
     </ul>
     <ul class='nav nav-default'>
-      <?php commonModel::printRecentMemu();?>
+      <?php commonModel::printRecentMenu();?>
     </ul>
   </nav>
   <div class="table-col col-right">

module/program/model.php

@@ -1745,6 +1745,11 @@ class programModel extends model
                 }
                 $title = "title='{$PRJProgram}'";
             }
+            if($id == 'PRJBudget')
+            {
+                $budget = $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
+                $title  = "title='$budget'";
+            }
 
             if($id == 'PRJEstimate') $title = "title='{$project->hours->totalEstimate} {$this->lang->project->workHour}'";
             if($id == 'PRJConsume')  $title = "title='{$project->hours->totalConsumed} {$this->lang->project->workHour}'";
@@ -1781,7 +1786,7 @@ class programModel extends model
                     echo "<span class='status-task status-{$project->status}'> " . zget($this->lang->program->statusList, $project->status) . "</span>";
                     break;
                 case 'PRJBudget':
-                    echo $project->budget != 0 ? zget($this->lang->program->currencySymbol, $project->budgetUnit) . number_format($project->budget, 2) : $this->lang->program->future;
+                    echo $budget;
                     break;
                 case 'teamCount':
                     echo $project->teamCount;

module/subject/view/browse.html.php

@@ -78,9 +78,8 @@
             </tr>
             <tr>
               <td></td>
-              <td colspan="2" class="form-actions">
+              <td colspan="2" class="form-actions text-center">
                 <?php echo html::submitButton();?>
-                <?php echo html::backButton();?>
                 <?php echo html::hidden('parentModuleID', $currentModuleID);?>
                 <?php echo html::hidden('maxOrder', $maxOrder);?>
               </td>