From 22a1ab69f3ea9588e9ff359f1c6ccbc6bae19e9d Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 12 Aug 2014 18:09:58 -0700 Subject: [PATCH] Stubbing in move and delete actions into organizer. --- media/css/reader.css | 43 +++++++++++++++++++- media/js/newsblur/reader/reader.js | 10 ++--- media/js/newsblur/reader/reader_organizer.js | 28 ++++++++++++- 3 files changed, 73 insertions(+), 8 deletions(-) diff --git a/media/css/reader.css b/media/css/reader.css index e54d1331b..20322d8f4 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -10828,7 +10828,6 @@ form.opml_import_form input { max-height: 500px; border: 1px solid rgba(0, 0, 0, .2); margin: 4px 24px 0 0; - clear: both; -webkit-touch-callout: none; -webkit-user-select: none; -khtml-user-select: none; @@ -10945,6 +10944,48 @@ form.opml_import_form input { margin-right: 6px; } +.NB-modal-organizer .NB-organizer-sidebar { + float: right; + width: 27%; + margin: 12px 0 0; +} +.NB-modal-organizer .NB-organizer-sidebar-title { + text-transform: uppercase; + font-size: 11px; + line-height: 18px; + font-weight: bold; + margin-top: 12px; +} +.NB-modal-organizer .NB-organizer-sidebar-move .NB-organizer-sidebar-title { + margin-top: 0; +} +.NB-modal-organizer .NB-organizer-sidebar-container { + margin: 4px 0 0; + border: 1px solid rgba(0, 0, 0, .2); + background-color: #F7F8F5; + padding: 6px; +} +.NB-modal-organizer .NB-modal-submit-button { + text-align: center; + margin: 6px 0 0; +} +.NB-modal-organizer .NB-folders { + width: 164px; +} +.NB-modal-organizer .NB-icon-add { + background: transparent url('/media/embed/icons/circular/g_icn_folder_add.png') no-repeat 0 0; + float: right; + width: 16px; + height: 16px; + margin: 4px 4px 0; + cursor: pointer; + background-size: 16px; +} +.NB-modal-organizer .NB-icon-add:hover { + background: transparent url('/media/embed/icons/circular/g_icn_folder_add_dark.png') no-repeat 0 0; + background-size: 16px; +} + /* ================= */ /* = Feed Selector = */ /* ================= */ diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 6a49a2062..18f655ca2 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -2955,27 +2955,27 @@ $.make('li', { className: 'NB-menu-item NB-menu-manage-mark-read NB-menu-manage-site-mark-read' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Mark everything as read'), - $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Choose how many days back.') + $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Choose how many days back') ]), $.make('li', { className: 'NB-menu-item NB-menu-manage-trainer' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Intelligence Trainer'), - $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Accurate filters are happy filters.') + $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Accurate filters are happy filters') ]), (show_chooser && $.make('li', { className: 'NB-menu-item NB-menu-manage-feedchooser' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Choose Your 64 sites'), - $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Enable the sites you want.') + $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Enable the sites you want') ])), (NEWSBLUR.Globals.is_premium && $.make('li', { className: 'NB-menu-item NB-menu-manage-feedchooser' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Mute Sites'), - $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Temporarily turn off feeds.') + $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Temporarily turn off feeds') ])), $.make('li', { className: 'NB-menu-item NB-menu-manage-organizer' }, [ $.make('div', { className: 'NB-menu-manage-image' }), $.make('div', { className: 'NB-menu-manage-title' }, 'Organize Sites'), - $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Move, delete, and batch actions.') + $.make('div', { className: 'NB-menu-manage-subtitle' }, 'Cleanup and rearrange feeds') ]), (show_chooser && $.make('li', { className: 'NB-menu-item NB-menu-manage-premium' }, [ $.make('div', { className: 'NB-menu-manage-image' }), diff --git a/media/js/newsblur/reader/reader_organizer.js b/media/js/newsblur/reader/reader_organizer.js index 994deb818..0c07f146f 100644 --- a/media/js/newsblur/reader/reader_organizer.js +++ b/media/js/newsblur/reader/reader_organizer.js @@ -30,13 +30,37 @@ _.extend(NEWSBLUR.ReaderOrganizer.prototype, { $.make('h2', { className: 'NB-modal-title' }, [ $.make('div', { className: 'NB-modal-loading' }), $.make('div', { className: 'NB-icon' }), - 'Organize sites' + 'Organize sites', + $.make('div', { className: 'NB-icon-dropdown' }) + ]), + $.make('div', { className: 'NB-organizer-sidebar'}, [ + $.make('div', { className: 'NB-organizer-sidebar-move' }, [ + $.make('div', { className: 'NB-organizer-sidebar-title' }, 'Move to folder'), + $.make('div', { className: 'NB-organizer-sidebar-container' }, [ + NEWSBLUR.utils.make_folders(), + $.make('div', { className: 'NB-icon-add', title: "Add folder" }), + $.make('div', { className: 'NB-modal-submit-button NB-modal-submit-green NB-disabled NB-action-move' }, 'Move'), + $.make('div', { className: 'NB-loading' }), + $.make('div', { className: "NB-add-folder NB-hidden" }, [ + $.make('div', { className: 'NB-modal-submit-button NB-modal-submit-green NB-add-folder-submit' }, 'Add folder'), + $.make('div', { className: 'NB-loading' }), + $.make('input', { type: 'text', id: 'NB-add-folder', className: 'NB-input NB-add-folder-input', name: 'new_folder_name', placeholder: "New folder name..." }) + ]) + ]) + ]), + $.make('div', { className: 'NB-organizer-sidebar-delete' }, [ + $.make('div', { className: 'NB-organizer-sidebar-title' }, 'Delete sites'), + $.make('div', { className: 'NB-organizer-sidebar-container' }, [ + $.make('div', { className: 'NB-modal-submit-button NB-modal-submit-red NB-disabled NB-action-delete' }, 'Delete'), + $.make('div', { className: 'NB-loading' }) + ]) + ]) ]), $.make('div', { className: 'NB-organizer-actionbar' }, [ $.make('div', { className: 'NB-organizer-sorts' }, [ $.make('div', { className: 'NB-organizer-action-title' }, 'Sort '), $.make('div', { className: 'NB-organizer-action NB-action-alphabetical NB-active' }, 'Name'), - $.make('div', { className: 'NB-organizer-action NB-action-subscribers' }, 'Subs'), + $.make('div', { className: 'NB-organizer-action NB-action-subscribers' }, 'Subscribers'), $.make('div', { className: 'NB-organizer-action NB-action-frequency' }, 'Frequency'), $.make('div', { className: 'NB-organizer-action NB-action-recency' }, 'Recency'), $.make('div', { className: 'NB-organizer-action NB-action-mostused' }, 'Use')