diff options
| author | Staicu Ionut <github@iamntz.com> | 2012-07-10 07:33:04 +0300 |
|---|---|---|
| committer | Staicu Ionut <github@iamntz.com> | 2012-07-10 07:33:04 +0300 |
| commit | ba7b85d0d986e7c511aa91bde97b3a992bb5d436 (patch) | |
| tree | 135989b8950030545f5157e2228cd93e2064872f /app/views/issues | |
| parent | be1b40802dcbfd59ecdd3c7439fc48d6cec97e2b (diff) | |
| download | gitlab-ce-ba7b85d0d986e7c511aa91bde97b3a992bb5d436.tar.gz | |
issues counter are now live updated on creation/deleteion/reopening
buttons on forms are disabled on submit (re-enabled after the request is complete)
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_issues.html.haml | 4 | ||||
| -rw-r--r-- | app/views/issues/_show.html.haml | 8 | ||||
| -rw-r--r-- | app/views/issues/index.html.haml | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index a20df176afc..17141cc453c 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -6,7 +6,9 @@ .row .span7= paginate @issues, :remote => true, :theme => "gitlab" .span3.right - %span.cgray.right #{@issues.total_count} issues for this filter + %span.cgray.right + %span.issue_counter #{@issues.total_count} + issues for this filter - else %li %h4.nothing_here_message Nothing to show here diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 03524901c99..e12c3c1a99c 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -12,9 +12,9 @@ = issue.notes.count - if can? current_user, :modify_issue, issue - if issue.closed - = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small grouped", :remote => true + = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small grouped reopen_issue", :remote => true - else - = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small grouped", :remote => true + = link_to 'Resolve', project_issue_path(issue.project, issue, :issue => {:closed => true }, :status_only => true), :method => :put, :class => "success btn small grouped close_issue", :remote => true = link_to edit_project_issue_path(issue.project, issue), :class => "btn small edit-issue-link", :remote => true do %i.icon-edit Edit @@ -35,6 +35,4 @@ - if issue.upvotes > 0 - %span.badge.badge-success= "+#{issue.upvotes}" - - + %span.badge.badge-success= "+#{issue.upvotes}"
\ No newline at end of file diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 7328fa88812..fb8b9f8ee8e 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -2,7 +2,7 @@ .issues_content %h3.page_title Issues - %small (#{@issues.total_count}) + %small (<span class=issue_counter>#{@issues.total_count}</span>) .right .span5 - if can? current_user, :write_issue, @project @@ -45,4 +45,4 @@ :javascript $(function(){ issuesPage(); - }) + })
\ No newline at end of file |