public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finishing all boilerplate to the tutorial. This includes the preference to show/hide tutorial, and hiding the dashboard module.

Browse source
This commit is contained in:
Samuel Clay 2011-05-13 10:15:56 -04:00
parent 913fc49c3a
commit 5adf024dda
5 changed files with 54 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/profile/views.py
View file

@ -25,6 +25,7 @@ def set_preference(request):
preferences = json.decode(request.user.profile.preferences)
for preference_name, preference_value in new_preferences.items():
if preference_value in ['true','false']: preference_value = True if preference_value == 'true' else False
if preference_name in SINGLE_FIELD_PREFS:
setattr(request.user.profile, preference_name, preference_value)
elif preference_name in SPECIAL_PREFERENCES:

21
media/js/newsblur/reader.js
View file

@ -3111,9 +3111,24 @@
},
open_tutorial_modal: function() {
this.model.preference('tutorial_finished', false);
NEWSBLUR.tutorial = new NEWSBLUR.ReaderTutorial();
},
hide_tutorial: function() {
var $tutorial = $('.NB-module-tutorial');
this.model.preference('tutorial_finished', true);
$tutorial.animate({
'opacity': 0
}, {
'duration': 500,
'complete': function() {
$tutorial.slideUp(350);
}
});
},
// ==========================
// = Story Pane - Feed View =
// ==========================
@ -5529,6 +5544,12 @@
self.open_tutorial_modal();
}
});
$.targetIs(e, { tagSelector: '.NB-module-tutorial-hide' }, function($t, $p){
e.preventDefault();
if (!$t.hasClass('NB-disabled')) {
self.hide_tutorial();
}
});
$.targetIs(e, { tagSelector: '.NB-menu-manage-story-unread' }, function($t, $p){
e.preventDefault();

7
media/js/newsblur/reader_tutorial.js
View file

@ -88,6 +88,13 @@ _.extend(NEWSBLUR.ReaderTutorial.prototype, {
]));
},
close: function() {
_.delay(function() {
NEWSBLUR.reader.hide_tutorial();
}, 500);
NEWSBLUR.Modal.prototype.close.call(this);
},
// ===========
// = Actions =
// ===========

1
templates/base.html
View file

@ -25,6 +25,7 @@
'unread_view' : 0,
'lock_mouse_indicator' : 0,
'feed_pane_size' : {{ user_profile.feed_pane_size }},
'tutorial_finished' : {{ user_profile.tutorial_finished|yesno:"true,false" }},
'story_titles_pane_size' : 168,
'new_window' : 1,
'default_view' : 'page',

46
templates/reader/feeds.xhtml
View file

@ -323,30 +323,32 @@ $(document).ready(function() {
</div>
</div>
<div class="NB-module">
<h5 class="NB-module-header">
Tutorial
<div class="NB-module-header-right">
<a href="#" class="NB-splash-link">Hide</a>
</div>
</h5>
<div class="NB-module-tutorial NB-module-account NB-last {% if user_profile.hide_tutorial %}NB-hidden{% endif %}">
<div class="NB-module-account-image">
<img src="{{ MEDIA_URL }}/img/reader/module_tutorial.jpg" />
</div>
<h3 class="NB-module-content-header">
<span class="NB-module-content-subtitle">
Takes <span class="NB-module-account-trainer-count">5</span> minutes
</span>
Learn to use NewsBlur
</h3>
<div class="NB-module-account-title">
<div class="NB-modal-submit">
<div class="NB-modal-submit-green NB-modal-submit-button NB-module-launch-tutorial NB-javascript">Launch the 5 step tutorial</div>
</div>
{% if not user_profile.tutorial_finished %}
<div class="NB-module NB-module-tutorial">
<h5 class="NB-module-header">
Tutorial
<div class="NB-module-header-right">
<a href="#" class="NB-splash-link NB-module-tutorial-hide">Hide</a>
</div>
</h5>
<div class="NB-module-account NB-last {% if user_profile.hide_tutorial %}NB-hidden{% endif %}">
<div class="NB-module-account-image">
<img src="{{ MEDIA_URL }}/img/reader/module_tutorial.jpg" />
</div>
<h3 class="NB-module-content-header">
<span class="NB-module-content-subtitle">
Takes <span class="NB-module-account-trainer-count">5</span> minutes
</span>
Learn to use NewsBlur
</h3>
<div class="NB-module-account-title">
<div class="NB-modal-submit">
<div class="NB-modal-submit-green NB-modal-submit-button NB-module-launch-tutorial NB-javascript">Launch the 5 step tutorial</div>
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% endif %}