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

Showing title classifiers in story trainer.

Browse source
This commit is contained in:
Samuel Clay 2010-11-09 22:06:08 -05:00
parent f72aa14b5c
commit 21379537aa
5 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/analyzer/views.py
View file

@ -43,6 +43,7 @@ def save_classifier(request):
if opinion in post:
post_contents = post.getlist(opinion)
for post_content in post_contents:
if not post_content: continue
classifier_dict = {
'user_id': request.user.pk,
'feed_id': feed_id,

6
apps/rss_feeds/models.py
View file

@ -445,7 +445,7 @@ class Feed(models.Model):
def trim_feed(self):
from apps.reader.models import MUserStory
trim_cutoff = 250
trim_cutoff = 500
if self.active_subscribers <= 1:
trim_cutoff = 50
elif self.active_subscribers <= 3:
@ -453,7 +453,9 @@ class Feed(models.Model):
elif self.active_subscribers <= 5:
trim_cutoff = 150
elif self.active_subscribers <= 10:
trim_cutoff = 200
trim_cutoff = 250
elif self.active_subscribers <= 25:
trim_cutoff = 350
stories = MStory.objects(
story_feed_id=self.pk,
).order_by('-story_date')

7
media/css/reader.css
View file

@ -1806,6 +1806,13 @@ a.NB-splash-link:hover {
.NB-modal .NB-modal-field input[type=text] {
width: 446px;
font-size: 14px;
font-size: 14px;
padding: 2px;
margin: 0px 4px 6px;
border: 1px solid #606060;
-moz-box-shadow:2px 2px 0 #D0D0D0;
-webkit-box-shadow:2px 2px 0 #D0D0D0;
box-shadow:2px 2px 0 #D0D0D0;
}
.NB-modal .NB-modal-field input[type=checkbox] {

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

@ -375,8 +375,8 @@
get_feed_ids_in_folder: function($folder) {
$folder = $folder || this.$s.$feed_list;
var $feeds = $('.feed', $folder);
var feeds = _.map($('.feed', $folder), function(o) {
var $feeds = $('.feed:not(.NB-empty)', $folder);
var feeds = _.map($('.feed:not(.NB-empty)', $folder), function(o) {
return o && $(o).data('feed_id');
});

32
media/js/newsblur/reader_classifier.js
View file

@ -102,8 +102,8 @@ var classifier_prototype = {
this.find_story_and_feed();
this.make_modal_story();
this.make_modal_title();
this.handle_text_highlight();
this.make_modal_title();
this.handle_cancel();
this.open_modal();
this.$modal.parent().bind('click.reader_classifer', $.rescope(this.handle_clicks, this));
@ -381,7 +381,7 @@ var classifier_prototype = {
var feed = this.feed;
var opinion = (this.score == 1 ? 'like_' : 'dislike_');
NEWSBLUR.log(['Make Story', story, feed]);
// NEWSBLUR.log(['Make Story', story, feed]);
// HTML entities decoding.
story.story_title = $('<div/>').html(story.story_title).text();
@ -393,7 +393,10 @@ var classifier_prototype = {
$.make('h5', 'Story Title'),
$.make('div', { className: 'NB-fieldset-fields NB-classifiers' }, [
$.make('input', { type: 'text', value: story.story_title, className: 'NB-classifier-title-highlight' }),
this.make_classifier('<span class="NB-classifier-title-text">Highlight phrases to look for in future stories</span>', '', 'title')
this.make_classifier('<span class="NB-classifier-title-placeholder">Highlight phrases to look for in future stories</span>', '', 'title'),
$.make('span',
this.make_user_titles(story.story_title)
)
])
])),
(story.story_authors && $.make('div', { className: 'NB-modal-field NB-fieldset' }, [
@ -453,13 +456,15 @@ var classifier_prototype = {
$count.html(count + '/' + total);
},
make_user_titles: function() {
make_user_titles: function(existing_title) {
var $titles = [];
var titles = _.keys(this.user_classifiers.titles);
_.each(titles, _.bind(function(title) {
var $title = this.make_classifier(title, title, 'title');
$titles.push($title);
if (!existing_title || existing_title.indexOf(title) != -1) {
var $title = this.make_classifier(title, title, 'title');
$titles.push($title);
}
}, this));
return $titles;
@ -707,18 +712,18 @@ var classifier_prototype = {
handle_text_highlight: function() {
var self = this;
var $title_highlight = $('.NB-classifier-title-highlight', this.$modal);
var $title = $('.NB-classifier-title-text', this.$modal);
var $title_classifier = $title.parents('.NB-classifier').eq(0);
var $title_placeholder = $('.NB-classifier-title-placeholder', this.$modal);
var $title_classifier = $title_placeholder.parents('.NB-classifier').eq(0);
var $title_checkboxs = $('.NB-classifier-input-like, .NB-classifier-input-dislike', $title_classifier);
var update = function() {
var text = $.trim($(this).getSelection().text);
if (text.length && $title.text() != text) {
$title.text(text);
if (text.length && $title_placeholder.text() != text) {
$title_placeholder.text(text);
$title_checkboxs.val(text);
if (!$title_classifier.is('.NB-classifier-like,.NB-classifier-dislike')) {
self.change_classifier($title.parents('.NB-classifier').eq(0), 'like');
self.change_classifier($title_classifier, 'like');
}
}
};
@ -726,6 +731,11 @@ var classifier_prototype = {
$title_highlight
.keydown(update).keyup(update)
.mousedown(update).mouseup(update).mousemove(update);
$title_checkboxs.val($title_highlight.val());
$title_placeholder.parents('.NB-classifier').bind('click', function() {
$title_placeholder.text($title_highlight.val());
});
},
handle_cancel: function() {