added commits page header and footer ・ c0c4318 ・ Gitprep

- added commits page header and footer;
- Browse files
- Yuki Kimoto commited on 2012-11-30
- 1 parent ffcde4d
  
  commit c0c4318e0d2ab087e64f59cdf270eebaca1b9292

Showing 5 changed files with 74 additions and 60 deletions

templates/css/common.html.ep

@@ -34,6 +34,14 @@
   .header_right li a{
     display:block;
   }
+
+  /* User and repository name */
+  .user_rep {
+    font-size:140%;
+    font-weight:bold;
+    margin-top:15px;
+    margin-bottom:15px;
+  }
   
   /* Main panel */
   .main_panel {

templates/include/footer.html.ep

View

...	...	@@ -0,0 +1,3 @@
	1	+<div class="footer">
	2	+ <a href="https://github.com/yuki-kimoto/gitprep">Gitprep</a>
	3	+</div>

+15

templates/include/sub_header.html.ep

View

...	...	@@ -0,0 +1,15 @@
	1	+<div class="user_rep">
	2	+ <a href="<%= url_for("/$user") %>"><%= $user %></a>
	3	+ /
	4	+ <a href="<%= url_for %>"><%= $repository %></a>
	5	+</div>
	6	+
	7	+<ul class="main_menu">
	8	+ <li><a href="<%= url_for %>">Code</a></li>
	9	+ <li><a href="<%= url_for("/$user/$repository/network") %>"><s>Network</s></a></li>
	10	+ <li><a href="<%= url_for("/$user/$repository/pulls") %>"><s>Pull Requests 0</s></a></li>
	11	+ <li><a href="<%= url_for("/$user/$repository/issues") %>"><s>Issues 1</s></a></li>
	12	+ <li><a href="<%= url_for("/$user/$repository/wiki") %>"><s>Wiki</s></a></li>
	13	+ <li><a href="<%= url_for("/$user/$repository/graphs") %>"><s>Graphs</s></a></li>
	14	+ <li><a href="<%= url_for("/$user/$repository/admin") %>"><s>Admin</s></a></li>
	15	+</ul>

+44 -34

templates/main/commits.html.ep

View

@@ -34,44 +34,54 @@
   
   # References
   my $refs = $git->references($project);
+  
+  # Global variable
+  stash(user => $user, repository => $repository);
 %>
 
-% layout 'common';
-  %= include '/include/header', title => 'Commits', project => $project;
+% layout 'new_common';
+  %= include '/css/common';
+  %= include '/include/new_header';
+
+  <div class="main_panel">
+    %= include '/include/sub_header';
 
-  % for my $commit (@$commits) {
-    <div class="header">
-      <a class="title" href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">
-        <span class="age" style="font-size:70%">
-          <%= $commit->{age_string} %>
-        </span>
-        &nbsp;
-        <%= $commit->{title} %>
-      </a>
-    </div>
-    <div class="title_text">
-      <div class="log_link">
-        <a href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">commit</a> |
-        <a href="<%= url_for('commitdiff', project => $project_ns, diff => $commit->{id}) %>">
-          commitdiff
+    % for my $commit (@$commits) {
+      <div class="header">
+        <a class="title" href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">
+          <span class="age" style="font-size:70%">
+            <%= $commit->{age_string} %>
+          </span>
+          &nbsp;
+          <%= $commit->{title} %>
         </a>
-        |
-        <a href="<%= url_for('tree', project => $project_ns,
-            id_dir => $commit->{id}) %>">
-          tree
-        </a><br/>
       </div>
-      <span class="author_date"><%= $commit->{author_name} %> [<%= $commit->{author_date} %>]</span>
+      <div class="title_text">
+        <div class="log_link">
+          <a href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">commit</a> |
+          <a href="<%= url_for('commitdiff', project => $project_ns, diff => $commit->{id}) %>">
+            commitdiff
+          </a>
+          |
+          <a href="<%= url_for('tree', project => $project_ns,
+              id_dir => $commit->{id}) %>">
+            tree
+          </a><br/>
+        </div>
+        <span class="author_date"><%= $commit->{author_name} %> [<%= $commit->{author_date} %>]</span>
+        <br/>
+      </div>
+      <div class="log_body">
+        %= include 'include/refs', project_ns => $project_ns, commit => $commit, refs => $refs;
+        <%= $commit->{title} %><br/>
       <br/>
-    </div>
-    <div class="log_body">
-      %= include 'include/refs', project_ns => $project_ns, commit => $commit, refs => $refs;
-      <%= $commit->{title} %><br/>
-    <br/>
-    </div>
-  % }
+      </div>
+    % }
 
