engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tables: unified tables for main pages of rhodecode repo pages.

Browse source
This commit is contained in:
Marcin Kuzminski 2020-10-08 12:50:57 +02:00
parent 508c8ba158
commit e9f4c90062
13 changed files with 85 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

1
rhodecode/public/css/main.less
View file

@ -2660,6 +2660,7 @@ h3.files_location{
li {
list-style-type: none
}
}
.grid-filter-box-icon {

20
rhodecode/public/css/summary.less
View file

@ -477,23 +477,3 @@
}
}
.rctable.repo_summary {
border: 1px solid #eaeaea;
border-radius: 2px;
border-collapse: inherit;
border-bottom: 0;
th {
background: @grey7;
border-bottom: 0;
}
td {
border-color: #eaeaea;
}
td.td-status {
padding: 0 0 0 10px;
}
}

33
rhodecode/public/css/tables.less
View file

@ -4,6 +4,25 @@
// see style guide documentation for guidelines.
// TABLES
table.rctable.table-bordered {
border: 1px solid #eaeaea;
border-radius: 2px;
border-collapse: inherit;
border-bottom: 0;
th {
background: @grey7;
border-bottom: 0;
}
td {
border-color: #eaeaea;
}
td.td-status {
padding: 0 0 0 10px;
}
}
.rctable,
table.rctable,
@ -306,12 +325,14 @@ table.dataTable {
}
}
}
.rctable.audit-log {
td {
vertical-align: top;
}
}
// TRUNCATING
// TODO: lisaq: should this possibly be moved out of tables.less?
// for truncated text
@ -426,15 +447,6 @@ table.keyboard-mappings {
}
}
// Pull Request List Table
#pull_request_list_table.dataTable {
//TODO: lisa: This needs to be removed once the description is adjusted
// for using an expand_commit button (see issue 765)
td {
vertical-align: middle;
}
}
// Settings (no border)
table.rctable.dl-settings {
@ -484,9 +496,6 @@ table.trending_language_tbl {
// Changesets
#changesets.rctable {
th {
padding: 0 1em 0.65em 0;
}
// td must be fixed height for graph
td {

4
rhodecode/public/css/type.less
View file

@ -344,6 +344,10 @@ mark,
width: 200px;
}
#obj_count {
line-height: 34px;
}
}
#readme .title {

9
rhodecode/public/js/src/rhodecode/changelog.js
View file

