mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-31 21:41:33 +00:00
84f79e5a81
* master: (30 commits) Fixing search positioning on saved stories. Fixing positioning of popover options in All Site Stories. Adding Split tooltip. Removing extra logging. Switching feedbar and navbar. Fixing mark folder as read. Removing double. Fixing mark as read on socialsubs. Adjusting positioning on new feedbar. Also scrolling to selected feed/folder when switch story layouts. Reloading feed list when adding, moving, and deleting feeds and folders. Reloading feeds on feed/folder add and feedchooser. Backend for marking feeds/folders as read at a specific timestamp. Adding expanded mark read buttons. Needs backend support. iOS v3. Fixed move site view folder placement as well. Moving feedbar down to bottom of screen. Prep for new mark read buttons. Fixing 2 ios crashes: double-tapping instapaper button and a weird keyboard condition. Fixing activities height for subscriptions on ios. Also turning river back on for third-party clients. That wasn't fair and it's hard to get users to upgrade. I'd rather give users the ability to use the product instead of crippling it, unless there is a proper workflow for upgrading, which only exists on the web today. Removing last traces of Google Reader from ios app. Also add better final page of ftux. Fixing folder chooser in add dialog on ios. Fixing colors on share/train buttons when active. Fixing height on profile cells. Stopping animation of share view/keyboard before orientation has changed. ... Conflicts: media/js/newsblur/views/story_titles_header_view.js
271 lines
No EOL
13 KiB
HTML
271 lines
No EOL
13 KiB
HTML
|
|
<div class="NB-layout">
|
|
|
|
<div class="left-pane">
|
|
|
|
<div class="left-north">
|
|
<div class="NB-feeds-header-user">
|
|
<div class="NB-feeds-header-user-image">
|
|
{% if social_profile.large_photo_url %}
|
|
<img src="{{ social_profile.large_photo_url }}">
|
|
{% else %}
|
|
{% if user.profile.is_premium %}
|
|
<img src="{{ MEDIA_URL }}/img/reader/account_premium_{{ account_images|random }}.jpg" />
|
|
{% else %}
|
|
<img src="{{ MEDIA_URL }}/img/reader/account_standard_{{ account_images|random }}.jpg" />
|
|
{% endif %}
|
|
{% endif %}
|
|
</div>
|
|
<div class="NB-feeds-header-user-name">{{ social_profile.username }}</div>
|
|
<div class="NB-feeds-header-user-interactions">
|
|
<div class="NB-feeds-header-user-interactions-badge NB-hidden"></div>
|
|
<img src="{{ MEDIA_URL }}/img/icons/circular/nav_icn_activity_active.png">
|
|
</div>
|
|
<div class="NB-feeds-header-user-dashboard">
|
|
<img src="{{ MEDIA_URL }}/img/icons/circular/nav_icn_dashboard_active.png">
|
|
</div>
|
|
<div class="NB-feeds-header-dashboard"></div>
|
|
</div>
|
|
<div class="NB-feeds-selector">
|
|
<input type="text" name="feeds_selector" class="NB-feeds-selector-input NB-search-input" />
|
|
</div>
|
|
</div>
|
|
|
|
<div class="left-center">
|
|
|
|
<div class="left-center-content NB-sidebar NB-feedlists">
|
|
<div id="NB-feeds-list-loader">Everything is on its way...</div>
|
|
<div class="NB-feeds-header-wrapper">
|
|
<div class="NB-feeds-header-container NB-feeds-header-tryfeed-container">
|
|
<div class="NB-feeds-header NB-feeds-header-tryfeed">
|
|
<img class="NB-feeds-header-icon" src="" />
|
|
<div class="NB-feeds-header-title"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-global-container">
|
|
<div class="NB-feeds-header NB-feeds-header-river-global NB-empty">
|
|
<div class="NB-feeds-header-count unread_count"></div>
|
|
<div class="NB-feeds-header-icon"></div>
|
|
<div class="NB-feeds-header-title">
|
|
Global Shared Stories
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-blurblogs-container">
|
|
<div class="NB-feeds-header NB-feeds-header-river-blurblogs NB-empty">
|
|
<div class="NB-feeds-header-count unread_count"></div>
|
|
<div class="NB-feeds-header-icon"></div>
|
|
<div class="NB-feedlist-collapse-icon"></div>
|
|
<div class="NB-feeds-header-title">
|
|
All Shared Stories
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="NB-socialfeeds-folder">
|
|
<ul class="NB-socialfeeds NB-feedlist"></ul>
|
|
</div>
|
|
|
|
<div class="NB-feeds-header-container NB-feeds-header-river-container NB-feeds-header-river-sites-container">
|
|
<div class="NB-feeds-header NB-feeds-header-river-sites NB-empty">
|
|
<div class="NB-feeds-header-count unread_count"></div>
|
|
<div class="NB-feeds-header-icon"></div>
|
|
<div class="NB-feeds-header-title">
|
|
All Site Stories
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<ul class="folder NB-feedlist" id="feed_list"></ul>
|
|
|
|
<div class="NB-feeds-header-container NB-feeds-header-starred-container">
|
|
<div class="NB-feeds-header NB-feeds-header-starred NB-empty">
|
|
<div class="NB-feeds-header-count feed_counts_floater unread_count"></div>
|
|
<div class="NB-feeds-header-icon"></div>
|
|
<div class="NB-feedlist-collapse-icon"></div>
|
|
<div class="NB-feeds-header-title">
|
|
Saved Stories
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="NB-starred-folder">
|
|
<ul class="NB-starred-feeds NB-feedlist"></ul>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="left-center-footer">
|
|
<div id="NB-progress">
|
|
<div class="NB-progress-container">
|
|
<div class="NB-progress-close"></div>
|
|
<div class="NB-progress-title">Fetching your feeds</div>
|
|
<div class="NB-progress-percentage"></div>
|
|
<div class="NB-progress-link"></div>
|
|
<div class="NB-progress-counts">
|
|
<span class="NB-progress-counts-fetched"></span>
|
|
/
|
|
<span class="NB-progress-counts-total"></span>
|
|
</div>
|
|
<div class="NB-progress-bar"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="left-south">
|
|
<div class="NB-taskbar-container">
|
|
<div class="NB-feed-taskbar">
|
|
<div class="NB-callout-ftux NB-callout">
|
|
<div class="NB-callout-container">
|
|
<div class="NB-callout-text"></div>
|
|
<div class="NB-callout-arrow"></div>
|
|
</div>
|
|
</div>
|
|
<div class="NB-task-button NB-task-add">
|
|
<div class="NB-task-image"></div>
|
|
</div>
|
|
<div class="NB-task-button NB-task-manage NB-disabled">
|
|
<div class="NB-task-image"></div>
|
|
</div>
|
|
<div class="NB-taskbar-intelligence">
|
|
<div class="NB-intelligence-slider">
|
|
<ul class="segmented-control">
|
|
<li class="NB-intelligence-slider-control NB-intelligence-slider-red">
|
|
All
|
|
</li>
|
|
<li class="NB-intelligence-slider-control NB-intelligence-slider-yellow">
|
|
<img src="{{ MEDIA_URL }}embed/icons/circular/g_icn_unread.png">
|
|
<span class="NB-intelligence-label">Unread</span>
|
|
</li>
|
|
<li class="NB-intelligence-slider-control NB-intelligence-slider-green">
|
|
<img src="{{ MEDIA_URL }}embed/icons/circular/g_icn_focus.png">
|
|
<span class="NB-intelligence-label">Focus</span>
|
|
</li>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<div class="NB-menu-manage-container"></div>
|
|
|
|
<div class="NB-taskbar-sidebar-toggle-open" title="Show sidebar"><div class="NB-taskbar-sidebar-toggle-open-image"></div></div>
|
|
|
|
<div class="right-pane">
|
|
|
|
<div class="NB-feedbar content-north">
|
|
|
|
<ul class="segmented-control NB-taskbar NB-taskbar-nav">
|
|
<li class="NB-taskbar-button NB-task-story-previous">
|
|
<div class="NB-task-image"></div>
|
|
</li>
|
|
<li class="NB-taskbar-button NB-task-story-next-unread NB-task-story-next-positive">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Next Unread</span>
|
|
</li>
|
|
<li class="NB-taskbar-button NB-task-story-next">
|
|
<div class="NB-task-image"></div>
|
|
</li>
|
|
</ul>
|
|
|
|
<div class="NB-story-titles-header"></div>
|
|
|
|
</div>
|
|
|
|
<div id="story_taskbar" class="NB-taskbar-container content-south">
|
|
<ul class="segmented-control NB-taskbar NB-taskbar-view">
|
|
<li class="NB-taskbar-button task_view_page NB-tipsy" tipsy-title="Original">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Original</span>
|
|
<span class="NB-task-original-return NB-task-title">
|
|
Return
|
|
</span>
|
|
<div class="NB-task-view-switch-arrow NB-task-view-page-to-feed-arrow"></div>
|
|
</li>
|
|
<li class="NB-taskbar-button task_view_feed NB-active NB-tipsy" tipsy-title="Feed">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Feed</span>
|
|
<div class="NB-task-view-switch-arrow NB-task-view-to-feed-arrow"></div>
|
|
</li>
|
|
<li class="NB-taskbar-button task_view_text NB-tipsy" tipsy-title="Text">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Text</span>
|
|
<div class="NB-task-view-switch-arrow NB-task-view-to-text-arrow"></div>
|
|
</li>
|
|
<li class="NB-taskbar-button task_view_story NB-tipsy" tipsy-title="Story">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Story</span>
|
|
<div class="NB-task-view-switch-arrow NB-task-view-to-story-arrow"></div>
|
|
</li>
|
|
</ul>
|
|
|
|
<ul class="segmented-control NB-taskbar NB-taskbar-layout">
|
|
<li class="NB-taskbar-button NB-task-layout-full NB-tipsy" tipsy-title="Full">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">Full</span>
|
|
</li>
|
|
<li class="NB-taskbar-button NB-task-layout-split NB-active NB-tipsy" tipsy-title="Split">
|
|
<div class="NB-task-image"></div>
|
|
</li>
|
|
<li class="NB-taskbar-button NB-task-layout-list NB-tipsy" tipsy-title="List">
|
|
<div class="NB-task-image"></div>
|
|
<span class="NB-task-title">List</span>
|
|
</li>
|
|
</ul>
|
|
|
|
{% if not user.is_authenticated %}
|
|
<div class="NB-callout-ftux-signup NB-callout">
|
|
<div class="NB-callout-container">
|
|
<div class="NB-callout-text"></div>
|
|
<div class="NB-callout-arrow"></div>
|
|
</div>
|
|
</div>
|
|
{% endif %}
|
|
</div>
|
|
|
|
<div class="content-pane">
|
|
|
|
<div id="story_titles" class="right-north">
|
|
<div class="NB-story-titles"></div>
|
|
</div>
|
|
|
|
<div id="story_pane" class="content-center">
|
|
<div id="mouse-indicator">
|
|
<div class="NB-callout-mouse-indicator NB-callout">
|
|
<div class="NB-callout-container">
|
|
<div class="NB-callout-text"></div>
|
|
<div class="NB-callout-arrow"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="NB-story-pane-container">
|
|
<iframe id="feed_iframe" class="NB-feed-iframe"></iframe>
|
|
<div class="NB-feed-story-view NB-view-hidden">
|
|
<div class="NB-feed-story-view-floater"></div>
|
|
<div class="NB-feed-stories-container">
|
|
<div class="NB-feed-story-view-header NB-feedbar"></div>
|
|
<ul class="NB-feed-stories"></ul>
|
|
</div>
|
|
</div>
|
|
<div class="NB-text-view">
|
|
<div class="NB-text-view-detail"></div>
|
|
</div>
|
|
<div class="NB-story-view">
|
|
<iframe id="story_iframe" class="NB-story-iframe"></iframe>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div> |