* ajusted views of module 'project'.

is00hcw · Mar 25, 2014 · 1ff011f · 1ff011f
1 parent 4fb25db
commit 1ff011f
Show file tree

Hide file tree

Showing 19 changed files with 412 additions and 334 deletions.
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
@@ -16,7 +16,7 @@
     <span class='prefix'><?php echo html::icon($lang->icons['product']) . ' #' . $product->id;?></span>
     <strong><?php echo $product->name;?></strong>
     <?php if($product->deleted):?>
-    <small class='label label-danger'><?php echo $lang->product->deleted;?></small>
+    <span class='label label-danger'><?php echo $lang->product->deleted;?></span>
     <?php endif; ?>
   </div>
   <div class='actions'>

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
@@ -19,7 +19,7 @@
   <span class='prefix'><?php echo html::icon($lang->icons['plan']) . ' #' . $plan->id;?></span>
     <strong><?php echo $plan->title;?></strong>
     <?php if($plan->deleted):?>
-    <small class='label label-danger'><?php echo $lang->plan->deleted;?></small>
+    <span class='label label-danger'><?php echo $lang->plan->deleted;?></span>
     <?php endif; ?>
   </div>
   <div class='actions'>

diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
@@ -16,7 +16,7 @@
     <span class='prefix'><?php echo html::icon($lang->icons['project']) . ' #' . $project->id;?></span>
     <strong><?php echo $project->name;?></strong>
     <?php if($project->deleted):?>
-    <small class='label label-danger'><?php echo $lang->project->deleted;?></small>
+    <span class='label label-danger'><?php echo $lang->project->deleted;?></span>
     <?php endif; ?>
   </div>
   <div class='actions'>

diff --git a/module/release/view/view.html.php b/module/release/view/view.html.php
@@ -16,7 +16,7 @@
     <span class='prefix'><?php echo html::icon($lang->icons['release']) . ' #' . $release->id;?></span>
     <strong><?php echo $release->name;?></strong>
     <?php if($release->deleted):?>
-    <small class='label label-danger'><?php echo $lang->release->deleted;?></small>
+    <span class='label label-danger'><?php echo $lang->release->deleted;?></span>
     <?php endif; ?>
   </div>
   <div class='actions'>

diff --git a/module/task/css/create.css b/module/task/css/create.css
@@ -1,4 +1 @@
-.button-c {padding:2px}
-#mailto {width:90.5%}
-#preview{line-height: 24px;position: relative;top: -10px;+top:0;}
-caption .f-right a{color:red}
+#preview, #copyButton{line-height: 30px; position: relative; left: 10px}
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
@@ -1,3 +0,0 @@
-select.select-1,#module,#mailto {width:220px}
-.text-1 {width:213px}
-#estStarted,#realStarted,#deadline {width:190px}

diff --git a/module/task/js/create.js b/module/task/js/create.js
@@ -41,8 +41,6 @@ function setPreview()
         $('#copyButton').removeClass('hidden');
     }
 
-    $("#preview").colorbox({width:960, height:550, iframe:true, transition:'none', scrolling:true});
-
     setAfter();
 }
 
@@ -99,7 +97,8 @@ function setStories(moduleID, projectID)
 
 $(document).ready(function()
 {
+    var options = {no_results_text: noResultsMatch, allow_single_deselect: true, disable_search_threshold: 10, width: '100%', placeholder_text_single: selectAnOption, placeholder_text_multiple: selectSoomeOptions};
     setPreview();
-    $("#story").chosen({no_results_text: noResultsMatch});
-    $("#mailto").chosen({no_results_text: noResultsMatch});
+    $("#story").chosen(options);
+    $("#mailto").chosen(options);
 });
diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php
@@ -16,6 +16,7 @@
 $lang->task->import             = "导入之前未完任务";
 $lang->task->edit               = "编辑";
 $lang->task->delete             = "删除";
+$lang->task->deleted            = "已删除";
 $lang->task->view               = "查看任务";
 $lang->task->logEfforts         = "记录工时";
 $lang->task->record             = "工时";

diff --git a/module/task/view/assignto.html.php b/module/task/view/assignto.html.php
@@ -12,25 +12,33 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin'>
-  <table class='table-1'>
-    <caption><?php echo $task->name;?></caption>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;;?></span>
+    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
+    <small class='text-muted'> <?php echo $lang->task->assign;?> <?php echo html::icon($lang->icons['assign']);?></small>
+  </div>
+</div>
+<form class='form-condensed' method='post' target='hiddenwin'>
+  <table class='table table-form'>
     <tr>
