cleanup ・ ac56111 ・ Gitprep

- cleanup;
- Browse files
- Yuki Kimoto commited on 2013-03-15
- 1 parent b72219d
  
  commit ac56111be3eae731cbd0b95588f087b50f44458d

Showing 5 changed files with 81 additions and 144 deletions

+1 -1

templates/include/code_menu.html.ep

@@ -4,7 +4,7 @@
   my $display = stash('display') || '';
 %>
 
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs" style="margin-bottom:10px">
   % if (defined(my $rev = stash('rev'))) {
     <li>
       <button class="btn">

+2 -2

templates/include/footer.html.ep

View

...	...	@@ -1,4 +1,4 @@
1		-<hr>
2		-<div class="text-center">
	1	+<hr style="margin-top:0;margin-bottom:10px">
	2	+<div class="text-center" style="margin-bottom:10px">
3	3	<a href="https://github.com/yuki-kimoto/gitprep">Gitprep</a>
4	4	</div>

+25 -34

templates/include/page_path.html.ep

View

...	...	@@ -8,38 +8,29 @@
8	8	my $rev = stash('id') \|\| stash('rev');
9	9	%>
10	10
11		-%= stylesheet begin
12		- .page_path {
13		- font-size:120%;
14		- margin-bottom:10px;
15		- }
16		-
17		- .page_path a {
18		- color:#4183C4;
19		- }
20		-% end
21		-
22		-<span class="page_path">
23		- <a href="<%= url_for("/$user/$project" . ($operation eq 'commits' ? '/commits' : '')) %>">
24		- <b><%= $project %></b>
25		- </a> /
26		- % my @parts = split('/', $Path);
27		- % my $path;
28		- % for (my $i = 0; $i < @parts; $i++) {
29		- % my $part = $parts[$i];
30		- % $path .= "$part";
31		-
32		- % if ($type eq 'blob' && $i == @parts - 1) {
33		- <b><%= $part %></b>
34		- % } else {
35		- <a href=
36		- "<%= url_for("/$user/$project/$operation/$rev/$path") %>">
37		- <%= $part %>
38		- </a>
39		- % $path .= '/';
40		- % }
41		- % unless ($type eq 'blob' && $i == @parts - 1) {
42		- /
	11	+<div style="margin-bottom:10px">
	12	+ <big>
	13	+ <a href="<%= url_for("/$user/$project" . ($operation eq 'commits' ? '/commits' : '')) %>">
	14	+ <b><%= $project %></b>
	15	+ </a> /
	16	+ % my @parts = split('/', $Path);
	17	+ % my $path;
	18	+ % for (my $i = 0; $i < @parts; $i++) {
	19	+ % my $part = $parts[$i];
	20	+ % $path .= "$part";
	21	+
	22	+ % if ($type eq 'blob' && $i == @parts - 1) {
	23	+ <b><%= $part %></b>
	24	+ % } else {
	25	+ <a href=
	26	+ "<%= url_for("/$user/$project/$operation/$rev/$path") %>">
	27	+ <%= $part %>
	28	+ </a>
	29	+ % $path .= '/';
	30	+ % }
	31	+ % unless ($type eq 'blob' && $i == @parts - 1) {
	32	+ /
	33	+ % }
43	34	% }
44		- % }
45		-</span>
	35	+ </big>
	36	+</div>

-63

templates/include/tags.html.ep

View

...	...	@@ -1,63 +0,0 @@
1		-<table class="tags">
2		- % for (my $i = 0; $i < @$tags; $i++) {
3		- % my $tag = $tags->[$i];
4		- % my $name = $tag->{name};
5		- % my $reftype = $tag->{reftype};
6		- % my $comment = $tag->{comment_short};
7		-
8		- <tr class="<%= $i % 2 ? 'light' : 'dark' %>">
9		- <td><i><%= $tag->{age} %></i></td>
10		- <td>
11		- <a class="list name"
12		- href="<%= url_for("$reftype", project => $project_ns, id => $tag->{refid}) %>">
13		- %= $tag->{name};
14		- </a>
15		- % if (defined $comment) {
16		- <a class="list subject"
17		- href="<%= url_for('tag', project => $project_ns, id => $tag->{id}) %>">
18		- <%= $comment %>
19		- </a>
20		- % }
21		- </td>
22		- <td class="selflink">
23		- % if ($tag->{type} eq 'tag') {
24		- <a href="<%= url_for('tag', project => $project_ns, id => $tag->{id}) %>">
25		- tag
26		- </a>
27		- \|
28		- % }
29		- </td>
30		- <td class="link">
31		- <a href="<%= url_for("$reftype", project => $project_ns, id => $tag->{refid}, id => $tag->{refid}) %>">
32		- %= $reftype;
33		- </a>
34		- % if ($reftype eq 'commit') {
35		- \|
36		- <a href="<%= url_for('shortlog', project => $project_ns, id => "refs/tags/$name") %>">
37		- shortlog
38		- </a>
39		- \|
40		- <a href="<%= url_for('log', project => $project_ns, id => "refs/tags/$name") %>">
41		- log
42		- </a>
43		- % } elsif ($reftype eq 'blob') {
44		- <a href="<%= url_for('blob_plain', project => $project_ns,
45		- bid => $tag->{refid}) %>">
46		- row
47		- </a>
48		- % }
49		- </td>
50		- </tr>
51		- % }
52		- % if (stash('summary')) {
53		- % if (@$tags == stash('tag_count')) {
54		- <tr>
55		- <td>
56		- <a href="<%= url_for('tags',project => $project_ns) %>">
57		- ...
58		- </a>
59		- </td>
60		- </tr>
61		- % }
62		- % }
63		-</table>

+53 -44

templates/include/tree.html.ep

View

@@ -87,58 +87,67 @@
   }
 % end
 
