Moving the UI around to match the new design flow. Going to be adding in a taskbar for the right pane soon.

This commit is contained in:
Samuel Clay 2009-08-14 00:30:29 +00:00
parent d97c5ff0c3
commit 82d988d901
5 changed files with 65 additions and 38 deletions

View file

@ -38,17 +38,10 @@ a img {
/* ============= */
#feed_list {
position: fixed;
left: 0px;
top: 0px;
width: 220px;
background-color: #D7DDE6;
border-right: 1px solid #808080;
z-index: 20;
font-size: 11px;
overflow-y: auto;
font-size: 11px;
}
#feed_list .folder {
margin: 6px 0px 4px;
background: transparent url(../img/icons/silk/folder.png) no-repeat 3px 1px;
@ -551,4 +544,23 @@ form.opml_import_form input {
border: 0;
margin: 0;
padding: 0;
}
/* =============== */
/* = Splash Pane = */
/* =============== */
#NB-splash {
width: 100%;
height: 100%;
z-index: 100;
position: relative;
background-color: white;
}
#NB-splash .NB-splash-title {
margin: 0 auto;
height: 376px;
width: 600px;
background: transparent url(../img/reader/newsblur_splash_logo.png) no-repeat 0 0;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 KiB

View file

@ -1,7 +1,5 @@
(function($) {
var middleLayout, outerLayout;
NEWSBLUR.reader = function() {
var self = this;
this.$feed_list = $('#feed_list');
@ -57,16 +55,12 @@
},
apply_resizable_layout: function() {
var outerLayout, middleLayout;
var outerLayout, middleLayout, leftLayout;
outerLayout = $('body').layout({
closable: false,
center__paneSelector: ".center-pane",
south__paneSelector: "#taskbar",
south__size: 29,
south__resizable: false,
south__spacing_open: 0,
west__paneSelector: "#feed_list",
west__paneSelector: ".left-pane",
west__size: 300,
spacing_open: 4,
center__onresize: "middleLayout.resizeAll",
@ -81,6 +75,15 @@
center__onresize: "middleLayout.resizeAll",
resizerDragOpacity: 0.6
});
leftLayout = $('.left-pane').layout({
closable: false,
center__paneSelector: ".left-center",
south__paneSelector: ".left-south",
south__size: 29,
south__resizable: false,
south__spacing_open: 0
});
},
resize_story_content_pane: function() {
@ -147,6 +150,10 @@
});
},
hide_splash_page: function() {
$('#NB-splash').hide();
},
// ==============
// = Navigation =
// ==============
@ -268,6 +275,7 @@
var self = this;
var $story_titles = this.$story_titles;
$story_titles.empty().scrollTop('0px');
this.hide_splash_page();
this.$story_titles.data('page', 0);
this.$story_titles.data('feed_id', feed_id);

View file

@ -2,9 +2,37 @@
{% block content %}
<div id="feed_list"></div>
<div class="left-pane">
<div class="left-center" id="feed_list"></div>
<div id="taskbar" class="left-south">
<ul class="taskbar_leftnav">
<li class="task_button task_add">
<ul class="taskbar_menu">
<li>Import</li>
<li><span class="NB-task-import-upload-opml">Upload an OPML file</span></li>
<li><span>From NetNewsWire (NewsGator)</span></li>
<li><span>From Google Reader</span></li>
</ul>
</li>
</ul>
<ul class="taskbar_leftnav">
<li class="task_button task_profile">
<ul class="taskbar_menu">
<li>{{ user_info.username }}</li>
<li><span>View my feed preferences</span></li>
<li><span>Change NewsBlur options</span></li>
</ul>
</li>
</ul>
</div>
</div>
<div class="center-pane">
<div id="NB-splash">
<div class="NB-splash-title"></div>
</div>
<div id="story_titles" class="middle-north">
</div>
@ -24,27 +52,6 @@
{# {% url apps.opml_import.views.opml_import %} #}
<div id="taskbar">
<ul class="taskbar_leftnav">
<li class="task_button task_add">
<ul class="taskbar_menu">
<li>Import</li>
<li><span class="NB-task-import-upload-opml">Upload an OPML file</span></li>
<li><span>From NetNewsWire (NewsGator)</span></li>
<li><span>From Google Reader</span></li>
</ul>
</li>
</ul>
<ul class="taskbar_leftnav">
<li class="task_button task_profile">
<ul class="taskbar_menu">
<li>{{ user_info.username }}</li>
<li><span>View my feed preferences</span></li>
<li><span>Change NewsBlur options</span></li>
</ul>
</li>
</ul>
</div>
{% endblock %}