# HG changeset patch # User Marcin Kuzminski # Date 2018-11-02 08:27:06 # Node ID d9b9ddddd83caaf48e7a66d3a14d166636e4c32d # Parent 3a350ddc10a32e6491b160a71b7803caee75fa33 commits: unified expand commit logic and UI. - also added cursor for whole clickable element not just the arrow. 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 @@ -623,11 +623,6 @@ input::-moz-focus-inner { border:0; padd display: block; } -//TODO: lisa: this should be in tables -.show_more_col { - width: 20px; -} - //FORMS .medium-inline, 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 @@ -230,6 +230,8 @@ table.dataTable { &.expand_commit { padding-right: 0; padding-left: 1em; + cursor: pointer; + width: 20px; } } @@ -445,6 +447,8 @@ table.trending_language_tbl { &.expand_commit { padding-right: 0; + cursor: pointer; + width: 20px; } } } 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 @@ -142,7 +142,8 @@ var CommitsController = function () { }) }; - this.expandCommit = function (node) { + this.expandCommit = function (node, reloadGraph) { + reloadGraph = reloadGraph || false; var target_expand = $(node); var cid = target_expand.data('commitId'); @@ -179,7 +180,10 @@ var CommitsController = function () { }); target_expand.addClass('open'); } - // redraw the graph - self.reloadGraph(); + + if (reloadGraph) { + // redraw the graph + self.reloadGraph(); + } } }; diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako --- a/rhodecode/templates/changelog/changelog_elements.mako +++ b/rhodecode/templates/changelog/changelog_elements.mako @@ -1,7 +1,6 @@ ## small box that displays changed/added/removed details fetched by AJAX <%namespace name="base" file="/base/base.mako"/> - % if c.prev_page: @@ -80,14 +79,12 @@ % endif % endif - -
+   -
-
${urlify_commit_message(commit.message, c.repo_name)}
+
${urlify_commit_message(commit.message, c.repo_name)}
diff --git a/rhodecode/templates/compare/compare_commits.mako b/rhodecode/templates/compare/compare_commits.mako --- a/rhodecode/templates/compare/compare_commits.mako +++ b/rhodecode/templates/compare/compare_commits.mako @@ -45,23 +45,12 @@ ${h.hidden('revisions',commit.raw_id)} - -
+ -
-
- ${urlify_commit_message(commit.message, c.repo_name)} -
+
${urlify_commit_message(commit.message, c.repo_name)}
@@ -85,31 +74,7 @@ - % endif % else: @@ -656,6 +626,7 @@ versionController.init(); reviewersController = new ReviewersController(); + commitsController = new CommitsController(); $(function(){ diff --git a/rhodecode/templates/search/search_commit.mako b/rhodecode/templates/search/search_commit.mako --- a/rhodecode/templates/search/search_commit.mako +++ b/rhodecode/templates/search/search_commit.mako @@ -34,7 +34,7 @@ h.route_path('repo_commit',repo_name=entry['repository'],commit_id=entry['commit_id']))} -
+