Merge pull request #45 from kitalab/master

CSS見直し
NetCommons3 · Aug 22, 2016 · ae4fffc · ae4fffc
2 parents 84a9f00 + d5bfbef
commit ae4fffc
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 20 deletions.
diff --git a/Controller/TaskContentsController.php b/Controller/TaskContentsController.php
@@ -152,10 +152,9 @@ public function add() {
 				));
 
 				return $this->redirect($url);
-			} else {
-				// ToDo担当者ユーザー保持
-				$this->request->data = $this->TaskCharge->getSelectUsers($this->request->data);
 			}
+			// ToDo担当者ユーザー保持
+			$this->request->data = $this->TaskCharge->getSelectUsers($this->request->data);
 
 			$this->NetCommons->handleValidationError($this->TaskContent->validationErrors);
 
@@ -376,8 +375,7 @@ private function __list($conditions) {
 		$currentUserId = '';
 		// 担当者絞り込み
 		if (isset($conditions['user_id'])) {
-			if (! empty($conditions['user_id'])
-					&& $this->TaskCharge->searchChargeUser($conditions['user_id'])) {
+			if ($this->TaskCharge->searchChargeUser($conditions['user_id'])) {
 				$userParam = array(
 					'TaskCharge.user_id' => $conditions['user_id']
 				);
@@ -556,15 +554,16 @@ private function __getSelectOptions($selectTarget = '') {
 	private function __getSortParam($conditions = array(), $sortOptions = array()) {
 		$sortPram = '';
 		$currentSort = '';
+		$order = array();
+		$defaultOrder = array('TaskContent.is_date_set' => 'desc');
+		$afterOrder = array('TaskContent.task_end_date' => 'asc');
 		if (isset($conditions['sort']) && isset($conditions['direction'])) {
 			$sortPram = $conditions['sort'] . '.' . $conditions['direction'];
 		}
-		if (isset($sortOptions[$sortPram]) && $conditions['sort'] !== 'TaskContent.task_end_date') {
+		if (isset($sortOptions[$sortPram])) {
 			$order = array($conditions['sort'] => $conditions['direction']);
+			$order = array_merge($defaultOrder, $order, $afterOrder);
 			$currentSort = $conditions['sort'] . '.' . $conditions['direction'];
-		} else {
-			// 期限の近い順が選択された時のみ期限設定フラグを並べ替えソートに含める
-			$order = array('TaskContent.is_date_set' => 'desc', 'TaskContent.task_end_date' => 'asc');
 		}
 
 		$sort = array(

diff --git a/View/Elements/TaskContents/task_content.ctp b/View/Elements/TaskContents/task_content.ctp
@@ -76,14 +76,14 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css');
 					TaskContent::TASK_BEING_PERFORMED => ''
 				);
 				?>
-				<td class="col-xs-3 col-sm-2 col-md-2 col-lg-2 task-index-content-text-middle 
+				<td class="col-xs-4 col-sm-2 col-md-2 col-lg-2 task-index-content-text-middle task-word-break
 					<?php echo $color[$content['TaskContent']['date_color']]; ?>">
 					<?php if (empty($content['TaskContent']['priority'])): ?>
-						<div>
+						<div class="task-date-font">
 							<?php echo $this->TaskContent->displayDate($content['TaskContent']['task_end_date'], $content['TaskContent']['is_date_set']); ?>
 						</div>
 					<?php else: ?>
-						<div class="task-index-priority-1">
+						<div class="task-index-priority-1 task-word-break task-date-font">
 							<?php echo $this->TaskContent->displayDate($content['TaskContent']['task_end_date'], $content['TaskContent']['is_date_set']); ?>
 						</div>
 						<?php echo $this->element('TaskContents/priority_icon', array(
@@ -94,7 +94,7 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css');
 					<?php endif; ?>
 				</td>
 
-				<td class="col-xs-8 col-sm-5 col-md-5 col-lg-5 task-index-content-text-middle">
+				<td class="col-xs-7 col-sm-5 col-md-5 col-lg-5 task-index-content-text-middle task-word-break">
 					<div>
 						<?php echo $this->Workflow->label($content['TaskContent']['status']); ?>
 					</div>

diff --git a/View/Helper/TaskContentHelper.php b/View/Helper/TaskContentHelper.php
@@ -32,10 +32,10 @@ class TaskContentHelper extends AppHelper {
  * 表示するTODO実施期間作成
  *
  * @param string $date 実施期間
- * @param string $isDateSet 実施期間使用フラグ
+ * @param bool $isDateSet 実施期間使用フラグ
  * @return string HTML
  */
-	public function displayDate($date, $isDateSet = false) {
+	public function displayDate($date, $isDateSet) {
 		if ($isDateSet) {
 			$format = '';
 			$now = $this->NetCommonsTime->getNowDatetime();

diff --git a/View/TaskContents/index.ctp b/View/TaskContents/index.ctp
@@ -45,7 +45,7 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css');
 				</button>
 				<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1">
 					<?php echo $this->Category->dropDownToggle(array(
-						'empty' => false,
+						'empty' => h(__d('tasks', 'No category assignment')),
 						'displayMenu' => false,
 						$this->NetCommonsHtml->url(array('action' => 'index')),
 					)); ?>

diff --git a/View/TaskContents/view.ctp b/View/TaskContents/view.ctp
@@ -164,9 +164,10 @@ echo $this->NetCommonsHtml->css('/tasks/css/tasks.css');
 			<div class="task-view-content-top task-word-break">
 				<?php echo $taskContent['TaskContent']['content']; ?>
 			</div>
-
-			<?php echo $this->ContentComment->index($taskContent); ?>
 
+			<div class="task-word-break">
+				<?php echo $this->ContentComment->index($taskContent); ?>
+			</div>
 		</article>
 	</div>
 </div>
diff --git a/webroot/css/tasks.css b/webroot/css/tasks.css
@@ -9,7 +9,8 @@
 }
 
 .task-select-ellipsis {
-    width: 135px;
+    min-width: 5px;
+    max-width: 200px;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
@@ -28,7 +29,7 @@
 
 .table>tbody>tr>td.task-index-content-text-middle {
     vertical-align: middle;
-    word-break: break-all;
+    /*word-break: break-all;*/
 }
 
 .task-index-priority-1 {
@@ -112,4 +113,10 @@
     .task-progress-width-view {
         width: 150px;
     }
+}
+
+@media (max-width: 400px) {
+    .task-date-font {
+        font-size: 10px;
+    }
 }