show labels ・ a91dfb6 ・ Gitprep

- show labels;
- Browse files
- Yuki Kimoto commited on 2016-07-26
- 1 parent f6b754a
  
  commit a91dfb65a34a62f550837564b0edde837bc1366e

Showing 3 changed files with 34 additions and 2 deletions

+2 -1

lib/Gitprep.pm

@@ -242,7 +242,8 @@ sub startup {
       table => 'label',
       primary_key => 'row_id',
       join => [
-        'left join project on label.project = project.row_id'
+        'left join project on label.project = project.row_id',
+        'left join user as project__user on project.user = project__user.row_id'
       ]
     }
   ];

+15

public/css/common.css

View

@@ -35,6 +35,21 @@
   box-sizing: border-box;
 }
 
+.labels {
+  
+}
+.labels li {
+  border:1px #e5e5e5 solid;
+  border-top:none;
+  padding:7px 10px;
+}
+.labels li:first-child {
+  padding:10px 10px;
+  border-top:1px #e5e5e5 solid;
+  border-radius:3px 3px 0 0;
+  background:#f8f8f8;
+}
+
 .issues-title a {
   color:black;
 }

+17 -1

templates/labels.html.ep

View

@@ -6,13 +6,29 @@
   my $user_id = param('user');
   my $project_id = param('project');
   
+  my $labels = app->dbi->model('label')->select(
+    {__MY__ => '*'},
+    where => {'project__user.id' => $user_id, 'project.id' => $project_id},
+    append => 'order by id'
+  )->all;
+  
   layout 'common', title => "Labels - $user_id/$project_id";
 %>
 
 %= include '/include/header';
 
 <div class="container">
-  Labels
+  <ul class="labels">
+    <li><%= @$labels %> labels</li>
+    % for my $label (@$labels) {
+      <li>
+        <div style="border-radius:5px;display:inline-block;background:<%= $label->{color} %>;padding:7px 12px;font-weight:bold;border:1px solid #dddddd;">
+          <i class="icon icon-tag"></i>
+          <%= $label->{id} %>
+        </div>
+      </li>
+    % }
+  </ul>
 </div>
 
 %= include '/include/footer';

...	...	@@ -242,7 +242,8 @@ sub startup {
242	242	table => 'label',
243	243	primary_key => 'row_id',
244	244	join => [
245		- 'left join project on label.project = project.row_id'
	245	+ 'left join project on label.project = project.row_id',
	246	+ 'left join user as project__user on project.user = project__user.row_id'
246	247	]
247	248	}
248	249	];

...	...	@@ -35,6 +35,21 @@
35	35	box-sizing: border-box;
36	36	}
37	37
	38	+.labels {
	39	+
	40	+}
	41	+.labels li {
	42	+ border:1px #e5e5e5 solid;
	43	+ border-top:none;
	44	+ padding:7px 10px;
	45	+}
	46	+.labels li:first-child {
	47	+ padding:10px 10px;
	48	+ border-top:1px #e5e5e5 solid;
	49	+ border-radius:3px 3px 0 0;
	50	+ background:#f8f8f8;
	51	+}
	52	+
38	53	.issues-title a {
39	54	color:black;
40	55	}

...	...	@@ -6,13 +6,29 @@
6	6	my $user_id = param('user');
7	7	my $project_id = param('project');
8	8
	9	+ my $labels = app->dbi->model('label')->select(
	10	+ {__MY__ => '*'},
	11	+ where => {'project__user.id' => $user_id, 'project.id' => $project_id},
	12	+ append => 'order by id'
	13	+ )->all;
	14	+
9	15	layout 'common', title => "Labels - $user_id/$project_id";
10	16	%>
11	17
12	18	%= include '/include/header';
13	19
14	20	<div class="container">
15		- Labels
	21	+ <ul class="labels">
	22	+ <li><%= @$labels %> labels</li>
	23	+ % for my $label (@$labels) {
	24	+ <li>
	25	+ <div style="border-radius:5px;display:inline-block;background:<%= $label->{color} %>;padding:7px 12px;font-weight:bold;border:1px solid #dddddd;">
	26	+ <i class="icon icon-tag"></i>
	27	+ <%= $label->{id} %>
	28	+ </div>
	29	+ </li>
	30	+ % }
	31	+ </ul>
16	32	</div>
17	33
18	34	%= include '/include/footer';