diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README b/README old mode 100644 new mode 100755 diff --git a/_working/create b/_working/create old mode 100644 new mode 100755 diff --git a/_working/event.sql b/_working/event.sql old mode 100644 new mode 100755 diff --git a/_working/label.sql b/_working/label.sql old mode 100644 new mode 100755 diff --git a/_working/mix.sql b/_working/mix.sql old mode 100644 new mode 100755 diff --git a/_working/recurrence.sql b/_working/recurrence.sql old mode 100644 new mode 100755 diff --git a/_working/release.sql b/_working/release.sql old mode 100644 new mode 100755 diff --git a/_working/release_audio.sql b/_working/release_audio.sql old mode 100644 new mode 100755 diff --git a/_working/social.sql b/_working/social.sql old mode 100644 new mode 100755 diff --git a/_working/venue.sql b/_working/venue.sql old mode 100644 new mode 100755 diff --git a/apache/django_live.wsgi b/apache/django_live.wsgi old mode 100644 new mode 100755 diff --git a/core/__init__.py b/core/__init__.py old mode 100644 new mode 100755 diff --git a/core/analytics/__init__.py b/core/analytics/__init__.py old mode 100644 new mode 100755 diff --git a/core/analytics/google.py b/core/analytics/google.py old mode 100644 new mode 100755 diff --git a/core/decorators.py b/core/decorators.py old mode 100644 new mode 100755 diff --git a/core/serialisers/__init__.py b/core/serialisers/__init__.py old mode 100644 new mode 100755 diff --git a/core/serialisers/json.py b/core/serialisers/json.py old mode 100644 new mode 100755 diff --git a/core/social/Facebook.py b/core/social/Facebook.py old mode 100644 new mode 100755 diff --git a/core/social/_Social.py b/core/social/_Social.py old mode 100644 new mode 100755 diff --git a/core/social/__init__.py b/core/social/__init__.py old mode 100644 new mode 100755 diff --git a/core/tasks.py b/core/tasks.py old mode 100644 new mode 100755 diff --git a/core/tests/__init__.py b/core/tests/__init__.py old mode 100644 new mode 100755 diff --git a/core/tests/mix.py b/core/tests/mix.py old mode 100644 new mode 100755 diff --git a/core/utils/__init__.py b/core/utils/__init__.py old mode 100644 new mode 100755 diff --git a/core/utils/file.py b/core/utils/file.py old mode 100644 new mode 100755 diff --git a/core/utils/html.py b/core/utils/html.py old mode 100644 new mode 100755 diff --git a/core/utils/live.py b/core/utils/live.py old mode 100644 new mode 100755 diff --git a/core/utils/string.py b/core/utils/string.py old mode 100644 new mode 100755 diff --git a/core/utils/waveform.py b/core/utils/waveform.py old mode 100644 new mode 100755 diff --git a/core/widgets/__init__.py b/core/widgets/__init__.py old mode 100644 new mode 100755 diff --git a/core/widgets/upload.py b/core/widgets/upload.py old mode 100644 new mode 100755 diff --git a/dss/__init__.py b/dss/__init__.py old mode 100644 new mode 100755 diff --git a/dss/settings.py b/dss/settings.py old mode 100644 new mode 100755 index a5cdd6a..ff519bf --- a/dss/settings.py +++ b/dss/settings.py @@ -151,7 +151,6 @@ INSTALLED_APPS = ( 'allauth.socialaccount.providers.linkedin', 'allauth.socialaccount.providers.openid', 'allauth.socialaccount.providers.twitter', - 'emailconfirmation', 'backbone_tastypie', ) diff --git a/dss/urls.py b/dss/urls.py old mode 100644 new mode 100755 index c10261d..0a80bb6 --- a/dss/urls.py +++ b/dss/urls.py @@ -18,11 +18,11 @@ urlpatterns = patterns('', (r'^tos\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/tos.html'}), (r'^test\.html$', 'django.views.generic.simple.redirect_to', {'url': '/static/html/test.html'}), (r'^500', 'django.views.defaults.server_error'), - url(r'^', include('spa.urls')), (r'^grappelli/', include('grappelli.urls')), url(r'^accounts/', include('allauth.urls')), (r'^avatar/', include('avatar.urls')), (r'^tinymce/', include('tinymce.urls')), + url(r'^', include('spa.urls')), ) if settings.DEBUG: diff --git a/dss/wsgi.py b/dss/wsgi.py old mode 100644 new mode 100755 diff --git a/initial_data.json b/initial_data.json old mode 100644 new mode 100755 diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt old mode 100644 new mode 100755 diff --git a/spa/__init__.py b/spa/__init__.py old mode 100644 new mode 100755 diff --git a/spa/admin.py b/spa/admin.py old mode 100644 new mode 100755 diff --git a/spa/ajax.py b/spa/ajax.py old mode 100644 new mode 100755 diff --git a/spa/api/__init__.py b/spa/api/__init__.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/BackboneCompatibleResource.py b/spa/api/v1/BackboneCompatibleResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/CommentResource.py b/spa/api/v1/CommentResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/EventResource.py b/spa/api/v1/EventResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/MixResource.py b/spa/api/v1/MixResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/ReleaseAudioResource.py b/spa/api/v1/ReleaseAudioResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/ReleaseResource.py b/spa/api/v1/ReleaseResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/UserResource.py b/spa/api/v1/UserResource.py old mode 100644 new mode 100755 diff --git a/spa/api/v1/__init__.py b/spa/api/v1/__init__.py old mode 100644 new mode 100755 diff --git a/spa/audio.py b/spa/audio.py old mode 100644 new mode 100755 diff --git a/spa/forms.py b/spa/forms.py old mode 100644 new mode 100755 diff --git a/spa/management/__init__.py b/spa/management/__init__.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/__init__.py b/spa/management/commands/__init__.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/cleanup.py b/spa/management/commands/cleanup.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/drop.py b/spa/management/commands/drop.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/purchaselinks.py b/spa/management/commands/purchaselinks.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/tracklists.py b/spa/management/commands/tracklists.py old mode 100644 new mode 100755 diff --git a/spa/management/commands/waveforms.py b/spa/management/commands/waveforms.py old mode 100644 new mode 100755 diff --git a/spa/models/Comment.py b/spa/models/Comment.py old mode 100644 new mode 100755 diff --git a/spa/models/Event.py b/spa/models/Event.py old mode 100644 new mode 100755 diff --git a/spa/models/Label.py b/spa/models/Label.py old mode 100644 new mode 100755 diff --git a/spa/models/Mix.py b/spa/models/Mix.py old mode 100644 new mode 100755 diff --git a/spa/models/MixFavourite.py b/spa/models/MixFavourite.py old mode 100644 new mode 100755 diff --git a/spa/models/MixLike.py b/spa/models/MixLike.py old mode 100644 new mode 100755 diff --git a/spa/models/MixPlay.py b/spa/models/MixPlay.py old mode 100644 new mode 100755 diff --git a/spa/models/PurchaseLink.py b/spa/models/PurchaseLink.py old mode 100644 new mode 100755 diff --git a/spa/models/Recurrence.py b/spa/models/Recurrence.py old mode 100644 new mode 100755 diff --git a/spa/models/Release.py b/spa/models/Release.py old mode 100644 new mode 100755 diff --git a/spa/models/Tracklist.py b/spa/models/Tracklist.py old mode 100644 new mode 100755 diff --git a/spa/models/UserProfile.py b/spa/models/UserProfile.py old mode 100644 new mode 100755 diff --git a/spa/models/Venue.py b/spa/models/Venue.py old mode 100644 new mode 100755 diff --git a/spa/models/_Activity.py b/spa/models/_Activity.py old mode 100644 new mode 100755 diff --git a/spa/models/_BaseModel.py b/spa/models/_BaseModel.py old mode 100644 new mode 100755 diff --git a/spa/models/_Lookup.py b/spa/models/_Lookup.py old mode 100644 new mode 100755 diff --git a/spa/models/__init__.py b/spa/models/__init__.py old mode 100644 new mode 100755 diff --git a/spa/social.py b/spa/social.py old mode 100644 new mode 100755 diff --git a/spa/templates.py b/spa/templates.py old mode 100644 new mode 100755 diff --git a/spa/templatetags/__init__.py b/spa/templatetags/__init__.py old mode 100644 new mode 100755 diff --git a/spa/templatetags/spa_extras.py b/spa/templatetags/spa_extras.py old mode 100644 new mode 100755 diff --git a/spa/urls.py b/spa/urls.py old mode 100644 new mode 100755 index db0fd24..96ab08d --- a/spa/urls.py +++ b/spa/urls.py @@ -26,7 +26,6 @@ social = SocialHandler() urlpatterns = django.conf.urls.patterns( '', url(r'^$', 'spa.views.app', name='home'), - url(r'^upload', 'spa.views.app', name='home'), url(r'^tpl/(?P\w+)/$', 'spa.templates.get_template'), url(r'^js/(?P\w+)/$', 'spa.templates.get_javascript'), url(r'^tplex/(?P\w+)/$', 'spa.templates.get_template_ex'), diff --git a/spa/views.py b/spa/views.py old mode 100644 new mode 100755 diff --git a/static/bin/sm/soundmanager2.swf b/static/bin/sm/soundmanager2.swf old mode 100644 new mode 100755 diff --git a/static/bin/sm/soundmanager2_debug.swf b/static/bin/sm/soundmanager2_debug.swf old mode 100644 new mode 100755 diff --git a/static/bin/sm/soundmanager2_flash9.swf b/static/bin/sm/soundmanager2_flash9.swf old mode 100644 new mode 100755 diff --git a/static/bin/sm/soundmanager2_flash9_debug.swf b/static/bin/sm/soundmanager2_flash9_debug.swf old mode 100644 new mode 100755 diff --git a/static/bin/sm/soundmanager2_flash_xdomain.zip b/static/bin/sm/soundmanager2_flash_xdomain.zip old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap-datepicker.css b/static/css/bootstrap/bootstrap-datepicker.css old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap-responsive.css b/static/css/bootstrap/bootstrap-responsive.css old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap-responsive.min.css b/static/css/bootstrap/bootstrap-responsive.min.css old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap-timepicker.css b/static/css/bootstrap/bootstrap-timepicker.css old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap.css b/static/css/bootstrap/bootstrap.css old mode 100644 new mode 100755 diff --git a/static/css/bootstrap/bootstrap.min.css b/static/css/bootstrap/bootstrap.min.css old mode 100644 new mode 100755 diff --git a/static/css/colorbox.css b/static/css/colorbox.css old mode 100644 new mode 100755 diff --git a/static/css/com.podnoms.player.css b/static/css/com.podnoms.player.css old mode 100644 new mode 100755 diff --git a/static/css/deepsouthsounds.css b/static/css/deepsouthsounds.css old mode 100644 new mode 100755 diff --git a/static/css/jasny/jasny-bootstrap-responsive.css b/static/css/jasny/jasny-bootstrap-responsive.css old mode 100644 new mode 100755 diff --git a/static/css/jasny/jasny-bootstrap-responsive.min.css b/static/css/jasny/jasny-bootstrap-responsive.min.css old mode 100644 new mode 100755 diff --git a/static/css/jasny/jasny-bootstrap.css b/static/css/jasny/jasny-bootstrap.css old mode 100644 new mode 100755 diff --git a/static/css/jasny/jasny-bootstrap.min.css b/static/css/jasny/jasny-bootstrap.min.css old mode 100644 new mode 100755 diff --git a/static/css/uploadifive.css b/static/css/uploadifive.css old mode 100644 new mode 100755 index 36b92fd..d1b44d4 --- a/static/css/uploadifive.css +++ b/static/css/uploadifive.css @@ -1,3 +1,8 @@ +/* +UploadiFive +Copyright (c) 2012 Reactive Apps, Ronnie Garcia +*/ + .uploadifive-button { background-color: #505050; background-image: linear-gradient(bottom, #505050 0%, #707070 100%); @@ -52,7 +57,7 @@ padding: 15px; } .uploadifive-queue-item .close { - background: url('../img/uploadifive-cancel.png') 0 0 no-repeat; + background: url('uploadifive-cancel.png') 0 0 no-repeat; display: block; float: right; height: 16px; diff --git a/static/fonts/iconic_fill.eot b/static/fonts/iconic_fill.eot old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_fill.otf b/static/fonts/iconic_fill.otf old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_fill.svg b/static/fonts/iconic_fill.svg old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_fill.ttf b/static/fonts/iconic_fill.ttf old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_fill.woff b/static/fonts/iconic_fill.woff old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_stroke.eot b/static/fonts/iconic_stroke.eot old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_stroke.otf b/static/fonts/iconic_stroke.otf old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_stroke.svg b/static/fonts/iconic_stroke.svg old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_stroke.ttf b/static/fonts/iconic_stroke.ttf old mode 100644 new mode 100755 diff --git a/static/fonts/iconic_stroke.woff b/static/fonts/iconic_stroke.woff old mode 100644 new mode 100755 diff --git a/static/html/fb_channel.html b/static/html/fb_channel.html old mode 100644 new mode 100755 diff --git a/static/html/privacy.html b/static/html/privacy.html old mode 100644 new mode 100755 diff --git a/static/html/robots.txt b/static/html/robots.txt old mode 100644 new mode 100755 diff --git a/static/html/test.html b/static/html/test.html old mode 100644 new mode 100755 diff --git a/static/html/test2.html b/static/html/test2.html old mode 100644 new mode 100755 diff --git a/static/html/tos.html b/static/html/tos.html old mode 100644 new mode 100755 diff --git a/static/img/500.png b/static/img/500.png old mode 100644 new mode 100755 diff --git a/static/img/asc.png b/static/img/asc.png old mode 100644 new mode 100755 diff --git a/static/img/bg.png b/static/img/bg.png old mode 100644 new mode 100755 diff --git a/static/img/colorbox/border.png b/static/img/colorbox/border.png old mode 100644 new mode 100755 diff --git a/static/img/colorbox/controls.png b/static/img/colorbox/controls.png old mode 100644 new mode 100755 diff --git a/static/img/colorbox/loading.gif b/static/img/colorbox/loading.gif old mode 100644 new mode 100755 diff --git a/static/img/colorbox/loading_background.png b/static/img/colorbox/loading_background.png old mode 100644 new mode 100755 diff --git a/static/img/default-avatar-32.png b/static/img/default-avatar-32.png old mode 100644 new mode 100755 diff --git a/static/img/default-avatar.png b/static/img/default-avatar.png old mode 100644 new mode 100755 diff --git a/static/img/default-track.png b/static/img/default-track.png old mode 100644 new mode 100755 diff --git a/static/img/desc.png b/static/img/desc.png old mode 100644 new mode 100755 diff --git a/static/img/download-progress-overlay.png b/static/img/download-progress-overlay.png old mode 100644 new mode 100755 diff --git a/static/img/dss-large.png b/static/img/dss-large.png old mode 100644 new mode 100755 diff --git a/static/img/favicon.ico b/static/img/favicon.ico old mode 100644 new mode 100755 diff --git a/static/img/glyphicons-halflings-white.png b/static/img/glyphicons-halflings-white.png old mode 100644 new mode 100755 diff --git a/static/img/glyphicons-halflings.png b/static/img/glyphicons-halflings.png old mode 100644 new mode 100755 diff --git a/static/img/info.png b/static/img/info.png old mode 100644 new mode 100755 diff --git a/static/img/loader.gif b/static/img/loader.gif old mode 100644 new mode 100755 diff --git a/static/img/mix-loader.gif b/static/img/mix-loader.gif old mode 100644 new mode 100755 diff --git a/static/img/pause.png b/static/img/pause.png old mode 100644 new mode 100755 diff --git a/static/img/play.png b/static/img/play.png old mode 100644 new mode 100755 diff --git a/static/img/playhead.png b/static/img/playhead.png old mode 100644 new mode 100755 diff --git a/static/img/sheen3.png b/static/img/sheen3.png old mode 100644 new mode 100755 diff --git a/static/img/signin_facebook.png b/static/img/signin_facebook.png old mode 100644 new mode 100755 diff --git a/static/img/signin_twitter.png b/static/img/signin_twitter.png old mode 100644 new mode 100755 diff --git a/static/img/site-logo-gr.png b/static/img/site-logo-gr.png old mode 100644 new mode 100755 diff --git a/static/img/slide-nav.png b/static/img/slide-nav.png old mode 100644 new mode 100755 diff --git a/static/img/switch_handle-OLD.png b/static/img/switch_handle-OLD.png old mode 100644 new mode 100755 diff --git a/static/img/switch_handle-gray.png b/static/img/switch_handle-gray.png old mode 100644 new mode 100755 diff --git a/static/img/switch_handle-light.png b/static/img/switch_handle-light.png old mode 100644 new mode 100755 diff --git a/static/img/switch_handle.png b/static/img/switch_handle.png old mode 100644 new mode 100755 diff --git a/static/img/switch_handle_pressed.png b/static/img/switch_handle_pressed.png old mode 100644 new mode 100755 diff --git a/static/img/switch_track-dark.png b/static/img/switch_track-dark.png old mode 100644 new mode 100755 diff --git a/static/img/switch_track-gray.png b/static/img/switch_track-gray.png old mode 100644 new mode 100755 diff --git a/static/img/switch_track-light.png b/static/img/switch_track-light.png old mode 100644 new mode 100755 diff --git a/static/img/switch_track.png b/static/img/switch_track.png old mode 100644 new mode 100755 diff --git a/static/img/transmogrifying.png b/static/img/transmogrifying.png old mode 100644 new mode 100755 diff --git a/static/img/twitter-ico.png b/static/img/twitter-ico.png old mode 100644 new mode 100755 diff --git a/static/img/twitter.png b/static/img/twitter.png old mode 100644 new mode 100755 diff --git a/static/img/uploadifive-cancel.png b/static/img/uploadifive-cancel.png old mode 100644 new mode 100755 diff --git a/static/img/whats-on.png b/static/img/whats-on.png old mode 100644 new mode 100755 diff --git a/static/js/app/app.js b/static/js/app/app.js old mode 100644 new mode 100755 index 4e4c9b6..83d457d --- a/static/js/app/app.js +++ b/static/js/app/app.js @@ -20,8 +20,10 @@ var AppRouter = Backbone.Router.extend({ "event/add":"eventAdd", "event/:id":"eventDetails", "accounts/social/connections/":"connectAccounts", + "accounts/facebook/login":"loginRedirect", "accounts/login/":"login", "accounts/logout/":"logout", + "upload/":"defaultRoute", "me":"userDetails", "*path":"defaultRoute" }, @@ -142,6 +144,10 @@ var AppRouter = Backbone.Router.extend({ $('#content').html(html.el); $('#site-content-fill').html(''); }, + loginRedirect:function(){ + com.podnoms.utils.showAlert("Success", "Thank you for logging in.", "alert-success", true); + this.defaultRoute(); + }, login:function () { $.colorbox({ href:"/tpl/LoginView/", @@ -151,10 +157,10 @@ var AppRouter = Backbone.Router.extend({ }) }, logout:function () { - com.podnoms.utils.showAlert("Success", "You are now logged out", "alert-success"); + com.podnoms.utils.showAlert("Success", "You are now logged out", "alert-success", true); }, connectAccounts:function () { - alert("sdfkjsdlfj"); + alert("Connecting accounts"); }, userDetails:function () { var user = new User(); diff --git a/static/js/app/models/comment.js b/static/js/app/models/comment.js old mode 100644 new mode 100755 diff --git a/static/js/app/models/event.js b/static/js/app/models/event.js old mode 100644 new mode 100755 diff --git a/static/js/app/models/mix.js b/static/js/app/models/mix.js old mode 100644 new mode 100755 diff --git a/static/js/app/models/release.js b/static/js/app/models/release.js old mode 100644 new mode 100755 diff --git a/static/js/app/models/release_audio.js b/static/js/app/models/release_audio.js old mode 100644 new mode 100755 diff --git a/static/js/app/models/user.js b/static/js/app/models/user.js old mode 100644 new mode 100755 diff --git a/static/js/app/site.js b/static/js/app/site.js old mode 100644 new mode 100755 diff --git a/static/js/app/social.js b/static/js/app/social.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/comment.js b/static/js/app/views/comment.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/event.js b/static/js/app/views/event.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/header.js b/static/js/app/views/header.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/mix.js b/static/js/app/views/mix.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/release.js b/static/js/app/views/release.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/release_audio.js b/static/js/app/views/release_audio.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/sidebar.js b/static/js/app/views/sidebar.js old mode 100644 new mode 100755 diff --git a/static/js/app/views/user.js b/static/js/app/views/user.js old mode 100644 new mode 100755 diff --git a/static/js/com.podnoms.player.js b/static/js/com.podnoms.player.js old mode 100644 new mode 100755 diff --git a/static/js/com.podnoms.storage.js b/static/js/com.podnoms.storage.js old mode 100644 new mode 100755 diff --git a/static/js/com.podnoms.utils.js b/static/js/com.podnoms.utils.js old mode 100644 new mode 100755 diff --git a/static/js/libs/ICanHaz.js b/static/js/libs/ICanHaz.js old mode 100644 new mode 100755 diff --git a/static/js/libs/ajaxfileupload.js b/static/js/libs/ajaxfileupload.js old mode 100644 new mode 100755 diff --git a/static/js/libs/backbone/backbone-localstorage.js b/static/js/libs/backbone/backbone-localstorage.js old mode 100644 new mode 100755 diff --git a/static/js/libs/backbone/backbone-tastypie.js b/static/js/libs/backbone/backbone-tastypie.js old mode 100644 new mode 100755 diff --git a/static/js/libs/backbone/backbone.js b/static/js/libs/backbone/backbone.js old mode 100644 new mode 100755 diff --git a/static/js/libs/backbone/backbone.mine.js b/static/js/libs/backbone/backbone.mine.js old mode 100644 new mode 100755 diff --git a/static/js/libs/backbone/underscore.js b/static/js/libs/backbone/underscore.js old mode 100644 new mode 100755 diff --git a/static/js/libs/bootstrap/bootstrap-datepicker.js b/static/js/libs/bootstrap/bootstrap-datepicker.js old mode 100644 new mode 100755 diff --git a/static/js/libs/bootstrap/bootstrap-timepicker.js b/static/js/libs/bootstrap/bootstrap-timepicker.js old mode 100644 new mode 100755 diff --git a/static/js/libs/bootstrap/bootstrap.js b/static/js/libs/bootstrap/bootstrap.js old mode 100644 new mode 100755 diff --git a/static/js/libs/bootstrap/bootstrap.min.js b/static/js/libs/bootstrap/bootstrap.min.js old mode 100644 new mode 100755 diff --git a/static/js/libs/clickify.js b/static/js/libs/clickify.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jasny/bootstrap-fileupload.js b/static/js/libs/jasny/bootstrap-fileupload.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jasny/bootstrap-inputmask.js b/static/js/libs/jasny/bootstrap-inputmask.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jasny/bootstrap-rowlink.js b/static/js/libs/jasny/bootstrap-rowlink.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jasny/jasny-bootstrap.js b/static/js/libs/jasny/jasny-bootstrap.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jasny/jasny-bootstrap.min.js b/static/js/libs/jasny/jasny-bootstrap.min.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.colorbox.js b/static/js/libs/jquery.colorbox.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.form.js b/static/js/libs/jquery.form.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.iphone-switch.js b/static/js/libs/jquery.iphone-switch.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.min.js b/static/js/libs/jquery.min.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.tablesorter.js b/static/js/libs/jquery.tablesorter.js old mode 100644 new mode 100755 diff --git a/static/js/libs/jquery.uploadifive.js b/static/js/libs/jquery.uploadifive.js new file mode 100755 index 0000000..c54636e --- /dev/null +++ b/static/js/libs/jquery.uploadifive.js @@ -0,0 +1,893 @@ +/* +UploadiFive 1.1.0 +Copyright (c) 2012 Reactive Apps, Ronnie Garcia +Released under the UploadiFive Standard License +*/ +;(function($) { + + var methods = { + + init : function(options) { + + return this.each(function() { + + // Create a reference to the jQuery DOM object + var $this = $(this); + $this.data('uploadifive', { + inputs : {}, // The object that contains all the file inputs + inputCount : 0, // The total number of file inputs created + fileID : 0, + queue : { + count : 0, // Total number of files in the queue + selected : 0, // Number of files selected in the last select operation + replaced : 0, // Number of files replaced in the last select operation + errors : 0, // Number of files that returned an error in the last select operation + queued : 0, // Number of files added to the queue in the last select operation + cancelled : 0 // Total number of files that have been cancelled or removed from the queue + }, + uploads : { + current : 0, // Number of files currently being uploaded + attempts : 0, // Number of file uploads attempted in the last upload operation + successful : 0, // Number of files successfully uploaded in the last upload operation + errors : 0, // Number of files returning errors in the last upload operation + count : 0 // Total number of files uploaded successfully + } + }); + var $data = $this.data('uploadifive'); + + // Set the default options + var settings = $data.settings = $.extend({ + 'auto' : true, // Automatically upload a file when it's added to the queue + 'buttonClass' : false, // A class to add to the UploadiFive button + 'buttonText' : 'Select Files', // The text that appears on the UploadiFive button + 'checkScript' : false, // Path to the script that checks for existing file names + 'dnd' : true, // Allow drag and drop into the queue + 'dropTarget' : false, // Selector for the drop target + 'fileObjName' : 'Filedata', // The name of the file object to use in your server-side script + 'fileSizeLimit' : 0, // Maximum allowed size of files to upload + 'fileType' : false, // Type of files allowed (image, etc) + 'formData' : {}, // Additional data to send to the upload script + 'height' : 30, // The height of the button + 'itemTemplate' : false, // The HTML markup for the item in the queue + 'method' : 'post', // The method to use when submitting the upload + 'multi' : true, // Set to true to allow multiple file selections + 'overrideEvents' : [], // An array of events to override + 'queueID' : false, // The ID of the file queue + 'queueSizeLimit' : 0, // The maximum number of files that can be in the queue + 'removeCompleted' : false, // Set to true to remove files that have completed uploading + 'simUploadLimit' : 0, // The maximum number of files to upload at once + 'truncateLength' : 0, // The length to truncate the file names to + 'uploadLimit' : 0, // The maximum number of files you can upload + 'uploadScript' : 'uploadifive.php', // The path to the upload script + 'width' : 100 // The width of the button + + /* + // Events + 'onAddQueueItem' : function(file) {}, // Triggered for each file that is added to the queue + 'onCancel' : function(file) {}, // Triggered when a file is cancelled or removed from the queue + 'onCheck' : function(file, exists) {}, // Triggered when the server is checked for an existing file + 'onClearQueue' : function(queue) {}, // Triggered during the clearQueue function + 'onDestroy' : function() {} // Triggered during the destroy function + 'onDrop' : function(files, numberOfFilesDropped) {}, // Triggered when files are dropped into the file queue + 'onError' : function(file, fileType, data) {}, // Triggered when an error occurs + 'onFallback' : function() {}, // Triggered if the HTML5 File API is not supported by the browser + 'onInit' : function() {}, // Triggered when UploadiFive if initialized + 'onQueueComplete' : function() {}, // Triggered once when an upload queue is done + 'onProgress' : function(file, event) {}, // Triggered during each progress update of an upload + 'onSelect' : function() {}, // Triggered once when files are selected from a dialog box + 'onUpload' : function(file) {}, // Triggered when an upload queue is started + 'onUploadComplete' : function(file, data) {}, // Triggered when a file is successfully uploaded + 'onUploadFile' : function(file) {}, // Triggered for each file being uploaded + */ + }, options); + + // Calculate the file size limit + if (isNaN(settings.fileSizeLimit)) { + var fileSizeLimitBytes = parseInt(settings.fileSizeLimit) * 1.024 + if (settings.fileSizeLimit.indexOf('KB') > -1) { + settings.fileSizeLimit = fileSizeLimitBytes * 1000; + } else if (settings.fileSizeLimit.indexOf('MB') > -1) { + settings.fileSizeLimit = fileSizeLimitBytes * 1000000; + } else if (settings.fileSizeLimit.indexOf('GB') > -1) { + settings.fileSizeLimit = fileSizeLimitBytes * 1000000000; + } + } else { + settings.fileSizeLimit = settings.fileSizeLimit * 1024; + } + + // Create a template for a file input + $data.inputTemplate = $('') + .css({ + 'opacity' : 0, + 'position' : 'absolute', + 'z-index' : 999 + }); + + // Create a new input + $data.createInput = function() { + + // Create a clone of the file input + var input = $data.inputTemplate.clone(); + // Create a unique name for the input item + var inputName = input.name = 'input' + $data.inputCount++; + // Set the multiple attribute + if (settings.multi) { + input.attr('multiple', true); + } + // Set the onchange event for the input + input.bind('change', function() { + $data.queue.selected = 0; + $data.queue.replaced = 0; + $data.queue.errors = 0; + $data.queue.queued = 0; + // Add a queue item to the queue for each file + var limit = this.files.length; + $data.queue.selected = limit; + if (($data.queue.count + limit) > settings.queueSizeLimit && settings.queueSizeLimit !== 0) { + if ($.inArray('onError', settings.overrideEvents) < 0) { + alert('The maximum number of queue items has been reached (' + settings.queueSizeLimit + '). Please select fewer files.'); + } + // Trigger the error event + if (typeof settings.onError === 'function') { + settings.onError.call($this, 'QUEUE_LIMIT_EXCEEDED'); + } + } else { + for (var n = 0; n < limit; n++) { + file = this.files[n]; + $data.addQueueItem(file); + } + $data.inputs[inputName] = this; + $data.createInput(); + } + // Upload the file if auto-uploads are enabled + if (settings.auto) { + methods.upload.call($this); + } + // Trigger the select event + if (typeof settings.onSelect === 'function') { + settings.onSelect.call($this, $data.queue); + } + }); + // Hide the existing current item and add the new one + if ($data.currentInput) { + $data.currentInput.hide(); + } + $data.button.append(input); + $data.currentInput = input; + } + + // Remove an input + $data.destroyInput = function(key) { + $($data.inputs[key]).remove(); + delete $data.inputs[key]; + $data.inputCount--; + } + + // Drop a file into the queue + $data.drop = function(e) { + $data.queue.selected = 0; + $data.queue.replaced = 0; + $data.queue.errors = 0; + $data.queue.queued = 0; + + var fileData = e.dataTransfer; + + var inputName = fileData.name = 'input' + $data.inputCount++; + // Add a queue item to the queue for each file + var limit = fileData.files.length; + $data.queue.selected = limit; + if (($data.queue.count + limit) > settings.queueSizeLimit && settings.queueSizeLimit !== 0) { + // Check if the queueSizeLimit was reached + if ($.inArray('onError', settings.overrideEvents) < 0) { + alert('The maximum number of queue items has been reached (' + settings.queueSizeLimit + '). Please select fewer files.'); + } + // Trigger the onError event + if (typeof settings.onError === 'function') { + settings.onError.call($this, 'QUEUE_LIMIT_EXCEEDED'); + } + } else { + // Add a queue item for each file + for (var n = 0; n < limit; n++) { + file = fileData.files[n]; + $data.addQueueItem(file); + } + // Save the data to the inputs object + $data.inputs[inputName] = fileData; + } + + // Upload the file if auto-uploads are enabled + if (settings.auto) { + methods.upload.call($this); + } + + // Trigger the onDrop event + if (typeof settings.onDrop === 'function') { + settings.onDrop.call($this, fileData.files, fileData.files.length); + } + + // Stop FireFox from opening the dropped file(s) + e.preventDefault(); + e.stopPropagation(); + } + + // Check if a filename exists in the queue + $data.fileExistsInQueue = function(file) { + for (var key in $data.inputs) { + input = $data.inputs[key]; + limit = input.files.length; + for (var n = 0; n < limit; n++) { + existingFile = input.files[n]; + // Check if the filename matches + if (existingFile.name == file.name && !existingFile.complete) { + return true; + } + } + } + return false; + } + + // Remove an existing file in the queue + $data.removeExistingFile = function(file) { + for (var key in $data.inputs) { + input = $data.inputs[key]; + limit = input.files.length; + for (var n = 0; n < limit; n++) { + existingFile = input.files[n]; + // Check if the filename matches + if (existingFile.name == file.name && !existingFile.complete) { + $data.queue.replaced++; + methods.cancel.call($this, existingFile, true); + } + } + } + } + + // Create the file item template + if (settings.itemTemplate == false) { + $data.queueItem = $('
\ + X\ +
\ +
\ +
\ +
\ +
'); + } else { + $data.queueItem = $(settings.itemTemplate); + } + + // Add an item to the queue + $data.addQueueItem = function(file) { + if ($.inArray('onAddQueueItem', settings.overrideEvents) < 0) { + // Check if the filename already exists in the queue + $data.removeExistingFile(file); + // Create a clone of the queue item template + file.queueItem = $data.queueItem.clone(); + // Add an ID to the queue item + file.queueItem.attr('id', settings.id + '-file-' + $data.fileID++); + // Bind the close event to the close button + file.queueItem.find('.close').bind('click', function() { + methods.cancel.call($this, file); + return false; + }); + var fileName = file.name; + if (fileName.length > settings.truncateLength && settings.truncateLength != 0) { + fileName = fileName.substring(0, settings.truncateLength) + '...'; + } + file.queueItem.find('.filename').html(fileName); + // Add a reference to the file + file.queueItem.data('file', file); + $data.queueEl.append(file.queueItem); + } + // Trigger the addQueueItem event + if (typeof settings.onAddQueueItem === 'function') { + settings.onAddQueueItem.call($this, file); + } + // Check the filetype + if (settings.fileType) { + if ($.isArray(settings.fileType)) { + var isValidFileType = false; + for (var n = 0; n < settings.fileType.length; n++) { + if (file.type.indexOf(settings.fileType[n]) > -1) { + isValidFileType = true; + } + } + if (!isValidFileType) { + $data.error('FORBIDDEN_FILE_TYPE', file); + } + } else { + if (file.type.indexOf(settings.fileType) < 0) { + $data.error('FORBIDDEN_FILE_TYPE', file); + } + } + } + // Check the filesize + if (file.size > settings.fileSizeLimit && settings.fileSizeLimit != 0) { + $data.error('FILE_SIZE_LIMIT_EXCEEDED', file); + } else { + $data.queue.queued++; + $data.queue.count++; + } + } + + // Remove an item from the queue + $data.removeQueueItem = function(file, instant, delay) { + // Set the default delay + if (!delay) delay = 0; + var fadeTime = instant ? 0 : 500; + if (file.queueItem) { + if (file.queueItem.find('.fileinfo').html() != ' - Completed') { + file.queueItem.find('.fileinfo').html(' - Cancelled'); + } + file.queueItem.find('.progress-bar').width(0); + file.queueItem.delay(delay).fadeOut(fadeTime, function() { + $(this).remove(); + }); + delete file.queueItem; + $data.queue.count--; + } + } + + // Count the number of files that need to be uploaded + $data.filesToUpload = function() { + var filesToUpload = 0; + for (var key in $data.inputs) { + input = $data.inputs[key]; + limit = input.files.length; + for (var n = 0; n < limit; n++) { + file = input.files[n]; + if (!file.skip && !file.complete) { + filesToUpload++; + } + } + } + return filesToUpload; + } + + // Check if a file exists + $data.checkExists = function(file) { + if ($.inArray('onCheck', settings.overrideEvents) < 0) { + // This request needs to be synchronous + $.ajaxSetup({ + 'async' : false + }); + // Send the filename to the check script + var checkData = $.extend(settings.formData, {filename: file.name}); + $.post(settings.checkScript, checkData, function(fileExists) { + file.exists = parseInt(fileExists); + }); + if (file.exists) { + if (!confirm('A file named ' + file.name + ' already exists in the upload folder.\nWould you like to replace it?')) { + // If not replacing the file, cancel the upload + methods.cancel.call($this, file); + return true; + } + } + } + // Trigger the check event + if (typeof settings.onCheck === 'function') { + settings.onCheck.call($this, file, file.exists); + } + return false; + } + + // Upload a single file + $data.uploadFile = function(file, uploadAll) { + if (!file.skip && !file.complete && !file.uploading) { + file.uploading = true; + $data.uploads.current++; + $data.uploads.attempted++; + + // Create a new AJAX request + xhr = file.xhr = new XMLHttpRequest(); + + // Start the upload + // Use the faster FormData if it exists + if (typeof FormData === 'function' || typeof FormData === 'object') { + + // Create a new FormData object + var formData = new FormData(); + + // Add the form data + formData.append(settings.fileObjName, file); + + // Add the rest of the formData + for (i in settings.formData) { + formData.append(i, settings.formData[i]); + } + + // Open the AJAX call + xhr.open(settings.method, settings.uploadScript, true); + + // On progress function + xhr.upload.addEventListener('progress', function(e) { + if (e.lengthComputable) { + $data.progress(e, file); + } + }, false); + + // On complete function + xhr.addEventListener('load', function(e) { + if (this.readyState == 4) { + file.uploading = false; + if (this.status == 200) { + if (file.xhr.responseText !== 'Invalid file type.') { + $data.uploadComplete(e, file, uploadAll); + } else { + $data.error(file.xhr.responseText, file, uploadAll); + } + } else if (this.status == 404) { + $data.error('404_FILE_NOT_FOUND', file, uploadAll); + } else if (this.status == 403) { + $data.error('403_FORBIDDEN', file, uplaodAll); + } else { + $data.error('Unknown Error', file, uploadAll); + } + } + }); + + // Send the form data (multipart/form-data) + xhr.send(formData); + + } else { + + // Send as binary + var reader = new FileReader(); + reader.onload = function(e) { + + // Set some file builder variables + var boundary = '-------------------------' + (new Date).getTime(), + dashes = '--', + eol = '\r\n', + binFile = ''; + + // Build an RFC2388 String + binFile += dashes + boundary + eol; + // Generate the headers + binFile += 'Content-Disposition: form-data; name="' + settings.fileObjName + '"'; + if (file.name) { + binFile += '; filename="' + file.name + '"'; + } + binFile += eol; + binFile += 'Content-Type: application/octet-stream' + eol + eol; + binFile += e.target.result + eol; + + for (key in settings.formData) { + binFile += dashes + boundary + eol; + binFile += 'Content-Disposition: form-data; name="' + key + '"' + eol + eol; + binFile += settings.formData[key] + eol; + } + + binFile += dashes + boundary + dashes + eol; + + // On progress function + xhr.upload.addEventListener('progress', function(e) { + $data.progress(e, file); + }, false); + + // On complete function + xhr.addEventListener('load', function(e) { + file.uploading = false; + var status = this.status; + if (status == 404) { + $data.error('404_FILE_NOT_FOUND', file, uploadAll); + } else { + if (file.xhr.responseText != 'Invalid file type.') { + $data.uploadComplete(e, file, uploadAll); + } else { + $data.error(file.xhr.responseText, file, uploadAll); + } + } + }, false); + + // Open the ajax request + var url = settings.uploadScript; + if (settings.method == 'get') { + var params = $(settings.formData).param(); + url += params; + } + xhr.open(settings.method, settings.uploadScript, true); + xhr.setRequestHeader("Content-Type", "multipart/form-data; boundary=" + boundary); + + // Trigger the uploadFile event + if (typeof settings.onUploadFile === 'function') { + settings.onUploadFile.call($this, file); + } + + // Send the file for upload + xhr.sendAsBinary(binFile); + } + reader.readAsBinaryString(file); + + } + } + } + + // Update a file upload's progress + $data.progress = function(e, file) { + if ($.inArray('onProgress', settings.overrideEvents) < 0) { + if (e.lengthComputable) { + var percent = Math.round((e.loaded / e.total) * 100); + } + file.queueItem.find('.fileinfo').html(' - ' + percent + '%'); + file.queueItem.find('.progress-bar').css('width', percent + '%'); + } + // Trigger the progress event + if (typeof settings.onProgress === 'function') { + settings.onProgress.call($this, file, e); + } + } + + // Trigger an error + $data.error = function(errorType, file, uploadAll) { + if ($.inArray('onError', settings.overrideEvents) < 0) { + // Get the error message + switch(errorType) { + case '404_FILE_NOT_FOUND': + errorMsg = '404 Error'; + break; + case '403_FORBIDDEN': + errorMsg = '403 Forbidden'; + break; + case 'FORBIDDEN_FILE_TYPE': + errorMsg = 'Forbidden File Type'; + break; + case 'FILE_SIZE_LIMIT_EXCEEDED': + errorMsg = 'File Too Large'; + break; + default: + errorMsg = 'Unknown Error'; + break; + } + + // Add the error class to the queue item + file.queueItem.addClass('error') + // Output the error in the queue item + .find('.fileinfo').html(' - ' + errorMsg); + // Hide the + file.queueItem.find('.progress').remove(); + } + // Trigger the error event + if (typeof settings.onError === 'function') { + settings.onError.call($this, errorType, file); + } + file.skip = true; + if (errorType == '404_FILE_NOT_FOUND') { + $data.uploads.errors++; + } else { + $data.queue.errors++; + } + if (uploadAll) { + methods.upload.call($this, null, true); + } + } + + // Trigger when a single file upload is complete + $data.uploadComplete = function(e, file, uploadAll) { + if ($.inArray('onUploadComplete', settings.overrideEvents) < 0) { + file.queueItem.find('.progress-bar').css('width', '100%'); + file.queueItem.find('.fileinfo').html(' - Completed'); + file.queueItem.find('.progress').slideUp(250); + file.queueItem.addClass('complete'); + } + // Trigger the complete event + if (typeof settings.onUploadComplete === 'function') { + settings.onUploadComplete.call($this, file, file.xhr.responseText); + } + if (settings.removeCompleted) { + setTimeout(function() { methods.cancel.call($this, file); }, 3000); + } + file.complete = true; + $data.uploads.successful++; + $data.uploads.count++; + $data.uploads.current--; + delete file.xhr; + if (uploadAll) { + methods.upload.call($this, null, true); + } + } + + // Trigger when all the files are done uploading + $data.queueComplete = function() { + // Trigger the queueComplete event + if (typeof settings.onQueueComplete === 'function') { + settings.onQueueComplete.call($this, $data.uploads); + } + } + + // ---------------------- + // Initialize UploadiFive + // ---------------------- + + // Check if HTML5 is available + if (window.File && window.FileList && window.Blob && (window.FileReader || window.FormData)) { + // Assign an ID to the object + settings.id = 'uploadifive-' + $this.attr('id'); + + // Wrap the file input in a div with overflow set to hidden + $data.button = $('
' + settings.buttonText + '
'); + if (settings.buttonClass) $data.button.addClass(settings.buttonClass); + + // Style the button wrapper + $data.button.css({ + 'height' : settings.height, + 'line-height' : settings.height + 'px', + 'overflow' : 'hidden', + 'position' : 'relative', + 'text-align' : 'center', + 'width' : settings.width + }); + + // Insert the button above the file input + $this.before($data.button) + // Add the file input to the button + .appendTo($data.button) + // Modify the styles of the file input + .hide(); + + // Create a new input + $data.createInput.call($this); + + // Position the browse files button under the cursor + $data.button.mousemove(function(e) { + var offset = $data.button.offset(); + $data.currentInput.css({ + 'left' : e.pageX - offset.left - $this.width() + 10, + 'top' : e.pageY - offset.top - $this.height() + 10 + }); + }); + + // Create the queue container + if (!settings.queueID) { + settings.queueID = settings.id + '-queue'; + $data.queueEl = $('
'); + $data.button.after($data.queueEl); + } else { + $data.queueEl = $('#' + settings.queueID); + } + + // Add drag and drop functionality + if (settings.dnd) { + var $dropTarget = settings.dropTarget ? $(settings.dropTarget) : $data.queueEl.get(0); + $dropTarget.addEventListener('dragleave', function(e) { + // Stop FireFox from opening the dropped file(s) + e.preventDefault(); + e.stopPropagation(); + }, false); + $dropTarget.addEventListener('dragenter', function(e) { + // Stop FireFox from opening the dropped file(s) + e.preventDefault(); + e.stopPropagation(); + }, false); + $dropTarget.addEventListener('dragover', function(e) { + // Stop FireFox from opening the dropped file(s) + e.preventDefault(); + e.stopPropagation(); + }, false); + $dropTarget.addEventListener('drop', $data.drop, false); + } + + // Send as binary workaround for Chrome + if (!XMLHttpRequest.prototype.sendAsBinary) { + XMLHttpRequest.prototype.sendAsBinary = function(datastr) { + function byteValue(x) { + return x.charCodeAt(0) & 0xff; + } + var ords = Array.prototype.map.call(datastr, byteValue); + var ui8a = new Uint8Array(ords); + this.send(ui8a.buffer); + } + } + + // Trigger the oninit event + if (typeof settings.onInit === 'function') { + settings.onInit.call($this); + } + + } else { + + // Trigger the fallback event + if (typeof settings.onFallback === 'function') { + settings.onFallback.call($this); + } + return false; + + } + + }); + + }, + + + // Write some data to the console + debug : function() { + + return this.each(function() { + + console.log($(this).data('uploadifive')); + + }); + + }, + + // Clear all the items from the queue + clearQueue : function() { + + this.each(function() { + + var $this = $(this), + $data = $this.data('uploadifive'), + settings = $data.settings; + + for (var key in $data.inputs) { + input = $data.inputs[key]; + limit = input.files.length; + for (i = 0; i < limit; i++) { + file = input.files[i]; + methods.cancel.call($this, file); + } + } + // Trigger the onClearQueue event + if (typeof settings.onClearQueue === 'function') { + settings.onClearQueue.call($this, $('#' + $data.options.queueID)); + } + + }); + + }, + + // Cancel a file upload in progress or remove a file from the queue + cancel : function(file, fast) { + + this.each(function() { + + var $this = $(this), + $data = $this.data('uploadifive'), + settings = $data.settings; + + // If user passed a queue item ID instead of file... + if (typeof file === 'string') { + if (!isNaN(file)) { + fileID = 'uploadifive-' + $(this).attr('id') + '-file-' + file; + } + file = $('#' + fileID).data('file'); + } + + file.skip = true; + $data.filesCancelled++; + if (file.uploading) { + $data.uploads.current--; + file.uploading = false; + file.xhr.abort(); + delete file.xhr; + methods.upload.call($this); + } + if ($.inArray('onCancel', settings.overrideEvents) < 0) { + $data.removeQueueItem(file, fast); + } + + // Trigger the cancel event + if (typeof settings.onCancel === 'function') { + settings.onCancel.call($this, file); + } + + }); + + }, + + // Upload the files in the queue + upload : function(file, keepVars) { + + this.each(function() { + + var $this = $(this), + $data = $this.data('uploadifive'), + settings = $data.settings; + + if (file) { + + $data.uploadFile.call($this, file); + + } else { + + // Check if the upload limit was reached + if (($data.uploads.count + $data.uploads.current) < settings.uploadLimit || settings.uploadLimit == 0) { + if (!keepVars) { + $data.uploads.attempted = 0; + $data.uploads.successsful = 0; + $data.uploads.errors = 0; + var filesToUpload = $data.filesToUpload(); + // Trigger the onUpload event + if (typeof settings.onUpload === 'function') { + settings.onUpload.call($this, filesToUpload); + } + } + + // Loop through the files + $('#' + settings.queueID).find('.uploadifive-queue-item').not('.error, .complete').each(function() { + _file = $(this).data('file'); + // Check if the simUpload limit was reached + if (($data.uploads.current >= settings.simUploadLimit && settings.simUploadLimit !== 0) || ($data.uploads.current >= settings.uploadLimit && settings.uploadLimit !== 0) || ($data.uploads.count >= settings.uploadLimit && settings.uploadLimit !== 0)) { + return false; + } + if (settings.checkScript) { + // Let the loop know that we're already processing this file + _file.checking = true; + skipFile = $data.checkExists(_file); + _file.checking = false; + if (!skipFile) { + $data.uploadFile(_file, true); + } + } else { + $data.uploadFile(_file, true); + } + }); + if ($('#' + settings.queueID).find('.uploadifive-queue-item').not('.error, .complete').size() == 0) { + $data.queueComplete(); + } + } else { + if ($data.uploads.current == 0) { + if ($.inArray('onError', settings.overrideEvents) < 0) { + if ($data.filesToUpload() > 0 && settings.uploadLimit != 0) { + alert('The maximum upload limit has been reached.'); + } + } + // Trigger the onError event + if (typeof settings.onError === 'function') { + settings.onError.call($this, 'UPLOAD_LIMIT_EXCEEDED', $data.filesToUpload()); + } + } + } + + } + + }); + + }, + + // Destroy an instance of UploadiFive + destroy : function() { + + this.each(function() { + + var $this = $(this), + $data = $this.data('uploadifive'), + settings = $data.settings; + + // Clear the queue + methods.clearQueue.call($this); + // Destroy the queue if it was created + if (!settings.queueID) $('#' + settings.queueID).remove(); + // Remove extra inputs + $this.siblings('input').remove(); + // Show the original file input + $this.show() + // Move the file input out of the button + .insertBefore($data.button); + // Delete the button + $data.button.remove(); + // Trigger the destroy event + if (typeof settings.onDestroy === 'function') { + settings.onDestroy.call($this); + } + + }); + + } + + } + + $.fn.uploadifive = function(method) { + + if (methods[method]) { + return methods[method].apply(this, Array.prototype.slice.call(arguments, 1)); + } else if (typeof method === 'object' || !method) { + return methods.init.apply(this, arguments); + } else { + $.error('The method ' + method + ' does not exist in $.uploadify'); + } + + } + +})(jQuery); + +/* I gave the queueItems IDs and they each have a reference to the file held in the 'data' obj. */ \ No newline at end of file diff --git a/static/js/libs/jquery.uploadifive.min.js b/static/js/libs/jquery.uploadifive.min.js new file mode 100755 index 0000000..66d633d --- /dev/null +++ b/static/js/libs/jquery.uploadifive.min.js @@ -0,0 +1,6 @@ +/* +UploadiFive 1.1.0 +Copyright (c) 2012 Reactive Apps, Ronnie Garcia +Released under the UploadiFive Standard License +*/ +;(function(b){var a={init:function(c){return this.each(function(){var g=b(this);g.data("uploadifive",{inputs:{},inputCount:0,fileID:0,queue:{count:0,selected:0,replaced:0,errors:0,queued:0,cancelled:0},uploads:{current:0,attempts:0,successful:0,errors:0,count:0}});var d=g.data("uploadifive");var f=d.settings=b.extend({auto:true,buttonClass:false,buttonText:"Select Files",checkScript:false,dnd:true,dropTarget:false,fileObjName:"Filedata",fileSizeLimit:0,fileType:false,formData:{},height:30,itemTemplate:false,method:"post",multi:true,overrideEvents:[],queueID:false,queueSizeLimit:0,removeCompleted:false,simUploadLimit:0,truncateLength:0,uploadLimit:0,uploadScript:"uploadifive.php",width:100},c);if(isNaN(f.fileSizeLimit)){var e=parseInt(f.fileSizeLimit)*1.024;if(f.fileSizeLimit.indexOf("KB")>-1){f.fileSizeLimit=e*1000;}else{if(f.fileSizeLimit.indexOf("MB")>-1){f.fileSizeLimit=e*1000000;}else{if(f.fileSizeLimit.indexOf("GB")>-1){f.fileSizeLimit=e*1000000000;}}}}else{f.fileSizeLimit=f.fileSizeLimit*1024;}d.inputTemplate=b('').css({opacity:0,position:"absolute","z-index":999});d.createInput=function(){var j=d.inputTemplate.clone();var k=j.name="input"+d.inputCount++;if(f.multi){j.attr("multiple",true);}j.bind("change",function(){d.queue.selected=0;d.queue.replaced=0;d.queue.errors=0;d.queue.queued=0;var l=this.files.length;d.queue.selected=l;if((d.queue.count+l)>f.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var m=0;mf.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var o=0;o X
');}else{d.queueItem=b(f.itemTemplate);}d.addQueueItem=function(k){if(b.inArray("onAddQueueItem",f.overrideEvents)<0){d.removeExistingFile(k);k.queueItem=d.queueItem.clone();k.queueItem.attr("id",f.id+"-file-"+d.fileID++);k.queueItem.find(".close").bind("click",function(){a.cancel.call(g,k);return false;});var m=k.name;if(m.length>f.truncateLength&&f.truncateLength!=0){m=m.substring(0,f.truncateLength)+"...";}k.queueItem.find(".filename").html(m);k.queueItem.data("file",k);d.queueEl.append(k.queueItem);}if(typeof f.onAddQueueItem==="function"){f.onAddQueueItem.call(g,k);}if(f.fileType){if(b.isArray(f.fileType)){var j=false;for(var l=0;l-1){j=true;}}if(!j){d.error("FORBIDDEN_FILE_TYPE",k);}}else{if(k.type.indexOf(f.fileType)<0){d.error("FORBIDDEN_FILE_TYPE",k);}}}if(k.size>f.fileSizeLimit&&f.fileSizeLimit!=0){d.error("FILE_SIZE_LIMIT_EXCEEDED",k);}else{d.queue.queued++;d.queue.count++;}};d.removeQueueItem=function(m,l,k){if(!k){k=0;}var j=l?0:500;if(m.queueItem){if(m.queueItem.find(".fileinfo").html()!=" - Completed"){m.queueItem.find(".fileinfo").html(" - Cancelled");}m.queueItem.find(".progress-bar").width(0);m.queueItem.delay(k).fadeOut(j,function(){b(this).remove();});delete m.queueItem;d.queue.count--;}};d.filesToUpload=function(){var k=0;for(var j in d.inputs){input=d.inputs[j];limit=input.files.length;for(var l=0;l'+f.buttonText+"");if(f.buttonClass){d.button.addClass(f.buttonClass);}d.button.css({height:f.height,"line-height":f.height+"px",overflow:"hidden",position:"relative","text-align":"center",width:f.width});g.before(d.button).appendTo(d.button).hide();d.createInput.call(g);d.button.mousemove(function(j){var k=d.button.offset();d.currentInput.css({left:j.pageX-k.left-g.width()+10,top:j.pageY-k.top-g.height()+10});});if(!f.queueID){f.queueID=f.id+"-queue";d.queueEl=b('
');d.button.after(d.queueEl);}else{d.queueEl=b("#"+f.queueID);}if(f.dnd){var h=f.dropTarget?b(f.dropTarget):d.queueEl.get(0);h.addEventListener("dragleave",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragenter",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragover",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("drop",d.drop,false);}if(!XMLHttpRequest.prototype.sendAsBinary){XMLHttpRequest.prototype.sendAsBinary=function(k){function l(n){return n.charCodeAt(0)&255;}var m=Array.prototype.map.call(k,l);var j=new Uint8Array(m);this.send(j.buffer);};}if(typeof f.onInit==="function"){f.onInit.call(g);}}else{if(typeof f.onFallback==="function"){f.onFallback.call(g);}return false;}});},debug:function(){return this.each(function(){console.log(b(this).data("uploadifive"));});},clearQueue:function(){this.each(function(){var f=b(this),c=f.data("uploadifive"),e=c.settings;for(var d in c.inputs){input=c.inputs[d];limit=input.files.length;for(i=0;i=f.simUploadLimit&&f.simUploadLimit!==0)||(e.uploads.current>=f.uploadLimit&&f.uploadLimit!==0)||(e.uploads.count>=f.uploadLimit&&f.uploadLimit!==0)){return false;}if(f.checkScript){_file.checking=true;skipFile=e.checkExists(_file);_file.checking=false;if(!skipFile){e.uploadFile(_file,true);}}else{e.uploadFile(_file,true);}});if(b("#"+f.queueID).find(".uploadifive-queue-item").not(".error, .complete").size()==0){e.queueComplete();}}else{if(e.uploads.current==0){if(b.inArray("onError",f.overrideEvents)<0){if(e.filesToUpload()>0&&f.uploadLimit!=0){alert("The maximum upload limit has been reached.");}}if(typeof f.onError==="function"){f.onError.call(h,"UPLOAD_LIMIT_EXCEEDED",e.filesToUpload());}}}}});},destroy:function(){this.each(function(){var e=b(this),c=e.data("uploadifive"),d=c.settings;a.clearQueue.call(e);if(!d.queueID){b("#"+d.queueID).remove();}e.siblings("input").remove();e.show().insertBefore(c.button);c.button.remove();if(typeof d.onDestroy==="function"){d.onDestroy.call(e);}});}};b.fn.uploadifive=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("The method "+c+" does not exist in $.uploadify");}}};})(jQuery); \ No newline at end of file diff --git a/static/js/libs/modernizr.js b/static/js/libs/modernizr.js old mode 100644 new mode 100755 diff --git a/static/js/libs/sm/soundmanager2-jsmin.js b/static/js/libs/sm/soundmanager2-jsmin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/sm/soundmanager2-nodebug-jsmin.js b/static/js/libs/sm/soundmanager2-nodebug-jsmin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/sm/soundmanager2-nodebug.js b/static/js/libs/sm/soundmanager2-nodebug.js old mode 100644 new mode 100755 diff --git a/static/js/libs/sm/soundmanager2.js b/static/js/libs/sm/soundmanager2.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/jquery.tinymce.js b/static/js/libs/tiny_mce/jquery.tinymce.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/langs/en.js b/static/js/libs/tiny_mce/langs/en.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/css/advhr.css b/static/js/libs/tiny_mce/plugins/advhr/css/advhr.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/editor_plugin.js b/static/js/libs/tiny_mce/plugins/advhr/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/advhr/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/js/rule.js b/static/js/libs/tiny_mce/plugins/advhr/js/rule.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/advhr/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advhr/rule.htm b/static/js/libs/tiny_mce/plugins/advhr/rule.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/css/advimage.css b/static/js/libs/tiny_mce/plugins/advimage/css/advimage.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/editor_plugin.js b/static/js/libs/tiny_mce/plugins/advimage/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/advimage/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/image.htm b/static/js/libs/tiny_mce/plugins/advimage/image.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/img/sample.gif b/static/js/libs/tiny_mce/plugins/advimage/img/sample.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/js/image.js b/static/js/libs/tiny_mce/plugins/advimage/js/image.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advimage/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/advimage/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/css/advlink.css b/static/js/libs/tiny_mce/plugins/advlink/css/advlink.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/editor_plugin.js b/static/js/libs/tiny_mce/plugins/advlink/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/advlink/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/js/advlink.js b/static/js/libs/tiny_mce/plugins/advlink/js/advlink.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/advlink/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlink/link.htm b/static/js/libs/tiny_mce/plugins/advlink/link.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlist/editor_plugin.js b/static/js/libs/tiny_mce/plugins/advlist/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/advlist/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/advlist/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autolink/editor_plugin.js b/static/js/libs/tiny_mce/plugins/autolink/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autolink/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/autolink/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autoresize/editor_plugin.js b/static/js/libs/tiny_mce/plugins/autoresize/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/autoresize/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autosave/editor_plugin.js b/static/js/libs/tiny_mce/plugins/autosave/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autosave/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/autosave/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/autosave/langs/en.js b/static/js/libs/tiny_mce/plugins/autosave/langs/en.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/bbcode/editor_plugin.js b/static/js/libs/tiny_mce/plugins/bbcode/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/bbcode/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/contextmenu/editor_plugin.js b/static/js/libs/tiny_mce/plugins/contextmenu/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/contextmenu/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/directionality/editor_plugin.js b/static/js/libs/tiny_mce/plugins/directionality/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/directionality/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/directionality/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/editor_plugin.js b/static/js/libs/tiny_mce/plugins/emotions/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/emotions/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/emotions.htm b/static/js/libs/tiny_mce/plugins/emotions/emotions.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-cool.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-cry.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-embarassed.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-frown.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-innocent.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-kiss.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-laughing.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-sealed.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-smile.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-surprised.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-undecided.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-wink.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif b/static/js/libs/tiny_mce/plugins/emotions/img/smiley-yell.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/js/emotions.js b/static/js/libs/tiny_mce/plugins/emotions/js/emotions.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/emotions/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/emotions/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/dialog.htm b/static/js/libs/tiny_mce/plugins/example/dialog.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/editor_plugin.js b/static/js/libs/tiny_mce/plugins/example/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/example/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/img/example.gif b/static/js/libs/tiny_mce/plugins/example/img/example.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/js/dialog.js b/static/js/libs/tiny_mce/plugins/example/js/dialog.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/langs/en.js b/static/js/libs/tiny_mce/plugins/example/langs/en.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/example/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example_dependency/editor_plugin.js b/static/js/libs/tiny_mce/plugins/example_dependency/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/example_dependency/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/example_dependency/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/css/fullpage.css b/static/js/libs/tiny_mce/plugins/fullpage/css/fullpage.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/editor_plugin.js b/static/js/libs/tiny_mce/plugins/fullpage/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/fullpage/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/fullpage.htm b/static/js/libs/tiny_mce/plugins/fullpage/fullpage.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/js/fullpage.js b/static/js/libs/tiny_mce/plugins/fullpage/js/fullpage.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/fullpage/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullscreen/editor_plugin.js b/static/js/libs/tiny_mce/plugins/fullscreen/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/fullscreen/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/fullscreen/fullscreen.htm b/static/js/libs/tiny_mce/plugins/fullscreen/fullscreen.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/iespell/editor_plugin.js b/static/js/libs/tiny_mce/plugins/iespell/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/iespell/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/iespell/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js b/static/js/libs/tiny_mce/plugins/inlinepopups/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/inlinepopups/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/static/js/libs/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/inlinepopups/template.htm b/static/js/libs/tiny_mce/plugins/inlinepopups/template.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js b/static/js/libs/tiny_mce/plugins/insertdatetime/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/insertdatetime/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/layer/editor_plugin.js b/static/js/libs/tiny_mce/plugins/layer/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/layer/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/layer/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js b/static/js/libs/tiny_mce/plugins/legacyoutput/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/legacyoutput/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/lists/editor_plugin.js b/static/js/libs/tiny_mce/plugins/lists/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/lists/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/lists/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/css/media.css b/static/js/libs/tiny_mce/plugins/media/css/media.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/editor_plugin.js b/static/js/libs/tiny_mce/plugins/media/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/media/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/js/embed.js b/static/js/libs/tiny_mce/plugins/media/js/embed.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/js/media.js b/static/js/libs/tiny_mce/plugins/media/js/media.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/media/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/media.htm b/static/js/libs/tiny_mce/plugins/media/media.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/media/moxieplayer.swf b/static/js/libs/tiny_mce/plugins/media/moxieplayer.swf old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js b/static/js/libs/tiny_mce/plugins/nonbreaking/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/nonbreaking/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/noneditable/editor_plugin.js b/static/js/libs/tiny_mce/plugins/noneditable/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/noneditable/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/pagebreak/editor_plugin.js b/static/js/libs/tiny_mce/plugins/pagebreak/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/pagebreak/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/editor_plugin.js b/static/js/libs/tiny_mce/plugins/paste/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/paste/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/js/pastetext.js b/static/js/libs/tiny_mce/plugins/paste/js/pastetext.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/js/pasteword.js b/static/js/libs/tiny_mce/plugins/paste/js/pasteword.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/paste/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/pastetext.htm b/static/js/libs/tiny_mce/plugins/paste/pastetext.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/paste/pasteword.htm b/static/js/libs/tiny_mce/plugins/paste/pasteword.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/preview/editor_plugin.js b/static/js/libs/tiny_mce/plugins/preview/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/preview/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/preview/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/preview/example.html b/static/js/libs/tiny_mce/plugins/preview/example.html old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/preview/jscripts/embed.js b/static/js/libs/tiny_mce/plugins/preview/jscripts/embed.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/preview/preview.html b/static/js/libs/tiny_mce/plugins/preview/preview.html old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/print/editor_plugin.js b/static/js/libs/tiny_mce/plugins/print/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/print/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/print/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/save/editor_plugin.js b/static/js/libs/tiny_mce/plugins/save/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/save/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/save/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css b/static/js/libs/tiny_mce/plugins/searchreplace/css/searchreplace.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/editor_plugin.js b/static/js/libs/tiny_mce/plugins/searchreplace/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/searchreplace/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js b/static/js/libs/tiny_mce/plugins/searchreplace/js/searchreplace.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/searchreplace/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/searchreplace/searchreplace.htm b/static/js/libs/tiny_mce/plugins/searchreplace/searchreplace.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/spellchecker/css/content.css b/static/js/libs/tiny_mce/plugins/spellchecker/css/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/spellchecker/editor_plugin.js b/static/js/libs/tiny_mce/plugins/spellchecker/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/spellchecker/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/spellchecker/img/wline.gif b/static/js/libs/tiny_mce/plugins/spellchecker/img/wline.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/css/props.css b/static/js/libs/tiny_mce/plugins/style/css/props.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/editor_plugin.js b/static/js/libs/tiny_mce/plugins/style/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/style/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/js/props.js b/static/js/libs/tiny_mce/plugins/style/js/props.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/style/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/props.htm b/static/js/libs/tiny_mce/plugins/style/props.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/style/readme.txt b/static/js/libs/tiny_mce/plugins/style/readme.txt old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/tabfocus/editor_plugin.js b/static/js/libs/tiny_mce/plugins/tabfocus/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/tabfocus/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/cell.htm b/static/js/libs/tiny_mce/plugins/table/cell.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/css/cell.css b/static/js/libs/tiny_mce/plugins/table/css/cell.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/css/row.css b/static/js/libs/tiny_mce/plugins/table/css/row.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/css/table.css b/static/js/libs/tiny_mce/plugins/table/css/table.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/editor_plugin.js b/static/js/libs/tiny_mce/plugins/table/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/table/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/js/cell.js b/static/js/libs/tiny_mce/plugins/table/js/cell.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/js/merge_cells.js b/static/js/libs/tiny_mce/plugins/table/js/merge_cells.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/js/row.js b/static/js/libs/tiny_mce/plugins/table/js/row.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/js/table.js b/static/js/libs/tiny_mce/plugins/table/js/table.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/table/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/merge_cells.htm b/static/js/libs/tiny_mce/plugins/table/merge_cells.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/row.htm b/static/js/libs/tiny_mce/plugins/table/row.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/table/table.htm b/static/js/libs/tiny_mce/plugins/table/table.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/blank.htm b/static/js/libs/tiny_mce/plugins/template/blank.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/css/template.css b/static/js/libs/tiny_mce/plugins/template/css/template.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/editor_plugin.js b/static/js/libs/tiny_mce/plugins/template/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/template/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/js/template.js b/static/js/libs/tiny_mce/plugins/template/js/template.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/template/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/template/template.htm b/static/js/libs/tiny_mce/plugins/template/template.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/visualblocks/css/visualblocks.css b/static/js/libs/tiny_mce/plugins/visualblocks/css/visualblocks.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/visualblocks/editor_plugin.js b/static/js/libs/tiny_mce/plugins/visualblocks/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/visualblocks/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/visualblocks/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/visualchars/editor_plugin.js b/static/js/libs/tiny_mce/plugins/visualchars/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/visualchars/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/wordcount/editor_plugin.js b/static/js/libs/tiny_mce/plugins/wordcount/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/wordcount/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/abbr.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/acronym.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/attributes.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/cite.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/cite.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/static/js/libs/tiny_mce/plugins/xhtmlxtras/css/attributes.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css b/static/js/libs/tiny_mce/plugins/xhtmlxtras/css/popup.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/del.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/del.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/ins.htm b/static/js/libs/tiny_mce/plugins/xhtmlxtras/ins.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/abbr.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/acronym.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/attributes.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/cite.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/del.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/del.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/element_common.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/js/ins.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/static/js/libs/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/about.htm b/static/js/libs/tiny_mce/themes/advanced/about.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/anchor.htm b/static/js/libs/tiny_mce/themes/advanced/anchor.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/charmap.htm b/static/js/libs/tiny_mce/themes/advanced/charmap.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/color_picker.htm b/static/js/libs/tiny_mce/themes/advanced/color_picker.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/editor_template.js b/static/js/libs/tiny_mce/themes/advanced/editor_template.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/editor_template_src.js b/static/js/libs/tiny_mce/themes/advanced/editor_template_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/image.htm b/static/js/libs/tiny_mce/themes/advanced/image.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/colorpicker.jpg b/static/js/libs/tiny_mce/themes/advanced/img/colorpicker.jpg old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/flash.gif b/static/js/libs/tiny_mce/themes/advanced/img/flash.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/icons.gif b/static/js/libs/tiny_mce/themes/advanced/img/icons.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/iframe.gif b/static/js/libs/tiny_mce/themes/advanced/img/iframe.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/pagebreak.gif b/static/js/libs/tiny_mce/themes/advanced/img/pagebreak.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/quicktime.gif b/static/js/libs/tiny_mce/themes/advanced/img/quicktime.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/realmedia.gif b/static/js/libs/tiny_mce/themes/advanced/img/realmedia.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/shockwave.gif b/static/js/libs/tiny_mce/themes/advanced/img/shockwave.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/trans.gif b/static/js/libs/tiny_mce/themes/advanced/img/trans.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/video.gif b/static/js/libs/tiny_mce/themes/advanced/img/video.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/img/windowsmedia.gif b/static/js/libs/tiny_mce/themes/advanced/img/windowsmedia.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/about.js b/static/js/libs/tiny_mce/themes/advanced/js/about.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/anchor.js b/static/js/libs/tiny_mce/themes/advanced/js/anchor.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/charmap.js b/static/js/libs/tiny_mce/themes/advanced/js/charmap.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/color_picker.js b/static/js/libs/tiny_mce/themes/advanced/js/color_picker.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/image.js b/static/js/libs/tiny_mce/themes/advanced/js/image.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/link.js b/static/js/libs/tiny_mce/themes/advanced/js/link.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/js/source_editor.js b/static/js/libs/tiny_mce/themes/advanced/js/source_editor.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/langs/en.js b/static/js/libs/tiny_mce/themes/advanced/langs/en.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/langs/en_dlg.js b/static/js/libs/tiny_mce/themes/advanced/langs/en_dlg.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/link.htm b/static/js/libs/tiny_mce/themes/advanced/link.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/shortcuts.htm b/static/js/libs/tiny_mce/themes/advanced/shortcuts.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/content.css b/static/js/libs/tiny_mce/themes/advanced/skins/default/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/dialog.css b/static/js/libs/tiny_mce/themes/advanced/skins/default/dialog.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/buttons.png old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/items.gif b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/items.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/menu_check.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/progress.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/static/js/libs/tiny_mce/themes/advanced/skins/default/img/tabs.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/default/ui.css b/static/js/libs/tiny_mce/themes/advanced/skins/default/ui.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/content.css b/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/dialog.css b/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/dialog.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/ui.css b/static/js/libs/tiny_mce/themes/advanced/skins/highcontrast/ui.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/content.css b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/dialog.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui_black.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/static/js/libs/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/advanced/source_editor.htm b/static/js/libs/tiny_mce/themes/advanced/source_editor.htm old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/editor_template.js b/static/js/libs/tiny_mce/themes/simple/editor_template.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/editor_template_src.js b/static/js/libs/tiny_mce/themes/simple/editor_template_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/img/icons.gif b/static/js/libs/tiny_mce/themes/simple/img/icons.gif old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/langs/en.js b/static/js/libs/tiny_mce/themes/simple/langs/en.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/skins/default/content.css b/static/js/libs/tiny_mce/themes/simple/skins/default/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/skins/default/ui.css b/static/js/libs/tiny_mce/themes/simple/skins/default/ui.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/skins/o2k7/content.css b/static/js/libs/tiny_mce/themes/simple/skins/o2k7/content.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/static/js/libs/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/themes/simple/skins/o2k7/ui.css b/static/js/libs/tiny_mce/themes/simple/skins/o2k7/ui.css old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/tiny_mce.js b/static/js/libs/tiny_mce/tiny_mce.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/tiny_mce_popup.js b/static/js/libs/tiny_mce/tiny_mce_popup.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/tiny_mce_src.js b/static/js/libs/tiny_mce/tiny_mce_src.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/utils/editable_selects.js b/static/js/libs/tiny_mce/utils/editable_selects.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/utils/form_utils.js b/static/js/libs/tiny_mce/utils/form_utils.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/utils/mctabs.js b/static/js/libs/tiny_mce/utils/mctabs.js old mode 100644 new mode 100755 diff --git a/static/js/libs/tiny_mce/utils/validate.js b/static/js/libs/tiny_mce/utils/validate.js old mode 100644 new mode 100755 diff --git a/static/js/libs/uploadify/jquery.uploadifive.js b/static/js/libs/uploadify/jquery.uploadifive.js old mode 100644 new mode 100755 index 9928813..2ae2677 --- a/static/js/libs/uploadify/jquery.uploadifive.js +++ b/static/js/libs/uploadify/jquery.uploadifive.js @@ -412,7 +412,7 @@ Released under the UploadiFive Standard License */ -;(function(b){var a={init:function(c){return this.each(function(){var g=b(this);g.data("uploadifive",{inputs:{},inputCount:0,fileID:0,queue:{count:0,selected:0,replaced:0,errors:0,queued:0,cancelled:0},uploads:{current:0,attempts:0,successful:0,errors:0,count:0}});var d=g.data("uploadifive");var f=d.settings=b.extend({auto:true,buttonClass:false,buttonText:"Select Files",checkScript:false,dnd:true,dropTarget:false,fileSizeLimit:0,fileType:false,formData:{},height:30,method:"post",multi:true,overrideEvents:[],queueID:false,queueSizeLimit:0,removeCompleted:false,simUploadLimit:0,truncateLength:0,uploadLimit:0,uploadScript:"uploadifive.php",width:100},c);if(isNaN(f.fileSizeLimit)){var e=parseInt(f.fileSizeLimit)*1.024;if(f.fileSizeLimit.indexOf("KB")>-1){f.fileSizeLimit=e*1000;}else{if(f.fileSizeLimit.indexOf("MB")>-1){f.fileSizeLimit=e*1000000;}else{if(f.fileSizeLimit.indexOf("GB")>-1){f.fileSizeLimit=e*1000000000;}}}}else{f.fileSizeLimit=f.fileSizeLimit*1024;}d.inputTemplate=b('').css({opacity:0,position:"absolute","z-index":999});d.createInput=function(){var j=d.inputTemplate.clone();var k=j.name="input"+d.inputCount++;if(f.multi){j.attr("multiple",true);}j.bind("change",function(){d.queue.selected=0;d.queue.replaced=0;d.queue.errors=0;d.queue.queued=0;var l=this.files.length;d.queue.selected=l;if((d.queue.count+l)>f.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var m=0;mf.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var o=0;o X
');d.addQueueItem=function(k){if(b.inArray("onAddQueueItem",f.overrideEvents)<0){d.removeExistingFile(k);k.queueItem=d.queueItem.clone();k.queueItem.attr("id",f.id+"-file-"+d.fileID++);k.queueItem.find(".close").bind("click",function(){a.cancel.call(g,k);return false;});var m=k.name;if(m.length>f.truncateLength&&f.truncateLength!=0){m=m.substring(0,f.truncateLength)+"...";}k.queueItem.find(".filename").html(m);k.queueItem.data("file",k);d.queueEl.append(k.queueItem);}if(typeof f.onAddQueueItem==="function"){f.onAddQueueItem.call(g,k);}if(f.fileType){if(b.isArray(f.fileType)){var j=false;for(var l=0;l-1){j=true;}}if(!j){d.error("FORBIDDEN_FILE_TYPE",k);}}else{if(k.type.indexOf(f.fileType)<0){d.error("FORBIDDEN_FILE_TYPE",k);}}}if(k.size>f.fileSizeLimit&&f.fileSizeLimit!=0){d.error("FILE_SIZE_LIMIT_EXCEEDED",k);}else{d.queue.queued++;d.queue.count++;}};d.removeQueueItem=function(m,l,k){if(!k){k=0;}var j=l?0:500;if(m.queueItem){if(m.queueItem.find(".fileinfo").html()!=" - Completed"){m.queueItem.find(".fileinfo").html(" - Cancelled");}m.queueItem.find(".progress-bar").width(0);m.queueItem.delay(k).fadeOut(j,function(){b(this).remove();});delete m.queueItem;d.queue.count--;}};d.filesToUpload=function(){var k=0;for(var j in d.inputs){input=d.inputs[j];limit=input.files.length;for(var l=0;l'+f.buttonText+"");if(f.buttonClass){d.button.addClass(f.buttonClass);}d.button.css({height:f.height,"line-height":f.height+"px",overflow:"hidden",position:"relative","text-align":"center",width:f.width});g.before(d.button).appendTo(d.button).hide();d.createInput.call(g);d.button.mousemove(function(j){var k=d.button.offset();d.currentInput.css({left:j.pageX-k.left-g.width()+10,top:j.pageY-k.top-g.height()+10});});if(!f.queueID){f.queueID=f.id+"-queue";d.queueEl=b('
');d.button.after(d.queueEl);}else{d.queueEl=b("#"+f.queueID);}if(f.dnd){var h=f.dropTarget?b(f.dropTarget):d.queueEl.get(0);h.addEventListener("dragleave",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragenter",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragover",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("drop",d.drop,false);}if(!XMLHttpRequest.prototype.sendAsBinary){XMLHttpRequest.prototype.sendAsBinary=function(k){function l(n){return n.charCodeAt(0)&255;}var m=Array.prototype.map.call(k,l);var j=new Uint8Array(m);this.send(j.buffer);};}if(typeof f.onInit==="function"){f.onInit.call(g);}}else{if(typeof f.onFallback==="function"){f.onFallback.call(g);}return false;}});},debug:function(){return this.each(function(){console.log(b(this).data("uploadifive"));});},clearQueue:function(){this.each(function(){var f=b(this),c=f.data("uploadifive"),e=c.settings;for(var d in c.inputs){input=c.inputs[d];limit=input.files.length;for(i=0;i=f.simUploadLimit&&f.simUploadLimit!==0)||(e.uploads.current>=f.uploadLimit&&f.uploadLimit!==0)||(e.uploads.count>=f.uploadLimit&&f.uploadLimit!==0)){return false;}if(f.checkScript){_file.checking=true;skipFile=e.checkExists(_file);_file.checking=false;if(!skipFile){e.uploadFile(_file,true);}}else{e.uploadFile(_file,true);}});if(b("#"+f.queueID).find(".uploadifive-queue-item").not(".error, .complete").size()==0){e.queueComplete();}}else{if(e.uploads.current==0){if(b.inArray("onError",f.overrideEvents)<0){if(e.filesToUpload()>0&&f.uploadLimit!=0){alert("The maximum upload limit has been reached.");}}if(typeof f.onError==="function"){f.onError.call(h,"UPLOAD_LIMIT_EXCEEDED",e.filesToUpload());}}}}});},destroy:function(){this.each(function(){var e=b(this),c=e.data("uploadifive"),d=c.settings;a.clearQueue.call(e);if(!d.queueID){b("#"+d.queueID).remove();}e.siblings("input").remove();e.show().insertBefore(c.button);c.button.remove();if(typeof d.onDestroy==="function"){d.onDestroy.call(e);}});}};b.fn.uploadifive=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("The method "+c+" does not exist in $.uploadify");}}};})(jQuery); \ No newline at end of file +;(function(b){var a={init:function(c){return this.each(function(){var g=b(this);g.data("uploadifive",{inputs:{},inputCount:0,fileID:0,queue:{count:0,selected:0,replaced:0,errors:0,queued:0,cancelled:0},uploads:{current:0,attempts:0,successful:0,errors:0,count:0}});var d=g.data("uploadifive");var f=d.settings=b.extend({auto:true,buttonClass:false,buttonText:"Select Files",checkScript:false,dnd:true,dropTarget:false,fileSizeLimit:0,fileType:false,formData:{},height:30,method:"post",multi:true,overrideEvents:[],queueID:false,queueSizeLimit:0,removeCompleted:false,simUploadLimit:0,truncateLength:0,uploadLimit:0,uploadScript:"uploadifive.php",width:100},c);if(isNaN(f.fileSizeLimit)){var e=parseInt(f.fileSizeLimit)*1.024;if(f.fileSizeLimit.indexOf("KB")>-1){f.fileSizeLimit=e*1000;}else{if(f.fileSizeLimit.indexOf("MB")>-1){f.fileSizeLimit=e*1000000;}else{if(f.fileSizeLimit.indexOf("GB")>-1){f.fileSizeLimit=e*1000000000;}}}}else{f.fileSizeLimit=f.fileSizeLimit*1024;}d.inputTemplate=b('').css({opacity:0,position:"absolute","z-index":999});d.createInput=function(){var j=d.inputTemplate.clone();var k=j.name="input"+d.inputCount++;if(f.multi){j.attr("multiple",true);}j.bind("change",function(){d.queue.selected=0;d.queue.replaced=0;d.queue.errors=0;d.queue.queued=0;var l=this.files.length;d.queue.selected=l;if((d.queue.count+l)>f.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var m=0;mf.queueSizeLimit&&f.queueSizeLimit!==0){if(b.inArray("onError",f.overrideEvents)<0){alert("The maximum number of queue items has been reached ("+f.queueSizeLimit+"). Please select fewer files.");}if(typeof f.onError==="function"){f.onError.call(g,"QUEUE_LIMIT_EXCEEDED");}}else{for(var o=0;o X
');d.addQueueItem=function(k){if(b.inArray("onAddQueueItem",f.overrideEvents)<0){d.removeExistingFile(k);k.queueItem=d.queueItem.clone();k.queueItem.attr("id",f.id+"-file-"+d.fileID++);k.queueItem.find(".close").bind("click",function(){a.cancel.call(g,k);return false;});var m=k.name;if(m.length>f.truncateLength&&f.truncateLength!=0){m=m.substring(0,f.truncateLength)+"...";}k.queueItem.find(".filename").html(m);k.queueItem.data("file",k);d.queueEl.append(k.queueItem);}if(typeof f.onAddQueueItem==="function"){f.onAddQueueItem.call(g,k);}if(f.fileType){if(b.isArray(f.fileType)){var j=false;for(var l=0;l-1){j=true;}}if(!j){d.error("FORBIDDEN_FILE_TYPE",k);}}else{if(k.type.indexOf(f.fileType)<0){d.error("FORBIDDEN_FILE_TYPE",k);}}}if(k.size>f.fileSizeLimit&&f.fileSizeLimit!=0){d.error("FILE_SIZE_LIMIT_EXCEEDED",k);}else{d.queue.queued++;d.queue.count++;}};d.removeQueueItem=function(m,l,k){if(!k){k=0;}var j=l?0:500;if(m.queueItem){if(m.queueItem.find(".fileinfo").html()!=" - Completed"){m.queueItem.find(".fileinfo").html(" - Cancelled");}m.queueItem.find(".progress-bar").width(0);m.queueItem.delay(k).fadeOut(j,function(){b(this).remove();});delete m.queueItem;d.queue.count--;}};d.filesToUpload=function(){var k=0;for(var j in d.inputs){input=d.inputs[j];limit=input.files.length;for(var l=0;l'+f.buttonText+"");if(f.buttonClass){d.button.addClass(f.buttonClass);}d.button.css({height:f.height,"line-height":f.height+"px",overflow:"hidden",position:"relative","text-align":"center",width:f.width});g.before(d.button).appendTo(d.button).hide();d.createInput.call(g);d.button.mousemove(function(j){var k=d.button.offset();d.currentInput.css({left:j.pageX-k.left-g.width()+10,top:j.pageY-k.top-g.height()+10});});if(!f.queueID){f.queueID=f.id+"-queue";d.queueEl=b('
');d.button.after(d.queueEl);}else{d.queueEl=b("#"+f.queueID);}if(f.dnd){var h=f.dropTarget?b(f.dropTarget):d.queueEl.get(0);h.addEventListener("dragleave",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragenter",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("dragover",function(j){j.preventDefault();j.stopPropagation();},false);h.addEventListener("drop",d.drop,false);}if(!XMLHttpRequest.prototype.sendAsBinary){XMLHttpRequest.prototype.sendAsBinary=function(k){function l(n){return n.charCodeAt(0)&255;}var m=Array.prototype.map.call(k,l);var j=new Uint8Array(m);this.send(j.buffer);};}if(typeof f.onInit==="function"){f.onInit.call(g);}}else{if(typeof f.onFallback==="function"){f.onFallback.call(g);}return false;}});},debug:function(){return this.each(function(){console.log(b(this).data("uploadifive"));});},clearQueue:function(){this.each(function(){var f=b(this),c=f.data("uploadifive"),e=c.settings;for(var d in c.inputs){input=c.inputs[d];limit=input.files.length;for(i=0;i=f.simUploadLimit&&f.simUploadLimit!==0)||(e.uploads.current>=f.uploadLimit&&f.uploadLimit!==0)||(e.uploads.count>=f.uploadLimit&&f.uploadLimit!==0)){return false;}if(f.checkScript){_file.checking=true;skipFile=e.checkExists(_file);_file.checking=false;if(!skipFile){e.uploadFile(_file,true);}}else{e.uploadFile(_file,true);}});if(b("#"+f.queueID).find(".uploadifive-queue-item").not(".error, .complete").size()==0){e.queueComplete();}}else{if(e.uploads.current==0){if(b.inArray("onError",f.overrideEvents)<0){if(e.filesToUpload()>0&&f.uploadLimit!=0){alert("The maximum upload limit has been reached.");}}if(typeof f.onError==="function"){f.onError.call(h,"UPLOAD_LIMIT_EXCEEDED",e.filesToUpload());}}}}});},destroy:function(){this.each(function(){var e=b(this),c=e.data("uploadifive"),d=c.settings;a.clearQueue.call(e);if(!d.queueID){b("#"+d.queueID).remove();}e.siblings("input").remove();e.show().insertBefore(c.button);c.button.remove();if(typeof d.onDestroy==="function"){d.onDestroy.call(e);}});}};b.fn.uploadifive=function(c){if(a[c]){return a[c].apply(this,Array.prototype.slice.call(arguments,1));}else{if(typeof c==="object"||!c){return a.init.apply(this,arguments);}else{b.error("The method "+c+" does not exist in $.uploadify");}}};})(jQuery); \ No newline at end of file diff --git a/static/js/old__dss_sound_handler.js b/static/js/old__dss_sound_handler.js old mode 100644 new mode 100755 diff --git a/static/test.html b/static/test.html old mode 100644 new mode 100755 diff --git a/templates/404.html b/templates/404.html old mode 100644 new mode 100755 diff --git a/templates/500.html b/templates/500.html old mode 100644 new mode 100755 diff --git a/templates/account/base.html b/templates/account/base.html old mode 100644 new mode 100755 diff --git a/templates/account/email.html b/templates/account/email.html old mode 100644 new mode 100755 diff --git a/templates/account/login.html b/templates/account/login.html old mode 100644 new mode 100755 diff --git a/templates/account/logout.html b/templates/account/logout.html old mode 100644 new mode 100755 index da8f7a2..51f8998 --- a/templates/account/logout.html +++ b/templates/account/logout.html @@ -1,19 +1,14 @@ {% extends "account/base.html" %} - {% load i18n %} - {% block head_title %}{% trans "Signed Out" %}{% endblock %} - {% block content %}

{% trans "Signed Out" %}

-

{% trans "You have signed out." %}

{% endblock %} - {% block footerscripts %} {% endblock %} \ No newline at end of file diff --git a/templates/account/password_change.html b/templates/account/password_change.html old mode 100644 new mode 100755 diff --git a/templates/account/password_delete.html b/templates/account/password_delete.html old mode 100644 new mode 100755 diff --git a/templates/account/password_delete_done.html b/templates/account/password_delete_done.html old mode 100644 new mode 100755 diff --git a/templates/account/password_reset.html b/templates/account/password_reset.html old mode 100644 new mode 100755 diff --git a/templates/account/password_reset_done.html b/templates/account/password_reset_done.html old mode 100644 new mode 100755 diff --git a/templates/account/password_reset_from_key.html b/templates/account/password_reset_from_key.html old mode 100644 new mode 100755 diff --git a/templates/account/password_reset_key_message.txt b/templates/account/password_reset_key_message.txt old mode 100644 new mode 100755 diff --git a/templates/account/password_set.html b/templates/account/password_set.html old mode 100644 new mode 100755 diff --git a/templates/account/registration_form.html b/templates/account/registration_form.html old mode 100644 new mode 100755 diff --git a/templates/account/signup.html b/templates/account/signup.html old mode 100644 new mode 100755 diff --git a/templates/account/snippets/already_logged_in.html b/templates/account/snippets/already_logged_in.html old mode 100644 new mode 100755 diff --git a/templates/account/user_details.html b/templates/account/user_details.html old mode 100644 new mode 100755 diff --git a/templates/account/verification_sent.html b/templates/account/verification_sent.html old mode 100644 new mode 100755 diff --git a/templates/account/verified_email_required.html b/templates/account/verified_email_required.html old mode 100644 new mode 100755 diff --git a/templates/base.html b/templates/base.html old mode 100644 new mode 100755 index a6d496d..1d9bfba --- a/templates/base.html +++ b/templates/base.html @@ -27,6 +27,9 @@ if (window.location.hash == '#_=_') { window.location.hash = ''; } + if (window.location.hash== 'upload#'){ + Backbone.history.navigate("/"); + } {% block headerscripts %} @@ -99,6 +102,7 @@ {% compress js %} + @@ -117,7 +121,6 @@ - diff --git a/templates/emailconfirmation/confirm_email.html b/templates/emailconfirmation/confirm_email.html old mode 100644 new mode 100755 diff --git a/templates/emailconfirmation/email_confirmation_message.txt b/templates/emailconfirmation/email_confirmation_message.txt old mode 100644 new mode 100755 diff --git a/templates/emailconfirmation/email_confirmation_subject.txt b/templates/emailconfirmation/email_confirmation_subject.txt old mode 100644 new mode 100755 diff --git a/templates/inc/_MixItemInsert.html b/templates/inc/_MixItemInsert.html old mode 100644 new mode 100755 diff --git a/templates/inc/analytics.html b/templates/inc/analytics.html old mode 100644 new mode 100755 diff --git a/templates/inc/ancient_browser.html b/templates/inc/ancient_browser.html old mode 100644 new mode 100755 diff --git a/templates/inc/app.html b/templates/inc/app.html old mode 100644 new mode 100755 diff --git a/templates/inc/comment_list.html b/templates/inc/comment_list.html old mode 100644 new mode 100755 diff --git a/templates/inc/facebook.html b/templates/inc/facebook.html old mode 100644 new mode 100755 diff --git a/templates/inc/facebook/index.html b/templates/inc/facebook/index.html old mode 100644 new mode 100755 diff --git a/templates/inc/facebook/mix.html b/templates/inc/facebook/mix.html old mode 100644 new mode 100755 diff --git a/templates/inc/facebook_init.html b/templates/inc/facebook_init.html old mode 100644 new mode 100755 diff --git a/templates/inc/fb_like.html b/templates/inc/fb_like.html old mode 100644 new mode 100755 diff --git a/templates/inc/image_insert.html b/templates/inc/image_insert.html old mode 100644 new mode 100755 diff --git a/templates/inc/meta.html b/templates/inc/meta.html old mode 100644 new mode 100755 diff --git a/templates/inc/mix_edit_toolbar.html b/templates/inc/mix_edit_toolbar.html old mode 100644 new mode 100755 diff --git a/templates/inc/track_player_ajax.html b/templates/inc/track_player_ajax.html old mode 100644 new mode 100755 diff --git a/templates/inc/twitter.html b/templates/inc/twitter.html old mode 100644 new mode 100755 diff --git a/templates/javascript/settings.js b/templates/javascript/settings.js old mode 100644 new mode 100755 diff --git a/templates/openid/base.html b/templates/openid/base.html old mode 100644 new mode 100755 diff --git a/templates/openid/login.html b/templates/openid/login.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/account_inactive.html b/templates/socialaccount/account_inactive.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/authentication_error.html b/templates/socialaccount/authentication_error.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/base.html b/templates/socialaccount/base.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/connections.html b/templates/socialaccount/connections.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/login_cancelled.html b/templates/socialaccount/login_cancelled.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/signup.html b/templates/socialaccount/signup.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/snippets/login_extra.html b/templates/socialaccount/snippets/login_extra.html old mode 100644 new mode 100755 diff --git a/templates/socialaccount/snippets/provider_list.html b/templates/socialaccount/snippets/provider_list.html old mode 100644 new mode 100755 diff --git a/templates/views/CommentListItemView.html b/templates/views/CommentListItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/CommentListView.html b/templates/views/CommentListView.html old mode 100644 new mode 100755 diff --git a/templates/views/EventCreateView.html b/templates/views/EventCreateView.html old mode 100644 new mode 100755 diff --git a/templates/views/EventItemView.html b/templates/views/EventItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/EventListItemView.html b/templates/views/EventListItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/EventListView.html b/templates/views/EventListView.html old mode 100644 new mode 100755 diff --git a/templates/views/EventView.html b/templates/views/EventView.html old mode 100644 new mode 100755 diff --git a/templates/views/HeaderView.html b/templates/views/HeaderView.html old mode 100644 new mode 100755 index 5ea6def..70e48e2 --- a/templates/views/HeaderView.html +++ b/templates/views/HeaderView.html @@ -12,10 +12,10 @@
  • Releases
  • Events
    • {% if user.is_authenticated %} -
  • Logout  +
  • Logout 
    • {% else %} -
  • Login/Signup Login/Signup 
    • {% endif %} diff --git a/templates/views/LoginView.html b/templates/views/LoginView.html old mode 100644 new mode 100755 index 450515a..ea2f7c8 --- a/templates/views/LoginView.html +++ b/templates/views/LoginView.html @@ -1,4 +1,6 @@ -{% load socialaccount_tags %} +{% load account %} +{% load socialaccount %} +

    Login to Deep South Sounds

    @@ -6,11 +8,11 @@
    diff --git a/templates/views/MixCreateView.html b/templates/views/MixCreateView.html old mode 100644 new mode 100755 diff --git a/templates/views/MixListItemView.html b/templates/views/MixListItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/MixListView.html b/templates/views/MixListView.html old mode 100644 new mode 100755 diff --git a/templates/views/MixView.html b/templates/views/MixView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseAudioItemView.html b/templates/views/ReleaseAudioItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseAudioListView.html b/templates/views/ReleaseAudioListView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseCreateView.html b/templates/views/ReleaseCreateView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseItemView.html b/templates/views/ReleaseItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseListItemView.html b/templates/views/ReleaseListItemView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseListView.html b/templates/views/ReleaseListView.html old mode 100644 new mode 100755 diff --git a/templates/views/ReleaseView.html b/templates/views/ReleaseView.html old mode 100644 new mode 100755 diff --git a/templates/views/SidebarView.html b/templates/views/SidebarView.html old mode 100644 new mode 100755 diff --git a/templates/views/UserView.html b/templates/views/UserView.html old mode 100644 new mode 100755 diff --git a/utils.py b/utils.py old mode 100644 new mode 100755