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

module/bug/model.php

@@ -94,7 +94,7 @@ class bugModel extends model
             $bug->project     = $data->projects[$i] ? $data->projects[$i] : 0;
             $bug->openedBuild = implode(',', $data->openedBuilds[$i]);
             $bug->title       = $data->titles[$i];
-            $bug->steps       = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($data->stepses[$i]));
+            $bug->steps       = nl2br(htmlspecialchars($data->stepses[$i]));
             $bug->type        = $data->types[$i];
             $bug->severity    = $data->severities[$i];
             $bug->os          = $data->oses[$i];

module/mail/view/test.html.php

@@ -12,7 +12,7 @@
 if(isset($error))
 {
     include '../../common/view/header.lite.html.php';
-    die("<br />" . str_replace('\n', "<br />", join('', $error)));
+    die("<br />" . nl2br(join('', $error)));
 }
 ?>
 

module/project/css/managemembers.css

@@ -0,0 +1 @@
+.active-result, .chzn-single{text-align:left;}

module/story/model.php

@@ -244,7 +244,7 @@ class storyModel extends model
                 $specData[$i]->story   = $storyID;
                 $specData[$i]->version = 1;
                 $specData[$i]->title   = htmlspecialchars($stories->title[$i]);
-                if($stories->spec[$i] != '') $specData[$i]->spec = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($stories->spec[$i]));
+                if($stories->spec[$i] != '') $specData[$i]->spec = nl2br(htmlspecialchars($stories->spec[$i]));
                 $this->dao->insert(TABLE_STORYSPEC)->data($specData[$i])->exec();
 
                 $this->loadModel('action');

module/task/css/batchcreate.css

@@ -1,3 +1,4 @@
 textarea {height:16px}
-.icon-green-same:before {content: "\f105";}
+#icon-same {margin:4px 0;}
+.icon-green-same:before {content: "\f0c5"; font-size:small; color:grey;}
 .sameAsStory{float:right;}

module/task/model.php

@@ -112,7 +112,7 @@ class taskModel extends model
             $data[$i]->module       = $tasks->module[$i]     == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->module     : 0) : $tasks->module[$i];
             $data[$i]->assignedTo   = $tasks->assignedTo[$i] == 'ditto' ? (isset($data[$i-1]) ? $data[$i-1]->assignedTo : 0) : $tasks->assignedTo[$i];
             $data[$i]->name         = htmlspecialchars($tasks->name[$i]);
-            $data[$i]->desc         = str_replace(array("\r\n", "\n"), '<br />', htmlspecialchars($tasks->desc[$i]));
+            $data[$i]->desc         = nl2br(htmlspecialchars($tasks->desc[$i]));
             $data[$i]->pri          = $tasks->pri[$i];
             $data[$i]->estimate     = $tasks->estimate[$i];
             $data[$i]->left         = $tasks->estimate[$i];

module/task/view/batchcreate.html.php

@@ -18,10 +18,10 @@
     <caption><?php echo $lang->task->project . $lang->colon . $lang->task->batchCreate;?></caption>
     <tr>
       <th class='w-20px'><?php echo $lang->idAB;?></th> 
+      <th class='w-200px'><?php echo $lang->task->module?></th>
       <th><?php echo $lang->task->story;?></th>
       <th class='red'><?php echo $lang->task->name;?></th>
       <th class='w-60px red'><?php echo $lang->typeAB;?></th>
-      <th class='w-80px'><?php echo $lang->task->module?></th>
       <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
       <th class='w-50px'><?php echo $lang->task->estimateAB;?></th>
       <th class='w-200px'><?php echo $lang->task->desc;?></th>
@@ -51,15 +51,15 @@
     <?php $pri = 3;?>
     <tr class='a-center'>
       <td><?php echo $i + 1;?></td>
+      <td><?php echo html::select("module[$i]", $modules, $module, "class='select-1' onchange='setStories(this.value, $project->id, $i)'")?></td>
       <td class='a-left' style='overflow:visible'>
         <?php 
         echo html::select("story[$i]", $stories, $currentStory, "class='select-1' onchange='setStoryRelated($i)'");
-        echo html::a("javascript:copyStoryTitle($i)", "<i class='icon-green-same'></i>", '', "class='sameAsStory' title='{$lang->task->copyStoryTitle}'");
+        echo html::a("javascript:copyStoryTitle($i)", "<i class='icon-green-same' id='icon-same'></i>", '', "class='sameAsStory' title='{$lang->task->copyStoryTitle}'");
         ?>
       </td>
       <td><?php echo html::input("name[$i]", '', 'class=text-1');?></td>
       <td><?php echo html::select("type[$i]", $lang->task->typeList, $type, 'class=select-1');?></td>
-      <td><?php echo html::select("module[$i]", $modules, $module, "class='select-1' onchange='setStories(this.value, $project->id, $i)'")?></td>
       <td><?php echo html::select("assignedTo[$i]", $members, $member, 'class=select-1');?></td>
       <td><?php echo html::input("estimate[$i]", '', 'class=text-1');?></td>
       <td><?php echo html::textarea("desc[$i]", '', "rows='1' class=text-1");?></td>

module/upgrade/model.php

@@ -771,7 +771,7 @@ class upgradeModel extends model
         foreach($projects as $id => $project)
         {
             $this->dao->update(TABLE_PROJECT)
-                ->set('`desc`')->eq($project->goal . '<br />' . $project->desc)
+                ->set('`desc`')->eq($project->desc . '<br />' . $project->goal)
                 ->where('id')->eq($id)
                 ->exec();
         }