diff --git a/apps/api/views.py b/apps/api/views.py index 8dfcf766c..6678ddcc4 100644 --- a/apps/api/views.py +++ b/apps/api/views.py @@ -153,7 +153,7 @@ def check_share_on_site(request, token): except Profile.DoesNotExist: code = -1 - logging.user(profile.user, "~BY~FRChecking share from site: ~SB%s" % (story_url)) + logging.user(profile.user, "~BM~FCChecking share from site: ~SB%s" % (story_url)) return HttpResponse(callback + '(' + json.encode({ 'code': code, @@ -176,7 +176,7 @@ def share_story(request, token): except Profile.DoesNotExist: code = -1 - logging.user(profile.user, "~BY~FRSharing story from site: ~SB%s: %s" % (story_url, comments)) + logging.user(profile.user, "~BM~FYSharing story from site: ~SB%s: %s" % (story_url, comments)) return HttpResponse(callback + '(' + json.encode({ 'code': code, diff --git a/media/css/bookmarklet.css b/media/css/bookmarklet.css index a783cec9f..9adb5b2c7 100644 --- a/media/css/bookmarklet.css +++ b/media/css/bookmarklet.css @@ -150,20 +150,26 @@ float: left; } .NB-bookmarklet .NB-folders { - width: 200px; + width: 150px; } .NB-bookmarklet .NB-modal-submit { margin: 24px 0 8px; padding: 0 0 6px; + clear: both; + overflow: hidden; } .NB-bookmarklet .NB-modal-submit-button { clear: both; padding: 0 16px; line-height: 24px; - width: 200px; + width: 160px; text-align: center; text-shadow: none; } +.NB-bookmarklet .NB-modal-submit-button:hover, +.NB-bookmarklet .NB-modal-submit-button:active { + font-weight: normal; +} .NB-bookmarklet .NB-modal-submit-button img { margin: 5px 6px 0 0; width: 16px; diff --git a/templates/api/share_bookmarklet.js b/templates/api/share_bookmarklet.js index 3a640120f..c7c2c30e5 100644 --- a/templates/api/share_bookmarklet.js +++ b/templates/api/share_bookmarklet.js @@ -76,7 +76,7 @@ 'Signed in as ', $.make('b', { style: 'color: #505050' }, this.username) ]), - $.make('div', { className: 'NB-modal-title' }, 'Sharing \"'+this.get_page_title()+'\"'), + $.make('div', { className: 'NB-modal-title' }, 'Share this story on NewsBlur'), $.make('div', { className: 'NB-bookmarklet-main'}, [ $.make('div', { className: 'NB-bookmarklet-page' }, [ $.make('div', { className: 'NB-bookmarklet-page-title' }), @@ -93,6 +93,9 @@ ]) ]), $.make('div', { className: 'NB-bookmarklet-side' }, [ + $.make('div', { className: 'NB-modal-submit' }, [ + $.make('div', { className: 'NB-modal-submit-button NB-modal-submit-green' }, 'Subscribe to this site') + ]), $.make('div', { className: 'NB-bookmarklet-folder-container' }, [ $.make('img', { className: 'NB-bookmarklet-folder-add-button', src: 'data:image/png;charset=utf-8;base64,{{ add_image }}', title: 'Add New Folder' }), this.make_folders(), @@ -100,9 +103,6 @@ $.make('img', { className: 'NB-bookmarklet-folder-new-label', src: 'data:image/png;charset=utf-8;base64,{{ new_folder_image }}' }), $.make('input', { type: 'text', name: 'new_folder_name', className: 'NB-bookmarklet-folder-new' }) ]) - ]), - $.make('div', { className: 'NB-modal-submit' }, [ - $.make('div', { className: 'NB-modal-submit-button NB-modal-submit-green' }, 'Add this site') ]) ]) ]);