diff options
author | Dave Whiteland <dave@mysociety.org> | 2012-10-01 14:00:51 +0100 |
---|---|---|
committer | Dave Whiteland <dave@mysociety.org> | 2012-10-01 16:41:24 +0100 |
commit | c187cb1f43b27c70419c50e3362ef10f5eb35337 (patch) | |
tree | d8d8aa2e45c26f55abbec832f7d97c4b1cebf656 | |
parent | 8c570f0b777cbeb1fe9ed94cb40b3f440e37757a (diff) |
explicitly handle msg-is-active class for message that will be used to create report, instead of msg-is-owned, fixes mysociety/message-manager#49
-rw-r--r-- | templates/web/fixmybarangay/report/_message_manager.html | 10 | ||||
-rw-r--r-- | web/cobrands/fixmybarangay/message_manager.scss | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/templates/web/fixmybarangay/report/_message_manager.html b/templates/web/fixmybarangay/report/_message_manager.html index d3a08d466..94f38e04b 100644 --- a/templates/web/fixmybarangay/report/_message_manager.html +++ b/templates/web/fixmybarangay/report/_message_manager.html @@ -46,7 +46,7 @@ <script type="text/javascript"> $(document).ready(function() { - + var $mm_message_list = $('#mm-message-list'); var mm_url = "[% c.config.MESSAGE_MANAGER_URL %]"; // from config var problem_id = "[% problem.id %]"; var dummy_busy = false; @@ -65,10 +65,12 @@ $(document).ready(function() { var mm_selected_message = function(data) { var msg_text = ""; var service_id = ""; + $('li.msg-is-active', $mm_message_list).removeClass('msg-is-active'); if (data['success']) { // msg_text = $('#form_detail').val( $('input[name=mm_text]:checked').val() ); # == message data msg_text = data['data']['Message']['message']; service_id = data['data']['Message']['id']; + $('#msg-' + service_id).addClass('msg-is-active'); } else { $('input[name=mm_text]').prop('checked', false); // uncheck all } @@ -100,13 +102,13 @@ $(document).ready(function() { }); $('#available-submit').click(); - $('#mm-message-list').on('mouseover', 'li.mm-msg', function(e){ + $mm_message_list.on('mouseover', 'li.mm-msg', function(e){ e.stopPropagation(); // because replies are nested - $('.mm-msg-action', $('#mm-message-list')).stop().fadeOut(200); + $('.mm-msg-action', $mm_message_list).stop().fadeOut(200); $(this).find('> .mm-msg-action').stop().show(); }); - $('#mm-message-list').on('click', '.mm-hide', function(e){ + $mm_message_list.on('click', '.mm-hide', function(e){ var want_hide = confirm('Are you sure you want to delete the following message?\n\n"' + $('p', $(this).parent()).first().text() + '"\n'); diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss index 20c0057fb..e9db9a6ce 100644 --- a/web/cobrands/fixmybarangay/message_manager.scss +++ b/web/cobrands/fixmybarangay/message_manager.scss @@ -82,7 +82,8 @@ $color_bg_mm_list: #F6F6F6; &:hover { background-color: #efe;} &.msg-is-locked { background-color: #fdd;} &.msg-is-busy { background-color: #ffd;} - &.msg-is-owned { background-color: $contrast1; color:#fff;} // was: #dfd, now stronger + &.msg-is-owned { background-color: #dfd;} + &.msg-is-active { background-color: $contrast1; color:#fff;} span.msg-tag { width: 3em; float:left; |