* refactor codes.

2018-05-21 11:29:00 +08:00
parent 2268f3e582
commit 258f2cad9c
8 changed files with 66 additions and 62 deletions
@@ -199,7 +199,7 @@
                <td>
                  <?php
                  echo $lang->bug->resolutionList[$bug->resolution];
-                  if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug"), $bug->duplicateBugTitle);
+                  if(isset($bug->duplicateBugTitle)) echo " #$bug->duplicateBug:" . html::a($this->createLink('bug', 'view', "bugID=$bug->duplicateBug", '', true), $bug->duplicateBugTitle, '', "class='iframe' data-width='80%'");
                  ?>
                </td>
              </tr>
@@ -230,7 +230,7 @@
                <th><?php echo $lang->bug->story;?></th>
                <td>
                  <?php
-                  if($bug->story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story"), "#$bug->story $bug->storyTitle");
+                  if($bug->story) echo html::a($this->createLink('story', 'view', "storyID=$bug->story", '', true), "#$bug->story $bug->storyTitle", '', "class='iframe' data-width='80%'");
                  if($bug->storyStatus == 'active' and $bug->latestStoryVersion > $bug->storyVersion)
                  {
                      echo "(<span class='warning'>{$lang->story->changed}</span> ";
@@ -242,7 +242,7 @@
              </tr>
              <tr>
                <th><?php echo $lang->bug->task;?></th>
-                <td><?php if($bug->task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task"), $bug->taskName);?></td>
+                <td><?php if($bug->task) echo html::a($this->createLink('task', 'view', "taskID=$bug->task", '', true), $bug->taskName, '', "class='iframe' data-width='80%'");?></td>
              </tr>
            </tbody>
          </table>
@@ -263,7 +263,7 @@
                  {
                      foreach($bug->linkBugTitles as $linkBugID => $linkBugTitle)
                      {
-                          echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID"), "#$linkBugID $linkBugTitle", '_blank') . '<br />';
+                          echo html::a($this->createLink('bug', 'view', "bugID=$linkBugID", '', true), "#$linkBugID $linkBugTitle", '', "class='iframe' data-width='80%'") . '<br />';
                      }
                  }
                  ?>
@@ -272,7 +272,7 @@
              <?php if($bug->case):?>
              <tr>
                <th class='w-60px'><?php echo $lang->bug->fromCase;?></th>
-                <td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case"), "#$bug->case $bug->caseTitle", '_blank');?></td>
+                <td><?php echo html::a($this->createLink('testcase', 'view', "caseID=$bug->case", '', true), "#$bug->case $bug->caseTitle", '', "class='iframe' data-width='80%'");?></td>
              </tr>
              <?php endif;?>
              <?php if($bug->toCases):?>
@@ -282,7 +282,7 @@
                <?php 
                foreach($bug->toCases as $caseID => $case) 
                {
-                    echo '<p style="margin-bottom:0;">' . html::a($this->createLink('testcase', 'view', "caseID=$caseID"), $case) . '</p>';
+                    echo '<p style="margin-bottom:0;">' . html::a($this->createLink('testcase', 'view', "caseID=$caseID", '', true), $case, '', "class='iframe' data-width='80%'") . '</p>';
                }
                ?>
                </td>
@@ -292,13 +292,13 @@
              <?php if($bug->toStory != 0):?>
              <tr>
                <th><?php echo $lang->bug->toStory;?></th>
-                <td><?php echo html::a($this->createLink('story', 'view', "storyID=$bug->toStory"), "#$bug->toStory $bug->toStoryTitle", '_blank');?></td>
+                <td><?php echo html::a($this->createLink('story', 'view', "storyID=$bug->toStory", '', true), "#$bug->toStory $bug->toStoryTitle", '', "class='iframe' data-width='80%'");?></td>
              </tr>
              <?php endif;?>
              <?php if($bug->toTask != 0):?>
              <tr>
                <th><?php echo $lang->bug->toTask;?></th>
-                <td><?php echo html::a($this->createLink('task', 'view', "taskID=$bug->toTask"), "#$bug->toTask $bug->toTaskTitle", '_blank');?></td>
+                <td><?php echo html::a($this->createLink('task', 'view', "taskID=$bug->toTask", '', true), "#$bug->toTask $bug->toTaskTitle", '', "class='iframe' data-width='80%'");?></td>
              </tr>
              <?php endif;?>
              <?php endif;?>
@@ -680,7 +680,7 @@ class commonModel extends model
      <div class="modal-body">
    <form action="$commentFormLink" target='hiddenwin' method='post'>
          <div class="form-group">
-            <textarea id='comment' name='comment' class="form-control" rows="8"></textarea>
+            <textarea id='comment' name='comment' class="form-control" rows="8" autofocus="autofocus"></textarea>
          </div>
          <div class="form-group form-actions">
            <button type="submit" class="btn btn-primary btn-wide">{$lang->save}</button>
@@ -70,7 +70,7 @@
        <?php if($canEditComment):?>
        <form method='post' class='comment-edit-form' action='<?php echo $this->createLink('action', 'editComment', "actionID=$action->id")?>'>
          <div class="form-group">
-          <?php echo html::textarea('lastComment', htmlspecialchars($action->comment), "rows='8'");?>
+          <?php echo html::textarea('lastComment', htmlspecialchars($action->comment), "rows='8' autofocus='autofocus'");?>
          </div>
          <div class="form-group form-actions">
          <?php echo html::submitButton($lang->save, '', 'btn btn-primary btn-wide');?>
@@ -203,7 +203,7 @@
                <th class='w-70px'><?php echo $lang->story->legendFromBug;?></th>
                <td class='pd-0'>
                  <ul class='list-unstyled'>
-                  <?php echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id"), "#$fromBug->id $fromBug->title") . '</li>';?>
+                  <?php echo "<li title='#$fromBug->id $fromBug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$fromBug->id", '', true), "#$fromBug->id $fromBug->title", '', "class='iframe' data-width='80%'") . '</li>';?>
                  </ul>
                </td>
              </tr>
@@ -215,7 +215,7 @@
                  <?php
                  foreach($bugs as $bug)
                  {
-                      echo "<li title='#$bug->id $bug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$bug->id"), "#$bug->id $bug->title") . '</li>';
+                      echo "<li title='#$bug->id $bug->title'>" . html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), "#$bug->id $bug->title", '', "class='iframe' data-width='80%'") . '</li>';
                  }
                  ?>
                  </ul>