@ -75,8 +75,8 @@ var CommitsController = function () {
height: height,
x_step: x_step,
y_step: 42,
dotRadius: 3.5,
lineWidth: 2.5
dotRadius: 3.8,
lineWidth: 2.8
};
var prevCommitsData = this.$graphCanvas.data('commits') || [];
@ -98,11 +98,12 @@ var CommitsController = function () {
this.setLabelText(edgeData);
var padding = 90;
// main padding from top, aligns the first dot graph
var padding = 100;
if (prev_link) {
padding += 34;
}
$('#graph_nodes').css({'padding-top': padding});
$.each($('.message.truncate'), function(idx, value) {

2
rhodecode/templates/admin/my_account/my_account_pullrequests.mako
View file

@ -33,7 +33,7 @@
<h3 class="panel-title">${_('Pull Requests You Participate In')}</h3>
</div>
<div class="panel-body panel-body-min-height">
<table id="pull_request_list_table" class="display"></table>
<table id="pull_request_list_table" class="rctable table-bordered"></table>
</div>
</div>

20
rhodecode/templates/bookmarks/bookmarks.mako
View file

@ -30,11 +30,21 @@
</ul>
%endif
%if c.has_references:
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
<span id="obj_count">0</span> ${_('bookmarks')}
<div class="grid-quick-filter">
<ul class="grid-filter-box">
<li class="grid-filter-box-icon">
<i class="icon-search"></i>
</li>
<li class="grid-filter-box-input">
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
</li>
</ul>
</div>
<div id="obj_count">0</div>
%endif
</div>
<table id="obj_list_table" class="display"></table>
<table id="obj_list_table" class="rctable table-bordered"></table>
</div>
@ -43,7 +53,9 @@ $(document).ready(function() {
var get_datatable_count = function(){
var api = $('#obj_list_table').dataTable().api();
$('#obj_count').text(api.page.info().recordsDisplay);
var total = api.page.info().recordsDisplay
var _text = _ngettext('{0} bookmark', '{0} bookmarks', total).format(total);
$('#obj_count').text(_text);
};
// object list

20
rhodecode/templates/branches/branches.mako
View file

@ -30,11 +30,20 @@
</ul>
%endif
%if c.has_references:
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
<span id="obj_count">0</span> ${_('branches')}
<div class="grid-quick-filter">
<ul class="grid-filter-box">
<li class="grid-filter-box-icon">
<i class="icon-search"></i>
</li>
<li class="grid-filter-box-input">
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
</li>
</ul>
</div>
<div id="obj_count">0</div>
%endif
</div>
<table id="obj_list_table" class="display"></table>
<table id="obj_list_table" class="rctable table-bordered"></table>
</div>
<script type="text/javascript">
@ -42,7 +51,10 @@ $(document).ready(function() {
var get_datatable_count = function(){
var api = $('#obj_list_table').dataTable().api();
$('#obj_count').text(api.page.info().recordsDisplay);
var total = api.page.info().recordsDisplay
var _text = _ngettext('{0} branch', '{0} branches', total).format(total);
$('#obj_count').text(_text);
};
// object list

2
rhodecode/templates/commits/changelog.mako
View file

@ -99,7 +99,7 @@
<div id="graph_content" class="graph_full_width">
<div class="table">
<table id="changesets" class="rctable">
<table id="changesets" class="rctable table-bordered">
<tr>
## checkbox
<th colspan="4">

2
rhodecode/templates/files/files_browser_tree.mako
View file

@ -10,7 +10,7 @@
default_landing_ref = c.commit.raw_id
%>
<div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
<table class="code-browser rctable repo_summary">
<table class="code-browser rctable table-bordered">
<thead>
<tr>
<th>${_('Name')}</th>

2
rhodecode/templates/pullrequests/pullrequests.mako
View file

@ -61,7 +61,7 @@
</div>
<div class="main-content-full-width">
<table id="pull_request_list_table" class="display"></table>
<table id="pull_request_list_table" class="rctable table-bordered"></table>
</div>
</div>

4
rhodecode/templates/summary/summary_commits.mako
View file

@ -1,11 +1,11 @@
## -*- coding: utf-8 -*-
<%namespace name="base" file="/base/base.mako"/>
%if c.repo_commits:
<table class="rctable repo_summary table_disp">
<table class="rctable table-bordered">
<tr>
<th class="status"></th>
<th>${_('Commit')}</th>
<th></th>
<th>${_('Commit message')}</th>
<th>${_('Age')}</th>
<th>${_('Author')}</th>

20
rhodecode/templates/tags/tags.mako
View file

@ -30,11 +30,20 @@
</ul>
%endif
%if c.has_references:
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
<span id="obj_count">0</span> ${_('tags')}
<div class="grid-quick-filter">
<ul class="grid-filter-box">
<li class="grid-filter-box-icon">
<i class="icon-search"></i>
</li>
<li class="grid-filter-box-input">
<input class="q_filter_box" id="q_filter" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
</li>
</ul>
</div>
<div id="obj_count">0</div>
%endif
</div>
<table id="obj_list_table" class="display"></table>
<table id="obj_list_table" class="rctable table-bordered"></table>
</div>
@ -43,7 +52,10 @@ $(document).ready(function() {
var get_datatable_count = function(){
var api = $('#obj_list_table').dataTable().api();
$('#obj_count').text(api.page.info().recordsDisplay);
var total = api.page.info().recordsDisplay
var _text = _ngettext('{0} tag', '{0} tags', total).format(total);
$('#obj_count').text(_text);
};
// object list