* adjust code.

2010-11-30 10:27:43 +00:00
parent 3cbd630685
commit 6d644d2d05
6 changed files with 43 additions and 48 deletions
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -448,15 +448,22 @@ class project extends control
     * @access public
     * @return void
     */
-    public function create()
+    public function create($projectID = '')
    {
+        if($projectID)
+        {
+            $this->view->tips = $this->fetch('project', 'tips', "projectID=$projectID");
+            $this->display();
+            exit;
+        }
+
        if(!empty($_POST))
        {
            $projectID = $this->project->create();
            $this->project->updateProducts($projectID);
            if(dao::isError()) die(js::error(dao::getError()));
            $this->loadModel('action')->create('project', $projectID, 'opened');
-            die(js::locate($this->createLink('project', 'tips', "projectID=$projectID"), 'parent'));
+            die(js::locate($this->createLink('project', 'create', "projectID=$projectID"), 'parent'));
        }

        $this->project->setMenu($this->projects, '');
@@ -818,10 +825,8 @@ class project extends control
    public function tips($projectID)
    {
        $url = $this->createLink('project', 'task', "projectID=$projectID");       
-        $header['title']       = $this->lang->project->tips;
-        $this->view->header    = $header;
        $this->view->projectID = $projectID;        
-        $this->display();
-        die("<html><head><meta http-equiv='refresh' content='3; url=$url' /></head><body></body></html>");
+        $this->display('project', 'tips');
+        die("<html><head><meta http-equiv='refresh' content='5; url=$url' /></head><body></body></html>");
    }
 }
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -116,6 +116,12 @@ $lang->project->confirmUnlinkMember   = 'Are you sure to remove this user from t
 $lang->project->confirmUnlinkStory    = 'Are you sure to remove the story from this project?';
 $lang->project->errorNoLinkedProducts = 'There is no linked products, go to the link page.';
 $lang->project->accessDenied          = 'Access to this project denied.';
+$lang->project->tips                  = 'Tips';
+$lang->project->afterInfo             = 'Successful and you can do:';
+$lang->project->setTeam               = 'Set team';
+$lang->project->linkStory             = 'Link story';
+$lang->project->createTask            = 'Create task';
+$lang->project->goback                = 'Go back（Automatically after 5 seconds）';

 /* Report. */
 $lang->project->charts->burn->graph->caption      = "Burndown chart";
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -121,7 +121,7 @@ $lang->project->afterInfo             = '项目添加成功，您现在可以进
 $lang->project->setTeam               = '设置团队';
 $lang->project->linkStory             = '关联需求';
 $lang->project->createTask            = '添加任务';
-$lang->project->goback                = '返回项目首页(3秒后将自动跳转)';
+$lang->project->goback                = '返回项目首页（5秒后将自动跳转）';

 /* 统计。*/
 $lang->project->charts->burn->graph->caption      = "燃尽图";
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -10,6 +10,21 @@
 * @link        http://www.zentao.net
 */
 ?>
+<?php if(isset($tips)):?>
+<?php include '../../common/view/header.lite.html.php';?>
+<?php include '../../common/view/colorbox.html.php';?>
+<body style='background:white'>
+<script language='Javascript'>
+var tips = <?php echo json_encode($tips);?>;
+$(document).ready(function() 
+{
+    $.fn.colorbox({html:tips, open:true, width:480, height:280});
+});
+</script>
+</body>
+</html>
+<?php exit;?>
+<?php endif;?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
--- a/module/project/view/tips.html.php
+++ b/module/project/view/tips.html.php
@@ -1,44 +1,13 @@
-<?php
-/**
- * The html template file of tips method of project module of ZenTaoMS.
- *
- * ZenTaoMS is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * ZenTaoMS is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with ZenTaoMS.  If not, see <http://www.gnu.org/licenses/>.
- *
- * @copyright   Copyright 2009-2010 青岛易软天创网络科技有限公司(www.cnezsoft.com)
- * @author      Jia Fu <fujia@cnezsoft.com>
- * @package     ZenTaoMS
- * @version     $Id: tips.html.php 867 2010-06-17 09:32:58Z jajacn$
- */
-include '../../common/view/header.lite.html.php';
-?>
-<style >body{background:white}</style>
-<div class='yui-d0' style='margin-top:100px'>
+<div class='yui-d0' style='margin-top:30px'>
  <table align='center' class='table-3'> 
    <caption><?php echo $lang->project->tips;?></caption>
    <tr>
-      <td>
-        <?php
-        echo $lang->project->afterInfo;
-        echo "<br />";
-        echo html::a($this->createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam);
-        echo html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory);
-        echo html::a($this->createLink('task', 'create', "project=$projectID"), $lang->project->createTask);
-        echo html::a($this->createLink('project', 'task', "projectID=$projectID"), $lang->project->goback);
-        ?>
+      <td><?php echo $lang->project->afterInfo;?>
+      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'team', "projectID=$projectID"), $lang->project->setTeam);?></div>
+      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'linkstory', "projectID=$projectID"), $lang->project->linkStory);?></div>
+      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('task', 'create', "project=$projectID"), $lang->project->createTask);?></div>
+      <div class='f-14px pt-10px'><?php echo $lang->arrow. html::a($this->createLink('project', 'task', "projectID=$projectID"), $lang->project->goback);?></div>
      </td>
    </tr>  
  </table>
-</div>  
-</body>
-</html>
+</div>
--- a/module/search/view/select.html.php
+++ b/module/search/view/select.html.php
@@ -40,8 +40,8 @@ function setSelected(result)
 foreach($fieldParams as $fieldName => $param)
 {
    echo "<span id='box$fieldName'>";
-    if($param['control'] == 'select') echo html::select($fieldName, $param['values'], '', 'class=select-2');
-    if($param['control'] == 'input') echo html::input($fieldName, '', 'class=text-2');
+    if($param['control'] == 'select') echo html::select($fieldName, $param['values'], '', 'class=select-4');
+    if($param['control'] == 'input') echo html::input($fieldName, '', 'class=text-4');
    echo '</span>';
 }
 ?>
@@ -65,7 +65,7 @@ foreach($fieldParams as $fieldName => $param)

  /* 打印值。*/
  echo "<span id='valueBox$fieldNO'>";
-  if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], 'class=select-2');
+  if($param['control'] == 'select') echo html::select("value$fieldNO", $param['values'], $formSession["value$fieldNO"], 'class=select-4');
  if($param['control'] == 'input') echo html::input("value$fieldNO",  $formSession["value$fieldNO"], 'class=text-4');
  echo '</span>';
  ?>