##// END OF EJS Templates
tables: unified tables for main pages of rhodecode repo pages.
marcink -
r4511:c6ccda60 stable
parent child Browse files
Show More
@@ -2660,6 +2660,7 b' h3.files_location{'
2660 li {
2660 li {
2661 list-style-type: none
2661 list-style-type: none
2662 }
2662 }
2663
2663 }
2664 }
2664
2665
2665 .grid-filter-box-icon {
2666 .grid-filter-box-icon {
@@ -477,23 +477,3 b''
477 }
477 }
478
478
479 }
479 }
480
481 .rctable.repo_summary {
482 border: 1px solid #eaeaea;
483 border-radius: 2px;
484 border-collapse: inherit;
485 border-bottom: 0;
486
487 th {
488 background: @grey7;
489 border-bottom: 0;
490 }
491
492 td {
493 border-color: #eaeaea;
494 }
495
496 td.td-status {
497 padding: 0 0 0 10px;
498 }
499 }
@@ -4,6 +4,25 b''
4 // see style guide documentation for guidelines.
4 // see style guide documentation for guidelines.
5
5
6 // TABLES
6 // TABLES
7 table.rctable.table-bordered {
8 border: 1px solid #eaeaea;
9 border-radius: 2px;
10 border-collapse: inherit;
11 border-bottom: 0;
12
13 th {
14 background: @grey7;
15 border-bottom: 0;
16 }
17
18 td {
19 border-color: #eaeaea;
20 }
21
22 td.td-status {
23 padding: 0 0 0 10px;
24 }
25 }
7
26
8 .rctable,
27 .rctable,
9 table.rctable,
28 table.rctable,
@@ -306,12 +325,14 b' table.dataTable {'
306 }
325 }
307 }
326 }
308 }
327 }
328
309 .rctable.audit-log {
329 .rctable.audit-log {
310 td {
330 td {
311 vertical-align: top;
331 vertical-align: top;
312 }
332 }
313 }
333 }
314
334
335
315 // TRUNCATING
336 // TRUNCATING
316 // TODO: lisaq: should this possibly be moved out of tables.less?
337 // TODO: lisaq: should this possibly be moved out of tables.less?
317 // for truncated text
338 // for truncated text
@@ -426,15 +447,6 b' table.keyboard-mappings {'
426 }
447 }
427 }
448 }
428
449
429 // Pull Request List Table
430 #pull_request_list_table.dataTable {
431
432 //TODO: lisa: This needs to be removed once the description is adjusted
433 // for using an expand_commit button (see issue 765)
434 td {
435 vertical-align: middle;
436 }
437 }
438
450
439 // Settings (no border)
451 // Settings (no border)
440 table.rctable.dl-settings {
452 table.rctable.dl-settings {
@@ -484,9 +496,6 b' table.trending_language_tbl {'
484
496
485 // Changesets
497 // Changesets
486 #changesets.rctable {
498 #changesets.rctable {
487 th {
488 padding: 0 1em 0.65em 0;
489 }
490
499
491 // td must be fixed height for graph
500 // td must be fixed height for graph
492 td {
501 td {
@@ -344,6 +344,10 b' mark,'
344 width: 200px;
344 width: 200px;
345 }
345 }
346
346
347 #obj_count {
348 line-height: 34px;
349 }
350
347 }
351 }
348
352
349 #readme .title {
353 #readme .title {
@@ -75,8 +75,8 b' var CommitsController = function () {'
75 height: height,
75 height: height,
76 x_step: x_step,
76 x_step: x_step,
77 y_step: 42,
77 y_step: 42,
78 dotRadius: 3.5,
78 dotRadius: 3.8,
79 lineWidth: 2.5
79 lineWidth: 2.8
80 };
80 };
81
81
82 var prevCommitsData = this.$graphCanvas.data('commits') || [];
82 var prevCommitsData = this.$graphCanvas.data('commits') || [];
@@ -98,11 +98,12 b' var CommitsController = function () {'
98
98
99 this.setLabelText(edgeData);
99 this.setLabelText(edgeData);
100
100
101 var padding = 90;
101 // main padding from top, aligns the first dot graph
102 var padding = 100;
102 if (prev_link) {
103 if (prev_link) {
103 padding += 34;
104 padding += 34;
105 }
104
106
105 }
106 $('#graph_nodes').css({'padding-top': padding});
107 $('#graph_nodes').css({'padding-top': padding});
107
108
108 $.each($('.message.truncate'), function(idx, value) {
109 $.each($('.message.truncate'), function(idx, value) {
@@ -33,7 +33,7 b''
33 <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
33 <h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
34 </div>
34 </div>
35 <div class="panel-body panel-body-min-height">
35 <div class="panel-body panel-body-min-height">
36 <table id="pull_request_list_table" class="display"></table>
36 <table id="pull_request_list_table" class="rctable table-bordered"></table>
37 </div>
37 </div>
38 </div>
38 </div>
39
39
@@ -30,11 +30,21 b''
30 </ul>
30 </ul>
31 %endif
31 %endif
32 %if c.has_references:
32 %if c.has_references:
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
33 <div class="grid-quick-filter">
34 <span id="obj_count">0</span> ${_('bookmarks')}
34 <ul class="grid-filter-box">
35 <li class="grid-filter-box-icon">
36 <i class="icon-search"></i>
37 </li>
38 <li class="grid-filter-box-input">
39 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
40 </li>
41 </ul>
42 </div>
43 <div id="obj_count">0</div>
35 %endif
44 %endif
36 </div>
45 </div>
37 <table id="obj_list_table" class="display"></table>
46
47 <table id="obj_list_table" class="rctable table-bordered"></table>
38 </div>
48 </div>
39
49
40
50
@@ -43,7 +53,9 b''
43
53
44 var get_datatable_count = function(){
54 var get_datatable_count = function(){
45 var api = $('#obj_list_table').dataTable().api();
55 var api = $('#obj_list_table').dataTable().api();
46 $('#obj_count').text(api.page.info().recordsDisplay);
56 var total = api.page.info().recordsDisplay
57 var _text = _ngettext('{0} bookmark', '{0} bookmarks', total).format(total);
58 $('#obj_count').text(_text);
47 };
59 };
48
60
49 // object list
61 // object list
@@ -30,11 +30,20 b''
30 </ul>
30 </ul>
31 %endif
31 %endif
32 %if c.has_references:
32 %if c.has_references:
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
33 <div class="grid-quick-filter">
34 <span id="obj_count">0</span> ${_('branches')}
34 <ul class="grid-filter-box">
35 <li class="grid-filter-box-icon">
36 <i class="icon-search"></i>
37 </li>
38 <li class="grid-filter-box-input">
39 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
40 </li>
41 </ul>
42 </div>
43 <div id="obj_count">0</div>
35 %endif
44 %endif
36 </div>
45 </div>
37 <table id="obj_list_table" class="display"></table>
46 <table id="obj_list_table" class="rctable table-bordered"></table>
38 </div>
47 </div>
39
48
40 <script type="text/javascript">
49 <script type="text/javascript">
@@ -42,7 +51,10 b''
42
51
43 var get_datatable_count = function(){
52 var get_datatable_count = function(){
44 var api = $('#obj_list_table').dataTable().api();
53 var api = $('#obj_list_table').dataTable().api();
45 $('#obj_count').text(api.page.info().recordsDisplay);
54 var total = api.page.info().recordsDisplay
55 var _text = _ngettext('{0} branch', '{0} branches', total).format(total);
56
57 $('#obj_count').text(_text);
46 };
58 };
47
59
48 // object list
60 // object list
@@ -99,7 +99,7 b''
99 <div id="graph_content" class="graph_full_width">
99 <div id="graph_content" class="graph_full_width">
100
100
101 <div class="table">
101 <div class="table">
102 <table id="changesets" class="rctable">
102 <table id="changesets" class="rctable table-bordered">
103 <tr>
103 <tr>
104 ## checkbox
104 ## checkbox
105 <th colspan="4">
105 <th colspan="4">
@@ -10,7 +10,7 b''
10 default_landing_ref = c.commit.raw_id
10 default_landing_ref = c.commit.raw_id
11 %>
11 %>
12 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
12 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
13 <table class="code-browser rctable repo_summary">
13 <table class="code-browser rctable table-bordered">
14 <thead>
14 <thead>
15 <tr>
15 <tr>
16 <th>${_('Name')}</th>
16 <th>${_('Name')}</th>
@@ -61,7 +61,7 b''
61 </div>
61 </div>
62
62
63 <div class="main-content-full-width">
63 <div class="main-content-full-width">
64 <table id="pull_request_list_table" class="display"></table>
64 <table id="pull_request_list_table" class="rctable table-bordered"></table>
65 </div>
65 </div>
66
66
67 </div>
67 </div>
@@ -1,11 +1,11 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 <%namespace name="base" file="/base/base.mako"/>
2 <%namespace name="base" file="/base/base.mako"/>
3 %if c.repo_commits:
3 %if c.repo_commits:
4 <table class="rctable repo_summary table_disp">
4 <table class="rctable table-bordered">
5 <tr>
5 <tr>
6
6
7 <th class="status"></th>
7 <th class="status"></th>
8 <th>${_('Commit')}</th>
8 <th></th>
9 <th>${_('Commit message')}</th>
9 <th>${_('Commit message')}</th>
10 <th>${_('Age')}</th>
10 <th>${_('Age')}</th>
11 <th>${_('Author')}</th>
11 <th>${_('Author')}</th>
@@ -30,11 +30,20 b''
30 </ul>
30 </ul>
31 %endif
31 %endif
32 %if c.has_references:
32 %if c.has_references:
33 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
33 <div class="grid-quick-filter">
34 <span id="obj_count">0</span> ${_('tags')}
34 <ul class="grid-filter-box">
35 <li class="grid-filter-box-icon">
36 <i class="icon-search"></i>
37 </li>
38 <li class="grid-filter-box-input">
39 <input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
40 </li>
41 </ul>
42 </div>
43 <div id="obj_count">0</div>
35 %endif
44 %endif
36 </div>
45 </div>
37 <table id="obj_list_table" class="display"></table>
46 <table id="obj_list_table" class="rctable table-bordered"></table>
38 </div>
47 </div>
39
48
40
49
@@ -43,7 +52,10 b''
43
52
44 var get_datatable_count = function(){
53 var get_datatable_count = function(){
45 var api = $('#obj_list_table').dataTable().api();
54 var api = $('#obj_list_table').dataTable().api();
46 $('#obj_count').text(api.page.info().recordsDisplay);
55 var total = api.page.info().recordsDisplay
56 var _text = _ngettext('{0} tag', '{0} tags', total).format(total);
57
58 $('#obj_count').text(_text);
47 };
59 };
48
60
49 // object list
61 // object list
General Comments 0
You need to be logged in to leave comments. Login now