-      <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo', $users, '', "class='text-3 chosen'");?></td>
+      <th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
+      <td class='w-p45'><?php echo html::select('assignedTo', $users, '', "class='form-control chosen'");?></td><td></td>
     </tr>  
     <tr>
-      <th class='rowhead'><?php echo $lang->task->left;?></th>
-      <td><?php echo html::input('left', $task->left, "class='text-3'") . $lang->task->hour;?></td>
+      <th><?php echo $lang->task->left;?></th>
+      <td><div class='input-group'><?php echo html::input('left', $task->left, "class='form-control'");?> <span class='input-group-addon'><?php echo $lang->task->hour;?></span></div></td><td></td>
     </tr>  
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td colspan='2'><?php echo html::textarea('comment', '', "rows='6' class='form-control w-p98'");?></td>
     </tr>
     <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
+      <td colspan='3' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/cancel.html.php b/module/task/view/cancel.html.php
@@ -12,15 +12,24 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin'>
-  <table class='table-1'>
-    <caption><?php echo $task->name;?></caption>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;;?></span>
+    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
+    <small class='text-muted'> <?php echo $lang->task->cancel;?> <?php echo html::icon($lang->icons['cancel']);?></small>
+  </div>
+</div>
+
+<form class='form-condensed' method='post' target='hiddenwin'>
+  <table class='table table-form'>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr><td colspan='2' class='text-center'><?php echo html::submitButton();?></td></tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/close.html.php b/module/task/view/close.html.php
@@ -12,17 +12,26 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<form method='post' target='hiddenwin'>
-  <table class='table-1'>
-    <caption><?php echo $task->name;?></caption>
+<div id='titlebar'>
+  <div class='heading'>
+    <span class='prefix'><?php echo html::icon($lang->icons['task']) . ' #' . $task->id;;?></span>
+    <strong><?php echo html::a($this->createLink('task', 'view', 'task=' . $task->id), $task->name, '_blank');?></strong>
+    <small class='text-danger'> <?php echo $lang->task->close;?> <?php echo html::icon($lang->icons['close']);?></small>
+  </div>
+</div>
+
+<form class='form-condensed' method='post' target='hiddenwin'>
+  <table class='table table-form'>
     <tr>
-      <td class='rowhead'><?php echo $lang->comment;?></td>
-      <td><?php echo html::textarea('comment', '', "rows='6' class='w-p98'");?></td>
+      <th><?php echo $lang->comment;?></th>
+      <td><?php echo html::textarea('comment', '', "rows='6' class='form-control'");?></td>
     </tr>
     <tr>
       <td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
     </tr>
   </table>
-  <?php include '../../common/view/action.html.php';?>
 </form>
+<div class='main'>
+  <?php include '../../common/view/action.html.php';?>
+</div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/task/view/create.html.php b/module/task/view/create.html.php
@@ -15,81 +15,92 @@
 <?php include '../../common/view/datepicker.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('holders', $lang->task->placeholder);?>