@@ -228,7 +228,7 @@
                  <?php
                  foreach($cases as $case)
                  {
-                      echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id"), "#$case->id $case->title") . '</li>';
+                      echo "<li title='#$case->id $case->title'>" . html::a($this->createLink('testcase', 'view', "caseID=$case->id", '', true), "#$case->id $case->title", '', "class='iframe' data-width='80%'") . '</li>';
                  }
                  ?>
                  </ul>
@@ -243,7 +243,7 @@
                    $linkStories = explode(',', $story->linkStories) ;
                    foreach($linkStories as $linkStoryID)
                    {
-                        if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID"), "#$linkStoryID " . $story->extraStories[$linkStoryID]) . '</li>';
+                        if(isset($story->extraStories[$linkStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$linkStoryID", '', true), "#$linkStoryID " . $story->extraStories[$linkStoryID], '', "class='iframe' data-width='80%'") . '</li>';
                    }
                    ?>
                  </ul>
@@ -257,7 +257,7 @@
                    $childStories = explode(',', $story->childStories) ;
                    foreach($childStories as $childStoryID)
                    {
-                      if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID"), "#$childStoryID " . $story->extraStories[$childStoryID]) . '</li>';
+                      if(isset($story->extraStories[$childStoryID])) echo '<li>' . html::a(inlink('view', "storyID=$childStoryID", '', true), "#$childStoryID " . $story->extraStories[$childStoryID], '', "class='iframe' data-width='80%'") . '</li>';
                    }
                    ?>
                  </ul>
@@ -83,46 +83,50 @@
        <div class='detail-title'><?php echo $this->lang->task->children;?></div>
        <div class='detail-content article-content'>
          <table class='table table-hover table-fixed'>
-            <tr class='text-center'>
-              <td class='w-50px'> <?php echo $lang->task->id;?></th>
-              <td class='w-40px'> <?php echo $lang->task->lblPri;?></th>
-              <td>                <?php echo $lang->task->name;?></th>
-              <td class='w-100px'><?php echo $lang->task->deadline;?></th>
-              <td class='w-80px'> <?php echo $lang->task->assignedTo;?></th>
-              <td class='w-80px'> <?php echo $lang->task->status;?></th>
-              <td class='w-60px visible-lg'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
-              <td class='w-60px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
-              <td class='w-250px'><?php echo $lang->actions;?></th>
-            </tr>
-            <?php foreach($task->children as $child):?>
-            <tr class='text-center'>
-              <td><?php echo $child->id;?></td>
-              <td>
-                <?php
-                echo "<span class='pri-" . $child->pri . "'>";
-                echo $child->pri == '0' ? '' : zget($this->lang->task->priList, $child->pri, $child->pri);
-                echo "</span>";
-                ?>
-              </td>
-              <td class='text-left' title='<?php echo $child->name;?>'><a href="<?php echo $this->createLink('task', 'view', "taskID=$child->id"); ?>"><?php echo $child->name;?></a></td>
-              <td><?php echo $child->deadline;?></td>
-              <td><?php if(isset($users[$child->assignedTo])) echo $users[$child->assignedTo];?></td>
-              <td><?php echo zget($lang->task->statusList, $child->status);?></td>
-              <td class='visible-lg'><?php echo $child->consumed;?></td>
-              <td class='visible-lg'><?php echo $child->left;?></td>
-              <td class='c-actions'>
-                <?php
-                common::printIcon('task', 'assignTo', "projectID=$child->project&taskID=$child->id", $child, 'list', '', '', 'iframe', true);
-                common::printIcon('task', 'start',    "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
-                common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
-                common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true);
-                common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
-                common::printIcon('task', 'close',  "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
-                common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list');
-                ?>
-              </td>
-            </tr>
-            <?php endforeach;?>
+            <thead>
+              <tr class='text-center'>
+                <th class='w-50px'> <?php echo $lang->task->id;?></th>
+                <th class='w-40px'> <?php echo $lang->task->lblPri;?></th>
+                <th>                <?php echo $lang->task->name;?></th>
+                <th class='w-100px'><?php echo $lang->task->deadline;?></th>
+                <th class='w-80px'> <?php echo $lang->task->assignedTo;?></th>
+                <th class='w-80px'> <?php echo $lang->task->status;?></th>
+                <th class='w-60px visible-lg'><?php echo $lang->task->consumedAB . $lang->task->lblHour;?></th>
+                <th class='w-60px visible-lg'><?php echo $lang->task->leftAB . $lang->task->lblHour;?></th>
+                <th class='w-250px'><?php echo $lang->actions;?></th>
+              </tr>
+            </thead>
+            <tbody>
+              <?php foreach($task->children as $child):?>
+              <tr class='text-center'>
+                <td><?php echo $child->id;?></td>
+                <td>
+                  <?php
+                  echo "<span class='pri-" . $child->pri . "'>";
+                  echo $child->pri == '0' ? '' : zget($this->lang->task->priList, $child->pri, $child->pri);
+                  echo "</span>";
+                  ?>
+                </td>
+                <td class='text-left' title='<?php echo $child->name;?>'><a class="iframe" data-width="90%" href="<?php echo $this->createLink('task', 'view', "taskID=$child->id", '', true); ?>"><?php echo $child->name;?></a></td>
+                <td><?php echo $child->deadline;?></td>
+                <td><?php if(isset($users[$child->assignedTo])) echo $users[$child->assignedTo];?></td>
+                <td><?php echo zget($lang->task->statusList, $child->status);?></td>
+                <td class='visible-lg'><?php echo $child->consumed;?></td>
+                <td class='visible-lg'><?php echo $child->left;?></td>
+                <td class='c-actions'>
+                  <?php
+                  common::printIcon('task', 'assignTo', "projectID=$child->project&taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                  common::printIcon('task', 'start',    "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                  common::printIcon('task', 'activate', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                  common::printIcon('task', 'recordEstimate', "taskID=$child->id", $child, 'list', 'time', '', 'iframe', true);
+                  common::printIcon('task', 'finish', "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                  common::printIcon('task', 'close',  "taskID=$child->id", $child, 'list', '', '', 'iframe', true);
+                  common::printIcon('task', 'edit',   "taskID=$child->id", $child, 'list');
+                  ?>
+                </td>
+              </tr>
+              <?php endforeach;?>
+            </tbody>
          </table>
        </div> 
      </div>
@@ -194,7 +198,7 @@
              <?php if($task->fromBug):?>
              <tr>
                <th><?php echo $lang->task->fromBug;?></th>
-                <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$task->fromBug"), "#$task->fromBug " . $fromBug->title, '_blank');?></td>
+                <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$task->fromBug", '', true), "#$task->fromBug " . $fromBug->title, '', "class='iframe' data-width='80%'");?></td>
              </tr>
              <?php endif;?>
              <tr>
@@ -134,7 +134,7 @@
              <th><?php echo $lang->testcase->story;?></th>
              <td>
                <?php
-                if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story"), "#$case->story:$case->storyTitle");
+                if(isset($case->storyTitle)) echo html::a($this->createLink('story', 'view', "storyID=$case->story", '', true), "#$case->story:$case->storyTitle", '', "class='iframe' data-width='80%'");
                if($case->story and $case->storyStatus == 'active' and $case->latestStoryVersion > $case->storyVersion)
                {
                    echo "(<span class='warning'>{$lang->story->changed}</span> ";
@@ -207,7 +207,7 @@
                {
                    foreach($case->linkCaseTitles as $linkCaseID => $linkCaseTitle)
                    {
-                        echo html::a($this->createLink('testcase', 'view', "caseID=$linkCaseID"), "#$linkCaseID $linkCaseTitle", '_blank') . '<br />';
+                        echo html::a($this->createLink('testcase', 'view', "caseID=$linkCaseID", '', true), "#$linkCaseID $linkCaseTitle", '', "class='iframe' data-width='80%'") . '<br />';
                    }
                }
                ?>
@@ -227,7 +227,7 @@
            <?php if($case->fromBug):?>
            <tr>
              <th class='w-60px'><?php echo $lang->testcase->fromBug;?></th>
-              <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$case->fromBug"), $case->fromBugTitle);?></td>
+              <td><?php echo html::a($this->createLink('bug', 'view', "bugID=$case->fromBug", '', true), $case->fromBugTitle, '', "class='iframe' data-width='80%'");?></td>
            </tr>
            <?php endif;?>
            <?php if($case->toBugs):?>
@@ -237,7 +237,7 @@
              <?php 
              foreach($case->toBugs as $bugID => $bugTitle) 
              {
-                  echo '<p style="margin-bottom:0;">' . html::a($this->createLink('bug', 'view', "bugID=$bugID"), $bugTitle) . '</p>';
+                  echo '<p style="margin-bottom:0;">' . html::a($this->createLink('bug', 'view', "bugID=$bugID", '', true), $bugTitle, '', "class='iframe' data-width='80%'") . '</p>';
              }
              ?>
              </td>