From c6a532160154a3e6177f3eae35c13c5c9da56a5e Mon Sep 17 00:00:00 2001 From: Seth Call Date: Sun, 29 May 2016 22:50:57 -0500 Subject: [PATCH] VRFS-4160 - add checkbox styling and pop external in recording selector dialog --- web/app/assets/javascripts/feedHelper.js | 4 ++++ .../stylesheets/dialogs/recordingSelectorDialog.css.scss | 5 +++++ web/app/assets/stylesheets/web/audioWidgets.css.scss | 1 - web/app/views/users/_feed_recording_ajax.html.haml | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/app/assets/javascripts/feedHelper.js b/web/app/assets/javascripts/feedHelper.js index 3d68671ff..61f7b69e8 100644 --- a/web/app/assets/javascripts/feedHelper.js +++ b/web/app/assets/javascripts/feedHelper.js @@ -581,6 +581,9 @@ if(!defaults.show_checkbox) { $feedItem.find('.select-box').hide(); } + else { + context.JK.checkbox($feedItem.find('.select-box')) + } if(defaults.hide_avatar) { $feedItem.find('.avatar-small.ib').hide(); } @@ -598,6 +601,7 @@ $feedItem.data('original-max-height', $feedItem.css('height')); context.JK.bindHoverEvents($feedItem); context.JK.bindProfileClickEvents($feedItem); + context.JK.popExternalLinks($feedItem) } else { logger.warn("skipping feed type: " + feed.type); diff --git a/web/app/assets/stylesheets/dialogs/recordingSelectorDialog.css.scss b/web/app/assets/stylesheets/dialogs/recordingSelectorDialog.css.scss index e241ce388..0e32b36d1 100644 --- a/web/app/assets/stylesheets/dialogs/recordingSelectorDialog.css.scss +++ b/web/app/assets/stylesheets/dialogs/recordingSelectorDialog.css.scss @@ -16,6 +16,11 @@ overflow-y:auto; } + + .title-artist { + margin-left:25px; + } + .action-buttons { margin-bottom:10px; } diff --git a/web/app/assets/stylesheets/web/audioWidgets.css.scss b/web/app/assets/stylesheets/web/audioWidgets.css.scss index 621a173a3..a5a6b553e 100644 --- a/web/app/assets/stylesheets/web/audioWidgets.css.scss +++ b/web/app/assets/stylesheets/web/audioWidgets.css.scss @@ -13,7 +13,6 @@ height: 36px; } - .recording-controls { margin-top: 15px; padding: 3px 5px 3px 10px; diff --git a/web/app/views/users/_feed_recording_ajax.html.haml b/web/app/views/users/_feed_recording_ajax.html.haml index f410088d8..e66263d33 100644 --- a/web/app/views/users/_feed_recording_ajax.html.haml +++ b/web/app/views/users/_feed_recording_ajax.html.haml @@ -8,7 +8,7 @@ %a{:hoveraction => "{{data.feed_item.helpers.artist_hoveraction}}", :profileaction => "{{data.feed_item.helpers.artist_hoveraction}}", :"{{data.feed_item.helpers.artist_datakey}}" => "{{data.feed_item.helpers.artist_id}}"} %img{ src: '{{data.feed_item.helpers.avatar}}' } / type and artist - .left.ml20.w15 + .left.ml20.w15.title-artist .title %a.title-text{:href => "/recordings/{{data.candidate_claimed_recording.id}}", :rel => "external", :hoveraction => "recording", :'recording-id' => '{{data.candidate_claimed_recording.id}}'} RECORDING %a.edit-recording-dialog{href: "#"} (edit)