Showing 21 changed files with 73 additions and 92 deletions
+5 -4
templates/auto/_login.html.ep
... ...
@@ -88,8 +88,9 @@
88 88
 % layout 'common', title => 'Sign in';
89 89
 
90 90
   <!-- Login page -->
91
-  
92
-  %= include '/include/header';
91
+  <div class="text-center" style="margin:15px 0;font-size:18px;">
92
+    Sign in to GitPrep
93
+  </div>
93 94
 
94 95
   <div class="container">
95 96
     % my $id = '';
... ...
@@ -116,13 +117,13 @@
116 117
         <div><%= $error %></div>
117 118
       </div>
118 119
     % }
119
-      
120
+    
120 121
     <div class="well border-gray"
121 122
       style="background:white;padding-top:15px;padding-left:60px;width:300px;margin-left:auto;margin-right:auto"
122 123
     >
123 124
       <form action="<%= url_for->query(op => 'login') %>" method="post">
124 125
         <div class="control-group">
125
-          <label class="control-label" for="user-name">User name</label>
126
+          <label class="control-label" for="user-name">Username</label>
126 127
           <div class="controls">
127 128
             <%= input_tag id => $id, type => 'text', placeholder => 'User', id =>'user-name'%>
128 129
           </div>
-7
templates/auto/_new.html.ep
... ...
@@ -84,13 +84,6 @@
84 84
   %= include '/include/header';
85 85
   
86 86
   <div class="container">