-  <%= include '/include/page_navi2', current => 'log', id => $id,
-    page => $page, page_count => $page_count, commits => $commits,
-    project_ns => $project_ns;
-  %>
+    <%= include '/include/page_navi2', current => 'log', id => $id,
+      page => $page, page_count => $page_count, commits => $commits,
+      project_ns => $project_ns;
+    %>
+  </div>
+  
+  %= include '/include/footer';

+4 -26

templates/main/repository.html.ep

View

@@ -78,6 +78,8 @@
   # README
   my $readme = $git->blob_plain($rep, $ref, 'README');
   
+  # Global variable
+  stash(user => $user, repository => $repository);
 %>
 
 % layout 'new_common';
@@ -124,14 +126,6 @@
   
   %= stylesheet begin
     
-    /* User and repository name */
-    .user_rep {
-      font-size:140%;
-      font-weight:bold;
-      margin-top:15px;
-      margin-bottom:15px;
-    }
-    
     /* Repository description */
     .description {
       padding:10px;
@@ -264,21 +258,7 @@
   %= include '/include/new_header';
 
   <div class="main_panel">
-    <div class="user_rep">
-      <a href="<%= url_for("/$user") %>"><%= $user %></a>
-      /
-      <a href="<%= url_for %>"><%= $repository %></a>
-    </div>
-    
-    <ul class="main_menu">
-      <li><a href="<%= url_for %>">Code</a></li>
-      <li><a href="<%= url_for("/$user/$repository/network") %>"><s>Network</s></a></li>
-      <li><a href="<%= url_for("/$user/$repository/pulls") %>"><s>Pull Requests 0</s></a></li>
-      <li><a href="<%= url_for("/$user/$repository/issues") %>"><s>Issues 1</s></a></li>
-      <li><a href="<%= url_for("/$user/$repository/wiki") %>"><s>Wiki</s></a></li>
-      <li><a href="<%= url_for("/$user/$repository/graphs") %>"><s>Graphs</s></a></li>
-      <li><a href="<%= url_for("/$user/$repository/admin") %>"><s>Admin</s></a></li>
-    </ul>
+    %= include '/include/sub_header';
 
     <div class="description"><%= $desc %></div>
     
@@ -383,6 +363,4 @@
     </div>
   </div>
   
-  <div class="footer">
-    <a href="https://github.com/yuki-kimoto/gitprep">Gitprep</a>
-  </div>
+  %= include '/include/footer';

...	...	@@ -34,6 +34,14 @@
34	34	.header_right li a{
35	35	display:block;
36	36	}
	37	+
	38	+ /* User and repository name */
	39	+ .user_rep {
	40	+ font-size:140%;
	41	+ font-weight:bold;
	42	+ margin-top:15px;
	43	+ margin-bottom:15px;
	44	+ }
37	45
38	46	/* Main panel */
39	47	.main_panel {

...	...	@@ -34,44 +34,54 @@
34	34
35	35	# References
36	36	my $refs = $git->references($project);
	37	+
	38	+ # Global variable
	39	+ stash(user => $user, repository => $repository);
37	40	%>
38	41
39		-% layout 'common';
40		- %= include '/include/header', title => 'Commits', project => $project;
	42	+% layout 'new_common';
	43	+ %= include '/css/common';
	44	+ %= include '/include/new_header';
	45	+
	46	+ <div class="main_panel">
	47	+ %= include '/include/sub_header';
41	48
42		- % for my $commit (@$commits) {
43		- <div class="header">
44		- <a class="title" href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">
45		- <span class="age" style="font-size:70%">
46		- <%= $commit->{age_string} %>
47		- </span>
48		-
49		- <%= $commit->{title} %>
50		- </a>
51		- </div>
52		- <div class="title_text">
53		- <div class="log_link">
54		- <a href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">commit</a> \|
55		- <a href="<%= url_for('commitdiff', project => $project_ns, diff => $commit->{id}) %>">
56		- commitdiff
	49	+ % for my $commit (@$commits) {
	50	+ <div class="header">
	51	+ <a class="title" href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">
	52	+ <span class="age" style="font-size:70%">
	53	+ <%= $commit->{age_string} %>
	54	+ </span>
	55	+
	56	+ <%= $commit->{title} %>
57	57	</a>
58		- \|
59		- <a href="<%= url_for('tree', project => $project_ns,
60		- id_dir => $commit->{id}) %>">
61		- tree
62		- </a><br/>
63	58	</div>
64		- <span class="author_date"><%= $commit->{author_name} %> [<%= $commit->{author_date} %>]</span>
	59	+ <div class="title_text">
	60	+ <div class="log_link">
	61	+ <a href="<%= url_for('commit', project => $project_ns, id => $commit->{id}) %>">commit</a> \|
	62	+ <a href="<%= url_for('commitdiff', project => $project_ns, diff => $commit->{id}) %>">
	63	+ commitdiff
	64	+ </a>
	65	+ \|
	66	+ <a href="<%= url_for('tree', project => $project_ns,
	67	+ id_dir => $commit->{id}) %>">
	68	+ tree
	69	+ </a><br/>
	70	+ </div>
	71	+ <span class="author_date"><%= $commit->{author_name} %> [<%= $commit->{author_date} %>]</span>
	72	+ <br/>
	73	+ </div>
	74	+ <div class="log_body">
	75	+ %= include 'include/refs', project_ns => $project_ns, commit => $commit, refs => $refs;
	76	+ <%= $commit->{title} %><br/>
65	77	<br/>
66		- </div>
67		- <div class="log_body">
68		- %= include 'include/refs', project_ns => $project_ns, commit => $commit, refs => $refs;
69		- <%= $commit->{title} %><br/>
70		- <br/>
71		- </div>
72		- % }
	78	+ </div>
	79	+ % }
