From 4e534dba91f4bff128824ff24fdceeab7b95bc79 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 23 Oct 2011 03:30:09 +0200 Subject: [PATCH 1/3] remove unused admin stuff --- pandora/app/views.py | 1 + pandora/archive/admin.py | 3 - pandora/archive/forms.py | 27 --------- pandora/item/forms.py | 18 ------ requirements.txt | 1 - static/js/ajax_filtered_fields.js | 91 ------------------------------- 6 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 static/js/ajax_filtered_fields.js diff --git a/pandora/app/views.py b/pandora/app/views.py index 60f8f354..71decff8 100644 --- a/pandora/app/views.py +++ b/pandora/app/views.py @@ -91,3 +91,4 @@ def redirect_url(request, url): return redirect(url) else: return HttpResponse(''%json.dumps(url)) + diff --git a/pandora/archive/admin.py b/pandora/archive/admin.py index 93c8c3f1..573d21b9 100644 --- a/pandora/archive/admin.py +++ b/pandora/archive/admin.py @@ -3,7 +3,6 @@ from django.contrib import admin -from forms import FileAdminForm, InstanceAdminForm import models @@ -15,13 +14,11 @@ class FileAdmin(admin.ModelAdmin): def itemId(self, obj): return '%s'%(obj.item.itemId) - form = FileAdminForm admin.site.register(models.File, FileAdmin) class InstanceAdmin(admin.ModelAdmin): search_fields = ['path', 'volume__name', 'file__oshash'] - form = InstanceAdminForm admin.site.register(models.Instance, InstanceAdmin) diff --git a/pandora/archive/forms.py b/pandora/archive/forms.py index 04221754..0e2ac95b 100644 --- a/pandora/archive/forms.py +++ b/pandora/archive/forms.py @@ -1,4 +1,3 @@ -from ajax_filtered_fields.forms import ForeignKeyByLetter from django.conf import settings from django import forms @@ -6,29 +5,3 @@ import models from item.models import Item -ajax_filtered_js = ( - settings.ADMIN_MEDIA_PREFIX + "js/SelectBox.js", - settings.ADMIN_MEDIA_PREFIX + "js/SelectFilter2.js", - settings.STATIC_URL + 'js/jquery/jquery.js', - settings.STATIC_URL + 'js/ajax_filtered_fields.js', -) - - -class FileAdminForm(forms.ModelForm): - item = ForeignKeyByLetter(Item, field_name='itemId') - - class Meta: - model = models.File - - class Media: - js = ajax_filtered_js - - -class InstanceAdminForm(forms.ModelForm): - file = ForeignKeyByLetter(models.File, field_name='path') - - class Meta: - model = models.Instance - - class Media: - js = ajax_filtered_js diff --git a/pandora/item/forms.py b/pandora/item/forms.py index 664b728b..acad2478 100644 --- a/pandora/item/forms.py +++ b/pandora/item/forms.py @@ -1,20 +1,2 @@ -from ajax_filtered_fields.forms import AjaxManyToManyField, ForeignKeyByLetter from django.conf import settings -ajax_filtered_js = ( - settings.ADMIN_MEDIA_PREFIX + "js/SelectBox.js", - settings.ADMIN_MEDIA_PREFIX + "js/SelectFilter2.js", - settings.STATIC_URL + 'js/jquery/jquery.js', - settings.STATIC_URL + 'js/ajax_filtered_fields.js', -) -""" -class ItemAdminForm(forms.ModelForm): - imdb = ForeignKeyByLetter(models.ItemImdb, field_name='title') - oxdb = ForeignKeyByLetter(models.ItemOxdb, field_name='title') - - class Meta: - model = models.Item - - class Media: - js = ajax_filtered_js -""" diff --git a/requirements.txt b/requirements.txt index 71ee76bb..a083ef36 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ -e bzr+http://code.0x2620.org/oxtimeline/#egg=oxtimeline simplejson chardet --e hg+https://django-ajax-filtered-fields.googlecode.com/hg/#egg=django-ajax-filtered-fields celery>2.1.1 django-celery>2.1.1 #django_extensions diff --git a/static/js/ajax_filtered_fields.js b/static/js/ajax_filtered_fields.js deleted file mode 100644 index 887348da..00000000 --- a/static/js/ajax_filtered_fields.js +++ /dev/null @@ -1,91 +0,0 @@ -ajax_filtered_fields = { - - request_url: "/ajax_filtered_fields/json_index/", - data_loaded: "data_loaded", - - _appendOption: function(obj, selector) { - // append a json data row as an option to the selector - var option = $(''); - option.attr({value: obj[0]}); - option.appendTo(selector); - return option; - }, - - _removeOptions: function(selector) { - // remove all options from selector - selector.children("option").each(function(i) { - $(this).remove(); - }); - }, - - getManyToManyJSON: function(element_id, app_label, object_name, - lookup_string, select_related) { - // manage the ManyToMany ajax request - var selector_from = $("#" + element_id + "_from"); - var selector_to = $("#" + element_id + "_to"); - - $("#" + element_id + "_input").val(""); - selector_from.attr("disabled", true); - selector_to.attr("disabled", true); - - this._removeOptions(selector_from); - - $.getJSON(this.request_url, { - app_label: app_label, - object_name: object_name, - lookup_string: lookup_string, - select_related: select_related}, - function(data){ - $.each(data, function(i, obj){ - var option_is_selected = selector_to.children("option[value='" + obj[0] + "']").length; - if (!option_is_selected) { - ajax_filtered_fields._appendOption(obj, selector_from); - }; - }); - SelectBox.init(element_id + "_from"); - selector_from.attr("disabled", false); - selector_to.attr("disabled", false); - selector_from.trigger(ajax_filtered_fields.data_loaded); - }); - }, - - getForeignKeyJSON: function(element_id, app_label, object_name, - lookup_string, select_related) { - // manage the ForeignKey ajax request - var selector = $("#" + element_id); - var hidden = $("#hidden-" + element_id); - - $("#" + element_id + "_input").val(""); - selector.attr("disabled", true); - - this._removeOptions(selector); - - $.getJSON(this.request_url, { - app_label: app_label, - object_name: object_name, - lookup_string: lookup_string, - select_related: select_related}, - function(data){ - var selection = hidden.val(); - ajax_filtered_fields._appendOption(new Array("", "---------"), selector); - $.each(data, function(i, obj){ - ajax_filtered_fields._appendOption(obj, selector); - }); - selector.children("option[value='" + selection + "']").attr("selected", "selected"); - selector.attr("disabled", false); - SelectBox.init(element_id); - ajax_filtered_fields.bindForeignKeyOptions(element_id); - selector.trigger(ajax_filtered_fields.data_loaded); - }); - }, - - bindForeignKeyOptions: function(element_id) { - // bind the dummy options to the hidden field that do the work - var selector = $("#" + element_id); - var hidden = $("#hidden-" + element_id); - selector.change(function(e) { - hidden.val($(this).val()); - }); - } - -}; From 2c378e46ea11c456cfe447cf62fa6cd9de9d97a3 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 23 Oct 2011 03:37:58 +0200 Subject: [PATCH 2/3] remove outdated oxff integration --- static/js/pandora.local.js | 393 ------------------------------------- 1 file changed, 393 deletions(-) delete mode 100644 static/js/pandora.local.js diff --git a/static/js/pandora.local.js b/static/js/pandora.local.js deleted file mode 100644 index feadaca2..00000000 --- a/static/js/pandora.local.js +++ /dev/null @@ -1,393 +0,0 @@ -if(typeof(pandora.afterLaunch) == "undefined") - pandora.afterLaunch = []; - -//pandora.afterLaunch[0](); -pandora.afterLaunch.push(function() { - if (typeof(OxFF) == 'undefined') - return; - pandora.local = { - api: new OxFF(), - volumes: function(cb) { - var _this = this; - Ox.print('api.volumes'); - this.api.login(window, pandora.user.username); - Ox.print('api.now access'); - this.api.access(function(access) { - Ox.print('access callback', access); - if(!access) { - var dialogHeight = pandora.$document.height()/2, - dialogWidth = parseInt((dialogHeight - 48) * 0.75); - - var $dialog = new Ox.Dialog({ - buttons: [ - { - title: 'Close', - click: function() { - $dialog.close(); - delete $dialog; - } - } - ], - height: dialogHeight, - padding: 0, - title: "Pan.do/ra OxFF Local Archive", - width: dialogWidth - }) - .append("For this part of the page to work, you have to allow OxFF to send data to this site") - .open(); - } else { - _this.api.volumes(function(result) { - var data = JSON.parse(result); - cb(data); - }); - } - }); - }, - files: function(archive, cb) { - this.api.login(window, pandora.user.username); - if(!this.api.access()) - return false; - this.api.files(archive, function(result) { - var data = JSON.parse(result); - cb(data); - }); - return true; - }, - upload: function(options, done_cb, progress_cb) { - function wrap(cb) { - if(!cb) - return null; - return function(result) { - var data = JSON.parse(result); - cb(data); - } - } - this.api.upload(JSON.stringify(options), - wrap(done_cb), - wrap(progress_cb)); - return true; - }, - parsePath: function(path) { - var folder = path.split('/'); - folder.pop(); - if(folder.length==0) { - folder.push("rootfolder"); - } - //FIXME: this is also done on the backend but might require more sub options - if (folder[folder.length-1] == "Extras" || folder[folder.length-1] == "Versions") - folder.pop(); - folder = folder.join('/'); - return { - folder: folder, - name: path.substring(folder.length), - } - }, - loadVolumes: function() { - var _this = this; - Ox.print("load volumes"); - var $section = new Ox.CollapsePanel({ - id: 'volumes', - size: 'small', - title: 'Volumes' - }); - - pandora.$ui.sections.push($section); - // fixme: cleanup - pandora.local.volumes(function(data) { - Ox.print("got volumes", data); - var volumes = 0; - Ox.forEach(data, function(info, name) { - volumes ++; - Ox.print("add volume", name, info); - var status = info.available?"online":"offline"; - var $line = $('
').css({ height: '20px' }).append( - $('
').css({ float: 'left', width: '16px', height: '16px', margin: '1px'}).append( - $('').attr({ src: 'static/oxjs/build/png/ox.ui.modern/iconFind.png' }) - .css({ - width: '16px', height: '16px', - border: 0, background: 'rgb(64, 64, 64)', - WebkitBorderRadius: '2px' }) - ) - ).append( - $('
').css({ float: 'left', width: '122px', height: '14px', margin: '2px' }).html(name) - ).append( - $('
').css({ float: 'left', width: '40px', height: '14px', margin: '2px', textAlign: 'right' }).html(status) - ); - $line.click(function() { - Ox.print("get files", name); - pandora.local.constructFileList(name); - }); - $section.$content.append($line); - }); - - add_button = new Ox.Button({ - id: 'add_volume', - title: 'add', - width: 32 - }).bindEvent('click', function(data) { - if(_this.api.setLocation("Volume "+(volumes+1))) _this.loadVolumes(); - }); - var update_button = new Ox.Button({ - id: 'update_archive', - title: 'update', - width: 48 - }).bindEvent('click', function(data) { - update_button.options({disabled: true}); - _this.api.update(function() { - update_button.options({disabled: false}); - }) - }); - pandora.$ui.lists.replaceWith(pandora.constructLists()); - $section.find('.OxBar').append($('
') - .css({'text-align': 'right', 'margin': '2px'}) - .append(update_button.$element) - .append(add_button.$element) - ); - }); - }, - uploadVideos: function(ids, done, progress, total) { - var _this = this; - if(typeof(total) == 'undefined') - total = ids.length; - - if(ids.length>0) { - var oshash = ids.pop(); - this.uploadVideo(oshash, - function(data) { - if(ids.length>0) { - Ox.print('more files in queue, calling again', ids, total); - _this.uploadVideos(ids, done, progress, total); - } else { //FIXME: should keep info about all uploads - done(data); - } - }, - function(data) { - data.progress = data.progress/total; - progress(data); - }); - } - }, - uploadVideo: function(oshash, done, progress) { - Ox.print('upload', oshash); - var url = pandora.local.absolute_url('/api/'); - pandora.local.upload({ - url: url, - data: {action: 'upload', oshash: oshash}, - oshash: oshash, - action: 'frames' - }, - function(result) { - Ox.print(result); - //FIXME: check result before posting video - profile = '96p.webm'; - var url = pandora.local.absolute_url('/api/upload/') + '?profile=' + profile + '&oshash=' + oshash; - pandora.local.upload( - { - oshash: oshash, - action: 'video', - profile: profile, - url: url - }, - done, - progress - ); - } - ); - }, - uploadFile: function(oshash) { - Ox.print('upload file', oshash); - var url = pandora.local.absolute_url('/api/'); - pandora.local.upload({ - url: url, - data: {action: 'upload', oshash: oshash}, - oshash: oshash, - action: 'file' - }, - function(result) { - Ox.print(result); - } - ); - }, - cancel: function(oshash) { - Ox.print('this function needs to be implemented: cancel ', oshash); - }, - constructFileList: function(name) { - var _this = this, - $list = new Ox.TextList({ - columns: [ - { - align: "left", - id: "id", - operator: "+", - title: "ID", - unique: true, - visible: false, - width: 120 - }, - { - align: "left", - id: "path", - operator: "+", - title: "path", - unique: false, - visible: true, - width: 600 - }, - { - align: "left", - id: "files", - operator: "+", - title: "files", - visible: true, - width: 80 - }, - { - align: "left", - id: "status", - operator: "+", - title: "status", - unique: false, - visible: true, - width:120 - }, - ], - id: "volume", - request: function(options, callback) { - Ox.print("options, volumes", options) - if(!options.range) { - callback({ - data: { - items: 58 - } - }); - } else { - pandora.local.files(name, function(result) { - var fileInfo = result.info; - pandora.api.update({ - 'volume': name, 'files': result.files - }, function(result) { - var videos = {}; - function parseResult(result) { - //extract and upload requested videos - result.data.data.forEach(function(oshash) { - folder_ids.forEach(function(ids, i) { - if (ids.indexOf(oshash) > -1) { - if (!videos[i]) { - videos[i] = []; - var button = new Ox.Button({ - id: 'upload_' + oshash, - title: 'Upload', - width: 48 - }).bindEvent('click', function(fid) { return function(data) { - Ox.print(videos[fid]); - $($('#'+fid).find('.OxCell')[1]).html(function(fid) { - var button = new Ox.Button({ - title: 'Cancel', - width: 48 - }).bindEvent('click', function(data) { - videos[fid].forEach(function(oshash) { - _this.cancel(oshash); - }); - }); - return button.$element; - }(fid)); - //$($('#'+fid).find('.OxCell')[2]).html('extracting data...'); - pandora.local.uploadVideos( - videos[fid], - function(data) { - $($('#'+fid).find('.OxCell')[2]).html('done'); - }, - function(data) { - $($('#'+fid).find('.OxCell')[2]).html(parseInt(data.progress*100)); - } - ); - }}(i)); - $($('#'+i).find('.OxCell')[2]).html(button.$element); - $('#'+i).css({'font-weight': 'bold'}); - } - videos[i].push(oshash); - //add some double click callback here to trigger video upload - return false; - } - }); - }); - //upload requested files - result.data.file.forEach(function(oshash) { - pandora.local.uploadFile(oshash); - }); - }; - if (result.data.info.length>0) { - var post = {'info': {}}; - result.data.info.forEach(function(oshash) { - if(fileInfo[oshash]) { - post.info[oshash] = fileInfo[oshash]; - } - }); - pandora.api.update(post, function(result) { - parseResult(result); - }); - } else { - parseResult(result); - } - - }); - var data = { - items: [] - } - var folder_ids = {}; - var folders = {}; - result.files.forEach(function(file) { - var f = pandora.local.parsePath(file.path); - if(!folders[f.folder]) { - folders[f.folder] = { - id: file.oshash, - path: f.folder, - files: 0, - status:'ok', - ids: [] - }; - folder_ids[file.oshash] = []; - } - folders[f.folder].files++; - folder_ids[folders[f.folder].id].push(file.oshash); - }); - var j = 1; - folders.forEach(function(folder) { - data.items.push(folder); - }); - r = { - data: data, - } - Ox.print(r); - callback(r); - - }); - } - }, - sort: [ - { - key: "path", - operator: "+" - } - ] - }); - pandora.$ui.contentPanel.replace(1, $list); - }, - absolute_url: function (url) { - var base = document.location.href; - if (url.substring(0, 1) == '/') { - base = document.location.protocol + '//' + document.location.hostname; - if(document.location.port) base += ':'+document.location.port - url = base + url; - } - else { - if(base.substring(base.length-1) == '/') - url = base + url; - else - url = base + '/' + url; - } - return url; - }, - }; - pandora.local.loadVolumes(); -}); From 7586f2746a712b3453009477683b0ffeb0db6892 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Sun, 23 Oct 2011 04:29:20 +0200 Subject: [PATCH 3/3] build static, move js files --- pandora/app/management/__init__.py | 0 pandora/app/management/commands/__init__.py | 0 .../app/management/commands/update_static.py | 15 +++ pandora/app/models.py | 26 ++++ pandora/templates/api.html | 4 +- pandora/templates/embed.html | 2 +- pandora/templates/index.html | 4 +- static/js/{ => api}/highlight.pack.js | 0 static/js/{pandora.api.js => api/pandora.js} | 0 .../js/{pandoraEmbed.js => embed/pandora.js} | 0 static/js/{pandora.js => init.js} | 49 ++++---- static/js/pandora/{ui => }/account.js | 0 static/js/pandora/{ui => }/appPanel.js | 0 static/js/pandora/{ui => }/backButton.js | 0 static/js/pandora/{ui => }/browser.js | 0 static/js/pandora/{ui => }/clipList.js | 0 static/js/pandora/{ui => }/clipPlayer.js | 0 static/js/pandora/{ui => }/contactForm.js | 0 static/js/pandora/{ui => }/contentPanel.js | 0 .../js/pandora/{ui => }/deleteListDialog.js | 0 static/js/pandora/{ui => }/editor.js | 0 static/js/pandora/{ui => }/eventsDialog.js | 0 static/js/pandora/{ui => }/filesView.js | 0 static/js/pandora/{ui => }/filter.js | 0 static/js/pandora/{ui => }/filterDialog.js | 0 static/js/pandora/{ui => }/findElement.js | 0 static/js/pandora/{ui => }/folderBrowser.js | 0 .../js/pandora/{ui => }/folderBrowserBar.js | 0 .../js/pandora/{ui => }/folderBrowserList.js | 0 static/js/pandora/{ui => }/folderList.js | 0 static/js/pandora/{ui => }/folders.js | 0 static/js/pandora/{ui => }/group.js | 0 static/js/pandora/{ui => }/helpDialog.js | 0 static/js/pandora/{ui => }/home.js | 0 static/js/pandora/{ui => }/homePage.js | 0 static/js/pandora/{ui => }/info.js | 0 static/js/pandora/{ui => }/infoView.js | 0 static/js/pandora/{ui => }/item.js | 44 +++---- static/js/pandora/{ui => }/itemClips.js | 0 static/js/pandora/{ui => }/leftPanel.js | 0 static/js/pandora/{ui => }/list.js | 0 static/js/pandora/{ui => }/listDialog.js | 0 static/js/pandora/{ui => }/mainPanel.js | 0 static/js/pandora/{ui => }/mediaView.js | 0 static/js/pandora/{ui => }/menu.js | 0 static/js/pandora/{ui => }/namesDialog.js | 0 static/js/pandora/{ui => }/navigationView.js | 0 static/js/pandora/{ui => }/orderButton.js | 0 static/js/pandora/{ui => }/placesDialog.js | 0 .../js/pandora/{ui => }/preferencesDialog.js | 0 static/js/pandora/{ui => }/publicLists.js | 0 static/js/pandora/{ui => }/rightPanel.js | 0 static/js/pandora/{ui => }/sectionButtons.js | 0 static/js/pandora/{ui => }/sectionSelect.js | 0 static/js/pandora/{ui => }/sectionbar.js | 0 static/js/pandora/{ui => }/siteDialog.js | 0 static/js/pandora/{ui => }/sortSelect.js | 0 static/js/pandora/{ui => }/status.js | 0 static/js/pandora/{ui => }/statusbar.js | 0 static/js/pandora/{ui => }/titlesDialog.js | 0 static/js/pandora/{ui => }/toolbar.js | 0 static/js/pandora/{ui => }/usersDialog.js | 0 static/js/pandora/{ui => }/videoPreview.js | 0 static/js/pandora/{ui => }/viewSelect.js | 0 static/json/pandora.json | 118 +++++++++--------- 65 files changed, 146 insertions(+), 116 deletions(-) create mode 100644 pandora/app/management/__init__.py create mode 100644 pandora/app/management/commands/__init__.py create mode 100644 pandora/app/management/commands/update_static.py rename static/js/{ => api}/highlight.pack.js (100%) rename static/js/{pandora.api.js => api/pandora.js} (100%) rename static/js/{pandoraEmbed.js => embed/pandora.js} (100%) rename static/js/{pandora.js => init.js} (83%) rename static/js/pandora/{ui => }/account.js (100%) rename static/js/pandora/{ui => }/appPanel.js (100%) rename static/js/pandora/{ui => }/backButton.js (100%) rename static/js/pandora/{ui => }/browser.js (100%) rename static/js/pandora/{ui => }/clipList.js (100%) rename static/js/pandora/{ui => }/clipPlayer.js (100%) rename static/js/pandora/{ui => }/contactForm.js (100%) rename static/js/pandora/{ui => }/contentPanel.js (100%) rename static/js/pandora/{ui => }/deleteListDialog.js (100%) rename static/js/pandora/{ui => }/editor.js (100%) rename static/js/pandora/{ui => }/eventsDialog.js (100%) rename static/js/pandora/{ui => }/filesView.js (100%) rename static/js/pandora/{ui => }/filter.js (100%) rename static/js/pandora/{ui => }/filterDialog.js (100%) rename static/js/pandora/{ui => }/findElement.js (100%) rename static/js/pandora/{ui => }/folderBrowser.js (100%) rename static/js/pandora/{ui => }/folderBrowserBar.js (100%) rename static/js/pandora/{ui => }/folderBrowserList.js (100%) rename static/js/pandora/{ui => }/folderList.js (100%) rename static/js/pandora/{ui => }/folders.js (100%) rename static/js/pandora/{ui => }/group.js (100%) rename static/js/pandora/{ui => }/helpDialog.js (100%) rename static/js/pandora/{ui => }/home.js (100%) rename static/js/pandora/{ui => }/homePage.js (100%) rename static/js/pandora/{ui => }/info.js (100%) rename static/js/pandora/{ui => }/infoView.js (100%) rename static/js/pandora/{ui => }/item.js (94%) rename static/js/pandora/{ui => }/itemClips.js (100%) rename static/js/pandora/{ui => }/leftPanel.js (100%) rename static/js/pandora/{ui => }/list.js (100%) rename static/js/pandora/{ui => }/listDialog.js (100%) rename static/js/pandora/{ui => }/mainPanel.js (100%) rename static/js/pandora/{ui => }/mediaView.js (100%) rename static/js/pandora/{ui => }/menu.js (100%) rename static/js/pandora/{ui => }/namesDialog.js (100%) rename static/js/pandora/{ui => }/navigationView.js (100%) rename static/js/pandora/{ui => }/orderButton.js (100%) rename static/js/pandora/{ui => }/placesDialog.js (100%) rename static/js/pandora/{ui => }/preferencesDialog.js (100%) rename static/js/pandora/{ui => }/publicLists.js (100%) rename static/js/pandora/{ui => }/rightPanel.js (100%) rename static/js/pandora/{ui => }/sectionButtons.js (100%) rename static/js/pandora/{ui => }/sectionSelect.js (100%) rename static/js/pandora/{ui => }/sectionbar.js (100%) rename static/js/pandora/{ui => }/siteDialog.js (100%) rename static/js/pandora/{ui => }/sortSelect.js (100%) rename static/js/pandora/{ui => }/status.js (100%) rename static/js/pandora/{ui => }/statusbar.js (100%) rename static/js/pandora/{ui => }/titlesDialog.js (100%) rename static/js/pandora/{ui => }/toolbar.js (100%) rename static/js/pandora/{ui => }/usersDialog.js (100%) rename static/js/pandora/{ui => }/videoPreview.js (100%) rename static/js/pandora/{ui => }/viewSelect.js (100%) diff --git a/pandora/app/management/__init__.py b/pandora/app/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pandora/app/management/commands/__init__.py b/pandora/app/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pandora/app/management/commands/update_static.py b/pandora/app/management/commands/update_static.py new file mode 100644 index 00000000..f98c2b7d --- /dev/null +++ b/pandora/app/management/commands/update_static.py @@ -0,0 +1,15 @@ +# -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 +from django.core.management.base import BaseCommand + +from ... import models + + +class Command(BaseCommand): + """ + """ + help = 'update static files' + args = '' + + def handle(self, **options): + models.update_static() diff --git a/pandora/app/models.py b/pandora/app/models.py index 77d0bc28..bc5cbac6 100644 --- a/pandora/app/models.py +++ b/pandora/app/models.py @@ -10,6 +10,7 @@ import thread from django.db import models from django.conf import settings import ox.jsonc +from ox.utils import json _win = (sys.platform == "win32") @@ -52,3 +53,28 @@ def reloader_thread(): time.sleep(1) thread.start_new_thread(reloader_thread, ()) + +def update_static(): + oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py') + if os.path.exists(oxjs_build): + os.system(oxjs_build) + + data = '' + js = [] + pandora_js = os.path.join(settings.STATIC_ROOT, 'js/pandora.js') + pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json') + for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js/pandora')): + for f in files: + js.append(os.path.join(root, f)[len(settings.STATIC_ROOT)+1:]) + with open(os.path.join(root, f)) as j: + data += j.read() + '\n' + + print 'write', pandora_js + with open(pandora_js, 'w') as f: + #data = ox.js.minify(data) + f.write(data) + + print 'write', pandora_json + with open(pandora_json, 'w') as f: + json.dump(sorted(js), f, indent=2) + diff --git a/pandora/templates/api.html b/pandora/templates/api.html index 347773fb..89fce8e2 100644 --- a/pandora/templates/api.html +++ b/pandora/templates/api.html @@ -7,8 +7,8 @@ - - + + diff --git a/pandora/templates/embed.html b/pandora/templates/embed.html index b63fa1d3..4c34e554 100644 --- a/pandora/templates/embed.html +++ b/pandora/templates/embed.html @@ -4,7 +4,7 @@ {{settings.SITENAME}} - + diff --git a/pandora/templates/index.html b/pandora/templates/index.html index 06080bd8..90d36fe7 100644 --- a/pandora/templates/index.html +++ b/pandora/templates/index.html @@ -11,8 +11,8 @@ }; } - - + + diff --git a/static/js/highlight.pack.js b/static/js/api/highlight.pack.js similarity index 100% rename from static/js/highlight.pack.js rename to static/js/api/highlight.pack.js diff --git a/static/js/pandora.api.js b/static/js/api/pandora.js similarity index 100% rename from static/js/pandora.api.js rename to static/js/api/pandora.js diff --git a/static/js/pandoraEmbed.js b/static/js/embed/pandora.js similarity index 100% rename from static/js/pandoraEmbed.js rename to static/js/embed/pandora.js diff --git a/static/js/pandora.js b/static/js/init.js similarity index 83% rename from static/js/pandora.js rename to static/js/init.js index 17962bdd..70f40bca 100644 --- a/static/js/pandora.js +++ b/static/js/init.js @@ -29,7 +29,7 @@ Ox.load({ hideScreen: false, loadImages: true, showScreen: true, - theme: 'modern' + theme: localStorage?localStorage.theme:'modern' }, Geo: {} }, function(browserSupported) { @@ -54,7 +54,7 @@ Ox.load({ ui: {} }); - loadResources('/static/json/pandora.json', function() { + loadResources(function() { Ox.print('Ox.App load', data); @@ -144,34 +144,33 @@ Ox.load({ }); - }, '/static/'); // fixme: why does loadResources have an argument after callback???? + }); } }); - function loadResources(json, callback, prefix) { - prefix = prefix || ''; - $.getJSON(json, function(files) { - var promises = []; - files.forEach(function(file) { - // fixme: opera doesnt fire onload for svgs - // (but neither do we support opera nor do we have svgs) - if ($.browser.opera && Ox.endsWith(file, '.svg')) { - return; - } - var dfd = new $.Deferred(); - promises.push(dfd.promise()); - Ox.loadFile(prefix + file, function() { - dfd.resolve(); + function loadResources(callback) { + var prefix = '/static/'; + if(localStorage && localStorage.debug) { + Ox.getJSON(prefix + 'json/pandora.json', function(files) { + var promises = []; + files.forEach(function(file) { + var dfd = new $.Deferred(); + promises.push(dfd.promise()); + Ox.loadFile(prefix + file, function() { + dfd.resolve(); + }); }); + $.when.apply(null, promises) + .done(function() { + callback(); + }) + .fail(function() { + throw new Error('File not found.'); + }); }); - $.when.apply(null, promises) - .done(function() { - callback(); - }) - .fail(function() { - throw new Error('File not found.') - }); - }); + } else { + Ox.loadFile(prefix + 'js/pandora.js', callback); + } } }); diff --git a/static/js/pandora/ui/account.js b/static/js/pandora/account.js similarity index 100% rename from static/js/pandora/ui/account.js rename to static/js/pandora/account.js diff --git a/static/js/pandora/ui/appPanel.js b/static/js/pandora/appPanel.js similarity index 100% rename from static/js/pandora/ui/appPanel.js rename to static/js/pandora/appPanel.js diff --git a/static/js/pandora/ui/backButton.js b/static/js/pandora/backButton.js similarity index 100% rename from static/js/pandora/ui/backButton.js rename to static/js/pandora/backButton.js diff --git a/static/js/pandora/ui/browser.js b/static/js/pandora/browser.js similarity index 100% rename from static/js/pandora/ui/browser.js rename to static/js/pandora/browser.js diff --git a/static/js/pandora/ui/clipList.js b/static/js/pandora/clipList.js similarity index 100% rename from static/js/pandora/ui/clipList.js rename to static/js/pandora/clipList.js diff --git a/static/js/pandora/ui/clipPlayer.js b/static/js/pandora/clipPlayer.js similarity index 100% rename from static/js/pandora/ui/clipPlayer.js rename to static/js/pandora/clipPlayer.js diff --git a/static/js/pandora/ui/contactForm.js b/static/js/pandora/contactForm.js similarity index 100% rename from static/js/pandora/ui/contactForm.js rename to static/js/pandora/contactForm.js diff --git a/static/js/pandora/ui/contentPanel.js b/static/js/pandora/contentPanel.js similarity index 100% rename from static/js/pandora/ui/contentPanel.js rename to static/js/pandora/contentPanel.js diff --git a/static/js/pandora/ui/deleteListDialog.js b/static/js/pandora/deleteListDialog.js similarity index 100% rename from static/js/pandora/ui/deleteListDialog.js rename to static/js/pandora/deleteListDialog.js diff --git a/static/js/pandora/ui/editor.js b/static/js/pandora/editor.js similarity index 100% rename from static/js/pandora/ui/editor.js rename to static/js/pandora/editor.js diff --git a/static/js/pandora/ui/eventsDialog.js b/static/js/pandora/eventsDialog.js similarity index 100% rename from static/js/pandora/ui/eventsDialog.js rename to static/js/pandora/eventsDialog.js diff --git a/static/js/pandora/ui/filesView.js b/static/js/pandora/filesView.js similarity index 100% rename from static/js/pandora/ui/filesView.js rename to static/js/pandora/filesView.js diff --git a/static/js/pandora/ui/filter.js b/static/js/pandora/filter.js similarity index 100% rename from static/js/pandora/ui/filter.js rename to static/js/pandora/filter.js diff --git a/static/js/pandora/ui/filterDialog.js b/static/js/pandora/filterDialog.js similarity index 100% rename from static/js/pandora/ui/filterDialog.js rename to static/js/pandora/filterDialog.js diff --git a/static/js/pandora/ui/findElement.js b/static/js/pandora/findElement.js similarity index 100% rename from static/js/pandora/ui/findElement.js rename to static/js/pandora/findElement.js diff --git a/static/js/pandora/ui/folderBrowser.js b/static/js/pandora/folderBrowser.js similarity index 100% rename from static/js/pandora/ui/folderBrowser.js rename to static/js/pandora/folderBrowser.js diff --git a/static/js/pandora/ui/folderBrowserBar.js b/static/js/pandora/folderBrowserBar.js similarity index 100% rename from static/js/pandora/ui/folderBrowserBar.js rename to static/js/pandora/folderBrowserBar.js diff --git a/static/js/pandora/ui/folderBrowserList.js b/static/js/pandora/folderBrowserList.js similarity index 100% rename from static/js/pandora/ui/folderBrowserList.js rename to static/js/pandora/folderBrowserList.js diff --git a/static/js/pandora/ui/folderList.js b/static/js/pandora/folderList.js similarity index 100% rename from static/js/pandora/ui/folderList.js rename to static/js/pandora/folderList.js diff --git a/static/js/pandora/ui/folders.js b/static/js/pandora/folders.js similarity index 100% rename from static/js/pandora/ui/folders.js rename to static/js/pandora/folders.js diff --git a/static/js/pandora/ui/group.js b/static/js/pandora/group.js similarity index 100% rename from static/js/pandora/ui/group.js rename to static/js/pandora/group.js diff --git a/static/js/pandora/ui/helpDialog.js b/static/js/pandora/helpDialog.js similarity index 100% rename from static/js/pandora/ui/helpDialog.js rename to static/js/pandora/helpDialog.js diff --git a/static/js/pandora/ui/home.js b/static/js/pandora/home.js similarity index 100% rename from static/js/pandora/ui/home.js rename to static/js/pandora/home.js diff --git a/static/js/pandora/ui/homePage.js b/static/js/pandora/homePage.js similarity index 100% rename from static/js/pandora/ui/homePage.js rename to static/js/pandora/homePage.js diff --git a/static/js/pandora/ui/info.js b/static/js/pandora/info.js similarity index 100% rename from static/js/pandora/ui/info.js rename to static/js/pandora/info.js diff --git a/static/js/pandora/ui/infoView.js b/static/js/pandora/infoView.js similarity index 100% rename from static/js/pandora/ui/infoView.js rename to static/js/pandora/infoView.js diff --git a/static/js/pandora/ui/item.js b/static/js/pandora/item.js similarity index 94% rename from static/js/pandora/ui/item.js rename to static/js/pandora/item.js index cd7bffe4..6872d100 100644 --- a/static/js/pandora/ui/item.js +++ b/static/js/pandora/item.js @@ -28,6 +28,7 @@ pandora.ui.item = function() { }*/ if (['video', 'timeline'].indexOf(pandora.user.ui.itemView) > -1) { + // fixme: layers have value, subtitles has text? var subtitles = result.data.layers.subtitles ? result.data.layers.subtitles.map(function(subtitle) { return {'in': subtitle['in'], out: subtitle.out, text: subtitle.value}; @@ -54,7 +55,19 @@ pandora.ui.item = function() { }; }) ) - : [{'in': 0, out: result.data.duration}]; + : [{'in': 0, out: result.data.duration}], + layers = [], + video = {}; + + pandora.site.layers.forEach(function(layer, i) { + layers[i] = Ox.extend({}, layer, {items: result.data.layers[layer.id]}); + }); + pandora.site.video.resolutions.forEach(function(resolution) { + video[resolution] = Ox.range(result.data.parts).map(function(i) { + return '/' + pandora.user.ui.item + '/' + + resolution + 'p' + (i + 1) + '.' + pandora.user.videoFormat; + }); + }); } if (!result.data.rendered && [ @@ -64,7 +77,7 @@ pandora.ui.item = function() { Ox.Element() .css({marginTop: '32px', fontSize: '12px', textAlign: 'center'}) .html( - 'Sorry, ' + result.data.title + 'Sorry, ' + result.data.title + ' currently doesn\'t have a ' + pandora.user.ui.itemView + ' view.' ) @@ -135,18 +148,7 @@ pandora.ui.item = function() { } else if (pandora.user.ui.itemView == 'video') { // fixme: duplicated var clipsQuery = pandora.getClipsQuery(), - isClipsQuery = !!clipsQuery.conditions.length, - layers = [], - video = {}; - pandora.site.layers.forEach(function(layer, i) { - layers[i] = Ox.extend({}, layer, {items: result.data.layers[layer.id]}); - }); - pandora.site.video.resolutions.forEach(function(resolution) { - video[resolution] = Ox.range(result.data.parts).map(function(i) { - return '/' + pandora.user.ui.item + '/' - + resolution + 'p' + (i + 1) + '.' + pandora.user.videoFormat; - }); - }); + isClipsQuery = !!clipsQuery.conditions.length; // pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.player = Ox.VideoPanelPlayer({ annotationsSize: pandora.user.ui.annotationsSize, @@ -200,18 +202,7 @@ pandora.ui.item = function() { } else if (pandora.user.ui.itemView == 'timeline') { var clipsQuery = pandora.getClipsQuery(), - isClipsQuery = !!clipsQuery.conditions.length, - layers = [], - video = {}; - pandora.site.layers.forEach(function(layer) { - layers.push(Ox.extend({items: result.data.layers[layer.id]}, layer)); - }); - pandora.site.video.resolutions.forEach(function(resolution) { - video[resolution] = Ox.range(result.data.parts).map(function(i) { - return '/' + pandora.user.ui.item + '/' - + resolution + 'p' + (i + 1) + '.' + pandora.user.videoFormat; - }); - }); + isClipsQuery = !!clipsQuery.conditions.length; pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.editor = Ox.VideoEditor({ annotationsSize: pandora.user.ui.annotationsSize, censored: censored, @@ -237,7 +228,6 @@ pandora.ui.item = function() { posterFrame: parseInt(video.duration / 2), showAnnotations: pandora.user.ui.showAnnotations, showLargeTimeline: true, - // fixme: layers have value, subtitles has text? subtitles: subtitles, tooltips: true, video: video, diff --git a/static/js/pandora/ui/itemClips.js b/static/js/pandora/itemClips.js similarity index 100% rename from static/js/pandora/ui/itemClips.js rename to static/js/pandora/itemClips.js diff --git a/static/js/pandora/ui/leftPanel.js b/static/js/pandora/leftPanel.js similarity index 100% rename from static/js/pandora/ui/leftPanel.js rename to static/js/pandora/leftPanel.js diff --git a/static/js/pandora/ui/list.js b/static/js/pandora/list.js similarity index 100% rename from static/js/pandora/ui/list.js rename to static/js/pandora/list.js diff --git a/static/js/pandora/ui/listDialog.js b/static/js/pandora/listDialog.js similarity index 100% rename from static/js/pandora/ui/listDialog.js rename to static/js/pandora/listDialog.js diff --git a/static/js/pandora/ui/mainPanel.js b/static/js/pandora/mainPanel.js similarity index 100% rename from static/js/pandora/ui/mainPanel.js rename to static/js/pandora/mainPanel.js diff --git a/static/js/pandora/ui/mediaView.js b/static/js/pandora/mediaView.js similarity index 100% rename from static/js/pandora/ui/mediaView.js rename to static/js/pandora/mediaView.js diff --git a/static/js/pandora/ui/menu.js b/static/js/pandora/menu.js similarity index 100% rename from static/js/pandora/ui/menu.js rename to static/js/pandora/menu.js diff --git a/static/js/pandora/ui/namesDialog.js b/static/js/pandora/namesDialog.js similarity index 100% rename from static/js/pandora/ui/namesDialog.js rename to static/js/pandora/namesDialog.js diff --git a/static/js/pandora/ui/navigationView.js b/static/js/pandora/navigationView.js similarity index 100% rename from static/js/pandora/ui/navigationView.js rename to static/js/pandora/navigationView.js diff --git a/static/js/pandora/ui/orderButton.js b/static/js/pandora/orderButton.js similarity index 100% rename from static/js/pandora/ui/orderButton.js rename to static/js/pandora/orderButton.js diff --git a/static/js/pandora/ui/placesDialog.js b/static/js/pandora/placesDialog.js similarity index 100% rename from static/js/pandora/ui/placesDialog.js rename to static/js/pandora/placesDialog.js diff --git a/static/js/pandora/ui/preferencesDialog.js b/static/js/pandora/preferencesDialog.js similarity index 100% rename from static/js/pandora/ui/preferencesDialog.js rename to static/js/pandora/preferencesDialog.js diff --git a/static/js/pandora/ui/publicLists.js b/static/js/pandora/publicLists.js similarity index 100% rename from static/js/pandora/ui/publicLists.js rename to static/js/pandora/publicLists.js diff --git a/static/js/pandora/ui/rightPanel.js b/static/js/pandora/rightPanel.js similarity index 100% rename from static/js/pandora/ui/rightPanel.js rename to static/js/pandora/rightPanel.js diff --git a/static/js/pandora/ui/sectionButtons.js b/static/js/pandora/sectionButtons.js similarity index 100% rename from static/js/pandora/ui/sectionButtons.js rename to static/js/pandora/sectionButtons.js diff --git a/static/js/pandora/ui/sectionSelect.js b/static/js/pandora/sectionSelect.js similarity index 100% rename from static/js/pandora/ui/sectionSelect.js rename to static/js/pandora/sectionSelect.js diff --git a/static/js/pandora/ui/sectionbar.js b/static/js/pandora/sectionbar.js similarity index 100% rename from static/js/pandora/ui/sectionbar.js rename to static/js/pandora/sectionbar.js diff --git a/static/js/pandora/ui/siteDialog.js b/static/js/pandora/siteDialog.js similarity index 100% rename from static/js/pandora/ui/siteDialog.js rename to static/js/pandora/siteDialog.js diff --git a/static/js/pandora/ui/sortSelect.js b/static/js/pandora/sortSelect.js similarity index 100% rename from static/js/pandora/ui/sortSelect.js rename to static/js/pandora/sortSelect.js diff --git a/static/js/pandora/ui/status.js b/static/js/pandora/status.js similarity index 100% rename from static/js/pandora/ui/status.js rename to static/js/pandora/status.js diff --git a/static/js/pandora/ui/statusbar.js b/static/js/pandora/statusbar.js similarity index 100% rename from static/js/pandora/ui/statusbar.js rename to static/js/pandora/statusbar.js diff --git a/static/js/pandora/ui/titlesDialog.js b/static/js/pandora/titlesDialog.js similarity index 100% rename from static/js/pandora/ui/titlesDialog.js rename to static/js/pandora/titlesDialog.js diff --git a/static/js/pandora/ui/toolbar.js b/static/js/pandora/toolbar.js similarity index 100% rename from static/js/pandora/ui/toolbar.js rename to static/js/pandora/toolbar.js diff --git a/static/js/pandora/ui/usersDialog.js b/static/js/pandora/usersDialog.js similarity index 100% rename from static/js/pandora/ui/usersDialog.js rename to static/js/pandora/usersDialog.js diff --git a/static/js/pandora/ui/videoPreview.js b/static/js/pandora/videoPreview.js similarity index 100% rename from static/js/pandora/ui/videoPreview.js rename to static/js/pandora/videoPreview.js diff --git a/static/js/pandora/ui/viewSelect.js b/static/js/pandora/viewSelect.js similarity index 100% rename from static/js/pandora/ui/viewSelect.js rename to static/js/pandora/viewSelect.js diff --git a/static/json/pandora.json b/static/json/pandora.json index 92ec261f..7a5f447e 100644 --- a/static/json/pandora.json +++ b/static/json/pandora.json @@ -1,60 +1,60 @@ [ - "js/pandora/Query.js", - "js/pandora/UI.js", - "js/pandora/URL.js", - "js/pandora/autovalidate.js", - "js/pandora/utils.js", - "js/pandora/ui/filesView.js", - "js/pandora/ui/account.js", - "js/pandora/ui/appPanel.js", - "js/pandora/ui/backButton.js", - "js/pandora/ui/browser.js", - "js/pandora/ui/clipList.js", - "js/pandora/ui/contentPanel.js", - "js/pandora/ui/contactForm.js", - "js/pandora/ui/deleteListDialog.js", - "js/pandora/ui/editor.js", - "js/pandora/ui/eventsDialog.js", - "js/pandora/ui/titlesDialog.js", - "js/pandora/ui/filter.js", - "js/pandora/ui/filterDialog.js", - "js/pandora/ui/findElement.js", - "js/pandora/ui/folderBrowser.js", - "js/pandora/ui/folderBrowserBar.js", - "js/pandora/ui/folderBrowserList.js", - "js/pandora/ui/folderList.js", - "js/pandora/ui/folders.js", - "js/pandora/ui/group.js", - "js/pandora/ui/home.js", - "js/pandora/ui/homePage.js", - "js/pandora/ui/info.js", - "js/pandora/ui/infoView.js", - "js/pandora/ui/item.js", - "js/pandora/ui/itemClips.js", - "js/pandora/ui/leftPanel.js", - "js/pandora/ui/list.js", - "js/pandora/ui/listDialog.js", - "js/pandora/ui/mainPanel.js", - "js/pandora/ui/mediaView.js", - "js/pandora/ui/menu.js", - "js/pandora/ui/namesDialog.js", - "js/pandora/ui/navigationView.js", - "js/pandora/ui/orderButton.js", - "js/pandora/ui/placesDialog.js", - "js/pandora/ui/preferencesDialog.js", - "js/pandora/ui/publicLists.js", - "js/pandora/ui/rightPanel.js", - "js/pandora/ui/sectionButtons.js", - "js/pandora/ui/sectionSelect.js", - "js/pandora/ui/sectionbar.js", - "js/pandora/ui/siteDialog.js", - "js/pandora/ui/sortSelect.js", - "js/pandora/ui/status.js", - "js/pandora/ui/statusbar.js", - "js/pandora/ui/toolbar.js", - "js/pandora/ui/usersDialog.js", - "js/pandora/ui/videoPreview.js", - "js/pandora/ui/viewSelect.js", - "js/pandora/ui/helpDialog.js", - "js/pandora/ui/clipPlayer.js" -] + "js/pandora/Query.js", + "js/pandora/UI.js", + "js/pandora/URL.js", + "js/pandora/account.js", + "js/pandora/appPanel.js", + "js/pandora/autovalidate.js", + "js/pandora/backButton.js", + "js/pandora/browser.js", + "js/pandora/clipList.js", + "js/pandora/clipPlayer.js", + "js/pandora/contactForm.js", + "js/pandora/contentPanel.js", + "js/pandora/deleteListDialog.js", + "js/pandora/editor.js", + "js/pandora/eventsDialog.js", + "js/pandora/filesView.js", + "js/pandora/filter.js", + "js/pandora/filterDialog.js", + "js/pandora/findElement.js", + "js/pandora/folderBrowser.js", + "js/pandora/folderBrowserBar.js", + "js/pandora/folderBrowserList.js", + "js/pandora/folderList.js", + "js/pandora/folders.js", + "js/pandora/group.js", + "js/pandora/helpDialog.js", + "js/pandora/home.js", + "js/pandora/homePage.js", + "js/pandora/info.js", + "js/pandora/infoView.js", + "js/pandora/item.js", + "js/pandora/itemClips.js", + "js/pandora/leftPanel.js", + "js/pandora/list.js", + "js/pandora/listDialog.js", + "js/pandora/mainPanel.js", + "js/pandora/mediaView.js", + "js/pandora/menu.js", + "js/pandora/namesDialog.js", + "js/pandora/navigationView.js", + "js/pandora/orderButton.js", + "js/pandora/placesDialog.js", + "js/pandora/preferencesDialog.js", + "js/pandora/publicLists.js", + "js/pandora/rightPanel.js", + "js/pandora/sectionButtons.js", + "js/pandora/sectionSelect.js", + "js/pandora/sectionbar.js", + "js/pandora/siteDialog.js", + "js/pandora/sortSelect.js", + "js/pandora/status.js", + "js/pandora/statusbar.js", + "js/pandora/titlesDialog.js", + "js/pandora/toolbar.js", + "js/pandora/usersDialog.js", + "js/pandora/utils.js", + "js/pandora/videoPreview.js", + "js/pandora/viewSelect.js" +] \ No newline at end of file