87
-    <ul class="breadcrumb" style="margin-top:10px">
88
-      <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
89
-      /
90
-      % my $user = session('user');
91
-      <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
92
-    </ul>
93
-  
94 87
     % if ($errors) {
95 88
       <div class="alert alert-error">
96 89
         <button type="button" class="close" data-dismiss="alert">&times;</button>
-1
templates/blame.html.ep
... ...
@@ -57,7 +57,6 @@
57 57
   
58 58
   <!-- Blame page -->
59 59
   <div class="container">
60
-    %= include '/include/project_header';
61 60
     <div style="margin-bottom:20px;">
62 61
       %= include '/include/branch_select', display => 'files';
63 62
     </div>
-1
templates/blob.html.ep
... ...
@@ -44,7 +44,6 @@
44 44
   %= include '/include/header';
45 45
 
46 46
   <div class="container">
47
-    %= include '/include/project_header';
48 47
     <div style="margin-bottom:20px;">
49 48
       %= include '/include/branch_select', display => 'files';
50 49
     </div>
-2
templates/branches.html.ep
... ...
@@ -114,8 +114,6 @@
114 114
     %= include '/include/errors', errors => $errors;
115 115
     %= include '/include/message', message => flash('message');
116 116
     
117
-    %= include '/include/project_header';
118
-    
119 117
     <h3 style="font-size:19px">Branches</h3>
120 118
     
121 119
     <div style="margin-bottom:10px">
-1
templates/commit.html.ep
... ...
@@ -49,7 +49,6 @@
49 49
   %= include '/include/header';
50 50
 
51 51
   <div class="container">
52
-    %= include '/include/project_header';
53 52
     <div style="margin-bottom:20px;">
54 53
       %= include '/include/branch_select', display => 'commits';
55 54
     </div>
-1
templates/commits.html.ep
... ...
@@ -118,7 +118,6 @@
118 118
     %= include '/include/header';
119 119
 
120 120
     <div class="container">
121
-      %= include '/include/project_header';
122 121
       <div style="margin-bottom:20px;">
123 122
         %= include '/include/branch_select', display => 'commits';
124 123
       </div>
-1
templates/compare.html.ep
... ...
@@ -95,7 +95,6 @@
95 95
   %= include '/include/header';
96 96
 
97 97
   <div class="container">
98
-    %= include '/include/project_header';
99 98
     <div style="margin-bottom:20px;">
100 99
       %= include '/include/branch_select', display => 'files';
101 100
     </div>
-1
templates/import-branch.html.ep
... ...
@@ -113,7 +113,6 @@
113 113
   % end
114 114
   
115 115
   <div class="container">
116
-    %= include '/include/project_header';
117 116
     % if (my $message = flash('message')) {
118 117
       <div class="alert alert-success">
119 118
         <button type="button" class="close" data-dismiss="alert">&times;</button>
+68 -6
templates/include/header.html.ep
... ...
@@ -1,6 +1,20 @@
1 1
 <%
2 2
   my $api = gitprep_api;
3
-  my $user = session('user') || '';
3
+  my $logined = $api->logined;
4
+
5
+  my $current_user = session('user');
6
+  my $user = param('user');
7
+
8
+  my $project = param('project');
9
+  my $original_user;
10
+  my $original_project;
11
+  my $is_private_project;
12
+  
13
+  if (defined $project) {
14
+    $original_user = app->manager->original_user($user, $project);
15
+    $original_project = app->manager->original_project($user, $project);
16
+    $is_private_project = app->manager->is_private_project($user, $project);
17
+  }
4 18
 %>
5 19
 
6 20
 <div style="background:#f5f5f5">
... ...
@@ -19,14 +33,14 @@
19 33
       <div class="span6 text-right">
20 34
         <div style="margin:0; padding-top:12px">
21 35
           % if ($api->logined) {
22
-            % unless ($user eq 'admin') {
36
+            % unless ($current_user eq 'admin') {
23 37
               <a class="btn btn-small" href="<%= url_for("/_new") %>">Create a new repo</a>
24
-              <a class="btn btn-small" href="<%= url_for("/$user/_settings") %>">Account Settings</a>
38
+              <a class="btn btn-small" href="<%= url_for("/$current_user/_settings") %>">Account Settings</a>
25 39
             % }
26 40
             % my $url = url_with->to_abs;
27 41
             <a class="btn btn-small" href="<%= url_for("/_logout?from=$url") %>">Sign out</a>
28
-            <!-- Logined as <%= $user %> -->
29
-            <i class="icon-user"></i><a href="<%= url_for("/$user") %>"><%= $user %></a>
42
+            <!-- Logined as <%= $current_user %> -->
43
+            <i class="icon-user"></i><a href="<%= url_for("/$current_user") %>"><%= $current_user %></a>
30 44
           % } else {
31 45
             <a class="btn btn-primary" href="<%= url_for('/_login') %>">Sign in</a>
32 46
           % }
... ...
@@ -35,4 +49,52 @@
35 49
     </div>
36 50
   </div>
37 51
 </div>
38
-<hr style="margin-top:0;margin-bottom:10px">
52
+<hr style="margin:0;">
53
+
54
+% if (defined $user || defined $project) {
55
+  <div style="padding-top:10px;background:#fafafa;border-bottom:1px solid #eee;margin-bottom:10px;">
56
+    <div class="container">
57
+      <div class="row" style="margin-bottom:10px">
58
+        <div class="span9">
59
+          <ul class="breadcrumb" style="margin:0;background:none;padding-left:0;font-size:16px;">
60
+            <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
61
+            /
62
+            <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
63
+            % if (defined $project) {
64
+              /
65
+              <li><b><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></b></li>
66
+            % }
67
+            
68
+            % if ($is_private_project) {
69
+              <i class="icon icon-lock" style="margin-left:5px;margin-right:5px"></i>
70
+            % }
71
+            
72
+            % if (defined $original_project) {
73
+              (
74
+                forked from
75
+                <a href="<%= url_for("/$original_user/$original_project") %>">
76
+                  <%= "$original_user/$original_project" %>
77
+                </a>
78
+              )
79
+            % }
80
+          </ul>
81
+        </div>
82
+        % if (defined $project) {
83
+          <div class="span3">
84
+            <a class="btn" href="<%= url_for("/$user/$project/network") %>" >Network</a>
85
+            % if ($logined && $current_user ne $user ) {
86
+              <a href="<%= url_for("/$user/$project/fork") %>" class="btn">Fork</a>
87
+            % } else {
88
+              <button class="btn disabled" disabled>Fork</button>
89
+            % }
90
+            % if ($logined && $user eq session('user')) {
91
+              <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
92
+            % } else {
93
+              <button class="btn disabled" disabled>Settings</button>
94
+            % }
95
+          </div>
96
+        % }
97
+      </div>
98
+    </div>
99
+  </div>
100
+% }
-47
templates/include/project_header.html.ep
... ...
@@ -1,47 +0,0 @@
1
-<%
2
-  my $api = gitprep_api;
3
-  my $logined = $api->logined;
4
-  my $current_user = session('user');
5
-  my $user = stash('user');
6
-  my $original_user = app->manager->original_user($user, $project);
7
-  my $original_project = app->manager->original_project($user, $project);
8
-  my $is_private_project = app->manager->is_private_project($user, $project);
9
-%>
10
-
11
-<div class="row" style="margin-bottom:10px">
12
-  <div class="span9">
13
-    <ul class="breadcrumb" style="margin:0">
14
-      <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
15
-      /
16
-      <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
17
-      /
18
-      <li><b><a href="<%= url_for("/$user/$project") %>"><%= $project %></a></b></li>
19
-      
20
-      % if ($is_private_project) {
21
-        <i class="icon icon-lock" style="margin-left:5px;margin-right:5px"></i>
22
-      % }
23
-      
24
-      % if (defined $original_project) {
25
-        (
26
-          forked from
27
-          <a href="<%= url_for("/$original_user/$original_project") %>">
28
-            <%= "$original_user/$original_project" %>
29
-          </a>
30
-        )
31
-      % }
32
-    </ul>
33
-  </div>
34
-  <div class="span3">
35
-    <a class="btn" href="<%= url_for("/$user/$project/network") %>" >Network</a>
36
-    % if ($logined && $current_user ne $user ) {
37
-      <a href="<%= url_for("/$user/$project/fork") %>" class="btn">Fork</a>
38
-    % } else {
39
-      <button class="btn disabled" disabled>Fork</button>
40
-    % }
41
-    % if ($logined && $user eq session('user')) {
42
-      <a class="btn" href="<%= url_for("/$user/$project/settings") %>">Settings</a>
43
-    % } else {
44
-      <button class="btn disabled" disabled>Settings</button>
45
-    % }
46
-  </div>
47
-</div>
-1
templates/network.html.ep
... ...
@@ -53,7 +53,6 @@
53 53
   %= include '/include/header';
54 54
 
55 55
   <div class="container" style="min-heigth:500px">
56
-    %= include '/include/project_header';
57 56
     <h3>Members of the <%= $project %> Network</h3>
58 57
     <div class="well" style="padding:5px 10px 0 10px;margin-bottom:20px">
59 58
       <span class="label label-info">My branch</span>
-1
templates/network/graph.html.ep
... ...
@@ -58,7 +58,6 @@
58 58
   % end
59 59
   
60 60
   <div class="container">
61
-    %= include '/include/project_header';
62 61
     <h3>Graph</h3>
63 62
     <div style="margin-bottom:20px">Compare 100 commits.</div>
64 63
     <div style="margin-bottom:10px">
-1
templates/project.html.ep
... ...
@@ -112,7 +112,6 @@
112 112
   
113 113
   <div class="container">
114 114
     %= include '/include/message', message => flash('message');
115
-    %= include '/include/project_header';
116 115
     
117 116
     <h3 style="font-weight:normal;color:#666;margin:20px 0px 20px 0;font-size:16px;line-height:0">
118 117
       <%= $desc %>
-1
templates/settings.html.ep
... ...
@@ -171,7 +171,6 @@
171 171
   <div class="container">
172 172
     %= include '/include/errors', errors => $errors;
173 173
     %= include '/include/message', message => flash('message');
174
-    %= include '/include/project_header';
175 174
     
176 175
     <div class="row">
177 176
       <div class="span2">
-1
templates/settings/collaboration.html.ep
... ...
@@ -106,7 +106,6 @@
106 106
   <div class="container">
107 107
     %= include '/include/errors', errors => $errors;
108 108
     %= include '/include/message', message => flash('message');
109
-    %= include '/include/project_header';
110 109
     
111 110
     <div class="row">
112 111
       <div class="span2">
-2
templates/submodule.html.ep
... ...
@@ -42,11 +42,9 @@
42 42
 <% layout 'common' , title => "$project/$file at $rev \x{30fb} $user/$project",
43 43
      stylesheets => ['/js/google-code-prettify/prettify.css']; %>
44 44
 
45
-%
46 45
   %= include '/include/header';
47 46
 
48 47
   <div class="container">
49
-    %= include '/include/project_header';
50 48
     <div style="margin-bottom:20px;">
51 49
       %= include '/include/branch_select', display => 'files';
52 50
     </div>
-1
templates/tags.html.ep
... ...
@@ -28,7 +28,6 @@
28 28
   %= include '/include/header';
29 29
 
30 30
   <div class="container">
31
-    %= include '/include/project_header';
32 31
     
33 32
     <h3 style="font-size:20px">Tags</h3>
34 33
     
-1
templates/tree.html.ep
... ...
@@ -36,7 +36,6 @@
36 36
   %= include '/include/header';
37 37
 
38 38
   <div class="container">
39
-    %= include '/include/project_header';
40 39
     <div style="margin-bottom:20px;">
41 40
       %= include '/include/branch_select', display => 'files';
42 41
     </div>
-5
templates/user-settings.html.ep
... ...
@@ -18,11 +18,6 @@
18 18
   %= include '/include/header';
19 19
   
20 20
   <div class="container">
21
-    <ul class="breadcrumb" style="margin-top:10px">
22
-      <li><a href="<%= url_for('/') %>">Home</a></li>
23
-      /
24
-      <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
25
-    </ul>
26 21
     <div class="row">
27 22
       <div class="span2">
28 23
         <ul class="nav nav-tabs nav-stacked">
-6
templates/user.html.ep
... ...
@@ -32,12 +32,6 @@
32 32
   <div class="container">
33 33
     <div>
34 34
       %= include '/include/message', message => flash('message');
35
-      
36
-      <ul class="breadcrumb" style="margin-top:10px">
37
-        <li><a href="<%= url_for('/') %>"><i class="icon-home"></i></a></li>
38
-        /
39
-        <li><a href="<%= url_for("/$user") %>"><%= $user %></a></li>
40
-      </ul>
41 35
 
42 36
       <h3>Repositories</h3>
43 37