diff --git a/attract/static/js/tasks.js b/attract/static/js/tasks.js index 422018e..bbe2b65 100644 --- a/attract/static/js/tasks.js +++ b/attract/static/js/tasks.js @@ -40,8 +40,9 @@ function task_open(task_id, project_url) { return; } - $('[id^="task-"]').removeClass('active'); + $('#col_right .col_header span.header_text').text('Task details'); + $('[id^="task-"]').removeClass('active'); $('#task-' + task_id).addClass('active'); var task_url = '/attract/' + project_url + '/tasks/' + task_id; @@ -66,7 +67,7 @@ function shot_open(shot_id, project_url) { return; } - $('#col_right .col_header').text('Shot details'); + $('#col_right .col_header span.header_text').text('Shot details'); $('#shot-list').find('a').removeClass('active'); $('#shot-link' + shot_id).addClass('active'); @@ -123,14 +124,15 @@ function attract_form_save(form_id, item_id, item_save_url, options={}) $button.attr('disabled', true); $item.addClass('processing'); - $('#status-bar').text('Saving task...'); + $('#status-bar').text('Saving ' + options.type + '...'); if (console) console.log('Sending:', payload); $.post(item_save_url, payload) .done(function(saved_item) { if (console) console.log('Done saving', saved_item); - $('#status-bar').text('Saved item. ' + saved_item._updated); + $('#status-bar') + .text('Saved ' + options.type + '. ' + saved_item._updated); if (options.done) options.done($item, saved_item); }) @@ -170,7 +172,8 @@ function task_save(task_id, task_url) { }, fail: function($item, xhr_or_response_data) { $('#task-details').html(xhr_or_response_data.responseText); - } + }, + type: 'task' }); } @@ -187,6 +190,7 @@ function shot_save(shot_id, shot_url) { }, fail: function($item, xhr_or_response_data) { $('#task-details').html(xhr_or_response_data.responseText); - } + }, + type: 'shot' }); } diff --git a/src/styles/_base.sass b/src/styles/_base.sass index 45022b9..781c6b2 100644 --- a/src/styles/_base.sass +++ b/src/styles/_base.sass @@ -115,7 +115,7 @@ select.input-transparent #status-bar color: $color-text-dark-secondary margin-left: auto - font-size: .9em + text-align: right .table display: table diff --git a/src/styles/_shots.sass b/src/styles/_shots.sass index 4929d25..371b609 100644 --- a/src/styles/_shots.sass +++ b/src/styles/_shots.sass @@ -41,10 +41,8 @@ padding: 3px 10px &.active - font-weight: bold +status-border-color - a[class^="status-"] opacity: 1 diff --git a/src/templates/attract/shots/for_project.jade b/src/templates/attract/shots/for_project.jade index 69dba5a..60f085e 100644 --- a/src/templates/attract/shots/for_project.jade +++ b/src/templates/attract/shots/for_project.jade @@ -52,7 +52,7 @@ #col_right .col_header - | Task Details + span.header_text Shot details #status-bar #task-details diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.jade index e93b5d8..8746c9e 100644 --- a/src/templates/attract/tasks/for_project.jade +++ b/src/templates/attract/tasks/for_project.jade @@ -24,7 +24,7 @@ | {% endfor %} #col_right .col_header - | Task Details + span.header_text Task Details #status-bar #task-details #task-view