-<form method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
-  <table align='center' class='table-1 a-left'> 
-    <caption><?php echo $lang->task->create;?></caption>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->project;?></th>
-      <td><?php echo $project->name;?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->module;?></th>
-      <td><span id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='select-3' onchange='setStories(this.value,$project->id)'");?></span></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->assignedTo;?></th>
-      <td><?php echo html::select('assignedTo[]', $members, $task->assignedTo, "class='select-3 chosen'");?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->type;?></th>
-      <td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=select-3 onchange="setOwners(this.value)"');?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->story;?></th>
-      <td>
-        <?php echo html::select('story', $stories, $task->story, 'class=select-1 onchange=setPreview();');?>
-        <a href='' id='preview' class='iframe'><?php echo $lang->preview;?></a>
-      </td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->name;?></th>
-      <td>
-      <?php
-      echo html::input('name', $task->name, "class='text-1'");
-      echo html::commonButton($lang->task->copyStoryTitle, 'onclick=copyStoryTitle() id="copyButton"');?>
-      </td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->desc;?></th>
-      <td><?php echo html::textarea('desc', $task->desc, "rows='7' class='area-1'");?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->pri;?></th>
-      <td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=select-3');?> 
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->estimate;?></th>
-      <td><?php echo html::input('estimate', $task->estimate, "class='text-3'") . $lang->task->hour;?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->estStarted;?></th>
-      <td><?php echo html::input('estStarted', $task->estStarted, "class='text-3 date'");?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->deadline;?></th>
-      <td><?php echo html::input('deadline', $task->deadline, "class='text-3 date'");?></td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->mailto;?></th>
-      <td>
-        <?php
-        echo html::select('mailto[]', $users, str_replace(' ', '', $task->mailto), 'multiple');
-        if($contactLists) echo html::select('', $contactLists, '', "class='f-right' onchange=\"setMailto('mailto', this.value)\"");
-        ?>
-      </td>
-    </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->files;?></th>
-      <td class='text-left'><?php echo $this->fetch('file', 'buildform');?></td>
-    </tr>  
-    <tr>
-      <th class='rowhead'><?php echo $lang->task->afterSubmit;?></th>
-      <td><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td> 
-    </tr>
-    <tr>
-      <td colspan='2' class='text-center'><?php echo html::submitButton() . html::backButton();?></td>
-    </tr>
-  </table>
-  <span id='responser'></span>
-</form>
+<div class='container'>
+  <div id='titlebar'>
+    <div class='heading'>
+      <span class='prefix'><?php echo html::icon($lang->icons['task']);?></span>
+      <strong><small class='text-muted'><i class='icon icon-plus'></i></small> <?php echo $lang->task->create;?></strong>
+    </div>
+  </div>
+  <form class='form-condensed' method='post' enctype='multipart/form-data' id='dataform' class='ajaxForm'>
+    <table class='table table-form'> 
+      <tr>
+        <th class='w-100px'><?php echo $lang->task->project;?></th>
+        <td colspan='3'><?php echo $project->name;?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->task->module;?></th>
+        <td id='moduleIdBox' class='w-p35'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control' onchange='setStories(this.value,$project->id)'");?></td><td class='w-p40'></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->assignedTo;?></th>
+        <td><?php echo html::select('assignedTo[]', $members, $task->assignedTo, "class='form-control chosen'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->type;?></th>
+        <td><?php echo html::select('type', $lang->task->typeList, $task->type, 'class=form-control onchange="setOwners(this.value)"');?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->story;?></th>
+        <td colspan='2'>
+          <?php echo html::select('story', $stories, $task->story, 'class=form-control onchange=setPreview();');?>
+        </td><td><a href='#' id='preview' class='iframe'><i class='icon-eye-open'></i> <?php echo $lang->preview;?></a></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->task->name;?></th>
+        <td colspan='2'>
+          <?php echo html::input('name', $task->name, "class='form-control'");?>
+        </td>
+        <td><a href='#' id='copyButton' onclick='copyStoryTitle()'><i class='icon-copy'></i> <?php echo $lang->task->copyStoryTitle;?></a></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->task->desc;?></th>
+        <td colspan='2'><?php echo html::textarea('desc', $task->desc, "rows='7' class='form-control'");?></td><td></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->task->pri;?></th>
+        <td><?php echo html::select('pri', $lang->task->priList, $task->pri, 'class=form-control');?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->estimate;?></th>
+        <td>
+          <div class="input-group">
+            <?php echo html::input('estimate', $task->estimate, "class='form-control'")?>
+            <span class="input-group-addon"><?php echo $lang->task->hour;?></span>
+          </div>
+        </td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->estStarted;?></th>
+        <td><?php echo html::input('estStarted', $task->estStarted, "class='form-control form-date'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->deadline;?></th>
+        <td><?php echo html::input('deadline', $task->deadline, "class='form-control form-date'");?></td><td></td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->task->mailto;?></th>
+        <td colspan='3'>
+          <?php
+          echo html::select('mailto[]', $users, str_replace(' ', '', $task->mailto), "multiple class='form-control'");
+          if($contactLists) echo html::select('', $contactLists, '', "class='form-control' onchange=\"setMailto('mailto', this.value)\"");
+          ?>
+        </td>
+      </tr>
+      <tr>
+        <th><?php echo $lang->files;?></th>
+        <td colspan='3'><?php echo $this->fetch('file', 'buildform');?></td>
+      </tr>  
+      <tr>
+        <th><?php echo $lang->task->afterSubmit;?></th>
+        <td colspan='3'><?php echo html::radio('after', $lang->task->afterChoices, 'continueAdding');?></td>
+      </tr>
+      <tr>
+        <td></td>
+        <td colspan='3'><?php echo html::submitButton() . html::backButton();?></td>
+      </tr>
+    </table>
+    <span id='responser'></span>
+  </form>
+</div>
 <?php include '../../common/view/footer.html.php';?>