* Add holiday and fix project and product menu.

module/program/control.php

@@ -9,7 +9,7 @@ class program extends control
         $this->programs = $this->program->getPairs();
     }
 
-    public function index($status = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
+    public function browse($status = 'doing', $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 10, $pageID = 1)
     {
         if(common::hasPriv('program', 'createGuide')) $this->lang->pageActions = html::a($this->createLink('program', 'createGuide'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-primary' data-toggle=modal");
 
@@ -36,8 +36,8 @@ class program extends control
         $this->view->orderBy     = $orderBy;
         $this->view->pager       = $pager;
         $this->view->users       = $this->loadModel('user')->getPairs('noletter');
-        $this->view->title       = $this->lang->program->index;
-        $this->view->position[]  = $this->lang->program->index;
+        $this->view->title       = $this->lang->program->browse;
+        $this->view->position[]  = $this->lang->program->browse;
         $this->view->programType = $programType;
         $this->display();
     }
@@ -57,7 +57,7 @@ class program extends control
                 $this->send(array('result' => 'fail', 'message' => $this->processErrors(dao::getError())));
             }
             $this->loadModel('action')->create('project', $projectID, 'opened');
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('index', array('status' => 'wait', 'orderBy' => 'order_desc'))));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse', array('status' => 'wait', 'orderBy' => 'order_desc'))));
         }
 
         $name         = '';
@@ -329,7 +329,7 @@ class program extends control
                 $actionID = $this->loadModel('action')->create('project', $projectID, 'edited');
                 $this->action->logHistory($actionID, $changes);
             }
-            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('index')));
+            $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('browse')));
         }
 
         $this->view->pmUsers     = $this->loadModel('user')->getPairs('noclosed|nodeleted|pmfirst',  $project->PM);
@@ -346,7 +346,7 @@ class program extends control
         if(!empty($_POST))
         {    
             $this->project->manageMembers($projectID);
-            die(js::locate($this->createLink('program', 'index'), 'parent'));
+            die(js::locate($this->createLink('program', 'browse'), 'parent'));
         }    
 
         /* Load model. */        
@@ -419,7 +419,7 @@ class program extends control
         else
         {
             $this->project->delete(TABLE_PROJECT, $projectID);
-            die(js::locate(inlink('index'), 'parent'));
+            die(js::locate(inlink('browse'), 'parent'));
         }
     }
 

module/program/lang/zh-cn.php

@@ -1,5 +1,6 @@
 <?php
 $lang->program->index           = '项目主页';
+$lang->program->browse          = '项目列表';
 $lang->program->common          = '项目';
 $lang->program->stage           = '阶段';
 $lang->program->name            = '项目名称';

module/program/model.php

@@ -50,10 +50,10 @@ class programModel extends model
     {
         echo(js::alert($this->lang->program->accessDenied));
 
-        if(!$this->server->http_referer) die(js::locate(helper::createLink('program', 'index')));
+        if(!$this->server->http_referer) die(js::locate(helper::createLink('program', 'browse')));
 
         $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('program', 'index')));
+        if(strpos($this->server->http_referer, $loginLink) !== false) die(js::locate(helper::createLink('program', 'browse')));
 
         die(js::locate('back'));
     }
@@ -160,7 +160,7 @@ class programModel extends model
             $currentProgram     = $this->project->getById($programID);
             $currentProgramName = $currentProgram->name;
         }    
-        if($currentModule == 'program' && $currentMethod == 'index') $currentProgramName = $this->lang->program->all;
+        if($currentModule == 'program' && $currentMethod == 'browse') $currentProgramName = $this->lang->program->all;
 
         $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod&extra=$extra");
         $output  = "<div class='btn-group' id='swapper'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem' title='{$currentProgramName}'>{$currentProgramName} <i class='icon icon-swap'></i></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";

module/program/view/ajaxgetdropmenu.html.php

@@ -51,7 +51,7 @@ foreach($programs as $program)
     <div class="col-footer">
       <?php echo html::a(helper::createLink('program', 'createGuide'), '<i class="icon icon-plus"></i>' . $lang->program->create, '', 'class="not-list-item text-primary" data-toggle=modal'); ?>
       <div class='pull-right'>
-        <?php echo html::a(helper::createLink('program', 'index', 'status=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
+        <?php echo html::a(helper::createLink('program', 'browse', 'status=all'), '<i class="icon icon-cards-view muted"></i> ' . $lang->project->all, '', 'class="not-list-item"'); ?>
         <span class='text-muted muted'> &nbsp; | &nbsp; </span>
         <a class='toggle-right-col not-list-item'><?php echo $lang->project->doneProjects?><i class='icon icon-angle-right'></i></a>
       </div>

module/program/view/browse.html.php

@@ -24,7 +24,7 @@
     <?php $active = $status == $key ? 'btn-active-text' : '';?>
     <?php $label = "<span class='text'>$label</span>";?>
     <?php if($status == $key) $label .= " <span class='label label-light label-badge'>{$pager->recTotal}</span>";?>
-    <?php echo html::a(inlink('index', "status=$key&orderBy=$orderBy"), $label, '', "class='btn btn-link $active'");?>
+    <?php echo html::a(inlink('browse', "status=$key&orderBy=$orderBy"), $label, '', "class='btn btn-link $active'");?>
     <?php endforeach;?>
     <?php echo html::checkbox('mine', array('1' => $lang->program->mine), '', $this->cookie->mine ? 'checked=checked' : '');?>
   </div>
@@ -40,7 +40,7 @@
 <div id='mainContent' class='main-row'>
   <?php if(empty($projectList)):?>
   <div class="table-empty-tip">
-    <p><span class="text-muted"><?php echo $lang->program->noProgram;?></span> <?php common::printLink('program', 'createguide', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info'");?></p>
+    <p><span class="text-muted"><?php echo $lang->program->noProgram;?></span> <?php common::printLink('program', 'createguide', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info' data-toggle=modal");?></p>
   </div>
   <?php else:?>
   <div class='main-col'>