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

Fixing issues around adding a folder in the add site bookmarklet. Cleaning up the modal by taking out the folder icon.

Browse source
This commit is contained in:
Samuel Clay 2011-03-21 20:37:58 -04:00
parent 4a15794321
commit 45cf8f5cf8
4 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/api/views.py
View file

@ -15,7 +15,6 @@ def add_site_load_script(request, token):
image_file = open(os.path.join(settings.MEDIA_ROOT, 'img/icons/silk/%s.png' % image_name))
return base64.b64encode(image_file.read())
folder_image = image_base64('folder')
accept_image = image_base64('accept')
error_image = image_base64('error')
new_folder_image = image_base64('arrow_down_right')
@ -35,7 +34,6 @@ def add_site_load_script(request, token):
'code': code,
'token': token,
'folders': usf.folders,
'folder_image': folder_image,
'accept_image': accept_image,
'error_image': error_image,
'add_image': add_image,
@ -48,7 +46,7 @@ def add_site(request, token):
code = 0
url = request.GET['url']
folder = request.GET['folder']
new_folder = request.GET['new_folder']
new_folder = request.GET.get('new_folder')
callback = request.GET['callback']
if not url:

1
apps/reader/models.py
View file

@ -304,6 +304,7 @@ class UserSubscriptionFolders(models.Model):
obj = {folder: []}
user_sub_folders = add_object_to_folder(obj, parent_folder, user_sub_folders)
self.folders = json.encode(user_sub_folders)
print self.folders, parent_folder, folder
self.save()
def delete_feed(self, feed_id, in_folder):

33
media/css/modals.css
View file

@ -249,11 +249,29 @@
.NB-bookmarklet .NB-bookmarklet-folder-container .NB-folders {
font-size: 14px;
}
.NB-bookmarklet .NB-bookmarklet-folder-add-button {
float: left;
margin: 2px 4px 0 0;
cursor: pointer;
}
.NB-bookmarklet .NB-bookmarklet-new-folder-container {
display: none;
float: right;
clear: both;
}
.NB-bookmarklet .NB-bookmarklet-folder-new {
float: left;
padding: 2px;
border: 1px solid #505050;
font-size: 11px;
line-height: 13px;
margin: 2px 0 0;
width: 170px;
}
.NB-bookmarklet .NB-bookmarklet-folder-new-label {
margin: 4px 4px 0 0;
float: left;
}
.NB-bookmarklet .NB-folders {
width: 200px;
}
@ -290,19 +308,4 @@
}
.NB-bookmarklet .NB-folders {
float: right;
}
.NB-bookmarklet .NB-bookmarklet-folder-new-label {
float: right;
}
.NB-bookmarklet .NB-bookmarklet-folder-new {
clear: both;
float: right;
padding: 2px;
border: 1px solid #505050;
font-size: 11px;
line-height: 13px;
margin: 2px 0 0 4px;
}
.NB-bookmarklet .NB-bookmarklet-folder-new-label {
margin: 4px 0 0 0;
}

13
templates/api/bookmarklet_subscribe.js
View file

@ -14,7 +14,7 @@
this.domain = "{% current_domain %}";
this.flags = {
'new_folder': false
}
};
this.options = $.extend({}, defaults, options);
this.runner();
@ -74,12 +74,11 @@
]),
$.make('div', { className: 'NB-modal-title' }, 'Adding \"'+this.get_page_title()+'\"'),
$.make('div', { className: 'NB-bookmarklet-folder-container' }, [
$.make('img', { className: 'NB-bookmarklet-folder-label', src: 'data:image/png;charset=utf-8;base64,{{ folder_image }}' }),
$.make('img', { className: 'NB-bookmarklet-folder-add-button', src: 'data:image/png;charset=utf-8;base64,{{ add_image }}', title: 'Add New Folder' }),
this.make_folders(),
$.make('img', { className: 'NB-bookmarklet-folder-add-button', src: 'data:image/png;charset=utf-8;base64,{{ add_image }}' }),
$.make('div', { className: 'NB-bookmarklet-new-folder-container' }, [
$.make('img', { className: 'NB-bookmarklet-folder-new-label', src: 'data:image/png;charset=utf-8;base64,{{ new_folder_image }}' })
$.make('input', { type: 'text', name: 'new_folder_name', className: 'NB-bookmarklet-folder-new' }),
$.make('img', { className: 'NB-bookmarklet-folder-new-label', src: 'data:image/png;charset=utf-8;base64,{{ new_folder_image }}' }),
$.make('input', { type: 'text', name: 'new_folder_name', className: 'NB-bookmarklet-folder-new' })
])
]),
$.make('div', { className: 'NB-modal-submit' }, [
@ -104,8 +103,6 @@
$options = this.make_folder_options($options, folders, '-');
$('option', $options).tsort();
var $option = $.make('option', { value: '', selected: true }, "Top Level");
$options.prepend($option);
@ -176,7 +173,7 @@
if (this.flags['new_folder']) {
var new_folder_name = $('input[name=new_folder_name]', this.$modal).val();
if (new_folder_name) {
data['new_folder'] = new_folder_name
data['new_folder'] = new_folder_name;
}
}