##// END OF EJS Templates
pull-requests: fixed layout to be more similar to the designed one.
dan -
r3757:35014215 new-ui
parent child Browse files
Show More
@@ -422,3 +422,23 b' input[type="reset"] {'
422 }
422 }
423 }
423 }
424
424
425
426 .button-links {
427 float: left;
428 display: inline;
429 margin: 0;
430 padding-left: 0;
431 list-style: none;
432 text-align: right;
433
434 li {
435
436
437 }
438
439 li.active {
440 background-color: @grey6;
441 .border ( @border-thickness, @grey4 );
442 }
443
444 }
@@ -20,34 +20,34 b''
20
20
21
21
22 <%def name="main()">
22 <%def name="main()">
23 <style>
24
25 </style>
26
23 <div class="box">
27 <div class="box">
24 <div class="title">
28 <div class="title">
25 <ul class="links">
29 <ul class="button-links">
30 <li class="btn ${('active' if c.active=='open' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0})}">${_('Opened')}</a></li>
31 <li class="btn ${('active' if c.active=='my' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'my':1})}">${_('Opened by me')}</a></li>
32 <li class="btn ${('active' if c.active=='awaiting' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'awaiting_review':1})}">${_('Awaiting review')}</a></li>
33 <li class="btn ${('active' if c.active=='awaiting_my' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'awaiting_my_review':1})}">${_('Awaiting my review')}</a></li>
34 <li class="btn ${('active' if c.active=='closed' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'closed':1})}">${_('Closed')}</a></li>
35 <li class="btn ${('active' if c.active=='source' else '')}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':1})}">${_('From this repo')}</a></li>
36 </ul>
37
38 <ul class="links">
39 % if c.rhodecode_user.username != h.DEFAULT_USER:
26 <li>
40 <li>
27 %if c.rhodecode_user.username != h.DEFAULT_USER:
28 <span>
41 <span>
29 <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">
42 <a id="open_new_pull_request" class="btn btn-small btn-success" href="${h.route_path('pullrequest_new',repo_name=c.repo_name)}">
30 ${_('Open new Pull Request')}
43 ${_('Open new Pull Request')}
31 </a>
44 </a>
32 </span>
45 </span>
33 %endif
34 </li>
46 </li>
35 </ul>
47 % endif
48 </ul>
36
49
37 ${self.breadcrumbs()}
50 ${self.breadcrumbs()}
38 </div>
39
40 <div class="sidebar-col-wrapper">
41 ##main
42 <div class="sidebar">
43 <ul class="nav nav-pills nav-stacked">
44 <li class="${'active' if c.active=='open' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0})}">${_('Opened')}</a></li>
45 <li class="${'active' if c.active=='my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'my':1})}">${_('Opened by me')}</a></li>
46 <li class="${'active' if c.active=='awaiting' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'awaiting_review':1})}">${_('Awaiting review')}</a></li>
47 <li class="${'active' if c.active=='awaiting_my' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'awaiting_my_review':1})}">${_('Awaiting my review')}</a></li>
48 <li class="${'active' if c.active=='closed' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':0,'closed':1})}">${_('Closed')}</a></li>
49 <li class="${'active' if c.active=='source' else ''}"><a href="${h.route_path('pullrequest_show_all',repo_name=c.repo_name, _query={'source':1})}">${_('From this repo')}</a></li>
50 </ul>
51 </div>
51 </div>
52
52
53 <div class="main-content-full-width">
53 <div class="main-content-full-width">
@@ -74,7 +74,7 b''
74 </div>
74 </div>
75 </div>
75 </div>
76 </div>
76 </div>
77 </div>
77
78 </div>
78 </div>
79
79
80 <script type="text/javascript">
80 <script type="text/javascript">
General Comments 0
You need to be logged in to leave comments. Login now