# HG changeset patch # User Marcin Kuzminski # Date 2019-06-28 19:15:01 # Node ID c26fb0fb0295f5d7e6f6232f4c589d174a22cab5 # Parent 1da45f27db23156d5fbfcb45c7f2234edce77498 ui: fixed commits page details diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -996,7 +996,7 @@ label { #graph_nodes { width: 100px; position: absolute; - left: 120px; + left: 70px; z-index: -1; } } diff --git a/rhodecode/public/css/tables.less b/rhodecode/public/css/tables.less --- a/rhodecode/public/css/tables.less +++ b/rhodecode/public/css/tables.less @@ -119,7 +119,9 @@ table.dataTable { } &.td-graphbox { - width: 140px; + width: 100px; + max-width: 100px; + min-width: 100px; } &.td-time { @@ -433,6 +435,9 @@ table.trending_language_tbl { // Changesets #changesets.rctable { + th { + padding: 0 1em 0.65em 0; + } // td must be fixed height for graph td { diff --git a/rhodecode/public/js/src/rhodecode/changelog.js b/rhodecode/public/js/src/rhodecode/changelog.js --- a/rhodecode/public/js/src/rhodecode/changelog.js +++ b/rhodecode/public/js/src/rhodecode/changelog.js @@ -98,9 +98,9 @@ var CommitsController = function () { this.setLabelText(edgeData); - var padding = 98; + var padding = 90; if (prev_link) { - padding += 32; + padding += 34; } $('#graph_nodes').css({'padding-top': padding}); diff --git a/rhodecode/templates/commits/changelog.mako b/rhodecode/templates/commits/changelog.mako --- a/rhodecode/templates/commits/changelog.mako +++ b/rhodecode/templates/commits/changelog.mako @@ -110,11 +110,6 @@ - ## graph - - ## review box - - ${_('Commit')} ## commit message expand arrow @@ -184,8 +179,12 @@ var lbl_start = 'r{0}:{1}'.format(commitStart.commitIdx, commitStart.commitId.substr(0,6)); var lbl_end = 'r{0}:{1}'.format(commitEnd.commitIdx, commitEnd.commitId.substr(0,6)); + + var lbl_start = '{0}'.format(commitStart.commitId.substr(0,6)); + var lbl_end = '{0}'.format(commitEnd.commitId.substr(0,6)); + var url = pyroutes.url('repo_commit', {'repo_name': '${c.repo_name}', 'commit_id': revStart+'...'+revEnd}); - var link = _gettext('Show selected commits {0} ... {1}').format(lbl_start, lbl_end); + var link = _gettext('Show commit range {0} ... {1}').format(lbl_start, lbl_end); if (selectedCheckboxes.length > 1) { $commitRangeClear.show(); diff --git a/rhodecode/templates/commits/changelog_elements.mako b/rhodecode/templates/commits/changelog_elements.mako --- a/rhodecode/templates/commits/changelog_elements.mako +++ b/rhodecode/templates/commits/changelog_elements.mako @@ -3,7 +3,7 @@ % if c.prev_page: - + ${_('load previous')}