73	80
74		- <%= include '/include/page_navi2', current => 'log', id => $id,
75		- page => $page, page_count => $page_count, commits => $commits,
76		- project_ns => $project_ns;
77		- %>
	81	+ <%= include '/include/page_navi2', current => 'log', id => $id,
	82	+ page => $page, page_count => $page_count, commits => $commits,
	83	+ project_ns => $project_ns;
	84	+ %>
	85	+ </div>
	86	+
	87	+ %= include '/include/footer';

...	...	@@ -78,6 +78,8 @@
78	78	# README
79	79	my $readme = $git->blob_plain($rep, $ref, 'README');
80	80
	81	+ # Global variable
	82	+ stash(user => $user, repository => $repository);
81	83	%>
82	84
83	85	% layout 'new_common';
...	...	@@ -124,14 +126,6 @@
124	126
125	127	%= stylesheet begin
126	128
127		- /* User and repository name */
128		- .user_rep {
129		- font-size:140%;
130		- font-weight:bold;
131		- margin-top:15px;
132		- margin-bottom:15px;
133		- }
134		-
135	129	/* Repository description */
136	130	.description {
137	131	padding:10px;
...	...	@@ -264,21 +258,7 @@
264	258	%= include '/include/new_header';
265	259
266	260	<div class="main_panel">
267		- <div class="user_rep">
268		- <a href="<%= url_for("/$user") %>"><%= $user %></a>
269		- /
270		- <a href="<%= url_for %>"><%= $repository %></a>
271		- </div>
272		-
273		- <ul class="main_menu">
274		- <li><a href="<%= url_for %>">Code</a></li>
275		- <li><a href="<%= url_for("/$user/$repository/network") %>"><s>Network</s></a></li>
276		- <li><a href="<%= url_for("/$user/$repository/pulls") %>"><s>Pull Requests 0</s></a></li>
277		- <li><a href="<%= url_for("/$user/$repository/issues") %>"><s>Issues 1</s></a></li>
278		- <li><a href="<%= url_for("/$user/$repository/wiki") %>"><s>Wiki</s></a></li>
279		- <li><a href="<%= url_for("/$user/$repository/graphs") %>"><s>Graphs</s></a></li>
280		- <li><a href="<%= url_for("/$user/$repository/admin") %>"><s>Admin</s></a></li>
281		- </ul>
	261	+ %= include '/include/sub_header';
282	262
283	263	<div class="description"><%= $desc %></div>
284	264
...	...	@@ -383,6 +363,4 @@
383	363	</div>
384	364	</div>
385	365
386		- <div class="footer">
387		- <a href="https://github.com/yuki-kimoto/gitprep">Gitprep</a>
388		- </div>
	366	+ %= include '/include/footer';