UI updates

Made the PR button a "basic" button Vertically centered the issue checkboxes Labels will update only once after modal is closed
go-gitea · Feb 10, 2019 · 477d07b · 477d07b
1 parent c6e708f
commit 477d07b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/public/css/index.css b/public/css/index.css
diff --git a/public/js/index.js b/public/js/index.js
@@ -271,10 +271,22 @@ function initCommentForm() {
  var $noSelect = $list.find('.no-select');
  var $listMenu = $('.' + selector + ' .menu');
  var hasLabelUpdateAction = $listMenu.data('action') == 'update';
+ var labels = {};
 
  $('.' + selector).dropdown('setting', 'onHide', function(){
  hasLabelUpdateAction = $listMenu.data('action') == 'update'; // Update the var
  if (hasLabelUpdateAction) {
+ for (var elementId in labels) {
+ if (labels.hasOwnProperty(elementId)) {
+ var label = labels[elementId];
+ updateIssuesMeta(
+ label["update-url"],
+ label["action"],
+ label["issue-id"],
+ elementId
+ );
+ }
+ }
  location.reload();
  }
  });
@@ -308,23 +320,21 @@ function initCommentForm() {
  $(this).removeClass('checked');
  $(this).find('.octicon').removeClass('octicon-check');
  if (hasLabelUpdateAction) {
- updateIssuesMeta(
- $listMenu.data('update-url'),
- "detach",
- $listMenu.data('issue-id'),
- $(this).data('id')
- );
+ labels[$(this).data('id')] = {
+ "update-url": $listMenu.data('update-url'),
+ "action": "detach",
+ "issue-id": $listMenu.data('issue-id'),
+ };
  }
  } else {
  $(this).addClass('checked');
  $(this).find('.octicon').addClass('octicon-check');
  if (hasLabelUpdateAction) {
- updateIssuesMeta(
- $listMenu.data('update-url'),
- "attach",
- $listMenu.data('issue-id'),
- $(this).data('id')
- );
+ labels[$(this).data('id')] = {
+ "update-url": $listMenu.data('update-url'),
+ "action": "attach",
+ "issue-id": $listMenu.data('issue-id'),
+ };
  }
  }
 

diff --git a/public/less/_repository.less b/public/less/_repository.less
@@ -1587,6 +1587,10 @@
  display: none;
 }
 
+.ui.checkbox.issue-checkbox {
+ vertical-align: middle;
+}
+
 .issue.list {
  list-style: none;
  padding-top: 15px;

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
@@ -65,7 +65,7 @@
  {{if and .PullRequestCtx.Allowed .IsViewBranch (not .Repository.IsArchived)}}
  <div class="fitted item">
  <a href="{{.BaseRepo.Link}}/compare/{{.BaseRepo.DefaultBranch | EscapePound}}...{{if ne .Repository.Owner.Name .BaseRepo.Owner.Name}}{{.Repository.Owner.Name}}:{{end}}{{.BranchName | EscapePound}}">
- <button class="ui small compact button">{{.i18n.Tr "repo.pulls.compare_changes"}}</button>
+ <button class="ui small compact basic button">{{.i18n.Tr "repo.pulls.compare_changes"}}</button>
  </a>
  </div>
  {{end}}