Commit: f2f590b02c9096c7e90db705f95a845a070c12ea - teswiki (git)

blogger

Commit MetaInfo

• Révision: f2f590b02c9096c7e90db705f95a845a070c12ea (tree)
• l'heure: 2017-09-08 07:34:14
• Auteur: umorigu <umorigu@gmai...>
• Commiter: umorigu

Message de Log

BugTrack/2424 bugtrack: Define bugtrack list style by CSS

Change Summary

• modified: plugin/bugtrack.inc.php
• modified: skin/pukiwiki.css
• modified: skin/tdiary.css

Modification

--- a/plugin/bugtrack.inc.php
+++ b/plugin/bugtrack.inc.php
@@ -24,8 +24,9 @@ function plugin_bugtrack_init()
 		'priority_list'  => array('緊急', '重要', '普通', '低'),
 		'state_list'     => array('提案', '着手', '完了', '保留', '却下'),
 		'state_sort'     => array('着手', '保留', '完了', '提案', '却下'),
-		'state_bgcolor'  => array('#ccccff', '#ffcc99', '#ccffcc', '#ffccff', '#cccccc', '#ff3333'),
-		'header_bgcolor' => '#ffffcc',
+		'state_class'  => array('bugtrack_state_proposal', 'bugtrack_state_accept',
+			'bugrack_state_resolved', 'bugtrack_state_pending', 'bugtrack_state_cancel',
+			'bugtrack_state_undef'),
 		'base'     => 'ページ',
 		'summary'  => 'サマリ',
 		'nosummary'=> 'ここにサマリを記入して下さい',
@@ -373,18 +374,19 @@ function plugin_bugtrack_list_convert()
 
 			$state_no = array_search($state, $_plugin_bugtrack['state_sort']);
 			if ($state_no === NULL || $state_no === FALSE) $state_no = $count_list;
-			$bgcolor = htmlsc($_plugin_bugtrack['state_bgcolor'][$state_no]);
+			$cssclass = htmlsc($_plugin_bugtrack['state_class'][$state_no]);
 
 			$row = <<<EOD
- <tr>
-  <td style="background-color:$bgcolor">$page_link</td>
-  <td style="background-color:$bgcolor">$state</td>
-  <td style="background-color:$bgcolor">$priority</td>
-  <td style="background-color:$bgcolor">$category</td>
-  <td style="background-color:$bgcolor">$name</td>
-  <td style="background-color:$bgcolor">$summary</td>
+ <tr class="$cssclass">
+  <td>$page_link</td>
+  <td>$state</td>
+  <td>$priority</td>
+  <td>$category</td>
+  <td>$name</td>
+  <td>$summary</td>
  </tr>
 EOD;
+			$row = preg_replace('#(?<=>)\n\s+#', '', $row) . "\n"; // Reduce space size
 			$rec = &$data[$i];
 			$rec[] = $state_no; // color number
 			$rec[] = $row; // HTML content
@@ -407,10 +409,9 @@ EOD;
 		list($page_name, $no, $summary, $name, $priority, $state, $category, $filetime, $state_no, $html) = $line;
 		$table[$state_no][$no] = $html;
 	}
-	$table_html = ' <tr>' . "\n";
-	$bgcolor = htmlsc($_plugin_bugtrack['header_bgcolor']);
+	$table_html = ' <tr class="bugtrack_list_header">' . "\n";
 	foreach (array('pagename', 'state', 'priority', 'category', 'name', 'summary') as $item)
-		$table_html .= '  <th style="background-color:' . $bgcolor . '">' .
+		$table_html .= '  <th>' .
 			htmlsc($_plugin_bugtrack[$item]) . '</th>' . "\n";
 	$table_html .= ' </tr>' . "\n";
 	for ($i = 0; $i <= $count_list; ++$i) {
@@ -451,11 +452,10 @@ function plugin_bugtrack_list_pageinfo($page, $no = NULL, $recurse = TRUE, $file
 				$$item = ''; // Data not found
 		}
 	}
-
 	if (preg_match("/\*([^\n]*)/", $body, $matches)) {
 		$summary = $matches[1];
 		make_heading($summary);
+		$summary = trim($summary);
 	}
-
 	return array($page, $no, $summary, $name, $priority, $state, $category, $filetime);
 }

--- a/skin/pukiwiki.css
+++ b/skin/pukiwiki.css
@@ -618,6 +618,29 @@ span.topicpath-top {
 	user-select: none;
 }
 
+/* bugtrack.inc.php */
+tr.bugtrack_list_header th {
+	background-color: #ffffcc;
+}
+tr.bugtrack_state_proposal td {
+	background-color: #ccccff;
+}
+tr.bugtrack_state_accept td {
+	background-color: #ffcc99;
+}
+tr.bugrack_state_resolved td {
+	background-color: #ccffcc;
+}
+tr.bugtrack_state_pending td {
+	background-color: #ffccff;
+}
+tr.bugtrack_state_cancel td {
+	background-color: #cccccc;
+}
+tr.bugtrack_state_undef td {
+	background-color: #ff3333;
+}
+
 @media print {
   a:link,
   a:visited {

--- a/skin/tdiary.css
+++ b/skin/tdiary.css
@@ -494,6 +494,29 @@ span.topicpath-top {
 	user-select: none;
 }
 
+/* bugtrack.inc.php */
+tr.bugtrack_list_header th {
+	background-color: #ffffcc;
+}
+tr.bugtrack_state_proposal td {
+	background-color: #ccccff;
+}
+tr.bugtrack_state_accept td {
+	background-color: #ffcc99;
+}
+tr.bugrack_state_resolved td {
+	background-color: #ccffcc;
+}
+tr.bugtrack_state_pending td {
+	background-color: #ffccff;
+}
+tr.bugtrack_state_cancel td {
+	background-color: #cccccc;
+}
+tr.bugtrack_state_undef td {
+	background-color: #ff3333;
+}
+
 @media print {
   img#logo,
   div#navigator,