-<div class="tree">
-  <div class="tree_header">
+<div class="border-gray border-bottom-none" style="margin-bottom:10px">
+  <div class="vpadding5 bk-blue-light border-bottom-gray">
+    <div class="space5"></div>
     <a href="<%= url_for("/$user/$project/commit/$rev") %>">
       <%= $commit->{title} %>
     </a>
   </div>
-  <div class="tree_header2">
-    <div class="tree_header2_left">
-      <b><%= $latest_commit_log->{author} %></b> <span class="tree_header2_left_right">authored <%= $latest_commit_log->{author_date} %></span>
-    </div>
-    <div class="tree_header2_right">
-      <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
-        latest commit <%= substr($commit->{id}, 0, 10) %>
-      </a>
+  <div class="row">
+    <div class="span12 vpadding5 border-bottom-gray">
+      <div class="row">
+        <div class="span8">
+          <div class="space5"></div>
+          <b><%= $latest_commit_log->{author} %></b>
+          <span class="muted">
+            authored <%= $latest_commit_log->{author_date} %>
+          </span>
+        </div>
+        <div class="span4 text-right">
+          <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
+            latest commit <%= substr($commit->{id}, 0, 10) %>
+          </a>
+          <div class="space5"></div>
+       </div>
+      </div>
     </div>
   </div>
-  <table class="tree_body" cellpadding="0" cellspacing="0">
+  <div class="row">
     % for (my $i = 0; $i <@$trees; $i++) {
-      
-      % my $tree = $trees->[$i];
-      % my $type = $tree->{type};
-      % my $name = $tree->{name};
-      
-      % my $child_dir = defined $dir && length $dir ? join('/', $dir, $name) : $name;
-      <tr>
-        
-        % if ($type eq 'blob') {
-          % my $file = defined $dir && $dir ne '' ? "$dir/$name" : $name;
+      <div class="span12 border-bottom-gray vpadding5" style="font-size:90%">
+        <div class="row">
+          % my $tree = $trees->[$i];
+          % my $type = $tree->{type};
+          % my $name = $tree->{name};
           
-          <td class="tree_td_blob">
-            <a href="<%= url_for("/$user/$project/blob/$rev/$file") %>">
-              <%= $name %>
-            </a>
-          </td>
-        % } elsif ($tree) {
-          <td class="tree_td_dir">
-            <a href="<%= url_for("/$user/$project/tree/$rev/$child_dir") %>">
-              <%= $name %>
+          <div class="span2">
+            <div class="space5"></div>
+            % my $child_dir = defined $dir && length $dir ? join('/', $dir, $name) : $name;
+            % if ($type eq 'blob') {
+              % my $file = defined $dir && $dir ne '' ? "$dir/$name" : $name;
+              <i class="icon-file"></i>
+              <a href="<%= url_for("/$user/$project/blob/$rev/$file") %>">
+                <%= $name %>
+              </a>
+            % } elsif ($tree) {
+              <i class="icon-folder-open"></i>
+              <a href="<%= url_for("/$user/$project/tree/$rev/$child_dir") %>">
+                <%= $name %>
+              </a>
+            % }
+          </div>
+          <div class="span2">
+            <%= $tree->{author_date} %>
+          </div>
+          <div class="span8">
+            <a class="font-black" href="<%= url_for("/$user/$project/commit/$tree->{commit}") %>">
+              <%= $tree->{comment} %>
             </a>
-          </td>
-        % }
-        
-        <td>
-          <%= $tree->{author_date} %>
-        </td>
-        <td class="tree_td_commit">
-          <a href="<%= url_for("/$user/$project/commit/$tree->{commit}") %>">
-            <%= $tree->{comment} %>
-          </a>
-          [<%= $tree->{author} %>]
-        </td>
-      </tr>
+            [<%= $tree->{author} %>]
+          </div>
+        </div>
+      </div>
     % }
-  </table>
+  </div>
 </div>

