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
@@ -960,9 +960,6 @@ label {
}
-#graph_nodes {
- padding-top: 43px;
-}
#graph_content{
@@ -995,13 +992,12 @@ label {
}
.graph-col-wrapper {
- padding-left: 110px;
#graph_nodes {
width: 100px;
- margin-left: -110px;
- float: left;
- clear: left;
+ position: absolute;
+ left: 120px;
+ z-index: -1;
}
}
@@ -1018,6 +1014,16 @@ label {
}
}
+.obsolete-toggle {
+ line-height: 30px;
+ margin-left: -15px;
+}
+
+#rev_range_container, #rev_range_clear, #rev_range_more {
+ margin-top: -5px;
+ margin-bottom: -5px;
+}
+
#filter_changelog {
float: left;
}
diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less
--- a/rhodecode/public/css/navigation.less
+++ b/rhodecode/public/css/navigation.less
@@ -621,14 +621,6 @@ ul#context-pages {
font-family: @text-regular;
color: @grey1;
- graph_nodes {
- clear:both;
- width: auto;
- margin-left: -100px;
- padding: 0;
- border: none;
- }
-
.nav-pills {
margin: 0;
}
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
@@ -118,6 +118,10 @@ table.dataTable {
}
}
+ &.td-graphbox {
+ width: 140px;
+ }
+
&.td-time {
width: 160px;
white-space: nowrap;
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
@@ -46,6 +46,8 @@ var CommitsController = function () {
self.$graphCanvas.html('');
var edgeData = $("[data-graph]").data('graph') || this.$graphCanvas.data('graph') || [];
+ var prev_link = $('.load-more-commits').find('.prev-commits').get(0);
+ var next_link = $('.load-more-commits').find('.next-commits').get(0);
// Determine max number of edges per row in graph
var edgeCount = 1;
@@ -57,10 +59,20 @@ var CommitsController = function () {
});
});
+ if (prev_link && next_link) {
+ var graph_padding = -64;
+ }
+ else if (next_link) {
+ var graph_padding = -32;
+ } else {
+ var graph_padding = 0;
+ }
+
var x_step = Math.min(10, Math.floor(86 / edgeCount));
+ var height = $('#changesets').find('.commits-range').height() + graph_padding;
var graph_options = {
width: 100,
- height: $('#changesets').find('.commits-range').height(),
+ height: height,
x_step: x_step,
y_step: 42,
dotRadius: 3.5,
@@ -85,11 +97,11 @@ var CommitsController = function () {
this.$graphCanvas.commits(graph_options);
this.setLabelText(edgeData);
- if ($('.load-more-commits').find('.prev-commits').get(0)) {
- var padding = 75;
- } else {
- var padding = 43;
+ var padding = 98;
+ if (prev_link) {
+ padding += 32;
+
}
$('#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
@@ -29,10 +29,30 @@
<%def name="main()">
+
+
+ ${h.hidden('branch_filter')}
+ %if c.selected_name:
+
+ ${_('Clear filter')}
+
+ %endif
+
+
@@ -73,29 +88,7 @@
@@ -103,14 +96,23 @@
-
+
## checkbox
- |
- |
+
+ ## clear selection
+
+
+
+ ${_('Select second commit')}
+
+ |
+ ## graph
+
+ ## review box
${_('Commit')} |
@@ -135,6 +137,9 @@
+
+ ${_ungettext('showing %d out of %d commit', 'showing %d out of %d commits', c.showing_commits) % (c.showing_commits, c.total_cs)}
+