improved desingn ・ adccd6d ・ Gitprep

- improved desingn;
- Browse files
- Yuki Kimoto commited on 2013-04-18
- 1 parent 6b87ad1
  
  commit adccd6d77e952832c93bfe681bc5fe36a01fe128

Showing 5 changed files with 93 additions and 66 deletions

+3 -1

lib/Gitprep/RepManager.pm

@@ -380,7 +380,9 @@ sub _create_rep {
     or croak "Can't move post-update";
   
   # Description
-  if (my $description = $opts->{description}) {
+  {
+    my $description = $opts->{description};
+    $description = '' unless defined $description;
     my $file = "$temp_rep/description";
     open my $fh, '>', $file
       or croak "Can't open $file: $!";

+10 -6

templates/include/project_header.html.ep

View

@@ -5,17 +5,16 @@
   my $user = stash('user');
   my $original_user = app->manager->original_user($user, $project);
   my $original_project = app->manager->original_project($user, $project);
-  
 %>
 
 <div class="row">
-  <div class="span10">
+  <div class="span9">
     <ul class="breadcrumb">
-      <li><a href="<%= url_for('/') %>">Home</a></li>
+      <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
       /
       <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
       /
-      <li><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></li>
+      <li><b><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></b></li>
       
       % if (defined $original_project) {
         (
@@ -27,12 +26,17 @@
       % }
     </ul>
   </div>
-  <div class="span2">
+  <div class="span3">
     <a class="btn" href="<%= url_for("/$user/$project/network") %>" >Network</a>
     % if ($logined && $current_user ne $user ) {
       <a href="<%= url_for("/$user/$project/fork") %>" class="btn">Fork</a>
     % } else {
-      <btn class="btn disabled" disabled>Fork</a>
+      <button class="btn disabled" disabled>Fork</button>
+    % }
+    % if ($logined && $user eq session('user')) {
+      <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
+    % } else {
+      <button class="btn disabled" disabled>Settings</button>
     % }
   </div>
 </div>

+49 -29

templates/network.html.ep

View

@@ -15,46 +15,66 @@
     ];
     $member->{branches} = $branches;
   }
+  
+  # Default branch
+  my $default_branch = app->manager->default_branch($user, $project);
 %>
 
 % layout 'common';
 
+  %= javascript begin
+    $(document).ready(function () {
+      // Update user and project hidden field
+      $('select[name="branch"]').on('change', function () {
+        $('input[name="branch"]').val($(this).val());
+      });
+    });
+  % end
+  
   %= include '/include/header';
   
   <div class="container" style="min-heigth:500px">
     <h3>Members of the <%= $project %> Network</h3>
     <div style="padding-left:10px">
       <%= "$user / $project" %> /
+      % param('branch', $default_branch);
       %= select_field 'branch' => $branches, style => 'margin-top:5px;width:150px';
     </div>
-    <table class="table" style="font-size:130%">
-      % for my $member (@$members) {
-        <form action="<%= url_for("/$user/$project/network/graph") %>" method="get">
-          % my $mid = $member->{id};
-          % my $mproject = $member->{project};
-          % my $mbranches = $member->{branches};
-          <tr>
-            <td>
-              <a href="<%= url_for("/$mid") %>">
-                <%= $mid %>
-              </a>
-              <span>/</span>
-              <a href="<%= url_for("/$mid/$mproject") %>">
-                <%= $mproject %>
-              </a>
-              <span>/</span>
-              %= select_field 'remote_branch' => $mbranches, style => 'margin-top:5px;margin-bottom:7px;width:150px';
-            </td>
-            <td style="text-align:right">
-              <input class="btn" type="submit" value="Compare" style="margin-top:5px">
-            </td>
-          </tr>
-          %= hidden_field user => $user;
-          %= hidden_field project => $project;
-          %= hidden_field remote_user => $mid;
-          %= hidden_field remote_project => $mproject;
-        </form>
-      % }
-    </table>
+    % if (@$members) {
+      <table class="table" style="font-size:130%">
+        % for my $member (@$members) {
+          <form action="<%= url_for("/$user/$project/network/graph") %>" method="get">
+            % my $mid = $member->{id};
+            % my $mproject = $member->{project};
+            % my $mbranches = $member->{branches};
+            <tr>
+              <td>
+                <a href="<%= url_for("/$mid") %>">
+                  <%= $mid %>
+                </a>
+                <span>/</span>
+                <a href="<%= url_for("/$mid/$mproject") %>">
+                  <%= $mproject %>
+                </a>
+                <span>/</span>
+                %= select_field 'remote_branch' => $mbranches, style => 'margin-top:5px;margin-bottom:7px;width:150px';
+              </td>
+              <td style="text-align:right">
+                <input class="btn" type="submit" value="Compare" style="margin-top:5px">
+              </td>
+            </tr>
+            %= hidden_field user => $user;
+            %= hidden_field project => $project;
+            %= hidden_field remote_user => $mid;
+            %= hidden_field remote_project => $mproject;
+            %= hidden_field 'branch' => $default_branch;
+          </form>
+        % }
+      </table>
+    % } else {
+      <div class="well">
+        No Members.
+      </div>
+    % }
   </div>
   %= include '/include/footer';

-5

templates/project.html.ep

View

@@ -126,11 +126,6 @@
           <%= $desc %>
         </h4>
       </div>
-      <div class="span2 text-right">
-        % if ($logined && $user eq session('user')) {
-          <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
-        % }
-      </div>
     </div>
     % if ($state eq 'display') {
       <div class="border-gray" style="padding:0 5px;margin-bottom:10px">

+31 -25

templates/tags.html.ep

View

@@ -25,33 +25,39 @@
     %= include '/include/code_menu', display => 'tags', tags_count => scalar @$tags;
     
     <div>
-      % for (my $i = 0; $i < @$tags; $i++) {
-        % my $tag = $tags->[$i];
-        % my $name = $tag->{name};
-        % my $tag_class = $i == @$tags - 1 ? 'tag tag_last' : 'tag';
-        <div class="padding5 border-bottom-gray">
-          <div class="row">
-            <div class="span2">
-              <a class="font-black" href="<%= url_for("/$user/$project/tree/$name") %>">
-                <b><%= $name %></b>
-              </a>
-            </div>
-            <div class="span9 ofsset1-mini">
-              % my $commit_id = $tag->{commit}{id};
-              <a class="muted" href="<%= url_for("/$user/$project/commit/$commit_id") %>">
-                <i class="icon-share-alt"></i>
-                <%= substr($commit_id, 0, 7) %>
-              </a>
-              <a class="muted" href="<%= url_for("/$user/$project/archive/$name.zip") %>">
-                <i class="icon-file"></i>
-                zip
-              </a>
-              <a class="muted" href="<%= url_for("/$user/$project/archive/$name.tar.gz") %>">
-                <i class="icon-file"></i>
-                tar.gz
-              </a>
+      % if (@$tags) {
+        % for (my $i = 0; $i < @$tags; $i++) {
+          % my $tag = $tags->[$i];
+          % my $name = $tag->{name};
+          % my $tag_class = $i == @$tags - 1 ? 'tag tag_last' : 'tag';
+          <div class="padding5 border-bottom-gray">
+            <div class="row">
+              <div class="span2">
+                <a class="font-black" href="<%= url_for("/$user/$project/tree/$name") %>">
+                  <b><%= $name %></b>
+                </a>
+              </div>
+              <div class="span9 ofsset1-mini">
+                % my $commit_id = $tag->{commit}{id};
+                <a class="muted" href="<%= url_for("/$user/$project/commit/$commit_id") %>">
+                  <i class="icon-share-alt"></i>
+                  <%= substr($commit_id, 0, 7) %>
+                </a>
+                <a class="muted" href="<%= url_for("/$user/$project/archive/$name.zip") %>">
+                  <i class="icon-file"></i>
+                  zip
+                </a>
+                <a class="muted" href="<%= url_for("/$user/$project/archive/$name.tar.gz") %>">
+                  <i class="icon-file"></i>
+                  tar.gz
+                </a>
+              </div>
             </div>
           </div>
+        % }
+      % } else {
+        <div class="well">
+          No Tags.
         </div>
       % }
     </div>

...	...	@@ -380,7 +380,9 @@ sub _create_rep {
380	380	or croak "Can't move post-update";
381	381
382	382	# Description
383		- if (my $description = $opts->{description}) {
	383	+ {
	384	+ my $description = $opts->{description};
	385	+ $description = '' unless defined $description;
384	386	my $file = "$temp_rep/description";
385	387	open my $fh, '>', $file
386	388	or croak "Can't open $file: $!";

...	...	@@ -5,17 +5,16 @@
5	5	my $user = stash('user');
6	6	my $original_user = app->manager->original_user($user, $project);
7	7	my $original_project = app->manager->original_project($user, $project);
8		-
9	8	%>
10	9
11	10	<div class="row">
12		- <div class="span10">
	11	+ <div class="span9">
13	12	<ul class="breadcrumb">
14		- <li><a href="<%= url_for('/') %>">Home</a></li>
	13	+ <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
15	14	/
16	15	<li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
17	16	/
18		- <li><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></li>
	17	+ <li><b><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></b></li>
19	18
20	19	% if (defined $original_project) {
21	20	(
...	...	@@ -27,12 +26,17 @@
27	26	% }
28	27	</ul>
29	28	</div>
30		- <div class="span2">
	29	+ <div class="span3">
31	30	<a class="btn" href="<%= url_for("/$user/$project/network") %>" >Network</a>
32	31	% if ($logined && $current_user ne $user ) {
33	32	<a href="<%= url_for("/$user/$project/fork") %>" class="btn">Fork</a>
34	33	% } else {
35		- <btn class="btn disabled" disabled>Fork</a>
	34	+ <button class="btn disabled" disabled>Fork</button>
	35	+ % }
	36	+ % if ($logined && $user eq session('user')) {
	37	+ <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
	38	+ % } else {
	39	+ <button class="btn disabled" disabled>Settings</button>
36	40	% }
37	41	</div>
38	42	</div>

...	...	@@ -15,46 +15,66 @@
15	15	];
16	16	$member->{branches} = $branches;
17	17	}
	18	+
	19	+ # Default branch
	20	+ my $default_branch = app->manager->default_branch($user, $project);
18	21	%>
19	22
20	23	% layout 'common';
21	24
	25	+ %= javascript begin
	26	+ $(document).ready(function () {
	27	+ // Update user and project hidden field
	28	+ $('select[name="branch"]').on('change', function () {
	29	+ $('input[name="branch"]').val($(this).val());
	30	+ });
	31	+ });
	32	+ % end
	33	+
22	34	%= include '/include/header';
23	35
24	36	<div class="container" style="min-heigth:500px">
25	37	<h3>Members of the <%= $project %> Network</h3>
26	38	<div style="padding-left:10px">
27	39	<%= "$user / $project" %> /
	40	+ % param('branch', $default_branch);
28	41	%= select_field 'branch' => $branches, style => 'margin-top:5px;width:150px';
29	42	</div>
30		- <table class="table" style="font-size:130%">
31		- % for my $member (@$members) {
32		- <form action="<%= url_for("/$user/$project/network/graph") %>" method="get">
33		- % my $mid = $member->{id};
34		- % my $mproject = $member->{project};
35		- % my $mbranches = $member->{branches};
36		- <tr>
37		- <td>
38		- <a href="<%= url_for("/$mid") %>">
39		- <%= $mid %>
40		- </a>
41		- <span>/</span>
42		- <a href="<%= url_for("/$mid/$mproject") %>">
43		- <%= $mproject %>
44		- </a>
45		- <span>/</span>
46		- %= select_field 'remote_branch' => $mbranches, style => 'margin-top:5px;margin-bottom:7px;width:150px';
47		- </td>
48		- <td style="text-align:right">
49		- <input class="btn" type="submit" value="Compare" style="margin-top:5px">
50		- </td>
51		- </tr>
52		- %= hidden_field user => $user;
53		- %= hidden_field project => $project;
54		- %= hidden_field remote_user => $mid;
55		- %= hidden_field remote_project => $mproject;
56		- </form>
57		- % }
58		- </table>
	43	+ % if (@$members) {
	44	+ <table class="table" style="font-size:130%">
	45	+ % for my $member (@$members) {
	46	+ <form action="<%= url_for("/$user/$project/network/graph") %>" method="get">
	47	+ % my $mid = $member->{id};
	48	+ % my $mproject = $member->{project};
	49	+ % my $mbranches = $member->{branches};
	50	+ <tr>
	51	+ <td>
	52	+ <a href="<%= url_for("/$mid") %>">
	53	+ <%= $mid %>
	54	+ </a>
	55	+ <span>/</span>
	56	+ <a href="<%= url_for("/$mid/$mproject") %>">
	57	+ <%= $mproject %>
	58	+ </a>
	59	+ <span>/</span>
	60	+ %= select_field 'remote_branch' => $mbranches, style => 'margin-top:5px;margin-bottom:7px;width:150px';
	61	+ </td>
	62	+ <td style="text-align:right">
	63	+ <input class="btn" type="submit" value="Compare" style="margin-top:5px">
	64	+ </td>
	65	+ </tr>
	66	+ %= hidden_field user => $user;
	67	+ %= hidden_field project => $project;
	68	+ %= hidden_field remote_user => $mid;
	69	+ %= hidden_field remote_project => $mproject;
	70	+ %= hidden_field 'branch' => $default_branch;
	71	+ </form>
	72	+ % }
	73	+ </table>
	74	+ % } else {
	75	+ <div class="well">
	76	+ No Members.
	77	+ </div>
	78	+ % }
59	79	</div>
60	80	%= include '/include/footer';

...	...	@@ -126,11 +126,6 @@
126	126	<%= $desc %>
127	127	</h4>
128	128	</div>
129		- <div class="span2 text-right">
130		- % if ($logined && $user eq session('user')) {
131		- <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
132		- % }
133		- </div>
134	129	</div>
135	130	% if ($state eq 'display') {
136	131	<div class="border-gray" style="padding:0 5px;margin-bottom:10px">

...	...	@@ -25,33 +25,39 @@
25	25	%= include '/include/code_menu', display => 'tags', tags_count => scalar @$tags;
26	26
27	27	<div>
28		- % for (my $i = 0; $i < @$tags; $i++) {
29		- % my $tag = $tags->[$i];
30		- % my $name = $tag->{name};
31		- % my $tag_class = $i == @$tags - 1 ? 'tag tag_last' : 'tag';
32		- <div class="padding5 border-bottom-gray">
33		- <div class="row">
34		- <div class="span2">
35		- <a class="font-black" href="<%= url_for("/$user/$project/tree/$name") %>">
36		- <b><%= $name %></b>
37		- </a>
38		- </div>
39		- <div class="span9 ofsset1-mini">
40		- % my $commit_id = $tag->{commit}{id};
41		- <a class="muted" href="<%= url_for("/$user/$project/commit/$commit_id") %>">
42		- <i class="icon-share-alt"></i>
43		- <%= substr($commit_id, 0, 7) %>
44		- </a>
45		- <a class="muted" href="<%= url_for("/$user/$project/archive/$name.zip") %>">
46		- <i class="icon-file"></i>
47		- zip
48		- </a>
49		- <a class="muted" href="<%= url_for("/$user/$project/archive/$name.tar.gz") %>">
50		- <i class="icon-file"></i>
51		- tar.gz
52		- </a>
	28	+ % if (@$tags) {
	29	+ % for (my $i = 0; $i < @$tags; $i++) {
	30	+ % my $tag = $tags->[$i];
	31	+ % my $name = $tag->{name};
	32	+ % my $tag_class = $i == @$tags - 1 ? 'tag tag_last' : 'tag';
	33	+ <div class="padding5 border-bottom-gray">
	34	+ <div class="row">
	35	+ <div class="span2">
	36	+ <a class="font-black" href="<%= url_for("/$user/$project/tree/$name") %>">
	37	+ <b><%= $name %></b>
	38	+ </a>
	39	+ </div>
	40	+ <div class="span9 ofsset1-mini">
	41	+ % my $commit_id = $tag->{commit}{id};
	42	+ <a class="muted" href="<%= url_for("/$user/$project/commit/$commit_id") %>">
	43	+ <i class="icon-share-alt"></i>
	44	+ <%= substr($commit_id, 0, 7) %>
	45	+ </a>
	46	+ <a class="muted" href="<%= url_for("/$user/$project/archive/$name.zip") %>">
	47	+ <i class="icon-file"></i>
	48	+ zip
	49	+ </a>
	50	+ <a class="muted" href="<%= url_for("/$user/$project/archive/$name.tar.gz") %>">
	51	+ <i class="icon-file"></i>
	52	+ tar.gz
	53	+ </a>
	54	+ </div>
53	55	</div>
54	56	</div>
	57	+ % }
	58	+ % } else {
	59	+ <div class="well">
	60	+ No Tags.
55	61	</div>
56	62	% }
57	63	</div>