...	...	@@ -4,7 +4,7 @@
4	4	my $display = stash('display') \|\| '';
5	5	%>
6	6
7		-<ul class="nav nav-tabs">
	7	+<ul class="nav nav-tabs" style="margin-bottom:10px">
8	8	% if (defined(my $rev = stash('rev'))) {
9	9	<li>
10	10	<button class="btn">

...	...	@@ -87,58 +87,67 @@
87	87	}
88	88	% end
89	89
90		-<div class="tree">
91		- <div class="tree_header">
	90	+<div class="border-gray border-bottom-none" style="margin-bottom:10px">
	91	+ <div class="vpadding5 bk-blue-light border-bottom-gray">
	92	+ <div class="space5"></div>
92	93	<a href="<%= url_for("/$user/$project/commit/$rev") %>">
93	94	<%= $commit->{title} %>
94	95	</a>
95	96	</div>
96		- <div class="tree_header2">
97		- <div class="tree_header2_left">
98		- <b><%= $latest_commit_log->{author} %></b> <span class="tree_header2_left_right">authored <%= $latest_commit_log->{author_date} %></span>
99		- </div>
100		- <div class="tree_header2_right">
101		- <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
102		- latest commit <%= substr($commit->{id}, 0, 10) %>
103		- </a>
	97	+ <div class="row">
	98	+ <div class="span12 vpadding5 border-bottom-gray">
	99	+ <div class="row">
	100	+ <div class="span8">
	101	+ <div class="space5"></div>
	102	+ <b><%= $latest_commit_log->{author} %></b>
	103	+ <span class="muted">
	104	+ authored <%= $latest_commit_log->{author_date} %>
	105	+ </span>
	106	+ </div>
	107	+ <div class="span4 text-right">
	108	+ <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">
	109	+ latest commit <%= substr($commit->{id}, 0, 10) %>
	110	+ </a>
	111	+ <div class="space5"></div>
	112	+ </div>
	113	+ </div>
104	114	</div>
105	115	</div>
106		- <table class="tree_body" cellpadding="0" cellspacing="0">
	116	+ <div class="row">
107	117	% for (my $i = 0; $i <@$trees; $i++) {
108		-
109		- % my $tree = $trees->[$i];
110		- % my $type = $tree->{type};
111		- % my $name = $tree->{name};
112		-
113		- % my $child_dir = defined $dir && length $dir ? join('/', $dir, $name) : $name;
114		- <tr>
115		-
116		- % if ($type eq 'blob') {
117		- % my $file = defined $dir && $dir ne '' ? "$dir/$name" : $name;
	118	+ <div class="span12 border-bottom-gray vpadding5" style="font-size:90%">
	119	+ <div class="row">
	120	+ % my $tree = $trees->[$i];
	121	+ % my $type = $tree->{type};
	122	+ % my $name = $tree->{name};
118	123
119		- <td class="tree_td_blob">
120		- <a href="<%= url_for("/$user/$project/blob/$rev/$file") %>">
121		- <%= $name %>
122		- </a>
123		- </td>
124		- % } elsif ($tree) {
125		- <td class="tree_td_dir">
126		- <a href="<%= url_for("/$user/$project/tree/$rev/$child_dir") %>">
127		- <%= $name %>
	124	+ <div class="span2">
	125	+ <div class="space5"></div>
	126	+ % my $child_dir = defined $dir && length $dir ? join('/', $dir, $name) : $name;
	127	+ % if ($type eq 'blob') {
	128	+ % my $file = defined $dir && $dir ne '' ? "$dir/$name" : $name;
	129	+ <i class="icon-file"></i>
	130	+ <a href="<%= url_for("/$user/$project/blob/$rev/$file") %>">
	131	+ <%= $name %>
	132	+ </a>
	133	+ % } elsif ($tree) {
	134	+ <i class="icon-folder-open"></i>
	135	+ <a href="<%= url_for("/$user/$project/tree/$rev/$child_dir") %>">
	136	+ <%= $name %>
	137	+ </a>
	138	+ % }
	139	+ </div>
	140	+ <div class="span2">
	141	+ <%= $tree->{author_date} %>
	142	+ </div>
	143	+ <div class="span8">
	144	+ <a class="font-black" href="<%= url_for("/$user/$project/commit/$tree->{commit}") %>">
	145	+ <%= $tree->{comment} %>
128	146	</a>
129		- </td>
130		- % }
131		-
132		- <td>
133		- <%= $tree->{author_date} %>
134		- </td>
135		- <td class="tree_td_commit">
136		- <a href="<%= url_for("/$user/$project/commit/$tree->{commit}") %>">
137		- <%= $tree->{comment} %>
138		- </a>
139		- [<%= $tree->{author} %>]
140		- </td>
141		- </tr>
	147	+ [<%= $tree->{author} %>]
	148	+ </div>
	149	+ </div>
	150	+ </div>
142	151	% }
143		- </table>
	152	+ </div>
144	153	</div>