From 7f709ec31b88d8ccb529bd23552bf789a2a43e54 Mon Sep 17 00:00:00 2001 From: Ciaran Duffy Date: Sat, 28 Jan 2017 12:19:57 +0000 Subject: [PATCH 001/296] adding skip navigation switch (#1492) --- plugins/content/config/model.schema | 9 +++++++++ plugins/content/course/model.schema | 19 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/plugins/content/config/model.schema b/plugins/content/config/model.schema index fd89874df0..379cb91ce0 100644 --- a/plugins/content/config/model.schema +++ b/plugins/content/config/model.schema @@ -80,6 +80,15 @@ "validators": [], "title": "Enable text reader support?", "help": "If set to 'true' the course will add focusing to assist text reader software" + }, + "_isSkipNavigationEnabled": { + "type": "bool", + "default": "true", + "isSetting": false, + "inputType": {"type": "Boolean", "options": [true, false]}, + "validators": [], + "title": "Skip Navigation", + "help": "If set to 'true' a 'Skip Navigation' link will appear allowing users to jump to content" } } }, diff --git a/plugins/content/course/model.schema b/plugins/content/course/model.schema index 98491112c2..17822391fb 100644 --- a/plugins/content/course/model.schema +++ b/plugins/content/course/model.schema @@ -158,6 +158,17 @@ "required" ] }, + "skipNavigationText": { + "type": "string", + "title": "Skip navigation label", + "translatable": true, + "default": "Skip navigation", + "inputType": "Text", + "required": true, + "validators": [ + "required" + ] + }, "_accessibilityInstructions": { "type": "object", "title": "Accessibility instructions", @@ -205,6 +216,14 @@ "inputType": "Text", "required": true }, + "skipNavigation": { + "type": "string", + "translatable": true, + "title": "", + "default": "Skip navigation", + "inputType": "Text", + "required": true + }, "menuLoaded": { "type": "string", "title": "", From b0491ea461aa0001506efce611fa355e39a780b4 Mon Sep 17 00:00:00 2001 From: Himanshu Rajotia Date: Tue, 21 Feb 2017 21:34:40 +0530 Subject: [PATCH 002/296] added missing `app` context (#1399) --- install.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install.js b/install.js index ff8e1a05b6..21108518cf 100644 --- a/install.js +++ b/install.js @@ -295,9 +295,9 @@ var steps = [ masterTenant = tenant; console.log("Tenant " + tenant.name + " was created. Now saving configuration, please wait ..."); // save master tenant name to config - configuration.setConfig('masterTenantName', tenant.name); - configuration.setConfig('masterTenantID', tenant._id); - saveConfig(configuration.getConfig(), cb); + app.configuration.setConfig('masterTenantName', tenant.name); + app.configuration.setConfig('masterTenantID', tenant._id); + saveConfig(app.configuration.getConfig(), cb); } ); }; From 025b20d3c9d12217ecd2648aca0fbe011eeea646 Mon Sep 17 00:00:00 2001 From: nicola Date: Fri, 24 Feb 2017 15:58:10 +0000 Subject: [PATCH 003/296] Add confirmation for super user password during install --- install.js | 9 +++++++++ plugins/auth/local/index.js | 8 ++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/install.js b/install.js index 21108518cf..c460600760 100644 --- a/install.js +++ b/install.js @@ -190,6 +190,13 @@ userConfig = [ description: "Password", hidden: true, required: true + }, + { + name: 'retypePassword', + type: 'string', + description: "Retype Password", + hidden: true, + required: true } ]; @@ -376,6 +383,7 @@ var steps = [ var userEmail = result.email; var userPassword = result.password; + var userRetypePassword = result.retypePassword; // ruthlessly remove any existing users (we're already nuclear if we've deleted the existing tenant) app.usermanager.deleteUser({ email: userEmail }, function (err, userRec) { if (err) { @@ -387,6 +395,7 @@ var steps = [ new localAuth().internalRegisterUser({ email: userEmail, password: userPassword, + retypePassword: userRetypePassword, _tenantId: masterTenant._id }, function (err, user) { if (err) { diff --git a/plugins/auth/local/index.js b/plugins/auth/local/index.js index 4a465ebb51..6a82505c31 100644 --- a/plugins/auth/local/index.js +++ b/plugins/auth/local/index.js @@ -195,8 +195,12 @@ LocalAuth.prototype.registerUser = function (req, res, next) { }; LocalAuth.prototype.internalRegisterUser = function (user, cb) { - if (!user.email || !user.password) { - return cb(new auth.errors.UserRegistrationError('email and password are required!')); + if (!user.email || !user.password || !user.retypePassword) { + return cb(new auth.errors.UserRegistrationError('email, password and retyped password are required!')); + } + + if (user.password !== user.retypePassword) { + return cb(new auth.errors.UserRegistrationError('password and retyped password must match!')) } // create user with hashed password From d0ac4cc73039c82915e34e8dba05f15dff9f3cf5 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Feb 2017 17:02:39 +0000 Subject: [PATCH 004/296] Refactor FFMPEG code --- plugins/filestorage/localfs/index.js | 103 +++++++++++++-------------- 1 file changed, 49 insertions(+), 54 deletions(-) diff --git a/plugins/filestorage/localfs/index.js b/plugins/filestorage/localfs/index.js index 1c5e822fbf..8454644dbc 100644 --- a/plugins/filestorage/localfs/index.js +++ b/plugins/filestorage/localfs/index.js @@ -352,70 +352,65 @@ LocalFileStorage.prototype.copyAsset = function(asset, sourceTenantName, destina */ LocalFileStorage.prototype.createThumbnail = function (filePath, fileType, options, next) { - var imgThumbPath; // early return if we can't create thumbnails if (!configuration.getConfig('useffmpeg')) { return next(null, false); } - - var self = this; var fileFormat = fileType.split('/')[1]; - var additionalOptions = []; fileType = fileType.split('/')[0]; - if ('image' === fileType) { - if ('gif' === fileFormat){ - // pixel format for gif required - additionalOptions.push('-pix_fmt rgb24'); - // number of frames - additionalOptions.push('-frames 1'); - } - imgThumbPath = path.join(path.dirname(filePath), path.basename(filePath) + '_thumb' + path.extname(filePath)); - return new FFMpeg({ source: filePath }) - .addOptions(additionalOptions) - .withSize(options.width + 'x' + options.height) - .keepPixelAspect(true) - .on('error', function (err) { - logger.log('error', 'Failed to create image thumbnail: ' + err.message); - return next(err, false); - }) - .on('end', function () { - return next(null, self.getRelativePath(imgThumbPath)); - }) - .saveToFile(imgThumbPath); - - } else if ('video' === fileType) { - - imgThumbPath = path.join(path.dirname(filePath), path.basename(filePath) + '_thumb.gif'); + // also check fileType is supported + if(!isThumbnailTypeSupported(fileType)) { + return next(null, false); + } + var self = this; + var thumbExt = ('image' === fileType) ? path.extname(filePath) : '.gif'; + var imgThumbPath = path.join(path.dirname(filePath), path.basename(filePath)) + '_thumb' + thumbExt; + + var ff = new FFMpeg({ source: filePath }).output(imgThumbPath); + + if ('video' === fileType) { // pixel format for gifs (only needed with ffmpeg older versions eg 1.2) - additionalOptions.push('-pix_fmt rgb24'); + ff.outputOptions('-pix_fmt rgb24'); + // limit file size to ~300kb + ff.outputOptions('-fs 300000'); // start position 1sec in case of black screen - additionalOptions.push('-ss 00:00:01'); - // frequency of snaps one every five seconds - additionalOptions.push('-vf fps=fps=1/5'); - // number of frames - additionalOptions.push('-frames 7'); - // frame rate - additionalOptions.push('-r 7'); - // set the limit file size in bytes - additionalOptions.push('-fs 300000'); - var pathToDir = path.dirname(filePath); - return new FFMpeg({ source : filePath }) - .addOptions(additionalOptions) - .withSize(options.width + 'x' + options.height) - .on('error', function (err) { - logger.log('error', 'Failed to create video thumbnail: ' + err.message); - return next(null, false); - }) - .on('end', function () { - return next(null, self.getRelativePath(imgThumbPath)); - }) - .saveToFile(imgThumbPath); - } - - // can't do thumb - return next(null, false); + ff.seekInput('00:00:01'); + // setting speed to ~x20 gives a good overview + ff.videoFilters('setpts=0.05*PTS'); + // set output framerate + ff.fps(1.5); + } + else if ('gif' === fileFormat) { + // pixel format for gifs (only needed with ffmpeg older versions eg 1.2) + ff.outputOptions('-pix_fmt rgb24'); + // only want 1 output image + ff.frames(1); + } + // use size from options + ff.size(options.width + 'x' + options.height); + // event handling + ff.on('error', function(err) { + logger.log('error', 'Failed to create ' + fileType + ' thumbnail: ' + err.message); + return next(err, false); + }); + ff.on('end', function() { + return next(null, self.getRelativePath(imgThumbPath)); + }); + + return ff.run(); }; +function isThumbnailTypeSupported(type) { + switch(fileType) { + case 'video': + case 'image': + return true; + break; + default: + return false; + } +} + /** * inspects a file using ffprobe and sets metadata * From c216b853cbba8c9213afec2a2f6f70e437410eac Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Feb 2017 17:02:53 +0000 Subject: [PATCH 005/296] Sort imports --- plugins/filestorage/localfs/index.js | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/plugins/filestorage/localfs/index.js b/plugins/filestorage/localfs/index.js index 8454644dbc..6eb3b2e049 100644 --- a/plugins/filestorage/localfs/index.js +++ b/plugins/filestorage/localfs/index.js @@ -3,18 +3,19 @@ * Local LocalFileStorage module */ -var FileStorage = require('../../../lib/filestorage').FileStorage, - configuration = require('../../../lib/configuration'), - usermanager = require('../../../lib/usermanager'), - util = require('util'), - fs = require('fs'), - path = require('path'), - mkdirp = require('mkdirp'), - async = require('async'), - probe = require('node-ffprobe'), - logger = require('../../../lib/logger'), - ncp = require('ncp').ncp, - FFMpeg = require('fluent-ffmpeg'); +var async = require('async'); +var util = require('util'); +var FFMpeg = require('fluent-ffmpeg'); +var fs = require('fs'); +var mkdirp = require('mkdirp'); +var ncp = require('ncp').ncp; +var path = require('path'); +var probe = require('node-ffprobe'); + +var configuration = require('../../../lib/configuration'); +var FileStorage = require('../../../lib/filestorage').FileStorage; +var logger = require('../../../lib/logger'); +var usermanager = require('../../../lib/usermanager'); function LocalFileStorage() { this.dataRoot = path.join(configuration.serverRoot, configuration.getConfig('dataRoot')); From 21bd21606f46d6d18cfd7fa93e12fbe5e6e89ffe Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Feb 2017 17:08:34 +0000 Subject: [PATCH 006/296] Make var lowercase --- plugins/filestorage/localfs/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/filestorage/localfs/index.js b/plugins/filestorage/localfs/index.js index 6eb3b2e049..98f3676827 100644 --- a/plugins/filestorage/localfs/index.js +++ b/plugins/filestorage/localfs/index.js @@ -5,7 +5,7 @@ var async = require('async'); var util = require('util'); -var FFMpeg = require('fluent-ffmpeg'); +var ffmpeg = require('fluent-ffmpeg'); var fs = require('fs'); var mkdirp = require('mkdirp'); var ncp = require('ncp').ncp; @@ -367,7 +367,7 @@ LocalFileStorage.prototype.createThumbnail = function (filePath, fileType, optio var thumbExt = ('image' === fileType) ? path.extname(filePath) : '.gif'; var imgThumbPath = path.join(path.dirname(filePath), path.basename(filePath)) + '_thumb' + thumbExt; - var ff = new FFMpeg({ source: filePath }).output(imgThumbPath); + var ff = new ffmpeg({ source: filePath }).output(imgThumbPath); if ('video' === fileType) { // pixel format for gifs (only needed with ffmpeg older versions eg 1.2) From 6a13ec4601500e540aba4670051c2d6c7460f3cc Mon Sep 17 00:00:00 2001 From: nicola Date: Tue, 28 Feb 2017 13:14:02 +0000 Subject: [PATCH 007/296] Fixes to tests --- plugins/auth/local/index.js | 5 +++-- test/lib.auth.js | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/auth/local/index.js b/plugins/auth/local/index.js index 6a82505c31..517e6c29ca 100644 --- a/plugins/auth/local/index.js +++ b/plugins/auth/local/index.js @@ -175,10 +175,11 @@ LocalAuth.prototype.disavow = function (req, res, next) { }; LocalAuth.prototype.registerUser = function (req, res, next) { - // presently, all we need is email and password + // presently, all we need is email, password and retyped password var user = { email: req.body.email, - password: req.body.password + password: req.body.password, + retypePassword: req.body.retypePassword }; this.internalRegisterUser(user, function (error, user) { diff --git a/test/lib.auth.js b/test/lib.auth.js index ca6be90c96..c539d20fc9 100644 --- a/test/lib.auth.js +++ b/test/lib.auth.js @@ -8,6 +8,7 @@ describe('auth', function() { var app = origin(); var helper = { passwordPlain: 'this is my password', + passwordRetypePlain: 'this is my password', passwordCipher: '', email: 'auth@foo.bar', userId: '', @@ -76,7 +77,8 @@ describe('auth', function() { .set('Accept', 'application/json') .send({ 'email': helper.email, - 'password': helper.passwordPlain + 'password': helper.passwordPlain, + 'retypePassword': helper.passwordRetypePlain }) .expect(200) .expect('Content-Type', /json/) From 2ced960ec82091fb1b724bb06598e40a3c0e7df6 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 13 Mar 2017 10:03:33 +0000 Subject: [PATCH 008/296] Fix (some) whitespace (#1545) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix whitespace * Remove AdaptBuilder references * Fix whitespace * Fix origin whitepace * Fix router whitespace * Fix originView whitespace * Fix helpers whitespace Some minor refactoring * Fix bowermanager whitespace * Fix helpers whitespace * Fix auth whitespace * Fix sidebarFieldsetFilterView whitespace * Fix scaffoldTextArea whitespace * Fix sharedProjectView whitespace * Fix projectModel whitespace * Fix navigationView whitespace * Fix modal whitespace * Fix location whitespace * Fix editorPage whitespace * Fix editorComponentModel whitespace * Fix editorBlockModel whitespace * Fix editorArticleModel whitespace * Fix editorMenuSettingsEditSidebar whitespace * Fix editorMenuLayerView whitespace * Fix editorModel whitespace * Fix dashboardSidebarView whitespace Also some minor refactoring, including removing redundant code from updateUI. * Fix dashboardSidebar whitespace * Fix dashboard whitespace * Fix assetModel whitespace * Fix localfs whitespace * Fix menu whitespace * Fix extension whitespace * Fix stray tab * Fix missing whitespace from feedback * Switch “ for ‘ * Replace " * Add space * Add spaces --- frontend/src/core/app/origin.js | 29 +- frontend/src/core/app/router.js | 28 +- frontend/src/core/app/views/originView.js | 43 +-- .../core/assetManagement/models/assetModel.js | 8 +- frontend/src/core/dashboard/dashboard.js | 37 +- .../dashboard/templates/dashboardSidebar.hbs | 64 ++-- .../dashboard/views/dashboardSidebarView.js | 328 ++++++++---------- .../core/editor/global/models/editorModel.js | 229 ++++++------ .../editor/menu/views/editorMenuLayerView.js | 71 +--- .../editorMenuSettingsEditSidebar.hbs | 9 +- .../editor/page/models/editorArticleModel.js | 22 +- .../editor/page/models/editorBlockModel.js | 61 ++-- .../page/models/editorComponentModel.js | 47 ++- .../core/editor/page/templates/editorPage.hbs | 39 +-- frontend/src/core/location/location.js | 14 +- frontend/src/core/modal/modal.js | 5 +- .../core/navigation/views/navigationView.js | 7 +- .../src/core/project/models/projectModel.js | 16 +- .../core/project/views/sharedProjectView.js | 31 +- .../scaffold/views/scaffoldTextAreaView.js | 51 ++- .../views/sidebarFieldsetFilterView.js | 3 - lib/auth.js | 69 ++-- lib/bowermanager.js | 104 +++--- lib/helpers.js | 81 ++--- lib/outputmanager.js | 16 +- plugins/auth/local/index.js | 64 ++-- plugins/content/extension/index.js | 141 ++++---- plugins/content/menu/index.js | 48 +-- plugins/filestorage/localfs/index.js | 49 +-- 29 files changed, 776 insertions(+), 938 deletions(-) diff --git a/frontend/src/core/app/origin.js b/frontend/src/core/app/origin.js index db5e588cff..48d00c9300 100644 --- a/frontend/src/core/app/origin.js +++ b/frontend/src/core/app/origin.js @@ -1,19 +1,23 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var _ = require('underscore'); var Backbone = require('backbone'); - var Origin = {}; + var Origin = { + location: {}, + editor: { + data: {} + } + }; + + var pluginTaps = []; _.extend(Origin, Backbone.Events); Origin.initialize = _.once(function() { - Origin.tap('initialize', function() { initialize(); }); - }); function initialize() { @@ -30,34 +34,22 @@ define(function(require){ if (currentLocationPluginsLength === 0) { callback(); } else { - var count = 0; - // Goes through each plugin registered using Origin.registerPluginTap + // Goes through each plugin registered using Origin.registerPluginTap // and that have the same location function callPlugin() { currentLocationPlugins[count].pluginMethod.call(null, function() { - count ++; - if (count === currentLocationPluginsLength) { + if (++count === currentLocationPluginsLength) { callback(); } else { callPlugin(); } }); } - callPlugin(); - } } - Origin.editor = {}; - - Origin.editor.data = {}; - - Origin.location = {}; - - var pluginTaps = []; - // Register a plugin to tap into a certain location before the location loads Origin.registerPluginTap = function(location, pluginMethod) { var pluginTap = { @@ -85,5 +77,4 @@ define(function(require){ }); return Origin; - }); diff --git a/frontend/src/core/app/router.js b/frontend/src/core/app/router.js index 44a758cfa3..281259af99 100644 --- a/frontend/src/core/app/router.js +++ b/frontend/src/core/app/router.js @@ -1,16 +1,14 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var PermissionsView = require('coreJS/app/views/permissionsView'); var Router = Backbone.Router.extend({ - routes: { - "" : "handleIndex", - "_=_" : "handleIndex", - ":module(/*route1)(/*route2)(/*route3)(/*route4)" : "handleRoute" + '': 'handleIndex', + '_=_': 'handleIndex', + ':module(/*route1)(/*route2)(/*route3)(/*route4)': 'handleRoute' }, initialize: function() { @@ -28,11 +26,10 @@ define(function(require) { }, redirectToLogin: function() { - this.navigate('#/user/login', {trigger: true}); + this.navigate('#/user/login', { trigger: true }); }, createView: function(View, viewOptions, settings) { - var viewOptions = (viewOptions || {}); var settings = (settings || {}); var currentView; @@ -46,17 +43,15 @@ define(function(require) { return this.redirectToLogin(); } } - $('.app-inner').append(currentView.$el); - }, handleIndex: function() { // Show loading on any route this.showLoading(); - // console.log('in handleIndex'); + if (this.isUserAuthenticated()) { - this.navigate('#/dashboard', {trigger: true}); + this.navigate('#/dashboard', { trigger: true }); } else { return this.redirectToLogin(); } @@ -65,11 +60,9 @@ define(function(require) { // Persist any dashboard routing for 'Back to courses' link evaluateDashboardRoute: function() { if (Origin.location && Origin.location.module == 'dashboard') { - var suffix = Origin.location.route1 ? '/' + Origin.location.route1 : ''; - Origin.dashboardRoute = '/#/dashboard' + suffix; } }, @@ -79,14 +72,12 @@ define(function(require) { this.showLoading(); // Remove views this.removeViews(); - // Check this user has permissions if (!Origin.permissions.checkRoute(Backbone.history.fragment)) { Origin.trigger('sidebar:sidebarContainer:hide'); Origin.trigger('location:title:hide'); return $('.app-inner').append(new PermissionsView().$el); } - // Verify the user is authenticated if (!this.isUserAuthenticated() && (module !== 'user' && route1 !== 'login')) { Origin.Notify.alert({ @@ -97,17 +88,14 @@ define(function(require) { } var routeArguments = arguments; - // Set previous location object Origin.previousLocation = Origin.location; this.evaluateDashboardRoute(); - // Set location object Origin.location = {}; _.each(this.locationKeys, function(locationKey, index) { Origin.location[locationKey] = routeArguments[index]; }); - // Trigger location change Origin.trigger('location:change', Origin.location); @@ -116,7 +104,6 @@ define(function(require) { locationClass += ' location-' + Origin.location.route1 } $('body').removeClass().addClass(locationClass); - // Trigger router event Origin.trigger('router:' + module, route1, route2, route3, route4); }, @@ -139,11 +126,8 @@ define(function(require) { _.delay(_.bind(function() { this.$loading.addClass('display-none').removeClass('cover-top-bar'); }, this), 300); - } - }); return Router; - }); diff --git a/frontend/src/core/app/views/originView.js b/frontend/src/core/app/views/originView.js index 89934e9fce..7ea9b49be8 100644 --- a/frontend/src/core/app/views/originView.js +++ b/frontend/src/core/app/views/originView.js @@ -1,16 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -/* -* BuilderView - base class for all views -* License - http://github.com/adaptlearning/adapt_authoring/LICENSE -* Maintainers - Brian Quinn -*/ define(function(require){ - var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var OriginView = Backbone.View.extend({ - settings: { autoRender: true, preferencesKey: '' @@ -27,7 +20,9 @@ define(function(require){ this.listenTo(Origin, 'remove:views', this.remove); }, - preRender: function() {}, + preRender: function() { + + }, render: function() { var data = this.model ? this.model.toJSON() : null; @@ -43,9 +38,13 @@ define(function(require){ return this; }, - postRender: function() {}, + postRender: function() { - onReady: function() {}, + }, + + onReady: function() { + + }, setViewToReady: function() { Origin.trigger('router:hideLoading'); @@ -53,13 +52,11 @@ define(function(require){ setUserPreference: function(key, value) { if (this.settings.preferencesKey && typeof(Storage) !== "undefined") { - // Get preferences for this view var preferences = (Origin.sessionModel.get(this.settings.preferencesKey) || {}); - // Set key and value + // persist data preferences[key] = value; - // Store in localStorage Origin.sessionModel.set(this.settings.preferencesKey, preferences); - + } }, @@ -83,34 +80,24 @@ define(function(require){ }, remove: function() { - - - // If a view has a form - remove it when removing parent view if (this.form) { - // remove ckeditor instances this.form.$( "textarea" ).each(function () { var editor = CKEDITOR.instances[this.id]; try { // check editor is still in the dom (otherwise throws exception) - if (editor && editor.window.getFrame()){ + if (editor && editor.window.getFrame()) { editor.destroy(true); - } + } } catch (e) { + // do nothing } }); - this.form.remove(); - } - // Call original remove + } Backbone.View.prototype.remove.apply(this, arguments); - - - } - }); return OriginView; - }); diff --git a/frontend/src/core/assetManagement/models/assetModel.js b/frontend/src/core/assetManagement/models/assetModel.js index e1bed1ab73..2e668be6ac 100644 --- a/frontend/src/core/assetManagement/models/assetModel.js +++ b/frontend/src/core/assetManagement/models/assetModel.js @@ -1,17 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); var AssetModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/asset' - }); return AssetModel; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/dashboard/dashboard.js b/frontend/src/core/dashboard/dashboard.js index b0877bb6a6..7be1ac3a5e 100644 --- a/frontend/src/core/dashboard/dashboard.js +++ b/frontend/src/core/dashboard/dashboard.js @@ -1,6 +1,5 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var DashboardView = require('coreJS/dashboard/views/dashboardView'); var DashboardSidebarView = require('coreJS/dashboard/views/dashboardSidebarView'); @@ -11,7 +10,6 @@ define(function(require) { Origin.on('router:dashboard', function(location, subLocation, action) { Origin.tap('dashboard', function() { - Origin.editor = {}; Origin.editor.data = {}; @@ -23,7 +21,8 @@ define(function(require) { callbackEvent: 'dashboard:layout:grid', value: 'grid', group: 'layout', - }, { + }, + { title: window.polyglot.t('app.list'), icon: 'list', callbackEvent: 'dashboard:layout:list', @@ -36,13 +35,15 @@ define(function(require) { callbackEvent: 'dashboard:sort:asc', value: 'asc', group: 'sort' - }, { + }, + { title: window.polyglot.t('app.descending'), icon: 'sort-alpha-desc', callbackEvent: 'dashboard:sort:desc', value: 'desc', group: 'sort' - }, { + }, + { title: window.polyglot.t('app.recent'), icon: 'edit', callbackEvent: 'dashboard:sort:updated', @@ -55,7 +56,7 @@ define(function(require) { tagsCollection.fetch({ success: function() { - Origin.sidebar.addView(new DashboardSidebarView({collection:tagsCollection}).$el); + Origin.sidebar.addView(new DashboardSidebarView({ collection: tagsCollection }).$el); var dashboardType = location || 'all'; Origin.trigger('dashboard:loaded', { type: dashboardType }); }, @@ -63,11 +64,8 @@ define(function(require) { console.log('Error occured getting the tags collection - try refreshing your page'); } }); - }); - }); - Origin.on('dashboard:loaded', function (options) { switch (options.type) { case 'shared': @@ -83,21 +81,16 @@ define(function(require) { }); Origin.on('globalMenu:dashboard:open', function() { - - Origin.router.navigate('#/dashboard', {trigger: true}); - + Origin.router.navigate('#/dashboard', { trigger: true }); }); - var globalMenuObject = { - "location": "global", - "text": "Dashboard", - "icon": "fa-home", - "callbackEvent": "dashboard:open", - "sortOrder": 1 - }; - Origin.on('app:dataReady login:changed', function() { - Origin.globalMenu.addItem(globalMenuObject); + Origin.globalMenu.addItem({ + "location": "global", + "text": window.polyglot.t('app.dashboard'), + "icon": "fa-home", + "callbackEvent": "dashboard:open", + "sortOrder": 1 + }); }); - }); diff --git a/frontend/src/core/dashboard/templates/dashboardSidebar.hbs b/frontend/src/core/dashboard/templates/dashboardSidebar.hbs index 1ae122dba6..66ee12139f 100644 --- a/frontend/src/core/dashboard/templates/dashboardSidebar.hbs +++ b/frontend/src/core/dashboard/templates/dashboardSidebar.hbs @@ -1,54 +1,40 @@
-{{!--
-

- {{t 'app.dashboard'}} -

-
--}} -
+
- + -
+
- +
- +
-{{!--
-

- {{t 'app.search'}} -

-
--}}
-
-
- - -
+
+
+ +
+
- +
diff --git a/frontend/src/core/dashboard/views/dashboardSidebarView.js b/frontend/src/core/dashboard/views/dashboardSidebarView.js index c4a3f2fd9c..46aa2f0411 100644 --- a/frontend/src/core/dashboard/views/dashboardSidebarView.js +++ b/frontend/src/core/dashboard/views/dashboardSidebarView.js @@ -1,179 +1,157 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - - var DashboardSidebarView = SidebarItemView.extend({ - settings: { - autoRender: true - }, - - events: { - 'click .dashboard-sidebar-add-course' : 'addCourse', - 'click .dashboard-sidebar-my-courses' : 'gotoMyCourses', - 'click .dashboard-sidebar-shared-courses' : 'gotoSharedCourses', - 'keyup .dashboard-sidebar-filter-search-input':'filterProjectsByTitle', - 'click .sidebar-filter-clear': 'clearFilterInput', - 'click .dashboard-sidebar-tag': 'onFilterButtonClicked', - 'click .dashboard-sidebar-add-tag': 'onAddTagClicked', - 'click .dashboard-sidebar-row-filter': 'onFilterRemovedClicked' - }, - - postRender: function() { - this.listenTo(Origin, 'sidebarFilter:filterByTags', this.filterProjectsByTags); - this.listenTo(Origin, 'sidebarFilter:addTagToSidebar', this.addTagToSidebar); - this.listenTo(Origin, 'sidebar:update:ui', this.updateUI); - this.tags = []; - this.usedTags = []; - }, - - highlightSearchBox: function(){ - this.$('.dashboard-sidebar-filter-search-input').removeClass('search-highlight') - if (this.$('.dashboard-sidebar-filter-search-input').val()) { - this.$('.dashboard-sidebar-filter-search-input').addClass('search-highlight') - } - }, - - updateUI: function(userPreferences) { - if (userPreferences.search) { - this.$('.dashboard-sidebar-filter-search-input').val(userPreferences.search); - } - this.highlightSearchBox(); - if (userPreferences.tags) { - this.tags = userPreferences.tags; - var systemTags = [/*'archive', 'favourites'*/]; - _.each(userPreferences.tags, function(tag) { - // If this tag is part of the systemTags - // select this tag - if (_.contains(systemTags, tag)) { - this.$('.dashboard-sidebar-tag-'+tag.title).addClass('selected'); - } else { - this.addTagToSidebar(tag); - } - }, this); - } - }, - - addCourse: function() { - Origin.router.navigate('#/project/new', {trigger:true}); - }, - - gotoMyCourses: function() { - Origin.router.navigate('#/dashboard', {trigger: true}); - }, - - gotoSharedCourses: function() { - Origin.router.navigate('#/dashboard/shared', {trigger: true}); - }, - - filterProjectsByTitle: function(event, filter) { - if (event) { - event.preventDefault(); - } - var filterText = $(event.currentTarget).val().trim(); - Origin.trigger('dashboard:dashboardSidebarView:filterBySearch', filterText); - - this.highlightSearchBox(); - }, - - clearFilterInput: function(event) { - event.preventDefault(); - var $currentTarget = $(event.currentTarget); - $currentTarget.prev('.dashboard-sidebar-filter-input').val('').trigger('keyup', [true]); - this.highlightSearchBox(); - }, - - onFilterButtonClicked: function(event) { - $currentTarget = $(event.currentTarget); - var filterType = $currentTarget.attr('data-tag'); - - // If this filter is already selected - remove filter - // else add the filter - if ($currentTarget.hasClass('selected')) { - $currentTarget.removeClass('selected'); - Origin.trigger('dashboard:sidebarFilter:remove', filterType); - } else { - $currentTarget.addClass('selected'); - Origin.trigger('dashboard:sidebarFilter:add', filterType); - } - - }, - - onAddTagClicked: function(event) { - event.preventDefault(); - var availableTags = []; - // Go through each tag in the collection and filter out duplicate tags - // to create an array of unique project tags - - this.collection.each(function(tag) { - var availableTagsTitles = _.pluck(availableTags, 'title'); - var usedTagTitles = _.pluck(this.usedTags, 'title'); - if (!_.contains(availableTagsTitles, tag.get('title')) && !_.contains(usedTagTitles, tag.get('title'))) { - availableTags.push(tag.attributes); - } - - }, this); - - Origin.trigger('sidebar:sidebarFilter:add', { - title:'Filter by Tags', - items: availableTags - }); - }, - - onTagClicked: function(event) { - var tag = $(event.currentTarget).toggleClass('selected').attr('data-tag'); - this.filterProjectsByTags(tag); - }, - - filterProjectsByTags: function(tag) { - - // Check if the tag is already being filtered and remove it - if (_.findWhere(this.tags, { id: tag.id } )) { - this.tags = _.reject(this.tags, function(tagItem) { - return tagItem.id === tag.id; - }); - } else { - // Else add it to array - this.tags.push(tag); - } - - Origin.trigger('dashboard:dashboardSidebarView:filterByTags', this.tags); - }, - - addTagToSidebar: function(tag) { - this.usedTags.push(tag); - - var template = Handlebars.templates['sidebarRowFilter']; - var data = { - rowClasses: 'sidebar-row-filter', - buttonClasses:'dashboard-sidebar-row-filter', - tag: tag - }; - - this.$('.dashboard-sidebar-add-tag').parent().after(template(data)); - }, - - onFilterRemovedClicked: function(event) { - var tag = { - title: $(event.currentTarget).attr('data-title'), - id: $(event.currentTarget).attr('data-id') - } - - // Remove this tag from the usedTags - this.usedTags = _.reject(this.usedTags, function(item) { - return item.id === tag.id; - }); - - this.filterProjectsByTags(tag); - - $(event.currentTarget).parent().remove(); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + + var DashboardSidebarView = SidebarItemView.extend({ + settings: { + autoRender: true + }, + + events: { + 'click .dashboard-sidebar-add-course': 'addCourse', + 'click .dashboard-sidebar-my-courses': 'gotoMyCourses', + 'click .dashboard-sidebar-shared-courses': 'gotoSharedCourses', + 'click .sidebar-filter-clear': 'clearFilterInput', + 'click .dashboard-sidebar-tag': 'onFilterButtonClicked', + 'click .dashboard-sidebar-add-tag': 'onAddTagClicked', + 'click .dashboard-sidebar-row-filter': 'onFilterRemovedClicked', + 'keyup .dashboard-sidebar-filter-search-input': 'filterProjectsByTitle' + }, + + postRender: function() { + this.listenTo(Origin, 'sidebarFilter:filterByTags', this.filterProjectsByTags); + this.listenTo(Origin, 'sidebarFilter:addTagToSidebar', this.addTagToSidebar); + this.listenTo(Origin, 'sidebar:update:ui', this.updateUI); + this.tags = []; + this.usedTags = []; + }, + + highlightSearchBox: function(){ + this.$('.dashboard-sidebar-filter-search-input').removeClass('search-highlight'); + if (this.$('.dashboard-sidebar-filter-search-input').val()) { + this.$('.dashboard-sidebar-filter-search-input').addClass('search-highlight'); + } + }, + + updateUI: function(userPreferences) { + if (userPreferences.search) { + this.$('.dashboard-sidebar-filter-search-input').val(userPreferences.search); + } + this.highlightSearchBox(); + if (userPreferences.tags) { + this.tags = userPreferences.tags; + _.each(userPreferences.tags, this.addTagToSidebar, this); + } + }, + + addCourse: function() { + Origin.router.navigate('#/project/new', { trigger: true }); + }, + + gotoMyCourses: function() { + Origin.router.navigate('#/dashboard', { trigger: true }); + }, + + gotoSharedCourses: function() { + Origin.router.navigate('#/dashboard/shared', { trigger: true }); + }, + + filterProjectsByTitle: function(event, filter) { + event && event.preventDefault(); + + var filterText = $(event.currentTarget).val().trim(); + Origin.trigger('dashboard:dashboardSidebarView:filterBySearch', filterText); + this.highlightSearchBox(); + }, + + clearFilterInput: function(event) { + event && event.preventDefault(); + + var $currentTarget = $(event.currentTarget); + $currentTarget.prev('.dashboard-sidebar-filter-input').val('').trigger('keyup', [true]); + this.highlightSearchBox(); + }, + + onFilterButtonClicked: function(event) { + event && event.preventDefault(); + // toggle filter + $currentTarget = $(event.currentTarget); + var filterType = $currentTarget.attr('data-tag'); + if ($currentTarget.hasClass('selected')) { + $currentTarget.removeClass('selected'); + Origin.trigger('dashboard:sidebarFilter:remove', filterType); + } else { + $currentTarget.addClass('selected'); + Origin.trigger('dashboard:sidebarFilter:add', filterType); + } + }, + + onAddTagClicked: function(event) { + event && event.preventDefault(); + var availableTags = []; + // create an array of unique project tags + this.collection.each(function(tag) { + var availableTagsTitles = _.pluck(availableTags, 'title'); + var usedTagTitles = _.pluck(this.usedTags, 'title'); + if (!_.contains(availableTagsTitles, tag.get('title')) && !_.contains(usedTagTitles, tag.get('title'))) { + availableTags.push(tag.attributes); } - - }, { - template: 'dashboardSidebar' - }); - - return DashboardSidebarView; - + }, this); + + Origin.trigger('sidebar:sidebarFilter:add', { + title: window.polyglot.t('app.filterbytag'), + items: availableTags + }); + }, + + onTagClicked: function(event) { + var tag = $(event.currentTarget).toggleClass('selected').attr('data-tag'); + this.filterProjectsByTags(tag); + }, + + filterProjectsByTags: function(tag) { + // toggle tag + if (_.findWhere(this.tags, { id: tag.id } )) { + this.tags = _.reject(this.tags, function(tagItem) { + return tagItem.id === tag.id; + }); + } else { + this.tags.push(tag); + } + Origin.trigger('dashboard:dashboardSidebarView:filterByTags', this.tags); + }, + + addTagToSidebar: function(tag) { + this.usedTags.push(tag); + + var template = Handlebars.templates['sidebarRowFilter']; + var data = { + rowClasses: 'sidebar-row-filter', + buttonClasses:'dashboard-sidebar-row-filter', + tag: tag + }; + + this.$('.dashboard-sidebar-add-tag').parent().after(template(data)); + }, + + onFilterRemovedClicked: function(event) { + var tag = { + title: $(event.currentTarget).attr('data-title'), + id: $(event.currentTarget).attr('data-id') + } + // Remove this tag from the usedTags + this.usedTags = _.reject(this.usedTags, function(item) { + return item.id === tag.id; + }); + + this.filterProjectsByTags(tag); + + $(event.currentTarget).parent().remove(); + } + }, { + template: 'dashboardSidebar' + }); + + return DashboardSidebarView; }); diff --git a/frontend/src/core/editor/global/models/editorModel.js b/frontend/src/core/editor/global/models/editorModel.js index 7684c31956..1fa03e6d87 100644 --- a/frontend/src/core/editor/global/models/editorModel.js +++ b/frontend/src/core/editor/global/models/editorModel.js @@ -1,141 +1,116 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); - - var EditorModel = Backbone.Model.extend({ - - idAttribute: '_id', - whitelistAttributes: null, - - initialize : function(options) { - this.on('sync', this.loadedData, this); - this.on('change', this.loadedData, this); - this.fetch(); - }, - - loadedData: function() { - if (this._siblings) { - this._type = this._siblings; - } - - Origin.trigger('editorModel:dataLoaded', this._type); - }, - - getChildren: function() { - if (Origin.editor.data[this._children]) { - var children = Origin.editor.data[this._children].where({_parentId:this.get("_id")}); - var childrenCollection = new Backbone.Collection(children); - - return childrenCollection; - } else { - return null; - } - }, - - getParent: function() { - var currentType = this.get('_type'); - var parent; - var currentParentId = this.get('_parentId'); - - if (currentType === 'menu' || currentType === 'page') { - if (currentParentId === Origin.editor.data.course.get('_id')) { - parent = Origin.editor.data.course; - } else { - parent = Origin.editor.data.contentObjects.findWhere({_id: currentParentId}); - } - } else if (currentType != 'course'){ - parent = Origin.editor.data[this._parent].findWhere({_id: currentParentId}); - } - - return parent; - - }, - - getSiblings: function(returnMyself) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + + var EditorModel = Backbone.Model.extend({ + idAttribute: '_id', + whitelistAttributes: null, + + initialize: function(options) { + this.on('sync', this.loadedData, this); + this.on('change', this.loadedData, this); + this.fetch(); + }, + + loadedData: function() { + if (this._siblings) { + this._type = this._siblings; + } + Origin.trigger('editorModel:dataLoaded', this._type, this.get('_id')); + }, + + getChildren: function() { + if (Origin.editor.data[this._children]) { + var children = Origin.editor.data[this._children].where({ _parentId:this.get('_id') }); + var childrenCollection = new Backbone.Collection(children); + return childrenCollection; + } + return null; + }, - if (returnMyself) { - var siblings = Origin.editor.data[this._siblings].where({_parentId:this.get("_parentId")}); - var siblingsCollection = new Backbone.Collection(siblings); + getParent: function() { + var currentType = this.get('_type'); + var parent; + var currentParentId = this.get('_parentId'); - return siblingsCollection; - } else { + if (currentType === 'menu' || currentType === 'page') { + if (currentParentId === Origin.editor.data.course.get('_id')) { + parent = Origin.editor.data.course; + } else { + parent = Origin.editor.data.contentObjects.findWhere({ _id: currentParentId }); + } + } else if (currentType != 'course'){ + parent = Origin.editor.data[this._parent].findWhere({ _id: currentParentId }); + } - var siblings = _.reject(Origin.editor.data[this._siblings].where({ - _parentId:this.get("_parentId") - }), _.bind(function(model){ - return model.get('_id') == this.get('_id'); - }, this)); - var siblingsCollection = new Backbone.Collection(siblings); + return parent; + }, - - // returns a collection of siblings - return siblingsCollection; + getSiblings: function(returnMyself) { + if (returnMyself) { + var siblings = Origin.editor.data[this._siblings].where({ _parentId: this.get('_parentId') }); + return new Backbone.Collection(siblings); + } + var siblings = _.reject(Origin.editor.data[this._siblings].where({ + _parentId: this.get('_parentId') + }), _.bind(function(model){ + return model.get('_id') == this.get('_id'); + }, this)); + + return new Backbone.Collection(siblings); + }, + + setOnChildren: function(key, value, options) { + var args = arguments; + + if(!this._children) return; + + this.getChildren().each(function(child){ + child.setOnChildren.apply(child, args); + }); + }, + + getPossibleAncestors: function() { + var map = { + 'contentObjects': { 'ancestorType': 'page' }, + 'articles': { 'ancestorType': 'article' }, + 'blocks': { 'ancestorType': 'block' } + }; + ancestors = Origin.editor.data[this._parent].where({ _type: map[this._parent].ancestorType }); + return new Backbone.Collection(ancestors); + }, + + serialize: function() { + return JSON.stringify(this); + }, + + // Remove any attributes which are not on the whitelist (called before a save) + pruneAttributes: function() { + var self = this; + // Ensure that only valid attributes are pushed back on the save + if (self.whitelistAttributes) { + _.each(_.keys(self.attributes), function(key) { + if (!_.contains(self.whitelistAttributes, key)) { + self.unset(key); } - }, - - setOnChildren: function(key, value, options) { - var args = arguments; - - if(!this._children) return; - - this.getChildren().each(function(child){ - child.setOnChildren.apply(child, args); }); - }, - - getPossibleAncestors: function() { - var map = { - 'contentObjects': { - 'ancestorType': 'page' - }, - 'articles' : { - 'ancestorType' : 'article' - }, - 'blocks' : { - 'ancestorType' : 'block' - } - }; - ancestors = Origin.editor.data[this._parent].where({_type: map[this._parent].ancestorType}); - - var ancestorsCollection = new Backbone.Collection(ancestors); - - return ancestorsCollection; - }, - - serialize: function() { - return JSON.stringify(this); - }, - - // Remove any attributes which are not on the whitelist - // Useful to call before a save() - pruneAttributes: function() { - var self = this; - // Ensure that only valid attributes are pushed back on the save - if (self.whitelistAttributes) { - _.each(_.keys(self.attributes), function(key) { - if (!_.contains(self.whitelistAttributes, key)) { - self.unset(key); - } - }); - } - }, - - serializeChildren: function() { - var children = this.getChildren(); - var serializedJson = ''; + } + }, - if (children) { - _.each(children.models, function(child) { - serializedJson += child.serialize(); - }); - } + serializeChildren: function() { + var children = this.getChildren(); + var serializedJson = ''; - return serializedJson; + if (children) { + _.each(children.models, function(child) { + serializedJson += child.serialize(); + }); } - - }); - return EditorModel; + return serializedJson; + } + }); + return EditorModel; }); diff --git a/frontend/src/core/editor/menu/views/editorMenuLayerView.js b/frontend/src/core/editor/menu/views/editorMenuLayerView.js index 394c2431c9..06962a8043 100644 --- a/frontend/src/core/editor/menu/views/editorMenuLayerView.js +++ b/frontend/src/core/editor/menu/views/editorMenuLayerView.js @@ -1,34 +1,31 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('coreJS/app/origin'); + var Origin = require('coreJS/app/origin'); + var EditorArticleModel = require('editorPage/models/editorArticleModel'); + var EditorBlockModel = require('editorPage/models/editorBlockModel'); + var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); + var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); var EditorMenuLayerView = EditorOriginView.extend({ - className: 'editor-menu-layer', events: { - 'click button.editor-menu-layer-add-page' : 'addPage', - 'click button.editor-menu-layer-add-menu' : 'addMenu', - 'click .editor-menu-layer-paste' : 'pasteMenuItem', - 'click .editor-menu-layer-paste-cancel' : 'cancelPasteMenuItem' + 'click button.editor-menu-layer-add-page': 'addPage', + 'click button.editor-menu-layer-add-menu': 'addMenu', + 'click .editor-menu-layer-paste': 'pasteMenuItem', + 'click .editor-menu-layer-paste-cancel': 'cancelPasteMenuItem' }, preRender: function(options) { if (options._parentId) { this._parentId = options._parentId; } - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); this.listenTo(Origin, 'editorMenuView:removeMenuViews', this.remove); }, - postRender: function() { + postRender: function() { if (this._parentId) { // Append the parentId value to the container to allow us to move pages, etc. this.$el.attr('data-parentId', this._parentId); @@ -40,10 +37,7 @@ define(function(require) { var data = this.data ? this.data : false; var template = Handlebars.templates[this.constructor.template]; this.$el.html(template(data)); - _.defer(_.bind(function() { - this.postRender(); - }, this)); - + _.defer(_.bind(this.postRender, this)); return this; }, @@ -77,33 +71,21 @@ define(function(require) { displayTitle: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), body: '', linkText: window.polyglot.t('app.view'), - graphic: { - alt: '', - src: '' - }, + graphic: { alt: '', src: '' }, _type: type }); - // Instantly add the view for UI purposes var newMenuItemView = this.addMenuItemView(newMenuItemModel); - // Save the model newMenuItemModel.save(null, { error: function(error) { - // If there's an error show the menu item fading out - // and show an unobtrusive pop notification - var timeOut = 3000; + // If there's an error show the menu item fading out and alert newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errormenueditorbody'), }); - - _.delay(function() { - newMenuItemView.remove(); - }, timeOut); - + _.delay(newMenuItemView.remove, 3000); }, success: _.bind(function(model) { Origin.editor.data.contentObjects.add(model); @@ -116,19 +98,15 @@ define(function(require) { } else { newMenuItemView.$el.removeClass('syncing').addClass('synced'); } - this.setHeight(); - }, this) }); }, addNewPageArticleAndBlock: function(model, newMenuItemView) { - var typeToAdd; var newChildModel; var newChildTitle; - this.pageModel; this.pageView; @@ -152,17 +130,12 @@ define(function(require) { _courseId: Origin.editor.data.course.get('_id') }, { error: function() { - var timeOut = 3000; newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errormenueditorbody'), }); - - _.delay(function() { - newMenuItemView.remove(); - }, timeOut); + _.delay(newMenuItemView.remove, 3000); }, success: _.bind(function(model, response, options) { // Add this new element to the collect @@ -173,15 +146,12 @@ define(function(require) { } else { newMenuItemView.$el.removeClass('syncing').addClass('synced'); } - }, this) }); }, addMenuItemView: function(model) { - var newMenuItemView = new EditorMenuItemView({ - model: model - }); + var newMenuItemView = new EditorMenuItemView({ model: model }); this.$('.editor-menu-layer-inner').append(newMenuItemView.$el.addClass('syncing')); return newMenuItemView; }, @@ -189,9 +159,6 @@ define(function(require) { pasteMenuItem: function(event) { event.preventDefault(); Origin.trigger('editorView:paste', this._parentId, this.$('.editor-menu-item').length + 1); - /*_.delay(_.bind(function() { - Origin.trigger('editorView:menuView:updateSelectedItem', this); - }, this), 2000)*/ }, cancelPasteMenuItem: function(event) { @@ -204,11 +171,9 @@ define(function(require) { }); Origin.trigger('editorView:pasteCancel', target); } - - }, { - template: 'editorMenuLayer' + }, { + template: 'editorMenuLayer' }); return EditorMenuLayerView; - }); diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs index af1526460f..deb5d662c1 100644 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs +++ b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs @@ -1,12 +1,7 @@
-{{!--
-

- {{t 'app.menupicker'}} -

-
--}} -
\ No newline at end of file +
diff --git a/frontend/src/core/editor/page/models/editorArticleModel.js b/frontend/src/core/editor/page/models/editorArticleModel.js index 50af86edd0..dafb5820fc 100644 --- a/frontend/src/core/editor/page/models/editorArticleModel.js +++ b/frontend/src/core/editor/page/models/editorArticleModel.js @@ -1,17 +1,17 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var EditorModel = require('editorGlobal/models/editorModel'); - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorArticleModel = EditorModel.extend({ + urlRoot: '/api/content/article', + _parent: 'contentObjects', + _siblings: 'articles', + _children: 'blocks', - var EditorArticleModel = EditorModel.extend({ - - urlRoot: '/api/content/article', - initialize: function() {}, - _parent:'contentObjects', - _siblings:'articles', - _children: 'blocks' - }); - - return EditorArticleModel; + initialize: function(options) { + // TODO intentional override? + } + }); + return EditorArticleModel; }); diff --git a/frontend/src/core/editor/page/models/editorBlockModel.js b/frontend/src/core/editor/page/models/editorBlockModel.js index e1fe810825..f34d7edaf2 100644 --- a/frontend/src/core/editor/page/models/editorBlockModel.js +++ b/frontend/src/core/editor/page/models/editorBlockModel.js @@ -1,29 +1,38 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorBlockModel = EditorModel.extend({ - - urlRoot: '/api/content/block', - - initialize: function() {}, - - _parent: 'articles', - _siblings:'blocks', - _children: 'components', - - // Block specific properties - layoutOptions: null, - dragLayoutOptions: null, - - // These are the only attributes which should be permitted on a save - whitelistAttributes: ['_id', '_courseId', '_parentId', '_layoutOptions', - '_type', '_sortOrder', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', '_extensions'] - - }); - - return EditorBlockModel; - + var EditorModel = require('editorGlobal/models/editorModel'); + + var EditorBlockModel = EditorModel.extend({ + urlRoot: '/api/content/block', + _parent: 'articles', + _siblings: 'blocks', + _children: 'components', + // Block specific properties + layoutOptions: null, + dragLayoutOptions: null, + // These are the only attributes which should be permitted on a save + // TODO look into this... + whitelistAttributes: [ + '_id', + '_courseId', + '_parentId', + '_layoutOptions', + '_type', + '_sortOrder', + '_classes', + '_isOptional', + '_isAvailable', + 'body', + 'displayTitle', + 'title', + '_extensions', + 'themeSettings' + ], + + initialize: function() { + // TODO interntional override? + } + }); + + return EditorBlockModel; }); diff --git a/frontend/src/core/editor/page/models/editorComponentModel.js b/frontend/src/core/editor/page/models/editorComponentModel.js index 940a664dbd..8703b4643e 100644 --- a/frontend/src/core/editor/page/models/editorComponentModel.js +++ b/frontend/src/core/editor/page/models/editorComponentModel.js @@ -1,21 +1,38 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var EditorModel = require('editorGlobal/models/editorModel'); - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorComponentModel = EditorModel.extend({ + urlRoot: '/api/content/component', + _parent: 'blocks', + _siblings: 'components', + _children: false, + // These are the only attributes which should be permitted on a save + // TODO look into this... + whitelistAttributes: [ + '_id', + '_componentType', + '_courseId', + '_layout', + '_parentId', + '_type', + 'properties', + '_component', + '_extensions', + '_classes', + '_isOptional', + '_isAvailable', + 'body', + 'displayTitle', + 'title', + 'version', + 'themeSettings' + ], - var EditorComponentModel = EditorModel.extend({ - urlRoot: '/api/content/component', - initialize: function() {}, - - _parent: 'blocks', - _siblings:'components', - _children: false, - // These are the only attributes which should be permitted on a save - whitelistAttributes: ['_id', '_componentType', '_courseId', '_layout', '_parentId', - '_type', 'properties', '_component', '_extensions', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', 'version'] - }); - - return EditorComponentModel; + initialize: function() { + // TODO intentional override? + } + }); + return EditorComponentModel; }); diff --git a/frontend/src/core/editor/page/templates/editorPage.hbs b/frontend/src/core/editor/page/templates/editorPage.hbs index 2eef01bf9d..76848b65fc 100644 --- a/frontend/src/core/editor/page/templates/editorPage.hbs +++ b/frontend/src/core/editor/page/templates/editorPage.hbs @@ -1,26 +1,21 @@
+
+

+ + + + {{#if displayTitle}} + {{displayTitle}} + {{else}} + {{title}} + {{/if}} +

+
{{body}}
+
-
- -

- - - - {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -

- -
{{{body}}}
- -
- -
- -
- {{t 'app.addarticle'}} -
+
+
+ {{t 'app.addarticle'}} +
diff --git a/frontend/src/core/location/location.js b/frontend/src/core/location/location.js index c2a0ccb4d1..baab0cbaab 100644 --- a/frontend/src/core/location/location.js +++ b/frontend/src/core/location/location.js @@ -1,11 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Origin = require('coreJS/app/origin'); + var LocationTitleView = require('coreJS/location/views/locationTitleView'); - var Origin = require('coreJS/app/origin'); - var LocationTitleView = require('coreJS/location/views/locationTitleView'); - - Origin.once('app:dataReady', function() { - $('.location-title').html(new LocationTitleView().$el); - }); - -}) \ No newline at end of file + Origin.once('app:dataReady', function() { + $('.location-title').html(new LocationTitleView().$el); + }); +}) diff --git a/frontend/src/core/modal/modal.js b/frontend/src/core/modal/modal.js index 5d3fca8961..00e4671255 100644 --- a/frontend/src/core/modal/modal.js +++ b/frontend/src/core/modal/modal.js @@ -1,9 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var ModalView = require('coreJS/modal/views/modalView'); - var ModalModel = require('coreJS/modal/models/modalModel'); Origin.on('modal:open', function(view, options, context) { new ModalView({ @@ -12,5 +10,4 @@ define(function(require) { context: context }); }); - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/navigation/views/navigationView.js b/frontend/src/core/navigation/views/navigationView.js index 59e4d42ced..7e9ee1c9f6 100644 --- a/frontend/src/core/navigation/views/navigationView.js +++ b/frontend/src/core/navigation/views/navigationView.js @@ -1,13 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('coreJS/app/views/originView'); var Origin = require('coreJS/app/origin'); var NavigationView = OriginView.extend({ - tagName: 'nav', - className: 'navigation', initialize: function() { @@ -38,7 +35,7 @@ define(function(require){ $.ajax({ method: 'post', url: '/api/loginas', - data: {email: _revertLogin.email}, + data: { email: _revertLogin.email }, success: function (jqXHR, textStatus, errorThrown) { sessionModel.set('_canRevert', false); sessionModel.set('id', jqXHR.id); @@ -65,11 +62,9 @@ define(function(require){ event.stopPropagation(); Origin.trigger('navigation:' + $(event.currentTarget).attr('data-event')); } - }, { template: 'navigation' }); return NavigationView; - }); diff --git a/frontend/src/core/project/models/projectModel.js b/frontend/src/core/project/models/projectModel.js index 90220eaa22..8abe9a7989 100644 --- a/frontend/src/core/project/models/projectModel.js +++ b/frontend/src/core/project/models/projectModel.js @@ -1,21 +1,16 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); - var Helpers = require('coreJS/app/helpers'); var EditorModel = require('editorGlobal/models/editorModel'); + var Helpers = require('coreJS/app/helpers'); + var Origin = require('coreJS/app/origin'); var ProjectModel = EditorModel.extend({ - idAttribute: '_id', - urlRoot: '/api/content/course', - defaults: { - 'tags': [], - _type: 'course', - customStyle: '' + 'tags': [], + _type: 'course', + customStyle: '' }, initialize : function(options) { @@ -40,5 +35,4 @@ define(function(require) { }); return ProjectModel; - }); diff --git a/frontend/src/core/project/views/sharedProjectView.js b/frontend/src/core/project/views/sharedProjectView.js index 8f97b20cb3..d44f9440c4 100644 --- a/frontend/src/core/project/views/sharedProjectView.js +++ b/frontend/src/core/project/views/sharedProjectView.js @@ -1,21 +1,16 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - - var Backbone = require('backbone'); - var Handlebars = require('handlebars'); var OriginView = require('coreJS/app/views/originView'); var Origin = require('coreJS/app/origin'); var SharedProjectView = OriginView.extend({ - tagName: 'li', - className: 'shared-project-list-item', events: { - 'dblclick' : 'promptDuplicateProject', - 'click' : 'selectProject', - 'click a.open-context-course' : 'openContextMenu' + 'dblclick': 'promptDuplicateProject', + 'click': 'selectProject', + 'click a.open-context-course': 'openContextMenu' }, preRender: function() { @@ -30,28 +25,25 @@ define(function(require){ this.model.set('heroImageURI', this.model.getHeroImageURI()); }, - openContextMenu: function (e) { - e.stopPropagation(); - e.preventDefault(); - + openContextMenu: function(e) { + e && e.stopPropagation() && e.preventDefault(); Origin.trigger('contextMenu:open', this, e); }, - selectProject: function(event) { - event && event.preventDefault(); - + selectProject: function(e) { + e && e.preventDefault(); this.selectItem(); }, selectItem: function() { Origin.trigger('dashboard:projectView:itemSelected'); this.$el.addClass('selected'); - this.model.set({_isSelected:true}); + this.model.set({ _isSelected: true }); }, deselectItem: function() { this.$el.removeClass('selected'); - this.model.set({_isSelected:false}); + this.model.set({ _isSelected: false }); }, preview: function() { @@ -63,7 +55,6 @@ define(function(require){ promptDuplicateProject: function() { var self = this; - Origin.Notify.confirm({ text: window.polyglot.t('app.confirmduplicate'), callback: function(confirmed) { @@ -79,7 +70,7 @@ define(function(require){ url: this.model.getDuplicateURI(), type: 'GET', success: function (data) { - Origin.router.navigate('/editor/' + data.newCourseId + '/settings', {trigger: true}); + Origin.router.navigate('/editor/' + data.newCourseId + '/settings', { trigger: true }); }, error: function() { Origin.Notify.alert({ @@ -89,11 +80,9 @@ define(function(require){ } }); } - }, { template: 'sharedProject' }); return SharedProjectView; - }); diff --git a/frontend/src/core/scaffold/views/scaffoldTextAreaView.js b/frontend/src/core/scaffold/views/scaffoldTextAreaView.js index 758c5c375b..db9db1438a 100644 --- a/frontend/src/core/scaffold/views/scaffoldTextAreaView.js +++ b/frontend/src/core/scaffold/views/scaffoldTextAreaView.js @@ -1,30 +1,25 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Backbone = require('backbone'); - var BackboneForms = require('backboneForms'); - var Origin = require('coreJS/app/origin'); - - var TextAreaBlankView = Backbone.Form.editors.TextArea.extend({ - - render: function() { - // Place value - this.setValue(this.value); - return this; - }, - - getValue: function() { - return this.$el.val(); - } - - }); - - Origin.on('app:dataReady', function() { - // Add Image editor to the list of editors - Origin.scaffold.addCustomField('TextArea:blank', TextAreaBlankView); - }) - - - return TextAreaBlankView; - -}) \ No newline at end of file + var Backbone = require('backbone'); + var BackboneForms = require('backboneForms'); + var Origin = require('coreJS/app/origin'); + + var TextAreaBlankView = Backbone.Form.editors.TextArea.extend({ + render: function() { + // Place value + this.setValue(this.value); + return this; + }, + + getValue: function() { + return this.$el.val(); + } + }); + + Origin.on('app:dataReady', function() { + // Add Image editor to the list of editors + Origin.scaffold.addCustomField('TextArea:blank', TextAreaBlankView); + }); + + return TextAreaBlankView; +}); diff --git a/frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js b/frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js index e770a1e559..b4048366c6 100644 --- a/frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js +++ b/frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js @@ -1,13 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var Backbone = require('backbone'); var SidebarFieldsetFilterView = Backbone.View.extend({ - className: 'sidebar-row', - events: { 'click button': 'onFilterClicked' }, diff --git a/lib/auth.js b/lib/auth.js index b760d67fec..d1e316cc7c 100644 --- a/lib/auth.js +++ b/lib/auth.js @@ -4,21 +4,22 @@ * */ -var path = require('path'), - fs = require('fs'), - async = require('async'), - junk = require('junk'), - util = require('util'), - bcrypt = require('bcrypt-nodejs'), - passport = require('passport'), - database = require('./database'), - configuration = require('./configuration'), - logger = require('./logger'), - rest = require('./rest'), - pluginmanager = require('./pluginmanager'), - permissions = require('./permissions'), - tenantmanager = require('./tenantmanager'), - usermanager = require('./usermanager'); +var async = require('async'); +var bcrypt = require('bcrypt-nodejs'); +var fs = require('fs'); +var junk = require('junk'); +var path = require('path'); +var util = require('util'); +var passport = require('passport'); + +var configuration = require('./configuration'); +var database = require('./database'); +var logger = require('./logger'); +var rest = require('./rest'); +var permissions = require('./permissions'); +var pluginmanager = require('./pluginmanager'); +var tenantmanager = require('./tenantmanager'); +var usermanager = require('./usermanager'); // private hash for memoizing auth plugins var _authPlugins = Object.create(null); @@ -27,8 +28,8 @@ var _otherLoginLinks = []; /* * CONSTANTS */ -var MODNAME = 'authentication', - WAITFOR = 'pluginmanager'; +var MODNAME = 'authentication'; +var WAITFOR = 'pluginmanager'; // custom errors function UserRegistrationError (message) { @@ -63,7 +64,7 @@ AuthPlugin.prototype.authenticate = function (req, res, next) { }; AuthPlugin.prototype.getLoginHtml = function() { - return ''; + return ''; }; AuthPlugin.prototype.disavow = function (req, res, next) { @@ -107,7 +108,7 @@ AuthPlugin.prototype.isTenantEnabled = function (user, cb) { exports = module.exports = { errors: { - 'UserRegistrationError' : UserRegistrationError, + 'UserRegistrationError': UserRegistrationError, 'UserResetPasswordError': UserResetPasswordError, 'UserGenerateTokenError': UserGenerateTokenError }, @@ -179,7 +180,7 @@ exports = module.exports = { * @return {object} preloader - an AdaptBuilder ModulePreloader */ preload: function (app) { - var preloader = new app.ModulePreloader(app, MODNAME, {events:preloadHandle(app,this)}); + var preloader = new app.ModulePreloader(app, MODNAME, { events: preloadHandle(app,this) }); return preloader; }, @@ -209,38 +210,38 @@ exports = module.exports = { if (err) { return cb(err); } - + var loginHtml = _authPlugins[name].getLoginHtml(); - + if (loginHtml.length !== 0) { - _otherLoginLinks.push(loginHtml) + _otherLoginLinks.push(loginHtml) } - return cb(null, _authPlugins[name]); + return cb(null, _authPlugins[name]); }); - + } catch (err) { return cb(err); } }); }, - + /** * reads the auth plugin directory and returns the names * of available plugins - * + * * @return array */ - + getAvailableAuthPluginsSync: function () { return fs.readdirSync(path.join(configuration.serverRoot, 'plugins', 'auth')).filter(junk.not); }, - + loadAuthPlugins: function(next) { // Load all auth plugins here - logger.log('info', 'Supporting the following authentication types:') + logger.log('info', 'Supporting the following authentication types:') var self = this; - + async.eachSeries( self.getAvailableAuthPluginsSync(), function (pluginName, nextPlugin) { @@ -301,7 +302,7 @@ function preloadHandle(app, instance){ // user exists var user = results[0]; } - + // Store the login details req.logIn(user, function(error) { if (error) { @@ -386,7 +387,7 @@ function preloadHandle(app, instance){ res.statusCode = 200; return res.json(result); }); - + }); rest.post('/userpasswordreset/:token', function (req, res, next) { @@ -411,7 +412,7 @@ function preloadHandle(app, instance){ instance.loadAuthPlugins(function() { preloader.emit('preloadChange', MODNAME, app.preloadConstants.COMPLETE); - }); + }); } } }; diff --git a/lib/bowermanager.js b/lib/bowermanager.js index a119e212d1..608a9acb12 100644 --- a/lib/bowermanager.js +++ b/lib/bowermanager.js @@ -1,14 +1,18 @@ -var bower = require('bower'); +var _ = require('underscore'); var async = require('async'); +var bower = require('bower'); +var fs = require('fs-extra'); +var mkdirp = require('mkdirp'); +var ncp = require('ncp').ncp; +var path = require('path'); var rimraf = require('rimraf'); var semver = require('semver'); -var logger = require('./logger'); + +var Constants = require('./outputmanager').Constants; var database = require('./database'); -var ncp = require('ncp').ncp; -var mkdirp = require('mkdirp'); -var fs = require('fs-extra'); -var path = require('path'); -var _ = require('underscore'); +var logger = require('./logger'); +var origin = require('./application')(); + var bowerOptions = require('../plugins/content/bower/defaults.json'); /* @@ -16,9 +20,9 @@ var bowerOptions = require('../plugins/content/bower/defaults.json'); */ var MODNAME = 'bowermanager', WAITFOR = 'contentmanager'; - + var BowerManager = function() { - + } BowerManager.prototype.extractPackageInfo = function(plugin, pkgMeta, schema) { @@ -38,9 +42,9 @@ BowerManager.prototype.extractPackageInfo = function(plugin, pkgMeta, schema) { // The targetAttribute property is optional. if (pkgMeta.targetAttribute) { - info.targetAttribute = pkgMeta.targetAttribute; + info.targetAttribute = pkgMeta.targetAttribute; } - + // The assetFields property is optional too. if (pkgMeta.assetFields) { info.assetFields = pkgMeta.assetFields; @@ -67,41 +71,41 @@ BowerManager.prototype.extractPackageInfo = function(plugin, pkgMeta, schema) { */ BowerManager.prototype.installPlugin = function(pluginName, pluginVersion, callback) { var self = this; - + // Formulate the package name. var packageName = (pluginVersion == '*') ? pluginName : pluginName + '#' + pluginVersion; - + // Interrogate the version.json file on installation as we cannot rely on including it via a 'require' call. fs.readFile(path.join(app.configuration.getConfig('root'), 'version.json'), 'utf8', function(err, version) { - // Ensure the JSON is parsed. + // Ensure the JSON is parsed. version = JSON.parse(version); - + if (err) { logger.log('error', err); return callback(err); } - + // Clear the bower cache for this plugin. rimraf(path.join(bowerOptions.directory, pluginName), function (err) { if (err) { logger.log('error', err); return callback(err); } - + // Query bower to verify that the specified plugin exists. bower.commands.search(pluginName, bowerOptions) .on('error', callback) - .on('end', function (results) { + .on('end', function (results) { if (!results || results.length == 0) { logger.log('warn', 'Plugin ' + packageName + ' not found!'); return callback('Plugin ' + packageName + ' not found!'); } - - // The plugin exists -- remove any fuzzy matches, e.g. adapt-contrib-assessment would + + // The plugin exists -- remove any fuzzy matches, e.g. adapt-contrib-assessment would // also bring in adapt-contrib-assessmentResults, etc. - var bowerPackage = _.findWhere(results, {name: pluginName}); + var bowerPackage = _.findWhere(results, { name: pluginName }); // Install the plugin from bower. bower.commands.install([packageName], { save: true }, bowerOptions) @@ -109,24 +113,24 @@ BowerManager.prototype.installPlugin = function(pluginName, pluginVersion, callb logger.log('error', err); return callback(err); }) - .on('end', function (packageInfo) { + .on('end', function (packageInfo) { // Unfortunately this is required as the only way to identify the type - // of a plugin is to check for the presence of the property which + // of a plugin is to check for the presence of the property which // actually indicates its type. :-/ - var pluginType = packageInfo[pluginName].pkgMeta.hasOwnProperty('component') + var pluginType = packageInfo[pluginName].pkgMeta.hasOwnProperty('component') ? 'component' : packageInfo[pluginName].pkgMeta.hasOwnProperty('extension') ? 'extension' : packageInfo[pluginName].pkgMeta.hasOwnProperty('menu') ? 'menu' - : packageInfo[pluginName].pkgMeta.hasOwnProperty('theme') + : packageInfo[pluginName].pkgMeta.hasOwnProperty('theme') ? 'theme' : '' - + if (pluginType == '') { logger.log('error', 'Unable to identify pluginType for ' + packageName); return callback('Unable to identify pluginType for ' + packageName); } - + app.contentmanager.getContentPlugin(pluginType, function(err, plugin) { if (err) { return callback(err); @@ -141,12 +145,12 @@ BowerManager.prototype.installPlugin = function(pluginName, pluginVersion, callb return callback('Unable to install ' + packageInfo[pluginName].pkgMeta.name + ' as it is not supported in the current version of of the Adapt framework'); } } else { - self.importPackage(plugin, packageInfo[pluginName], bowerOptions, callback); + self.importPackage(plugin, packageInfo[pluginName], bowerOptions, callback); } }); }); }); - }); + }); }); } @@ -215,12 +219,12 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c options = { strict: false }; - } + } var self = this; var pkgMeta = packageInfo.pkgMeta; var schemaPath = path.join(packageInfo.canonicalDir, options._adaptSchemaFile); - + fs.exists(schemaPath, function (exists) { if (!exists) { if (options.strict) { @@ -252,10 +256,10 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c logger.log('error', 'failed to parse schema for ' + pkgMeta.name, e); return callback(null); } - + // Build a path to the destination working folder. var destination = path.join(app.configuration.getConfig('root').toString(), 'temp', app.configuration.getConfig('masterTenantID').toString(), 'adapt_framework', 'src', plugin.bowerConfig.srcLocation, pkgMeta.name); - + // Remove whatever version of the plugin is there already. rimraf(destination, function(err) { if (err) { @@ -268,7 +272,7 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c return logger.log('error', err); } - // Move from the bower cache to the working directory. + // Move from the bower cache to the working directory. ncp(packageInfo.canonicalDir, destination, function (err) { if (err) { // Don't double call callback. @@ -282,60 +286,60 @@ BowerManager.prototype.importPackage = function (plugin, packageInfo, options, c } logger.log('info', 'Successfully copied ' + pkgMeta.name + ' to ' + destination); - + // Build the package information. var package = self.extractPackageInfo(plugin, pkgMeta, schema); var db = app.db; var pluginString = package.name + ' (v' + package.version + ')'; - // Add the package to the collection. + // Add the package to the collection. // Check if a plugin with this name and version already exists. db.retrieve(plugin.getPluginType(), { name: package.name, version: package.version }, function (err, results) { if (err) { logger.log('error', err); return callback(err); } - + if (results && results.length !== 0) { // Don't add a duplicate. if (options.strict) { return callback("Can't add " + pluginString + ": verion already exists"); } - + return callback(null); } - + // Add the new plugin. db.create(plugin.getPluginType(), package, function (err, newPlugin) { - if (err) { + if (err) { logger.log('error', err); - + if (options.strict) { return callback(err); } - + logger.log('error', 'Failed to add package: ' + pluginString, err); return callback(null); } - + logger.log('info', 'Added package: ' + pluginString); - + // Retrieve any older versions of the plugin. db.retrieve(plugin.getPluginType(), { name: package.name, version: { $ne: newPlugin.version } }, function (err, results) { if (err) { // strictness doesn't matter at this point logger.log('error', 'Failed to retrieve previous packages: ' + err.message, err); } - + // Remove older versions of this plugin. - db.destroy(plugin.getPluginType(), { name: package.name, version: { $ne: newPlugin.version } }, function (err) { + db.destroy(plugin.getPluginType(), { name: package.name, version: { $ne: newPlugin.version } }, function (err) { if (err) { logger.log('error', err); return callback(err); } - + logger.log('info', 'Successfully removed versions of ' + package.name + ' (' + plugin.getPluginType() + ') older than ' + newPlugin.version); - + return callback(null, newPlugin); }); // Remove older versions of the plugin. }); // Retrieve older versions of the plugin. @@ -357,8 +361,8 @@ exports = module.exports = { /** * preload function * - * @param {object} app - AdaptBuilder instance - * @return {object} preloader - an AdaptBuilder ModulePreloader + * @param {object} app - Origin instance + * @return {object} preloader - a ModulePreloader */ preload : function (app) { var preloader = new app.ModulePreloader(app, MODNAME, { events: this.preloadHandle(app, new BowerManager()) }); diff --git a/lib/helpers.js b/lib/helpers.js index 10e46c3c13..d1352202fe 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -var rolemanager = require('./rolemanager'); +var configuration = require('./configuration'); var database = require('./database'); var logger = require('./logger'); -var configuration = require('./configuration'); +var rolemanager = require('./rolemanager'); /** * function generates an object from json schema - could not find a lib to do this for me :-\ @@ -14,7 +14,6 @@ function schemaToObject (schema, id, version, location) { if (!this.memo) { this.memo = Object.create(null); } - // check if we have already built this object var identifier = id + '#' + version + '/' + location; if (this.memo[identifier]) { @@ -42,7 +41,6 @@ function schemaToObject (schema, id, version, location) { break; case "object": var nestedProps = prop.properties; - child[key] = nestedProps ? walkObject(nestedProps) : prop.default || {}; break; default: @@ -76,35 +74,31 @@ function grantSuperPermissions (userId, next) { if (!userId) { return next(new Error("Failed to grant super user permissions, invalid userId: " + userId)); } - + var _assignSuperRole = function (userId, cb) { // verify the Super Admin role is installed rolemanager.retrieveRole({ name: "Super Admin" }, function (err, role) { if (err) { return cb(err); } - if (role) { return rolemanager.assignRole(role._id, userId, cb); } - // role does not exist, bah! return cb(new Error('Role not found')); }); }; - + _assignSuperRole(userId, function (err) { if (!err) { // no problem, role was assigned return next(null); } - // otherwise we need to install default roles rolemanager.installDefaultRoles(function (err) { if (err) { return next(err); } - // the second attempt passes control back to the first callback _assignSuperRole(userId, next); }); @@ -118,7 +112,7 @@ function isMasterPreviewAccessible(courseId, userId, next) { return err; } - db.retrieve('course', { _id: courseId }, {jsonOnly: true}, function (err, results) { + db.retrieve('course', { _id: courseId }, { jsonOnly: true }, function (err, results) { if (err) { logger.log('error', err); return next(err); @@ -130,10 +124,10 @@ function isMasterPreviewAccessible(courseId, userId, next) { if (course._isShared || course.createdBy == userId) { // Shared courses on the same tenant are open to users on the same tenant return next(null, true); - } - + } + return next(null, false); - + } else { return next(new Error('Course ' + courseId + ' not found')); } @@ -143,46 +137,43 @@ function isMasterPreviewAccessible(courseId, userId, next) { function hasCoursePermission (action, userId, tenantId, contentItem, next) { // Check that the contentItem has something resembling a courseId - if (contentItem.hasOwnProperty('_id') || contentItem.hasOwnProperty('_courseId')) { - var courseId = contentItem && contentItem._courseId - ? contentItem._courseId.toString() - : contentItem._id.toString(); + if (!contentItem.hasOwnProperty('_id') && !contentItem.hasOwnProperty('_courseId')) { + // Course permission cannot be verified + return next(null, false); + } - database.getDatabase(function(err, db) { + var courseId = contentItem && contentItem._courseId + ? contentItem._courseId.toString() + : contentItem._id.toString(); + + database.getDatabase(function(err, db) { + if (err) { + logger.log('error', err); + return err; + } + + db.retrieve('course', { _id: courseId }, { jsonOnly: true }, function (err, results) { if (err) { logger.log('error', err); - return err; + return next(err); + } + if (!results || results.length !== 1) { + return next(new Error('Course ' + courseId + ' not found')); } - db.retrieve('course', { _id: courseId }, {jsonOnly: true}, function (err, results) { - if (err) { - logger.log('error', err); - return next(err); - } - - if (results && results.length == 1) { - var course = results[0]; + var course = results[0]; - if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) { - // Shared courses on the same tenant are open to users on the same tenant - return next(null, true); - } - - return next(null, false); - - } else { - return next(new Error('Course ' + courseId + ' not found')); - } - }); - }); - } else { - // Course permission cannot be verified - return next(null, false); - } + if ((course._isShared || course.createdBy == userId) && course._tenantId.toString() == tenantId) { + // Shared courses on the same tenant are open to users on the same tenant + return next(null, true); + } + return next(null, false); + }); + }); } /** - * Replaces ALL insstances of the search parameter in a given string with a replacement + * Replaces ALL instances of the search parameter in a given string with a replacement * @param {string} str * @param {string} search * @param {string} replacement diff --git a/lib/outputmanager.js b/lib/outputmanager.js index 75388e986e..c59eb87c8c 100644 --- a/lib/outputmanager.js +++ b/lib/outputmanager.js @@ -112,8 +112,8 @@ OutputPlugin.prototype.getCourseJSON = function(tenantId, courseId, next) { async.each(Object.keys(Constants.CourseCollections), function(collectionType, callback) { // Set the courseId correctly var criteria = collectionType === 'course' - ? {_id: courseId} - : {_courseId: courseId}; + ? { _id: courseId } + : { _courseId: courseId }; if (collectionType == 'config') { @@ -365,9 +365,9 @@ OutputPlugin.prototype.buildFlagExists = function(pathToBuildFlag, next) { logger.log('error', err); } } - + var exists = typeof stats == 'object'; - + return next(null, exists); }); }; @@ -925,11 +925,11 @@ OutputPlugin.prototype.slugify = function(s) { * @return {string} */ OutputPlugin.prototype.escapeQuotes = function(s) { - + if (typeof s !== 'string') { return ''; } - + s = s.replace(/"/g,'\\"'); s = s.replace(/'/g, "\\'"); @@ -1048,8 +1048,8 @@ exports = module.exports = { /** * preload function * - * @param {object} app - AdaptBuilder instance - * @return {object} preloader - an AdaptBuilder ModulePreloader + * @param {object} app - Origin instance + * @return {object} preloader - a ModulePreloader */ preload : function (app) { var preloader = new app.ModulePreloader(app, MODNAME, { events: this.preloadHandle(app, new OutputManager()) }); diff --git a/plugins/auth/local/index.js b/plugins/auth/local/index.js index 4a465ebb51..e9a69e4aba 100644 --- a/plugins/auth/local/index.js +++ b/plugins/auth/local/index.js @@ -48,8 +48,10 @@ LocalAuth.prototype.verifyUser = function (email, password, done) { } if (!user) { - return done(null, false, {message: MESSAGES.INVALID_USERNAME_OR_PASSWORD, - errorCode: ERROR_CODES.INVALID_USERNAME_OR_PASSWORD}); + return done(null, false, { + message: MESSAGES.INVALID_USERNAME_OR_PASSWORD, + errorCode: ERROR_CODES.INVALID_USERNAME_OR_PASSWORD + }); } if (user.failedLoginCount < MAX_LOGIN_ATTEMPTS) { @@ -63,23 +65,25 @@ LocalAuth.prototype.verifyUser = function (email, password, done) { if (!valid) { // Increment the count of failed attempts var failedCount = user.failedLoginCount ? user.failedLoginCount : 0; - + failedCount++; var delta = { failedLoginCount: failedCount }; - usermanager.updateUser({email: user.email}, delta, function(error) { + usermanager.updateUser({ email: user.email }, delta, function(error) { if (error) { return done(error); } - - return done(null, false, {message: MESSAGES.INVALID_USERNAME_OR_PASSWORD, - errorCode: ERROR_CODES.INVALID_USERNAME_OR_PASSWORD}); + + return done(null, false, { + message: MESSAGES.INVALID_USERNAME_OR_PASSWORD, + errorCode: ERROR_CODES.INVALID_USERNAME_OR_PASSWORD + }); }); } else { - usermanager.updateUser({email: user.email}, {failedLoginCount: 0}, function(error) { + usermanager.updateUser({ email: user.email }, { failedLoginCount: 0 }, function(error) { if (error) { return done(error); } @@ -90,7 +94,10 @@ LocalAuth.prototype.verifyUser = function (email, password, done) { }); } else { // Indicate that the account is locked out - return done(null, false, {message: MESSAGES.ACCOUNT_LOCKED, errorCode: ERROR_CODES.ACCOUNT_LOCKED}); + return done(null, false, { + message: MESSAGES.ACCOUNT_LOCKED, + errorCode: ERROR_CODES.ACCOUNT_LOCKED + }); } }); }; @@ -126,20 +133,20 @@ LocalAuth.prototype.authenticate = function (req, res, next) { if (error) { return next(error); } - + usermanager.logAccess(user, function(error) { if (error) { return next(error); } - - + + //Used to get the users permissions permissions.getUserPermissions(user._id, function(error, userPermissions) { if (error) { return next(error); } res.statusCode = 200; - + if (req.body.shouldPersist && req.body.shouldPersist == 'true') { // Session is persisted for 2 weeks if the user has set 'Remember me' req.session.cookie.maxAge = 14 * 24 * 3600000; @@ -148,7 +155,7 @@ LocalAuth.prototype.authenticate = function (req, res, next) { } var userSession = req.session.passport.user; - + return res.json({ success: true, id: user._id, @@ -157,14 +164,12 @@ LocalAuth.prototype.authenticate = function (req, res, next) { tenantName: userSession.tenant.name, permissions: userPermissions }); - }); - }); }); }); } - + })(req, res, next); }; @@ -229,12 +234,12 @@ LocalAuth.prototype.resetPassword = function (req, res, next) { if (error) { logger.log('error', error); res.statusCode = 200; - return res.json({success: false}); + return res.json({ success: false }); // return next(error); } res.statusCode = 200; - return res.json({success: true}); + return res.json({ success: true }); }); }; @@ -250,12 +255,12 @@ LocalAuth.prototype.internalResetPassword = function (user, next) { } // Update user details with hashed password - usermanager.updateUser({_id: user.id}, {password: hash, failedLoginCount: 0}, function(err) { + usermanager.updateUser({ _id: user.id }, { password: hash, failedLoginCount: 0 }, function(err) { if (error) { return next(error) } - usermanager.deleteUserPasswordReset({user: user.id}, function (error, user) { + usermanager.deleteUserPasswordReset({ user: user.id }, function (error, user) { if (error) { return next(error); } @@ -270,13 +275,13 @@ LocalAuth.prototype.internalResetPassword = function (user, next) { LocalAuth.prototype.generateResetToken = function (req, res, next) { var self = this; - usermanager.retrieveUser({email: req.body.email, auth: 'local'}, function (error, userRecord) { + usermanager.retrieveUser({ email: req.body.email, auth: 'local' }, function (error, userRecord) { if (error) { logger.log('error', error); res.statusCode = 400; - return res.json({success: false}); + return res.json({ success: false }); } - + if (userRecord) { var user = { email: req.body.email, @@ -292,9 +297,9 @@ LocalAuth.prototype.generateResetToken = function (req, res, next) { if (!userToken) { return next(new auth.errors.UserGenerateTokenError('In generateResetToken and user object is not set!')); } - + var subject = app.polyglot.t('app.emailforgottenpasswordsubject'); - var body = app.polyglot.t('app.emailforgottenpasswordbody', {rootUrl: configuration.getConfig('rootUrl'), data: userToken.token}); + var body = app.polyglot.t('app.emailforgottenpasswordbody', { rootUrl: configuration.getConfig('rootUrl'), data: userToken.token }); var templateData = { name: 'passwordReset', user: user, @@ -310,14 +315,13 @@ LocalAuth.prototype.generateResetToken = function (req, res, next) { } logger.log('info', 'Password reset for ' + user.email + ' from ' + user.ipAddress); - return res.status(200).json({success: true}); + return res.status(200).json({ success: true }); }); }); } else { - // Indicate that all is ok even if the user does not exist - // This is to prevent hacking attempts + // Return 200 even if user doesn't exist to prevent brute force hacking res.statusCode = 200; - return res.json({success: true}); + return res.json({ success: true }); } }); }; diff --git a/plugins/content/extension/index.js b/plugins/content/extension/index.js index 6066f80e52..d636fe41e3 100644 --- a/plugins/content/extension/index.js +++ b/plugins/content/extension/index.js @@ -3,28 +3,30 @@ * Extension content plugin * */ - -var origin = require('../../../'), - contentmanager = require('../../../lib/contentmanager'), - usermanager = require('../../../lib/usermanager'), - rest = require('../../../lib/rest'), - BowerPlugin = require('../bower'), - ContentPlugin = contentmanager.ContentPlugin, - ContentTypeError = contentmanager.errors.ContentTypeError, - configuration = require('../../../lib/configuration'), - database = require('../../../lib/database'), - helpers = require('../../../lib/helpers'), - logger = require('../../../lib/logger'), - defaultOptions = require('./defaults.json'), - bower = require('bower'), - rimraf = require('rimraf'), - async = require('async'), - fs = require('fs'), - ncp = require('ncp').ncp, - mkdirp = require('mkdirp'), - _ = require('underscore'), - util = require('util'), - path = require('path'); +var _ = require('underscore'); +var async = require('async'); +var bower = require('bower'); +var fs = require('fs'); +var mkdirp = require('mkdirp'); +var ncp = require('ncp').ncp; +var path = require('path'); +var rimraf = require('rimraf'); +var util = require('util'); + +var BowerPlugin = require('../bower'); +var database = require('../../../lib/database'); +var configuration = require('../../../lib/configuration'); +var contentmanager = require('../../../lib/contentmanager'); +var helpers = require('../../../lib/helpers'); +var logger = require('../../../lib/logger'); +var origin = require('../../../'); +var rest = require('../../../lib/rest'); +var usermanager = require('../../../lib/usermanager'); + +var ContentPlugin = contentmanager.ContentPlugin; +var ContentTypeError = contentmanager.errors.ContentTypeError; + +var defaultOptions = require('./defaults.json'); var bowerConfig = { type: 'extensiontype', @@ -57,14 +59,12 @@ var bowerConfig = { enabledExtensions[key].version = newPlugin.version; } }); - // run the update db.update('config', { _id: doc._id }, { _enabledExtensions: enabledExtensions }, nextItem); }, function (err) { if (err) { logger.log('error', 'Failed to update old documents: ' + err.message, err); } - return next(null); }); }); @@ -152,7 +152,7 @@ function getEnabledExtensions(courseId, cb) { function contentDeletionHook(contentType, data, cb) { var contentData = data[0]; - + if (!contentData._id) { return cb(null, data); } @@ -184,51 +184,51 @@ function contentCreationHook (contentType, data, cb) { if (error) { return callback(error); } - + db.retrieve('componenttype', {component: contentData._component}, function(err, results) { if (err) { return callback(err); } - + if (!results || results.length == 0) { return callback('Unexpected number of componentType records'); } - + var componentType = results[0]._doc; - + if (componentType.globals) { // The component has globals. database.getDatabase(function(error, tenantDb) { // Add the globals to the course. - tenantDb.retrieve('course', {_id: contentData._courseId}, function(err, results) { + tenantDb.retrieve('course', { _id: contentData._courseId }, function(err, results) { if (err) { return callback(err); } - + var key = '_' + componentType.component; var courseDoc = results[0]._doc; var courseGlobals = courseDoc._globals ? courseDoc._globals : {}; - + // Create the _components global object. if (!courseGlobals._components) { courseGlobals._components = {}; } - + if (!courseGlobals._components[key]) { // The global JSON does not exist for this component so set the defaults. var componentGlobals = {}; - + for (var prop in componentType.globals) { if (componentType.globals.hasOwnProperty(prop)) { componentGlobals[prop] = componentType.globals[prop].default; } } - + courseGlobals._components[key] = componentGlobals; - - tenantDb.update('course', {_id: contentData._courseId}, {_globals: courseGlobals}, function(err, doc) { + + tenantDb.update('course', { _id: contentData._courseId }, { _globals: courseGlobals }, function(err, doc) { if (err) { return callback(err); } else { @@ -238,8 +238,8 @@ function contentCreationHook (contentType, data, cb) { } else { return callback(null); } - }); - }); + }); + }); } else { return callback(null) } @@ -250,23 +250,24 @@ function contentCreationHook (contentType, data, cb) { } }, function(callback) { - getEnabledExtensions(contentData._courseId, function (error, extensions) { + getEnabledExtensions(contentData._courseId, function(error, extensions) { if (error) { // permit content creation to continue, but log error logger.log('error', 'could not load extensions: ' + error.message); return callback(null); } - - // _extensions is undefined at this point - contentData._extensions = {}; - extensions.forEach(function (extensionItem) { + + // create _extensions if we need it + if(!contentData._extensions) contentData._extensions = {}; + extensions.forEach(function(extensionItem) { if (extensionItem.properties.hasOwnProperty('pluginLocations') && extensionItem.properties.pluginLocations.properties[contentType]) { var schema = extensionItem.properties.pluginLocations.properties[contentType].properties; // yeesh var generatedObject = helpers.schemaToObject(schema, extensionItem.name, extensionItem.version, contentType); - contentData._extensions = _.extend(contentData._extensions, generatedObject); - } + // keep any existing values in place + contentData._extensions = _.defaults(contentData._extensions, generatedObject); + } }); - + // assign back to passed args data[0] = contentData; callback(null); @@ -278,7 +279,7 @@ function contentCreationHook (contentType, data, cb) { logger.log('error', err); return cb(err); } - + return cb(null, data); }); } @@ -302,7 +303,7 @@ function toggleExtensions (courseId, action, extensions, cb) { if (user && user.tenant && user.tenant._id) { // Changes to extensions warrants a full course rebuild app.emit('rebuildCourse', user.tenant._id, courseId); - } + } database.getDatabase(function (err, db) { if (err) { @@ -335,9 +336,9 @@ function toggleExtensions (courseId, action, extensions, cb) { targetAttribute: targetAttribute }; } - + if (generatedObject) { - updatedExtensions = _.extend(updatedExtensions, generatedObject); + updatedExtensions = _.extend(updatedExtensions, generatedObject); } } else { // remove from list of enabled extensions in config object @@ -353,7 +354,7 @@ function toggleExtensions (courseId, action, extensions, cb) { if (isConfig) { delta._enabledExtensions = enabledExtensions; } - + tenantDb.update(componentType, { _id: component._id }, delta, next); }, nextComponent); }); @@ -370,11 +371,11 @@ function toggleExtensions (courseId, action, extensions, cb) { logger.log('error', err); return cb(err); } - + // Iterate over all the extensions async.eachSeries(results, function (extensionItem, nextItem) { var locations = extensionItem.properties.pluginLocations.properties; - + // Ensure that the 'config' key always exists, as this is required // to presist the list of enabled extensions. if (!_.has(locations, 'config')) { @@ -382,34 +383,34 @@ function toggleExtensions (courseId, action, extensions, cb) { } if (extensionItem.globals) { - tenantDb.retrieve('course', {_id: courseId}, function (err, results) { + tenantDb.retrieve('course', { _id: courseId }, function (err, results) { if (err) { return cb(err); } - + var courseDoc = results[0]._doc; var key = '_' + extensionItem.extension; // Extract the global defaults var courseGlobals = courseDoc._globals ? courseDoc._globals : {}; - - if (action == 'enable') { + + if (action == 'enable') { // Add default value and if (!courseGlobals._extensions) { courseGlobals._extensions = {}; } - + if (!courseGlobals._extensions[key]) { // The global JSON does not exist for this extension so set the defaults var extensionGlobals = {}; - + for (var prop in extensionItem.globals) { if (extensionItem.globals.hasOwnProperty(prop)) { extensionGlobals[prop] = extensionItem.globals[prop].default; } } - + courseGlobals._extensions[key] = extensionGlobals; } } else { @@ -418,19 +419,19 @@ function toggleExtensions (courseId, action, extensions, cb) { delete courseGlobals._extensions[key]; } } - - tenantDb.update('course', {_id: courseId}, {_globals: courseGlobals}, function(err, doc) { + + tenantDb.update('course', { _id: courseId }, { _globals: courseGlobals }, function(err, doc) { if (!err) { async.eachSeries(Object.keys(locations), function (key, nextLocation) { updateComponentItems(tenantDb, key, locations[key].properties, extensionItem, nextLocation); - }, nextItem); + }, nextItem); } }); - }); + }); } else { async.eachSeries(Object.keys(locations), function (key, nextLocation) { updateComponentItems(tenantDb, key, locations[key].properties, extensionItem, nextLocation); - }, nextItem); + }, nextItem); } }, function(err) { if (err) { @@ -441,12 +442,12 @@ function toggleExtensions (courseId, action, extensions, cb) { // Trigger an event to indicate that the extension has been enabled/disabled. app.emit(`extension:${action}`, results[0].name, user.tenant._id, courseId, user._id); } - + cb(); } - }); + }); }); - + }); }, configuration.getConfig('dbName')); } @@ -514,7 +515,7 @@ function initialize () { ['contentobject', 'article', 'block', 'component'].forEach(function (contentType) { app.contentmanager.addContentHook('create', contentType, contentCreationHook.bind(null, contentType)); }); - + ['component'].forEach(function(contentType) { app.contentmanager.addContentHook('destroy', contentType, contentDeletionHook.bind(null, contentType)); }); diff --git a/plugins/content/menu/index.js b/plugins/content/menu/index.js index 209021dcec..44874b6f67 100644 --- a/plugins/content/menu/index.js +++ b/plugins/content/menu/index.js @@ -3,27 +3,29 @@ * Menu content plugin * */ - -var origin = require('../../../'), - contentmanager = require('../../../lib/contentmanager'), - rest = require('../../../lib/rest'), - BowerPlugin = require('../bower'), - ContentPlugin = contentmanager.ContentPlugin, - ContentTypeError = contentmanager.errors.ContentTypeError, - configuration = require('../../../lib/configuration'), - usermanager = require('../../../lib/usermanager'), - database = require('../../../lib/database'), - logger = require('../../../lib/logger'), - defaultOptions = require('./defaults.json'), - bower = require('bower'), - rimraf = require('rimraf'), - async = require('async'), - fs = require('fs'), - ncp = require('ncp').ncp, - mkdirp = require('mkdirp'), - _ = require('underscore'), - util = require('util'), - path = require('path'); +var _ = require('underscore'); +var async = require('async'); +var bower = require('bower'); +var fs = require('fs'); +var mkdirp = require('mkdirp'); +var ncp = require('ncp').ncp; +var path = require('path'); +var rimraf = require('rimraf'); +var util = require('util'); + +var BowerPlugin = require('../bower'); +var configuration = require('../../../lib/configuration'); +var contentmanager = require('../../../lib/contentmanager'); +var database = require('../../../lib/database'); +var logger = require('../../../lib/logger'); +var origin = require('../../../'); +var rest = require('../../../lib/rest'); +var usermanager = require('../../../lib/usermanager'); + +var ContentPlugin = contentmanager.ContentPlugin; +var ContentTypeError = contentmanager.errors.ContentTypeError; + +var defaultOptions = require('./defaults.json'); var bowerConfig = { type: 'menutype', @@ -141,10 +143,10 @@ BowerPlugin.prototype.initialize.call(new Menu(), bowerConfig); app.emit('rebuildCourse', tenantId, courseId); res.statusCode = 200; - return res.json({success: true}); + return res.json({ success: true }); }); }); - }, configuration.getConfig('dbName')); + }, configuration.getConfig('dbName')); }); }); }); diff --git a/plugins/filestorage/localfs/index.js b/plugins/filestorage/localfs/index.js index 1c5e822fbf..119b1f5a54 100644 --- a/plugins/filestorage/localfs/index.js +++ b/plugins/filestorage/localfs/index.js @@ -3,18 +3,19 @@ * Local LocalFileStorage module */ -var FileStorage = require('../../../lib/filestorage').FileStorage, - configuration = require('../../../lib/configuration'), - usermanager = require('../../../lib/usermanager'), - util = require('util'), - fs = require('fs'), - path = require('path'), - mkdirp = require('mkdirp'), - async = require('async'), - probe = require('node-ffprobe'), - logger = require('../../../lib/logger'), - ncp = require('ncp').ncp, - FFMpeg = require('fluent-ffmpeg'); +var async = require('async'); +var util = require('util'); +var FFMpeg = require('fluent-ffmpeg'); +var fs = require('fs'); +var mkdirp = require('mkdirp'); +var ncp = require('ncp').ncp; +var path = require('path'); +var probe = require('node-ffprobe'); + +var configuration = require('../../../lib/configuration'); +var FileStorage = require('../../../lib/filestorage').FileStorage; +var logger = require('../../../lib/logger'); +var usermanager = require('../../../lib/usermanager'); function LocalFileStorage() { this.dataRoot = path.join(configuration.serverRoot, configuration.getConfig('dataRoot')); @@ -37,7 +38,7 @@ LocalFileStorage.prototype.resolvePath = function (relativePath, forceMaster) { if (!forceMaster) { tenantName = user.tenant ? user.tenant.name : configuration.getConfig('masterTenantName'); } else { - tenantName = configuration.getConfig('masterTenantName'); + tenantName = configuration.getConfig('masterTenantName'); } // check that the path isn't already absolute @@ -45,7 +46,7 @@ LocalFileStorage.prototype.resolvePath = function (relativePath, forceMaster) { if (0 === relativePath.indexOf(prefix)) { return relativePath; } - + return path.join(prefix, relativePath); } @@ -73,7 +74,7 @@ LocalFileStorage.prototype.getRelativePath = function (fullPath) { return fullPath.substr(prefix.length); } } - + return fullPath; }; @@ -133,7 +134,7 @@ LocalFileStorage.prototype.createReadStream = function (filePath, options, callb callback = options; options = {}; } - + var forceMaster = (options && options.forceMaster) ? true : false; @@ -185,7 +186,7 @@ LocalFileStorage.prototype.processFileUpload = function (file, newPath, options, newPath = this.resolvePath(newPath); var relativePath = this.getRelativePath(newPath); var self = this; - + // shuffle params if ('function' === typeof options) { cb = options; @@ -211,7 +212,7 @@ LocalFileStorage.prototype.processFileUpload = function (file, newPath, options, mimeType: file.type, size: file.size }; - + // create thumbnail? async.series([ function (nextFunc) { @@ -222,8 +223,8 @@ LocalFileStorage.prototype.processFileUpload = function (file, newPath, options, } nextFunc(); }); - } - + } + return nextFunc(); }, function (nextFunc) { @@ -234,8 +235,8 @@ LocalFileStorage.prototype.processFileUpload = function (file, newPath, options, } nextFunc(); }); - } - + } + return nextFunc(); }, function (nextFunc) { @@ -292,7 +293,7 @@ LocalFileStorage.prototype.getFileStats = function (filePath, callback) { /** * Copies an asset from one tenant to another. - * + * * @param {object} asset - A valid 'asset' record * @param {string} sourceTenantName - Source tenant.name * @param {string} destinationTenantName - Destination tenant.name @@ -410,7 +411,7 @@ LocalFileStorage.prototype.createThumbnail = function (filePath, fileType, optio return next(null, self.getRelativePath(imgThumbPath)); }) .saveToFile(imgThumbPath); - } + } // can't do thumb return next(null, false); From eba495d67fbc06df819abc88af69519e656e1aa4 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 13 Mar 2017 10:04:55 +0000 Subject: [PATCH 009/296] Update version.json and package.json (#1520) * Update version.json * Update package.json * Add TB to contributors * Move dependencies together * Add TG to contributors * Bump framework to 2.0.17 * Remove level of indentation --- package.json | 38 +++++++++++++++++++++++--------------- version.json | 4 ++-- 2 files changed, 25 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index c775ee49cd..24a7992885 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { - "name": "adapt-origin", - "version": "0.2.1", + "name": "adapt_authoring", + "version": "0.3.1", "license": "GPL-3.0", - "description": "Adapt framework authoring tool core application", + "description": "A server-based user interface for authoring eLearning courses using the Adapt Framework.", "keywords": [ "adapt", "authoring", @@ -29,14 +29,14 @@ "name": "Dan Gray", "email": "dan@sinensis.co.uk" }, - { - "name": "Daryl Hedley", - "email": "darylhedley@hotmail.com" - }, { "name": "Dennis Heaney", "email": "dennis@learningpool.com" }, + { + "name": "Daryl Hedley", + "email": "darylhedley@hotmail.com" + }, { "name": "Ryan Lafferty", "email": "ryanl@learningpool.com" @@ -57,15 +57,30 @@ "name": "Brian Quinn", "email": "brian@learningpool.com" }, + { + "name": "Thomas Berger", + "email": "thomas.berger@learnchamp.com" + }, + { + "name": "Tom Greenfield", + "email": "tom.greenfield@kineo.com" + }, { "name": "Thomas Taylor", - "email": "hello@taylortom.co.uk" + "email": "hello@tomtaylor.name" } ], "repository": { "type": "git", "url": "https://github.com/adaptlearning/adapt_authoring.git" }, + "main": "index", + "engines": { + "node": "4.x" + }, + "scripts": { + "test": "make test" + }, "dependencies": { "archiver": "~0.16.0", "async": "0.2.5", @@ -132,13 +147,6 @@ "validator": "4.2.1", "winston": "1.0.2" }, - "main": "index", - "engines": { - "node": "4.x" - }, - "scripts": { - "test": "make test" - }, "devDependencies": { "mocha": "~1.13.0", "phantom": "^0.6.5", diff --git a/version.json b/version.json index 9a69547e41..c4a102800e 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "adapt_authoring": "v0.2.2", - "adapt_framework": "v2.0.7" + "adapt_authoring": "v0.3.1", + "adapt_framework": "v2.0.17" } From 988146e4691fea6335aa86532fd5d84b6d38dd11 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 13 Mar 2017 16:32:27 +0000 Subject: [PATCH 010/296] Only attempt to load routes that are directories (#1535) * Only attempt to load routes that are directories Fixes #1534 * Add message for other errors * Remove duplication --- lib/router.js | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/lib/router.js b/lib/router.js index 02243f1d94..c7bc8f2213 100644 --- a/lib/router.js +++ b/lib/router.js @@ -1,14 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -/** - * Module used to set up routes - * - * @module lib/routes - */ - +var _ = require('underscore'); +var async = require('async'); var fs = require('fs'); var path = require('path'); + var configuration = require('./configuration'); -var _ = require('underscore'); +var logger = require('./logger'); /* * CONSTANTS @@ -28,11 +25,25 @@ function Router (options) { Router.prototype.init = function (app) { var basePath = this.options.path; - var routes = fs.readdirSync(basePath); var server = app.server; - routes.forEach (function (routePath) { - var route = require(path.join(basePath, routePath)); - server.use(route); + fs.readdir(basePath, function(error, contents) { + if(error) { + logger.log('error', error); + return; + } + async.each(contents, function(item, cb) { + var itemPath = path.join(basePath, item); + if(!fs.statSync(itemPath).isDirectory()) { + return; + } + try { + var route = require(itemPath); + server.use(route); + } catch(e) { + var detail = (e.code === 'MODULE_NOT_FOUND') ? ', no index.js found' : ` (${e})`; + logger.log('error', `Cannot load routes/${item}${detail}`); + } + }); }); }; From 605ca61cb62eae38037622da2a74f2ebde17add5 Mon Sep 17 00:00:00 2001 From: tomgreenfield Date: Mon, 13 Mar 2017 16:33:14 +0000 Subject: [PATCH 011/296] Clean up language strings (#1574) * Clean up language strings * Remove italics --- .../core/assetManagement/assetManagement.js | 16 +- .../templates/assetManagement.hbs | 4 +- .../assetManagementModalAutofill.hbs | 2 +- .../templates/assetManagementModalFilters.hbs | 4 +- .../assetManagementModalNewAsset.hbs | 4 +- .../templates/assetManagementNewAsset.hbs | 2 +- .../templates/assetManagementSidebar.hbs | 6 +- .../assetManagement/templates/assetPicker.hbs | 6 +- frontend/src/core/modal/templates/modal.hbs | 4 +- .../core/navigation/templates/navigation.hbs | 4 +- .../templates/pluginManagement.hbs | 14 +- .../templates/pluginManagementSidebar.hbs | 10 +- .../templates/pluginManagementUpload.hbs | 2 +- .../pluginManagement/templates/pluginType.hbs | 2 +- .../src/core/project/templates/project.hbs | 4 +- frontend/src/core/scaffold/scaffold.js | 8 +- .../core/sidebar/templates/sidebarFilter.hbs | 4 +- .../src/core/user/templates/userProfile.hbs | 2 +- .../src/core/user/views/userProfileView.js | 2 +- frontend/src/plugins/userManagement/index.js | 2 +- routes/lang/en-application.json | 159 +++++------------- 21 files changed, 92 insertions(+), 169 deletions(-) diff --git a/frontend/src/core/assetManagement/assetManagement.js b/frontend/src/core/assetManagement/assetManagement.js index 2386a9b461..459a58030c 100644 --- a/frontend/src/core/assetManagement/assetManagement.js +++ b/frontend/src/core/assetManagement/assetManagement.js @@ -52,15 +52,13 @@ define(function(require) { Origin.router.navigate('#/assetManagement', {trigger: true}); }); - var globalMenuObject = { - "location": "global", - "text": "Asset Management", - "icon": "fa-file-image-o", - "callbackEvent": "assetManagement:open", - "sortOrder": 2 - }; - Origin.on('app:dataReady login:changed', function() { - Origin.globalMenu.addItem(globalMenuObject); + Origin.globalMenu.addItem({ + "location": "global", + "text": window.polyglot.t('app.assetmanagement'), + "icon": "fa-file-image-o", + "callbackEvent": "assetManagement:open", + "sortOrder": 2 + }); }); }); diff --git a/frontend/src/core/assetManagement/templates/assetManagement.hbs b/frontend/src/core/assetManagement/templates/assetManagement.hbs index 1895932de3..712226e37a 100644 --- a/frontend/src/core/assetManagement/templates/assetManagement.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagement.hbs @@ -1,11 +1,11 @@
- +
-
Select an asset to see a preview here
+
{{t 'app.assetpreviewinstruction'}}
diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs b/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs index 74c682d94d..07639f6f00 100644 --- a/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs @@ -1 +1 @@ -Autofill \ No newline at end of file +{{t 'app.autofill'}} \ No newline at end of file diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs b/frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs index 98ad56119f..4e4fe6f289 100644 --- a/frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs @@ -1,6 +1,6 @@ @@ -11,6 +11,6 @@ \ No newline at end of file diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs b/frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs index 75062289f1..fc249c0a59 100644 --- a/frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs @@ -11,7 +11,7 @@ {{#if path}}
- File has been uploaded + {{t 'app.fileuploaded'}}
{{else}} @@ -44,7 +44,7 @@
- +
diff --git a/frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs b/frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs index bd4108ab53..537fa29b4b 100644 --- a/frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs @@ -8,7 +8,7 @@ {{#if path}}
- File has been uploaded + {{t 'app.fileuploaded'}}
{{else}} diff --git a/frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs b/frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs index 575d79cfbb..f3ef27183f 100644 --- a/frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs +++ b/frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs @@ -10,7 +10,7 @@ @@ -20,7 +20,7 @@

- Filters + {{t 'app.assetfilters'}}

@@ -80,7 +80,7 @@

- Tags + {{t 'app.tags'}}

diff --git a/frontend/src/core/assetManagement/templates/assetPicker.hbs b/frontend/src/core/assetManagement/templates/assetPicker.hbs index a30cdf05e4..1de21468e7 100644 --- a/frontend/src/core/assetManagement/templates/assetPicker.hbs +++ b/frontend/src/core/assetManagement/templates/assetPicker.hbs @@ -1,6 +1,6 @@
{{!-- inline search field with close button --}} - + {{/if}} {{#if _shouldShowCancelButton}} {{/if}}
diff --git a/frontend/src/core/navigation/templates/navigation.hbs b/frontend/src/core/navigation/templates/navigation.hbs index 4240002782..a59d879957 100644 --- a/frontend/src/core/navigation/templates/navigation.hbs +++ b/frontend/src/core/navigation/templates/navigation.hbs @@ -21,13 +21,13 @@ {{else}}
{{/if}} - {{#if _canRevert}}{{/if}} + {{#if _canRevert}}{{/if}} {{#if isAuthenticated}} {{t 'app.help'}} - Signed in as: {{email}} + {{t 'app.loggedinas'}}: {{email}} {{t 'app.logout'}} diff --git a/frontend/src/core/pluginManagement/templates/pluginManagement.hbs b/frontend/src/core/pluginManagement/templates/pluginManagement.hbs index 759d5485fc..d5fa8b994c 100644 --- a/frontend/src/core/pluginManagement/templates/pluginManagement.hbs +++ b/frontend/src/core/pluginManagement/templates/pluginManagement.hbs @@ -2,36 +2,36 @@
-

Name

+

{{t 'app.name'}}

-

Description

+

{{t 'app.description'}}

-

Version

+

{{t 'app.version'}}

-

Enabled

+

{{t 'app.enabled'}}

-

Action

+

{{t 'app.action'}}

    {{!-- Plugins get render in here --}}
    - Loading... + {{t 'app.loading'}}
- +
diff --git a/frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs b/frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs index fc57b38dd9..5aaaa0b538 100644 --- a/frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs +++ b/frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs @@ -14,34 +14,34 @@
diff --git a/frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs b/frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs index 96ce3c9713..54b3dac649 100644 --- a/frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs +++ b/frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs @@ -4,7 +4,7 @@
diff --git a/frontend/src/core/pluginManagement/templates/pluginType.hbs b/frontend/src/core/pluginManagement/templates/pluginType.hbs index 8645c56438..9a32830150 100644 --- a/frontend/src/core/pluginManagement/templates/pluginType.hbs +++ b/frontend/src/core/pluginManagement/templates/pluginType.hbs @@ -22,7 +22,7 @@ {{#if isLocalPackage}} ({{t 'app.uploadedbyuser'}}) {{else}} - + {{/if}} diff --git a/frontend/src/core/project/templates/project.hbs b/frontend/src/core/project/templates/project.hbs index fd97f5ada8..f131d3adac 100644 --- a/frontend/src/core/project/templates/project.hbs +++ b/frontend/src/core/project/templates/project.hbs @@ -35,7 +35,7 @@ {{#if tags.length}}
- +
    @@ -45,7 +45,7 @@ {{/each}}
- +
{{/if}} diff --git a/frontend/src/core/scaffold/scaffold.js b/frontend/src/core/scaffold/scaffold.js index dbf7e8318b..b6b431f92b 100644 --- a/frontend/src/core/scaffold/scaffold.js +++ b/frontend/src/core/scaffold/scaffold.js @@ -209,21 +209,21 @@ define(function(require) { // Setup default fieldsets var fieldsets = { general: { - legend: 'General', + legend: window.polyglot.t('app.general'), fields: [] }, // ::TODO // I want to remove this please properties: { - legend: 'Properties', + legend: window.polyglot.t('app.properties'), fields: [] }, settings :{ - legend: 'Settings', + legend: window.polyglot.t('app.settings'), fields: [] }, extensions: { - legend: 'Extensions', + legend: window.polyglot.t('app.extensions'), fields: ['_extensions'] } }; diff --git a/frontend/src/core/sidebar/templates/sidebarFilter.hbs b/frontend/src/core/sidebar/templates/sidebarFilter.hbs index d8baefcd80..c1a93502b2 100644 --- a/frontend/src/core/sidebar/templates/sidebarFilter.hbs +++ b/frontend/src/core/sidebar/templates/sidebarFilter.hbs @@ -2,10 +2,10 @@
- Filter by tags + {{t 'app.filterbytags'}}
- Please select a component: + {{t 'app.pleaseselectcomponent'}}:
diff --git a/frontend/src/core/user/templates/userProfile.hbs b/frontend/src/core/user/templates/userProfile.hbs index 68026f995a..65805847c6 100644 --- a/frontend/src/core/user/templates/userProfile.hbs +++ b/frontend/src/core/user/templates/userProfile.hbs @@ -49,7 +49,7 @@
From 09b1278cadaad1c89b36d1cc1160dbaab5e460bb Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 21 Mar 2017 16:04:17 +0000 Subject: [PATCH 041/296] Fix editor collections whitespace --- .../collections/editorConfigCollection.js | 7 +--- .../global/collections/editorCollection.js | 33 +++++++++---------- .../theme/templates/editorThemeCollection.hbs | 3 +- .../theme/views/editorThemeCollectionView.js | 5 ++- 4 files changed, 19 insertions(+), 29 deletions(-) diff --git a/frontend/src/core/editor/config/collections/editorConfigCollection.js b/frontend/src/core/editor/config/collections/editorConfigCollection.js index 3965ae053b..e2b624054b 100644 --- a/frontend/src/core/editor/config/collections/editorConfigCollection.js +++ b/frontend/src/core/editor/config/collections/editorConfigCollection.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var ConfigModel = require('editorConfig/models/editorConfigModel'); var ConfigCollection = Backbone.Collection.extend({ - model: ConfigModel, - url: 'api/content/config' - }); return ConfigCollection; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/global/collections/editorCollection.js b/frontend/src/core/editor/global/collections/editorCollection.js index 59772b6a81..d0bd452211 100644 --- a/frontend/src/core/editor/global/collections/editorCollection.js +++ b/frontend/src/core/editor/global/collections/editorCollection.js @@ -1,23 +1,20 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); + var EditorCollection = Backbone.Collection.extend({ + initialize : function(models, options){ + this.url = options.url; + this._type = options._type; + this.on('reset', this.loadedData, this); + this.fetch({ reset:true }); + }, - var EditorCollection = Backbone.Collection.extend({ - initialize : function(models, options){ - this.url = options.url; - this._type = options._type; - this.on('reset', this.loadedData, this); - this.fetch({reset:true}); - }, - - loadedData: function() { - Origin.trigger('editorCollection:dataLoaded', this._type); - } - - }); - - return EditorCollection; + loadedData: function() { + Origin.trigger('editorCollection:dataLoaded', this._type); + } + }); -}); \ No newline at end of file + return EditorCollection; +}); diff --git a/frontend/src/core/editor/theme/templates/editorThemeCollection.hbs b/frontend/src/core/editor/theme/templates/editorThemeCollection.hbs index a896a592ef..5422bf5532 100644 --- a/frontend/src/core/editor/theme/templates/editorThemeCollection.hbs +++ b/frontend/src/core/editor/theme/templates/editorThemeCollection.hbs @@ -1,2 +1 @@ -
-
+
diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionView.js index 00640fa868..96726a165c 100644 --- a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js +++ b/frontend/src/core/editor/theme/views/editorThemeCollectionView.js @@ -7,8 +7,8 @@ define(function(require) { var ThemeItemView = require('editorTheme/views/editorThemeItemView'); var EditorThemeCollectionView = EditorOriginView.extend({ - tagName: "ul", className: "editor-theme-edit", + tagName: "ul", preRender: function() { this.collection = new ThemeCollection(); @@ -68,8 +68,7 @@ define(function(require) { }, this); }, this)); } - }, - { + }, { template: 'editorThemeCollection' }); From 8351ee99192d821ebfda0723ae9c0087146247b2 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 21 Mar 2017 16:05:06 +0000 Subject: [PATCH 042/296] Fix editor models whitespace --- .../editor/config/models/editorConfigModel.js | 36 ++++++------- .../course/models/editorCourseAssetModel.js | 5 -- .../editor/course/models/editorCourseModel.js | 15 +++--- .../extensions/models/extensionModel.js | 16 +++--- .../global/models/editorClipboardModel.js | 12 ++--- .../menu/models/editorContentObjectModel.js | 50 ++++++++----------- .../models/editorMenuSettingsModel.js | 9 ---- .../editor/theme/models/editorThemeModel.js | 3 +- 8 files changed, 60 insertions(+), 86 deletions(-) delete mode 100644 frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js diff --git a/frontend/src/core/editor/config/models/editorConfigModel.js b/frontend/src/core/editor/config/models/editorConfigModel.js index fecc54321e..bb73a600e7 100644 --- a/frontend/src/core/editor/config/models/editorConfigModel.js +++ b/frontend/src/core/editor/config/models/editorConfigModel.js @@ -1,29 +1,29 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var EditorModel = require('editorGlobal/models/editorModel'); + var EditorConfigModel = EditorModel.extend({ + _type: 'config', + _parent: 'course', + _siblings: '', + _children: '', sync: function(method, model, options) { - options = options || {}; + options = options || {}; - switch (method.toLowerCase()) { - case 'read': - options.url = '/api/content/config/' + this.get('_courseId'); - break; - case 'update': - case 'patch': - options.url = '/api/content/config/' + this.get('_id'); - break; - } + switch (method.toLowerCase()) { + case 'read': + options.url = '/api/content/config/' + this.get('_courseId'); + break; + case 'update': + case 'patch': + options.url = '/api/content/config/' + this.get('_id'); + break; + } - return Backbone.sync.apply(this, arguments); - }, - - _siblings: '', - _children: '', - _parent: 'course', - _type: 'config' + return Backbone.sync.apply(this, arguments); + } }); return EditorConfigModel; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/course/models/editorCourseAssetModel.js b/frontend/src/core/editor/course/models/editorCourseAssetModel.js index 799053ce11..b75b6598bb 100644 --- a/frontend/src/core/editor/course/models/editorCourseAssetModel.js +++ b/frontend/src/core/editor/course/models/editorCourseAssetModel.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var CourseAssetModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/content/courseasset' - }); return CourseAssetModel; - }); diff --git a/frontend/src/core/editor/course/models/editorCourseModel.js b/frontend/src/core/editor/course/models/editorCourseModel.js index fe7e9c449a..f33b49704e 100644 --- a/frontend/src/core/editor/course/models/editorCourseModel.js +++ b/frontend/src/core/editor/course/models/editorCourseModel.js @@ -1,14 +1,13 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var EditorModel = require('editorGlobal/models/editorModel'); - var EditorCourseModel = EditorModel.extend({ - urlRoot: '/api/content/course', - - _siblings: '', - _children: 'contentObjects', - _type: 'course' - }); + var EditorCourseModel = EditorModel.extend({ + urlRoot: '/api/content/course', + _type: 'course', + _siblings: '', + _children: 'contentObjects' + }); return EditorCourseModel; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/extensions/models/extensionModel.js b/frontend/src/core/editor/extensions/models/extensionModel.js index 4f1123ca45..224f972040 100644 --- a/frontend/src/core/editor/extensions/models/extensionModel.js +++ b/frontend/src/core/editor/extensions/models/extensionModel.js @@ -1,21 +1,19 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - +define(function(require) { var EditorModel = require('editorGlobal/models/editorModel'); var ExtensionModel = EditorModel.extend({ - - idAttribute: '_id', - initialize: function(){}, - urlRoot: '/api/extensiontype', + idAttribute: '_id', + _type: 'extension', _parent: null, _siblings: null, _children: null, - _type: 'extension' + initialize: function(){ + + } }); return ExtensionModel; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/global/models/editorClipboardModel.js b/frontend/src/core/editor/global/models/editorClipboardModel.js index a99ce6c6d0..f8fa571a7a 100644 --- a/frontend/src/core/editor/global/models/editorClipboardModel.js +++ b/frontend/src/core/editor/global/models/editorClipboardModel.js @@ -1,12 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var EditorModel = require('editorGlobal/models/editorModel'); - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorClipboardModel = EditorModel.extend({ - urlRoot: '/api/content/clipboard', - }); - - return EditorClipboardModel; + var EditorClipboardModel = EditorModel.extend({ + urlRoot: '/api/content/clipboard', + }); + return EditorClipboardModel; }); diff --git a/frontend/src/core/editor/menu/models/editorContentObjectModel.js b/frontend/src/core/editor/menu/models/editorContentObjectModel.js index f25b41ac94..fee87ab7cd 100644 --- a/frontend/src/core/editor/menu/models/editorContentObjectModel.js +++ b/frontend/src/core/editor/menu/models/editorContentObjectModel.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var EditorModel = require('editorGlobal/models/editorModel'); + var Origin = require('coreJS/app/origin'); - var EditorModel = require('editorGlobal/models/editorModel'); - var Origin = require('coreJS/app/origin'); - - var EditorContentObjectModel = EditorModel.extend({ - - urlRoot: '/api/content/contentobject', - - _parent: 'contentObjects', - + var EditorContentObjectModel = EditorModel.extend({ + urlRoot: '/api/content/contentobject', + _parent: 'contentObjects', _siblings:'contentObjects', - _children: 'articles', defaults: { @@ -19,22 +14,21 @@ define(function(require) { _isExpanded: false }, - initialize: function() { - this.listenTo(this, 'sync', this.setupConstructor); - this.setupConstructor(); - this.listenTo(this, 'change:_type', this.setupConstructor); - }, - - setupConstructor: function() { - if (this.get('_parentId') === Origin.editor.data.course.get('_id')) { - this._parent === 'course'; - } - if (this.get('_type') === 'menu') { - this._children = 'contentObjects'; - } - } - }); - - return EditorContentObjectModel; + initialize: function() { + this.listenTo(this, 'sync', this.setupConstructor); + this.listenTo(this, 'change:_type', this.setupConstructor); + this.setupConstructor(); + }, -}); \ No newline at end of file + setupConstructor: function() { + if (this.get('_parentId') === Origin.editor.data.course.get('_id')) { + this._parent === 'course'; + } + if (this.get('_type') === 'menu') { + this._children = 'contentObjects'; + } + } + }); + + return EditorContentObjectModel; +}); diff --git a/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js b/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js deleted file mode 100644 index a1c72aa474..0000000000 --- a/frontend/src/core/editor/menuSettings/models/editorMenuSettingsModel.js +++ /dev/null @@ -1,9 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var Backbone = require('backbone'); - var EditorMenuSettingsModel = Backbone.Model.extend({ - - }); - - return EditorMenuSettingsModel; -}); \ No newline at end of file diff --git a/frontend/src/core/editor/theme/models/editorThemeModel.js b/frontend/src/core/editor/theme/models/editorThemeModel.js index 573ec5e4c8..75d5ef44c8 100644 --- a/frontend/src/core/editor/theme/models/editorThemeModel.js +++ b/frontend/src/core/editor/theme/models/editorThemeModel.js @@ -2,8 +2,7 @@ define(function(require) { var Backbone = require('backbone'); var EditorThemeModel = Backbone.Model.extend({ - }); return EditorThemeModel; -}); \ No newline at end of file +}); From c31a5921b60db6123af438f90df1849491511c26 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 21 Mar 2017 16:05:34 +0000 Subject: [PATCH 043/296] Fix editor templates whitespace --- .../templates/editorExtensionsEdit.hbs | 126 ++++++++---------- .../templates/editorExtensionsEditSidebar.hbs | 8 +- .../core/editor/global/templates/editor.hbs | 3 +- .../global/templates/editorPasteZone.hbs | 6 +- .../partials/part_editorItemSidebar.hbs | 50 +++---- .../core/editor/menu/templates/editorMenu.hbs | 3 +- .../editor/menu/templates/editorMenuItem.hbs | 37 +++-- .../editor/menu/templates/editorMenuLayer.hbs | 20 +-- .../templates/editorMenuSettingsEdit.hbs | 3 +- .../editorMenuSettingsEditSidebar.hbs | 8 +- .../templates/editorMenuSettingsItem.hbs | 6 +- .../editorThemeCollectionSidebar.hbs | 15 +-- .../theme/templates/editorThemeEdit.hbs | 3 +- .../templates/editorThemeEditSidebar.hbs | 27 ++-- .../theme/templates/editorThemeItem.hbs | 78 +++++------ 15 files changed, 174 insertions(+), 219 deletions(-) diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs b/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs index 5e6547fe10..14a69eea6b 100644 --- a/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs +++ b/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs @@ -1,81 +1,66 @@
+
+

{{ t 'app.enabledextensions'}}

+
-
-

{{ t 'app.enabledextensions'}}

+
+
+

{{t 'app.extension'}}

- -
- -
-

{{t 'app.extension'}}

-
- -
-

{{t 'app.description'}}

-
- -
-

{{t 'app.options'}}

-
- +
+

{{t 'app.description'}}

+
+
+

{{t 'app.options'}}

+
-
- {{!-- Plugins get render in here --}} - {{#if enabledExtensions}} - {{#each enabledExtensions}} +
+ {{#if enabledExtensions}} + {{!-- plugins rendered in here --}} + {{#each enabledExtensions}}
-
- -
-

{{{displayName}}}

-
- -
-
{{{description}}}
-
- -
-
- -
-
- +
+
+

{{{displayName}}}

+
+
+
{{{description}}}
+
+
+ +
+
+
- {{/each}} - {{else}} -
{{t 'app.noextensionsenabled'}}
- {{/if}} + {{/each}} + {{else}} +
{{t 'app.noextensionsenabled'}}
+ {{/if}} +
+ +
+

{{ t 'app.availableextensions'}}

+
+
+
+

{{t 'app.extension'}}

- -
-

{{ t 'app.availableextensions'}}

+
+

{{t 'app.description'}}

- -
- -
-

{{t 'app.extension'}}

-
- -
-

{{t 'app.description'}}

-
- -
-

{{t 'app.options'}}

-
- +
+

{{t 'app.options'}}

+
-
- {{!-- Plugins get render in here --}} - {{#if availableExtensions}} - {{#each availableExtensions}} +
+ {{#if availableExtensions}} + {{!-- plugins rendered in here --}} + {{#each availableExtensions}}
-

{{{displayName}}}

@@ -92,10 +77,9 @@
- {{/each}} - {{else}} -
{{t 'app.noextensionsavailable'}}
- {{/if}} -
- -
\ No newline at end of file + {{/each}} + {{else}} +
{{t 'app.noextensionsavailable'}}
+ {{/if}} +
+
diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs b/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs index 8dd7f70ffb..951760846e 100644 --- a/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs +++ b/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs @@ -1,7 +1 @@ -
-{{!--
-

- {{t 'app.manageextensions'}} -

-
--}} -
\ No newline at end of file +
diff --git a/frontend/src/core/editor/global/templates/editor.hbs b/frontend/src/core/editor/global/templates/editor.hbs index bdb93d1021..566da33530 100644 --- a/frontend/src/core/editor/global/templates/editor.hbs +++ b/frontend/src/core/editor/global/templates/editor.hbs @@ -1,2 +1 @@ -
-
\ No newline at end of file +
diff --git a/frontend/src/core/editor/global/templates/editorPasteZone.hbs b/frontend/src/core/editor/global/templates/editorPasteZone.hbs index 39b5ca4abc..7e6712ce89 100644 --- a/frontend/src/core/editor/global/templates/editorPasteZone.hbs +++ b/frontend/src/core/editor/global/templates/editorPasteZone.hbs @@ -1,4 +1,4 @@
-{{t 'app.paste'}} -{{t 'app.cancel'}} -
\ No newline at end of file + {{t 'app.paste'}} + {{t 'app.cancel'}} +
diff --git a/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs b/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs index b511bcf217..f82269d772 100644 --- a/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs +++ b/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs @@ -1,27 +1,27 @@
-
- - - - - - - {{#if _movePositions}} - {{#if _movePositions.left}} - - - - {{/if}} - {{#if _movePositions.right}} - - - - {{/if}} - {{#if _movePositions.full}} - - - - {{/if}} - {{/if}} -
+
+ + + + + + + {{#if _movePositions}} + {{#if _movePositions.left}} + + + + {{/if}} + {{#if _movePositions.right}} + + + + {{/if}} + {{#if _movePositions.full}} + + + + {{/if}} + {{/if}} +
diff --git a/frontend/src/core/editor/menu/templates/editorMenu.hbs b/frontend/src/core/editor/menu/templates/editorMenu.hbs index c28e5942bb..a80c944bb6 100644 --- a/frontend/src/core/editor/menu/templates/editorMenu.hbs +++ b/frontend/src/core/editor/menu/templates/editorMenu.hbs @@ -1,2 +1 @@ -
-
\ No newline at end of file +
diff --git a/frontend/src/core/editor/menu/templates/editorMenuItem.hbs b/frontend/src/core/editor/menu/templates/editorMenuItem.hbs index f78bee195c..eb5b813d73 100644 --- a/frontend/src/core/editor/menu/templates/editorMenuItem.hbs +++ b/frontend/src/core/editor/menu/templates/editorMenuItem.hbs @@ -1,26 +1,21 @@
- -
-
- - - - -
+
+
+ +
- -
- {{#ifValueEquals _type "menu"}} - - {{/ifValueEquals}} - {{#ifValueEquals _type "page"}} - - {{/ifValueEquals}} +
+
+ {{#ifValueEquals _type "menu"}} + + {{/ifValueEquals}} + {{#ifValueEquals _type "page"}} + + {{/ifValueEquals}}
-
-

{{{title}}}

-
+
+

{{{title}}}

+
-
-
\ No newline at end of file +
diff --git a/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs b/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs index e8582b6bce..457239326d 100644 --- a/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs +++ b/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs @@ -1,12 +1,12 @@
-
- - -
-
- - -
+
+ + +
+
+ + +
-
-
\ No newline at end of file + +
diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs index 673aa1a007..4e7d378f02 100644 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs +++ b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs @@ -1,2 +1 @@ -
-
\ No newline at end of file +
diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs index deb5d662c1..bed3f39c7a 100644 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs +++ b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs @@ -1,7 +1,5 @@
- +
diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs index 844a15283b..0486b9bc94 100644 --- a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs +++ b/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs @@ -1,4 +1,4 @@
-
{{displayName}}
-
{{description}}
-
\ No newline at end of file +
{{displayName}}
+
{{description}}
+
diff --git a/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs b/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs index be1a3c8d26..540368b970 100644 --- a/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs +++ b/frontend/src/core/editor/theme/templates/editorThemeCollectionSidebar.hbs @@ -1,12 +1,5 @@
-{{!--
-

- {{t 'app.themepicker'}} -

-
--}} - -
\ No newline at end of file + +
diff --git a/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs b/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs index 3fd70a9b4b..164c88c5ca 100644 --- a/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs +++ b/frontend/src/core/editor/theme/templates/editorThemeEdit.hbs @@ -1,2 +1 @@ -
-
+
diff --git a/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs b/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs index a65a00a35f..3cafe53ec6 100644 --- a/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs +++ b/frontend/src/core/editor/theme/templates/editorThemeEditSidebar.hbs @@ -1,17 +1,12 @@
-{{!--
-

- {{t 'app.themesettings'}} -

-
--}} - - -
\ No newline at end of file + + +
diff --git a/frontend/src/core/editor/theme/templates/editorThemeItem.hbs b/frontend/src/core/editor/theme/templates/editorThemeItem.hbs index 3a5a6f1f20..edd2900a6d 100644 --- a/frontend/src/core/editor/theme/templates/editorThemeItem.hbs +++ b/frontend/src/core/editor/theme/templates/editorThemeItem.hbs @@ -1,50 +1,50 @@
-
-

{{displayName}}

-
{{description}}
-
- {{#if settings}} +
+

{{displayName}}

+
{{description}}
+
+ {{#if settings}}
-
    -
  • -
    -
    -
    -
    • -
  • -
    -
    -
    -
    • -
  • -
    -
    -
    -
    • -
+
    +
  • +
    +
    +
    +
    • +
  • +
    +
    +
    +
    • +
  • +
    +
    +
    +
    • +
{{else}} {{#if settings}} {{#with properties}} -
+
    -
  • -
    -
    -
    -
    • -
  • -
    -
    -
    -
    • -
  • -
    -
    -
    -
    • +
  • +
    +
    +
    +
    • +
  • +
    +
    +
    +
    • +
  • +
    +
    +
    +
-
+
{{/with}} {{else}} {{/if}} From 29c78a00bcfc285fea50cfca10e4d88953089b4f Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 21 Mar 2017 16:06:32 +0000 Subject: [PATCH 044/296] Fix editor views whitespace --- .../views/editorExtensionsEditSidebarView.js | 18 +- .../views/editorExtensionsEditView.js | 74 ++--- .../editor/global/views/editorOriginView.js | 188 ++++++------ .../global/views/editorPasteZoneView.js | 102 +++---- .../core/editor/global/views/editorView.js | 275 +++++++----------- .../editor/menu/views/editorMenuItemView.js | 44 +-- .../menu/views/editorMenuSidebarView.js | 20 +- .../core/editor/menu/views/editorMenuView.js | 65 ++--- .../editorMenuSettingsEditSidebarView.js | 17 +- .../views/editorMenuSettingsEditView.js | 9 +- .../views/editorMenuSettingsView.js | 5 +- .../core/editor/page/views/editorPageView.js | 2 +- .../views/editorThemeCollectionSidebarView.js | 20 +- .../theme/views/editorThemeEditSidebarView.js | 13 +- .../editor/theme/views/editorThemeEditView.js | 18 +- .../editor/theme/views/editorThemeItemView.js | 19 +- .../editor/theme/views/editorThemeView.js | 13 +- 17 files changed, 362 insertions(+), 540 deletions(-) diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js index 3c9ac8b073..6dadb450c0 100644 --- a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js +++ b/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js @@ -1,14 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + var Backbone = require('backbone'); - var EditorExtensionsEditSidebarView = SidebarItemView.extend({}, { - template: 'editorExtensionsEditSidebar' - }); + var EditorExtensionsEditSidebarView = SidebarItemView.extend({}, { + template: 'editorExtensionsEditSidebar' + }); - return EditorExtensionsEditSidebarView; - -}); \ No newline at end of file + return EditorExtensionsEditSidebarView; +}); diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js index da00b8431c..85ff1e6555 100644 --- a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js @@ -14,8 +14,8 @@ define(function(require) { }, events: { - 'click button.remove-extension' : 'onRemoveExtensionClicked', - 'click button.add-extension' : 'onAddExtensionClicked' + 'click button.remove-extension': 'onRemoveExtensionClicked', + 'click button.add-extension': 'onAddExtensionClicked' }, preRender: function() { @@ -23,31 +23,28 @@ define(function(require) { this.listenTo(Origin, 'editorExtensionsEdit:views:add', this.addExtension); this.listenTo(Origin, 'editorExtensionsEdit:views:remove', this.removeExtension); this.setupExtensions(); + this.render(); + // TODO is defer a good idea? + _.defer(_.bind(this.postRender, this)); }, setupExtensions: function() { var availableExtensionsCollection = Origin.editor.data.extensionTypes; var enabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); var disabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); - var enabledExtensionNames = _.pluck(Origin.editor.data.config.get('_enabledExtensions'), 'name'); - // sort into appropriate collection availableExtensionsCollection.each(function(extension) { - if (_.indexOf(enabledExtensionNames, extension.get('name')) > -1) { + if(_.indexOf(enabledExtensionNames, extension.get('name')) > -1) { enabledExtensionsCollection.add(extension); } else if(extension.get('_isAvailableInEditor')) { disabledExtensionsCollection.add(extension); } }); - - // Set collections on model render for render - this.model.set('enabledExtensions', enabledExtensionsCollection.toJSON()); - this.model.set('availableExtensions', disabledExtensionsCollection.toJSON()); - - this.render(); - // TODO is defer a good idea? - _.defer(_.bind(this.postRender, this)); + this.model.set({ + enabledExtensions: enabledExtensionsCollection.toJSON()), + availableExtensions: disabledExtensionsCollection.toJSON()) + }); }, postRender: function() { @@ -56,30 +53,35 @@ define(function(require) { postData: function(url) { $.post(url + this.model.get('_id'), { extensions: this.currentSelectedIds }, _.bind(function(result) { - if (result.success) { - this.refreshData(); - } else { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); + if(!result.success) { + return Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); } + this.refreshData(); }, this)); }, refreshData: function() { - var configModel = new EditorConfigModel({ _courseId: this.model.get('_id') }); - // Ensure that the latest config model is always up-to-date when entering this screen - configModel.fetch({ + // ensure that the config model is up-to-date when entering this screen + (new EditorConfigModel({ _courseId: this.model.get('_id') })).fetch({ success: _.bind(function(model, response, options) { Origin.editor.data.config = model; - Origin.trigger('scaffold:updateSchemas', function() { - this.setupExtensions(); - }, this); + Origin.trigger('scaffold:updateSchemas', this.setupExtensions, this); }, this) }); }, + addExtension: function() { + this.postData('/api/extension/enable/'); + }, + + removeExtension: function() { + this.postData('/api/extension/disable/'); + }, + + /** + * Event handling + */ + onAddExtensionClicked: function(event) { this.currentSelectedIds = [$(event.currentTarget).attr('data-id')]; var extensionName = $(event.currentTarget).attr('data-displayname'); @@ -93,17 +95,7 @@ define(function(require) { }, onAddExtensionConfirmed: function(confirmed) { - if(confirmed) { - Origin.trigger('editorExtensionsEdit:views:add'); - } - }, - - addExtension: function() { - this.postData('/api/extension/enable/'); - }, - - removeExtension: function() { - this.postData('/api/extension/disable/'); + if(confirmed) Origin.trigger('editorExtensionsEdit:views:add'); }, onRemoveExtensionClicked: function(event) { @@ -118,15 +110,11 @@ define(function(require) { }, onRemoveExtensionConfirmed: function(confirmed) { - if(confirmed) { - Origin.trigger('editorExtensionsEdit:views:remove'); - } + if(confirmed) Origin.trigger('editorExtensionsEdit:views:remove'); } - }, - { + }, { template: 'editorExtensionsEdit' }); return EditorExtensionsEditView; - }); diff --git a/frontend/src/core/editor/global/views/editorOriginView.js b/frontend/src/core/editor/global/views/editorOriginView.js index 5712222967..c7f1500282 100644 --- a/frontend/src/core/editor/global/views/editorOriginView.js +++ b/frontend/src/core/editor/global/views/editorOriginView.js @@ -5,16 +5,11 @@ define(function(require){ var Helpers = require('coreJS/app/helpers'); var EditorOriginView = OriginView.extend({ - events: { - 'click .paste-cancel' : 'pasteCancel', + 'click .paste-cancel': 'onPasteCancel', 'click .field-object .legend': 'onFieldObjectClicked' }, - onFieldObjectClicked: function(event) { - $(event.currentTarget).closest('.field-object').children('.collapsed').first().toggleClass('expanded'); - }, - initialize: function(options) { // Set form on view if (options && options.form) { @@ -22,23 +17,31 @@ define(function(require){ this.filters = []; } OriginView.prototype.initialize.apply(this, arguments); - this.listenTo(Origin, 'sidebarFieldsetFilter:filterForm', this.filterForm); - this.listenTo(Origin, 'editorView:pasteCancel', this.hidePasteZones); + + this.listenTo(Origin, { + 'sidebarFieldsetFilter:filterForm': this.filterForm, + 'editorView:pasteCancel': this.hidePasteZones + }); + }, + + postRender: function() { + if (!this.form) { + return this.setViewToReady(); + } + this.$('.form-container').append(this.form.el); + // Set the delays going to stop jumping pages + _.delay(_.bind(this.setViewToReady, this, 400); }, filterForm: function(filter) { - // Check if the tag is already being filtered and remove it - if (_.contains(this.filters, filter)) { - this.filters = _.reject(this.filters, function(filterItem) { - return filterItem === filter; - }); + // toggle filter + if(_.contains(this.filters, filter)) { + this.filters = _.reject(this.filters, function(filterItem) { return filterItem === filter; }); } else { - // Else add it to array - this.filters.push(filter); + this.filters.push(filter); } - // Now actually filter the form - if (this.filters.length === 0) { + if(this.filters.length === 0) { $('.form-container > form > div > fieldset').removeClass('display-none'); } else { $('.form-container > form > div > fieldset').addClass('display-none'); @@ -48,97 +51,42 @@ define(function(require){ } }, - postRender: function() { - // On post render - pop the form into place - if (!this.form) { - this.setViewToReady(); - return; - } - var that = this; - this.$('.form-container').append(this.form.el); - // Set the delays going to stop jumping pages - _.delay(function() { - that.setViewToReady(); - }, 400); - }, - - onCopy: function(event) { - if (event) { - event.preventDefault(); - } - - Origin.trigger('editorView:copy', this.model); - }, - - onCopyID: function(event) { - if (event) { - event.preventDefault(); - } - - Origin.trigger('editorView:copyID', this.model); - }, - - onCut: function(event) { - if (event) { - event.preventDefault(); - } - - Origin.trigger('editorView:cut', this); - }, - - capitalise: function(string) { - return string.charAt(0).toUpperCase() + string.slice(1); - }, - - onPaste: function(event) { - event.preventDefault(); - event.stopPropagation(); - - Origin.trigger('editorView:paste', this.model.get('_parentId'), $(event.target).data('sort-order'), $(event.target).data('paste-layout')); - }, - - pasteCancel: function(event) { - event.preventDefault(); - - Origin.trigger('editorView:pasteCancel', this.model); + showPasteZones: function (type) { + $('.paste-zone').addClass('display-none'); + $('.add-control').addClass('display-none'); + if(type) $('.paste-zone-' + type).removeClass('display-none'); }, hidePasteZones: function() { - // Purposeful global selector here $('.paste-zone').addClass('display-none'); $('.add-control').removeClass('display-none'); }, - openContextMenu: function (e) { - e.stopPropagation(); - e.preventDefault(); - - Origin.trigger('contextMenu:open', this, e); - }, - - showPasteZones: function (type) { - $('.paste-zone').addClass('display-none'); - $('.add-control').addClass('display-none'); - type && $('.paste-zone-' + type).removeClass('display-none'); - }, - showDropZones: function () { - // Purposeful global selector here $('.paste-zone').addClass('display-none'); - // Hide the links within the dropzone $('.add-control').addClass('display-none'); $('.paste-zone-'+ this.model.get('_type') + ' a').addClass('display-none'); - $('.paste-zone-'+ this.model.get('_type')).addClass('paste-zone-available').removeClass('display-none'); - this.$el.parent().children('.drop-only').removeClass('display-none'); + + $('.paste-zone-'+ this.model.get('_type')) + .addClass('paste-zone-available') + .removeClass('display-none'); + + this.$el.parent() + .children('.drop-only') + .removeClass('display-none'); }, hideDropZones: function() { - // Purposeful global selectors here - $('.paste-zone').addClass('display-none').removeClass('paste-zone-available'); + $('.paste-zone') + .addClass('display-none') + .removeClass('paste-zone-available'); + $('.add-control').removeClass('display-none'); - // Show the links within the dropzone again, incase copy is initiated $('.paste-zone a').removeClass('display-none'); - this.$el.parent().children('.drop-only').addClass('display-none') + + this.$el.parent() + .children('.drop-only') + .addClass('display-none'); }, save: function() { @@ -152,8 +100,7 @@ define(function(require){ if (errors) { var errorText = - window.polyglot.t('app.validationfailedmessage') + - "

" + + window.polyglot.t('app.validationfailedmessage') + "

" + this.buildErrorMessage(errors, ''); // TODO remove when we've got a better solution @@ -165,12 +112,11 @@ define(function(require){ this.form.commit(); this.model.pruneAttributes(); - var self = this; var attrs = this.getAttributesToSave(); this.model.save(attrs, { patch: (attrs) ? true : false, - error: _.bind(this.onSaveError, self), - success: _.bind(this.onSaveSuccess, self) + success: _.bind(this.onSaveSuccess, this) + error: _.bind(this.onSaveError, this), }); }, @@ -189,15 +135,53 @@ define(function(require){ return null; }, + /** + * Event handling + */ + + openContextMenu: function (e) { + e && e.stopPropagation() && e.preventDefault(); + Origin.trigger('contextMenu:open', this, e); + }, + + onFieldObjectClicked: function(event) { + $(event.currentTarget) + .closest('.field-object') + .children('.collapsed') + .first() + .toggleClass('expanded'); + }, + + onCopy: function(e) { + e && e.preventDefault(); + Origin.trigger('editorView:copy', this.model); + }, + + onCopyID: function(e) { + e && e.preventDefault(); + Origin.trigger('editorView:copyID', this.model); + }, + + onCut: function(e) { + e && e.preventDefault(); + Origin.trigger('editorView:cut', this); + }, + + onPaste: function(e) { + e && e.preventDefault() && e.stopPropagation(); + Origin.trigger('editorView:paste', this.model.get('_parentId'), $(event.target).data('sort-order'), $(event.target).data('paste-layout')); + }, + + onPasteCancel: function(e) { + e && e.preventDefault(); + Origin.trigger('editorView:pasteCancel', this.model); + }, + onSaveError: function(pTitle, pText) { var title = _.isString(pTitle) ? pTitle : window.polyglot.t('app.errordefaulttitle'); var text = _.isString(pText) ? pText : window.polyglot.t('app.errorsave'); + Origin.Notify.alert({ type: 'error', title: title, text: text }); - Origin.Notify.alert({ - type: 'error', - title: title, - text: text - }); Origin.trigger('sidebar:resetButtons'); }, diff --git a/frontend/src/core/editor/global/views/editorPasteZoneView.js b/frontend/src/core/editor/global/views/editorPasteZoneView.js index 7f0de2bf4c..739c3fc2b1 100644 --- a/frontend/src/core/editor/global/views/editorPasteZoneView.js +++ b/frontend/src/core/editor/global/views/editorPasteZoneView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); + var Helpers = require('coreJS/app/helpers'); var EditorOriginView = require('editorGlobal/views/editorOriginView'); var Origin = require('coreJS/app/origin'); @@ -10,16 +10,7 @@ define(function(require){ className: 'display-none paste-zone', events: { - 'click .editor-paste-zone-paste': 'onPasteElementClicked' - }, - - onPasteElementClicked: function(event) { - event && event.preventDefault(); - var parentId = this.model.get('_parentId'); - var sortOrder = this.model.get('_pasteZoneSortOrder'); - var layout = this.model.get('_pasteZoneLayout'); - - Origin.trigger('editorView:paste', parentId, sortOrder, layout); + 'click .editor-paste-zone-paste': 'onPasteElementClicked' }, preRender: function() { @@ -29,56 +20,69 @@ define(function(require){ }, postRender: function () { - var view = this; - var type = view.model.get('_type'); - var parentId = view.model.get('_parentId'); + var type = this.model.get('_type'); this.$el.addClass('paste-zone-' + type); - this.$el.droppable({ accept: '.' + type + '-draggable', hoverClass: 'paste-zone-droppable', - drop: function (e, ui) { - var $component = $(ui.draggable); - var contentId = $component.attr('data-' + type + '-id'); - var droppedOnId = $component.attr('data-' + view.model.get('_parent') + '-id'); - var sortOrder = $(this).find('.paste-' + type).attr('data-sort-order'); - var newData = { - _sortOrder: sortOrder, - _parentId: parentId - }; - $.ajax({ - type: 'PUT', - url:'/api/content/' + type + '/' + contentId, - data: newData, - success: function(jqXHR, textStatus, errorThrown) { - var contentCollection = Origin.editor.data[view.model._siblings]; - contentCollection.fetch().done(function() { - // Re-render the move-from content item - Origin.trigger('editorView:move' + view.capitalise(type) + ':' + droppedOnId); - // Re-render the move-to content item if needed - if (droppedOnId !== parentId) { - Origin.trigger('editorView:move' + view.capitalise(type) + ':' + parentId); - } - }); - }, - error: function(jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ - type: 'error', - text: jqXHR.responseJSON.message - }); - } - }); + drop: _.bind(this.onDrop, this) + }); + }, + + /** + * Event handling + */ + + onPasteElementClicked: function(event) { + event && event.preventDefault(); + + var parentId = this.model.get('_parentId'); + var sortOrder = this.model.get('_pasteZoneSortOrder'); + var layout = this.model.get('_pasteZoneLayout'); + Origin.trigger('editorView:paste', parentId, sortOrder, layout); + }, + + onDrop: function(e, ui) { + var type = this.model.get('_type'); + var parentId = this.model.get('_parentId'); + var $component = $(ui.draggable); + var contentId = $component.attr('data-' + type + '-id'); + var droppedOnId = $component.attr('data-' + this.model.get('_parent') + '-id'); + var sortOrder = $(this).find('.paste-' + type).attr('data-sort-order'); + var newData = { + _sortOrder: sortOrder, + _parentId: parentId + }; + $.ajax({ + type: 'PUT', + url:'/api/content/' + type + '/' + contentId, + data: newData, + success: this.onSaveSuccess, + error: this.onSaveError + }); + }, + + onSaveSuccess: function(jqXHR, textStatus, errorThrown) { + var contentCollection = Origin.editor.data[view.model._siblings]; + contentCollection.fetch().done(function() { + // Re-render the move-from content item + Origin.trigger('editorView:move' + Helpers.capitalise(type) + ':' + droppedOnId); + // Re-render the move-to content item if needed + if (droppedOnId !== parentId) { + Origin.trigger('editorView:move' + Helpers.capitalise(type) + ':' + parentId); } }); }, - capitalise: function(string) { - return string.charAt(0).toUpperCase() + string.slice(1); + onSaveError: function(jqXHR) { + Origin.Notify.alert({ + type: 'error', + text: jqXHR.responseJSON.message + }); } }, { template: 'editorPasteZone' }); return EditorPasteZone; - }); diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 3ea600c606..82290d3bfd 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -5,7 +5,6 @@ * - Sort out error handling */ define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); @@ -23,22 +22,19 @@ define(function(require){ var ExtensionModel = require('editorExtensions/models/extensionModel'); var EditorView = EditorOriginView.extend({ + className: "editor-view", + tagName: "div", settings: { autoRender: false }, - exporting: false, - tagName: "div", - - className: "editor-view", - events: { - "click a.page-add-link" : "addNewPage", - "click a.load-page" : "loadPage", - "mouseover div.editable" : "onEditableHoverOver", - "mouseout div.editable" : "onEditableHoverOut" + "click a.page-add-link": "addNewPage", + "click a.load-page": "loadPage", + "mouseover div.editable": "onEditableHoverOver", + "mouseout div.editable": "onEditableHoverOut" }, preRender: function(options) { @@ -49,14 +45,16 @@ define(function(require){ this.currentCourse = Origin.editor.data.course; this.currentPageId = options.currentPageId; - this.listenTo(Origin, 'editorView:refreshView', this.setupEditor); - this.listenTo(Origin, 'editorView:copy', this.addToClipboard); - this.listenTo(Origin, 'editorView:copyID', this.copyIdToClipboard); - this.listenTo(Origin, 'editorView:cut', this.cutContent); - this.listenTo(Origin, 'editorView:paste', this.pasteFromClipboard); - this.listenTo(Origin, 'editorCommon:download', this.downloadProject); - this.listenTo(Origin, 'editorCommon:preview', this.previewProject); - this.listenTo(Origin, 'editorCommon:export', this.exportProject); + this.listenTo(Origin, { + 'editorView:refreshView': this.setupEditor, + 'editorView:copy': this.addToClipboard, + 'editorView:copyID': this.copyIdToClipboard, + 'editorView:cut': this.cutContent, + 'editorView:paste': this.pasteFromClipboard, + 'editorCommon:download': this.downloadProject, + 'editorCommon:preview': this.previewProject, + 'editorCommon:export': this.exportProject + }); this.render(); this.setupEditor(); @@ -66,21 +64,15 @@ define(function(require){ }, - onEditableHoverOver: function(e) { - e.stopPropagation(); - $(e.currentTarget).addClass('hovering'); - }, - onEditableHoverOut: function(e) { - $(e.currentTarget).removeClass('hovering'); - }, setupEditor: function() { this.renderCurrentEditorView(); }, - downloadProject: function(event) { - event && event.preventDefault(); + downloadProject: function(e) { + e && e.preventDefault(); + var self = this; if (helpers.validateCourseContent(this.currentCourse) && !Origin.editor.isDownloadPending) { @@ -91,7 +83,7 @@ define(function(require){ // Report progress for 45 seconds $('.editor-common-sidebar-downloading').animate({ width: '100%' }, 45000); } - + var courseId = Origin.editor.data.course.get('_id'); var tenantId = Origin.sessionModel.get('tenantId'); @@ -113,7 +105,7 @@ define(function(require){ } } else { self.resetDownloadProgress(); - + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') @@ -122,7 +114,7 @@ define(function(require){ }, error: function (jqXHR, textStatus, errorThrown) { self.resetDownloadProgress(); - + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') @@ -134,8 +126,8 @@ define(function(require){ } }, - exportProject: function(event) { - event && event.preventDefault(); + exportProject: function(e) { + e && e.preventDefault(); // aleady processing, don't try again if(this.exporting) return; @@ -192,8 +184,8 @@ define(function(require){ window.open('/preview/' + tenantId + '/' + courseId + '/', 'preview'); }, - previewProject: function(event) { - event && event.preventDefault(); + previewProject: function(e) { + e && e.preventDefault(); var self = this; @@ -238,65 +230,41 @@ define(function(require){ var self = this; var pollUrl = function() { - $.ajax({ - method: 'get', - url: url, - success: function(jqXHR, textStatus, errorThrown) { - if (jqXHR.progress == "100") { - clearInterval(pollId); - self.launchCoursePreview(); - self.resetPreviewProgress(); - } else { - $('.navigation-loading-progress').animate({ width: jqXHR.progress + '%' }, 1000); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - clearInterval(pollId); - self.resetPreviewProgress(); - - Origin.Notify.alert({ - type: 'error', - text: errorThrown - }); + $.get(url, function(jqXHR, textStatus, errorThrown) { + if (jqXHR.progress < "100") { + $('.navigation-loading-progress').animate({ width: jqXHR.progress + '%' }, 1000); + return; } + clearInterval(pollId); + self.launchCoursePreview(); + self.resetPreviewProgress(); + }).fail(function(jqXHR, textStatus, errorThrown) { + clearInterval(pollId); + self.resetPreviewProgress(); + Origin.Notify.alert({ type: 'error', text: errorThrown }); }); } // Check for updated progress every 3 seconds var pollId = setInterval(pollUrl, 3000); }, - - updateDownloadProgress: function(url) { - var self = this; - - var pollUrl = function() { - $.ajax({ - method: 'get', - url: url, - success: function(jqXHR, textStatus, errorThrown) { - if (jqXHR.progress == "100") { - clearInterval(pollId); - self.resetDownloadProgress(); - } else { - $('.editor-common-sidebar-downloading-progress').animate({ width: jqXHR.progress + '%' }, 1000); - } - }, - error: function(jqXHR, textStatus, errorThrown) { - clearInterval(pollId); - - self.resetDownloadProgress(); - - Origin.Notify.alert({ - type: 'error', - text: errorThrown - }); + updateDownloadProgress: function(url) { + // Check for updated progress every 3 seconds + var pollId = setInterval(_.bind(function pollURL() { + $.get(url, function(jqXHR, textStatus, errorThrown) { + if (jqXHR.progress < "100") { + $('.editor-common-sidebar-downloading-progress').animate({ width: jqXHR.progress + '%' }, 1000); + return; } + clearInterval(pollId); + this.resetDownloadProgress(); + }).fail(function(jqXHR, textStatus, errorThrown) { + clearInterval(pollId); + this.resetDownloadProgress(); + Origin.Notify.alert({ type: 'error', text: errorThrown }); }); - } - - // Check for updated progress every 3 seconds - var pollId = setInterval(pollUrl, 3000); + }, this), 3000); }, resetPreviewProgress: function() { @@ -306,51 +274,34 @@ define(function(require){ $('.navigation-loading-indicator').addClass('display-none'); Origin.editor.isPreviewPending = false; }, - + resetDownloadProgress: function() { $('.editor-common-sidebar-downloading-progress').css('width', 0).stop(); $('.editor-common-sidebar-download-inner').removeClass('display-none'); $('.editor-common-sidebar-downloading').addClass('display-none'); - Origin.editor.isDownloadPending = false; + Origin.editor.isDownloadPending = false; }, - /* - Archive off the clipboard - */ addToClipboard: function(model) { - _.defer(_.bind(function() { - _.invoke(Origin.editor.data.clipboard.models, 'destroy') - }, this)); + _.defer(_.bind(function() { _.invoke(Origin.editor.data.clipboard.models, 'destroy') }, this)); - var self = this; - var copiedObjectType = model.get('_type'); + var postData = { + objectId: model.get('_id'), + courseId: Origin.editor.data.course.get('_id'), + referenceType: model._siblings + }; - $.ajax({ - method: 'post', - url: '/api/content/clipboard/copy', - data: { - objectId: model.get('_id'), - courseId: Origin.editor.data.course.get('_id'), - referenceType: model._siblings - }, - success: function (jqXHR, textStatus, errorThrown) { + $.post('/api/content/clipboard/copy', postData, _.bind(function(jqXHR, textStatus, errorThrown) { if (!jqXHR.success) { - Origin.Notify.alert({ - type: 'error', - text: jqXHR.message - }); - } else { - Origin.editor.clipboardId = jqXHR.clipboardId; - Origin.editor.pasteParentModel = model.getParent(); - self.showPasteZones(copiedObjectType); + Origin.Notify.alert({ type: 'error', text: jqXHR.message }); + return; } - }, - error: function (jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorcopy') - }); - } + Origin.editor.clipboardId = jqXHR.clipboardId; + Origin.editor.pasteParentModel = model.getParent(); + this.showPasteZones(model.get('_type')); + }, this)).fail(function (jqXHR, textStatus, errorThrown) { + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorcopy') }); + }); }); }, @@ -360,55 +311,37 @@ define(function(require){ if (helpers.copyStringToClipboard(id)) { Origin.Notify.alert({ type: 'success', - text: window.polyglot.t('app.copyidtoclipboardsuccess', {id: id}) + text: window.polyglot.t('app.copyidtoclipboardsuccess', { id: id }) }); } else { Origin.Notify.alert({ type: 'warning', - text: window.polyglot.t('app.app.copyidtoclipboarderror', {id: id}) + text: window.polyglot.t('app.app.copyidtoclipboarderror', { id: id }) }); } }, pasteFromClipboard: function(parentId, sortOrder, layout) { - $.ajax({ - method: 'post', - url: '/api/content/clipboard/paste', - data: { - id: Origin.editor.clipboardId, - parentId: parentId, - layout: layout, - sortOrder: sortOrder, - courseId: Origin.editor.data.course.get('_id') - }, - success: function (jqXHR, textStatus, errorThrown) { - if (!jqXHR.success) { - Origin.Notify.alert({ - type: 'error', - text: jqXHR.message - }); - } else { - Origin.editor.clipboardId = null; - Origin.editor.pasteParentModel = null; - Origin.trigger('editor:refreshData', function() { - // TODO: HACK - I think this should probably pass a callback in - // and return it with the new item - this way the individual views - // can handle the new views and models - Backbone.history.loadUrl(); - }, this); - } - }, - error: function (jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorpaste') - }); + $.post('/api/content/clipboard/paste', function(jqXHR, textStatus, errorThrown) { + if (!jqXHR.success) { + Origin.Notify.alert({ type: 'error', text: jqXHR.message }); + return; } + Origin.editor.clipboardId = null; + Origin.editor.pasteParentModel = null; + Origin.trigger('editor:refreshData', function() { + // TODO: HACK - I think this should probably pass a callback in + // and return it with the new item - this way the individual views + // can handle the new views and models + Backbone.history.loadUrl(); + }, this); + }, this).fail(function(jqXHR, textStatus, errorThrown) { + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorpaste') }); }); }, createModel: function (type) { - var model = false; + var model; switch (type) { case 'contentObjects': model = new EditorContentObjectModel(); @@ -429,32 +362,29 @@ define(function(require){ renderCurrentEditorView: function() { Origin.trigger('editorView:removeSubViews'); - switch (this.currentView) { - case 'menu': - this.renderEditorMenu(); - break; - case 'page': - this.renderEditorPage(); - break; + if(this.currentView === 'menu') { + this.renderEditorMenu(); + } else if(this.currentView === 'page') { + this.renderEditorPage(); } Origin.trigger('editorSidebarView:addOverviewView'); }, renderEditorMenu: function() { - this.$('.editor-inner').html(new EditorMenuView({ - model: Origin.editor.data.course - }).$el); + var view = new EditorMenuView({ model: Origin.editor.data.course }); + this.$('.editor-inner').html(view.$el); }, renderEditorPage: function() { - this.$('.editor-inner').html(new EditorPageView({ - model: Origin.editor.data.contentObjects.findWhere({_id: this.currentPageId}), - }).$el); + var view = new EditorPageView({ + model: Origin.editor.data.contentObjects.findWhere({ _id: this.currentPageId }) + }); + this.$('.editor-inner').html(view.$el); }, cutContent: function(view) { - var type = this.capitalise(view.model.get('_type')); + var type = helpers.capitalise(view.model.get('_type')); var collectionType = view.model._siblings; this.addToClipboard(view.model); @@ -468,10 +398,21 @@ define(function(require){ }); } + /** + * Event handling + */ + + onEditableHoverOver: function(e) { + e && e.stopPropagation(); + $(e.currentTarget).addClass('hovering'); + }, + + onEditableHoverOut: function(e) { + $(e.currentTarget).removeClass('hovering'); + } }, { template: 'editor' }); return EditorView; - }); diff --git a/frontend/src/core/editor/menu/views/editorMenuItemView.js b/frontend/src/core/editor/menu/views/editorMenuItemView.js index e2d15d91b6..422f0d5f47 100644 --- a/frontend/src/core/editor/menu/views/editorMenuItemView.js +++ b/frontend/src/core/editor/menu/views/editorMenuItemView.js @@ -1,22 +1,19 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('coreJS/app/origin'); var EditorOriginView = require('editorGlobal/views/editorOriginView'); var EditorMenuItemView = EditorOriginView.extend({ - - tagName: "div", - className: "editor-menu-item", + tagName: "div", autoScrollTimer: false, events: { - 'click .editor-menu-item-inner' : 'onMenuItemClicked', - 'click a.open-context-contentObject' : 'openContextMenu', - 'click a.contentObject-delete' : 'deleteItemPrompt', - 'mousedown .handle' : 'enableDrag' + 'click .editor-menu-item-inner': 'onMenuItemClicked', + 'click a.open-context-contentObject': 'openContextMenu', + 'click a.contentObject-delete': 'deleteItemPrompt', + 'mousedown .handle': 'enableDrag' }, preRender: function() { @@ -27,7 +24,6 @@ define(function(require){ postRender: function() { // setup drag this.$el.closest('.editor-menu').on('mousemove', _.bind(this.handleDrag, this)); - // Check if the current item is expanded and update the next menuLayerView // This can end up being recursive if an item is selected inside a few menu items if (this.model.get('_isExpanded')) { @@ -89,15 +85,8 @@ define(function(require){ this.setItemAsSelected(); if(currentClicks === 1) { - - timer = setTimeout(_.bind(function() { - - this.model.set('clicks', 0); - - }, this), delay); - + timer = setTimeout(_.bind(function() { this.model.set('clicks', 0); }, this), delay); } else if (currentClicks === 2) { - clearTimeout(timer); // Only if the current double clicked it is a page item if (this.model.get('_type') == 'page') { @@ -107,16 +96,14 @@ define(function(require){ } this.model.set('clicks', 0); } - }, selectedLevel: function() { $(".editor-menu-layer").each(function() { if($(this).hasClass("selected")){ - $(this).removeClass("selected"); + $(this).removeClass("selected"); } }); - if($(this.el).hasClass("content-type-menu")) { $(this.el).parent().parent().next().addClass("selected"); } @@ -134,13 +121,11 @@ define(function(require){ Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/page/' + this.model.get('_id')); }, - - gotoSubMenuEditor: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/menu/' + this.model.get('_id') + '/edit'); - }, + gotoSubMenuEditor: function() { + Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/menu/' + this.model.get('_id') + '/edit'); + }, setItemAsSelected: function() { - // If this item is already selected please do nothing // because sometimes nothing is quite compelling if (this.model.get('_isSelected')) return; @@ -156,16 +141,15 @@ define(function(require){ this.setParentSelectedState(); } - this.model.set({'_isExpanded' : (isMenuType ? true : false)}); + this.model.set({ '_isExpanded' : (isMenuType ? true : false) }); - this.model.set({'_isSelected': true}); + this.model.set({ '_isSelected': true }); // This event passes out the view to the editorMenuView to add // a editorMenuLayerView and setup this.subView Origin.trigger('editorView:menuView:updateSelectedItem', this); this.selectedLevel(); - }, setParentSelectedState: function() { @@ -206,12 +190,10 @@ define(function(require){ } this.$el.removeClass('expanded'); } - // If this item is not meant to be expanded - remove subView if (!isExpanded && isMenuType && this.subView) { this.subView.remove(); } - }, editMenuItem: function() { @@ -325,11 +307,9 @@ define(function(require){ } }, 10); } - }, { template: 'editorMenuItem' }); return EditorMenuItemView; - }); diff --git a/frontend/src/core/editor/menu/views/editorMenuSidebarView.js b/frontend/src/core/editor/menu/views/editorMenuSidebarView.js index 88fd2dc2b4..639f1d70b4 100644 --- a/frontend/src/core/editor/menu/views/editorMenuSidebarView.js +++ b/frontend/src/core/editor/menu/views/editorMenuSidebarView.js @@ -1,17 +1,13 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - - var EditorMenuSidebarView = SidebarItemView.extend({ - - // If adding 'events', extend from the base view - - }, { - template: 'editorMenuSidebar' - }); - - return EditorMenuSidebarView; + var EditorMenuSidebarView = SidebarItemView.extend({ + // If adding 'events', extend from the base view + }, { + template: 'editorMenuSidebar' + }); + return EditorMenuSidebarView; }); diff --git a/frontend/src/core/editor/menu/views/editorMenuView.js b/frontend/src/core/editor/menu/views/editorMenuView.js index 7476e98fe2..62ab11cd8b 100644 --- a/frontend/src/core/editor/menu/views/editorMenuView.js +++ b/frontend/src/core/editor/menu/views/editorMenuView.js @@ -1,33 +1,29 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('coreJS/app/origin'); var EditorOriginView = require('editorGlobal/views/editorOriginView'); var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); var EditorMenuLayerView = require('editorMenu/views/editorMenuLayerView'); var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); - - var EditorMenuView = EditorOriginView.extend({ - - tagName: "div", + var EditorMenuView = EditorOriginView.extend({ className: "editor-menu", + tagName: "div", preRender: function() { - this.listenTo(Origin, 'editorView:menuView:updateSelectedItem', this.updateSelectedItem); - this.listenTo(Origin, 'window:resize', this.setupHorizontalScroll); + this.listenTo(Origin, { + 'editorView:menuView:updateSelectedItem': this.updateSelectedItem, + Origin, 'window:resize': this.setupHorizontalScroll + }); }, postRender: function() { this.setupMenuViews(); - _.defer(this.setViewToReady); + _.defer(this.setViewToReady); }, - /** - * Renders a menu layer for each child of the contentObject, and each item within - */ + // Renders a menu layer for each child of the contentObject, and each item within setupMenuViews: function() { - // If there's no currentContentObjectId if (!Origin.editor.currentContentObjectId) { this.addMenuLayerView(this); @@ -35,17 +31,15 @@ define(function(require){ this.addMenuLayerView(this); this.preserveCurrentMenuState(); } - }, /** * Recursive function which shows the expanded children for a given context model - * @param {Model} A given contextObject model + * @param {Model} A given contextObject model */ addMenuLayerView: function(view) { // Render menu layer view var menuLayer = this.renderMenuLayerView(view, false); - // Add children views of current model view.model.getChildren().each(function(contentObject) { menuLayer.append(new EditorMenuItemView({ @@ -62,7 +56,7 @@ define(function(require){ }, /** - * Presever the current menu state by finding the current element + * Presever the current menu state by finding the current element * then setting it's parent recursively to _isExpanded */ @@ -78,31 +72,25 @@ define(function(require){ /** * Appemds a menu item layer for a given ID to the editor * @param {String} parentId Unique identifier of the parent - * @param {Boolean} isCourseObject Flag to indicate if this is at the root level + * @param {Boolean} isCourseObject Flag to indicate if this is at the root level */ renderMenuLayerView: function(view) { // Get the current views _id to store as the _parentId var parentId = view.model.get('_id'); - // Create MenuLayerView var menuLayerView = new EditorMenuLayerView({_parentId: parentId}); - // Set subview on layerView so this can be removed view.subView = menuLayerView; - // Render and append the view $('.editor-menu-inner').append(menuLayerView.$el); - // Return the container ready to render menuItemView's return menuLayerView.$('.editor-menu-layer-inner'); }, updateSelectedItem: function(view) { - // This is triggered when an item is clicked // Store this id and fake navigate to bookmark current users position this.storeSelectedItem(view); - // If this item is a menu item let's render a MenuItemLayerView if (view.model.get('_type') === 'menu') { this.addMenuLayerView(view); @@ -120,39 +108,35 @@ define(function(require){ var selectedItemId = view.model.get('_id'); // Store the ID of the currently selected contentObject Origin.editor.currentContentObjectId = selectedItemId; - // Reset the address bar to allow persistance of the 'Back' button Origin.router.navigate('#editor/' + Origin.editor.data.course.id + '/menu/' + selectedItemId); }, /** - * Recursive function which shows any children for a given contentObject and sets + * Recursive function which shows any children for a given contentObject and sets * the UI element to 'expanded' - * @param {Model} selectedItem A given contextObject model + * @param {Model} selectedItem A given contextObject model */ setParentElementToSelected: function(selectedItem) { - if (selectedItem.get('_parentId') === Origin.editor.data.course.get('_id')) { return; } - var parentModel = Origin.editor.data.contentObjects.findWhere({ _id: selectedItem.get('_parentId') }); - parentModel.set('_isExpanded', true); - + this.setParentElementToSelected(parentModel); }, setupHorizontalScroll: function(windowWidth, windowHeight) { - var $menuLayers = this.$('.editor-menu-layer'); - var $menuView = this.$el; - var $menuControls = this.$('.editor-menu-layer-controls'); - // Get item width - var itemWidth = $menuLayers.first().outerWidth(true); - // Set menu holder to width by items length - $('.editor-menu-inner').width(itemWidth * $menuLayers.length); + var $menuLayers = this.$('.editor-menu-layer'); + var $menuView = this.$el; + var $menuControls = this.$('.editor-menu-layer-controls'); + // Get item width + var itemWidth = $menuLayers.first().outerWidth(true); + // Set menu holder to width by items length + $('.editor-menu-inner').width(itemWidth * $menuLayers.length); }, scrollToElement: function() { @@ -180,13 +164,10 @@ define(function(require){ var id = $('.editor-menu-item-inner', $draggedElement).attr('data-id'); var sortOrder = $draggedElement.index() + 1; var parentId = $draggedElement.closest('.editor-menu-layer').attr('data-parentId'); - // Find the model var currentModel = Origin.editor.data.contentObjects.findWhere({_id: id}); - // Save just the new attributes and patch them - currentModel.save({_sortOrder: sortOrder, _parentId: parentId}, {patch: true}); - + currentModel.save({ _sortOrder: sortOrder, _parentId: parentId }, { patch: true }); currentModel.set('_isDragging', false); }, @@ -204,11 +185,9 @@ define(function(require){ } }); } - }, { template: 'editorMenu' }); return EditorMenuView; - }); diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js index d2a2665555..95d09c9726 100644 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js +++ b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js @@ -1,27 +1,22 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - + var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); var EditorMenuSettingsEditSidebarView = SidebarItemView.extend({ - events: { - 'click .editor-menusettings-edit-sidebar-save' : 'saveEditing' + 'click .editor-menusettings-edit-sidebar-save': 'saveEditing' }, saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-menusettings-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('editorMenuSettingsEditSidebar:views:save'); + event && event.preventDefault(); + this.updateButton('.editor-menusettings-edit-sidebar-save', window.polyglot.t('app.saving')); + Origin.trigger('editorMenuSettingsEditSidebar:views:save'); } - }, { template: 'editorMenuSettingsEditSidebar' - }); return EditorMenuSettingsEditSidebarView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js index f9a8fd328f..585713e95c 100644 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js +++ b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js @@ -43,19 +43,14 @@ define(function(require) { if (event) { event.preventDefault(); } - - var selectedMenu = this.collection.findWhere({_isSelected: true}); - - if (selectedMenu === undefined) { + if(this.collection.findWhere({ _isSelected: true }) === undefined) { return this.onSaveError(null, window.polyglot.t('app.errornomenuselected')); } - $.post('/api/menu/' + selectedMenu.get('_id') + '/makeitso/' + this.model.get('_courseId')) .error(this.onSaveError) .done(this.onSaveSuccess); } - }, - { + }, { template: "editorMenuSettingsEdit" }); diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js index 241ae08d19..47acd38542 100644 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js +++ b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js @@ -14,7 +14,7 @@ define(function(require){ }, events: { - 'click' : 'toggleSelect' + 'click': 'toggleSelect' }, preRender: function() { @@ -30,7 +30,6 @@ define(function(require){ selectMenu: function() { Origin.trigger('editor:menuSettings:selected'); - this.$el.addClass('selected'); this.model.set({_isSelected: true}); }, @@ -44,4 +43,4 @@ define(function(require){ }); return MenuSettingsView; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/page/views/editorPageView.js b/frontend/src/core/editor/page/views/editorPageView.js index 59ddfce746..410df366bc 100644 --- a/frontend/src/core/editor/page/views/editorPageView.js +++ b/frontend/src/core/editor/page/views/editorPageView.js @@ -20,7 +20,7 @@ define(function(require){ 'click a.add-article' : 'addArticle', 'click a.page-edit-button' : 'openContextMenu', 'dblclick .page-detail' : 'loadPageEdit', - 'click .paste-cancel' : 'pasteCancel' + 'click .paste-cancel' : 'onPasteCancel' }, childrenCount: 0, diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js index 3f24aef5fe..5df31ade88 100644 --- a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js +++ b/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js @@ -1,32 +1,28 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); var Backbone = require('backbone'); var EditorThemeCollectionSidebarView = SidebarItemView.extend({ - events: { - 'click .editor-theme-edit-sidebar-save' : 'saveEditing', - 'click .editor-theme-edit-sidebar-cancel' : 'cancelEditing' + 'click .editor-theme-edit-sidebar-save': 'saveEditing', + 'click .editor-theme-edit-sidebar-cancel': 'cancelEditing' }, saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-theme-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('editorThemeEditSidebar:views:save'); + event && event.preventDefault(); + this.updateButton('.editor-theme-edit-sidebar-save', window.polyglot.t('app.saving')); + Origin.trigger('editorThemeEditSidebar:views:save'); }, cancelEditing: function(event) { - event.preventDefault(); - Backbone.history.history.back(); + event && event.preventDefault(); + Backbone.history.history.back(); } - }, { template: 'editorThemeCollectionSidebar' }); return EditorThemeCollectionSidebarView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js b/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js index 2ec432d54c..04bba9515a 100644 --- a/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js +++ b/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js @@ -1,26 +1,21 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); var Backbone = require('backbone'); var EditorThemeEditSidebarView = SidebarItemView.extend({ - events: { - 'click .editor-theme-edit-sidebar-save' : 'saveEditing' + 'click .editor-theme-edit-sidebar-save': 'saveEditing' }, saveEditing: function(event) { - event.preventDefault(); - - Origin.trigger('editorThemeEditSidebar:views:save'); + event && event.preventDefault(); + Origin.trigger('editorThemeEditSidebar:views:save'); } - }, { template: 'editorThemeEditSidebar' }); return EditorThemeEditSidebarView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/theme/views/editorThemeEditView.js b/frontend/src/core/editor/theme/views/editorThemeEditView.js index 12920d04a4..fbdad1ca45 100644 --- a/frontend/src/core/editor/theme/views/editorThemeEditView.js +++ b/frontend/src/core/editor/theme/views/editorThemeEditView.js @@ -1,6 +1,5 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var EditorOriginView = require('editorGlobal/views/editorOriginView'); @@ -8,10 +7,8 @@ define(function(require) { var ThemeView = require('editorTheme/views/editorThemeView'); var EditorThemeEditView = EditorOriginView.extend({ - - tagName: "ul", - className: "editor-theme-edit", + tagName: "ul", events: { @@ -35,20 +32,14 @@ define(function(require) { }, renderThemeViews: function() { - this.collection.each(function(theme) { - var isSelected = false; - if (theme.get('_id') === this.model.get('_theme')) { isSelected = true; } - theme.set('_isSelected', isSelected); this.$('.theme-list').append(new ThemeView({model: theme}).$el); - }, this); - }, cancel: function(event) { @@ -68,7 +59,7 @@ define(function(require) { type: 'error', text: window.polyglot.t('app.errornothemeselected') }); - + Origin.trigger('sidebar:resetButtons'); return; } @@ -91,13 +82,10 @@ define(function(require) { }, this); }, this)); - } - }, - { + }, { template: 'editorThemeEdit' }); return EditorThemeEditView; - }); diff --git a/frontend/src/core/editor/theme/views/editorThemeItemView.js b/frontend/src/core/editor/theme/views/editorThemeItemView.js index 630116d6f7..29f5e47f6c 100644 --- a/frontend/src/core/editor/theme/views/editorThemeItemView.js +++ b/frontend/src/core/editor/theme/views/editorThemeItemView.js @@ -1,25 +1,22 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('coreJS/app/views/originView'); var Origin = require('coreJS/app/origin'); var ThemeItemView = OriginView.extend({ - + tagName: 'li', + settings: { autoRender: true }, - tagName: 'li', - className: function() { var isSelectedClass = (this.model.get('_isSelected')) ? ' selected' : ''; - return 'theme-list-item' + isSelectedClass; }, events: { - 'click' : 'toggleSelect' + 'click': 'toggleSelect' }, preRender: function() { @@ -31,15 +28,11 @@ define(function(require){ toggleSelect: function(event) { event && event.stopPropagation(); - - if (!this.model.get('_isSelected')) { - this.selectItem(); - } + if (!this.model.get('_isSelected')) this.selectItem(); }, selectItem: function() { Origin.trigger('editor:theme:selected'); - this.$el.addClass('selected'); this.model.set({_isSelected: true}); }, @@ -48,11 +41,9 @@ define(function(require){ this.$el.removeClass('selected'); this.model.set({_isSelected: false}); } - }, { template: 'editorThemeItem' }); return ThemeItemView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/theme/views/editorThemeView.js b/frontend/src/core/editor/theme/views/editorThemeView.js index 9d03318e05..ae475e00fa 100644 --- a/frontend/src/core/editor/theme/views/editorThemeView.js +++ b/frontend/src/core/editor/theme/views/editorThemeView.js @@ -1,23 +1,20 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var OriginView = require('coreJS/app/views/originView'); var Origin = require('coreJS/app/origin'); var ThemeView = OriginView.extend({ - tagName: 'li', className: function() { var isSelectedClass = (this.model.get('_isSelected')) ? ' selected' : ''; - return 'theme-list-item' + isSelectedClass; }, events: { - 'click' : 'toggleSelect' + 'click': 'toggleSelect' }, preRender: function() { @@ -26,15 +23,13 @@ define(function(require){ toggleSelect: function(event) { event && event.stopPropagation(); - if (!this.model.get('_isSelected')) { this.selectItem(); - } + } }, selectItem: function() { Origin.trigger('editor:theme:selected'); - this.$el.addClass('selected'); this.model.set({_isSelected: true}); }, @@ -43,11 +38,9 @@ define(function(require){ this.$el.removeClass('selected'); this.model.set({_isSelected: false}); } - }, { template: 'editorThemeItem' }); return ThemeView; - -}); \ No newline at end of file +}); From d9b4c057e0ed63420f226b6f37ebaa2bb4f232fb Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 21 Mar 2017 16:06:50 +0000 Subject: [PATCH 045/296] Fix missed editor whitespace --- .../collections/editorMenuSettingsCollection.js | 5 ++--- .../src/core/editor/theme/models/editorThemeTypeModel.js | 7 +------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js b/frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js index f214c80b36..2118a3fae3 100644 --- a/frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js +++ b/frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js @@ -1,12 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var MenuSettingsModel = require('editorMenuSettings/models/editorMenuSettingsModel'); var MenuSettingsCollection = Backbone.Collection.extend({ - model: MenuSettingsModel, + model: Backbone.Model, url: 'api/menutype' }); return MenuSettingsCollection; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/theme/models/editorThemeTypeModel.js b/frontend/src/core/editor/theme/models/editorThemeTypeModel.js index 7f7fe029f8..2065b958b8 100644 --- a/frontend/src/core/editor/theme/models/editorThemeTypeModel.js +++ b/frontend/src/core/editor/theme/models/editorThemeTypeModel.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var EditorThemeTypeModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/themetype' - }); return EditorThemeTypeModel; - -}); \ No newline at end of file +}); From 77410639e7d9d6abc3b01dfaac8d48d91ac59439 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 22 Mar 2017 19:39:00 +0000 Subject: [PATCH 046/296] Organise folder --- frontend/src/core/editor/article/index.js | 19 + .../{page => article}/less/articleEditor.less | 0 .../models/editorArticleModel.js | 2 +- .../templates/editorArticle.hbs | 0 .../templates/editorArticleEdit.hbs | 0 .../templates/editorArticleEditSidebar.hbs | 0 .../views/editorArticleEditSidebarView.js | 32 ++ .../views/editorArticleEditView.js | 9 +- .../views/editorArticleView.js | 120 ++--- frontend/src/core/editor/block/index.js | 24 + .../{page => block}/less/blockEditor.less | 0 .../models/editorBlockModel.js | 2 +- .../{page => block}/templates/editorBlock.hbs | 0 .../templates/editorBlockEdit.hbs | 0 .../templates/editorBlockEditSidebar.hbs | 0 .../block/views/editorBlockEditSidebarView.js | 28 + .../views/editorBlockEditView.js | 7 +- .../{page => block}/views/editorBlockView.js | 148 ++---- frontend/src/core/editor/component/index.js | 54 ++ .../less/componentEditor.less | 0 .../less/editing-overlay-component-list.less | 0 .../less/editing-overlay-panel.less | 0 .../less/editorComponentList.less | 0 .../models/editorComponentModel.js | 2 +- .../models/editorComponentTypeModel.js | 14 +- .../templates/editorComponent.hbs | 0 .../templates/editorComponentEdit.hbs | 0 .../templates/editorComponentEditSidebar.hbs | 0 .../templates/editorComponentList.hbs | 0 .../templates/editorComponentListItem.hbs | 0 .../templates/editorComponentListSidebar.hbs | 0 .../templates/editorComponentPasteZone.hbs | 0 .../views/editorComponentEditSidebarView.js | 8 +- .../views/editorComponentEditView.js | 19 +- .../views/editorComponentListItemView.js | 112 ++++ .../views/editorComponentListSidebarView.js | 119 +++++ .../views/editorComponentListView.js | 17 +- .../views/editorComponentPasteZoneView.js | 10 +- .../views/editorComponentView.js | 34 +- .../collections/editorConfigCollection.js | 2 +- frontend/src/core/editor/config/index.js | 23 + .../editor/config/models/editorConfigModel.js | 2 +- .../config/views/editorConfigEditView.js | 4 +- .../src/core/editor/contentObject/index.js | 71 +++ .../less/editorMenu.less | 0 .../less/editorMenuItem.less | 0 .../less/editorMenuLayer.less | 0 .../less/pageEditor.less | 0 .../models/editorContentObjectModel.js | 5 +- .../templates/editorMenu.hbs | 0 .../templates/editorMenuItem.hbs | 0 .../templates/editorMenuLayer.hbs | 0 .../templates/editorMenuSidebar.hbs | 0 .../templates/editorPage.hbs | 0 .../templates/editorPageEdit.hbs | 0 .../templates/editorPageEditSidebar.hbs | 0 .../templates/editorPageOverview.hbs | 0 .../templates/editorPageSidebar.hbs | 0 .../views/editorMenuItemView.js | 10 +- .../views/editorMenuLayerView.js | 179 +++++++ .../views/editorMenuSidebarView.js | 0 .../views/editorMenuView.js | 10 +- .../views/editorPageEditSidebarView.js | 28 + .../views/editorPageEditView.js | 7 +- .../views/editorPageOverviewView.js | 123 +++++ .../views/editorPageSidebarView.js | 6 +- .../views/editorPageView.js | 38 +- frontend/src/core/editor/course/index.js | 42 ++ .../editor/course/models/editorCourseModel.js | 22 +- .../course/templates/editorCourseEdit.hbs} | 0 .../templates/editorCourseEditSidebar.hbs} | 0 .../views/editorCourseEditSidebarView.js | 28 + .../course/views/editorCourseEditView.js} | 17 +- frontend/src/core/editor/editor.js | 498 +----------------- frontend/src/core/editor/editor_old.js | 158 ++++++ frontend/src/core/editor/extensions/index.js | 30 ++ .../extensions/models/extensionModel.js | 5 +- .../views/editorExtensionsEditSidebarView.js | 2 +- .../views/editorExtensionsEditView.js | 10 +- frontend/src/core/editor/global/helpers.js | 6 + .../global/models/editorClipboardModel.js | 2 +- frontend/src/core/editor/global/preloader.js | 8 + .../templates/partials/part_editorCommon.hbs | 76 +++ .../partials/part_settingsGeneral.hbs | 7 +- .../editor/global/views/editorOriginView.js | 6 +- .../global/views/editorPasteZoneView.js | 4 +- .../core/editor/global/views/editorView.js | 43 +- .../editor/menu/views/editorMenuLayerView.js | 179 ------- .../src/core/editor/menuSettings/index.js | 32 ++ .../views/editorMenuSettingsEditView.js | 15 +- .../views/editorMenuSettingsView.js | 2 +- .../templates/partials/part_editorCommon.hbs | 80 --- .../views/editorArticleEditSidebarView.js | 34 -- .../page/views/editorBlockEditSidebarView.js | 32 -- .../page/views/editorComponentListItemView.js | 125 ----- .../views/editorComponentListSidebarView.js | 121 ----- .../page/views/editorPageEditSidebarView.js | 32 -- .../page/views/editorPageOverviewView.js | 128 ----- .../collections/editorThemeCollection.js | 4 +- frontend/src/core/editor/theme/index.js | 34 ++ .../editor/theme/models/editorThemeModel.js | 1 + .../views/editorThemeCollectionSidebarView.js | 2 +- .../theme/views/editorThemeCollectionView.js | 9 +- .../theme/views/editorThemeEditSidebarView.js | 2 +- .../editor/theme/views/editorThemeEditView.js | 14 +- .../editor/theme/views/editorThemeItemView.js | 2 +- frontend/src/core/help/help.js | 58 ++ .../collections/myProjectCollection.js | 11 +- .../project/collections/projectCollection.js | 11 +- .../collections/sharedProjectCollection.js | 11 +- .../src/core/project/models/projectModel.js | 38 -- frontend/src/core/project/project.js | 106 ---- .../views/projectDetailEditSidebarView.js | 32 -- 113 files changed, 1581 insertions(+), 1786 deletions(-) create mode 100644 frontend/src/core/editor/article/index.js rename frontend/src/core/editor/{page => article}/less/articleEditor.less (100%) rename frontend/src/core/editor/{page => article}/models/editorArticleModel.js (86%) rename frontend/src/core/editor/{page => article}/templates/editorArticle.hbs (100%) rename frontend/src/core/editor/{page => article}/templates/editorArticleEdit.hbs (100%) rename frontend/src/core/editor/{page => article}/templates/editorArticleEditSidebar.hbs (100%) create mode 100644 frontend/src/core/editor/article/views/editorArticleEditSidebarView.js rename frontend/src/core/editor/{page => article}/views/editorArticleEditView.js (87%) rename frontend/src/core/editor/{page => article}/views/editorArticleView.js (77%) create mode 100644 frontend/src/core/editor/block/index.js rename frontend/src/core/editor/{page => block}/less/blockEditor.less (100%) rename frontend/src/core/editor/{page => block}/models/editorBlockModel.js (93%) rename frontend/src/core/editor/{page => block}/templates/editorBlock.hbs (100%) rename frontend/src/core/editor/{page => block}/templates/editorBlockEdit.hbs (100%) rename frontend/src/core/editor/{page => block}/templates/editorBlockEditSidebar.hbs (100%) create mode 100644 frontend/src/core/editor/block/views/editorBlockEditSidebarView.js rename frontend/src/core/editor/{page => block}/views/editorBlockEditView.js (88%) rename frontend/src/core/editor/{page => block}/views/editorBlockView.js (77%) create mode 100644 frontend/src/core/editor/component/index.js rename frontend/src/core/editor/{page => component}/less/componentEditor.less (100%) rename frontend/src/core/editor/{page => component}/less/editing-overlay-component-list.less (100%) rename frontend/src/core/editor/{page => component}/less/editing-overlay-panel.less (100%) rename frontend/src/core/editor/{page => component}/less/editorComponentList.less (100%) rename frontend/src/core/editor/{page => component}/models/editorComponentModel.js (92%) rename frontend/src/core/editor/{page => component}/models/editorComponentTypeModel.js (66%) rename frontend/src/core/editor/{page => component}/templates/editorComponent.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentEdit.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentEditSidebar.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentList.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentListItem.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentListSidebar.hbs (100%) rename frontend/src/core/editor/{page => component}/templates/editorComponentPasteZone.hbs (100%) rename frontend/src/core/editor/{page => component}/views/editorComponentEditSidebarView.js (99%) rename frontend/src/core/editor/{page => component}/views/editorComponentEditView.js (64%) create mode 100644 frontend/src/core/editor/component/views/editorComponentListItemView.js create mode 100644 frontend/src/core/editor/component/views/editorComponentListSidebarView.js rename frontend/src/core/editor/{page => component}/views/editorComponentListView.js (93%) rename frontend/src/core/editor/{page => component}/views/editorComponentPasteZoneView.js (89%) rename frontend/src/core/editor/{page => component}/views/editorComponentView.js (93%) create mode 100644 frontend/src/core/editor/config/index.js create mode 100644 frontend/src/core/editor/contentObject/index.js rename frontend/src/core/editor/{menu => contentObject}/less/editorMenu.less (100%) rename frontend/src/core/editor/{menu => contentObject}/less/editorMenuItem.less (100%) rename frontend/src/core/editor/{menu => contentObject}/less/editorMenuLayer.less (100%) rename frontend/src/core/editor/{page => contentObject}/less/pageEditor.less (100%) rename frontend/src/core/editor/{menu => contentObject}/models/editorContentObjectModel.js (80%) rename frontend/src/core/editor/{menu => contentObject}/templates/editorMenu.hbs (100%) rename frontend/src/core/editor/{menu => contentObject}/templates/editorMenuItem.hbs (100%) rename frontend/src/core/editor/{menu => contentObject}/templates/editorMenuLayer.hbs (100%) rename frontend/src/core/editor/{menu => contentObject}/templates/editorMenuSidebar.hbs (100%) rename frontend/src/core/editor/{page => contentObject}/templates/editorPage.hbs (100%) rename frontend/src/core/editor/{page => contentObject}/templates/editorPageEdit.hbs (100%) rename frontend/src/core/editor/{page => contentObject}/templates/editorPageEditSidebar.hbs (100%) rename frontend/src/core/editor/{page => contentObject}/templates/editorPageOverview.hbs (100%) rename frontend/src/core/editor/{page => contentObject}/templates/editorPageSidebar.hbs (100%) rename frontend/src/core/editor/{menu => contentObject}/views/editorMenuItemView.js (97%) create mode 100644 frontend/src/core/editor/contentObject/views/editorMenuLayerView.js rename frontend/src/core/editor/{menu => contentObject}/views/editorMenuSidebarView.js (100%) rename frontend/src/core/editor/{menu => contentObject}/views/editorMenuView.js (94%) create mode 100644 frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js rename frontend/src/core/editor/{page => contentObject}/views/editorPageEditView.js (86%) create mode 100644 frontend/src/core/editor/contentObject/views/editorPageOverviewView.js rename frontend/src/core/editor/{page => contentObject}/views/editorPageSidebarView.js (97%) rename frontend/src/core/editor/{page => contentObject}/views/editorPageView.js (89%) create mode 100644 frontend/src/core/editor/course/index.js rename frontend/src/core/{project/templates/projectDetail.hbs => editor/course/templates/editorCourseEdit.hbs} (100%) rename frontend/src/core/{project/templates/projectDetailEditSidebar.hbs => editor/course/templates/editorCourseEditSidebar.hbs} (100%) create mode 100644 frontend/src/core/editor/course/views/editorCourseEditSidebarView.js rename frontend/src/core/{project/views/projectDetailView.js => editor/course/views/editorCourseEditView.js} (89%) create mode 100644 frontend/src/core/editor/editor_old.js create mode 100644 frontend/src/core/editor/extensions/index.js create mode 100644 frontend/src/core/editor/global/helpers.js create mode 100644 frontend/src/core/editor/global/preloader.js create mode 100644 frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs rename frontend/src/core/editor/{page => global}/templates/partials/part_settingsGeneral.hbs (94%) delete mode 100644 frontend/src/core/editor/menu/views/editorMenuLayerView.js create mode 100644 frontend/src/core/editor/menuSettings/index.js delete mode 100644 frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs delete mode 100644 frontend/src/core/editor/page/views/editorArticleEditSidebarView.js delete mode 100644 frontend/src/core/editor/page/views/editorBlockEditSidebarView.js delete mode 100644 frontend/src/core/editor/page/views/editorComponentListItemView.js delete mode 100644 frontend/src/core/editor/page/views/editorComponentListSidebarView.js delete mode 100644 frontend/src/core/editor/page/views/editorPageEditSidebarView.js delete mode 100644 frontend/src/core/editor/page/views/editorPageOverviewView.js create mode 100644 frontend/src/core/editor/theme/index.js create mode 100644 frontend/src/core/help/help.js delete mode 100644 frontend/src/core/project/models/projectModel.js delete mode 100644 frontend/src/core/project/project.js delete mode 100644 frontend/src/core/project/views/projectDetailEditSidebarView.js diff --git a/frontend/src/core/editor/article/index.js b/frontend/src/core/editor/article/index.js new file mode 100644 index 0000000000..6ed73d7bc8 --- /dev/null +++ b/frontend/src/core/editor/article/index.js @@ -0,0 +1,19 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('coreJS/app/origin'); + var Helpers = require('../global/helpers'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if (route2 !== 'article' || route4 !== 'edit') { + return; + } + (new EditorArticleModel({ _id: route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Editing article - ' + model.get('title') }); + Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); + } + }); + }); +}); diff --git a/frontend/src/core/editor/page/less/articleEditor.less b/frontend/src/core/editor/article/less/articleEditor.less similarity index 100% rename from frontend/src/core/editor/page/less/articleEditor.less rename to frontend/src/core/editor/article/less/articleEditor.less diff --git a/frontend/src/core/editor/page/models/editorArticleModel.js b/frontend/src/core/editor/article/models/editorArticleModel.js similarity index 86% rename from frontend/src/core/editor/page/models/editorArticleModel.js rename to frontend/src/core/editor/article/models/editorArticleModel.js index dafb5820fc..18b6ae0844 100644 --- a/frontend/src/core/editor/page/models/editorArticleModel.js +++ b/frontend/src/core/editor/article/models/editorArticleModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../global/models/editorModel'); var EditorArticleModel = EditorModel.extend({ urlRoot: '/api/content/article', diff --git a/frontend/src/core/editor/page/templates/editorArticle.hbs b/frontend/src/core/editor/article/templates/editorArticle.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorArticle.hbs rename to frontend/src/core/editor/article/templates/editorArticle.hbs diff --git a/frontend/src/core/editor/page/templates/editorArticleEdit.hbs b/frontend/src/core/editor/article/templates/editorArticleEdit.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorArticleEdit.hbs rename to frontend/src/core/editor/article/templates/editorArticleEdit.hbs diff --git a/frontend/src/core/editor/page/templates/editorArticleEditSidebar.hbs b/frontend/src/core/editor/article/templates/editorArticleEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorArticleEditSidebar.hbs rename to frontend/src/core/editor/article/templates/editorArticleEditSidebar.hbs diff --git a/frontend/src/core/editor/article/views/editorArticleEditSidebarView.js b/frontend/src/core/editor/article/views/editorArticleEditSidebarView.js new file mode 100644 index 0000000000..bed2608c6f --- /dev/null +++ b/frontend/src/core/editor/article/views/editorArticleEditSidebarView.js @@ -0,0 +1,32 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + + var EditorArticleEditSidebarView = SidebarItemView.extend({ + events: { + 'click .editor-article-edit-sidebar-save': 'saveEditing', + 'click .editor-article-edit-sidebar-cancel': 'cancelEditing' + }, + + postRender: function() { + + }, + + saveEditing: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-article-edit-sidebar-save', window.polyglot.t('app.saving')); + Origin.trigger('editorArticleEditSidebar:views:save'); + }, + + cancelEditing: function(event) { + event && event.preventDefault(); + Backbone.history.history.back(); + } + }, { + template: 'editorArticleEditSidebar' + }); + + return EditorArticleEditSidebarView; +}); diff --git a/frontend/src/core/editor/page/views/editorArticleEditView.js b/frontend/src/core/editor/article/views/editorArticleEditView.js similarity index 87% rename from frontend/src/core/editor/page/views/editorArticleEditView.js rename to frontend/src/core/editor/article/views/editorArticleEditView.js index 98aabb370d..7e03b20c92 100644 --- a/frontend/src/core/editor/page/views/editorArticleEditView.js +++ b/frontend/src/core/editor/article/views/editorArticleEditView.js @@ -2,18 +2,17 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorArticleEditView = EditorOriginView.extend({ - tagName: "div", className: "article-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, 'editorArticleEditSidebar:views:save', this.save); this.model.set('ancestors', this.model.getPossibleAncestors().toJSON()); - }, - }, - { + } + }, { template: 'editorArticleEdit' }); diff --git a/frontend/src/core/editor/page/views/editorArticleView.js b/frontend/src/core/editor/article/views/editorArticleView.js similarity index 77% rename from frontend/src/core/editor/page/views/editorArticleView.js rename to frontend/src/core/editor/article/views/editorArticleView.js index fb123c7441..fac8b51a10 100644 --- a/frontend/src/core/editor/page/views/editorArticleView.js +++ b/frontend/src/core/editor/article/views/editorArticleView.js @@ -1,37 +1,47 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorBlockView = require('editorPage/views/editorBlockView'); - var EditorModel = require('editorGlobal/models/editorModel'); - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - var EditorPasteZoneView = require('editorGlobal/views/editorPasteZoneView'); - var EditorArticleView = EditorOriginView.extend({ - - tagName: 'div', + var EditorBlockModel = require('../../block/models/editorBlockModel'); + var EditorBlockView = require('../../block/views/editorBlockView'); + var EditorModel = require('../../global/models/editorModel'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); + var EditorArticleView = EditorOriginView.extend({ className: 'article editable article-draggable', + tagName: 'div', - events: _.extend({ - 'click a.add-block' : 'addBlock', - 'click a.article-delete' : 'deleteArticlePrompt', - 'click a.open-context-article' : 'openContextMenu', - 'dblclick':'loadArticleEdit' - }, EditorOriginView.prototype.events), + events: _.extend(EditorOriginView.prototype.events, { + 'click a.add-block': 'addBlock', + 'click a.article-delete': 'deleteArticlePrompt', + 'click a.open-context-article': 'openContextMenu', + 'dblclick': 'loadArticleEdit' + }), preRender: function() { - this.listenTo(Origin, { - 'editorView:removeSubViews': this.remove, - 'editorPageView:removePageSubViews': this.remove - }); + this.listenToEvents(); + }, + + postRender: function() { + this.addBlockViews(); + this.setupDragDrop(); + _.defer(_.bind(function(){ + this.trigger('articleView:postRender'); + Origin.trigger('pageView:itemRendered'); + }, this)); + }, + listenToEvents: function() { + this.listenTo(Origin, 'editorView:removeSubViews editorPageView:removePageSubViews', this.remove); this.listenTo(this.model, 'sync', this.setupModelEvents); + if (!this.model.isNew()) { - this.setupModelEvents(); + this.listenTo(Origin, 'editorView:moveBlock:' + this.model.get('_id'), this.render); + this.listenTo(Origin, 'editorView:cutBlock:' + this.model.get('_id'), this.onCutBlock); + this.listenTo(Origin, 'editorView:deleteArticle:' + this.model.get('_id'), this.deletePageArticle); } this.listenTo(this, { @@ -43,21 +53,6 @@ define(function(require){ }); }, - setupModelEvents: function() { - this.listenTo(Origin, 'editorView:moveBlock:' + this.model.get('_id'), this.render); - this.listenTo(Origin, 'editorView:cutBlock:' + this.model.get('_id'), this.onCutBlock); - this.listenTo(Origin, 'editorView:deleteArticle:' + this.model.get('_id'), this.deletePageArticle); - }, - - postRender: function() { - this.addBlockViews(); - this.setupDragDrop(); - _.defer(_.bind(function(){ - this.trigger('articleView:postRender'); - Origin.trigger('pageView:itemRendered'); - }, this)); - }, - onCutBlock: function(view) { this.once('articleView:postRender', function() { view.showPasteZones(); @@ -77,9 +72,7 @@ define(function(require){ this.$('.article-blocks').append(new EditorPasteZoneView({model: prePasteBlock}).$el); // Iterate over each block and add it to the article - this.model.getChildren().each(function(block) { - this.addBlockView(block); - }, this); + this.model.getChildren().each(this.addBlockView, this); }, addBlockView: function(blockModel, scrollIntoView) { @@ -109,28 +102,22 @@ define(function(require){ }, addBlock: function(event) { - if (event) { - event.preventDefault(); - } - + event && event.preventDefault(); + var self = this; - var layoutOptions = [ - { + var layoutOptions = [{ type: 'left', name: 'app.layoutleft', pasteZoneRenderOrder: 2 - }, - { + }, { type: 'full', name: 'app.layoutfull', pasteZoneRenderOrder: 1 - }, - { + }, { type: 'right', name: 'app.layoutright', pasteZoneRenderOrder: 3 - } - ]; + }]; var newPageBlockModel = new EditorBlockModel({ title: window.polyglot.t('app.placeholdernewblock'), @@ -144,10 +131,7 @@ define(function(require){ newPageBlockModel.save(null, { error: function() { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.erroraddingblock') - }); + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.erroraddingblock') }); }, success: function(model, response, options) { var newBlockView = self.addBlockView(model, true); @@ -159,9 +143,7 @@ define(function(require){ }, deleteArticlePrompt: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); Origin.Notify.confirm({ type: 'warning', @@ -174,27 +156,17 @@ define(function(require){ deleteArticleConfirm: function(confirmed) { if (confirmed) { - var id = this.model.get('_id'); - Origin.trigger('editorView:deleteArticle:' + id); + Origin.trigger('editorView:deleteArticle:' + this.model.get('_id')); } }, deletePageArticle: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); - var _this = this; - - _this.model.destroy({ - success: function(model, response) { - _this.remove(); - }, + this.model.destroy({ + success: _.bind(this.remove, this), error: function(error) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); } }); }, @@ -252,7 +224,7 @@ define(function(require){ var SCROLL_INCREMENT = 7; var offsetTop = $container.offset().top; - var clientY = event.originalEvent.clientY; + var clientY = event.originalEvent.clientY; var scrollAmount; if (clientY < (offsetTop+SCROLL_THRESHOLD)) { @@ -275,11 +247,9 @@ define(function(require){ } }); } - }, { template: 'editorArticle' }); return EditorArticleView; - }); diff --git a/frontend/src/core/editor/block/index.js b/frontend/src/core/editor/block/index.js new file mode 100644 index 0000000000..90cae87875 --- /dev/null +++ b/frontend/src/core/editor/block/index.js @@ -0,0 +1,24 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var Helpers = require('../global/helpers'); + + var EditorBlockModel = require('./models/editorBlockModel'); + var EditorBlockEditView = require('./views/editorBlock'); + var EditorBlockEditSidebarView = require('./views/editorBlockEditSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 !== 'block' || route4 !== 'edit') { + return; + } + (new EditorBlockModel({ _id: route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Editing block - ' + model.get('title') }); + Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); + } + }); + }); +}); diff --git a/frontend/src/core/editor/page/less/blockEditor.less b/frontend/src/core/editor/block/less/blockEditor.less similarity index 100% rename from frontend/src/core/editor/page/less/blockEditor.less rename to frontend/src/core/editor/block/less/blockEditor.less diff --git a/frontend/src/core/editor/page/models/editorBlockModel.js b/frontend/src/core/editor/block/models/editorBlockModel.js similarity index 93% rename from frontend/src/core/editor/page/models/editorBlockModel.js rename to frontend/src/core/editor/block/models/editorBlockModel.js index f34d7edaf2..a6eab983f6 100644 --- a/frontend/src/core/editor/page/models/editorBlockModel.js +++ b/frontend/src/core/editor/block/models/editorBlockModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorBlockModel = EditorModel.extend({ urlRoot: '/api/content/block', diff --git a/frontend/src/core/editor/page/templates/editorBlock.hbs b/frontend/src/core/editor/block/templates/editorBlock.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorBlock.hbs rename to frontend/src/core/editor/block/templates/editorBlock.hbs diff --git a/frontend/src/core/editor/page/templates/editorBlockEdit.hbs b/frontend/src/core/editor/block/templates/editorBlockEdit.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorBlockEdit.hbs rename to frontend/src/core/editor/block/templates/editorBlockEdit.hbs diff --git a/frontend/src/core/editor/page/templates/editorBlockEditSidebar.hbs b/frontend/src/core/editor/block/templates/editorBlockEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorBlockEditSidebar.hbs rename to frontend/src/core/editor/block/templates/editorBlockEditSidebar.hbs diff --git a/frontend/src/core/editor/block/views/editorBlockEditSidebarView.js b/frontend/src/core/editor/block/views/editorBlockEditSidebarView.js new file mode 100644 index 0000000000..9d4b199944 --- /dev/null +++ b/frontend/src/core/editor/block/views/editorBlockEditSidebarView.js @@ -0,0 +1,28 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + + var EditorBlockEditSidebarView = SidebarItemView.extend({ + events: { + 'click .editor-block-edit-sidebar-save': 'saveEditing', + 'click .editor-block-edit-sidebar-cancel': 'cancelEditing' + }, + + saveEditing: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-block-edit-sidebar-save', window.polyglot.t('app.saving')); + Origin.trigger('editorBlockEditSidebar:views:save'); + }, + + cancelEditing: function(event) { + event && event.preventDefault(); + Backbone.history.history.back(); + } + }, { + template: 'editorBlockEditSidebar' + }); + + return EditorBlockEditSidebarView; +}); diff --git a/frontend/src/core/editor/page/views/editorBlockEditView.js b/frontend/src/core/editor/block/views/editorBlockEditView.js similarity index 88% rename from frontend/src/core/editor/page/views/editorBlockEditView.js rename to frontend/src/core/editor/block/views/editorBlockEditView.js index 549d07fc5f..971ddc7214 100644 --- a/frontend/src/core/editor/page/views/editorBlockEditView.js +++ b/frontend/src/core/editor/block/views/editorBlockEditView.js @@ -2,18 +2,17 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorBlockEditView = EditorOriginView.extend({ - tagName: "div", className: "block-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, 'editorBlockEditSidebar:views:save', this.save); this.model.set('ancestors', this.model.getPossibleAncestors().toJSON()); } - }, - { + }, { template: 'editorBlockEdit' }); diff --git a/frontend/src/core/editor/page/views/editorBlockView.js b/frontend/src/core/editor/block/views/editorBlockView.js similarity index 77% rename from frontend/src/core/editor/page/views/editorBlockView.js rename to frontend/src/core/editor/block/views/editorBlockView.js index 82c1c6d284..1871812d86 100644 --- a/frontend/src/core/editor/page/views/editorBlockView.js +++ b/frontend/src/core/editor/block/views/editorBlockView.js @@ -1,56 +1,53 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorComponentModel = require('editorPage/models/editorComponentModel'); - var EditorComponentView = require('editorPage/views/editorComponentView'); - var EditorComponentPasteZoneView = require('editorPage/views/editorComponentPasteZoneView'); - var EditorComponentListView = require('editorPage/views/editorComponentListView'); + var EditorOriginView = require('../global/views/editorOriginView'); + var EditorComponentModel = require('../component/models/editorComponentModel'); + var EditorComponentView = require('../component/views/editorComponentView'); + var EditorComponentPasteZoneView = require('../component/views/editorComponentPasteZoneView'); + var EditorComponentListView = require('../component/views/editorComponentListView'); var EditorBlockView = EditorOriginView.extend({ - - tagName: 'div', - className: 'block editable block-draggable', + tagName: 'div', settings: { autoRender: false }, - events: _.extend({ - 'click a.block-delete' : 'deleteBlockPrompt', - 'click a.add-component' : 'showComponentList', - 'click a.open-context-block' : 'openContextMenu', - 'dblclick' : 'loadBlockEdit' - }, EditorOriginView.prototype.events), + events: _.extend(EditorOriginView.prototype.events, { + 'click a.block-delete': 'deleteBlockPrompt', + 'click a.add-component': 'showComponentList', + 'click a.open-context-block': 'openContextMenu', + 'dblclick': 'loadBlockEdit' + }), preRender: function() { - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(Origin, 'editorPageView:removePageSubViews', this.remove); - this.setupModelEvents(); - - this.listenTo(this, { - 'contextMenu:block:edit': this.loadBlockEdit, - 'contextMenu:block:copy': this.onCopy, - 'contextMenu:block:copyID': this.onCopyID, - 'contextMenu:block:cut': this.onCut, - 'contextMenu:block:delete': this.deleteBlockPrompt - }); + this.listenToEvents(); this.model.set('componentTypes', Origin.editor.data.componentTypes.toJSON()); this.evaluateComponents(this.render); }, - setupModelEvents: function() { + listenToEvents: function() { + this.listenTo(Origin, 'editorView:removeSubViews editorPageView:removePageSubViews', this.remove); + this.listenTo(Origin, 'editorView:removeComponent:' + this.model.get('_id'), this.handleRemovedComponent); this.listenTo(Origin, 'editorView:moveComponent:' + this.model.get('_id'), this.reRender); this.listenTo(Origin, 'editorView:cutComponent:' + this.model.get('_id'), this.onCutComponent); this.listenTo(Origin, 'editorView:addComponent:' + this.model.get('_id'), this.addComponent); this.listenTo(Origin, 'editorView:deleteBlock:' + this.model.get('_id'), this.deleteBlock); + + this.listenTo(this, { + 'contextMenu:block:edit': this.loadBlockEdit, + 'contextMenu:block:copy': this.onCopy, + 'contextMenu:block:copyID': this.onCopyID, + 'contextMenu:block:cut': this.onCut, + 'contextMenu:block:delete': this.deleteBlockPrompt + }); }, postRender: function() { @@ -64,23 +61,19 @@ define(function(require){ }, evaluateComponents: function(callback) { - var layoutOptions = [ - { - type: 'left', - name: 'app.layoutleft', - pasteZoneRenderOrder: 2 - }, - { - type: 'full', - name: 'app.layoutfull', - pasteZoneRenderOrder: 1 - }, - { - type: 'right', - name: 'app.layoutright', - pasteZoneRenderOrder: 3 - } - ]; + var layoutOptions = [{ + type: 'left', + name: 'app.layoutleft', + pasteZoneRenderOrder: 2 + },{ + type: 'full', + name: 'app.layoutfull', + pasteZoneRenderOrder: 1 + },{ + type: 'right', + name: 'app.layoutright', + pasteZoneRenderOrder: 3 + }]; this.model.getChildren().each(function(component) { switch (component.get('_layout')) { @@ -123,9 +116,7 @@ define(function(require){ }, deleteBlockPrompt: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); Origin.Notify.confirm({ type: 'warning', @@ -137,22 +128,15 @@ define(function(require){ deleteBlockConfirm: function(confirmed) { if (confirmed) { - var id = this.model.get('_id'); - Origin.trigger('editorView:deleteBlock:' + id); + Origin.trigger('editorView:deleteBlock:' + this.model.get('_id')); } }, deleteBlock: function(event) { - var _this = this; - _this.model.destroy({ - success: function(model, response) { - _this.remove(); - }, + this.model.destroy({ + success: _.bind(this.remove, this), error: function(model, response) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); } }); }, @@ -257,30 +241,22 @@ define(function(require){ }, addComponentButtonLayout: function(components){ - if(components.length == 2) return; - else if (components.length == 0){ - this.$('.add-component').addClass('full'); - return; - } - else { - if(components.models[0].attributes._layout == 'left') - this.$('.add-component').addClass('right'); - else - this.$('.add-component').addClass('left'); - } + if(components.length === 2) { + return; + } + if(components.length === 0) { + this.$('.add-component').addClass('full'); + return; + } + var className = (components.models[0].attributes._layout === 'left') ? 'right' : 'left'; + this.$('.add-component').addClass(className); }, loadBlockEdit: function (event) { var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var Id = this.model.get('_id'); - Origin.router.navigate('#/editor/' - + courseId - + '/' - + type - + '/' - + Id - + '/edit', {trigger: true}); + Origin.router.navigate('#/editor/' + courseId + '/' + type + '/' + Id + '/edit', { trigger: true }); }, showComponentList: function(event) { @@ -302,7 +278,6 @@ define(function(require){ $parentElement: this.$el, parentView: this }).$el); - }, setupPasteZones: function() { @@ -337,24 +312,17 @@ define(function(require){ }, swapLayout: function (layout) { - var newLayout = 'full'; - if (layout != 'full') { - newLayout = (layout == 'left') ? 'right' : 'left'; + if (layout === 'full') { + return layout; } - return newLayout; + return (layout == 'left') ? 'right' : 'left'; }, toggleAddComponentsButton: function() { - var layoutOptions = this.model.get('layoutOptions'); - // Have to check here if it's null as layoutOptions can sometimes not be set - if (layoutOptions === null) layoutOptions = []; - if (layoutOptions === null || layoutOptions.length === 0) { - this.$('.add-control').addClass('display-none'); - } else { - this.$('.add-control').removeClass('display-none'); - } + var layoutOptions = this.model.get('layoutOptions') || []; + // display-none if we've no layout options + this.$('.add-control').toggleClass('display-none', layoutOptions.length === 0); } - }, { template: 'editorBlock' }); diff --git a/frontend/src/core/editor/component/index.js b/frontend/src/core/editor/component/index.js new file mode 100644 index 0000000000..6d15c4a8d5 --- /dev/null +++ b/frontend/src/core/editor/component/index.js @@ -0,0 +1,54 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var Helpers = require('../global/helpers'); + + var EditorComponentEditView = require('./views/editorComponentEditView'); + var EditorComponentEditSidebarView = require('./views/editorComponentEditSidebarView'); + var EditorComponentModel = require('./models/editorComponentModel'); + var EditorComponentListView = require('./views/editorComponentListView'); + var EditorComponentListSidebarView = require('./views/editorComponentListSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 === 'block' && route4 === 'add') { + // block->add, so we're actually adding a component + handleNewComponent(); + } else if (route2 === 'component') { + handleEditComponent(); + } + }); + + function handleNewComponent() { + var containingBlock = Origin.editor.data.blocks.findWhere({ _id: Origin.location.route3 }); + var layoutOptions = containingBlock.get('layoutOptions'); + var componentsModel = new Backbone.Model({ + title: window.polyglot.t('app.addcomponent'), + body: window.polyglot.t('app.pleaseselectcomponent'), + _parentId: route3, + componentTypes: Origin.editor.data.componentTypes.toJSON(), + layoutOptions: layoutOptions + }); + Origin.sidebar.addView(new EditorComponentListSidebarView({ model: componentsModel }).$el); + Origin.contentPane.setView(EditorComponentListView, { model: componentsModel }); + } + + function handleEditComponent() { + (new EditorComponentModel({ _id: Origin.location.route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + var displayName = getComponentDisplayName(model); + Origin.trigger('location:title:update', { title: 'Editing ' + displayName + ' component - ' + model.get('title') }); + Origin.sidebar.addView(new EditorComponentEditSidebarView({ model: model, form:form }).$el); + Origin.contentPane.setView(EditorComponentEditView, { model: model, form: form }); + } + }); + } + + function getComponentDisplayName(model) { + var componentType = _.find(Origin.editor.data.componentTypes.models, function(m) { + return m.get('_id') === model.get('_componentType'); + }); + return (componentType) ? componentType.get('displayName').toLowerCase() : ''; + } +}); diff --git a/frontend/src/core/editor/page/less/componentEditor.less b/frontend/src/core/editor/component/less/componentEditor.less similarity index 100% rename from frontend/src/core/editor/page/less/componentEditor.less rename to frontend/src/core/editor/component/less/componentEditor.less diff --git a/frontend/src/core/editor/page/less/editing-overlay-component-list.less b/frontend/src/core/editor/component/less/editing-overlay-component-list.less similarity index 100% rename from frontend/src/core/editor/page/less/editing-overlay-component-list.less rename to frontend/src/core/editor/component/less/editing-overlay-component-list.less diff --git a/frontend/src/core/editor/page/less/editing-overlay-panel.less b/frontend/src/core/editor/component/less/editing-overlay-panel.less similarity index 100% rename from frontend/src/core/editor/page/less/editing-overlay-panel.less rename to frontend/src/core/editor/component/less/editing-overlay-panel.less diff --git a/frontend/src/core/editor/page/less/editorComponentList.less b/frontend/src/core/editor/component/less/editorComponentList.less similarity index 100% rename from frontend/src/core/editor/page/less/editorComponentList.less rename to frontend/src/core/editor/component/less/editorComponentList.less diff --git a/frontend/src/core/editor/page/models/editorComponentModel.js b/frontend/src/core/editor/component/models/editorComponentModel.js similarity index 92% rename from frontend/src/core/editor/page/models/editorComponentModel.js rename to frontend/src/core/editor/component/models/editorComponentModel.js index 8703b4643e..35201cdace 100644 --- a/frontend/src/core/editor/page/models/editorComponentModel.js +++ b/frontend/src/core/editor/component/models/editorComponentModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorComponentModel = EditorModel.extend({ urlRoot: '/api/content/component', diff --git a/frontend/src/core/editor/page/models/editorComponentTypeModel.js b/frontend/src/core/editor/component/models/editorComponentTypeModel.js similarity index 66% rename from frontend/src/core/editor/page/models/editorComponentTypeModel.js rename to frontend/src/core/editor/component/models/editorComponentTypeModel.js index ca598dd883..d973b02e9c 100644 --- a/frontend/src/core/editor/page/models/editorComponentTypeModel.js +++ b/frontend/src/core/editor/component/models/editorComponentTypeModel.js @@ -1,18 +1,18 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorComponentTypeModel = EditorModel.extend({ - - initialize: function() {}, idAttribute: '_id', urlRoot: '/api/componenttype', _parent: 'blocks', _siblings:'componenttypes', - _children: null + _children: null, + + initialize: function() { + // TODO intentional override? + } }); return EditorComponentTypeModel; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/page/templates/editorComponent.hbs b/frontend/src/core/editor/component/templates/editorComponent.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponent.hbs rename to frontend/src/core/editor/component/templates/editorComponent.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentEdit.hbs b/frontend/src/core/editor/component/templates/editorComponentEdit.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentEdit.hbs rename to frontend/src/core/editor/component/templates/editorComponentEdit.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentEditSidebar.hbs b/frontend/src/core/editor/component/templates/editorComponentEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentEditSidebar.hbs rename to frontend/src/core/editor/component/templates/editorComponentEditSidebar.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentList.hbs b/frontend/src/core/editor/component/templates/editorComponentList.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentList.hbs rename to frontend/src/core/editor/component/templates/editorComponentList.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentListItem.hbs b/frontend/src/core/editor/component/templates/editorComponentListItem.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentListItem.hbs rename to frontend/src/core/editor/component/templates/editorComponentListItem.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentListSidebar.hbs b/frontend/src/core/editor/component/templates/editorComponentListSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentListSidebar.hbs rename to frontend/src/core/editor/component/templates/editorComponentListSidebar.hbs diff --git a/frontend/src/core/editor/page/templates/editorComponentPasteZone.hbs b/frontend/src/core/editor/component/templates/editorComponentPasteZone.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorComponentPasteZone.hbs rename to frontend/src/core/editor/component/templates/editorComponentPasteZone.hbs diff --git a/frontend/src/core/editor/page/views/editorComponentEditSidebarView.js b/frontend/src/core/editor/component/views/editorComponentEditSidebarView.js similarity index 99% rename from frontend/src/core/editor/page/views/editorComponentEditSidebarView.js rename to frontend/src/core/editor/component/views/editorComponentEditSidebarView.js index 5a2374c2b9..59bb2988e8 100644 --- a/frontend/src/core/editor/page/views/editorComponentEditSidebarView.js +++ b/frontend/src/core/editor/component/views/editorComponentEditSidebarView.js @@ -1,12 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - + var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); var EditorComponentEditSidebarView = SidebarItemView.extend({ - events: { 'click .editor-component-edit-sidebar-save': 'saveEditing', 'click .editor-component-edit-sidebar-cancel': 'cancelEditing' @@ -24,11 +22,9 @@ define(function(require) { var currentPageId = this.model.getParent().getParent().getParent().get('_id'); Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId); } - }, { template: 'editorComponentEditSidebar' }); return EditorComponentEditSidebarView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/page/views/editorComponentEditView.js b/frontend/src/core/editor/component/views/editorComponentEditView.js similarity index 64% rename from frontend/src/core/editor/page/views/editorComponentEditView.js rename to frontend/src/core/editor/component/views/editorComponentEditView.js index 02978bc911..57757a9741 100644 --- a/frontend/src/core/editor/page/views/editorComponentEditView.js +++ b/frontend/src/core/editor/component/views/editorComponentEditView.js @@ -2,11 +2,11 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorComponentEditView = EditorOriginView.extend({ - tagName: "div", className: "component-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, 'editorComponentEditSidebar:views:save', this.save); @@ -14,19 +14,10 @@ define(function(require) { }, cancel: function (event) { - event.preventDefault(); + event && event.preventDefault(); Origin.trigger('editorSidebarView:removeEditView', this.model); - }, - - /* - getAttributesToSave: function() { - // TODO look into this, always seems undefined - this.model.set('_componentType', this.model.get('_componentType')._id); - return EditorOriginView.prototype.getAttributesToSave.apply(this, arguments); - }, - */ - }, - { + } + }, { template: 'editorComponentEdit' }); diff --git a/frontend/src/core/editor/component/views/editorComponentListItemView.js b/frontend/src/core/editor/component/views/editorComponentListItemView.js new file mode 100644 index 0000000000..40a8f35e43 --- /dev/null +++ b/frontend/src/core/editor/component/views/editorComponentListItemView.js @@ -0,0 +1,112 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorComponentModel = require('../models/editorComponentModel'); + var EditorComponentView = require('./editorComponentView'); + + var EditorComponentListItemView = EditorOriginView.extend({ + className: 'editor-component-list-item', + tagName: 'div', + + events: { + 'click': 'onItemClicked', + 'click div.editor-component-list-item-overlay-inner > a': 'onButtonClicked' + }, + + preRender: function(options) { + this.listenTo(Origin, { + 'editorComponentListView:removeSubviews': this.remove, + 'editorComponentListItemView:deselect': this.deselectItem, + 'editorComponentListView:searchKeyup': this.onSearchValueChanged + }); + + this.model.set('availablePositions', options.availablePositions); + + this._parentId = options._parentId; + this.$parentElement = options.$parentElement; + this.parentView = options.parentView; + this.searchTerms = options.searchTerms; + }, + + postRender: function() { + if (this.model.get('_isAvailableInEditor') == false) { + this.$el.addClass('restricted'); + } + }, + + onItemClicked: function(event) { + event && event.preventDefault(); + + Origin.trigger('editorComponentListItemView:deselect') + + this.$el.addClass('selected'); + this.$('.editor-component-list-item-overlay').removeClass('display-none'); + }, + + deselectItem: function() { + $('.editor-component-list-item').removeClass('selected'); + this.$('.editor-component-list-item-overlay').addClass('display-none'); + }, + + onSearchValueChanged: function(searchValue) { + var isSearchTerms = this.searchTerms.indexOf(searchValue.toLowerCase()) > -1 || searchValue.length === 0; + this.$el.toggleClass('display-none', !isSearchTerms); + }, + + onButtonClicked: function(event) { + event && event.preventDefault(); + this.addComponent(event.currentTarget.getAttribute('data-position')); + }, + + addComponent: function(layout) { + Origin.trigger('editorComponentListView:remove'); + + var componentName = this.model.get('name'); + var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + return type.get('name') == componentName; + }); + + var newComponentModel = new EditorComponentModel({ + title: window.polyglot.t('app.placeholdernewcomponent'), + displayTitle: window.polyglot.t('app.placeholdernewcomponent'), + body: '', + _parentId: this._parentId, + _courseId: Origin.editor.data.course.get('_id'), + _type: 'component', + _componentType: componentType.get('_id'), + _componentTypeDisplayName: componentType.get('displayName'), + _component: componentType.get('component'), + _layout: layout, + version: componentType.get('version') + }); + + var newComponentView = new EditorComponentView({ model: newComponentModel }).$el.addClass('syncing'); + + this.$parentElement + .find('.page-components') + .append(newComponentView); + + newComponentModel.save(null, { + error: function() { + $('html').css('overflow-y', ''); + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.erroraddingcomponent') }); + }, + success: _.bind(function() { + Origin.editor.data.components.add(newComponentModel); + this.parentView.evaluateComponents(this.parentView.toggleAddComponentsButton); + // Re-render the block + this.parentView.reRender(); + newComponentView.addClass('synced'); + $('html').css('overflow-y', ''); + $.scrollTo(newComponentView.$el); + }, this) + }); + } + }, { + template: 'editorComponentListItem' + }); + + return EditorComponentListItemView; +}); diff --git a/frontend/src/core/editor/component/views/editorComponentListSidebarView.js b/frontend/src/core/editor/component/views/editorComponentListSidebarView.js new file mode 100644 index 0000000000..740310a465 --- /dev/null +++ b/frontend/src/core/editor/component/views/editorComponentListSidebarView.js @@ -0,0 +1,119 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + var EditorComponentModel = require('../models/editorComponentModel'); + + var EditorComponentListSidebarView = SidebarItemView.extend({ + events: { + 'click .editor-component-list-sidebar-save': 'onSaveClicked', + 'click .editor-component-list-sidebar-save-edit': 'onSaveAndEditClicked', + 'click .editor-component-list-sidebar-cancel': 'cancelEditing' + }, + + onSaveClicked: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-component-list-sidebar-save', window.polyglot.t('app.saving')); + + if(!this.model.get('component') || !this.model.get('layout')) { + return; + } + + var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + return type.get('name') == this.model.get('component'); + }, this); + + var _this = this; + var newComponentModel = new EditorComponentModel(); + + newComponentModel.save({ + title: window.polyglot.t('app.placeholdernewcomponent'), + displayTitle: '', + body: '', + _parentId: this.model.get('_parentId'), + _courseId: Origin.editor.data.course.get('_id'), + _type: 'component', + _componentType: componentType.get('_id'), + _component: componentType.get('component'), + _layout: this.model.get('layout'), + version: componentType.get('version') + }, + { + error: function() { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.erroraddingcomponent') + }); + }, + success: function() { + Origin.trigger('editor:refreshData', function() { + Backbone.history.history.back(); + }, this); + } + }); + }, + + onSaveAndEditClicked: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-component-list-sidebar-save-edit', window.polyglot.t('app.saving')); + + if(!this.model.get('component') || !this.model.get('layout')) { + return; + } + + var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + return type.get('name') == this.model.get('component'); + }, this); + + var _this = this; + var newComponentModel = new EditorComponentModel(); + + newComponentModel.save({ + title: window.polyglot.t('app.placeholdernewcomponent'), + displayTitle: '', + body: '', + _parentId: this.model.get('_parentId'), + _courseId: Origin.editor.data.course.get('_id'), + _type: 'component', + _componentType: componentType.get('_id'), + _component: componentType.get('component'), + _layout: this.model.get('layout'), + version: componentType.get('version') + }, + { + error: function() { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.erroraddingcomponent') + }); + }, + success: function(data) { + Origin.trigger('editor:refreshData', function() { + Origin.router.navigate('#/editor/' + + Origin.editor.data.course.get('_id') + + '/component/' + + data.get('_id')); + }, this); + + } + }); + }, + + cancelEditing: function(event) { + event && event.preventDefault(); + var currentCourseId = Origin.location.route1; + var currentBlockId = Origin.location.route3; + var currentBlock = Origin.editor.data.blocks.findWhere({_id: currentBlockId}); + // Don't like this line but until we have findAncestor this will do + var currentPage = currentBlock.getParent().getParent(); + var currentPageId = currentPage.get('_id'); + + Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId); + } + }, { + template: 'editorComponentListSidebar' + }); + + return EditorComponentListSidebarView; +}); diff --git a/frontend/src/core/editor/page/views/editorComponentListView.js b/frontend/src/core/editor/component/views/editorComponentListView.js similarity index 93% rename from frontend/src/core/editor/page/views/editorComponentListView.js rename to frontend/src/core/editor/component/views/editorComponentListView.js index af12ce97de..fd64e1a1a6 100644 --- a/frontend/src/core/editor/page/views/editorComponentListView.js +++ b/frontend/src/core/editor/component/views/editorComponentListView.js @@ -3,12 +3,12 @@ define(function(require) { var _ = require('underscore'); var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorComponentListItemView = require('editorPage/views/editorComponentListItemView'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorComponentListItemView = require('./views/editorComponentListItemView'); var EditorComponentListView = EditorOriginView.extend({ - tagName: "div", className: "editor-component-list", + tagName: "div", events: { 'click': 'onOverlayClicked', @@ -19,8 +19,10 @@ define(function(require) { preRender: function(options) { $('html').css('overflow-y', 'hidden'); - this.listenTo(Origin, 'editorComponentListView:remove', this.remove); - this.listenTo(Origin, 'window:resize', this.onScreenResize); + this.listenTo(Origin, { + 'editorComponentListView:remove': this.remove, + 'window:resize': this.onScreenResize + }); this.setupCollection(); this.setupFilters(); @@ -120,10 +122,9 @@ define(function(require) { onScreenResize: function(windowWidth, windowHeight) { this.$('.editor-component-list-sidebar-list').height(windowHeight - this.headerHeight); } - }, - { + }, { template: 'editorComponentList' }); return EditorComponentListView; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/page/views/editorComponentPasteZoneView.js b/frontend/src/core/editor/component/views/editorComponentPasteZoneView.js similarity index 89% rename from frontend/src/core/editor/page/views/editorComponentPasteZoneView.js rename to frontend/src/core/editor/component/views/editorComponentPasteZoneView.js index 5649a2700d..5a53a75bef 100644 --- a/frontend/src/core/editor/page/views/editorComponentPasteZoneView.js +++ b/frontend/src/core/editor/component/views/editorComponentPasteZoneView.js @@ -1,23 +1,20 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var EditorPasteZoneView = require('editorGlobal/views/editorPasteZoneView'); var Origin = require('coreJS/app/origin'); + var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); var EditorComponentPasteZone = EditorPasteZoneView.extend({ - className : 'paste-zone paste-zone-component display-none', events: { - 'click .editor-paste-zone-paste': 'onPasteElementClicked' + 'click .editor-paste-zone-paste': 'onPasteElementClicked' }, preRender: function () { this.listenTo(this.model, 'destroy', this.remove); - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(Origin, 'editorPageView:removePageSubViews', this.remove); + this.listenTo(Origin, 'editorView:removeSubViews editorPageView:removePageSubViews', this.remove); }, postRender: function () { @@ -71,5 +68,4 @@ define(function(require){ }); return EditorComponentPasteZone; - }); diff --git a/frontend/src/core/editor/page/views/editorComponentView.js b/frontend/src/core/editor/component/views/editorComponentView.js similarity index 93% rename from frontend/src/core/editor/page/views/editorComponentView.js rename to frontend/src/core/editor/component/views/editorComponentView.js index d5ebbe24ee..8a514ecbdb 100644 --- a/frontend/src/core/editor/page/views/editorComponentView.js +++ b/frontend/src/core/editor/component/views/editorComponentView.js @@ -1,24 +1,21 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorComponentModel = require('editorPage/models/editorComponentModel'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorComponentModel = require('../models/editorComponentModel'); var EditorComponentView = EditorOriginView.extend({ - - tagName: 'div', - className: 'component editable component-draggable', + tagName: 'div', - events: _.extend({ - 'click a.component-delete' : 'deleteComponentPrompt', - 'click a.component-move' : 'evaluateMove', - 'click a.open-context-component' : 'openContextMenu', - 'dblclick' : 'loadComponentEdit' - }, EditorOriginView.prototype.events), + events: _.extend(EditorOriginView.prototype.events, { + 'click a.component-delete': 'deleteComponentPrompt', + 'click a.component-move': 'evaluateMove', + 'click a.open-context-component': 'openContextMenu', + 'dblclick': 'loadComponentEdit' + }), preRender: function() { this.$el.addClass('component-' + this.model.get('_layout')); @@ -43,9 +40,7 @@ define(function(require){ }, deleteComponentPrompt: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); Origin.Notify.confirm({ type: 'warning', @@ -53,11 +48,12 @@ define(function(require){ text: window.polyglot.t('app.confirmdeletecomponent') + '
' + '
' + window.polyglot.t('app.confirmdeletecomponentwarning'), callback: _.bind(this.deleteComponentConfirm, this) }); - }, deleteComponentConfirm: function(confirmed) { - confirmed && this.deleteComponent(); + if(confirmed) { + this.deleteComponent(); + } }, deleteComponent: function() { @@ -174,7 +170,7 @@ define(function(require){ }, evaluateMove: function(event) { - event.preventDefault(); + event && event.preventDefault(); var left = $(event.currentTarget).hasClass('component-move-left'); var right = $(event.currentTarget).hasClass('component-move-right'); var newComponentLayout = (!left && !right) ? 'full' : (left ? 'left' : 'right'); @@ -255,11 +251,9 @@ define(function(require){ } }); } - }, { template: 'editorComponent' }); return EditorComponentView; - }); diff --git a/frontend/src/core/editor/config/collections/editorConfigCollection.js b/frontend/src/core/editor/config/collections/editorConfigCollection.js index e2b624054b..6293e4b77f 100644 --- a/frontend/src/core/editor/config/collections/editorConfigCollection.js +++ b/frontend/src/core/editor/config/collections/editorConfigCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var ConfigModel = require('editorConfig/models/editorConfigModel'); + var ConfigModel = require('../models/editorConfigModel'); var ConfigCollection = Backbone.Collection.extend({ model: ConfigModel, diff --git a/frontend/src/core/editor/config/index.js b/frontend/src/core/editor/config/index.js new file mode 100644 index 0000000000..9e052af445 --- /dev/null +++ b/frontend/src/core/editor/config/index.js @@ -0,0 +1,23 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('origin'); + var Helpers = require('../global/helpers'); + + var EditorConfigEditView = require('./views/editorConfigEditView'); + var EditorConfigEditSidebarView = require('./views/editorConfigEditSidebarView'); + var EditorConfigModel = require('./models/editorConfigModel'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 !== 'config') { + return; + } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Edit configuration' }); + Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); + Origin.contentPane.setView(EditorConfigEditView, { model: configModel, form: form }); + } + }); + }); +}); diff --git a/frontend/src/core/editor/config/models/editorConfigModel.js b/frontend/src/core/editor/config/models/editorConfigModel.js index bb73a600e7..a937354be8 100644 --- a/frontend/src/core/editor/config/models/editorConfigModel.js +++ b/frontend/src/core/editor/config/models/editorConfigModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorConfigModel = EditorModel.extend({ _type: 'config', diff --git a/frontend/src/core/editor/config/views/editorConfigEditView.js b/frontend/src/core/editor/config/views/editorConfigEditView.js index e59de2af3b..449db5931d 100644 --- a/frontend/src/core/editor/config/views/editorConfigEditView.js +++ b/frontend/src/core/editor/config/views/editorConfigEditView.js @@ -2,11 +2,11 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorConfigEditView = EditorOriginView.extend({ - tagName: "div", className: "config-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, { diff --git a/frontend/src/core/editor/contentObject/index.js b/frontend/src/core/editor/contentObject/index.js new file mode 100644 index 0000000000..3740293324 --- /dev/null +++ b/frontend/src/core/editor/contentObject/index.js @@ -0,0 +1,71 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('coreJS/app/origin'); + var Helpers = require('../global/helpers'); + + var EditorContentObjectModel = require('../menu/models/editorContentObjectModel'); + var EditorMenuSidebarView = require('./views/editorMenuSidebarView'); + var EditorPageEditView = require('./views/editorPageEditView'); + var EditorPageEditSidebarView = require('./views/editorPageEditSidebarView'); + var EditorPageSidebarView = require('./views/editorPageSidebarView'); + var EditorView = require('../global/views/editorView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + var isPageEdit = route2 === 'page' && route4 === "edit"; + var isMenuEdit = route2 === 'menu' && route4 === "edit"; + + if((route2 === 'page' || route2 === 'menu') && route4 === "edit") { + renderContentObjectEdit(); + } + else if(route2 === 'page') { + renderPageStructure(); + } + else if(route2 === 'menu') { + renderMenuStructure(); + } + }); + + function renderContentObjectEdit() { + (new EditorContentObjectModel({ _id: Origin.location.route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + // TODO this is from menu + // Origin.trigger('location:title:update', { title: 'Editing menu - ' + contentObjectModel.get('title') }); + Origin.trigger('location:title:update', { title: 'Editing page - ' + contentObjectModel.get('title') }); + Origin.sidebar.addView(new EditorPageEditSidebarView({ form: form }).$el); + Origin.contentPane.setView(EditorPageEditView, { model: model, form: form }); + } + }); + } + + function renderPageStructure() { + Origin.trigger('location:title:update', { title: 'Page editor' }); + + Origin.sidebar.addView(new EditorPageSidebarView().$el, { + "backButtonText": "Back to course structure", + "backButtonRoute": "/#/editor/" + Origin.location.route1 + "/menu" + }); + Origin.contentPane.setView(EditorView, { + currentCourseId: Origin.location.route1, + currentView: 'page', + currentPageId: (Origin.location.route3 || null) + }); + } + + function renderMenuStructure() { + Origin.trigger('location:title:update', { title: 'Menu editor' }); + + Origin.editor.currentContentObjectId = Origin.location.route3; + Origin.editor.scrollTo = 0; + + Origin.sidebar.addView(new EditorMenuSidebarView().$el, { + "backButtonText": "Back to courses", + "backButtonRoute": Origin.dashboardRoute || '/#/dashboard' + }); + Origin.contentPane.setView(EditorView, { + currentCourseId: Origin.location.route1, + currentView: 'menu', + currentPageId: (Origin.location.route3 || null) + }); + } +}); diff --git a/frontend/src/core/editor/menu/less/editorMenu.less b/frontend/src/core/editor/contentObject/less/editorMenu.less similarity index 100% rename from frontend/src/core/editor/menu/less/editorMenu.less rename to frontend/src/core/editor/contentObject/less/editorMenu.less diff --git a/frontend/src/core/editor/menu/less/editorMenuItem.less b/frontend/src/core/editor/contentObject/less/editorMenuItem.less similarity index 100% rename from frontend/src/core/editor/menu/less/editorMenuItem.less rename to frontend/src/core/editor/contentObject/less/editorMenuItem.less diff --git a/frontend/src/core/editor/menu/less/editorMenuLayer.less b/frontend/src/core/editor/contentObject/less/editorMenuLayer.less similarity index 100% rename from frontend/src/core/editor/menu/less/editorMenuLayer.less rename to frontend/src/core/editor/contentObject/less/editorMenuLayer.less diff --git a/frontend/src/core/editor/page/less/pageEditor.less b/frontend/src/core/editor/contentObject/less/pageEditor.less similarity index 100% rename from frontend/src/core/editor/page/less/pageEditor.less rename to frontend/src/core/editor/contentObject/less/pageEditor.less diff --git a/frontend/src/core/editor/menu/models/editorContentObjectModel.js b/frontend/src/core/editor/contentObject/models/editorContentObjectModel.js similarity index 80% rename from frontend/src/core/editor/menu/models/editorContentObjectModel.js rename to frontend/src/core/editor/contentObject/models/editorContentObjectModel.js index fee87ab7cd..4f0d35152a 100644 --- a/frontend/src/core/editor/menu/models/editorContentObjectModel.js +++ b/frontend/src/core/editor/contentObject/models/editorContentObjectModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); var Origin = require('coreJS/app/origin'); + var EditorModel = require('../../global/models/editorModel'); var EditorContentObjectModel = EditorModel.extend({ urlRoot: '/api/content/contentobject', @@ -15,8 +15,7 @@ define(function(require) { }, initialize: function() { - this.listenTo(this, 'sync', this.setupConstructor); - this.listenTo(this, 'change:_type', this.setupConstructor); + this.listenTo(this, 'sync change:_type', this.setupConstructor); this.setupConstructor(); }, diff --git a/frontend/src/core/editor/menu/templates/editorMenu.hbs b/frontend/src/core/editor/contentObject/templates/editorMenu.hbs similarity index 100% rename from frontend/src/core/editor/menu/templates/editorMenu.hbs rename to frontend/src/core/editor/contentObject/templates/editorMenu.hbs diff --git a/frontend/src/core/editor/menu/templates/editorMenuItem.hbs b/frontend/src/core/editor/contentObject/templates/editorMenuItem.hbs similarity index 100% rename from frontend/src/core/editor/menu/templates/editorMenuItem.hbs rename to frontend/src/core/editor/contentObject/templates/editorMenuItem.hbs diff --git a/frontend/src/core/editor/menu/templates/editorMenuLayer.hbs b/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs similarity index 100% rename from frontend/src/core/editor/menu/templates/editorMenuLayer.hbs rename to frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs diff --git a/frontend/src/core/editor/menu/templates/editorMenuSidebar.hbs b/frontend/src/core/editor/contentObject/templates/editorMenuSidebar.hbs similarity index 100% rename from frontend/src/core/editor/menu/templates/editorMenuSidebar.hbs rename to frontend/src/core/editor/contentObject/templates/editorMenuSidebar.hbs diff --git a/frontend/src/core/editor/page/templates/editorPage.hbs b/frontend/src/core/editor/contentObject/templates/editorPage.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorPage.hbs rename to frontend/src/core/editor/contentObject/templates/editorPage.hbs diff --git a/frontend/src/core/editor/page/templates/editorPageEdit.hbs b/frontend/src/core/editor/contentObject/templates/editorPageEdit.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorPageEdit.hbs rename to frontend/src/core/editor/contentObject/templates/editorPageEdit.hbs diff --git a/frontend/src/core/editor/page/templates/editorPageEditSidebar.hbs b/frontend/src/core/editor/contentObject/templates/editorPageEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorPageEditSidebar.hbs rename to frontend/src/core/editor/contentObject/templates/editorPageEditSidebar.hbs diff --git a/frontend/src/core/editor/page/templates/editorPageOverview.hbs b/frontend/src/core/editor/contentObject/templates/editorPageOverview.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorPageOverview.hbs rename to frontend/src/core/editor/contentObject/templates/editorPageOverview.hbs diff --git a/frontend/src/core/editor/page/templates/editorPageSidebar.hbs b/frontend/src/core/editor/contentObject/templates/editorPageSidebar.hbs similarity index 100% rename from frontend/src/core/editor/page/templates/editorPageSidebar.hbs rename to frontend/src/core/editor/contentObject/templates/editorPageSidebar.hbs diff --git a/frontend/src/core/editor/menu/views/editorMenuItemView.js b/frontend/src/core/editor/contentObject/views/editorMenuItemView.js similarity index 97% rename from frontend/src/core/editor/menu/views/editorMenuItemView.js rename to frontend/src/core/editor/contentObject/views/editorMenuItemView.js index 422f0d5f47..47297753dc 100644 --- a/frontend/src/core/editor/menu/views/editorMenuItemView.js +++ b/frontend/src/core/editor/contentObject/views/editorMenuItemView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorMenuItemView = EditorOriginView.extend({ className: "editor-menu-item", @@ -164,17 +164,13 @@ define(function(require){ setChildrenSelectedState: function() { this.model.getChildren().each(function(child) { - child.set({'_isSelected': false, '_isExpanded': false}); + child.set({ _isSelected: false, _isExpanded: false }); }) }, onSelectedChange: function(model, isSelected) { // This is used to toggle between _isSelected on the model - if (!isSelected) { - this.$el.removeClass('selected'); - } else { - this.$el.addClass('selected'); - } + this.$el.toggleClass('selected', !isSelected); }, onExpandedChange: function(model, isExpanded) { diff --git a/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js new file mode 100644 index 0000000000..f7571c1045 --- /dev/null +++ b/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js @@ -0,0 +1,179 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('coreJS/app/origin'); + var EditorArticleModel = require('../../article/models/editorArticleModel'); + var EditorBlockModel = require('../../block/models/editorBlockModel'); + var EditorContentObjectModel = require('../models/editorContentObjectModel'); + var EditorMenuItemView = require('./editorMenuItemView'); + var EditorOriginView = require('../../global/views/editorOriginView'); + + var EditorMenuLayerView = EditorOriginView.extend({ + className: 'editor-menu-layer', + + events: { + 'click button.editor-menu-layer-add-page': 'addPage', + 'click button.editor-menu-layer-add-menu': 'addMenu', + 'click .editor-menu-layer-paste': 'pasteMenuItem', + 'click .editor-menu-layer-paste-cancel': 'cancelPasteMenuItem' + }, + + preRender: function(options) { + if (options._parentId) { + this._parentId = options._parentId; + } + this.listenTo(Origin, 'editorView:removeSubViews', this.remove); + this.listenTo(Origin, 'editorMenuView:removeMenuViews', this.remove); + }, + + postRender: function() { + if (this._parentId) { + // Append the parentId value to the container to allow us to move pages, etc. + this.$el.attr('data-parentId', this._parentId); + } + this.setHeight(); + }, + + render: function() { + var data = this.data ? this.data : false; + var template = Handlebars.templates[this.constructor.template]; + this.$el.html(template(data)); + _.defer(_.bind(this.postRender, this)); + return this; + }, + + setHeight: function() { + var windowHeight = $(window).height(); + var offsetTop = $('.editor-menu-inner').offset().top; + var controlsHeight = this.$('.editor-menu-layer-controls').outerHeight(); + + this.$('.editor-menu-layer-inner').height(windowHeight-(offsetTop+controlsHeight)); + }, + + addMenu: function(event) { + this.addMenuItem(event, 'menu'); + }, + + addPage: function(event) { + this.addMenuItem(event, 'page'); + }, + + /** + * Adds a new contentObject of a given type + * @param {String} type Given contentObject type, i.e. 'menu' or 'page' + */ + addMenuItem: function(event, type) { + event.preventDefault(); + + var newMenuItemModel = new EditorContentObjectModel({ + _parentId: this._parentId, + _courseId: Origin.editor.data.course.get('_id'), + title: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), + displayTitle: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), + body: '', + linkText: window.polyglot.t('app.view'), + graphic: { alt: '', src: '' }, + _type: type + }); + // Instantly add the view for UI purposes + var newMenuItemView = this.addMenuItemView(newMenuItemModel); + // Save the model + newMenuItemModel.save(null, { + error: function(error) { + // If there's an error show the menu item fading out and alert + newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errormenueditorbody'), + }); + _.delay(newMenuItemView.remove, 3000); + }, + success: _.bind(function(model) { + Origin.editor.data.contentObjects.add(model); + // Force setting the data-id attribute as this is required for drag-drop sorting + newMenuItemView.$el.children('.editor-menu-item-inner').attr('data-id', model.get('_id')); + + if (type == 'page') { + // HACK -- This should be removed and placed on the server-side + return this.addNewPageArticleAndBlock(model, newMenuItemView); + } else { + newMenuItemView.$el.removeClass('syncing').addClass('synced'); + } + this.setHeight(); + }, this) + }); + }, + + addNewPageArticleAndBlock: function(model, newMenuItemView) { + var typeToAdd; + var newChildModel; + var newChildTitle; + this.pageModel; + this.pageView; + + if (model.get('_type') === 'page') { + this.pageModel = model; + this.pageView = newMenuItemView; + typeToAdd = 'article'; + newChildTitle = window.polyglot.t('app.placeholdernewarticle'); + var newChildModel = new EditorArticleModel(); + } else { + typeToAdd = 'block'; + newChildTitle = window.polyglot.t('app.placeholdernewblock'); + var newChildModel = new EditorBlockModel(); + } + + newChildModel.save({ + title: newChildTitle, + displayTitle: (typeToAdd == 'block') ? '' : newChildTitle, + body: '', + _parentId: model.get('_id'), + _courseId: Origin.editor.data.course.get('_id') + }, { + error: function() { + newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errormenueditorbody'), + }); + _.delay(newMenuItemView.remove, 3000); + }, + success: _.bind(function(model, response, options) { + // Add this new element to the collect + Origin.editor.data[model.get('_type') + 's'].add(model); + + if (typeToAdd === 'article') { + this.addNewPageArticleAndBlock(model, newMenuItemView); + } else { + newMenuItemView.$el.removeClass('syncing').addClass('synced'); + } + }, this) + }); + }, + + addMenuItemView: function(model) { + var newMenuItemView = new EditorMenuItemView({ model: model }); + this.$('.editor-menu-layer-inner').append(newMenuItemView.$el.addClass('syncing')); + return newMenuItemView; + }, + + pasteMenuItem: function(event) { + event.preventDefault(); + Origin.trigger('editorView:paste', this._parentId, this.$('.editor-menu-item').length + 1); + }, + + cancelPasteMenuItem: function(event) { + event.preventDefault(); + $('.add-zone').css('visibility','visible'); + var parentId = this._parentId; + var target = new EditorContentObjectModel({ + _parentId: parentId, + _courseId: Origin.editor.data.course.get('_id') + }); + Origin.trigger('editorView:pasteCancel', target); + } + }, { + template: 'editorMenuLayer' + }); + + return EditorMenuLayerView; +}); diff --git a/frontend/src/core/editor/menu/views/editorMenuSidebarView.js b/frontend/src/core/editor/contentObject/views/editorMenuSidebarView.js similarity index 100% rename from frontend/src/core/editor/menu/views/editorMenuSidebarView.js rename to frontend/src/core/editor/contentObject/views/editorMenuSidebarView.js diff --git a/frontend/src/core/editor/menu/views/editorMenuView.js b/frontend/src/core/editor/contentObject/views/editorMenuView.js similarity index 94% rename from frontend/src/core/editor/menu/views/editorMenuView.js rename to frontend/src/core/editor/contentObject/views/editorMenuView.js index 62ab11cd8b..8fb06e7579 100644 --- a/frontend/src/core/editor/menu/views/editorMenuView.js +++ b/frontend/src/core/editor/contentObject/views/editorMenuView.js @@ -1,10 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorMenuLayerView = require('editorMenu/views/editorMenuLayerView'); - var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorContentObjectModel = require('../models/editorContentObjectModel'); + var EditorMenuLayerView = require('./editorMenuLayerView'); + var EditorMenuItemView = require('./editorMenuItemView'); var EditorMenuView = EditorOriginView.extend({ className: "editor-menu", @@ -13,7 +13,7 @@ define(function(require){ preRender: function() { this.listenTo(Origin, { 'editorView:menuView:updateSelectedItem': this.updateSelectedItem, - Origin, 'window:resize': this.setupHorizontalScroll + 'window:resize': this.setupHorizontalScroll }); }, diff --git a/frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js b/frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js new file mode 100644 index 0000000000..a235ff094d --- /dev/null +++ b/frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js @@ -0,0 +1,28 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + + var EditorPageEditSidebarView = SidebarItemView.extend({ + events: { + 'click .editor-page-edit-sidebar-save': 'saveEditing', + 'click .editor-page-edit-sidebar-cancel': 'cancelEditing' + }, + + saveEditing: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving')) + Origin.trigger('editorPageEditSidebar:views:save'); + }, + + cancelEditing: function(event) { + event && event.preventDefault(); + Backbone.history.history.back(); + } + }, { + template: 'editorPageEditSidebar' + }); + + return EditorPageEditSidebarView; +}); diff --git a/frontend/src/core/editor/page/views/editorPageEditView.js b/frontend/src/core/editor/contentObject/views/editorPageEditView.js similarity index 86% rename from frontend/src/core/editor/page/views/editorPageEditView.js rename to frontend/src/core/editor/contentObject/views/editorPageEditView.js index a46828aae5..c0a8aa88b2 100644 --- a/frontend/src/core/editor/page/views/editorPageEditView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageEditView.js @@ -2,17 +2,16 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); + var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageEditView = EditorOriginView.extend({ - tagName: "div", className: "page-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, 'editorPageEditSidebar:views:save', this.save); } - }, - { + }, { template: 'editorPageEdit' }); diff --git a/frontend/src/core/editor/contentObject/views/editorPageOverviewView.js b/frontend/src/core/editor/contentObject/views/editorPageOverviewView.js new file mode 100644 index 0000000000..af747cb038 --- /dev/null +++ b/frontend/src/core/editor/contentObject/views/editorPageOverviewView.js @@ -0,0 +1,123 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('coreJS/app/origin'); + var EditorOriginView = require('../../global/views/editorOriginView'); + + var EditorPageOverviewView = EditorOriginView.extend({ + className: 'editor-page-overview', + + settings: { + autoRender: false + }, + + events: { + "click a.load-page" : "goToPage" + }, + + preRender: function() { + this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remove); + this.listenTo(Origin, 'editorView:refreshPageList', this.refreshProjectStructure); + + this.render(); + this.refreshProjectStructure(); + }, + + postRender: function() { + + }, + + /** + * Converts an array of Backbone Models to a JavaScript tree structure + * @param {Array} data + * @return A JavaScript treeview-like object structure + */ + convertModelsToTree: function(data){ + var map = {}, + flat = {}, + root = []; + + // Flatten the data + for (var i = 0; i < data.length; i++) { + var key = data[i].get('_id'); + + flat[key] = { + _id: data[i].get('_id'), + _type: data[i].get('_type'), + _parentId: data[i].get('_parentId'), + title: data[i].get('title') + }; + } + + // Add a 'children' container to each node + for (var i in flat) { + flat[i].children = []; + } + + // Populate any 'children' container arrays + for (var i in flat) { + var parentkey = flat[i]._parentId; + + if (flat[parentkey]) { + flat[parentkey].children.push(flat[i]); + } + } + + // Find the root nodes (no parent found) and create the hierarchy tree from them + for (var i in flat) { + var parentkey = flat[i]._parentId; + + if (!flat[parentkey]) { + root.push(flat[i]); + } + } + + return root; + }, + + /** + * Creates a HTML string from a given items treeview structure + * NOTE: string contatenation is faster here than DOM manipulation + * @param {String} html + * @param {Array} items + * @return A HTML unordered list snippet + */ + createOverviewTreeviewHtml: function(html, items) { + html += '
    ' + + for (var i = 0; i < items.length; i++) { + if (items[i].children.length != 0 || items[i]._type == 'menu') { + html += '
  • ' + items[i].title; + html = this.createOverviewTreeviewHtml(html, items[i].children); + html += '
    • '; + } else { + html += '
  • ' + items[i].title + '
    • '; + } + } + + html += '
'; + + return html; + }, + + /** + * Clears and reloads the project tree structure + */ + refreshProjectStructure: function() { + var $projectOverview = this.$('.page-list'); + var listItems = this.convertModelsToTree(Origin.editor.data.contentObjects.models); + + $projectOverview + .empty(); + .html(this.createOverviewTreeviewHtml(html, listItems)); + }, + + goToPage: function (event) { + event && event.preventDefault(); + Origin.router.navigate('/editor/' + Origin.editor.data.course.get('_id') + '/page/' + $(event.currentTarget).data('page-id'), {trigger: true}); + } + }, { + template: 'editorPageOverview' + }); + + return EditorPageOverviewView; +}); diff --git a/frontend/src/core/editor/page/views/editorPageSidebarView.js b/frontend/src/core/editor/contentObject/views/editorPageSidebarView.js similarity index 97% rename from frontend/src/core/editor/page/views/editorPageSidebarView.js rename to frontend/src/core/editor/contentObject/views/editorPageSidebarView.js index a3d1263b27..e763e86cf2 100644 --- a/frontend/src/core/editor/page/views/editorPageSidebarView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageSidebarView.js @@ -1,17 +1,13 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); var EditorPageSidebarView = SidebarItemView.extend({ - // If adding 'events', extend from the base view - }, { template: 'editorPageSidebar' }); return EditorPageSidebarView; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/page/views/editorPageView.js b/frontend/src/core/editor/contentObject/views/editorPageView.js similarity index 89% rename from frontend/src/core/editor/page/views/editorPageView.js rename to frontend/src/core/editor/contentObject/views/editorPageView.js index 410df366bc..93b54bc317 100644 --- a/frontend/src/core/editor/page/views/editorPageView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageView.js @@ -1,31 +1,28 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorModel = require('editorGlobal/models/editorModel'); - var EditorArticleView = require('editorPage/views/editorArticleView'); - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - var EditorPasteZoneView = require('editorGlobal/views/editorPasteZoneView'); - var EditorPageView = EditorOriginView.extend({ - - tagName: 'div', + var EditorArticleView = require('../../article/views/editorArticleView'); + var EditorArticleModel = require('../../article/models/editorArticleModel'); + var EditorModel = require('../../global/models/editorModel'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); + var EditorPageView = EditorOriginView.extend({ className: 'page', + tagName: 'div', + childrenCount: 0, + childrenRenderedCount: 0, events: { - 'click a.add-article' : 'addArticle', - 'click a.page-edit-button' : 'openContextMenu', - 'dblclick .page-detail' : 'loadPageEdit', - 'click .paste-cancel' : 'onPasteCancel' + 'click a.add-article': 'addArticle', + 'click a.page-edit-button': 'openContextMenu', + 'dblclick .page-detail': 'loadPageEdit', + 'click .paste-cancel': 'onPasteCancel' }, - childrenCount: 0, - childrenRenderedCount: 0, - preRender: function() { this.setupChildCount(); @@ -103,7 +100,6 @@ define(function(require){ }, addArticleView: function(articleModel, scrollIntoView, addNewBlock) { - var newArticleView = new EditorArticleView({model: articleModel}), sortOrder = articleModel.get('_sortOrder'); @@ -130,7 +126,7 @@ define(function(require){ }, addArticle: function(event) { - event.preventDefault(); + event && event.preventDefault(); var _this = this; var newPageArticleModel = new EditorArticleModel({ @@ -186,10 +182,7 @@ define(function(require){ }, onCutArticle: function(view) { - this.once('pageView:postRender', function() { - view.showPasteZones(); - }); - + this.once('pageView:postRender', view.showPasteZones); this.render(); } }, { @@ -197,5 +190,4 @@ define(function(require){ }); return EditorPageView; - }); diff --git a/frontend/src/core/editor/course/index.js b/frontend/src/core/editor/course/index.js new file mode 100644 index 0000000000..b920981e02 --- /dev/null +++ b/frontend/src/core/editor/course/index.js @@ -0,0 +1,42 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('coreJS/app/origin'); + var Helpers = require('../global/helpers'); + + var EditorCourseModel = require('./models/editorCourseModel'); + var EditorCourseEditView = require('./views/editorCourseEditView'); + var EditorCourseEditViewSidebarView = require('./views/editorCourseEditSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 === 'settings' || route2 === 'project' && route3 === 'edit') { + renderCourseEdit(); + } else if(route2 === 'project' && route3 === 'new') { + createNewCourse(); + } + }); +}); + +function renderCourseEdit() { + (new EditorCourseModel({ _id: Origin.location.route1 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: window.polyglot.t('app.editcourse') }); + Origin.editingOverlay.addView(new EditorCourseEditView({ model: model, form: form }).$el); + Origin.sidebar.addView(new EditorCourseEditViewSidebarView({ form: form }).$el); + } + }); +} + +function createNewCourse() { + // Default the new project title + var model = new EditorCourseModel({ + title: window.polyglot.t('app.placeholdernewcourse'), + displayTitle: window.polyglot.t('app.placeholdernewcourse') + }); + + var form = Origin.scaffold.buildForm({ model: model }); + + Origin.trigger('location:title:update', { title: window.polyglot.t('app.addnewproject') }); + Origin.editingOverlay.addView(new EditorCourseEditView({ model: model, form: form }).$el); + Origin.sidebar.addView(new EditorCourseEditViewSidebarView({ form: form }).$el); +} diff --git a/frontend/src/core/editor/course/models/editorCourseModel.js b/frontend/src/core/editor/course/models/editorCourseModel.js index f33b49704e..2b8e1c9e46 100644 --- a/frontend/src/core/editor/course/models/editorCourseModel.js +++ b/frontend/src/core/editor/course/models/editorCourseModel.js @@ -1,12 +1,30 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorCourseModel = EditorModel.extend({ urlRoot: '/api/content/course', _type: 'course', _siblings: '', - _children: 'contentObjects' + _children: 'contentObjects', + + initialize : function(options) { + }, + + getHeroImageURI: function () { + if(Helpers.isAssetExternal(this.get('heroImage'))) { + return this.get('heroImage'); + } + return '/api/asset/serve/' + this.get('heroImage'); + }, + + isEditable: function () { + return this.get('_isShared') || this.get('createdBy') == Origin.sessionModel.get('id'); + }, + + getDuplicateURI: function () { + return '/api/duplicatecourse/' + this.get('_id'); + } }); return EditorCourseModel; diff --git a/frontend/src/core/project/templates/projectDetail.hbs b/frontend/src/core/editor/course/templates/editorCourseEdit.hbs similarity index 100% rename from frontend/src/core/project/templates/projectDetail.hbs rename to frontend/src/core/editor/course/templates/editorCourseEdit.hbs diff --git a/frontend/src/core/project/templates/projectDetailEditSidebar.hbs b/frontend/src/core/editor/course/templates/editorCourseEditSidebar.hbs similarity index 100% rename from frontend/src/core/project/templates/projectDetailEditSidebar.hbs rename to frontend/src/core/editor/course/templates/editorCourseEditSidebar.hbs diff --git a/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js b/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js new file mode 100644 index 0000000000..f204565619 --- /dev/null +++ b/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js @@ -0,0 +1,28 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('coreJS/app/origin'); + var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); + + var EditorCourseEditSidebarView = SidebarItemView.extend({ + events: { + 'click .editor-project-edit-sidebar-save': 'save', + 'click .editor-project-edit-sidebar-cancel': 'cancel' + }, + + save: function(event) { + event && event.preventDefault(); + this.updateButton('.editor-project-edit-sidebar-save', window.polyglot.t('app.saving')); + Origin.trigger('projectEditSidebar:views:save'); + }, + + cancel: function(event) { + event && event.preventDefault(); + Backbone.history.history.back(); + } + }, { + template: 'editorCourseEditSidebarView' + }); + + return EditorCourseEditSidebarView; +}); diff --git a/frontend/src/core/project/views/projectDetailView.js b/frontend/src/core/editor/course/views/editorCourseEditView.js similarity index 89% rename from frontend/src/core/project/views/projectDetailView.js rename to frontend/src/core/editor/course/views/editorCourseEditView.js index 4fe0db2d73..eafce238b7 100644 --- a/frontend/src/core/project/views/projectDetailView.js +++ b/frontend/src/core/editor/course/views/editorCourseEditView.js @@ -2,14 +2,12 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorConfigModel = require('editorConfig/models/editorConfigModel'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - - var ProjectDetailView = EditorOriginView.extend({ - - tagName: "div", + var EditorConfigModel = require('../../config/models/editorConfigModel'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorCourseEditView = EditorOriginView.extend({ className: "course-edit", + tagName: "div", preRender: function() { this.listenTo(Origin, 'projectEditSidebar:views:save', this.save); @@ -61,10 +59,9 @@ define(function(require) { var messageText = typeof response.responseJSON == 'object' && response.responseJSON.message; EditorOriginView.prototype.onSaveError.call(this, null, messageText); } - }, - { - template: 'projectDetail' + }, { + template: 'editorCourseEdit' }); - return ProjectDetailView; + return EditorCourseEditView; }); diff --git a/frontend/src/core/editor/editor.js b/frontend/src/core/editor/editor.js index cbb8c79692..bdb6ed7da8 100644 --- a/frontend/src/core/editor/editor.js +++ b/frontend/src/core/editor/editor.js @@ -1,489 +1,15 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('coreJS/app/origin'); - var EditorView = require('editorGlobal/views/editorView'); - var EditorModel = require('editorGlobal/models/editorModel'); - var EditorMenuSidebarView = require('editorMenu/views/editorMenuSidebarView'); - - var EditorPageSidebarView = require('editorPage/views/editorPageSidebarView'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - - var EditorPageEditView = require('editorPage/views/editorPageEditView'); - var EditorPageEditSidebarView = require('editorPage/views/editorPageEditSidebarView'); - - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - - var EditorArticleEditView = require('editorPage/views/editorArticleEditView'); - var EditorArticleEditSidebarView = require('editorPage/views/editorArticleEditSidebarView'); - - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - - var EditorBlockEditView = require('editorPage/views/editorBlockEditView'); - var EditorBlockEditSidebarView = require('editorPage/views/editorBlockEditSidebarView'); - - var EditorComponentModel = require('editorPage/models/editorComponentModel'); - - var EditorComponentEditView = require('editorPage/views/editorComponentEditView'); - var EditorComponentEditSidebarView = require('editorPage/views/editorComponentEditSidebarView'); - - var EditorExtensionsEditView = require('editorExtensions/views/editorExtensionsEditView'); - var EditorExtensionsEditSidebarView = require('editorExtensions/views/editorExtensionsEditSidebarView'); - - var EditorConfigEditView = require('editorConfig/views/editorConfigEditView'); - var EditorConfigEditSidebarView = require('editorConfig/views/editorConfigEditSidebarView'); - var EditorConfigModel = require('editorConfig/models/editorConfigModel'); - var EditorConfigCollection = require('editorConfig/collections/editorConfigCollection'); - - var EditorThemeTypeModel = require('editorTheme/models/editorThemeTypeModel'); - - var EditorThemeCollectionView = require('editorTheme/views/editorThemeCollectionView'); - var EditorThemeCollectionSidebarView = require('editorTheme/views/editorThemeCollectionSidebarView'); - - var EditorComponentListView = require('editorPage/views/editorComponentListView'); - var EditorComponentListSidebarView = require('editorPage/views/editorComponentListSidebarView'); - - var EditorConfigModel = require('editorConfig/models/editorConfigModel'); - var EditorCourseModel = require('editorCourse/models/editorCourseModel'); - var EditorCollection = require('editorGlobal/collections/editorCollection'); - var EditorClipboardModel = require('editorGlobal/models/editorClipboardModel'); - var EditorComponentTypeModel = require('editorPage/models/editorComponentTypeModel'); - var ExtensionModel = require('editorExtensions/models/extensionModel'); - var EditorCourseAssetModel = require('editorCourse/models/editorCourseAssetModel'); - - var EditorMenuSettingsEditView = require('editorMenuSettings/views/editorMenuSettingsEditView'); - var EditorMenuSettingsEditSidebarView = require('editorMenuSettings/views/editorMenuSettingsEditSidebarView'); - - var ProjectModel = require('coreJS/project/models/projectModel'); - var ProjectDetailView = require('coreJS/project/views/projectDetailView'); - var ProjectDetailEditSidebarView = require('coreJS/project/views/projectDetailEditSidebarView'); - - var dataIsLoaded = false; - - Origin.on('editor:refreshData', function(callback, context) { - dataIsLoaded = false; - var loadedData = { - clipboard: false, - course: false, - config: false, - componentTypes: false, - extensionTypes: false, - contentObjects: false, - articles: false, - blocks: false, - components: false, - courseAssets: false - }; - Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { - - loadedData[loadedObject] = true; - - var allDataIsLoaded = _.every(loadedData, function(item) { - return item === true; - }); - - if (allDataIsLoaded) { - - Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); - Origin.trigger('editor:dataLoaded'); - dataIsLoaded = true; - if (callback) { - callback.apply(context); - } - } - - }); - - // // Not implemented for the time being - // Origin.editor.data.config.on('change:_enabledExtensions', function() { - // Origin.socket.emit('project:build', { id: this.currentCourseId }); - // }); - - _.each(Origin.editor.data, function(object) { - object.fetch({reset:true, - error: function(model, response, options) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); - } - }); - }); - - }); - - Origin.on('router:editor', function(route1, route2, route3, route4) { - // Check if data has already been loaded for this project - if (dataIsLoaded && Origin.editor.data.course && Origin.editor.data.course.get('_id') === route1) { - return routeAfterDataIsLoaded(route1, route2, route3, route4); - } - - var loadedData = { - clipboard: false, - course: false, - config: false, - componentTypes: false, - extensionTypes: false, - contentObjects: false, - articles: false, - blocks: false, - components: false, - courseAssets: false - }; - - Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { - - loadedData[loadedObject] = true; - - var allDataIsLoaded = _.every(loadedData, function(item) { - return item === true; - }); - - if (allDataIsLoaded) { - - Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); - Origin.trigger('editor:dataLoaded'); - dataIsLoaded = true; - routeAfterDataIsLoaded(route1, route2, route3, route4); - - } - - }); - - setupEditorData(route1, route2, route3, route4); - - }); - - function setupEditorData(route1, route2, route3, route4) { - Origin.editor.data.course = new EditorCourseModel({_id: route1}); - Origin.editor.data.config = new EditorConfigModel({_courseId: route1}); - - Origin.editor.data.contentObjects = new EditorCollection(null, { - model: EditorContentObjectModel, - url: '/api/content/contentobject?_courseId=' + route1, - _type: 'contentObjects' - }); - - Origin.editor.data.articles = new EditorCollection(null, { - model: EditorArticleModel, - url: '/api/content/article?_courseId=' + route1, - _type: 'articles' - }); - - Origin.editor.data.blocks = new EditorCollection(null, { - model: EditorBlockModel, - url: '/api/content/block?_courseId=' + route1, - _type: 'blocks' - }); - - Origin.editor.data.components = new EditorCollection(null, { - model: EditorComponentModel, - url: '/api/content/component?_courseId=' + route1, - _type: 'components' - }); - - Origin.editor.data.clipboard = new EditorCollection(null, { - model: EditorClipboardModel, - url: '/api/content/clipboard?_courseId=' + route1 + '&createdBy=' + Origin.sessionModel.get('id'), - _type: 'clipboard' - }); - - // Store the component types - Origin.editor.data.componentTypes = new EditorCollection(null, { - model : EditorComponentTypeModel, - url: '/api/componenttype', - _type: 'componentTypes' - }); - - Origin.editor.data.componentTypes.comparator = function(model) { - return model.get('displayName'); - }; - - // Store the extensions types - Origin.editor.data.extensionTypes = new EditorCollection(null, { - model : ExtensionModel, - url: '/api/extensiontype', - _type: 'extensionTypes' - }); - - // Store the course assets - Origin.editor.data.courseAssets = new EditorCollection(null, { - model: EditorCourseAssetModel, - url: '/api/content/courseasset?_courseId=' + route1, - _type: 'courseAssets' - }); - } - - function routeAfterDataIsLoaded(route1, route2, route3, route4) { - - if (route2 === 'article' && route4 === 'edit') { - var articleModel = new EditorArticleModel({_id: route3}); - articleModel.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: articleModel - }); - Origin.trigger('location:title:update', {title: 'Editing article - ' + articleModel.get('title')}); - Origin.sidebar.addView(new EditorArticleEditSidebarView({model: articleModel, form: form}).$el); - Origin.contentPane.setView(EditorArticleEditView, { model: articleModel, form: form }); - } - }); - return; - } - - if (route2 === 'block' && route4 === 'edit') { - var blockModel = new EditorBlockModel({_id: route3}); - blockModel.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: blockModel - }); - Origin.trigger('location:title:update', {title: 'Editing block - ' + blockModel.get('title')}); - Origin.sidebar.addView(new EditorBlockEditSidebarView({model: blockModel, form: form}).$el); - Origin.contentPane.setView(EditorBlockEditView, { model: blockModel, form: form }); - } - }); - return; - } - - if (route2 === 'block' && route4 === 'add') { - // If adding a new component - // Find block so we can get layout options - var containingBlock = Origin.editor.data.blocks.findWhere({_id: route3}); - - var layoutOptions = containingBlock.get('layoutOptions'); - - var componentSelectModel = new Backbone.Model({ - title: window.polyglot.t('app.addcomponent'), - body: window.polyglot.t('app.pleaseselectcomponent'), - _parentId: route3, - componentTypes: Origin.editor.data.componentTypes.toJSON(), - layoutOptions: layoutOptions - }); - - Origin.sidebar.addView(new EditorComponentListSidebarView({ - model: componentSelectModel - }).$el); - Origin.contentPane.setView(EditorComponentListView, { model: componentSelectModel }); - - return; - } - - if (route2 === 'component') { - // Display editing a component - var componentModel = new EditorComponentModel({_id: route3}); - componentModel.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: componentModel - }); - - var componentType = _.find(Origin.editor.data.componentTypes.models, function(componentTypeModel) { - return componentTypeModel.get('_id') == componentModel.get('_componentType'); - }); - - var componentDisplayName = (componentType) ? componentType.get('displayName').toLowerCase() : ''; - - Origin.trigger('location:title:update', {title: 'Editing ' + componentDisplayName + ' component - ' + componentModel.get('title')}); - Origin.sidebar.addView(new EditorComponentEditSidebarView({model: componentModel, form:form}).$el); - Origin.contentPane.setView(EditorComponentEditView, { model: componentModel, form: form }); - } - }); - return; - } - - switch (route2) { - case 'settings': - var project = new ProjectModel({_id: route1}); - - project.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: project - }); - - Origin.trigger('location:title:update', {title: 'Edit course'}); - Origin.contentPane.setView(ProjectDetailView, { model: project, form: form }); - Origin.sidebar.addView(new ProjectDetailEditSidebarView({form: form}).$el); - } - }); - break; - - case 'config': - // route2 is the courseid - // var collection = new EditorConfigCollection(); - // collection.findWhere({_courseId: location}); - - var configModel = new EditorConfigModel({_courseId: route1}); - - configModel.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: configModel - }); - - Origin.trigger('location:title:update', {title: 'Edit configuration'}); - Origin.sidebar.addView(new EditorConfigEditSidebarView({form: form}).$el); - Origin.contentPane.setView(EditorConfigEditView, { model: configModel, form: form }); - } - }); - - break; - - case 'selecttheme': - var configModel = new EditorConfigModel({_courseId: route1}); - - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } - - var optionsObject = { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }; - - configModel.fetch({ - success: function() { - Origin.trigger('location:title:update', {title: 'Select theme'}); - Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, optionsObject); - Origin.contentPane.setView(EditorThemeCollectionView, { model: configModel }); - } - }); - - break; - - case 'extensions': - Origin.trigger('location:title:update', {title: 'Manage extensions'}); - - var extensionsModel = new Backbone.Model({_id: route1}); - - // Setup back button breadcrumb - - // Check whether the user came from the page editor or menu editor - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } - - var optionsObject = { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }; - - Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, optionsObject); - Origin.contentPane.setView(EditorExtensionsEditView, { model: extensionsModel }); - - break; - - case 'menusettings': - var configModel = new EditorConfigModel({_courseId: route1}); - - configModel.fetch({ - success: function() { - - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } - - var optionsObject = { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }; - - Origin.trigger('location:title:update', {title: 'Select menu'}); - Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, optionsObject); - Origin.contentPane.setView(EditorMenuSettingsEditView, { model: configModel }); - } - }); - break; - - case 'menu': - - // Edit the menu item - if (route4 === "edit") { - var contentObjectModel = new EditorContentObjectModel({_id: route3}); - - contentObjectModel.fetch({ - success: function() { - - var form = Origin.scaffold.buildForm({ - model: contentObjectModel - }); - - Origin.trigger('location:title:update', {title: 'Editing menu - ' + contentObjectModel.get('title')}); - Origin.sidebar.addView(new EditorPageEditSidebarView().$el); - Origin.contentPane.setView(EditorPageEditView, { model: contentObjectModel, form: form }); - } - }); - } else { - // If route3 is an id set it to the currentContentObjectId - Origin.editor.currentContentObjectId = (route3) ? route3 : undefined; - - // Update page title - Origin.trigger('location:title:update', {title: 'Menu editor'}); - - Origin.editor.scrollTo = 0; - // Create Editor menu view - Origin.contentPane.setView(EditorView, { - currentCourseId: route1, - currentView: 'menu', - currentPageId: (route3 || null) - }); - - // update sidebar view - Origin.sidebar.addView(new EditorMenuSidebarView().$el, { - "backButtonText": "Back to courses", - "backButtonRoute": Origin.dashboardRoute || '/#/dashboard' - }); - } - break; - - case 'page': - - // Edit the page item - if (route4 === "edit") { - var contentObjectModel = new EditorContentObjectModel({_id: route3}); - contentObjectModel.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: contentObjectModel - }); - Origin.trigger('location:title:update', {title: 'Editing page - ' + contentObjectModel.get('title')}); - Origin.sidebar.addView(new EditorPageEditSidebarView({form: form}).$el); - Origin.contentPane.setView(EditorPageEditView, { model: contentObjectModel, form: form }); - } - }); - } else { - // Update page title - Origin.trigger('location:title:update', {title: 'Page editor'}); - - // Create Editor page view - // Origin.editor.scrollTo = 0; - Origin.contentPane.setView(EditorView, { - currentCourseId: route1, - currentView: 'page', - currentPageId: (route3 || null) - }); - // update sidebar view - Origin.sidebar.addView(new EditorPageSidebarView().$el, { - "backButtonText": "Back to course structure", - "backButtonRoute": "/#/editor/" + route1 + "/menu" - }); - } - break; - } - - } - + // just loads in the submodules + require([ + './article/index', + './block/index', + './component/index', + './config/index', + './contentObject/index', + './course/index', + './extensions/index', + './menuSettings/index', + './theme/index' + ]); }); diff --git a/frontend/src/core/editor/editor_old.js b/frontend/src/core/editor/editor_old.js new file mode 100644 index 0000000000..5f7d49724a --- /dev/null +++ b/frontend/src/core/editor/editor_old.js @@ -0,0 +1,158 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var dataIsLoaded = false; + + Origin.on('editor:refreshData', function(callback, context) { + dataIsLoaded = false; + var loadedData = { + clipboard: false, + course: false, + config: false, + componentTypes: false, + extensionTypes: false, + contentObjects: false, + articles: false, + blocks: false, + components: false, + courseAssets: false + }; + Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { + + loadedData[loadedObject] = true; + + var allDataIsLoaded = _.every(loadedData, function(item) { + return item === true; + }); + + if (allDataIsLoaded) { + + Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); + Origin.trigger('editor:dataLoaded'); + dataIsLoaded = true; + if (callback) { + callback.apply(context); + } + } + + }); + + // // Not implemented for the time being + // Origin.editor.data.config.on('change:_enabledExtensions', function() { + // Origin.socket.emit('project:build', { id: this.currentCourseId }); + // }); + + _.each(Origin.editor.data, function(object) { + object.fetch({reset:true, + error: function(model, response, options) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorgeneric') + }); + } + }); + }); + + }); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + // Check if data has already been loaded for this project + if (dataIsLoaded && Origin.editor.data.course && Origin.editor.data.course.get('_id') === route1) { + return routeAfterDataIsLoaded(route1, route2, route3, route4); + } + + var loadedData = { + clipboard: false, + course: false, + config: false, + componentTypes: false, + extensionTypes: false, + contentObjects: false, + articles: false, + blocks: false, + components: false, + courseAssets: false + }; + + Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { + + loadedData[loadedObject] = true; + + var allDataIsLoaded = _.every(loadedData, function(item) { + return item === true; + }); + + if (allDataIsLoaded) { + + Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); + Origin.trigger('editor:dataLoaded'); + dataIsLoaded = true; + routeAfterDataIsLoaded(route1, route2, route3, route4); + + } + + }); + + setupEditorData(route1, route2, route3, route4); + + }); + + function setupEditorData(route1, route2, route3, route4) { + Origin.editor.data.course = new EditorCourseModel({_id: route1}); + Origin.editor.data.config = new EditorConfigModel({_courseId: route1}); + + Origin.editor.data.contentObjects = new EditorCollection(null, { + model: EditorContentObjectModel, + url: '/api/content/contentobject?_courseId=' + route1, + _type: 'contentObjects' + }); + + Origin.editor.data.articles = new EditorCollection(null, { + model: EditorArticleModel, + url: '/api/content/article?_courseId=' + route1, + _type: 'articles' + }); + + Origin.editor.data.blocks = new EditorCollection(null, { + model: EditorBlockModel, + url: '/api/content/block?_courseId=' + route1, + _type: 'blocks' + }); + + Origin.editor.data.components = new EditorCollection(null, { + model: EditorComponentModel, + url: '/api/content/component?_courseId=' + route1, + _type: 'components' + }); + + Origin.editor.data.clipboard = new EditorCollection(null, { + model: EditorClipboardModel, + url: '/api/content/clipboard?_courseId=' + route1 + '&createdBy=' + Origin.sessionModel.get('id'), + _type: 'clipboard' + }); + + // Store the component types + Origin.editor.data.componentTypes = new EditorCollection(null, { + model : EditorComponentTypeModel, + url: '/api/componenttype', + _type: 'componentTypes' + }); + + Origin.editor.data.componentTypes.comparator = function(model) { + return model.get('displayName'); + }; + + // Store the extensions types + Origin.editor.data.extensionTypes = new EditorCollection(null, { + model : ExtensionModel, + url: '/api/extensiontype', + _type: 'extensionTypes' + }); + + // Store the course assets + Origin.editor.data.courseAssets = new EditorCollection(null, { + model: EditorCourseAssetModel, + url: '/api/content/courseasset?_courseId=' + route1, + _type: 'courseAssets' + }); + } +}); diff --git a/frontend/src/core/editor/extensions/index.js b/frontend/src/core/editor/extensions/index.js new file mode 100644 index 0000000000..536cc3ee08 --- /dev/null +++ b/frontend/src/core/editor/extensions/index.js @@ -0,0 +1,30 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('origin'); + var Helpers = require('../global/helpers'); + + var EditorExtensionsEditView = require('./views/editorExtensionsEditView'); + var EditorExtensionsEditSidebarView = require('./views/editorExtensionsEditSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 !== 'extensions') { + return; + } + Origin.trigger('location:title:update', { title: 'Manage extensions' }); + + // Check whether the user came from the page editor or menu editor + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } + + Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorExtensionsEditView, { model: new Backbone.Model({ _id: route1 }) }); + }); +}); diff --git a/frontend/src/core/editor/extensions/models/extensionModel.js b/frontend/src/core/editor/extensions/models/extensionModel.js index 224f972040..2fc2048181 100644 --- a/frontend/src/core/editor/extensions/models/extensionModel.js +++ b/frontend/src/core/editor/extensions/models/extensionModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); +define(function(require) { + var EditorModel = require('../../global/models/editorModel'); var ExtensionModel = EditorModel.extend({ urlRoot: '/api/extensiontype', @@ -11,7 +11,6 @@ define(function(require) { _children: null, initialize: function(){ - } }); diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js index 6dadb450c0..991a2573bf 100644 --- a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js +++ b/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); var EditorExtensionsEditSidebarView = SidebarItemView.extend({}, { template: 'editorExtensionsEditSidebar' diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js index 85ff1e6555..2136f63b0e 100644 --- a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js @@ -2,12 +2,12 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorConfigModel = require('editorConfig/models/editorConfigModel'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorConfigModel = require('../../config/models/editorConfigModel'); var EditorExtensionsEditView = EditorOriginView.extend({ - tagName: "div", className: "extension-management", + tagName: "div", settings: { autoRender: false @@ -42,8 +42,8 @@ define(function(require) { } }); this.model.set({ - enabledExtensions: enabledExtensionsCollection.toJSON()), - availableExtensions: disabledExtensionsCollection.toJSON()) + enabledExtensions: enabledExtensionsCollection.toJSON(), + availableExtensions: disabledExtensionsCollection.toJSON() }); }, diff --git a/frontend/src/core/editor/global/helpers.js b/frontend/src/core/editor/global/helpers.js new file mode 100644 index 0000000000..057146b082 --- /dev/null +++ b/frontend/src/core/editor/global/helpers.js @@ -0,0 +1,6 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require){ + return { + + }; +}); diff --git a/frontend/src/core/editor/global/models/editorClipboardModel.js b/frontend/src/core/editor/global/models/editorClipboardModel.js index f8fa571a7a..903d559578 100644 --- a/frontend/src/core/editor/global/models/editorClipboardModel.js +++ b/frontend/src/core/editor/global/models/editorClipboardModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorClipboardModel = EditorModel.extend({ urlRoot: '/api/content/clipboard', diff --git a/frontend/src/core/editor/global/preloader.js b/frontend/src/core/editor/global/preloader.js new file mode 100644 index 0000000000..08fd56e99d --- /dev/null +++ b/frontend/src/core/editor/global/preloader.js @@ -0,0 +1,8 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require){ + return { + preload: function() { + + } + }; +}); diff --git a/frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs b/frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs new file mode 100644 index 0000000000..98813fdd62 --- /dev/null +++ b/frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs @@ -0,0 +1,76 @@ +
+ + + + +
+ + {{#ifHasPermissions "*/*:create,*/*:read,*/*:update,*/*:delete"}} +
+ +
+ {{/ifHasPermissions}} + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
diff --git a/frontend/src/core/editor/page/templates/partials/part_settingsGeneral.hbs b/frontend/src/core/editor/global/templates/partials/part_settingsGeneral.hbs similarity index 94% rename from frontend/src/core/editor/page/templates/partials/part_settingsGeneral.hbs rename to frontend/src/core/editor/global/templates/partials/part_settingsGeneral.hbs index 0955cbd2bd..2ec22d54aa 100644 --- a/frontend/src/core/editor/page/templates/partials/part_settingsGeneral.hbs +++ b/frontend/src/core/editor/global/templates/partials/part_settingsGeneral.hbs @@ -1,24 +1,27 @@ -
+
+
+
+
+
- diff --git a/frontend/src/core/editor/global/views/editorOriginView.js b/frontend/src/core/editor/global/views/editorOriginView.js index c7f1500282..ac1d46d2e5 100644 --- a/frontend/src/core/editor/global/views/editorOriginView.js +++ b/frontend/src/core/editor/global/views/editorOriginView.js @@ -30,7 +30,7 @@ define(function(require){ } this.$('.form-container').append(this.form.el); // Set the delays going to stop jumping pages - _.delay(_.bind(this.setViewToReady, this, 400); + _.delay(_.bind(this.setViewToReady, this, 400)); }, filterForm: function(filter) { @@ -115,8 +115,8 @@ define(function(require){ var attrs = this.getAttributesToSave(); this.model.save(attrs, { patch: (attrs) ? true : false, - success: _.bind(this.onSaveSuccess, this) - error: _.bind(this.onSaveError, this), + success: _.bind(this.onSaveSuccess, this), + error: _.bind(this.onSaveError, this) }); }, diff --git a/frontend/src/core/editor/global/views/editorPasteZoneView.js b/frontend/src/core/editor/global/views/editorPasteZoneView.js index 739c3fc2b1..04f7884ed3 100644 --- a/frontend/src/core/editor/global/views/editorPasteZoneView.js +++ b/frontend/src/core/editor/global/views/editorPasteZoneView.js @@ -2,9 +2,9 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Helpers = require('coreJS/app/helpers'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); var Origin = require('coreJS/app/origin'); + var Helpers = require('coreJS/app/helpers'); + var EditorOriginView = require('./editorOriginView'); var EditorPasteZone = EditorOriginView.extend({ className: 'display-none paste-zone', diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 82290d3bfd..564740556a 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -1,5 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE /* + * I think this exists to add extra functionality to the menu/page structure pages * TODO This needs a tidy: * - Remove commented lines * - Sort out error handling @@ -9,17 +10,15 @@ define(function(require){ var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); var helpers = require('coreJS/app/helpers'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorMenuView = require('editorMenu/views/editorMenuView'); - var EditorPageView = require('editorPage/views/editorPageView'); - var EditorModel = require('editorGlobal/models/editorModel'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - var EditorComponentModel = require('editorPage/models/editorComponentModel'); - var EditorClipboardModel = require('editorGlobal/models/editorClipboardModel'); - var EditorComponentTypeModel = require('editorPage/models/editorComponentTypeModel'); - var ExtensionModel = require('editorExtensions/models/extensionModel'); + + var EditorOriginView = require('./editorOriginView'); + var EditorMenuView = require('../contentObject/views/editorMenuView'); + var EditorPageView = require('../contentObject/views/editorPageView'); + + var EditorContentObjectModel = require('../contentObject/models/editorContentObjectModel'); + var EditorArticleModel = require('../article/models/editorArticleModel'); + var EditorBlockModel = require('../block/models/editorBlockModel'); + var EditorComponentModel = require('../component/models/editorComponentModel'); var EditorView = EditorOriginView.extend({ className: "editor-view", @@ -64,8 +63,6 @@ define(function(require){ }, - - setupEditor: function() { this.renderCurrentEditorView(); }, @@ -292,16 +289,14 @@ define(function(require){ }; $.post('/api/content/clipboard/copy', postData, _.bind(function(jqXHR, textStatus, errorThrown) { - if (!jqXHR.success) { - Origin.Notify.alert({ type: 'error', text: jqXHR.message }); - return; - } - Origin.editor.clipboardId = jqXHR.clipboardId; - Origin.editor.pasteParentModel = model.getParent(); - this.showPasteZones(model.get('_type')); - }, this)).fail(function (jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorcopy') }); - }); + if (!jqXHR.success) { + return Origin.Notify.alert({ type: 'error', text: jqXHR.message }); + } + Origin.editor.clipboardId = jqXHR.clipboardId; + Origin.editor.pasteParentModel = model.getParent(); + this.showPasteZones(model.get('_type')); + }, this)).fail(function (jqXHR, textStatus, errorThrown) { + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorcopy') }); }); }, @@ -396,7 +391,7 @@ define(function(require){ _.defer(function () { Origin.trigger('editorView:cut' + type + ':' + view.model.get('_parentId'), view); }); - } + }, /** * Event handling diff --git a/frontend/src/core/editor/menu/views/editorMenuLayerView.js b/frontend/src/core/editor/menu/views/editorMenuLayerView.js deleted file mode 100644 index 06962a8043..0000000000 --- a/frontend/src/core/editor/menu/views/editorMenuLayerView.js +++ /dev/null @@ -1,179 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var Origin = require('coreJS/app/origin'); - var EditorArticleModel = require('editorPage/models/editorArticleModel'); - var EditorBlockModel = require('editorPage/models/editorBlockModel'); - var EditorContentObjectModel = require('editorMenu/models/editorContentObjectModel'); - var EditorMenuItemView = require('editorMenu/views/editorMenuItemView'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - - var EditorMenuLayerView = EditorOriginView.extend({ - className: 'editor-menu-layer', - - events: { - 'click button.editor-menu-layer-add-page': 'addPage', - 'click button.editor-menu-layer-add-menu': 'addMenu', - 'click .editor-menu-layer-paste': 'pasteMenuItem', - 'click .editor-menu-layer-paste-cancel': 'cancelPasteMenuItem' - }, - - preRender: function(options) { - if (options._parentId) { - this._parentId = options._parentId; - } - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(Origin, 'editorMenuView:removeMenuViews', this.remove); - }, - - postRender: function() { - if (this._parentId) { - // Append the parentId value to the container to allow us to move pages, etc. - this.$el.attr('data-parentId', this._parentId); - } - this.setHeight(); - }, - - render: function() { - var data = this.data ? this.data : false; - var template = Handlebars.templates[this.constructor.template]; - this.$el.html(template(data)); - _.defer(_.bind(this.postRender, this)); - return this; - }, - - setHeight: function() { - var windowHeight = $(window).height(); - var offsetTop = $('.editor-menu-inner').offset().top; - var controlsHeight = this.$('.editor-menu-layer-controls').outerHeight(); - - this.$('.editor-menu-layer-inner').height(windowHeight-(offsetTop+controlsHeight)); - }, - - addMenu: function(event) { - this.addMenuItem(event, 'menu'); - }, - - addPage: function(event) { - this.addMenuItem(event, 'page'); - }, - - /** - * Adds a new contentObject of a given type - * @param {String} type Given contentObject type, i.e. 'menu' or 'page' - */ - addMenuItem: function(event, type) { - event.preventDefault(); - - var newMenuItemModel = new EditorContentObjectModel({ - _parentId: this._parentId, - _courseId: Origin.editor.data.course.get('_id'), - title: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), - displayTitle: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), - body: '', - linkText: window.polyglot.t('app.view'), - graphic: { alt: '', src: '' }, - _type: type - }); - // Instantly add the view for UI purposes - var newMenuItemView = this.addMenuItemView(newMenuItemModel); - // Save the model - newMenuItemModel.save(null, { - error: function(error) { - // If there's an error show the menu item fading out and alert - newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), - }); - _.delay(newMenuItemView.remove, 3000); - }, - success: _.bind(function(model) { - Origin.editor.data.contentObjects.add(model); - // Force setting the data-id attribute as this is required for drag-drop sorting - newMenuItemView.$el.children('.editor-menu-item-inner').attr('data-id', model.get('_id')); - - if (type == 'page') { - // HACK -- This should be removed and placed on the server-side - return this.addNewPageArticleAndBlock(model, newMenuItemView); - } else { - newMenuItemView.$el.removeClass('syncing').addClass('synced'); - } - this.setHeight(); - }, this) - }); - }, - - addNewPageArticleAndBlock: function(model, newMenuItemView) { - var typeToAdd; - var newChildModel; - var newChildTitle; - this.pageModel; - this.pageView; - - if (model.get('_type') === 'page') { - this.pageModel = model; - this.pageView = newMenuItemView; - typeToAdd = 'article'; - newChildTitle = window.polyglot.t('app.placeholdernewarticle'); - var newChildModel = new EditorArticleModel(); - } else { - typeToAdd = 'block'; - newChildTitle = window.polyglot.t('app.placeholdernewblock'); - var newChildModel = new EditorBlockModel(); - } - - newChildModel.save({ - title: newChildTitle, - displayTitle: (typeToAdd == 'block') ? '' : newChildTitle, - body: '', - _parentId: model.get('_id'), - _courseId: Origin.editor.data.course.get('_id') - }, { - error: function() { - newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), - }); - _.delay(newMenuItemView.remove, 3000); - }, - success: _.bind(function(model, response, options) { - // Add this new element to the collect - Origin.editor.data[model.get('_type') + 's'].add(model); - - if (typeToAdd === 'article') { - this.addNewPageArticleAndBlock(model, newMenuItemView); - } else { - newMenuItemView.$el.removeClass('syncing').addClass('synced'); - } - }, this) - }); - }, - - addMenuItemView: function(model) { - var newMenuItemView = new EditorMenuItemView({ model: model }); - this.$('.editor-menu-layer-inner').append(newMenuItemView.$el.addClass('syncing')); - return newMenuItemView; - }, - - pasteMenuItem: function(event) { - event.preventDefault(); - Origin.trigger('editorView:paste', this._parentId, this.$('.editor-menu-item').length + 1); - }, - - cancelPasteMenuItem: function(event) { - event.preventDefault(); - $('.add-zone').css('visibility','visible'); - var parentId = this._parentId; - var target = new EditorContentObjectModel({ - _parentId: parentId, - _courseId: Origin.editor.data.course.get('_id') - }); - Origin.trigger('editorView:pasteCancel', target); - } - }, { - template: 'editorMenuLayer' - }); - - return EditorMenuLayerView; -}); diff --git a/frontend/src/core/editor/menuSettings/index.js b/frontend/src/core/editor/menuSettings/index.js new file mode 100644 index 0000000000..f0e52a87f3 --- /dev/null +++ b/frontend/src/core/editor/menuSettings/index.js @@ -0,0 +1,32 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('origin'); + var Helpers = require('../global/helpers'); + + var EditorConfigModel = require('./views/editorConfigModel'); + var EditorMenuSettingsEditView = require('./views/editorMenuSettingsEditView'); + var EditorMenuSettingsEditSidebarView = require('./views/editorMenuSettingsEditSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 !== 'menuSettings') { + return; + } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', {title: 'Select menu'}); + + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } + Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorMenuSettingsEditView, { model: model }); + } + }); + }); +}); diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js index 585713e95c..dde5f40812 100644 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js +++ b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js @@ -2,13 +2,13 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var MenuSettingsCollection = require('editorMenuSettings/collections/editorMenuSettingsCollection'); - var MenuSettingsView = require('editorMenuSettings/views/editorMenuSettingsView'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var MenuSettingsCollection = require('../collections/editorMenuSettingsCollection'); + var MenuSettingsView = require('./editorMenuSettingsView'); var EditorMenuSettingsEditView = EditorOriginView.extend({ - tagName: "ul", className: "editor-menu-settings-edit", + tagName: "ul", preRender: function() { this.collection = new MenuSettingsCollection(); @@ -35,14 +35,13 @@ define(function(require) { }, cancel: function(event) { - event.preventDefault(); + event && event.preventDefault(); Origin.trigger('editorSidebarView:removeEditView', this.model); }, saveData: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); + if(this.collection.findWhere({ _isSelected: true }) === undefined) { return this.onSaveError(null, window.polyglot.t('app.errornomenuselected')); } diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js index 47acd38542..3bd92063ea 100644 --- a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js +++ b/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ + var Handlebars = require('handlebars'); var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var OriginView = require('coreJS/app/views/originView'); - var Handlebars = require('handlebars'); var MenuSettingsView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs b/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs deleted file mode 100644 index 5b1cedc131..0000000000 --- a/frontend/src/core/editor/page/templates/partials/part_editorCommon.hbs +++ /dev/null @@ -1,80 +0,0 @@ -
-{{!--
-

- Global Settings -

-
--}} - - - -
- - {{#ifHasPermissions "*/*:create,*/*:read,*/*:update,*/*:delete"}} -
- -
- {{/ifHasPermissions}} - -
- -
- -
-
- -
-
- -
-
- -
-
- -
-
-
-
diff --git a/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js b/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js deleted file mode 100644 index 29c6caaf67..0000000000 --- a/frontend/src/core/editor/page/views/editorArticleEditSidebarView.js +++ /dev/null @@ -1,34 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - - var EditorArticleEditSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-article-edit-sidebar-save': 'saveEditing', - 'click .editor-article-edit-sidebar-cancel': 'cancelEditing' - }, - - postRender: function() {}, - - saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-article-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('editorArticleEditSidebar:views:save'); - }, - - cancelEditing: function(event) { - event.preventDefault(); - Backbone.history.history.back(); - } - - }, { - template: 'editorArticleEditSidebar' - }); - - return EditorArticleEditSidebarView; - -}); \ No newline at end of file diff --git a/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js b/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js deleted file mode 100644 index c0bb2a85d4..0000000000 --- a/frontend/src/core/editor/page/views/editorBlockEditSidebarView.js +++ /dev/null @@ -1,32 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - - var EditorBlockEditSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-block-edit-sidebar-save': 'saveEditing', - 'click .editor-block-edit-sidebar-cancel': 'cancelEditing' - }, - - saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-block-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('editorBlockEditSidebar:views:save'); - }, - - cancelEditing: function(event) { - event.preventDefault(); - Backbone.history.history.back(); - } - - }, { - template: 'editorBlockEditSidebar' - }); - - return EditorBlockEditSidebarView; - -}); \ No newline at end of file diff --git a/frontend/src/core/editor/page/views/editorComponentListItemView.js b/frontend/src/core/editor/page/views/editorComponentListItemView.js deleted file mode 100644 index 079cc7927a..0000000000 --- a/frontend/src/core/editor/page/views/editorComponentListItemView.js +++ /dev/null @@ -1,125 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Backbone = require('backbone'); - var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var EditorComponentModel = require('editorPage/models/editorComponentModel'); - var EditorComponentView = require('editorPage/views/editorComponentView'); - - var EditorComponentListItemView = EditorOriginView.extend({ - - tagName: 'div', - - className: 'editor-component-list-item', - - events: { - 'click': 'onItemClicked', - 'click div.editor-component-list-item-overlay-inner > a': 'onButtonClicked' - }, - - preRender: function(options) { - this.listenTo(Origin, 'editorComponentListView:removeSubviews', this.remove); - this.listenTo(Origin, 'editorComponentListItemView:deselect', this.deselectItem); - this.listenTo(Origin, 'editorComponentListView:searchKeyup', this.onSearchValueChanged); - this.model.set({ - 'availablePositions': options.availablePositions - }); - this._parentId = options._parentId; - this.$parentElement = options.$parentElement; - this.parentView = options.parentView; - this.searchTerms = options.searchTerms; - }, - - postRender: function() { - if (this.model.get('_isAvailableInEditor') == false) { - this.$el.addClass('restricted'); - } - - }, - - onItemClicked: function(event) { - event.preventDefault(); - - Origin.trigger('editorComponentListItemView:deselect') - this.$el.addClass('selected'); - this.$('.editor-component-list-item-overlay') - .removeClass('display-none'); - }, - - deselectItem: function() { - $('.editor-component-list-item').removeClass('selected'); - this.$('.editor-component-list-item-overlay') - .addClass('display-none'); - }, - - onSearchValueChanged: function(searchValue) { - if (this.searchTerms.indexOf(searchValue.toLowerCase()) > -1 || searchValue.length === 0) { - this.$el.removeClass('display-none'); - } else { - this.$el.addClass('display-none'); - } - }, - - onButtonClicked: function(event) { - event.preventDefault(); - - this.addComponent(event.currentTarget.getAttribute('data-position')); - }, - - addComponent: function(layout) { - - Origin.trigger('editorComponentListView:remove'); - - var componentName = this.model.get('name'); - - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ - return type.get('name') == componentName; - }); - - var newComponentModel = new EditorComponentModel({ - title: window.polyglot.t('app.placeholdernewcomponent'), - displayTitle: window.polyglot.t('app.placeholdernewcomponent'), - body: '', - _parentId: this._parentId, - _courseId: Origin.editor.data.course.get('_id'), - _type: 'component', - _componentType: componentType.get('_id'), - _componentTypeDisplayName: componentType.get('displayName'), - _component: componentType.get('component'), - _layout: layout, - version: componentType.get('version') - }); - - var newComponentView = new EditorComponentView({model: newComponentModel}).$el.addClass('syncing'); - this.$parentElement - .find('.page-components') - .append(newComponentView); - - newComponentModel.save(null, { - error: function() { - $('html').css('overflow-y', ''); - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.erroraddingcomponent') - }); - }, - success: _.bind(function() { - Origin.editor.data.components.add(newComponentModel); - this.parentView.evaluateComponents(this.parentView.toggleAddComponentsButton); - // Re-render the block - this.parentView.reRender(); - newComponentView.addClass('synced'); - $('html').css('overflow-y', ''); - $.scrollTo(newComponentView.$el); - }, this) - }); - } - - }, { - template: 'editorComponentListItem' - }); - - return EditorComponentListItemView; - -}) diff --git a/frontend/src/core/editor/page/views/editorComponentListSidebarView.js b/frontend/src/core/editor/page/views/editorComponentListSidebarView.js deleted file mode 100644 index 82e9c51632..0000000000 --- a/frontend/src/core/editor/page/views/editorComponentListSidebarView.js +++ /dev/null @@ -1,121 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - var EditorComponentModel = require('editorPage/models/editorComponentModel'); - - var EditorComponentListSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-component-list-sidebar-save': 'onSaveClicked', - 'click .editor-component-list-sidebar-save-edit': 'onSaveAndEditClicked', - 'click .editor-component-list-sidebar-cancel': 'cancelEditing' - }, - - onSaveClicked: function(event) { - event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save', window.polyglot.t('app.saving')); - if (!this.model.get('component') || !this.model.get('layout')) { - return; - } - - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ - return type.get('name') == this.model.get('component'); - }, this); - - var _this = this; - var newComponentModel = new EditorComponentModel(); - - newComponentModel.save({ - title: window.polyglot.t('app.placeholdernewcomponent'), - displayTitle: '', - body: '', - _parentId: this.model.get('_parentId'), - _courseId: Origin.editor.data.course.get('_id'), - _type: 'component', - _componentType: componentType.get('_id'), - _component: componentType.get('component'), - _layout: this.model.get('layout'), - version: componentType.get('version') - }, - { - error: function() { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.erroraddingcomponent') - }); - }, - success: function() { - Origin.trigger('editor:refreshData', function() { - Backbone.history.history.back(); - }, this); - } - }); - }, - - onSaveAndEditClicked: function(event) { - event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save-edit', window.polyglot.t('app.saving')); - if (!this.model.get('component') || !this.model.get('layout')) { - return; - } - - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ - return type.get('name') == this.model.get('component'); - }, this); - - var _this = this; - var newComponentModel = new EditorComponentModel(); - - newComponentModel.save({ - title: window.polyglot.t('app.placeholdernewcomponent'), - displayTitle: '', - body: '', - _parentId: this.model.get('_parentId'), - _courseId: Origin.editor.data.course.get('_id'), - _type: 'component', - _componentType: componentType.get('_id'), - _component: componentType.get('component'), - _layout: this.model.get('layout'), - version: componentType.get('version') - }, - { - error: function() { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.erroraddingcomponent') - }); - }, - success: function(data) { - Origin.trigger('editor:refreshData', function() { - Origin.router.navigate('#/editor/' - + Origin.editor.data.course.get('_id') - + '/component/' - + data.get('_id')); - }, this); - - } - }); - }, - - cancelEditing: function(event) { - event.preventDefault(); - var currentCourseId = Origin.location.route1; - var currentBlockId = Origin.location.route3; - var currentBlock = Origin.editor.data.blocks.findWhere({_id: currentBlockId}); - // Don't like this line but until we have findAncestor this will do - var currentPage = currentBlock.getParent().getParent(); - var currentPageId = currentPage.get('_id'); - - Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId); - } - - }, { - template: 'editorComponentListSidebar' - }); - - return EditorComponentListSidebarView; - -}); diff --git a/frontend/src/core/editor/page/views/editorPageEditSidebarView.js b/frontend/src/core/editor/page/views/editorPageEditSidebarView.js deleted file mode 100644 index e573024a75..0000000000 --- a/frontend/src/core/editor/page/views/editorPageEditSidebarView.js +++ /dev/null @@ -1,32 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - - var EditorPageEditSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-page-edit-sidebar-save': 'saveEditing', - 'click .editor-page-edit-sidebar-cancel': 'cancelEditing' - }, - - saveEditing: function(event) { - event.preventDefault(); - this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving')) - Origin.trigger('editorPageEditSidebar:views:save'); - }, - - cancelEditing: function(event) { - event.preventDefault(); - Backbone.history.history.back(); - } - - }, { - template: 'editorPageEditSidebar' - }); - - return EditorPageEditSidebarView; - -}); \ No newline at end of file diff --git a/frontend/src/core/editor/page/views/editorPageOverviewView.js b/frontend/src/core/editor/page/views/editorPageOverviewView.js deleted file mode 100644 index c412bf3d97..0000000000 --- a/frontend/src/core/editor/page/views/editorPageOverviewView.js +++ /dev/null @@ -1,128 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - - var EditorPageOverviewView = EditorOriginView.extend({ - settings: { - autoRender: false - }, - - className: 'editor-page-overview', - - events: { - "click a.load-page" : "goToPage" - }, - - preRender: function() { - this.listenTo(Origin, 'editorSidebarView:removeEditView', this.remove); - this.listenTo(Origin, 'editorView:refreshPageList', this.refreshProjectStructure); - - this.render(); - this.refreshProjectStructure(); - }, - - postRender: function() {}, - - /** - * Converts an array of Backbone Models to a JavaScript tree structure - * @param {Array} data - * @return A JavaScript treeview-like object structure - */ - convertModelsToTree: function(data){ - var map = {}, - flat = {}, - root = []; - - // Flatten the data - for (var i = 0; i < data.length; i++) { - var key = data[i].get('_id'); - - flat[key] = { - _id: data[i].get('_id'), - _type: data[i].get('_type'), - _parentId: data[i].get('_parentId'), - title: data[i].get('title') - }; - } - - // Add a 'children' container to each node - for (var i in flat) { - flat[i].children = []; - } - - // Populate any 'children' container arrays - for (var i in flat) { - var parentkey = flat[i]._parentId; - - if (flat[parentkey]) { - flat[parentkey].children.push(flat[i]); - } - } - - // Find the root nodes (no parent found) and create the hierarchy tree from them - for (var i in flat) { - var parentkey = flat[i]._parentId; - - if (!flat[parentkey]) { - root.push(flat[i]); - } - } - - return root; - }, - - /** - * Creates a HTML string from a given items treeview structure - * NOTE: string contatenation is faster here than DOM manipulation - * @param {String} html - * @param {Array} items - * @return A HTML unordered list snippet - */ - createOverviewTreeviewHtml: function(html, items) { - html += '
    ' - - for (var i = 0; i < items.length; i++) { - if (items[i].children.length != 0 || items[i]._type == 'menu') { - html += '
  • ' + items[i].title; - html = this.createOverviewTreeviewHtml(html, items[i].children); - html += '
    • '; - } else { - html += '
  • ' + items[i].title + '
    • '; - } - } - - html += '
'; - - return html; - }, - - /** - * Clears and reloads the project tree structure - */ - refreshProjectStructure: function() { - var $projectOverview = this.$('.page-list'), - listItems = this.convertModelsToTree(Origin.editor.data.contentObjects.models), - html = ''; - - $projectOverview.empty(); - - html = this.createOverviewTreeviewHtml(html, listItems); - - $projectOverview.html(html); - }, - - goToPage: function (event) { - event.preventDefault(); - - Origin.router.navigate('/editor/' + Origin.editor.data.course.get('_id') + '/page/' + $(event.currentTarget).data('page-id'), {trigger: true}); - } - - }, { - template: 'editorPageOverview' - }); - - return EditorPageOverviewView; - -}); diff --git a/frontend/src/core/editor/theme/collections/editorThemeCollection.js b/frontend/src/core/editor/theme/collections/editorThemeCollection.js index 6c97fcc0cf..9dd7a57621 100644 --- a/frontend/src/core/editor/theme/collections/editorThemeCollection.js +++ b/frontend/src/core/editor/theme/collections/editorThemeCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var ThemeModel = require('editorTheme/models/editorThemeModel'); + var ThemeModel = require('../models/editorThemeModel'); var ThemeCollection = Backbone.Collection.extend({ model: ThemeModel, @@ -10,4 +10,4 @@ define(function(require) { }); return ThemeCollection; -}); \ No newline at end of file +}); diff --git a/frontend/src/core/editor/theme/index.js b/frontend/src/core/editor/theme/index.js new file mode 100644 index 0000000000..399e2cb197 --- /dev/null +++ b/frontend/src/core/editor/theme/index.js @@ -0,0 +1,34 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Origin = require('origin'); + var Helpers = require('../global/helpers'); + + var EditorConfigModel = require('./models/editorConfigModel'); + var EditorThemeCollectionView = require('./views/editorThemeCollectionView'); + var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView'); + + Origin.on('router:editor', function(route1, route2, route3, route4) { + if(route2 !== 'selecttheme') { + return; + } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', { title: 'Select theme' }); + + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } + + Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorThemeCollectionView, { model: model }); + } + }); + }); +}); diff --git a/frontend/src/core/editor/theme/models/editorThemeModel.js b/frontend/src/core/editor/theme/models/editorThemeModel.js index 75d5ef44c8..b0e1d4baf5 100644 --- a/frontend/src/core/editor/theme/models/editorThemeModel.js +++ b/frontend/src/core/editor/theme/models/editorThemeModel.js @@ -1,6 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); + var EditorThemeModel = Backbone.Model.extend({ }); diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js index 5df31ade88..2d60e00660 100644 --- a/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js +++ b/frontend/src/core/editor/theme/views/editorThemeCollectionSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); var EditorThemeCollectionSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js b/frontend/src/core/editor/theme/views/editorThemeCollectionView.js index 96726a165c..59ef7f1cc0 100644 --- a/frontend/src/core/editor/theme/views/editorThemeCollectionView.js +++ b/frontend/src/core/editor/theme/views/editorThemeCollectionView.js @@ -2,9 +2,10 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var ThemeCollection = require('editorTheme/collections/editorThemeCollection'); - var ThemeItemView = require('editorTheme/views/editorThemeItemView'); + + var EditorOriginView = require('../../global/views/editorOriginView'); + var ThemeCollection = require('../collections/editorThemeCollection'); + var ThemeItemView = require('./editorThemeItemView'); var EditorThemeCollectionView = EditorOriginView.extend({ className: "editor-theme-edit", @@ -36,7 +37,7 @@ define(function(require) { }, cancel: function(event) { - event.preventDefault(); + event && event.preventDefault(); Origin.trigger('editorSidebarView:removeEditView', this.model); }, diff --git a/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js b/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js index 04bba9515a..3c865049f8 100644 --- a/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js +++ b/frontend/src/core/editor/theme/views/editorThemeEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); var EditorThemeEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/core/editor/theme/views/editorThemeEditView.js b/frontend/src/core/editor/theme/views/editorThemeEditView.js index fbdad1ca45..4533cb704b 100644 --- a/frontend/src/core/editor/theme/views/editorThemeEditView.js +++ b/frontend/src/core/editor/theme/views/editorThemeEditView.js @@ -2,16 +2,16 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('editorGlobal/views/editorOriginView'); - var ThemeCollection = require('editorTheme/collections/editorThemeCollection'); - var ThemeView = require('editorTheme/views/editorThemeView'); + + var EditorOriginView = require('../../global/views/editorOriginView'); + var ThemeCollection = require('../collections/editorThemeCollection'); + var ThemeView = require('./editorThemeView'); var EditorThemeEditView = EditorOriginView.extend({ className: "editor-theme-edit", tagName: "ul", events: { - }, preRender: function() { @@ -43,14 +43,12 @@ define(function(require) { }, cancel: function(event) { - event.preventDefault(); + event && event.preventDefault(); Origin.trigger('editorSidebarView:removeEditView', this.model); }, saveData: function(event) { - if (event) { - event.preventDefault(); - } + event && event.preventDefault(); var selectedTheme = this.collection.findWhere({_isSelected: true}); diff --git a/frontend/src/core/editor/theme/views/editorThemeItemView.js b/frontend/src/core/editor/theme/views/editorThemeItemView.js index 29f5e47f6c..0f818abd2e 100644 --- a/frontend/src/core/editor/theme/views/editorThemeItemView.js +++ b/frontend/src/core/editor/theme/views/editorThemeItemView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('coreJS/app/views/originView'); var Origin = require('coreJS/app/origin'); + var OriginView = require('coreJS/app/views/originView'); var ThemeItemView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/core/help/help.js b/frontend/src/core/help/help.js new file mode 100644 index 0000000000..4615bc3f9d --- /dev/null +++ b/frontend/src/core/help/help.js @@ -0,0 +1,58 @@ +define(function(require) { + var Origin = require('coreJS/app/origin'); + + Origin.on('navigation:help', function() { + openWikiLink(getLink()); + }); + + function getLink() { + switch (Origin.location.module) { + case 'dashboard': + var isShared = Origin.location.route1 === 'shared'; + return '' + (isShared) ? 'shared-courses' : 'the-dashboard'; + case 'project': + return 'Creating-a-Course#course-details'; + case 'editor': + return getEditorLink(); + case 'pluginManagement': + return 'Plugin-Manager'; + case 'assetManagement': + return 'Asset-Manager'; + } + } + + function getEditorLink() { + var link; + switch (Origin.location.route2) { + case 'menu': + link = 'editing-course-details'; + break; + case 'block': + link = 'adding-content-to-the-course'; + break; + case 'edit': + link = 'sectionpage-settings'; + break; + case 'page': + link = 'adding-content-to-the-course'; + break; + case 'config': + link = 'course-settings'; + break; + case 'theme': + link = 'course-settings'; + break; + case 'extensions': + link = 'course-settings'; + break; + default: + link = ''; + } + return 'Creating-a-Course' + (link) ? '#' + link : ''; + } + + function openWikiLink(page) { + var WIKI_URL = 'https://github.com/adaptlearning/adapt_authoring/wiki/'; + window.open(WIKI_URL + page || ''); + } +}); diff --git a/frontend/src/core/project/collections/myProjectCollection.js b/frontend/src/core/project/collections/myProjectCollection.js index f867b05a8c..55d34e661a 100644 --- a/frontend/src/core/project/collections/myProjectCollection.js +++ b/frontend/src/core/project/collections/myProjectCollection.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var ProjectModel = require('coreJS/project/models/projectModel'); + var EditorCourseModel = require('coreJS/editor/course/models/editorCourseModel'); var MyProjectCollection = Backbone.Collection.extend({ - - model: ProjectModel, - + model: EditorCourseModel, url: 'api/my/course' - }); return MyProjectCollection; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/project/collections/projectCollection.js b/frontend/src/core/project/collections/projectCollection.js index d033dae709..5c04e6a173 100644 --- a/frontend/src/core/project/collections/projectCollection.js +++ b/frontend/src/core/project/collections/projectCollection.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var ProjectModel = require('coreJS/project/models/projectModel'); + var EditorCourseModel = require('coreJS/editor/course/models/editorCourseModel'); var ProjectCollection = Backbone.Collection.extend({ - - model: ProjectModel, - + model: EditorCourseModel, url: 'api/content/course' - }); return ProjectCollection; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/project/collections/sharedProjectCollection.js b/frontend/src/core/project/collections/sharedProjectCollection.js index 768166459a..b95dce0806 100644 --- a/frontend/src/core/project/collections/sharedProjectCollection.js +++ b/frontend/src/core/project/collections/sharedProjectCollection.js @@ -1,17 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var ProjectModel = require('coreJS/project/models/projectModel'); + var EditorCourseModel = require('coreJS/editor/course/models/editorCourseModel'); var SharedProjectCollection = Backbone.Collection.extend({ - - model: ProjectModel, - + model: EditorCourseModel, url: 'api/shared/course' - }); return SharedProjectCollection; - -}); \ No newline at end of file +}); diff --git a/frontend/src/core/project/models/projectModel.js b/frontend/src/core/project/models/projectModel.js deleted file mode 100644 index 8abe9a7989..0000000000 --- a/frontend/src/core/project/models/projectModel.js +++ /dev/null @@ -1,38 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); - var Helpers = require('coreJS/app/helpers'); - var Origin = require('coreJS/app/origin'); - - var ProjectModel = EditorModel.extend({ - idAttribute: '_id', - urlRoot: '/api/content/course', - defaults: { - 'tags': [], - _type: 'course', - customStyle: '' - }, - - initialize : function(options) { - }, - - getHeroImageURI: function () { - if(Helpers.isAssetExternal(this.get('heroImage'))) { - return this.get('heroImage'); - } else { - return '/api/asset/serve/' + this.get('heroImage'); - } - }, - - isEditable: function () { - return this.get('_isShared') || this.get('createdBy') == Origin.sessionModel.get('id') - }, - - getDuplicateURI: function () { - return '/api/duplicatecourse/' + this.get('_id'); - } - - }); - - return ProjectModel; -}); diff --git a/frontend/src/core/project/project.js b/frontend/src/core/project/project.js deleted file mode 100644 index d0bf8c38f2..0000000000 --- a/frontend/src/core/project/project.js +++ /dev/null @@ -1,106 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var ProjectModel = require('coreJS/project/models/projectModel'); - var ProjectDetailView = require('coreJS/project/views/projectDetailView'); - var ProjectDetailEditSidebarView = require('coreJS/project/views/projectDetailEditSidebarView'); - - Origin.on('navigation:help', function() { - switch (Origin.location.module) { - case 'dashboard': - switch (Origin.location.route1) { - case 'shared': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#shared-courses"); - return; - default: - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#the-dashboard"); - return; - } - case 'project': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#course-details"); - return; - case 'editor': - switch (Origin.location.route2) { - case 'menu': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#editing-course-details"); - return; - case 'block': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#adding-content-to-the-course"); - return; - case 'edit': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#sectionpage-settings"); - return; - case 'page': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#adding-content-to-the-course"); - return; - case 'config': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#course-settings"); - return; - case 'theme': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#course-settings"); - return; - case 'extensions': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#course-settings"); - return; - default: - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/"); - return; - } - switch (Origin.location.route3) { - case 'edit': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Creating-a-Course#adding-content-to-the-course"); - return; - default: - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/"); - return; - } - return; - case 'pluginManagement': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Plugin-Manager"); - return; - case 'assetManagement': - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/Asset-Manager"); - return; - default: - window.open("https://github.com/adaptlearning/adapt_authoring/wiki/"); - return; - } - }); - - Origin.on('router:project', function(action, id) { - - switch (action) { - case 'new': - var project = new ProjectModel(); - - // Default the new project title - project.set('title', window.polyglot.t('app.placeholdernewcourse')); - project.set('displayTitle', window.polyglot.t('app.placeholdernewcourse')); - - var form = Origin.scaffold.buildForm({ - model: project - }); - - Origin.trigger('location:title:update', {title: window.polyglot.t('app.addnewproject')}); - Origin.editingOverlay.addView(new ProjectDetailView({model: project, form: form}).$el); - Origin.sidebar.addView(new ProjectDetailEditSidebarView({form: form}).$el); - break; - case 'edit': - var project = new ProjectModel({_id: id}); - project.fetch({ - success: function() { - var form = Origin.scaffold.buildForm({ - model: project - }); - Origin.trigger('location:title:update', {title: window.polyglot.t('app.editcourse')}); - Origin.editingOverlay.addView(new ProjectDetailView({model: project, form: form}).$el); - Origin.sidebar.addView(new ProjectDetailEditSidebarView({form: form}).$el); - } - }); - break; - } - - }); - -}) \ No newline at end of file diff --git a/frontend/src/core/project/views/projectDetailEditSidebarView.js b/frontend/src/core/project/views/projectDetailEditSidebarView.js deleted file mode 100644 index fd7daf6117..0000000000 --- a/frontend/src/core/project/views/projectDetailEditSidebarView.js +++ /dev/null @@ -1,32 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Origin = require('coreJS/app/origin'); - var SidebarItemView = require('coreJS/sidebar/views/sidebarItemView'); - var Backbone = require('backbone'); - - var ProjectDetailEditSidebarView = SidebarItemView.extend({ - - events: { - 'click .editor-project-edit-sidebar-save' : 'save', - 'click .editor-project-edit-sidebar-cancel' : 'cancel' - }, - - save: function(event) { - event.preventDefault(); - this.updateButton('.editor-project-edit-sidebar-save', window.polyglot.t('app.saving')); - Origin.trigger('projectEditSidebar:views:save'); - }, - - cancel: function(event) { - event.preventDefault(); - Backbone.history.history.back(); - } - - }, { - template: 'projectDetailEditSidebar' - }); - - return ProjectDetailEditSidebarView; - -}); \ No newline at end of file From a2f6c3e44f866492042c4529f584d372c3762c40 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 22 Mar 2017 20:10:59 +0000 Subject: [PATCH 047/296] Fix broken imports --- frontend/src/core/app/app.js | 4 ++-- .../core/editor/article/models/editorArticleModel.js | 2 +- frontend/src/core/editor/block/index.js | 4 ++-- .../src/core/editor/block/views/editorBlockView.js | 10 +++++----- .../component/views/editorComponentListView.js | 2 +- frontend/src/core/editor/contentObject/index.js | 2 +- .../core/editor/course/models/editorCourseModel.js | 2 ++ frontend/src/core/editor/global/views/editorView.js | 12 ++++++------ frontend/src/core/editor/menuSettings/index.js | 2 +- frontend/src/core/editor/theme/index.js | 2 +- 10 files changed, 22 insertions(+), 20 deletions(-) diff --git a/frontend/src/core/app/app.js b/frontend/src/core/app/app.js index f0e5b2fc07..15aad3485c 100644 --- a/frontend/src/core/app/app.js +++ b/frontend/src/core/app/app.js @@ -8,7 +8,7 @@ require([ 'coreJS/app/permissions', 'coreJS/app/contentPane', 'coreJS/user/user', - 'coreJS/project/project', + 'coreJS/help/help', 'coreJS/dashboard/dashboard', 'coreJS/editor/editor', 'coreJS/assetManagement/assetManagement', @@ -44,7 +44,7 @@ require([ Permissions, ContentPane, User, - Project, + Help, Dashboard, Editor, AssetManagement, diff --git a/frontend/src/core/editor/article/models/editorArticleModel.js b/frontend/src/core/editor/article/models/editorArticleModel.js index 18b6ae0844..5a1aa43d5f 100644 --- a/frontend/src/core/editor/article/models/editorArticleModel.js +++ b/frontend/src/core/editor/article/models/editorArticleModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var EditorModel = require('../global/models/editorModel'); + var EditorModel = require('../../global/models/editorModel'); var EditorArticleModel = EditorModel.extend({ urlRoot: '/api/content/article', diff --git a/frontend/src/core/editor/block/index.js b/frontend/src/core/editor/block/index.js index 90cae87875..a5513518f6 100644 --- a/frontend/src/core/editor/block/index.js +++ b/frontend/src/core/editor/block/index.js @@ -4,9 +4,9 @@ define(function(require) { var Origin = require('coreJS/app/origin'); var Helpers = require('../global/helpers'); - var EditorBlockModel = require('./models/editorBlockModel'); - var EditorBlockEditView = require('./views/editorBlock'); + var EditorBlockEditView = require('./views/editorBlockEditView'); var EditorBlockEditSidebarView = require('./views/editorBlockEditSidebarView'); + var EditorBlockModel = require('./models/editorBlockModel'); Origin.on('router:editor', function(route1, route2, route3, route4) { if(route2 !== 'block' || route4 !== 'edit') { diff --git a/frontend/src/core/editor/block/views/editorBlockView.js b/frontend/src/core/editor/block/views/editorBlockView.js index 1871812d86..1865eb2986 100644 --- a/frontend/src/core/editor/block/views/editorBlockView.js +++ b/frontend/src/core/editor/block/views/editorBlockView.js @@ -3,11 +3,11 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('coreJS/app/origin'); - var EditorOriginView = require('../global/views/editorOriginView'); - var EditorComponentModel = require('../component/models/editorComponentModel'); - var EditorComponentView = require('../component/views/editorComponentView'); - var EditorComponentPasteZoneView = require('../component/views/editorComponentPasteZoneView'); - var EditorComponentListView = require('../component/views/editorComponentListView'); + var EditorOriginView = require('../../global/views/editorOriginView'); + var EditorComponentModel = require('../../component/models/editorComponentModel'); + var EditorComponentView = require('../../component/views/editorComponentView'); + var EditorComponentPasteZoneView = require('../../component/views/editorComponentPasteZoneView'); + var EditorComponentListView = require('../../component/views/editorComponentListView'); var EditorBlockView = EditorOriginView.extend({ className: 'block editable block-draggable', diff --git a/frontend/src/core/editor/component/views/editorComponentListView.js b/frontend/src/core/editor/component/views/editorComponentListView.js index fd64e1a1a6..480894f12e 100644 --- a/frontend/src/core/editor/component/views/editorComponentListView.js +++ b/frontend/src/core/editor/component/views/editorComponentListView.js @@ -4,7 +4,7 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); - var EditorComponentListItemView = require('./views/editorComponentListItemView'); + var EditorComponentListItemView = require('./editorComponentListItemView'); var EditorComponentListView = EditorOriginView.extend({ className: "editor-component-list", diff --git a/frontend/src/core/editor/contentObject/index.js b/frontend/src/core/editor/contentObject/index.js index 3740293324..8031bcff5e 100644 --- a/frontend/src/core/editor/contentObject/index.js +++ b/frontend/src/core/editor/contentObject/index.js @@ -3,7 +3,7 @@ define(function(require) { var Origin = require('coreJS/app/origin'); var Helpers = require('../global/helpers'); - var EditorContentObjectModel = require('../menu/models/editorContentObjectModel'); + var EditorContentObjectModel = require('./models/editorContentObjectModel'); var EditorMenuSidebarView = require('./views/editorMenuSidebarView'); var EditorPageEditView = require('./views/editorPageEditView'); var EditorPageEditSidebarView = require('./views/editorPageEditSidebarView'); diff --git a/frontend/src/core/editor/course/models/editorCourseModel.js b/frontend/src/core/editor/course/models/editorCourseModel.js index 2b8e1c9e46..d4a3ded03b 100644 --- a/frontend/src/core/editor/course/models/editorCourseModel.js +++ b/frontend/src/core/editor/course/models/editorCourseModel.js @@ -1,5 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Origin = require('coreJS/app/origin'); + var Helpers = require('coreJS/app/helpers'); var EditorModel = require('../../global/models/editorModel'); var EditorCourseModel = EditorModel.extend({ diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 564740556a..efdf9b1b13 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -12,13 +12,13 @@ define(function(require){ var helpers = require('coreJS/app/helpers'); var EditorOriginView = require('./editorOriginView'); - var EditorMenuView = require('../contentObject/views/editorMenuView'); - var EditorPageView = require('../contentObject/views/editorPageView'); + var EditorMenuView = require('../../contentObject/views/editorMenuView'); + var EditorPageView = require('../../contentObject/views/editorPageView'); - var EditorContentObjectModel = require('../contentObject/models/editorContentObjectModel'); - var EditorArticleModel = require('../article/models/editorArticleModel'); - var EditorBlockModel = require('../block/models/editorBlockModel'); - var EditorComponentModel = require('../component/models/editorComponentModel'); + var EditorContentObjectModel = require('../../contentObject/models/editorContentObjectModel'); + var EditorArticleModel = require('../../article/models/editorArticleModel'); + var EditorBlockModel = require('../../block/models/editorBlockModel'); + var EditorComponentModel = require('../../component/models/editorComponentModel'); var EditorView = EditorOriginView.extend({ className: "editor-view", diff --git a/frontend/src/core/editor/menuSettings/index.js b/frontend/src/core/editor/menuSettings/index.js index f0e52a87f3..ce831ffd79 100644 --- a/frontend/src/core/editor/menuSettings/index.js +++ b/frontend/src/core/editor/menuSettings/index.js @@ -3,7 +3,7 @@ define(function(require) { var Origin = require('origin'); var Helpers = require('../global/helpers'); - var EditorConfigModel = require('./views/editorConfigModel'); + var EditorConfigModel = require('../config/models/editorConfigModel'); var EditorMenuSettingsEditView = require('./views/editorMenuSettingsEditView'); var EditorMenuSettingsEditSidebarView = require('./views/editorMenuSettingsEditSidebarView'); diff --git a/frontend/src/core/editor/theme/index.js b/frontend/src/core/editor/theme/index.js index 399e2cb197..a69994cf44 100644 --- a/frontend/src/core/editor/theme/index.js +++ b/frontend/src/core/editor/theme/index.js @@ -3,7 +3,7 @@ define(function(require) { var Origin = require('origin'); var Helpers = require('../global/helpers'); - var EditorConfigModel = require('./models/editorConfigModel'); + var EditorConfigModel = require('../config/models/editorConfigModel'); var EditorThemeCollectionView = require('./views/editorThemeCollectionView'); var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView'); From 8ac6c7ba682299018901436de2906b62de20bfd1 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 22 Mar 2017 20:28:43 +0000 Subject: [PATCH 048/296] Add preload code --- frontend/src/core/editor/editor.js | 174 +++++++++++++++++- frontend/src/core/editor/editor_old.js | 158 ---------------- .../core/scaffold/views/scaffoldAssetView.js | 30 +-- 3 files changed, 188 insertions(+), 174 deletions(-) delete mode 100644 frontend/src/core/editor/editor_old.js diff --git a/frontend/src/core/editor/editor.js b/frontend/src/core/editor/editor.js index bdb6ed7da8..a7909a1c7c 100644 --- a/frontend/src/core/editor/editor.js +++ b/frontend/src/core/editor/editor.js @@ -1,6 +1,21 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - // just loads in the submodules + var _ = require('underscore'); + var Origin = require('coreJS/app/origin'); + + var EditorArticleModel = require('./article/models/editorArticleModel'); + var EditorBlockModel = require('./block/models/editorBlockModel'); + var EditorClipboardModel = require('./global/models/editorClipboardModel'); + var EditorCollection = require('./global/collections/editorCollection'); + var EditorComponentModel = require('./component/models/editorComponentModel'); + var EditorComponentTypeModel = require('./component/models/editorComponentTypeModel'); + var EditorContentObjectModel = require('./contentObject/models/editorContentObjectModel'); + var EditorConfigModel = require('./config/models/editorConfigModel'); + var EditorCourseAssetModel = require('./course/models/editorCourseAssetModel'); + var EditorCourseModel = require('./course/models/editorCourseModel'); + var ExtensionModel = require('./extensions/models/extensionModel'); + + // load in the submodules require([ './article/index', './block/index', @@ -12,4 +27,161 @@ define(function(require) { './menuSettings/index', './theme/index' ]); + + // used to check what's preloaded + var globalData = { + courses: false, + extensionTypes: false, + componentTypes: false + }; + // used to check what's loaded + var courseData = { + clipboard: false, + course: false, + config: false, + contentObjects: false, + articles: false, + blocks: false, + components: false, + courseAssets: false + }; + + var isPreloaded = false; + var isLoaded = false; + + var currentLocation; + + // event listeners + Origin.on('login:changed login:newSession', preload); + Origin.on('editor:refreshData', onRefreshData); + Origin.on('editor:resetData', onResetData); + Origin.on('router:editor', onRoute); + + /** + * Functions + */ + + /** + * loads data that's needed elsewhere + */ + function preload() { + // no point continuing if not logged in + if(!Origin.sessionModel.get('isAuthenticated')) { + return; + } + if(!Origin.editor.data.courses) { + Origin.editor.data.courses = createCollection(EditorCourseModel, '/api/content/course', 'courses'); + } + if(!Origin.editor.data.extensionTypes) { + Origin.editor.data.extensionTypes = createCollection(ExtensionModel, '/api/extensiontype', 'extensionTypes'); + } + if(!Origin.editor.data.componentTypes) { + Origin.editor.data.componentTypes = createCollection(EditorComponentTypeModel, '/api/componenttype', 'componentTypes', { + comparator: function(model) { return model.get('displayName'); } + }); + } + // start preload + loadEditorData(_.clone(globalData), function() { + isPreloaded = true; + Origin.trigger('editor:dataPreloaded:'); + }); + } + + /** + * Fetches a group of editor collections (Origin.editor.data) + * @param object whose keys are the key found on Origin.editor.data + * and is used for progress checking + */ + function loadEditorData(data, callback) { + for(var i = 0, count = Object.keys(data).length; i < count; i++) { + var key = Object.keys(data)[i]; + Origin.editor.data[key].fetch({ + success: function(collection) { + data[collection._type] = true; + if(allDataIsLoaded(data) && callback) callback(); + }, + error: onFetchError + }); + } + } + + function setupEditorData(id) { + // add the following to editor data + _.extend(Origin.editor.data, { + course: new EditorCourseModel({ _id:id }), + config: new EditorConfigModel({ _courseId:id }), + contentObjects: createCollection(EditorContentObjectModel, '/api/content/contentobject?_courseId='+id, 'contentObjects'), + articles: createCollection(EditorArticleModel, '/api/content/article?_courseId='+id, 'articles'), + blocks: createCollection(EditorBlockModel, '/api/content/block?_courseId='+id, 'blocks'), + components: createCollection(EditorComponentModel, '/api/content/component?_courseId='+id, 'components'), + clipboard: createCollection(EditorClipboardModel, '/api/content/clipboard?_courseId=' + id + '&createdBy=' + Origin.sessionModel.get('id'), 'clipboard'), + courseAssets: createCollection(EditorCourseAssetModel, '/api/content/courseasset?_courseId='+id, 'courseAssets') + }); + // load all collections + loadEditorData(_.clone(courseData), function() { + Origin.trigger('editor:dataLoaded'); + if(currentLocation) EditorRouter.route(currentLocation); + }); + } + + /** + * Event handleSettingsRoute + */ + + function onRoute(route1, route2, route3, route4) { + currentLocation = { + course: route1, + type: route2, + id: route3, + action: route4 + }; + if (!isPreloaded) { + Origin.once('editor:dataPreloaded', function() { + onRoute(currentLocation.course, currentLocation.type, currentLocation.id, currentLocation.action); + }); + return; + } + // Check if data has already been loaded for this project + if (isLoaded && Origin.editor.data.course.get('_id') === route1) { + return EditorRouter.route(currentLocation); + } + setupEditorData(route1); + } + + function onRefreshData(callback, context) { + loadEditorData(_.clone(courseData), function() { + if(callback) callback.call(context); + }); + } + + // deletes course-specific data, and does a fetch on everything else + function onResetData() { + Origin.editor.data = _.omit(Origin.editor.data, Object.keys(courseData)); + preload(); + } + + function onFetchError(model, response, options) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorgeneric') + }); + } + + /** + * Helper functions + */ + + function createCollection(Model, url, type, data) { + return new EditorCollection(null, _.extend({ + autoFetch: false, + model: Model, + url: url, + _type: type + }, data || {})); + } + + function allDataIsLoaded(data) { + if(!data) return false; + return _.every(data, function(item) { return item === true; }); + }; }); diff --git a/frontend/src/core/editor/editor_old.js b/frontend/src/core/editor/editor_old.js deleted file mode 100644 index 5f7d49724a..0000000000 --- a/frontend/src/core/editor/editor_old.js +++ /dev/null @@ -1,158 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var dataIsLoaded = false; - - Origin.on('editor:refreshData', function(callback, context) { - dataIsLoaded = false; - var loadedData = { - clipboard: false, - course: false, - config: false, - componentTypes: false, - extensionTypes: false, - contentObjects: false, - articles: false, - blocks: false, - components: false, - courseAssets: false - }; - Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { - - loadedData[loadedObject] = true; - - var allDataIsLoaded = _.every(loadedData, function(item) { - return item === true; - }); - - if (allDataIsLoaded) { - - Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); - Origin.trigger('editor:dataLoaded'); - dataIsLoaded = true; - if (callback) { - callback.apply(context); - } - } - - }); - - // // Not implemented for the time being - // Origin.editor.data.config.on('change:_enabledExtensions', function() { - // Origin.socket.emit('project:build', { id: this.currentCourseId }); - // }); - - _.each(Origin.editor.data, function(object) { - object.fetch({reset:true, - error: function(model, response, options) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); - } - }); - }); - - }); - - Origin.on('router:editor', function(route1, route2, route3, route4) { - // Check if data has already been loaded for this project - if (dataIsLoaded && Origin.editor.data.course && Origin.editor.data.course.get('_id') === route1) { - return routeAfterDataIsLoaded(route1, route2, route3, route4); - } - - var loadedData = { - clipboard: false, - course: false, - config: false, - componentTypes: false, - extensionTypes: false, - contentObjects: false, - articles: false, - blocks: false, - components: false, - courseAssets: false - }; - - Origin.on('editorCollection:dataLoaded editorModel:dataLoaded', function(loadedObject) { - - loadedData[loadedObject] = true; - - var allDataIsLoaded = _.every(loadedData, function(item) { - return item === true; - }); - - if (allDataIsLoaded) { - - Origin.off('editorCollection:dataLoaded editorModel:dataLoaded'); - Origin.trigger('editor:dataLoaded'); - dataIsLoaded = true; - routeAfterDataIsLoaded(route1, route2, route3, route4); - - } - - }); - - setupEditorData(route1, route2, route3, route4); - - }); - - function setupEditorData(route1, route2, route3, route4) { - Origin.editor.data.course = new EditorCourseModel({_id: route1}); - Origin.editor.data.config = new EditorConfigModel({_courseId: route1}); - - Origin.editor.data.contentObjects = new EditorCollection(null, { - model: EditorContentObjectModel, - url: '/api/content/contentobject?_courseId=' + route1, - _type: 'contentObjects' - }); - - Origin.editor.data.articles = new EditorCollection(null, { - model: EditorArticleModel, - url: '/api/content/article?_courseId=' + route1, - _type: 'articles' - }); - - Origin.editor.data.blocks = new EditorCollection(null, { - model: EditorBlockModel, - url: '/api/content/block?_courseId=' + route1, - _type: 'blocks' - }); - - Origin.editor.data.components = new EditorCollection(null, { - model: EditorComponentModel, - url: '/api/content/component?_courseId=' + route1, - _type: 'components' - }); - - Origin.editor.data.clipboard = new EditorCollection(null, { - model: EditorClipboardModel, - url: '/api/content/clipboard?_courseId=' + route1 + '&createdBy=' + Origin.sessionModel.get('id'), - _type: 'clipboard' - }); - - // Store the component types - Origin.editor.data.componentTypes = new EditorCollection(null, { - model : EditorComponentTypeModel, - url: '/api/componenttype', - _type: 'componentTypes' - }); - - Origin.editor.data.componentTypes.comparator = function(model) { - return model.get('displayName'); - }; - - // Store the extensions types - Origin.editor.data.extensionTypes = new EditorCollection(null, { - model : ExtensionModel, - url: '/api/extensiontype', - _type: 'extensionTypes' - }); - - // Store the course assets - Origin.editor.data.courseAssets = new EditorCollection(null, { - model: EditorCourseAssetModel, - url: '/api/content/courseasset?_courseId=' + route1, - _type: 'courseAssets' - }); - } -}); diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index acc686125e..2ec8687e43 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -6,8 +6,8 @@ define(function(require) { var Origin = require('coreJS/app/origin'); var AssetManagementModalView = require('coreJS/assetManagement/views/assetManagementModalView'); var AssetCollection = require('coreJS/assetManagement/collections/assetCollection'); - var EditorCourseAssetModel = require('editorCourse/models/editorCourseAssetModel'); - + var EditorCourseAssetModel = require('coreJS/editor/course/models/editorCourseAssetModel'); + var ScaffoldAssetView = Backbone.Form.editors.Base.extend({ tagName: 'div', @@ -45,7 +45,7 @@ define(function(require) { this.listenTo(Origin, 'scaffold:assets:autofill', this.onAutofill); // Call parent constructor Backbone.Form.editors.Base.prototype.initialize.call(this, options); - + }, onAutofill: function(courseAssetObject, value) { @@ -158,7 +158,7 @@ define(function(require) { var fieldname = data.assetFilename; var assetId = data.assetId; - + var courseAssetObject = { contentTypeId: contentTypeId, contentType: contentType, @@ -187,7 +187,7 @@ define(function(require) { }, onClearButtonClicked: function(event) { - event.preventDefault(); + event.preventDefault(); this.checkValueHasChanged(); this.setValue(''); this.toggleFieldAvailibility(); @@ -238,7 +238,7 @@ define(function(require) { type: 'error', text: window.polyglot.t('app.errorsaveasset') }); - }, + }, success: function() { self.saveModel(true); } @@ -270,11 +270,11 @@ define(function(require) { var alternativeModel = Origin.scaffold.getAlternativeModel(); var alternativeAttribute = Origin.scaffold.getAlternativeAttribute(); var isPatch = false; - - attributesToSave = typeof attributesToSave == 'undefined' + + attributesToSave = typeof attributesToSave == 'undefined' ? [] : attributesToSave; - + // Check if alternative model should be used if (alternativeModel) { currentModel = alternativeModel; @@ -287,8 +287,8 @@ define(function(require) { // Check if alternative attribute should be used if (alternativeAttribute) { attributesToSave[alternativeAttribute] = Origin.scaffold.getCurrentModel().attributes; - } - + } + if (!attributesToSave && !attributesToSave.length) { currentModel.pruneAttributes(); currentModel.unset('tags'); @@ -305,12 +305,12 @@ define(function(require) { }); }, success: function() { - + // Sometimes we don't need to reset the courseAssets if (shouldResetAssetCollection) { Origin.editor.data.courseAssets.fetch({ - reset:true, + reset:true, success: function() { that.render(); that.trigger('change', that); @@ -337,8 +337,8 @@ define(function(require) { Origin.scaffold.addCustomField('Asset:other', ScaffoldAssetView); Origin.scaffold.addCustomField('Asset', ScaffoldAssetView); }) - + return ScaffoldAssetView; -}) \ No newline at end of file +}) From 3fb8a23d6aafc688aa0696c77af11ef38a56e2f0 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 23 Mar 2017 12:44:29 +0000 Subject: [PATCH 049/296] Add editor data loading --- frontend/src/core/app/origin.js | 5 +- frontend/src/core/dashboard/dashboard.js | 3 - frontend/src/core/editor/article/index.js | 22 +- frontend/src/core/editor/block/index.js | 22 +- frontend/src/core/editor/component/index.js | 16 +- frontend/src/core/editor/config/index.js | 24 ++- .../src/core/editor/contentObject/index.js | 32 +-- frontend/src/core/editor/course/index.js | 60 +++--- frontend/src/core/editor/editor.js | 176 +--------------- frontend/src/core/editor/extensions/index.js | 36 ++-- .../core/editor/global/editorDataLoader.js | 192 ++++++++++++++++++ frontend/src/core/editor/global/helpers.js | 6 - frontend/src/core/editor/global/preloader.js | 8 - .../src/core/editor/menuSettings/index.js | 40 ++-- frontend/src/core/editor/theme/index.js | 42 ++-- 15 files changed, 353 insertions(+), 331 deletions(-) create mode 100644 frontend/src/core/editor/global/editorDataLoader.js delete mode 100644 frontend/src/core/editor/global/helpers.js delete mode 100644 frontend/src/core/editor/global/preloader.js diff --git a/frontend/src/core/app/origin.js b/frontend/src/core/app/origin.js index 48d00c9300..79e3b75e12 100644 --- a/frontend/src/core/app/origin.js +++ b/frontend/src/core/app/origin.js @@ -4,10 +4,7 @@ define(function(require){ var Backbone = require('backbone'); var Origin = { - location: {}, - editor: { - data: {} - } + location: {} }; var pluginTaps = []; diff --git a/frontend/src/core/dashboard/dashboard.js b/frontend/src/core/dashboard/dashboard.js index 7b187307c7..d216dabedf 100644 --- a/frontend/src/core/dashboard/dashboard.js +++ b/frontend/src/core/dashboard/dashboard.js @@ -10,9 +10,6 @@ define(function(require) { Origin.on('router:dashboard', function(location, subLocation, action) { Origin.tap('dashboard', function() { - Origin.editor = {}; - Origin.editor.data = {}; - Origin.trigger('location:title:update', {title: 'Dashboard - viewing my courses'}); Origin.options.addItems([ { diff --git a/frontend/src/core/editor/article/index.js b/frontend/src/core/editor/article/index.js index 6ed73d7bc8..2a6c98a172 100644 --- a/frontend/src/core/editor/article/index.js +++ b/frontend/src/core/editor/article/index.js @@ -1,19 +1,21 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('coreJS/app/origin'); - var Helpers = require('../global/helpers'); + var EditorData = require('../global/editorDataLoader'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if (route2 !== 'article' || route4 !== 'edit') { - return; - } - (new EditorArticleModel({ _id: route3 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: 'Editing article - ' + model.get('title') }); - Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); - Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); + EditorData.waitForLoad(function() { + if (route2 !== 'article' || route4 !== 'edit') { + return; } + (new EditorArticleModel({ _id: route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Editing article - ' + model.get('title') }); + Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); + } + }); }); }); }); diff --git a/frontend/src/core/editor/block/index.js b/frontend/src/core/editor/block/index.js index a5513518f6..a1bbfe2867 100644 --- a/frontend/src/core/editor/block/index.js +++ b/frontend/src/core/editor/block/index.js @@ -2,23 +2,25 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var Helpers = require('../global/helpers'); + var EditorData = require('../global/editorDataLoader'); var EditorBlockEditView = require('./views/editorBlockEditView'); var EditorBlockEditSidebarView = require('./views/editorBlockEditSidebarView'); var EditorBlockModel = require('./models/editorBlockModel'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 !== 'block' || route4 !== 'edit') { - return; - } - (new EditorBlockModel({ _id: route3 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: 'Editing block - ' + model.get('title') }); - Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); - Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); + EditorData.waitForLoad(function() { + if(route2 !== 'block' || route4 !== 'edit') { + return; } + (new EditorBlockModel({ _id: route3 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Editing block - ' + model.get('title') }); + Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); + } + }); }); }); }); diff --git a/frontend/src/core/editor/component/index.js b/frontend/src/core/editor/component/index.js index 6d15c4a8d5..3a89806842 100644 --- a/frontend/src/core/editor/component/index.js +++ b/frontend/src/core/editor/component/index.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('coreJS/app/origin'); - var Helpers = require('../global/helpers'); + var EditorData = require('../global/editorDataLoader'); var EditorComponentEditView = require('./views/editorComponentEditView'); var EditorComponentEditSidebarView = require('./views/editorComponentEditSidebarView'); @@ -11,12 +11,14 @@ define(function(require) { var EditorComponentListSidebarView = require('./views/editorComponentListSidebarView'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 === 'block' && route4 === 'add') { - // block->add, so we're actually adding a component - handleNewComponent(); - } else if (route2 === 'component') { - handleEditComponent(); - } + EditorData.waitForLoad(function() { + if(route2 === 'block' && route4 === 'add') { + // block->add, so we're actually adding a component + handleNewComponent(); + } else if (route2 === 'component') { + handleEditComponent(); + } + }); }); function handleNewComponent() { diff --git a/frontend/src/core/editor/config/index.js b/frontend/src/core/editor/config/index.js index 9e052af445..2ef455ffee 100644 --- a/frontend/src/core/editor/config/index.js +++ b/frontend/src/core/editor/config/index.js @@ -1,23 +1,25 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('origin'); - var Helpers = require('../global/helpers'); + var Origin = require('coreJS/app/origin'); + var EditorData = require('../global/editorDataLoader'); var EditorConfigEditView = require('./views/editorConfigEditView'); var EditorConfigEditSidebarView = require('./views/editorConfigEditSidebarView'); var EditorConfigModel = require('./models/editorConfigModel'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 !== 'config') { - return; - } - (new EditorConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: 'Edit configuration' }); - Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); - Origin.contentPane.setView(EditorConfigEditView, { model: configModel, form: form }); + EditorData.waitForLoad(function() { + if(route2 !== 'config') { + return; } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Edit configuration' }); + Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); + Origin.contentPane.setView(EditorConfigEditView, { model: configModel, form: form }); + } + }); }); }); }); diff --git a/frontend/src/core/editor/contentObject/index.js b/frontend/src/core/editor/contentObject/index.js index 8031bcff5e..1e040ac293 100644 --- a/frontend/src/core/editor/contentObject/index.js +++ b/frontend/src/core/editor/contentObject/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('coreJS/app/origin'); - var Helpers = require('../global/helpers'); + var EditorData = require('../global/editorDataLoader'); var EditorContentObjectModel = require('./models/editorContentObjectModel'); var EditorMenuSidebarView = require('./views/editorMenuSidebarView'); @@ -11,27 +11,29 @@ define(function(require) { var EditorView = require('../global/views/editorView'); Origin.on('router:editor', function(route1, route2, route3, route4) { - var isPageEdit = route2 === 'page' && route4 === "edit"; - var isMenuEdit = route2 === 'menu' && route4 === "edit"; + EditorData.waitForLoad(function() { + var isPageEdit = route2 === 'page' && route4 === "edit"; + var isMenuEdit = route2 === 'menu' && route4 === "edit"; - if((route2 === 'page' || route2 === 'menu') && route4 === "edit") { - renderContentObjectEdit(); - } - else if(route2 === 'page') { - renderPageStructure(); - } - else if(route2 === 'menu') { - renderMenuStructure(); - } + if((route2 === 'page' || route2 === 'menu') && route4 === "edit") { + renderContentObjectEdit(); + } + else if(route2 === 'page') { + renderPageStructure(); + } + else if(route2 === 'menu') { + renderMenuStructure(); + } + }); }); function renderContentObjectEdit() { (new EditorContentObjectModel({ _id: Origin.location.route3 })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - // TODO this is from menu - // Origin.trigger('location:title:update', { title: 'Editing menu - ' + contentObjectModel.get('title') }); - Origin.trigger('location:title:update', { title: 'Editing page - ' + contentObjectModel.get('title') }); + // TODO this should be properly localised + var type = Origin.location.route2; + Origin.trigger('location:title:update', { title: 'Editing ' + type + ' - ' + contentObjectModel.get('title') }); Origin.sidebar.addView(new EditorPageEditSidebarView({ form: form }).$el); Origin.contentPane.setView(EditorPageEditView, { model: model, form: form }); } diff --git a/frontend/src/core/editor/course/index.js b/frontend/src/core/editor/course/index.js index b920981e02..8d7c9f6cc2 100644 --- a/frontend/src/core/editor/course/index.js +++ b/frontend/src/core/editor/course/index.js @@ -1,42 +1,42 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('coreJS/app/origin'); - var Helpers = require('../global/helpers'); + var EditorData = require('../global/editorDataLoader'); var EditorCourseModel = require('./models/editorCourseModel'); var EditorCourseEditView = require('./views/editorCourseEditView'); - var EditorCourseEditViewSidebarView = require('./views/editorCourseEditSidebarView'); + var EditorCourseEditSidebarView = require('./views/editorCourseEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 === 'settings' || route2 === 'project' && route3 === 'edit') { - renderCourseEdit(); - } else if(route2 === 'project' && route3 === 'new') { - createNewCourse(); - } - }); -}); - -function renderCourseEdit() { - (new EditorCourseModel({ _id: Origin.location.route1 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: window.polyglot.t('app.editcourse') }); - Origin.editingOverlay.addView(new EditorCourseEditView({ model: model, form: form }).$el); - Origin.sidebar.addView(new EditorCourseEditViewSidebarView({ form: form }).$el); - } + Origin.on('router:project', function(route1, route2, route3, route4) { + if(route1 === 'new') createNewCourse(); }); -} -function createNewCourse() { - // Default the new project title - var model = new EditorCourseModel({ - title: window.polyglot.t('app.placeholdernewcourse'), - displayTitle: window.polyglot.t('app.placeholdernewcourse') + Origin.on('router:editor', function(route1, route2, route3, route4) { + EditorData.waitForLoad(function() { + if(route2 === 'settings') renderCourseEdit(); + }); }); - var form = Origin.scaffold.buildForm({ model: model }); + function renderCourseEdit() { + console.log(Origin.location.module); + (new EditorCourseModel({ _id: Origin.location.route1 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: window.polyglot.t('app.editcourse') }); + Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); + Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); + } + }); + } - Origin.trigger('location:title:update', { title: window.polyglot.t('app.addnewproject') }); - Origin.editingOverlay.addView(new EditorCourseEditView({ model: model, form: form }).$el); - Origin.sidebar.addView(new EditorCourseEditViewSidebarView({ form: form }).$el); -} + function createNewCourse() { + var model = new EditorCourseModel({ + title: window.polyglot.t('app.placeholdernewcourse'), + displayTitle: window.polyglot.t('app.placeholdernewcourse') + }); + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: window.polyglot.t('app.addnewproject') }); + Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); + Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); + } +}); diff --git a/frontend/src/core/editor/editor.js b/frontend/src/core/editor/editor.js index a7909a1c7c..ca49eb0a92 100644 --- a/frontend/src/core/editor/editor.js +++ b/frontend/src/core/editor/editor.js @@ -1,20 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var _ = require('underscore'); var Origin = require('coreJS/app/origin'); - - var EditorArticleModel = require('./article/models/editorArticleModel'); - var EditorBlockModel = require('./block/models/editorBlockModel'); - var EditorClipboardModel = require('./global/models/editorClipboardModel'); - var EditorCollection = require('./global/collections/editorCollection'); - var EditorComponentModel = require('./component/models/editorComponentModel'); - var EditorComponentTypeModel = require('./component/models/editorComponentTypeModel'); - var EditorContentObjectModel = require('./contentObject/models/editorContentObjectModel'); - var EditorConfigModel = require('./config/models/editorConfigModel'); - var EditorCourseAssetModel = require('./course/models/editorCourseAssetModel'); - var EditorCourseModel = require('./course/models/editorCourseModel'); - var ExtensionModel = require('./extensions/models/extensionModel'); - + var EditorData = require('./global/editorDataLoader'); // load in the submodules require([ './article/index', @@ -27,161 +14,8 @@ define(function(require) { './menuSettings/index', './theme/index' ]); - - // used to check what's preloaded - var globalData = { - courses: false, - extensionTypes: false, - componentTypes: false - }; - // used to check what's loaded - var courseData = { - clipboard: false, - course: false, - config: false, - contentObjects: false, - articles: false, - blocks: false, - components: false, - courseAssets: false - }; - - var isPreloaded = false; - var isLoaded = false; - - var currentLocation; - - // event listeners - Origin.on('login:changed login:newSession', preload); - Origin.on('editor:refreshData', onRefreshData); - Origin.on('editor:resetData', onResetData); - Origin.on('router:editor', onRoute); - - /** - * Functions - */ - - /** - * loads data that's needed elsewhere - */ - function preload() { - // no point continuing if not logged in - if(!Origin.sessionModel.get('isAuthenticated')) { - return; - } - if(!Origin.editor.data.courses) { - Origin.editor.data.courses = createCollection(EditorCourseModel, '/api/content/course', 'courses'); - } - if(!Origin.editor.data.extensionTypes) { - Origin.editor.data.extensionTypes = createCollection(ExtensionModel, '/api/extensiontype', 'extensionTypes'); - } - if(!Origin.editor.data.componentTypes) { - Origin.editor.data.componentTypes = createCollection(EditorComponentTypeModel, '/api/componenttype', 'componentTypes', { - comparator: function(model) { return model.get('displayName'); } - }); - } - // start preload - loadEditorData(_.clone(globalData), function() { - isPreloaded = true; - Origin.trigger('editor:dataPreloaded:'); - }); - } - - /** - * Fetches a group of editor collections (Origin.editor.data) - * @param object whose keys are the key found on Origin.editor.data - * and is used for progress checking - */ - function loadEditorData(data, callback) { - for(var i = 0, count = Object.keys(data).length; i < count; i++) { - var key = Object.keys(data)[i]; - Origin.editor.data[key].fetch({ - success: function(collection) { - data[collection._type] = true; - if(allDataIsLoaded(data) && callback) callback(); - }, - error: onFetchError - }); - } - } - - function setupEditorData(id) { - // add the following to editor data - _.extend(Origin.editor.data, { - course: new EditorCourseModel({ _id:id }), - config: new EditorConfigModel({ _courseId:id }), - contentObjects: createCollection(EditorContentObjectModel, '/api/content/contentobject?_courseId='+id, 'contentObjects'), - articles: createCollection(EditorArticleModel, '/api/content/article?_courseId='+id, 'articles'), - blocks: createCollection(EditorBlockModel, '/api/content/block?_courseId='+id, 'blocks'), - components: createCollection(EditorComponentModel, '/api/content/component?_courseId='+id, 'components'), - clipboard: createCollection(EditorClipboardModel, '/api/content/clipboard?_courseId=' + id + '&createdBy=' + Origin.sessionModel.get('id'), 'clipboard'), - courseAssets: createCollection(EditorCourseAssetModel, '/api/content/courseasset?_courseId='+id, 'courseAssets') - }); - // load all collections - loadEditorData(_.clone(courseData), function() { - Origin.trigger('editor:dataLoaded'); - if(currentLocation) EditorRouter.route(currentLocation); - }); - } - - /** - * Event handleSettingsRoute - */ - - function onRoute(route1, route2, route3, route4) { - currentLocation = { - course: route1, - type: route2, - id: route3, - action: route4 - }; - if (!isPreloaded) { - Origin.once('editor:dataPreloaded', function() { - onRoute(currentLocation.course, currentLocation.type, currentLocation.id, currentLocation.action); - }); - return; - } - // Check if data has already been loaded for this project - if (isLoaded && Origin.editor.data.course.get('_id') === route1) { - return EditorRouter.route(currentLocation); - } - setupEditorData(route1); - } - - function onRefreshData(callback, context) { - loadEditorData(_.clone(courseData), function() { - if(callback) callback.call(context); - }); - } - - // deletes course-specific data, and does a fetch on everything else - function onResetData() { - Origin.editor.data = _.omit(Origin.editor.data, Object.keys(courseData)); - preload(); - } - - function onFetchError(model, response, options) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorgeneric') - }); - } - - /** - * Helper functions - */ - - function createCollection(Model, url, type, data) { - return new EditorCollection(null, _.extend({ - autoFetch: false, - model: Model, - url: url, - _type: type - }, data || {})); - } - - function allDataIsLoaded(data) { - if(!data) return false; - return _.every(data, function(item) { return item === true; }); - }; + // loads editor data + Origin.on('app:dataReady login:changed', EditorData.preload); + Origin.on('router:editor editor:refreshData', EditorData.load); + Origin.on('editor:resetData', EditorData.reset); }); diff --git a/frontend/src/core/editor/extensions/index.js b/frontend/src/core/editor/extensions/index.js index 536cc3ee08..5ff0c70c38 100644 --- a/frontend/src/core/editor/extensions/index.js +++ b/frontend/src/core/editor/extensions/index.js @@ -1,30 +1,32 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('origin'); - var Helpers = require('../global/helpers'); + var Origin = require('coreJS/app/origin'); + var EditorData = require('../global/editorDataLoader'); var EditorExtensionsEditView = require('./views/editorExtensionsEditView'); var EditorExtensionsEditSidebarView = require('./views/editorExtensionsEditSidebarView'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 !== 'extensions') { - return; - } - Origin.trigger('location:title:update', { title: 'Manage extensions' }); + EditorData.waitForLoad(function() { + if(route2 !== 'extensions') { + return; + } + Origin.trigger('location:title:update', { title: 'Manage extensions' }); - // Check whether the user came from the page editor or menu editor - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } + // Check whether the user came from the page editor or menu editor + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } - Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute + Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorExtensionsEditView, { model: new Backbone.Model({ _id: route1 }) }); }); - Origin.contentPane.setView(EditorExtensionsEditView, { model: new Backbone.Model({ _id: route1 }) }); }); }); diff --git a/frontend/src/core/editor/global/editorDataLoader.js b/frontend/src/core/editor/global/editorDataLoader.js new file mode 100644 index 0000000000..1f682bb360 --- /dev/null +++ b/frontend/src/core/editor/global/editorDataLoader.js @@ -0,0 +1,192 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var _ = require('underscore'); + var Origin = require('coreJS/app/origin'); + + var EditorArticleModel = require('../article/models/editorArticleModel'); + var EditorBlockModel = require('../block/models/editorBlockModel'); + var EditorClipboardModel = require('../global/models/editorClipboardModel'); + var EditorCollection = require('../global/collections/editorCollection'); + var EditorComponentModel = require('../component/models/editorComponentModel'); + var EditorComponentTypeModel = require('../component/models/editorComponentTypeModel'); + var EditorContentObjectModel = require('../contentObject/models/editorContentObjectModel'); + var EditorConfigModel = require('../config/models/editorConfigModel'); + var EditorCourseAssetModel = require('../course/models/editorCourseAssetModel'); + var EditorCourseModel = require('../course/models/editorCourseModel'); + var ExtensionModel = require('../extensions/models/extensionModel'); + + var isPreloaded = false; + var isLoaded = false; + // used to check what's preloaded + var globalData = { + courses: false, + extensionTypes: false, + componentTypes: false + }; + // used to check what's loaded + var courseData = { + clipboard: false, + course: false, + config: false, + contentObjects: false, + articles: false, + blocks: false, + components: false, + courseAssets: false + }; + + var preloader = { + /** + * Loads Origin.editor.data + */ + preload: function() { + console.log('EditorData.preload'); + // no point continuing if not logged in + if(!Origin.sessionModel.get('isAuthenticated')) { + return; + } + // make sure the Origin objects exist + if(!Origin.editor) Origin.editor = {}; + if(!Origin.editor.data) Origin.editor.data = {}; + + if(!Origin.editor.data.courses) { + Origin.editor.data.courses = createCollection(EditorCourseModel, '/api/content/course', 'courses'); + } + if(!Origin.editor.data.extensionTypes) { + Origin.editor.data.extensionTypes = createCollection(ExtensionModel, '/api/extensiontype', 'extensionTypes'); + } + if(!Origin.editor.data.componentTypes) { + Origin.editor.data.componentTypes = createCollection(EditorComponentTypeModel, '/api/componenttype', 'componentTypes', { + comparator: function(model) { return model.get('displayName'); } + }); + } + // start preload + loadEditorData(_.clone(globalData), function() { + isPreloaded = true; + console.log('preloaded'); + Origin.trigger('editor:dataPreloaded'); + }); + }, + /** + * Loads course-specific data + */ + load: function(callback) { + // if(!Origin.location.route1) + console.log('EditorData.load', Origin.location.route1); + // FIXME this is bad, put here as need to reference callback + var onDataLoad = function() { + isLoaded = true; + Origin.trigger('editor:dataLoaded'); + if(typeof callback === 'function') callback.call(this); + }; + if(!isLoaded || Origin.editor.data.course.get('_id') !== Origin.location.route1) { + isLoaded = false; + console.log('set up'); + setUpEditorData(Origin.location.route1, onDataLoad); + } else { + console.log('refresh'); + isLoaded = false; + loadEditorData(_.clone(courseData), onDataLoad); + } + }, + /** + * Deletes course-specific data, and does a fetch on everything else + */ + reset: function() { + console.log('EditorData.reset'); + isPreloaded = false; + Origin.editor.data = _.omit(Origin.editor.data, Object.keys(courseData)); + preloader.preload(); + }, + /** + * Makes sure all data has been loaded and calls callback + */ + waitForLoad: function(callback) { + console.log('waitForLoad', Origin.location.route1); + if(!isPreloaded) { + Origin.once('editor:dataPreloaded', function(){ + if(isLoadComplete()) return callback.apply(this); + }); + } + if(!isLoaded) { + Origin.once('editor:dataLoaded', function(){ + if(isLoadComplete()) return callback.apply(this); + }); + } + } + }; + + /** + * Functions + */ + + /** + * Fetches a group of editor collections (Origin.editor.data) + * @param object whose keys are the key found on Origin.editor.data + * and is used for progress checking + */ + function loadEditorData(data, callback) { + for(var i = 0, count = Object.keys(data).length; i < count; i++) { + var key = Object.keys(data)[i]; + Origin.editor.data[key].fetch({ + success: function(collection) { + data[collection._type] = true; + if(callback && isAllDataLoaded(data)) callback.apply(this); + }, + error: onFetchError + }); + } + } + + function setUpEditorData(id, callback) { + // add the following to editor data + _.extend(Origin.editor.data, { + course: new EditorCourseModel({ _id:id }), + config: new EditorConfigModel({ _courseId:id }), + contentObjects: createCollection(EditorContentObjectModel, '/api/content/contentobject?_courseId='+id, 'contentObjects'), + articles: createCollection(EditorArticleModel, '/api/content/article?_courseId='+id, 'articles'), + blocks: createCollection(EditorBlockModel, '/api/content/block?_courseId='+id, 'blocks'), + components: createCollection(EditorComponentModel, '/api/content/component?_courseId='+id, 'components'), + clipboard: createCollection(EditorClipboardModel, '/api/content/clipboard?_courseId=' + id + '&createdBy=' + Origin.sessionModel.get('id'), 'clipboard'), + courseAssets: createCollection(EditorCourseAssetModel, '/api/content/courseasset?_courseId='+id, 'courseAssets') + }); + // load all collections + loadEditorData(_.clone(courseData), function() { + callback.apply(this); + }); + } + + function createCollection(Model, url, type, data) { + return new EditorCollection(null, _.extend({ + autoFetch: false, + model: Model, + url: url, + _type: type + }, data || {})); + } + + function isAllDataLoaded(data) { + if(!data) return false; + return _.every(data, function(item) { return item === true; }); + } + + function isLoadComplete() { + return isPreloaded && isLoaded; + } + + /** + * Event handlers + */ + + function onFetchError(model, response, options) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorgeneric') + }); + } + + /** + * Export + */ + return preloader; +}); diff --git a/frontend/src/core/editor/global/helpers.js b/frontend/src/core/editor/global/helpers.js deleted file mode 100644 index 057146b082..0000000000 --- a/frontend/src/core/editor/global/helpers.js +++ /dev/null @@ -1,6 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - return { - - }; -}); diff --git a/frontend/src/core/editor/global/preloader.js b/frontend/src/core/editor/global/preloader.js deleted file mode 100644 index 08fd56e99d..0000000000 --- a/frontend/src/core/editor/global/preloader.js +++ /dev/null @@ -1,8 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - return { - preload: function() { - - } - }; -}); diff --git a/frontend/src/core/editor/menuSettings/index.js b/frontend/src/core/editor/menuSettings/index.js index ce831ffd79..b2fac4b0c0 100644 --- a/frontend/src/core/editor/menuSettings/index.js +++ b/frontend/src/core/editor/menuSettings/index.js @@ -1,32 +1,34 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('origin'); - var Helpers = require('../global/helpers'); + var Origin = require('coreJS/app/origin'); + var EditorData = require('../global/editorDataLoader'); var EditorConfigModel = require('../config/models/editorConfigModel'); var EditorMenuSettingsEditView = require('./views/editorMenuSettingsEditView'); var EditorMenuSettingsEditSidebarView = require('./views/editorMenuSettingsEditSidebarView'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 !== 'menuSettings') { - return; - } - (new EditorConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - Origin.trigger('location:title:update', {title: 'Select menu'}); + EditorData.waitForLoad(function() { + if(route2 !== 'menuSettings') { + return; + } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', {title: 'Select menu'}); - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } + Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorMenuSettingsEditView, { model: model }); } - Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }); - Origin.contentPane.setView(EditorMenuSettingsEditView, { model: model }); - } + }); }); }); }); diff --git a/frontend/src/core/editor/theme/index.js b/frontend/src/core/editor/theme/index.js index a69994cf44..deccb0b422 100644 --- a/frontend/src/core/editor/theme/index.js +++ b/frontend/src/core/editor/theme/index.js @@ -1,34 +1,36 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('origin'); - var Helpers = require('../global/helpers'); + var Origin = require('coreJS/app/origin'); + var EditorData = require('../global/editorDataLoader'); var EditorConfigModel = require('../config/models/editorConfigModel'); var EditorThemeCollectionView = require('./views/editorThemeCollectionView'); var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView'); Origin.on('router:editor', function(route1, route2, route3, route4) { - if(route2 !== 'selecttheme') { - return; - } - (new EditorConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - Origin.trigger('location:title:update', { title: 'Select theme' }); + EditorData.waitForLoad(function() { + if(route2 !== 'selecttheme') { + return; + } + (new EditorConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', { title: 'Select theme' }); - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } - Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }); - Origin.contentPane.setView(EditorThemeCollectionView, { model: model }); - } + Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorThemeCollectionView, { model: model }); + } + }); }); }); }); From a1d578106854c0f3a1de74cf6e542fc2befa15d9 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 23 Mar 2017 12:44:35 +0000 Subject: [PATCH 050/296] Fix template name --- .../src/core/editor/course/views/editorCourseEditSidebarView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js b/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js index f204565619..64f4781083 100644 --- a/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js +++ b/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js @@ -21,7 +21,7 @@ define(function(require) { Backbone.history.history.back(); } }, { - template: 'editorCourseEditSidebarView' + template: 'editorCourseEditSidebar' }); return EditorCourseEditSidebarView; From 362e731120d5d4f6ee461551d4ed1e5a27812f81 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 23 Mar 2017 12:46:44 +0000 Subject: [PATCH 051/296] Fix config --- frontend/src/core/editor/config/index.js | 2 +- .../core/editor/config/templates/editorConfigEditSidebar.hbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/core/editor/config/index.js b/frontend/src/core/editor/config/index.js index 2ef455ffee..07e0fb47e7 100644 --- a/frontend/src/core/editor/config/index.js +++ b/frontend/src/core/editor/config/index.js @@ -17,7 +17,7 @@ define(function(require) { var form = Origin.scaffold.buildForm({ model: model }); Origin.trigger('location:title:update', { title: 'Edit configuration' }); Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); - Origin.contentPane.setView(EditorConfigEditView, { model: configModel, form: form }); + Origin.contentPane.setView(EditorConfigEditView, { model: model, form: form }); } }); }); diff --git a/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs b/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs index 8fe27d9d8c..fb23d0b902 100644 --- a/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs +++ b/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs @@ -1,7 +1,7 @@
-
- {{t 'app.changepassword'}} -
+ {{#ifValueEquals auth "local"}} +
+
+ - {{/ifValueEquals}} - -
+ {{t 'app.changepassword'}} +
+
+ {{/ifValueEquals}} + + +
+
diff --git a/frontend/src/less/sharedStyles.less b/frontend/src/less/sharedStyles.less index ac0e76040f..678721673d 100644 --- a/frontend/src/less/sharedStyles.less +++ b/frontend/src/less/sharedStyles.less @@ -7,6 +7,9 @@ background-color: #fff; > .inner { padding: 30px; + .form-group { + border-bottom: none; + } } } @@ -15,4 +18,4 @@ white-space: nowrap; text-overflow: ellipsis; width: 90%; -} \ No newline at end of file +} From 9052b3ed1cd1e675b46d97d6b87ce9b7dc45064e Mon Sep 17 00:00:00 2001 From: lc-thomasberger Date: Mon, 27 Mar 2017 11:50:37 +0200 Subject: [PATCH 059/296] implement onScreen support (#1490) * update model schemas * Added `_onScreen` attribute to the whitelist so that it's saved. Articles and ContentObjects do not use whitelisting. * minor typo fixes * wording update --- .../editor/page/models/editorBlockModel.js | 2 +- .../page/models/editorComponentModel.js | 2 +- plugins/content/article/model.schema | 35 +++++++++++++++++++ plugins/content/block/model.schema | 35 +++++++++++++++++++ plugins/content/component/model.schema | 35 +++++++++++++++++++ plugins/content/contentobject/model.schema | 35 +++++++++++++++++++ 6 files changed, 142 insertions(+), 2 deletions(-) diff --git a/frontend/src/core/editor/page/models/editorBlockModel.js b/frontend/src/core/editor/page/models/editorBlockModel.js index e1fe810825..dbf208db7a 100644 --- a/frontend/src/core/editor/page/models/editorBlockModel.js +++ b/frontend/src/core/editor/page/models/editorBlockModel.js @@ -20,7 +20,7 @@ define(function(require) { // These are the only attributes which should be permitted on a save whitelistAttributes: ['_id', '_courseId', '_parentId', '_layoutOptions', '_type', '_sortOrder', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', '_extensions'] + 'title', '_extensions', '_onScreen'] }); diff --git a/frontend/src/core/editor/page/models/editorComponentModel.js b/frontend/src/core/editor/page/models/editorComponentModel.js index 940a664dbd..e2646cc999 100644 --- a/frontend/src/core/editor/page/models/editorComponentModel.js +++ b/frontend/src/core/editor/page/models/editorComponentModel.js @@ -13,7 +13,7 @@ define(function(require) { // These are the only attributes which should be permitted on a save whitelistAttributes: ['_id', '_componentType', '_courseId', '_layout', '_parentId', '_type', 'properties', '_component', '_extensions', '_classes', '_isOptional', '_isAvailable', 'body', 'displayTitle', - 'title', 'version'] + 'title', 'version', '_onScreen'] }); return EditorComponentModel; diff --git a/plugins/content/article/model.schema b/plugins/content/article/model.schema index edd4d1820c..55061402e3 100644 --- a/plugins/content/article/model.schema +++ b/plugins/content/article/model.schema @@ -52,6 +52,41 @@ "title": "Is this available?", "help": "If set to 'false' this will not be displayed" }, + "_onScreen": { + "type": "object", + "title": "", + "properties": { + "_isEnabled": { + "type": "bool", + "default": "false", + "isSetting": true, + "inputType": {"type": "Boolean", "options": [true, false]}, + "validators": [], + "title": "Enable", + "help": "If enabled, the CSS class(es) specified in the Classes field will be added to the article element when it is within the browser's viewport." + }, + "_classes": { + "type": "string", + "default": "", + "isSetting": true, + "required": false, + "inputType": "Text", + "validators": [], + "title": "Classes", + "help": "The CSS class(es) to add to the article element." + }, + "_percentInviewVertical": { + "type": "number", + "required": false, + "default": 50, + "isSetting": true, + "title": "Percent in view", + "inputType": "Number", + "validators": ["number"], + "help": "Controls what percentage of the article's height needs to be in the viewport in order for the CSS class(es) to be added." + } + } + }, "_extensions": { "type":"object" } diff --git a/plugins/content/block/model.schema b/plugins/content/block/model.schema index 905f904f75..72b7166216 100644 --- a/plugins/content/block/model.schema +++ b/plugins/content/block/model.schema @@ -59,6 +59,41 @@ "title": "Is this available?", "help": "If set to 'false' this will not be displayed" }, + "_onScreen": { + "type": "object", + "title": "", + "properties": { + "_isEnabled": { + "type": "bool", + "default": "false", + "isSetting": true, + "inputType": {"type": "Boolean", "options": [true, false]}, + "validators": [], + "title": "Enable", + "help": "If enabled, the CSS class(es) specified in the Classes field will be added to the block element when it is within the browser's viewport." + }, + "_classes": { + "type": "string", + "default": "", + "isSetting": true, + "required": false, + "inputType": "Text", + "validators": [], + "title": "Classes", + "help": "The CSS class(es) to add to the block element." + }, + "_percentInviewVertical": { + "type": "number", + "required": false, + "default": 50, + "isSetting": true, + "title": "Percent in view", + "inputType": "Number", + "validators": ["number"], + "help": "Controls what percentage of the block's height needs to be in the viewport in order for the CSS class(es) to be added." + } + } + }, "_extensions": { "type":"object" } diff --git a/plugins/content/component/model.schema b/plugins/content/component/model.schema index c411545d9e..f246c261b6 100644 --- a/plugins/content/component/model.schema +++ b/plugins/content/component/model.schema @@ -78,6 +78,41 @@ "inputType":"TextArea", "validators": [] }, + "_onScreen": { + "type": "object", + "title": "", + "properties": { + "_isEnabled": { + "type": "bool", + "default": "false", + "isSetting": true, + "inputType": {"type": "Boolean", "options": [true, false]}, + "validators": [], + "title": "Enable", + "help": "If enabled, the CSS class(es) specified in the Classes field will be added to the component element when it is within the browser's viewport." + }, + "_classes": { + "type": "string", + "default": "", + "isSetting": true, + "required": false, + "inputType": "Text", + "validators": [], + "title": "Classes", + "help": "The CSS class(es) to add to the component element." + }, + "_percentInviewVertical": { + "type": "number", + "required": false, + "default": 50, + "isSetting": true, + "title": "Percent in view", + "inputType": "Number", + "validators": ["number"], + "help": "Controls what percentage of the component's height needs to be in the viewport in order for the CSS class(es) to be added." + } + } + }, "_extensions": { "type":"object" }, diff --git a/plugins/content/contentobject/model.schema b/plugins/content/contentobject/model.schema index 344aeef173..39855db22e 100644 --- a/plugins/content/contentobject/model.schema +++ b/plugins/content/contentobject/model.schema @@ -99,6 +99,41 @@ "title": "Is this available?", "help": "If set to 'false' this will not be displayed" }, + "_onScreen": { + "type": "object", + "title": "", + "properties": { + "_isEnabled": { + "type": "bool", + "default": "false", + "isSetting": true, + "inputType": {"type": "Boolean", "options": [true, false]}, + "validators": [], + "title": "Enable", + "help": "If enabled, the CSS class(es) specified in the Classes field will be added to the page element when it is within the browser's viewport." + }, + "_classes": { + "type": "string", + "default": "", + "isSetting": true, + "required": false, + "inputType": "Text", + "validators": [], + "title": "Classes", + "help": "The CSS class(es) to add to the page element." + }, + "_percentInviewVertical": { + "type": "number", + "required": false, + "default": 50, + "isSetting": true, + "title": "Percent in view", + "inputType": "Number", + "validators": ["number"], + "help": "Controls what percentage of the page's height needs to be in the viewport in order for the CSS class(es) to be added." + } + } + }, "_extensions": { "type": "object" }, From db860f09f4d7c030f356b761efb603404c14f0db Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Mar 2017 11:07:39 +0100 Subject: [PATCH 060/296] Refactor layout code --- .../views/editorPageBlockView.js | 71 ++++++------------- 1 file changed, 20 insertions(+), 51 deletions(-) diff --git a/frontend/src/core/editor/contentObject/views/editorPageBlockView.js b/frontend/src/core/editor/contentObject/views/editorPageBlockView.js index 7e7a57cbdc..ac4f3e6ea6 100644 --- a/frontend/src/core/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageBlockView.js @@ -27,9 +27,7 @@ define(function(require){ preRender: function() { this.listenToEvents(); - this.model.set('componentTypes', Origin.editor.data.componentTypes.toJSON()); - this.evaluateComponents(this.render); }, @@ -61,59 +59,30 @@ define(function(require){ }, this)); }, - evaluateComponents: function(callback) { - var layoutOptions = [{ - type: 'left', - name: 'app.layoutleft', - pasteZoneRenderOrder: 2 - },{ - type: 'full', - name: 'app.layoutfull', - pasteZoneRenderOrder: 1 - },{ - type: 'right', - name: 'app.layoutright', - pasteZoneRenderOrder: 3 - }]; - - this.model.getChildren().each(function(component) { - switch (component.get('_layout')) { - case 'full': - layoutOptions = null; - break; - case 'left': - layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "full"})), 1); - layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "left"})), 1); - break; - case 'right': - layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "full"})), 1); - layoutOptions.splice(_.indexOf(layoutOptions, _.findWhere(layoutOptions, { type : "right"})), 1); - break; - } - }, this); - - var dragLayoutOptions = []; + getAvailableLayouts: function() { + var layoutOptions = { + full: { type: 'full', name: 'app.layoutfull', pasteZoneRenderOrder: 1 }, + left: { type: 'left', name: 'app.layoutleft', pasteZoneRenderOrder: 2 }, + right: { type: 'right', name: 'app.layoutright', pasteZoneRenderOrder: 3 } + }; var components = this.model.getChildren(); + if (components.length === 0) { + return [layoutOptions.full,layoutOptions.left,layoutOptions.right]; + } if (components.length === 1) { - switch (components.at(0).get('_layout')) { - case 'full': - dragLayoutOptions.push({type: 'left', name: 'app.layoutleft'}); - dragLayoutOptions.push({type: 'right', name: 'app.layoutright'}); - break; - case 'left': - dragLayoutOptions.push({type: 'full', name: 'app.layoutfull'}); - break; - case 'right': - dragLayoutOptions.push({type: 'full', name: 'app.layoutfull'}); - break; - } + var layout = components.at(0).get('_layout'); + if(layout === 'left') return [layoutOptions.right]; + if(layout === 'right') return [layoutOptions.left]; } + return []; + }, - this.model.set({"layoutOptions": layoutOptions, "dragLayoutOptions": dragLayoutOptions}); - - if (callback) { - callback.apply(this); - } + evaluateComponents: function(callback) { + this.model.set({ + layoutOptions: this.getAvailableLayouts(), + dragLayoutOptions: this.getAvailableLayouts() + }); + if(callback) callback.apply(this); }, deleteBlockPrompt: function(event) { From d3371ca98ad0391606b179c2c145068dddfe5c71 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Mar 2017 16:15:36 +0100 Subject: [PATCH 061/296] Use global paste zone functions for menu layer --- .../contentObject/less/editorMenuLayer.less | 28 ++++++++++--------- .../templates/editorMenuLayer.hbs | 2 +- .../contentObject/views/editorMenuItemView.js | 2 -- .../views/editorMenuLayerView.js | 2 +- .../editor/global/views/editorOriginView.js | 11 +++++--- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/frontend/src/core/editor/contentObject/less/editorMenuLayer.less b/frontend/src/core/editor/contentObject/less/editorMenuLayer.less index e2c3dbd1e3..ad0feb1708 100644 --- a/frontend/src/core/editor/contentObject/less/editorMenuLayer.less +++ b/frontend/src/core/editor/contentObject/less/editorMenuLayer.less @@ -20,21 +20,23 @@ position:relative; padding: 20px; border-bottom: 1px solid #d6f2f9; + // FIXME this should be dynamic... + height: 40px; - .editor-menu-layer-actions.paste-zone { - width: 100%; - position: absolute; - top: -67px; - z-index: 99; - margin:0px; - padding:0; - border:none; - background: none; - transition:top 0.5s cubic-bezier(0.8, 0.0, 0.2, 1); - &.show { - top:20px; - } + .editor-menu-layer-actions.paste-zone { + width: 100%; + position: absolute; + top: -67px; + z-index: 99; + margin:0px; + padding:0; + border:none; + background: none; + transition:top 0.5s cubic-bezier(0.8, 0.0, 0.2, 1); + &.show { + top:20px; } + } } .editor-menu-layer-controls { diff --git a/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs b/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs index 457239326d..f6308ae905 100644 --- a/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs +++ b/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs @@ -1,5 +1,5 @@
-
+
diff --git a/frontend/src/core/editor/contentObject/views/editorMenuItemView.js b/frontend/src/core/editor/contentObject/views/editorMenuItemView.js index d60a7132a8..d029d1efb0 100644 --- a/frontend/src/core/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/core/editor/contentObject/views/editorMenuItemView.js @@ -235,8 +235,6 @@ define(function(require){ }, copyMenuItem: function() { - $('.paste-zone').addClass('show'); - $('.add-zone').css('visibility','hidden'); Origin.trigger('editorView:copy', this.model); }, diff --git a/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js index 60a06a214f..c4d95de9bb 100644 --- a/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js +++ b/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js @@ -163,7 +163,7 @@ define(function(require) { cancelPasteMenuItem: function(event) { event.preventDefault(); - $('.add-zone').css('visibility','visible'); + this.hidePasteZones(); var parentId = this._parentId; var target = new ContentObjectModel({ _parentId: parentId, diff --git a/frontend/src/core/editor/global/views/editorOriginView.js b/frontend/src/core/editor/global/views/editorOriginView.js index ff2046a99d..fd3abb0fcf 100644 --- a/frontend/src/core/editor/global/views/editorOriginView.js +++ b/frontend/src/core/editor/global/views/editorOriginView.js @@ -51,18 +51,20 @@ define(function(require){ } }, - showPasteZones: function (type) { + showPasteZones: function(type) { $('.paste-zone').addClass('display-none'); $('.add-control').addClass('display-none'); - if(type) $('.paste-zone-' + type).removeClass('display-none'); + if(type) $('.paste-zone-' + type).removeClass('display-none').addClass('show'); }, hidePasteZones: function() { - $('.paste-zone').addClass('display-none'); + $('.paste-zone').removeClass('show'); + // FIXME timeout for animation + setTimeout(function() { $('.paste-zone').addClass('display-none'); }, 300); $('.add-control').removeClass('display-none'); }, - showDropZones: function () { + showDropZones: function() { $('.paste-zone').addClass('display-none'); $('.add-control').addClass('display-none'); $('.paste-zone-'+ this.model.get('_type') + ' a').addClass('display-none'); @@ -175,6 +177,7 @@ define(function(require){ e.stopPropagation(); e.preventDefault(); } + console.log(this.mode.attributes); Origin.trigger('editorView:paste', this.model.get('_parentId'), $(event.target).data('sort-order'), $(event.target).data('paste-layout')); }, From a4f92eb675cf4f7fc08dbdf9be22caf21d02f8f0 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Mar 2017 16:15:43 +0100 Subject: [PATCH 062/296] Remove underline --- frontend/src/core/editor/global/less/editor.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/core/editor/global/less/editor.less b/frontend/src/core/editor/global/less/editor.less index bfb32fb10e..aee0d3c521 100644 --- a/frontend/src/core/editor/global/less/editor.less +++ b/frontend/src/core/editor/global/less/editor.less @@ -112,6 +112,10 @@ background-color: transparent; transition: all 0.3s; + a { + text-decoration: none; + } + &:hover { cursor: move; } From 1f30321474363e5f119764e0baf68bbf39533abd Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 27 Mar 2017 16:23:29 +0100 Subject: [PATCH 063/296] Refactor clipboard code We now return relevant HTTP status codes on error rather than 200 Various whitespace-related fixes --- .../core/editor/global/views/editorView.js | 36 +- lib/contentmanager.js | 615 +++++++----------- 2 files changed, 261 insertions(+), 390 deletions(-) diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 876ad11b95..8c5f944991 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -287,17 +287,17 @@ define(function(require){ courseId: Origin.editor.data.course.get('_id'), referenceType: model._siblings }; - - $.post('/api/content/clipboard/copy', postData, _.bind(function(jqXHR, textStatus, errorThrown) { - if (!jqXHR.success) { - return Origin.Notify.alert({ type: 'error', text: jqXHR.message }); - } + $.post('/api/content/clipboard/copy', postData, _.bind(function(jqXHR) { Origin.editor.clipboardId = jqXHR.clipboardId; Origin.editor.pasteParentModel = model.getParent(); this.showPasteZones(model.get('_type')); - }, this)).fail(function (jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorcopy') }); - }); + }, this)).fail(_.bind(function (jqXHR, textStatus, errorThrown) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorcopy') + (jqXHR.message ? '\n\n' + jqXHR.message : '') + }); + this.hidePasteZones(); + }, this)); }, copyIdToClipboard: function(model) { @@ -317,21 +317,21 @@ define(function(require){ }, pasteFromClipboard: function(parentId, sortOrder, layout) { - $.post('/api/content/clipboard/paste', function(jqXHR, textStatus, errorThrown) { - if (!jqXHR.success) { - Origin.Notify.alert({ type: 'error', text: jqXHR.message }); - return; - } + $.post('/api/content/clipboard/paste', function(jqXHR) { Origin.editor.clipboardId = null; Origin.editor.pasteParentModel = null; Origin.trigger('editor:refreshData', function() { - // TODO: HACK - I think this should probably pass a callback in - // and return it with the new item - this way the individual views - // can handle the new views and models + /** + * FIXME views should handle rendering the new data, + * we shouldn't need to refresh the whole page + */ Backbone.history.loadUrl(); }, this); - }, this).fail(function(jqXHR, textStatus, errorThrown) { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorpaste') }); + }).fail(function(jqXHR, textStatus, errorThrown) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorpaste') + (jqXHR.message ? '\n\n' + jqXHR.message : '') + }); }); }, diff --git a/lib/contentmanager.js b/lib/contentmanager.js index bc7eba86b1..8c211cf215 100644 --- a/lib/contentmanager.js +++ b/lib/contentmanager.js @@ -142,7 +142,7 @@ ContentPlugin.prototype.create = function (data, next) { if (typeof data == 'undefined') { return next(new ContentPermissionError()); } - + var user = usermanager.getCurrentUser(); // must have a model name @@ -464,7 +464,7 @@ ContentManager.prototype.processContentHooks = function (action, contentType, da if (options.when == 'pre' && err) { return cb(err); } - + data = results.reduce(function (a, b) { a && a.forEach(function (item, index) { a[index] = _.extend(item, b[index]); @@ -1085,152 +1085,104 @@ ContentManager.prototype.setupRoutes = function () { database.getDatabase(function (error, db) { if (error) { - res.statusCode = 200; - return res.json({success: false, message: 'Unable to connect to database'}); + return res.status(500).json({ success: false, message: 'Unable to connect to database' }); } - async.series([ + // Remove any existing clipboards for this user function(callback) { - // Remove any existing clipboards for this user db.destroy('clipboard', {createdBy: user._id}, function (error) { - if (error) { + if(error) { logger.log('error', error); - callback('Unable to remove existing clipboard record'); - } else { - callback(); + return callback('Unable to remove existing clipboard record'); } + callback(); }); }, + // Retrieve the current object function(callback) { - // Retrieve the current object var type = hierarchy[referenceType]; db.retrieve(type, { _id: id }, function (error, results) { if (error) { return callback(error); } + if (results.length > 1) { + return callback('More results expected while copying object'); + } + var item = results[0]._doc; - if (results.length === 1) { - var item = results[0]._doc; - - switch (referenceType) { - case 'contentObjects': - isMenu = (item._type == 'menu') ? true : false; - contentObjects.push(item); - break; + switch (referenceType) { + case 'contentObjects': + isMenu = (item._type == 'menu') ? true : false; + contentObjects.push(item); + break; - case 'articles': - articles.push(item); - break; + case 'articles': + articles.push(item); + break; - case 'blocks': - blocks.push(item); - break; + case 'blocks': + blocks.push(item); + break; - case 'components': - components.push(item); - break; - } - - callback(); - } else { - callback('More results expected while copying object'); + case 'components': + components.push(item); + break; } + callback(); }); }, + // Process articles function(callback) { - // Process articles - if (contentObjects.length == 1 && !isMenu) { - db.retrieve('article', {_parentId: contentObjects[0]._id}, function(error, results) { - if (error) { - return callback(error); - } - - async.eachSeries(results, function(result, cb) { - articles.push(result._doc); - cb(); - }, function(err) { - if (err) { - callback(err); - } else { - // logger.log('info', 'All articles processed'); - callback(); - } - }); - }); - } else { - // A single article has been copied - callback(); + if(contentObjects.length !== 1 || isMenu) { + return callback(); } + db.retrieve('article', { _parentId: contentObjects[0]._id }, function(error, results) { + if (error) { + return callback(error); + } + async.eachSeries(results, function(result, cb) { + articles.push(result._doc); + cb(); + }, callback); + }); }, + // Process blocks function(callback) { - // Process blocks - if (articles.length !== 0 && !isMenu) { - async.eachSeries(articles, function(article, cb) { - db.retrieve('block', { _parentId: article._id }, function (error, results) { - if (error) { - return cb(error); - } - - async.eachSeries(results, function(result, cb2) { - blocks.push(result._doc); - - cb2(); - }, function(err) { - if (err) { - cb(err); - } else { - // logger.log('info', 'All blocks processed'); - cb(); - } - }); - }); - }, function(err) { - if (err) { - return callback(err); - } else { - callback(); + if(articles.length === 0 || isMenu) { + return callback(); + } + async.eachSeries(articles, function(article, cb) { + db.retrieve('block', { _parentId: article._id }, function(error, results) { + if (error) { + return cb(error); } + async.eachSeries(results, function(result, cb2) { + blocks.push(result._doc); + cb2(); + }, cb); }); - } else { - callback(); - } + }, callback); }, + // Process components function(callback) { - // Process components - if (blocks.length !== 0 && !isMenu) { - async.eachSeries(blocks, function(block, cb) { - db.retrieve('component', { _parentId: block._id }, function (error, results) { - if (error) { - return callback(error); - } - - async.eachSeries(results, function(result, cb2) { - components.push(result._doc); - - cb2(); - }, function(err) { - if (err) { - cb(err); - } else { - // logger.log('info', 'All components processed'); - cb(); - } - }); - }); - }, function(err) { - if (err) { - return callback(err); - } else { - callback(); + if (blocks.length === 0 || isMenu) { + return callback(); + } + async.eachSeries(blocks, function(block, cb) { + db.retrieve('component', { _parentId: block._id }, function(error, results) { + if (error) { + return callback(error); } + async.eachSeries(results, function(result, cb2) { + components.push(result._doc); + cb2(); + }, cb); }); - } else { - callback(); - } + }, callback); }, + // Insert the clipboard record function(callback) { - // Insert the clipboard record var clipboard = { _courseId: courseId, _tenantId: tenantId, @@ -1241,28 +1193,22 @@ ContentManager.prototype.setupRoutes = function () { blocks: blocks, components: components }; - db.create('clipboard', clipboard, function(error, newRecord) { if (error) { return callback(error); - } else { - clipboardId = newRecord._id.toString(); - callback(); } + clipboardId = newRecord._id.toString(); + callback(); }); } ], function(err) { - if (!err) { - res.statusCode = 200; - return res.json({success: true, message: 'ok', clipboardId: clipboardId}); - } else { + if (err) { logger.log('error', err); - res.statusCode = 200; - return res.json({success: false, message: 'Error adding clipboard data'}); + return res.status(500).json({ success: false, message: 'Error adding clipboard data' }); } + res.status(200).json({ success: true, message: 'ok', clipboardId: clipboardId }); }); }); - }); rest.post('/content/clipboard/paste', function(req, res, next) { @@ -1277,10 +1223,10 @@ ContentManager.prototype.setupRoutes = function () { var parentObject; var parentRelationship = { - 'contentObjects' : 'contentobject', // In case - 'articles' : 'contentobject', - 'blocks' : 'article', - 'components' : 'block' + 'contentObjects': 'contentobject', // In case + 'articles': 'contentobject', + 'blocks': 'article', + 'components': 'block' }; var typeToCollection = { @@ -1295,270 +1241,195 @@ ContentManager.prototype.setupRoutes = function () { database.getDatabase(function (error, db) { if (error) { - res.statusCode = 200; - return res.json({success: false, message: 'Unable to connect to database'}); + return res.status(500).json({ success: false, message: 'Unable to connect to database' }); } // Retrieve the clipboard db.retrieve('clipboard', {id: id, createdBy: user._id}, function(error, results) { if (error) { - res.statusCode = 200; - return res.json({success: false, message: 'Clipboard data not found'}); + return res.status(500).json({ success: false, message: 'Clipboard data not found' }); } - if (results.length == 1) { - clipboard = results[0]._doc; - - if (layout && clipboard.components.length == 1) { - // Persist the component layout when there is only one - clipboard.components[0]._layout = layout; - } - - // OK to proceed - async.series([ - function(callback) { - // Get the parent object - db.retrieve(parentRelationship[clipboard.referenceType], {_id: parentId}, function(error, results) { - if (error) { - callback(error); - } + if (results.length !== 1) { + return res.status(500).json({ success: false, message: 'More than one clipboard found' }); + } - if (results.length == 1) { - parentObject = results[0]._doc; - callback(); - } else { - if (clipboard.referenceType == 'contentObjects' - && (clipboard.contentObjects[0]._courseId.toString() === clipboard._courseId.toString())) { - // Handle if this is a root-level page - parentObject = { _id: clipboard._courseId }; - // map['contentObjects'] = {}; - // map['contentObjects'][clipboard.contentObjects[0]._parentId.toString()] = clipboard._courseId.toString(); - callback(); - } else { - return callback('More than one parent found'); - } - } - }); - }, - function(callback) { - // Set the sort order - if (clipboard[clipboard.referenceType].length == 1) { - if (sortOrder) { - clipboard[clipboard.referenceType][0]._sortOrder = sortOrder; - } - } + clipboard = results[0]._doc; + if (layout && clipboard.components.length == 1) { + // Persist the component layout when there is only one + clipboard.components[0]._layout = layout; + } + // OK to proceed + async.series([ + function(callback) { + // Get the parent object + db.retrieve(parentRelationship[clipboard.referenceType], { _id: parentId }, function(error, results) { + if (error) { + return callback(error); + } + if (results.length === 1) { + parentObject = results[0]._doc; + return callback(); + } + if (clipboard.referenceType === 'contentObjects' + && (clipboard.contentObjects[0]._courseId.toString() === clipboard._courseId.toString())) { + // Handle if this is a root-level page + parentObject = { _id: clipboard._courseId }; callback(); - }, - - function(callback) { - async.eachSeries(['contentObjects', 'articles', 'blocks', 'components'], function(level, cb) { - map[level] = {}; - - async.eachSeries(clipboard[level], function(item, cb2) { - map[level][item._id.toString()] = null; - cb2(); - }, function(err) { - if (err) { - logger.log('error', error); - } - }); - - cb(); - }, function(err) { - if (err) { - callback(err); - } - - callback(); - }); - }, - function(callback) { - // Pasting contentObjects - if (clipboard['contentObjects'].length !== 0) { - async.eachSeries(clipboard['contentObjects'], function(item, cb) { - var previousId = item._id.toString(); - var previousParentId = item._parentId.toString(); - var newParentId = typeof(map['contentObjects'][previousParentId]) !== 'undefined' && map['contentObjects'][previousParentId] != null - ? map['contentObjects'][previousParentId] - : parentObject._id; - - delete item._id; - item._parentId = newParentId; - - that.create('contentobject', item, function (error, newItem) { - if (error) { - cb(error); - } - - map['contentObjects'][previousId] = newItem._id; - // For each object being copied we should find out if there's any course assets - // associated with the object. Then create new ones based upon there new ids - copyCourseAssets(that, { - previousId: previousId, - newId: newItem._id, - previousParentId: previousParentId, - newParentId: newParentId - }, function(err) { - if (err) return cb(err); - cb(); - }); + } else { + return callback('More than one parent found'); + } + }); + }, + // Set the sort order + function(callback) { + if (clipboard[clipboard.referenceType].length === 1 && sortOrder) { + clipboard[clipboard.referenceType][0]._sortOrder = sortOrder; + } + callback(); + }, + function(callback) { + async.eachSeries(['contentObjects', 'articles', 'blocks', 'components'], function(level, cb) { + map[level] = {}; + async.eachSeries(clipboard[level], function(item, cb2) { + map[level][item._id.toString()] = null; + cb2(); + }, function(err) { if (err) logger.log('error', error); }); + cb(); + }, callback); + }, + // Pasting contentObjects + function(callback) { + if (clipboard['contentObjects'].length === 0) { + return callback(); + } + async.eachSeries(clipboard['contentObjects'], function(item, cb) { + var previousId = item._id.toString(); + var previousParentId = item._parentId.toString(); + var newParentId = typeof(map['contentObjects'][previousParentId]) !== 'undefined' && map['contentObjects'][previousParentId] != null + ? map['contentObjects'][previousParentId] + : parentObject._id; - }); - }, function(err) { - if (err) { - callback(err); - } + delete item._id; + item._parentId = newParentId; - callback(); - }); - } else { - callback(); + that.create('contentobject', item, function (error, newItem) { + if (error) { + return cb(error); } - }, - function(callback) { - // Pasting articles - if (clipboard['articles'].length !== 0) { - async.eachSeries(clipboard['articles'], function(item, cb) { - var previousId = item._id.toString(); - var previousParentId = item._parentId.toString(); - var newParentId = typeof(map['contentObjects'][previousParentId]) !== 'undefined' && map['contentObjects'][previousParentId] != null - ? map['contentObjects'][previousParentId] - : parentObject._id; - - delete item._id; - item._parentId = newParentId; - - that.create('article', item, function (error, newItem) { - if (error) { - cb(error); - } - - map['articles'][previousId] = newItem._id; - // For each object being copied we should find out if there's any course assets - // associated with the object. Then create new ones based upon there new ids - copyCourseAssets(that, { - previousId: previousId, - newId: newItem._id, - previousParentId: previousParentId, - newParentId: newParentId - }, function(err) { - if (err) return cb(err); - cb(); - }); + map['contentObjects'][previousId] = newItem._id; + // For each object being copied we should find out if there's any course assets + // associated with the object. Then create new ones based upon there new ids + copyCourseAssets(that, { + previousId: previousId, + newId: newItem._id, + previousParentId: previousParentId, + newParentId: newParentId + }, cb); + }); + }, callback); + }, + // Pasting articles + function(callback) { + if (clipboard['articles'].length === 0) { + return callback(); + } + async.eachSeries(clipboard['articles'], function(item, cb) { + var previousId = item._id.toString(); + var previousParentId = item._parentId.toString(); + var newParentId = typeof(map['contentObjects'][previousParentId]) !== 'undefined' && map['contentObjects'][previousParentId] != null + ? map['contentObjects'][previousParentId] + : parentObject._id; - }); - }, function(err) { - if (err) { - callback(err); - } + delete item._id; + item._parentId = newParentId; - callback(); - }); - } else { - callback(); + that.create('article', item, function(error, newItem) { + if (error) { + return cb(error); } - }, - function(callback) { - // Pasting blocks - if (clipboard['blocks'].length !== 0) { - async.eachSeries(clipboard['blocks'], function(item, cb) { - var previousId = item._id.toString(); - var previousParentId = item._parentId.toString(); - var newParentId = typeof(map['articles'][previousParentId]) !== 'undefined' - ? map['articles'][previousParentId] - : parentObject._id; - - delete item._id; - item._parentId = newParentId; - - that.create('block', item, function (error, newItem) { - if (error) { - cb(error); - } - - map['blocks'][previousId] = newItem._id; - // For each object being copied we should find out if there's any course assets - // associated with the object. Then create new ones based upon there new ids - copyCourseAssets(that, { - previousId: previousId, - newId: newItem._id, - previousParentId: previousParentId, - newParentId: newParentId - }, function(err) { - if (err) return cb(err); - cb(); - }); + map['articles'][previousId] = newItem._id; + // For each object being copied we should find out if there's any course assets + // associated with the object. Then create new ones based upon there new ids + copyCourseAssets(that, { + previousId: previousId, + newId: newItem._id, + previousParentId: previousParentId, + newParentId: newParentId + }, cb); + }); + }, callback); + }, + // Pasting blocks + function(callback) { + if (clipboard['blocks'].length === 0) { + return callback(); + } + async.eachSeries(clipboard['blocks'], function(item, cb) { + var previousId = item._id.toString(); + var previousParentId = item._parentId.toString(); + var newParentId = typeof(map['articles'][previousParentId]) !== 'undefined' + ? map['articles'][previousParentId] + : parentObject._id; - }); - }, function(err) { - if (err) { - callback(err); - } + delete item._id; + item._parentId = newParentId; - callback(); - }); - } else { - callback(); + that.create('block', item, function (error, newItem) { + if (error) { + return cb(error); } - }, - function(callback) { - // Pasting components - if (clipboard['components'].length !== 0) { - async.eachSeries(clipboard['components'], function(item, cb) { - var previousId = item._id.toString(); - var previousParentId = item._parentId.toString(); - var newParentId = typeof(map['blocks'][previousParentId]) !== 'undefined' - ? map['blocks'][previousParentId] - : parentObject._id; - - delete item._id; - item._parentId = newParentId; - - that.create('component', item, function (error, newItem) { - if (error) { - cb(error); - } - - map['components'][previousId] = newItem._id; - // For each object being copied we should find out if there's any course assets - // associated with the object. Then create new ones based upon there new ids - copyCourseAssets(that, { - previousId: previousId, - newId: newItem._id, - previousParentId: previousParentId, - newParentId: newParentId - }, function(err) { - if (err) return cb(err); - cb(); - }); + map['blocks'][previousId] = newItem._id; + // For each object being copied we should find out if there's any course assets + // associated with the object. Then create new ones based upon there new ids + copyCourseAssets(that, { + previousId: previousId, + newId: newItem._id, + previousParentId: previousParentId, + newParentId: newParentId + }, cb); + }); + }, callback); + }, + // Pasting components + function(callback) { + if (clipboard['components'].length === 0) { + return callback(); + } + async.eachSeries(clipboard['components'], function(item, cb) { + var previousId = item._id.toString(); + var previousParentId = item._parentId.toString(); + var newParentId = typeof(map['blocks'][previousParentId]) !== 'undefined' + ? map['blocks'][previousParentId] + : parentObject._id; - }); - }, function(err) { - if (err) { - callback(err); - } + delete item._id; + item._parentId = newParentId; - callback(); - }); - } else { - callback(); + that.create('component', item, function(error, newItem) { + if (error) { + return cb(error); } - } - ], function(err) { - if (!err) { - res.statusCode = 200; - return res.json({success: true, message: 'ok'}); - } else { - logger.log('error', err); - return res.json({success: false, message: 'Error pasting clipboard data'}); - } - }); - - } else { - res.statusCode = 200; - return res.json({success: false, message: 'More than one clipboard found'}); - } + map['components'][previousId] = newItem._id; + // For each object being copied we should find out if there's any course assets + // associated with the object. Then create new ones based upon there new ids + copyCourseAssets(that, { + previousId: previousId, + newId: newItem._id, + previousParentId: previousParentId, + newParentId: newParentId + }, cb); + }); + }, callback); + } + ], function(err) { + if (err) { + logger.log('error', err); + return res.status(500).json({ success: false, message: 'Error pasting clipboard data' }); + } + return res.status(200).json({ success: true, message: 'ok' }); + }); }, tenantId); }); }); @@ -1628,7 +1499,7 @@ ContentManager.prototype.onDatabaseCreated = function (db, next) { if (error) { return cb(error); } - + self.getContentPlugin(type, function (error, contentPlugin) { if (error) { return cb(error); From 44cfd9d481b1691d3c8450565a6bfde7d40fe63d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:42:44 +0100 Subject: [PATCH 064/296] Fix editorDataLoader preloading --- frontend/src/core/editor/editor.js | 4 +- .../core/editor/global/editorDataLoader.js | 190 ++++++++++-------- 2 files changed, 112 insertions(+), 82 deletions(-) diff --git a/frontend/src/core/editor/editor.js b/frontend/src/core/editor/editor.js index 158b22e720..4b56525852 100644 --- a/frontend/src/core/editor/editor.js +++ b/frontend/src/core/editor/editor.js @@ -15,7 +15,7 @@ define(function(require) { './selectTheme/index' ]); // loads editor data - Origin.on('app:dataReady login:changed', EditorData.preload); - Origin.on('router:editor editor:refreshData', EditorData.load); + Origin.on('app:dataReady login:changed', EditorData.loadGlobalData); + Origin.on('router:editor editor:refreshData', EditorData.loadCourseData); Origin.on('editor:resetData', EditorData.reset); }); diff --git a/frontend/src/core/editor/global/editorDataLoader.js b/frontend/src/core/editor/global/editorDataLoader.js index 90a22695cf..efb277fc14 100644 --- a/frontend/src/core/editor/global/editorDataLoader.js +++ b/frontend/src/core/editor/global/editorDataLoader.js @@ -15,86 +15,88 @@ define(function(require) { var EditorCollection = require('../global/collections/editorCollection'); var ExtensionModel = require('core/app/models/extensionModel'); - var isPreloaded = false; - var isLoaded = false; // used to check what's preloaded var globalData = { courses: false, - extensionTypes: false, - componentTypes: false + extensiontypes: false, + componenttypes: false }; // used to check what's loaded var courseData = { - clipboard: false, + clipboards: false, course: false, config: false, contentObjects: false, articles: false, blocks: false, components: false, - courseAssets: false + courseassets: false }; + // Public API var preloader = { /** - * Loads Origin.editor.data + * Loads course-specific data */ - preload: function() { - console.log('EditorData.preload'); - // no point continuing if not logged in + loadGlobalData: function() { if(!Origin.sessionModel.get('isAuthenticated')) { + // no point continuing if not logged in return; } - // make sure the Origin objects exist - if(!Origin.editor) Origin.editor = {}; - if(!Origin.editor.data) Origin.editor.data = {}; - + ensureEditorData(); + resetLoadStatus(globalData); + // create the global collections if(!Origin.editor.data.courses) { - Origin.editor.data.courses = createCollection(CourseModel, '/api/content/course', 'courses'); + Origin.editor.data.courses = createCollection(CourseModel); } - if(!Origin.editor.data.extensionTypes) { - Origin.editor.data.extensionTypes = createCollection(ExtensionModel, '/api/extensiontype', 'extensionTypes'); + if(!Origin.editor.data.extensiontypes) { + Origin.editor.data.extensiontypes = createCollection(ExtensionModel); } - if(!Origin.editor.data.componentTypes) { - Origin.editor.data.componentTypes = createCollection(ComponentTypeModel, '/api/componenttype', 'componentTypes', { - comparator: function(model) { return model.get('displayName'); } - }); + if(!Origin.editor.data.componenttypes) { + Origin.editor.data.componenttypes = createCollection(ComponentTypeModel); } // start preload - loadEditorData(_.clone(globalData), function() { - isPreloaded = true; - console.log('preloaded'); + fetchEditorData(globalData, function() { Origin.trigger('editor:dataPreloaded'); }); }, /** * Loads course-specific data */ - load: function(callback) { - // if(!Origin.location.route1) - console.log('EditorData.load', Origin.location.route1); - // FIXME this is bad, put here as need to reference callback - var onDataLoad = function() { - isLoaded = true; - Origin.trigger('editor:dataLoaded'); - if(typeof callback === 'function') callback.call(this); - }; - if(!isLoaded || Origin.editor.data.course.get('_id') !== Origin.location.route1) { - isLoaded = false; - console.log('set up'); - setUpEditorData(Origin.location.route1, onDataLoad); - } else { - console.log('refresh'); - isLoaded = false; - loadEditorData(_.clone(courseData), onDataLoad); + loadCourseData: function() { + if(!preloader.hasLoadedGlobalData()) { + return Origin.on('editor:dataPreloaded', preloader.loadCourseData); + } + if(!Origin.sessionModel.get('isAuthenticated')) { + // no point continuing if not logged in + return; + } + resetLoadStatus(courseData); + var ed = Origin.editor.data; + var courseId = Origin.location.route1; + var isAlreadyLoaded = preloader.hasLoadedCourseData() || (ed.course && ed.course.get('_id') === courseId); + // if data's already been initialised, we can just fetch the latest + if(!isAlreadyLoaded) { + _.extend(Origin.editor.data, { + course: new CourseModel({ _id: courseId }), + config: new ConfigModel({ _courseId: courseId }), + contentObjects: createCollection(ContentObjectModel), + articles: createCollection(ArticleModel), + blocks: createCollection(BlockModel), + components: createCollection(ComponentModel), + clipboards: createCollection(ClipboardModel, '&createdBy=' + Origin.sessionModel.get('id')), + courseassets: createCollection(CourseAssetModel) + }); } + // fetch all collections + fetchEditorData(courseData, function() { + Origin.trigger('editor:dataLoaded'); + }); }, /** * Deletes course-specific data, and does a fetch on everything else */ reset: function() { - console.log('EditorData.reset'); - isPreloaded = false; Origin.editor.data = _.omit(Origin.editor.data, Object.keys(courseData)); preloader.preload(); }, @@ -102,29 +104,67 @@ define(function(require) { * Makes sure all data has been loaded and calls callback */ waitForLoad: function(callback) { - if(!isPreloaded) { + // console.trace('waitForLoad:', preloader.hasLoadedGlobalData(), preloader.hasLoadedCourseData(), preloader.hasLoadedData()); + if(!preloader.hasLoadedGlobalData()) { + // console.log('- listening to preloader'); Origin.once('editor:dataPreloaded', function(){ - if(isLoadComplete()) return callback.apply(this); + if(preloader.hasLoadedData()) return callback.apply(this); }); } - if(!isLoaded) { + if(!preloader.hasLoadedCourseData()) { + // console.log('- listening to loader'); Origin.once('editor:dataLoaded', function(){ - if(isLoadComplete()) return callback.apply(this); + if(preloader.hasLoadedData()) return callback.apply(this); }); } - } + }, + /** + * Uses the below checks to test loading status + */ + hasLoadedData: function() { + return preloader.hasLoadedGlobalData() && preloader.hasLoadedCourseData(); + }, + /** + * Trivial check for editor global data (see globalData above) + */ + hasLoadedGlobalData: function() { + return isAllDataLoaded(globalData); + }, + /** + * Trivial check for editor course data (see courseData above) + */ + hasLoadedCourseData: function() { + return isAllDataLoaded(courseData); + }, }; /** * Functions */ + function isAllDataLoaded(data) { + if(!data) return false; + return _.every(data, function(value, key) { return value; }); + } + + function resetLoadStatus(data) { + _.every(data, function(value, key) { data[key] = false; }); + } + + /** + * Makes sure the Origin editor objects exist + */ + function ensureEditorData() { + if(!Origin.editor) Origin.editor = {}; + if(!Origin.editor.data) Origin.editor.data = {}; + } + /** * Fetches a group of editor collections (Origin.editor.data) * @param object whose keys are the key found on Origin.editor.data * and is used for progress checking */ - function loadEditorData(data, callback) { + function fetchEditorData(data, callback) { for(var i = 0, count = Object.keys(data).length; i < count; i++) { var key = Object.keys(data)[i]; Origin.editor.data[key].fetch({ @@ -137,40 +177,30 @@ define(function(require) { } } - function setUpEditorData(id, callback) { - // add the following to editor data - _.extend(Origin.editor.data, { - course: new CourseModel({ _id:id }), - config: new ConfigModel({ _courseId:id }), - contentObjects: createCollection(ContentObjectModel, '/api/content/contentobject?_courseId='+id, 'contentObjects'), - articles: createCollection(ArticleModel, '/api/content/article?_courseId='+id, 'articles'), - blocks: createCollection(BlockModel, '/api/content/block?_courseId='+id, 'blocks'), - components: createCollection(ComponentModel, '/api/content/component?_courseId='+id, 'components'), - clipboard: createCollection(ClipboardModel, '/api/content/clipboard?_courseId=' + id + '&createdBy=' + Origin.sessionModel.get('id'), 'clipboard'), - courseAssets: createCollection(CourseAssetModel, '/api/content/courseasset?_courseId='+id, 'courseAssets') - }); - // load all collections - loadEditorData(_.clone(courseData), function() { - callback.apply(this); - }); - } - - function createCollection(Model, url, type, data) { - return new EditorCollection(null, _.extend({ + /** + * Returns a new EditorCollection from the passed model + * Deduces URL from the Model's prototype data + */ + function createCollection(Model, query) { + var courseId = Origin.location.route1; + var url = Model.prototype.urlRoot; + var siblings = Model.prototype._siblings; + /** + * FIXME for non course-specific data without a model._type. + * Adding siblings will break the below check... + */ + var inferredType = url.split('/').slice(-1) + 's'; + // FIXME not the best check for course-specific collections + if(siblings !== undefined) { + if(!courseId) throw new Error('No Editor.data.course specified, cannot load ' + url); + url += '?_courseId=' + courseId + (query || ''); + } + return new EditorCollection(null, { autoFetch: false, model: Model, url: url, - _type: type - }, data || {})); - } - - function isAllDataLoaded(data) { - if(!data) return false; - return _.every(data, function(item) { return item === true; }); - } - - function isLoadComplete() { - return isPreloaded && isLoaded; + _type: siblings || inferredType + }); } /** From f55f8ae3e3295e042220dbe70d91fb205fa5e6e7 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:44:37 +0100 Subject: [PATCH 065/296] Rename editor collections --- frontend/src/core/app/helpers.js | 6 +++--- frontend/src/core/editor/component/index.js | 2 +- frontend/src/core/editor/contentObject/index.js | 2 +- .../editor/contentObject/views/editorPageBlockView.js | 4 ++-- .../views/editorPageComponentListItemView.js | 2 +- .../views/editorPageComponentListSidebarView.js | 4 ++-- .../editor/extensions/views/editorExtensionsEditView.js | 2 +- frontend/src/core/editor/global/views/editorView.js | 2 +- frontend/src/core/scaffold/views/scaffoldAssetView.js | 8 ++++---- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/src/core/app/helpers.js b/frontend/src/core/app/helpers.js index a29e83d7e4..b6bfea3a6a 100644 --- a/frontend/src/core/app/helpers.js +++ b/frontend/src/core/app/helpers.js @@ -209,8 +209,8 @@ define(function(require){ var urlSplit = url.split('/') var fileName = urlSplit[urlSplit.length - 1]; // Get courseAsset model - var courseAsset = Origin.editor.data.courseAssets.findWhere({_fieldName: fileName}); - + var courseAsset = Origin.editor.data.courseassets.findWhere({_fieldName: fileName}); + if (courseAsset) { var courseAssetId = courseAsset.get('_assetId'); @@ -233,7 +233,7 @@ define(function(require){ var urlSplit = url.split('/') var fileName = urlSplit[urlSplit.length - 1]; // Get courseAsset model - var courseAsset = Origin.editor.data.courseAssets.findWhere({_fieldName: fileName}); + var courseAsset = Origin.editor.data.courseassets.findWhere({_fieldName: fileName}); if (courseAsset) { var courseAssetId = courseAsset.get('_assetId'); return '/api/asset/thumb/' + courseAssetId; diff --git a/frontend/src/core/editor/component/index.js b/frontend/src/core/editor/component/index.js index 7cd8272df4..d7e48438b0 100644 --- a/frontend/src/core/editor/component/index.js +++ b/frontend/src/core/editor/component/index.js @@ -28,7 +28,7 @@ define(function(require) { } function getComponentDisplayName(model) { - var componentType = _.find(Origin.editor.data.componentTypes.models, function(m) { + var componentType = _.find(Origin.editor.data.componenttypes.models, function(m) { return m.get('_id') === model.get('_componentType'); }); return (componentType) ? componentType.get('displayName').toLowerCase() : ''; diff --git a/frontend/src/core/editor/contentObject/index.js b/frontend/src/core/editor/contentObject/index.js index 9db6b83cb5..e3628c6c80 100644 --- a/frontend/src/core/editor/contentObject/index.js +++ b/frontend/src/core/editor/contentObject/index.js @@ -90,7 +90,7 @@ define(function(require) { title: window.polyglot.t('app.addcomponent'), body: window.polyglot.t('app.pleaseselectcomponent'), _parentId: route3, - componentTypes: Origin.editor.data.componentTypes.toJSON(), + componentTypes: Origin.editor.data.componenttypes.toJSON(), layoutOptions: layoutOptions }); Origin.sidebar.addView(new EditorPageComponentListSidebarView({ model: componentsModel }).$el); diff --git a/frontend/src/core/editor/contentObject/views/editorPageBlockView.js b/frontend/src/core/editor/contentObject/views/editorPageBlockView.js index ac4f3e6ea6..0b8a34d856 100644 --- a/frontend/src/core/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageBlockView.js @@ -27,7 +27,7 @@ define(function(require){ preRender: function() { this.listenToEvents(); - this.model.set('componentTypes', Origin.editor.data.componentTypes.toJSON()); + this.model.set('componentTypes', Origin.editor.data.componenttypes.toJSON()); this.evaluateComponents(this.render); }, @@ -240,7 +240,7 @@ define(function(require){ title: window.polyglot.t('app.addcomponent'), body: window.polyglot.t('app.pleaseselectcomponent'), _parentId: this.model.get('_id'), - componentTypes: Origin.editor.data.componentTypes.toJSON(), + componentTypes: Origin.editor.data.componenttypes.toJSON(), layoutOptions: layoutOptions }); diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js b/frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js index a95671e2e3..2a830e445d 100644 --- a/frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js @@ -65,7 +65,7 @@ define(function(require) { Origin.trigger('editorComponentListView:remove'); var componentName = this.model.get('name'); - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + var componentType = _.find(Origin.editor.data.componenttypes.models, function(type){ return type.get('name') == componentName; }); diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js index 9b58bf6e4e..5698bcb16b 100644 --- a/frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js +++ b/frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js @@ -21,7 +21,7 @@ define(function(require) { return; } - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + var componentType = _.find(Origin.editor.data.componenttypes.models, function(type){ return type.get('name') == this.model.get('component'); }, this); @@ -63,7 +63,7 @@ define(function(require) { return; } - var componentType = _.find(Origin.editor.data.componentTypes.models, function(type){ + var componentType = _.find(Origin.editor.data.componenttypes.models, function(type){ return type.get('name') == this.model.get('component'); }, this); diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js index 94b44c7a0c..91a11d6581 100644 --- a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js @@ -30,7 +30,7 @@ define(function(require) { }, setupExtensions: function() { - var availableExtensionsCollection = Origin.editor.data.extensionTypes; + var availableExtensionsCollection = Origin.editor.data.extensiontypes; var enabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); var disabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); var enabledExtensionNames = _.pluck(Origin.editor.data.config.get('_enabledExtensions'), 'name'); diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 8c5f944991..c1ca49ce5c 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -280,7 +280,7 @@ define(function(require){ }, addToClipboard: function(model) { - _.defer(_.bind(function() { _.invoke(Origin.editor.data.clipboard.models, 'destroy') }, this)); + _.defer(_.bind(function() { _.invoke(Origin.editor.data.clipboards.models, 'destroy') }, this)); var postData = { objectId: model.get('_id'), diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/core/scaffold/views/scaffoldAssetView.js index 1bfdf8b997..bd65fac332 100644 --- a/frontend/src/core/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/core/scaffold/views/scaffoldAssetView.js @@ -211,11 +211,11 @@ define(function(require) { } else { searchCriteria._contentTypeParentId = Origin.editor.data.course.get('_id'); } - var asset = Origin.editor.data.courseAssets.findWhere(searchCriteria); + var asset = Origin.editor.data.courseassets.findWhere(searchCriteria); if (!asset) { // HACK - Try relaxing the search criteria for historic data - asset = Origin.editor.data.courseAssets.findWhere({_contentType: contentType, _fieldName: fieldname}); + asset = Origin.editor.data.courseassets.findWhere({_contentType: contentType, _fieldName: fieldname}); } return asset ? asset : false; @@ -306,10 +306,10 @@ define(function(require) { }, success: function() { - // Sometimes we don't need to reset the courseAssets + // Sometimes we don't need to reset the courseassets if (shouldResetAssetCollection) { - Origin.editor.data.courseAssets.fetch({ + Origin.editor.data.courseassets.fetch({ reset:true, success: function() { that.render(); From ab1cb053793ab26516a88ba3fcad775636506c86 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:45:05 +0100 Subject: [PATCH 066/296] Remove defunct attributes --- frontend/src/core/app/models/componentModel.js | 1 - frontend/src/core/app/models/componentTypeModel.js | 2 -- frontend/src/core/app/models/configModel.js | 2 -- frontend/src/core/app/models/courseModel.js | 1 - frontend/src/core/app/models/extensionModel.js | 5 +---- 5 files changed, 1 insertion(+), 10 deletions(-) diff --git a/frontend/src/core/app/models/componentModel.js b/frontend/src/core/app/models/componentModel.js index 55a0bf93b6..c5bf0145d2 100644 --- a/frontend/src/core/app/models/componentModel.js +++ b/frontend/src/core/app/models/componentModel.js @@ -6,7 +6,6 @@ define(function(require) { urlRoot: '/api/content/component', _parent: 'blocks', _siblings: 'components', - _children: false, // These are the only attributes which should be permitted on a save // TODO look into this... whitelistAttributes: [ diff --git a/frontend/src/core/app/models/componentTypeModel.js b/frontend/src/core/app/models/componentTypeModel.js index 2da7b5cf55..d980131901 100644 --- a/frontend/src/core/app/models/componentTypeModel.js +++ b/frontend/src/core/app/models/componentTypeModel.js @@ -6,8 +6,6 @@ define(function(require) { idAttribute: '_id', urlRoot: '/api/componenttype', _parent: 'blocks', - _siblings:'componenttypes', - _children: null, initialize: function() { // TODO intentional override? diff --git a/frontend/src/core/app/models/configModel.js b/frontend/src/core/app/models/configModel.js index e7e3e4597b..c28c233f72 100644 --- a/frontend/src/core/app/models/configModel.js +++ b/frontend/src/core/app/models/configModel.js @@ -5,8 +5,6 @@ define(function(require) { var ConfigModel = ContentModel.extend({ _type: 'config', _parent: 'course', - _siblings: '', - _children: '', sync: function(method, model, options) { options = options || {}; diff --git a/frontend/src/core/app/models/courseModel.js b/frontend/src/core/app/models/courseModel.js index 5bcb9664d0..ce2ea83c71 100644 --- a/frontend/src/core/app/models/courseModel.js +++ b/frontend/src/core/app/models/courseModel.js @@ -7,7 +7,6 @@ define(function(require) { var CourseModel = ContentModel.extend({ urlRoot: '/api/content/course', _type: 'course', - _siblings: '', _children: 'contentObjects', initialize : function(options) { diff --git a/frontend/src/core/app/models/extensionModel.js b/frontend/src/core/app/models/extensionModel.js index 1762ddb54c..21b81cde05 100644 --- a/frontend/src/core/app/models/extensionModel.js +++ b/frontend/src/core/app/models/extensionModel.js @@ -6,10 +6,7 @@ define(function(require) { urlRoot: '/api/extensiontype', idAttribute: '_id', _type: 'extension', - _parent: null, - _siblings: null, - _children: null, - + initialize: function(){ } }); From e97a299a50ab926c71bd3068cb19faf0a6c21bf6 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:45:22 +0100 Subject: [PATCH 067/296] Move comparator to model --- frontend/src/core/app/models/componentTypeModel.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/core/app/models/componentTypeModel.js b/frontend/src/core/app/models/componentTypeModel.js index d980131901..9eb5cdc425 100644 --- a/frontend/src/core/app/models/componentTypeModel.js +++ b/frontend/src/core/app/models/componentTypeModel.js @@ -7,6 +7,10 @@ define(function(require) { urlRoot: '/api/componenttype', _parent: 'blocks', + comparator: function(model) { + return model.get('displayName'); + }, + initialize: function() { // TODO intentional override? } From fce7a7591f619678ada88df1f8655fc9efed88f3 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:45:51 +0100 Subject: [PATCH 068/296] Fix whitespace --- frontend/src/less/editor.less | 37 ++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/frontend/src/less/editor.less b/frontend/src/less/editor.less index a795d4613a..fc15db865f 100644 --- a/frontend/src/less/editor.less +++ b/frontend/src/less/editor.less @@ -1,29 +1,30 @@ @import 'variables'; -@import 'variables'; -.editor-item-settings, .editor-menu-item-settings { - a { - color:@primary-color; - transition: all 0.3s; - - &:hover { - color:darken(@primary-color,5%); - } + +.editor-item-settings, +.editor-menu-item-settings { + a { + color:@primary-color; + transition: all 0.3s; + + &:hover { + color:darken(@primary-color,5%); } + } } .syncing { - transform: scale(0.8, 0.8); - opacity:0.6; + transform: scale(0.8, 0.8); + opacity:0.6; } .synced { - transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; - transform: scale(1, 1); - opacity:1; + transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; + transform: scale(1, 1); + opacity:1; } .not-synced { - transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; - transform: scale(0.4, 0.4); - opacity:0; -} \ No newline at end of file + transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; + transform: scale(0.4, 0.4); + opacity:0; +} From fda7bce6fc9aaab765e5f1ae977d2840a9576ed4 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:46:01 +0100 Subject: [PATCH 069/296] Fix whitespace --- .../src/core/editor/global/less/editor.less | 35 ++++++++----------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/frontend/src/core/editor/global/less/editor.less b/frontend/src/core/editor/global/less/editor.less index aee0d3c521..52a58b9d3b 100644 --- a/frontend/src/core/editor/global/less/editor.less +++ b/frontend/src/core/editor/global/less/editor.less @@ -1,29 +1,29 @@ .editor-view { .editor-container { - position:relative; + position: relative; width: 100%; height: 100%; } .editor-panel { - float:right; - width:10%; + float: right; + width: 10%; } .editor { - float:left; - width:90%; - height:100%; + float: left; + width: 90%; + height: 100%; background-color: lightgrey; } .paste-zone { - margin:30px; + margin: 30px; height: 50px; &-inner { - padding:20px 30px; + padding: 20px 30px; } &-component-left { @@ -37,11 +37,11 @@ } &-component { - margin:0px; + margin: 0px; } &-component-full { - margin-bottom:20px; + margin-bottom: 20px; } } @@ -86,10 +86,6 @@ } } - .open-context-icon { - // color: #fff; - } - .drag-helper { color: #DEDEDE; border: 1px solid #C9C9C9; @@ -99,7 +95,6 @@ cursor: move; min-width: 100px; } - } .editor-item-settings { @@ -121,11 +116,11 @@ } &-inner { - padding:6px; + padding: 6px; } .editor-delete-page-element { - float:right; + float: right; } } @@ -139,8 +134,6 @@ i.asset-clear { cursor: pointer; } -.sweet-alert { - .key { - font-weight: bold; - } +.sweet-alert .key { + font-weight: bold; } From e6ebc1cecabacb70fc870ea7d3f409935c16ddb3 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:46:14 +0100 Subject: [PATCH 070/296] fix whitespace --- frontend/src/less/menuEditor.less | 120 +++++++++++++++--------------- 1 file changed, 61 insertions(+), 59 deletions(-) diff --git a/frontend/src/less/menuEditor.less b/frontend/src/less/menuEditor.less index 91808355cb..de48500ce6 100644 --- a/frontend/src/less/menuEditor.less +++ b/frontend/src/less/menuEditor.less @@ -1,76 +1,78 @@ @import 'variables'; .editor-menu-item { - background-color: #fff; - transition:box-shadow 0.3s; - box-shadow: 0px 0px 1px 1px #EEE; - &:hover { - box-shadow: 0px 0px 3px 3px #e0e0e0; - cursor: pointer; - .project-settings { - top:0%; - opacity:1; - } + + background-color: #fff; + transition: box-shadow 0.3s; + box-shadow: 0px 0px 1px 1px #EEE; + &:hover { + box-shadow: 0px 0px 3px 3px #e0e0e0; + cursor: pointer; + .project-settings { + top:0%; + opacity:1; } + } - &.expanded { - - .editor-menu-item-inner { - color:#fff; - background-color: @primary-color; - transition:background-color 0s; - border:1px solid @primary-color; - } - - &.content-type-menu .editor-menu-item-pin { - border-left: 10px solid @primary-color; - } + &.expanded { - .editor-menu-item-settings { - a { - color:#fff; - transition:all 0.3s; - &:hover { - color:darken(#fff, 10%); - } - } - } + .editor-menu-item-inner { + color:#fff; + background-color: @primary-color; + transition:background-color 0s; + border:1px solid @primary-color; } - &.selected { + &.content-type-menu .editor-menu-item-pin { + border-left: 10px solid @primary-color; + } - .editor-menu-item-inner { - color:#fff; - background-color: @primary-color; - border:1px solid @primary-color; - } - - &.content-type-menu .editor-menu-item-pin { - border-left: 10px solid @primary-color; + .editor-menu-item-settings { + a { + color:#fff; + transition:all 0.3s; + &:hover { + color:darken(#fff, 10%); } + } + } + } + + &.selected { - .editor-menu-item-settings { - a { - color:#fff; - transition:all 0.3s; - &:hover { - color:darken(#fff, 10%); - } - } + .editor-menu-item-inner { + color:#fff; + background-color: @primary-color; + border:1px solid @primary-color; + } + + &.content-type-menu .editor-menu-item-pin { + border-left: 10px solid @primary-color; + } + + .editor-menu-item-settings { + a { + color:#fff; + transition:all 0.3s; + &:hover { + color:darken(#fff, 10%); } + } } + } } .editor-menu-layer-actions { - .primary-hollow { - i{ - color: @primary-color; - } - &:hover, &:active, &:focus { - i { - color: @white; - } - } - + .primary-hollow { + i{ + color: @primary-color; } -} \ No newline at end of file + &:hover, + &:active, + &:focus { + i { + color: @white; + } + } + } +} From a21331333ae30e9cf5cff73f2e5aa7ea84f9bc79 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:46:21 +0100 Subject: [PATCH 071/296] Update comment --- frontend/src/core/editor/global/views/editorView.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index c1ca49ce5c..326863420c 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -1,9 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE /* - * I think this exists to add extra functionality to the menu/page structure pages - * TODO This needs a tidy: - * - Remove commented lines - * - Sort out error handling + * TODO I think this exists to add extra functionality to the menu/page structure pages */ define(function(require){ var Backbone = require('backbone'); From 2c3a6cfb891a0214985a0b9b617adbcd6a96800c Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 12:46:34 +0100 Subject: [PATCH 072/296] Fix contentPaneView animation bug --- frontend/src/core/app/views/contentPaneView.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/core/app/views/contentPaneView.js b/frontend/src/core/app/views/contentPaneView.js index 23534510e1..c2f8e29108 100644 --- a/frontend/src/core/app/views/contentPaneView.js +++ b/frontend/src/core/app/views/contentPaneView.js @@ -6,14 +6,12 @@ define(function(require) { className: 'contentPane', visibleCSS: { - left: 0, opacity: 1 }, hiddenCSS: { - left: '10%', opacity: 0 }, - animDuration: 300, + animDuration: 500, initialize: function() { this.listenToEvents(); From e6182acadea761df36fff63194493c4dc65a113d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:03:39 +0100 Subject: [PATCH 073/296] Move files into modules folder --- frontend/src/core/{app => }/app.js | 0 .../assets/adapt-learning-logo-outline.png | Bin frontend/src/core/{app => }/assets/ajax-loader.gif | Bin .../core/{app => }/assets/transparency-light.png | Bin .../core/{tags => }/collections/tagsCollection.js | 0 frontend/src/core/{app => }/config.js | 0 frontend/src/core/{app => }/contentPane.js | 0 frontend/src/core/{app => }/contextMenu.js | 0 frontend/src/core/{app => }/helpers.js | 0 frontend/src/core/{app => }/less/_reset.less | 0 frontend/src/core/{app => }/less/app.less | 0 frontend/src/core/{app => }/less/columns.less | 0 frontend/src/core/{app => }/less/contentPane.less | 0 frontend/src/core/{app => }/less/contextMenu.less | 0 frontend/src/core/{app => }/less/forms.less | 0 frontend/src/core/{app => }/less/helpers.less | 0 frontend/src/core/{app => }/less/permissions.less | 4 ++-- frontend/src/{ => core}/less/sharedStyles.less | 0 frontend/src/core/{app => }/less/tables.less | 2 +- frontend/src/{ => core}/less/variables.less | 0 frontend/src/core/{app => }/models/articleModel.js | 0 frontend/src/core/{app => }/models/blockModel.js | 0 .../src/core/{app => }/models/clipboardModel.js | 0 .../src/core/{app => }/models/componentModel.js | 0 .../src/core/{app => }/models/componentTypeModel.js | 0 frontend/src/core/{app => }/models/configModel.js | 0 frontend/src/core/{app => }/models/contentModel.js | 0 .../src/core/{app => }/models/contentObjectModel.js | 0 .../src/core/{app => }/models/courseAssetModel.js | 0 frontend/src/core/{app => }/models/courseModel.js | 0 .../src/core/{app => }/models/extensionModel.js | 0 .../src/core/{app => }/models/themeTypeModel.js | 0 frontend/src/core/{app => }/origin.js | 0 frontend/src/core/{app => }/permissions.js | 0 frontend/src/core/{app => }/permissions.md | 0 frontend/src/core/{app => }/router.js | 0 .../src/core/{app => }/templates/contentPane.hbs | 0 .../src/core/{app => }/templates/contextMenu.hbs | 0 .../core/{app => }/templates/contextMenuItem.hbs | 0 .../src/core/{app => }/templates/permissions.hbs | 0 .../src/core/{app => }/views/contentPaneView.js | 0 .../src/core/{app => }/views/contextMenuView.js | 0 frontend/src/core/{app => }/views/originView.js | 0 .../src/core/{app => }/views/permissionsView.js | 0 frontend/src/{core => }/libraries/ace/ace.js | 0 .../src/{core => }/libraries/ace/ext-beautify.js | 0 .../src/{core => }/libraries/ace/ext-chromevox.js | 0 .../libraries/ace/ext-elastic_tabstops_lite.js | 0 frontend/src/{core => }/libraries/ace/ext-emmet.js | 0 .../{core => }/libraries/ace/ext-error_marker.js | 0 .../{core => }/libraries/ace/ext-keybinding_menu.js | 0 .../{core => }/libraries/ace/ext-language_tools.js | 0 .../src/{core => }/libraries/ace/ext-linking.js | 0 .../src/{core => }/libraries/ace/ext-modelist.js | 0 frontend/src/{core => }/libraries/ace/ext-old_ie.js | 0 .../src/{core => }/libraries/ace/ext-searchbox.js | 0 .../{core => }/libraries/ace/ext-settings_menu.js | 0 .../src/{core => }/libraries/ace/ext-spellcheck.js | 0 frontend/src/{core => }/libraries/ace/ext-split.js | 0 .../libraries/ace/ext-static_highlight.js | 0 .../src/{core => }/libraries/ace/ext-statusbar.js | 0 .../src/{core => }/libraries/ace/ext-textarea.js | 0 .../src/{core => }/libraries/ace/ext-themelist.js | 0 .../src/{core => }/libraries/ace/ext-whitespace.js | 0 .../{core => }/libraries/ace/keybinding-emacs.js | 0 .../src/{core => }/libraries/ace/keybinding-vim.js | 0 frontend/src/{core => }/libraries/ace/mode-abap.js | 0 frontend/src/{core => }/libraries/ace/mode-abc.js | 0 .../{core => }/libraries/ace/mode-actionscript.js | 0 frontend/src/{core => }/libraries/ace/mode-ada.js | 0 .../{core => }/libraries/ace/mode-apache_conf.js | 0 .../{core => }/libraries/ace/mode-applescript.js | 0 .../src/{core => }/libraries/ace/mode-asciidoc.js | 0 .../{core => }/libraries/ace/mode-assembly_x86.js | 0 .../src/{core => }/libraries/ace/mode-autohotkey.js | 0 .../src/{core => }/libraries/ace/mode-batchfile.js | 0 .../src/{core => }/libraries/ace/mode-c9search.js | 0 frontend/src/{core => }/libraries/ace/mode-c_cpp.js | 0 frontend/src/{core => }/libraries/ace/mode-cirru.js | 0 .../src/{core => }/libraries/ace/mode-clojure.js | 0 frontend/src/{core => }/libraries/ace/mode-cobol.js | 0 .../src/{core => }/libraries/ace/mode-coffee.js | 0 .../src/{core => }/libraries/ace/mode-coldfusion.js | 0 .../src/{core => }/libraries/ace/mode-csharp.js | 0 frontend/src/{core => }/libraries/ace/mode-css.js | 0 frontend/src/{core => }/libraries/ace/mode-curly.js | 0 frontend/src/{core => }/libraries/ace/mode-d.js | 0 frontend/src/{core => }/libraries/ace/mode-dart.js | 0 frontend/src/{core => }/libraries/ace/mode-diff.js | 0 .../src/{core => }/libraries/ace/mode-django.js | 0 .../src/{core => }/libraries/ace/mode-dockerfile.js | 0 frontend/src/{core => }/libraries/ace/mode-dot.js | 0 .../src/{core => }/libraries/ace/mode-eiffel.js | 0 frontend/src/{core => }/libraries/ace/mode-ejs.js | 0 .../src/{core => }/libraries/ace/mode-elixir.js | 0 frontend/src/{core => }/libraries/ace/mode-elm.js | 0 .../src/{core => }/libraries/ace/mode-erlang.js | 0 frontend/src/{core => }/libraries/ace/mode-forth.js | 0 frontend/src/{core => }/libraries/ace/mode-ftl.js | 0 frontend/src/{core => }/libraries/ace/mode-gcode.js | 0 .../src/{core => }/libraries/ace/mode-gherkin.js | 0 .../src/{core => }/libraries/ace/mode-gitignore.js | 0 frontend/src/{core => }/libraries/ace/mode-glsl.js | 0 .../src/{core => }/libraries/ace/mode-golang.js | 0 .../src/{core => }/libraries/ace/mode-groovy.js | 0 frontend/src/{core => }/libraries/ace/mode-haml.js | 0 .../src/{core => }/libraries/ace/mode-handlebars.js | 0 .../src/{core => }/libraries/ace/mode-haskell.js | 0 frontend/src/{core => }/libraries/ace/mode-haxe.js | 0 frontend/src/{core => }/libraries/ace/mode-html.js | 0 .../{core => }/libraries/ace/mode-html_elixir.js | 0 .../src/{core => }/libraries/ace/mode-html_ruby.js | 0 frontend/src/{core => }/libraries/ace/mode-ini.js | 0 frontend/src/{core => }/libraries/ace/mode-io.js | 0 frontend/src/{core => }/libraries/ace/mode-jack.js | 0 frontend/src/{core => }/libraries/ace/mode-jade.js | 0 frontend/src/{core => }/libraries/ace/mode-java.js | 0 .../src/{core => }/libraries/ace/mode-javascript.js | 0 frontend/src/{core => }/libraries/ace/mode-json.js | 0 .../src/{core => }/libraries/ace/mode-jsoniq.js | 0 frontend/src/{core => }/libraries/ace/mode-jsp.js | 0 frontend/src/{core => }/libraries/ace/mode-jsx.js | 0 frontend/src/{core => }/libraries/ace/mode-julia.js | 0 frontend/src/{core => }/libraries/ace/mode-latex.js | 0 frontend/src/{core => }/libraries/ace/mode-lean.js | 0 frontend/src/{core => }/libraries/ace/mode-less.js | 0 .../src/{core => }/libraries/ace/mode-liquid.js | 0 frontend/src/{core => }/libraries/ace/mode-lisp.js | 0 .../{core => }/libraries/ace/mode-live_script.js | 0 .../src/{core => }/libraries/ace/mode-livescript.js | 0 .../src/{core => }/libraries/ace/mode-logiql.js | 0 frontend/src/{core => }/libraries/ace/mode-lsl.js | 0 frontend/src/{core => }/libraries/ace/mode-lua.js | 0 .../src/{core => }/libraries/ace/mode-luapage.js | 0 .../src/{core => }/libraries/ace/mode-lucene.js | 0 .../src/{core => }/libraries/ace/mode-makefile.js | 0 .../src/{core => }/libraries/ace/mode-markdown.js | 0 frontend/src/{core => }/libraries/ace/mode-mask.js | 0 .../src/{core => }/libraries/ace/mode-matlab.js | 0 frontend/src/{core => }/libraries/ace/mode-maze.js | 0 frontend/src/{core => }/libraries/ace/mode-mel.js | 0 .../{core => }/libraries/ace/mode-mips_assembler.js | 0 .../{core => }/libraries/ace/mode-mipsassembler.js | 0 .../src/{core => }/libraries/ace/mode-mushcode.js | 0 frontend/src/{core => }/libraries/ace/mode-mysql.js | 0 frontend/src/{core => }/libraries/ace/mode-nix.js | 0 .../src/{core => }/libraries/ace/mode-objectivec.js | 0 frontend/src/{core => }/libraries/ace/mode-ocaml.js | 0 .../src/{core => }/libraries/ace/mode-pascal.js | 0 frontend/src/{core => }/libraries/ace/mode-perl.js | 0 frontend/src/{core => }/libraries/ace/mode-pgsql.js | 0 frontend/src/{core => }/libraries/ace/mode-php.js | 0 .../src/{core => }/libraries/ace/mode-plain_text.js | 0 .../src/{core => }/libraries/ace/mode-powershell.js | 0 frontend/src/{core => }/libraries/ace/mode-praat.js | 0 .../src/{core => }/libraries/ace/mode-prolog.js | 0 .../src/{core => }/libraries/ace/mode-properties.js | 0 .../src/{core => }/libraries/ace/mode-protobuf.js | 0 .../src/{core => }/libraries/ace/mode-python.js | 0 frontend/src/{core => }/libraries/ace/mode-r.js | 0 frontend/src/{core => }/libraries/ace/mode-rdoc.js | 0 frontend/src/{core => }/libraries/ace/mode-rhtml.js | 0 frontend/src/{core => }/libraries/ace/mode-ruby.js | 0 frontend/src/{core => }/libraries/ace/mode-rust.js | 0 frontend/src/{core => }/libraries/ace/mode-sass.js | 0 frontend/src/{core => }/libraries/ace/mode-scad.js | 0 frontend/src/{core => }/libraries/ace/mode-scala.js | 0 .../src/{core => }/libraries/ace/mode-scheme.js | 0 frontend/src/{core => }/libraries/ace/mode-scss.js | 0 frontend/src/{core => }/libraries/ace/mode-sh.js | 0 frontend/src/{core => }/libraries/ace/mode-sjs.js | 0 .../src/{core => }/libraries/ace/mode-smarty.js | 0 .../src/{core => }/libraries/ace/mode-snippets.js | 0 .../{core => }/libraries/ace/mode-soy_template.js | 0 frontend/src/{core => }/libraries/ace/mode-space.js | 0 frontend/src/{core => }/libraries/ace/mode-sql.js | 0 .../src/{core => }/libraries/ace/mode-sqlserver.js | 0 .../src/{core => }/libraries/ace/mode-stylus.js | 0 frontend/src/{core => }/libraries/ace/mode-svg.js | 0 frontend/src/{core => }/libraries/ace/mode-swift.js | 0 frontend/src/{core => }/libraries/ace/mode-swig.js | 0 frontend/src/{core => }/libraries/ace/mode-tcl.js | 0 frontend/src/{core => }/libraries/ace/mode-tex.js | 0 frontend/src/{core => }/libraries/ace/mode-text.js | 0 .../src/{core => }/libraries/ace/mode-textile.js | 0 frontend/src/{core => }/libraries/ace/mode-toml.js | 0 frontend/src/{core => }/libraries/ace/mode-twig.js | 0 .../src/{core => }/libraries/ace/mode-typescript.js | 0 frontend/src/{core => }/libraries/ace/mode-vala.js | 0 .../src/{core => }/libraries/ace/mode-vbscript.js | 0 .../src/{core => }/libraries/ace/mode-velocity.js | 0 .../src/{core => }/libraries/ace/mode-verilog.js | 0 frontend/src/{core => }/libraries/ace/mode-vhdl.js | 0 frontend/src/{core => }/libraries/ace/mode-xml.js | 0 .../src/{core => }/libraries/ace/mode-xquery.js | 0 frontend/src/{core => }/libraries/ace/mode-yaml.js | 0 .../src/{core => }/libraries/ace/snippets/abap.js | 0 .../src/{core => }/libraries/ace/snippets/abc.js | 0 .../libraries/ace/snippets/actionscript.js | 0 .../src/{core => }/libraries/ace/snippets/ada.js | 0 .../libraries/ace/snippets/apache_conf.js | 0 .../libraries/ace/snippets/applescript.js | 0 .../{core => }/libraries/ace/snippets/asciidoc.js | 0 .../libraries/ace/snippets/assembly_x86.js | 0 .../{core => }/libraries/ace/snippets/autohotkey.js | 0 .../{core => }/libraries/ace/snippets/batchfile.js | 0 .../{core => }/libraries/ace/snippets/c9search.js | 0 .../src/{core => }/libraries/ace/snippets/c_cpp.js | 0 .../src/{core => }/libraries/ace/snippets/cirru.js | 0 .../{core => }/libraries/ace/snippets/clojure.js | 0 .../src/{core => }/libraries/ace/snippets/cobol.js | 0 .../src/{core => }/libraries/ace/snippets/coffee.js | 0 .../{core => }/libraries/ace/snippets/coldfusion.js | 0 .../src/{core => }/libraries/ace/snippets/csharp.js | 0 .../src/{core => }/libraries/ace/snippets/css.js | 0 .../src/{core => }/libraries/ace/snippets/curly.js | 0 frontend/src/{core => }/libraries/ace/snippets/d.js | 0 .../src/{core => }/libraries/ace/snippets/dart.js | 0 .../src/{core => }/libraries/ace/snippets/diff.js | 0 .../src/{core => }/libraries/ace/snippets/django.js | 0 .../{core => }/libraries/ace/snippets/dockerfile.js | 0 .../src/{core => }/libraries/ace/snippets/dot.js | 0 .../src/{core => }/libraries/ace/snippets/eiffel.js | 0 .../src/{core => }/libraries/ace/snippets/ejs.js | 0 .../src/{core => }/libraries/ace/snippets/elixir.js | 0 .../src/{core => }/libraries/ace/snippets/elm.js | 0 .../src/{core => }/libraries/ace/snippets/erlang.js | 0 .../src/{core => }/libraries/ace/snippets/forth.js | 0 .../src/{core => }/libraries/ace/snippets/ftl.js | 0 .../src/{core => }/libraries/ace/snippets/gcode.js | 0 .../{core => }/libraries/ace/snippets/gherkin.js | 0 .../{core => }/libraries/ace/snippets/gitignore.js | 0 .../src/{core => }/libraries/ace/snippets/glsl.js | 0 .../src/{core => }/libraries/ace/snippets/golang.js | 0 .../src/{core => }/libraries/ace/snippets/groovy.js | 0 .../src/{core => }/libraries/ace/snippets/haml.js | 0 .../{core => }/libraries/ace/snippets/handlebars.js | 0 .../{core => }/libraries/ace/snippets/haskell.js | 0 .../src/{core => }/libraries/ace/snippets/haxe.js | 0 .../src/{core => }/libraries/ace/snippets/html.js | 0 .../libraries/ace/snippets/html_elixir.js | 0 .../{core => }/libraries/ace/snippets/html_ruby.js | 0 .../src/{core => }/libraries/ace/snippets/ini.js | 0 .../src/{core => }/libraries/ace/snippets/io.js | 0 .../src/{core => }/libraries/ace/snippets/jack.js | 0 .../src/{core => }/libraries/ace/snippets/jade.js | 0 .../src/{core => }/libraries/ace/snippets/java.js | 0 .../{core => }/libraries/ace/snippets/javascript.js | 0 .../src/{core => }/libraries/ace/snippets/json.js | 0 .../src/{core => }/libraries/ace/snippets/jsoniq.js | 0 .../src/{core => }/libraries/ace/snippets/jsp.js | 0 .../src/{core => }/libraries/ace/snippets/jsx.js | 0 .../src/{core => }/libraries/ace/snippets/julia.js | 0 .../src/{core => }/libraries/ace/snippets/latex.js | 0 .../src/{core => }/libraries/ace/snippets/lean.js | 0 .../src/{core => }/libraries/ace/snippets/less.js | 0 .../src/{core => }/libraries/ace/snippets/liquid.js | 0 .../src/{core => }/libraries/ace/snippets/lisp.js | 0 .../libraries/ace/snippets/live_script.js | 0 .../{core => }/libraries/ace/snippets/livescript.js | 0 .../src/{core => }/libraries/ace/snippets/logiql.js | 0 .../src/{core => }/libraries/ace/snippets/lsl.js | 0 .../src/{core => }/libraries/ace/snippets/lua.js | 0 .../{core => }/libraries/ace/snippets/luapage.js | 0 .../src/{core => }/libraries/ace/snippets/lucene.js | 0 .../{core => }/libraries/ace/snippets/makefile.js | 0 .../{core => }/libraries/ace/snippets/markdown.js | 0 .../src/{core => }/libraries/ace/snippets/mask.js | 0 .../src/{core => }/libraries/ace/snippets/matlab.js | 0 .../src/{core => }/libraries/ace/snippets/maze.js | 0 .../src/{core => }/libraries/ace/snippets/mel.js | 0 .../libraries/ace/snippets/mips_assembler.js | 0 .../libraries/ace/snippets/mipsassembler.js | 0 .../{core => }/libraries/ace/snippets/mushcode.js | 0 .../src/{core => }/libraries/ace/snippets/mysql.js | 0 .../src/{core => }/libraries/ace/snippets/nix.js | 0 .../{core => }/libraries/ace/snippets/objectivec.js | 0 .../src/{core => }/libraries/ace/snippets/ocaml.js | 0 .../src/{core => }/libraries/ace/snippets/pascal.js | 0 .../src/{core => }/libraries/ace/snippets/perl.js | 0 .../src/{core => }/libraries/ace/snippets/pgsql.js | 0 .../src/{core => }/libraries/ace/snippets/php.js | 0 .../{core => }/libraries/ace/snippets/plain_text.js | 0 .../{core => }/libraries/ace/snippets/powershell.js | 0 .../src/{core => }/libraries/ace/snippets/praat.js | 0 .../src/{core => }/libraries/ace/snippets/prolog.js | 0 .../{core => }/libraries/ace/snippets/properties.js | 0 .../{core => }/libraries/ace/snippets/protobuf.js | 0 .../src/{core => }/libraries/ace/snippets/python.js | 0 frontend/src/{core => }/libraries/ace/snippets/r.js | 0 .../src/{core => }/libraries/ace/snippets/rdoc.js | 0 .../src/{core => }/libraries/ace/snippets/rhtml.js | 0 .../src/{core => }/libraries/ace/snippets/ruby.js | 0 .../src/{core => }/libraries/ace/snippets/rust.js | 0 .../src/{core => }/libraries/ace/snippets/sass.js | 0 .../src/{core => }/libraries/ace/snippets/scad.js | 0 .../src/{core => }/libraries/ace/snippets/scala.js | 0 .../src/{core => }/libraries/ace/snippets/scheme.js | 0 .../src/{core => }/libraries/ace/snippets/scss.js | 0 .../src/{core => }/libraries/ace/snippets/sh.js | 0 .../src/{core => }/libraries/ace/snippets/sjs.js | 0 .../src/{core => }/libraries/ace/snippets/smarty.js | 0 .../{core => }/libraries/ace/snippets/snippets.js | 0 .../libraries/ace/snippets/soy_template.js | 0 .../src/{core => }/libraries/ace/snippets/space.js | 0 .../src/{core => }/libraries/ace/snippets/sql.js | 0 .../{core => }/libraries/ace/snippets/sqlserver.js | 0 .../src/{core => }/libraries/ace/snippets/stylus.js | 0 .../src/{core => }/libraries/ace/snippets/svg.js | 0 .../src/{core => }/libraries/ace/snippets/swift.js | 0 .../src/{core => }/libraries/ace/snippets/swig.js | 0 .../src/{core => }/libraries/ace/snippets/tcl.js | 0 .../src/{core => }/libraries/ace/snippets/tex.js | 0 .../src/{core => }/libraries/ace/snippets/text.js | 0 .../{core => }/libraries/ace/snippets/textile.js | 0 .../src/{core => }/libraries/ace/snippets/toml.js | 0 .../src/{core => }/libraries/ace/snippets/twig.js | 0 .../{core => }/libraries/ace/snippets/typescript.js | 0 .../src/{core => }/libraries/ace/snippets/vala.js | 0 .../{core => }/libraries/ace/snippets/vbscript.js | 0 .../{core => }/libraries/ace/snippets/velocity.js | 0 .../{core => }/libraries/ace/snippets/verilog.js | 0 .../src/{core => }/libraries/ace/snippets/vhdl.js | 0 .../src/{core => }/libraries/ace/snippets/xml.js | 0 .../src/{core => }/libraries/ace/snippets/xquery.js | 0 .../src/{core => }/libraries/ace/snippets/yaml.js | 0 .../src/{core => }/libraries/ace/theme-ambiance.js | 0 .../src/{core => }/libraries/ace/theme-chaos.js | 0 .../src/{core => }/libraries/ace/theme-chrome.js | 0 .../src/{core => }/libraries/ace/theme-clouds.js | 0 .../libraries/ace/theme-clouds_midnight.js | 0 .../src/{core => }/libraries/ace/theme-cobalt.js | 0 .../libraries/ace/theme-crimson_editor.js | 0 frontend/src/{core => }/libraries/ace/theme-dawn.js | 0 .../{core => }/libraries/ace/theme-dreamweaver.js | 0 .../src/{core => }/libraries/ace/theme-eclipse.js | 0 .../src/{core => }/libraries/ace/theme-github.js | 0 .../{core => }/libraries/ace/theme-idle_fingers.js | 0 .../src/{core => }/libraries/ace/theme-iplastic.js | 0 .../{core => }/libraries/ace/theme-katzenmilch.js | 0 .../src/{core => }/libraries/ace/theme-kr_theme.js | 0 .../src/{core => }/libraries/ace/theme-kuroir.js | 0 .../src/{core => }/libraries/ace/theme-merbivore.js | 0 .../libraries/ace/theme-merbivore_soft.js | 0 .../libraries/ace/theme-mono_industrial.js | 0 .../src/{core => }/libraries/ace/theme-monokai.js | 0 .../libraries/ace/theme-pastel_on_dark.js | 0 .../libraries/ace/theme-solarized_dark.js | 0 .../libraries/ace/theme-solarized_light.js | 0 .../src/{core => }/libraries/ace/theme-sqlserver.js | 0 .../src/{core => }/libraries/ace/theme-terminal.js | 0 .../src/{core => }/libraries/ace/theme-textmate.js | 0 .../src/{core => }/libraries/ace/theme-tomorrow.js | 0 .../libraries/ace/theme-tomorrow_night.js | 0 .../libraries/ace/theme-tomorrow_night_blue.js | 0 .../libraries/ace/theme-tomorrow_night_bright.js | 0 .../libraries/ace/theme-tomorrow_night_eighties.js | 0 .../src/{core => }/libraries/ace/theme-twilight.js | 0 .../{core => }/libraries/ace/theme-vibrant_ink.js | 0 .../src/{core => }/libraries/ace/theme-xcode.js | 0 .../src/{core => }/libraries/ace/worker-coffee.js | 0 frontend/src/{core => }/libraries/ace/worker-css.js | 0 .../src/{core => }/libraries/ace/worker-html.js | 0 .../{core => }/libraries/ace/worker-javascript.js | 0 .../src/{core => }/libraries/ace/worker-json.js | 0 frontend/src/{core => }/libraries/ace/worker-lua.js | 0 frontend/src/{core => }/libraries/ace/worker-php.js | 0 frontend/src/{core => }/libraries/ace/worker-xml.js | 0 .../src/{core => }/libraries/ace/worker-xquery.js | 0 .../{core => }/libraries/backbone-forms-lists.js | 0 frontend/src/{core => }/libraries/backbone-forms.js | 0 frontend/src/{core => }/libraries/backbone.js | 0 .../{core => }/libraries/backbone.localStorage.js | 0 .../libraries/colorPicker/assets/blank.gif | Bin .../colorPicker/assets/colorpicker_background.png | Bin .../colorPicker/assets/colorpicker_hex.png | Bin .../colorPicker/assets/colorpicker_hsb_b.png | Bin .../colorPicker/assets/colorpicker_hsb_h.png | Bin .../colorPicker/assets/colorpicker_hsb_s.png | Bin .../colorPicker/assets/colorpicker_indic.gif | Bin .../colorPicker/assets/colorpicker_overlay.png | Bin .../colorPicker/assets/colorpicker_rgb_b.png | Bin .../colorPicker/assets/colorpicker_rgb_g.png | Bin .../colorPicker/assets/colorpicker_rgb_r.png | Bin .../colorPicker/assets/colorpicker_select.gif | Bin .../colorPicker/assets/colorpicker_submit.png | Bin .../colorPicker/assets/custom_background.png | Bin .../libraries/colorPicker/assets/custom_hex.png | Bin .../libraries/colorPicker/assets/custom_hsb_b.png | Bin .../libraries/colorPicker/assets/custom_hsb_h.png | Bin .../libraries/colorPicker/assets/custom_hsb_s.png | Bin .../libraries/colorPicker/assets/custom_indic.gif | Bin .../libraries/colorPicker/assets/custom_rgb_b.png | Bin .../libraries/colorPicker/assets/custom_rgb_g.png | Bin .../libraries/colorPicker/assets/custom_rgb_r.png | Bin .../libraries/colorPicker/assets/custom_submit.png | Bin .../libraries/colorPicker/assets/select.png | Bin .../libraries/colorPicker/assets/select2.png | Bin .../libraries/colorPicker/assets/slider.png | Bin .../libraries/colorPicker/css/colorpicker.less | 0 .../libraries/colorPicker/js/colorpicker.js | 0 .../libraries/font-awesome-4.5.0/HELP-US-OUT.txt | 0 .../font-awesome-4.5.0/css/font-awesome.css | 0 .../font-awesome-4.5.0/css/font-awesome.min.css | 0 .../font-awesome-4.5.0/fonts/FontAwesome.otf | Bin .../fonts/fontawesome-webfont.eot | Bin .../fonts/fontawesome-webfont.svg | 0 .../fonts/fontawesome-webfont.ttf | Bin .../fonts/fontawesome-webfont.woff | Bin .../fonts/fontawesome-webfont.woff2 | Bin frontend/src/{core => }/libraries/handlebars.js | 0 frontend/src/{core => }/libraries/imageReady.js | 0 frontend/src/{core => }/libraries/inview.js | 0 frontend/src/{core => }/libraries/jquery-ui.min.js | 0 frontend/src/{core => }/libraries/jquery.form.js | 0 frontend/src/{core => }/libraries/jquery.js | 0 .../{core => }/libraries/jquery.jsoneditor.min.js | 0 .../src/{core => }/libraries/jquery.scrollTo.min.js | 0 .../{core => }/libraries/jquery.tagsinput.min.js | 0 frontend/src/{core => }/libraries/json2.js | 0 .../{core => }/libraries/mediaelement-and-player.js | 0 frontend/src/{core => }/libraries/modernizr.js | 0 frontend/src/{core => }/libraries/moment.min.js | 0 .../{core => }/libraries/pikaday/css/pikaday.less | 0 .../src/{core => }/libraries/pikaday/js/pikaday.js | 0 frontend/src/{core => }/libraries/polyglot.min.js | 0 frontend/src/{core => }/libraries/require.js | 0 frontend/src/{core => }/libraries/scrollTo.js | 0 frontend/src/{core => }/libraries/sweetalert.min.js | 0 frontend/src/{core => }/libraries/typeahead.js | 0 frontend/src/{core => }/libraries/underscore.js | 0 frontend/src/{core => }/libraries/velocity.js | 0 .../actions/actions.js => modules/actions/index.js} | 0 .../src/{core => modules}/actions/less/actions.less | 0 .../{core => modules}/actions/templates/actions.hbs | 0 .../{core => modules}/actions/views/actionsView.js | 0 .../assetManagement/assets/background.png | Bin .../assetManagement/assets/bigplay.png | Bin .../assetManagement/assets/bigplay.svg | 0 .../assetManagement/assets/controls-ted.png | Bin .../assetManagement/assets/controls-wmp-bg.png | Bin .../assetManagement/assets/controls-wmp.png | Bin .../assetManagement/assets/controls.png | Bin .../assetManagement/assets/controls.svg | 0 .../assetManagement/assets/flashmediaelement.swf | Bin .../assetManagement/assets/loading.gif | Bin .../assets/silverlightmediaelement.xap | Bin .../assetManagement/collections/assetCollection.js | 0 .../assetManagement/index.js} | 0 .../assetManagement/less/asset.less | 2 +- .../less/assetManagementModalTags.less | 0 .../assetManagement/less/assetManagementNew.less | 4 ++-- .../{core => modules}/assetManagement/less/mej.less | 0 .../assetManagement/models/assetModel.js | 0 .../assetManagement/templates/assetManagement.hbs | 0 .../templates/assetManagementCollection.hbs | 0 .../templates/assetManagementListItem.hbs | 0 .../templates/assetManagementModalAutofill.hbs | 0 .../templates/assetManagementModalFilters.hbs | 0 .../templates/assetManagementModalNewAsset.hbs | 0 .../templates/assetManagementModalTags.hbs | 0 .../templates/assetManagementNewAsset.hbs | 0 .../templates/assetManagementNewAssetSidebar.hbs | 0 .../templates/assetManagementPreview.hbs | 0 .../templates/assetManagementSidebar.hbs | 0 .../assetManagement/templates/assetPicker.hbs | 0 .../views/assetManagementCollectionView.js | 0 .../views/assetManagementItemView.js | 0 .../views/assetManagementModalAutofillView.js | 0 .../views/assetManagementModalFiltersView.js | 0 .../views/assetManagementModalNewAssetView.js | 0 .../views/assetManagementModalTagsView.js | 0 .../views/assetManagementModalView.js | 0 .../views/assetManagementNewAssetSidebarView.js | 0 .../views/assetManagementNewAssetView.js | 0 .../views/assetManagementPreviewView.js | 0 .../views/assetManagementSidebarView.js | 0 .../assetManagement/views/assetManagementView.js | 0 .../dashboard.js => modules/dashboard/index.js} | 0 .../{core => modules}/dashboard/less/dashboard.less | 0 .../dashboard/templates/dashboard.hbs | 0 .../dashboard/templates/dashboardSidebar.hbs | 0 .../{core => modules}/dashboard/templates/home.hbs | 0 .../dashboard/views/dashboardSidebarView.js | 0 .../dashboard/views/dashboardView.js | 0 .../src/{core => modules}/editor/article/index.js | 0 .../editor/article/templates/editorArticleEdit.hbs | 0 .../article/templates/editorArticleEditSidebar.hbs | 0 .../article/views/editorArticleEditSidebarView.js | 0 .../editor/article/views/editorArticleEditView.js | 0 .../src/{core => modules}/editor/block/index.js | 0 .../editor/block/templates/editorBlockEdit.hbs | 0 .../block/templates/editorBlockEditSidebar.hbs | 0 .../block/views/editorBlockEditSidebarView.js | 0 .../editor/block/views/editorBlockEditView.js | 0 .../src/{core => modules}/editor/component/index.js | 0 .../component/templates/editorComponentEdit.hbs | 0 .../templates/editorComponentEditSidebar.hbs | 0 .../views/editorComponentEditSidebarView.js | 0 .../component/views/editorComponentEditView.js | 0 .../config/collections/editorConfigCollection.js | 0 .../src/{core => modules}/editor/config/index.js | 0 .../editor/config/templates/editorConfigEdit.hbs | 0 .../config/templates/editorConfigEditSidebar.hbs | 0 .../config/views/editorConfigEditSidebarView.js | 0 .../editor/config/views/editorConfigEditView.js | 0 .../{core => modules}/editor/contentObject/index.js | 0 .../less/editing-overlay-component-list.less | 0 .../contentObject/less/editing-overlay-panel.less | 0 .../editor/contentObject/less/editorMenu.less | 0 .../editor/contentObject/less/editorMenuItem.less | 0 .../editor/contentObject/less/editorMenuLayer.less | 0 .../editor/contentObject/less/editorPage.less | 0 .../contentObject/less/editorPageArticle.less | 0 .../editor/contentObject/less/editorPageBlock.less | 0 .../contentObject/less/editorPageComponent.less | 0 .../contentObject/less/editorPageComponentList.less | 0 .../editor/contentObject/templates/editorMenu.hbs | 0 .../contentObject/templates/editorMenuItem.hbs | 0 .../contentObject/templates/editorMenuLayer.hbs | 0 .../contentObject/templates/editorMenuSidebar.hbs | 0 .../editor/contentObject/templates/editorPage.hbs | 0 .../contentObject/templates/editorPageArticle.hbs | 0 .../contentObject/templates/editorPageBlock.hbs | 0 .../contentObject/templates/editorPageComponent.hbs | 0 .../templates/editorPageComponentList.hbs | 0 .../templates/editorPageComponentListItem.hbs | 0 .../templates/editorPageComponentListSidebar.hbs | 0 .../templates/editorPageComponentPasteZone.hbs | 0 .../contentObject/templates/editorPageEdit.hbs | 0 .../templates/editorPageEditSidebar.hbs | 0 .../contentObject/templates/editorPageSidebar.hbs | 0 .../contentObject/views/editorMenuItemView.js | 0 .../contentObject/views/editorMenuLayerView.js | 0 .../contentObject/views/editorMenuSidebarView.js | 0 .../editor/contentObject/views/editorMenuView.js | 0 .../contentObject/views/editorPageArticleView.js | 0 .../contentObject/views/editorPageBlockView.js | 0 .../views/editorPageComponentListItemView.js | 0 .../views/editorPageComponentListSidebarView.js | 0 .../views/editorPageComponentListView.js | 0 .../views/editorPageComponentPasteZoneView.js | 0 .../contentObject/views/editorPageComponentView.js | 0 .../views/editorPageEditSidebarView.js | 0 .../contentObject/views/editorPageEditView.js | 0 .../contentObject/views/editorPageSidebarView.js | 0 .../editor/contentObject/views/editorPageView.js | 0 .../src/{core => modules}/editor/course/index.js | 0 .../editor/course/templates/editorCourseEdit.hbs | 0 .../course/templates/editorCourseEditSidebar.hbs | 0 .../course/views/editorCourseEditSidebarView.js | 0 .../editor/course/views/editorCourseEditView.js | 0 .../{core => modules}/editor/extensions/index.js | 0 .../editor/extensions/less/extensions.less | 0 .../extensions/templates/editorExtensionsEdit.hbs | 0 .../templates/editorExtensionsEditSidebar.hbs | 0 .../views/editorExtensionsEditSidebarView.js | 0 .../extensions/views/editorExtensionsEditView.js | 0 .../editor/global/collections/editorCollection.js | 0 .../editor/global/editorDataLoader.js | 0 .../src/{core => modules}/editor/global/helpers.js | 0 .../editor/global/less/editor.less | 0 .../editor/global/templates/editor.hbs | 0 .../editor/global/templates/editorPasteZone.hbs | 0 .../global/templates/partials/part_editorCommon.hbs | 0 .../templates/partials/part_editorItemSidebar.hbs | 0 .../global/templates/partials/part_editorMenu.hbs | 0 .../templates/partials/part_settingsGeneral.hbs | 0 .../editor/global/views/editorOriginView.js | 0 .../editor/global/views/editorPasteZoneView.js | 0 .../editor/global/views/editorView.js | 0 .../editor/editor.js => modules/editor/index.js} | 0 .../collections/editorMenuSettingsCollection.js | 0 .../{core => modules}/editor/menuSettings/index.js | 0 .../editor/menuSettings/less/menusettings.less | 0 .../templates/editorMenuSettingsEdit.hbs | 0 .../templates/editorMenuSettingsEditSidebar.hbs | 0 .../templates/editorMenuSettingsItem.hbs | 0 .../views/editorMenuSettingsEditSidebarView.js | 0 .../views/editorMenuSettingsEditView.js | 0 .../menuSettings/views/editorMenuSettingsView.js | 0 .../collections/editorThemeCollection.js | 0 .../{core => modules}/editor/selectTheme/index.js | 0 .../editor/selectTheme/less/editorTheme.less | 0 .../selectTheme/templates/editorThemeCollection.hbs | 0 .../templates/editorThemeCollectionSidebar.hbs | 0 .../selectTheme/templates/editorThemeEdit.hbs | 0 .../templates/editorThemeEditSidebar.hbs | 0 .../selectTheme/templates/editorThemeItem.hbs | 0 .../views/editorThemeCollectionSidebarView.js | 0 .../selectTheme/views/editorThemeCollectionView.js | 0 .../selectTheme/views/editorThemeEditSidebarView.js | 0 .../editor/selectTheme/views/editorThemeEditView.js | 0 .../editor/selectTheme/views/editorThemeItemView.js | 0 .../editor/selectTheme/views/editorThemeView.js | 0 .../filters/filters.js => modules/filters/index.js} | 0 .../{core => modules}/filters/less/typeAhead.less | 0 .../filters/templates/typeAhead.hbs | 0 .../filters/views/typeAheadView.js | 0 .../globalMenu.js => modules/globalMenu/index.js} | 0 .../globalMenu/less/globalMenu.less | 0 .../globalMenu/templates/globalMenu.hbs | 0 .../globalMenu/templates/globalMenuItem.hbs | 0 .../globalMenu/views/globalMenuItemView.js | 0 .../globalMenu/views/globalMenuView.js | 0 .../{core/help/help.js => modules/help/index.js} | 0 .../location.js => modules/location/index.js} | 0 .../{core => modules}/location/less/location.less | 0 .../location/templates/locationTitle.hbs | 0 .../location/views/locationTitleView.js | 0 .../{core/modal/modal.js => modules/modal/index.js} | 0 .../src/{core => modules}/modal/less/modal.less | 2 +- .../{core => modules}/modal/models/modalModel.js | 0 .../src/{core => modules}/modal/templates/modal.hbs | 0 .../src/{core => modules}/modal/views/modalView.js | 0 frontend/src/modules/modules.js | 1 + .../navigation/less/navigation.less | 0 .../navigation/templates/navigation.hbs | 0 .../navigation/views/navigationView.js | 0 .../notify/notify.js => modules/notify/index.js} | 0 .../notify/plugins/alert/assets/sweetalert.css | 0 .../{core => modules}/notify/plugins/alert/index.js | 0 .../notify/plugins/alert/less/alert.less | 0 .../notify/plugins/console/index.js | 0 .../options/options.js => modules/options/index.js} | 0 .../src/{core => modules}/options/less/options.less | 0 .../{core => modules}/options/templates/options.hbs | 0 .../options/templates/optionsGroup.hbs | 0 .../options/templates/optionsItem.hbs | 0 .../{core => modules}/options/views/optionsView.js | 0 .../collections/componentTypeCollection.js | 0 .../collections/extensionTypeCollection.js | 0 .../collections/menuTypeCollection.js | 0 .../collections/themeTypeCollection.js | 0 .../pluginManagement/index.js} | 0 .../pluginManagement/less/pluginManagement.less | 2 +- .../pluginManagement/less/pluginType.less | 0 .../pluginManagement/models/componentTypeModel.js | 0 .../pluginManagement/models/extensionTypeModel.js | 0 .../pluginManagement/models/menuTypeModel.js | 0 .../pluginManagement/models/themeTypeModel.js | 0 .../pluginManagement/templates/pluginManagement.hbs | 0 .../templates/pluginManagementSidebar.hbs | 0 .../templates/pluginManagementUpload.hbs | 0 .../templates/pluginManagementUploadSidebar.hbs | 0 .../pluginManagement/templates/pluginType.hbs | 0 .../views/pluginManagementSidebarView.js | 0 .../views/pluginManagementUploadSidebarView.js | 0 .../views/pluginManagementUploadView.js | 0 .../pluginManagement/views/pluginManagementView.js | 0 .../pluginManagement/views/pluginTypeView.js | 0 .../project/collections/myProjectCollection.js | 0 .../project/collections/projectCollection.js | 0 .../project/collections/sharedProjectCollection.js | 0 .../src/{core => modules}/project/less/project.less | 2 +- .../{core => modules}/project/templates/project.hbs | 0 .../project/templates/sharedProject.hbs | 0 .../{core => modules}/project/views/projectView.js | 0 .../project/views/sharedProjectView.js | 0 .../scaffold.js => modules/scaffold/index.js} | 0 .../{core => modules}/scaffold/less/codeEditor.less | 0 .../scaffold/less/colorPicker.less | 0 .../src/{core => modules}/scaffold/less/field.less | 0 .../src/{core => modules}/scaffold/less/forms.less | 0 .../src/{core => modules}/scaffold/less/modal.less | 0 .../scaffold/less/scaffoldAsset.less | 0 .../{core => modules}/scaffold/less/textArea.less | 0 .../scaffold/models/schemasModel.js | 0 .../{core => modules}/scaffold/scaffoldOverrides.js | 0 frontend/src/{core => modules}/scaffold/schemas.js | 0 .../{core => modules}/scaffold/templates/field.hbs | 0 .../scaffold/templates/fieldset.hbs | 0 .../scaffold/templates/scaffoldAsset.hbs | 0 .../scaffold/templates/scaffoldCodeEditor.hbs | 0 .../scaffold/templates/scaffoldColorPicker.hbs | 0 .../scaffold/templates/scaffoldDisplayTitle.hbs | 0 .../scaffold/templates/scaffoldEditHtml.hbs | 0 .../scaffold/templates/scaffoldItemsModal.hbs | 0 .../scaffold/templates/scaffoldModalOverlay.hbs | 0 .../scaffold/templates/scaffoldQuestionButton.hbs | 0 .../scaffold/templates/scaffoldTextArea.hbs | 0 .../scaffold/views/scaffoldAssetView.js | 0 .../scaffold/views/scaffoldBooleanView.js | 0 .../scaffold/views/scaffoldCodeEditorView.js | 0 .../scaffold/views/scaffoldColorPickerView.js | 0 .../scaffold/views/scaffoldDisplayTitleView.js | 0 .../scaffold/views/scaffoldItemsModalView.js | 0 .../scaffold/views/scaffoldQuestionButtonView.js | 0 .../scaffold/views/scaffoldTagsView.js | 0 .../scaffold/views/scaffoldTextAreaView.js | 0 .../sidebar/sidebar.js => modules/sidebar/index.js} | 0 .../src/{core => modules}/sidebar/less/sidebar.less | 2 +- .../sidebar/less/sidebarFilter.less | 0 .../{core => modules}/sidebar/templates/sidebar.hbs | 0 .../sidebar/templates/sidebarBreadcrumb.hbs | 0 .../sidebar/templates/sidebarDivide.hbs | 0 .../sidebar/templates/sidebarFieldsetFilter.hbs | 0 .../sidebar/templates/sidebarFilter.hbs | 0 .../sidebar/templates/sidebarRowFilter.hbs | 0 .../sidebar/templates/sidebarUpdateButton.hbs | 0 .../sidebar/views/sidebarFieldsetFilterView.js | 0 .../sidebar/views/sidebarFilterView.js | 0 .../sidebar/views/sidebarItemView.js | 0 .../{core => modules}/sidebar/views/sidebarView.js | 0 .../user/assets/adapt-learning-logo.png | Bin .../{core => modules}/user/assets/adapt-logo.png | Bin .../src/{core => modules}/user/assets/login_bg.jpg | Bin .../{core/user/user.js => modules/user/index.js} | 0 .../{core => modules}/user/less/forgotPassword.less | 0 frontend/src/{core => modules}/user/less/login.less | 2 +- .../src/{core => modules}/user/less/logout.less | 0 .../{core => modules}/user/less/resetPassword.less | 0 .../{core => modules}/user/less/userProfile.less | 2 +- .../{core => modules}/user/models/sessionModel.js | 0 .../user/models/userPasswordResetModel.js | 0 .../user/models/userProfileModel.js | 0 .../user/templates/forgotPassword.hbs | 0 .../src/{core => modules}/user/templates/login.hbs | 0 .../user/templates/resetPassword.hbs | 0 .../user/templates/userProfile.hbs | 0 .../user/templates/userProfileSidebar.hbs | 0 .../user/views/forgotPasswordView.js | 0 .../src/{core => modules}/user/views/loginView.js | 0 .../user/views/resetPasswordView.js | 0 .../user/views/userProfileSidebarView.js | 0 .../{core => modules}/user/views/userProfileView.js | 0 726 files changed, 13 insertions(+), 12 deletions(-) rename frontend/src/core/{app => }/app.js (100%) rename frontend/src/core/{app => }/assets/adapt-learning-logo-outline.png (100%) rename frontend/src/core/{app => }/assets/ajax-loader.gif (100%) rename frontend/src/core/{app => }/assets/transparency-light.png (100%) rename frontend/src/core/{tags => }/collections/tagsCollection.js (100%) rename frontend/src/core/{app => }/config.js (100%) rename frontend/src/core/{app => }/contentPane.js (100%) rename frontend/src/core/{app => }/contextMenu.js (100%) rename frontend/src/core/{app => }/helpers.js (100%) rename frontend/src/core/{app => }/less/_reset.less (100%) rename frontend/src/core/{app => }/less/app.less (100%) rename frontend/src/core/{app => }/less/columns.less (100%) rename frontend/src/core/{app => }/less/contentPane.less (100%) rename frontend/src/core/{app => }/less/contextMenu.less (100%) rename frontend/src/core/{app => }/less/forms.less (100%) rename frontend/src/core/{app => }/less/helpers.less (100%) rename frontend/src/core/{app => }/less/permissions.less (80%) rename frontend/src/{ => core}/less/sharedStyles.less (100%) rename frontend/src/core/{app => }/less/tables.less (91%) rename frontend/src/{ => core}/less/variables.less (100%) rename frontend/src/core/{app => }/models/articleModel.js (100%) rename frontend/src/core/{app => }/models/blockModel.js (100%) rename frontend/src/core/{app => }/models/clipboardModel.js (100%) rename frontend/src/core/{app => }/models/componentModel.js (100%) rename frontend/src/core/{app => }/models/componentTypeModel.js (100%) rename frontend/src/core/{app => }/models/configModel.js (100%) rename frontend/src/core/{app => }/models/contentModel.js (100%) rename frontend/src/core/{app => }/models/contentObjectModel.js (100%) rename frontend/src/core/{app => }/models/courseAssetModel.js (100%) rename frontend/src/core/{app => }/models/courseModel.js (100%) rename frontend/src/core/{app => }/models/extensionModel.js (100%) rename frontend/src/core/{app => }/models/themeTypeModel.js (100%) rename frontend/src/core/{app => }/origin.js (100%) rename frontend/src/core/{app => }/permissions.js (100%) rename frontend/src/core/{app => }/permissions.md (100%) rename frontend/src/core/{app => }/router.js (100%) rename frontend/src/core/{app => }/templates/contentPane.hbs (100%) rename frontend/src/core/{app => }/templates/contextMenu.hbs (100%) rename frontend/src/core/{app => }/templates/contextMenuItem.hbs (100%) rename frontend/src/core/{app => }/templates/permissions.hbs (100%) rename frontend/src/core/{app => }/views/contentPaneView.js (100%) rename frontend/src/core/{app => }/views/contextMenuView.js (100%) rename frontend/src/core/{app => }/views/originView.js (100%) rename frontend/src/core/{app => }/views/permissionsView.js (100%) rename frontend/src/{core => }/libraries/ace/ace.js (100%) rename frontend/src/{core => }/libraries/ace/ext-beautify.js (100%) rename frontend/src/{core => }/libraries/ace/ext-chromevox.js (100%) rename frontend/src/{core => }/libraries/ace/ext-elastic_tabstops_lite.js (100%) rename frontend/src/{core => }/libraries/ace/ext-emmet.js (100%) rename frontend/src/{core => }/libraries/ace/ext-error_marker.js (100%) rename frontend/src/{core => }/libraries/ace/ext-keybinding_menu.js (100%) rename frontend/src/{core => }/libraries/ace/ext-language_tools.js (100%) rename frontend/src/{core => }/libraries/ace/ext-linking.js (100%) rename frontend/src/{core => }/libraries/ace/ext-modelist.js (100%) rename frontend/src/{core => }/libraries/ace/ext-old_ie.js (100%) rename frontend/src/{core => }/libraries/ace/ext-searchbox.js (100%) rename frontend/src/{core => }/libraries/ace/ext-settings_menu.js (100%) rename frontend/src/{core => }/libraries/ace/ext-spellcheck.js (100%) rename frontend/src/{core => }/libraries/ace/ext-split.js (100%) rename frontend/src/{core => }/libraries/ace/ext-static_highlight.js (100%) rename frontend/src/{core => }/libraries/ace/ext-statusbar.js (100%) rename frontend/src/{core => }/libraries/ace/ext-textarea.js (100%) rename frontend/src/{core => }/libraries/ace/ext-themelist.js (100%) rename frontend/src/{core => }/libraries/ace/ext-whitespace.js (100%) rename frontend/src/{core => }/libraries/ace/keybinding-emacs.js (100%) rename frontend/src/{core => }/libraries/ace/keybinding-vim.js (100%) rename frontend/src/{core => }/libraries/ace/mode-abap.js (100%) rename frontend/src/{core => }/libraries/ace/mode-abc.js (100%) rename frontend/src/{core => }/libraries/ace/mode-actionscript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ada.js (100%) rename frontend/src/{core => }/libraries/ace/mode-apache_conf.js (100%) rename frontend/src/{core => }/libraries/ace/mode-applescript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-asciidoc.js (100%) rename frontend/src/{core => }/libraries/ace/mode-assembly_x86.js (100%) rename frontend/src/{core => }/libraries/ace/mode-autohotkey.js (100%) rename frontend/src/{core => }/libraries/ace/mode-batchfile.js (100%) rename frontend/src/{core => }/libraries/ace/mode-c9search.js (100%) rename frontend/src/{core => }/libraries/ace/mode-c_cpp.js (100%) rename frontend/src/{core => }/libraries/ace/mode-cirru.js (100%) rename frontend/src/{core => }/libraries/ace/mode-clojure.js (100%) rename frontend/src/{core => }/libraries/ace/mode-cobol.js (100%) rename frontend/src/{core => }/libraries/ace/mode-coffee.js (100%) rename frontend/src/{core => }/libraries/ace/mode-coldfusion.js (100%) rename frontend/src/{core => }/libraries/ace/mode-csharp.js (100%) rename frontend/src/{core => }/libraries/ace/mode-css.js (100%) rename frontend/src/{core => }/libraries/ace/mode-curly.js (100%) rename frontend/src/{core => }/libraries/ace/mode-d.js (100%) rename frontend/src/{core => }/libraries/ace/mode-dart.js (100%) rename frontend/src/{core => }/libraries/ace/mode-diff.js (100%) rename frontend/src/{core => }/libraries/ace/mode-django.js (100%) rename frontend/src/{core => }/libraries/ace/mode-dockerfile.js (100%) rename frontend/src/{core => }/libraries/ace/mode-dot.js (100%) rename frontend/src/{core => }/libraries/ace/mode-eiffel.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ejs.js (100%) rename frontend/src/{core => }/libraries/ace/mode-elixir.js (100%) rename frontend/src/{core => }/libraries/ace/mode-elm.js (100%) rename frontend/src/{core => }/libraries/ace/mode-erlang.js (100%) rename frontend/src/{core => }/libraries/ace/mode-forth.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ftl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-gcode.js (100%) rename frontend/src/{core => }/libraries/ace/mode-gherkin.js (100%) rename frontend/src/{core => }/libraries/ace/mode-gitignore.js (100%) rename frontend/src/{core => }/libraries/ace/mode-glsl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-golang.js (100%) rename frontend/src/{core => }/libraries/ace/mode-groovy.js (100%) rename frontend/src/{core => }/libraries/ace/mode-haml.js (100%) rename frontend/src/{core => }/libraries/ace/mode-handlebars.js (100%) rename frontend/src/{core => }/libraries/ace/mode-haskell.js (100%) rename frontend/src/{core => }/libraries/ace/mode-haxe.js (100%) rename frontend/src/{core => }/libraries/ace/mode-html.js (100%) rename frontend/src/{core => }/libraries/ace/mode-html_elixir.js (100%) rename frontend/src/{core => }/libraries/ace/mode-html_ruby.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ini.js (100%) rename frontend/src/{core => }/libraries/ace/mode-io.js (100%) rename frontend/src/{core => }/libraries/ace/mode-jack.js (100%) rename frontend/src/{core => }/libraries/ace/mode-jade.js (100%) rename frontend/src/{core => }/libraries/ace/mode-java.js (100%) rename frontend/src/{core => }/libraries/ace/mode-javascript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-json.js (100%) rename frontend/src/{core => }/libraries/ace/mode-jsoniq.js (100%) rename frontend/src/{core => }/libraries/ace/mode-jsp.js (100%) rename frontend/src/{core => }/libraries/ace/mode-jsx.js (100%) rename frontend/src/{core => }/libraries/ace/mode-julia.js (100%) rename frontend/src/{core => }/libraries/ace/mode-latex.js (100%) rename frontend/src/{core => }/libraries/ace/mode-lean.js (100%) rename frontend/src/{core => }/libraries/ace/mode-less.js (100%) rename frontend/src/{core => }/libraries/ace/mode-liquid.js (100%) rename frontend/src/{core => }/libraries/ace/mode-lisp.js (100%) rename frontend/src/{core => }/libraries/ace/mode-live_script.js (100%) rename frontend/src/{core => }/libraries/ace/mode-livescript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-logiql.js (100%) rename frontend/src/{core => }/libraries/ace/mode-lsl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-lua.js (100%) rename frontend/src/{core => }/libraries/ace/mode-luapage.js (100%) rename frontend/src/{core => }/libraries/ace/mode-lucene.js (100%) rename frontend/src/{core => }/libraries/ace/mode-makefile.js (100%) rename frontend/src/{core => }/libraries/ace/mode-markdown.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mask.js (100%) rename frontend/src/{core => }/libraries/ace/mode-matlab.js (100%) rename frontend/src/{core => }/libraries/ace/mode-maze.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mel.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mips_assembler.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mipsassembler.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mushcode.js (100%) rename frontend/src/{core => }/libraries/ace/mode-mysql.js (100%) rename frontend/src/{core => }/libraries/ace/mode-nix.js (100%) rename frontend/src/{core => }/libraries/ace/mode-objectivec.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ocaml.js (100%) rename frontend/src/{core => }/libraries/ace/mode-pascal.js (100%) rename frontend/src/{core => }/libraries/ace/mode-perl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-pgsql.js (100%) rename frontend/src/{core => }/libraries/ace/mode-php.js (100%) rename frontend/src/{core => }/libraries/ace/mode-plain_text.js (100%) rename frontend/src/{core => }/libraries/ace/mode-powershell.js (100%) rename frontend/src/{core => }/libraries/ace/mode-praat.js (100%) rename frontend/src/{core => }/libraries/ace/mode-prolog.js (100%) rename frontend/src/{core => }/libraries/ace/mode-properties.js (100%) rename frontend/src/{core => }/libraries/ace/mode-protobuf.js (100%) rename frontend/src/{core => }/libraries/ace/mode-python.js (100%) rename frontend/src/{core => }/libraries/ace/mode-r.js (100%) rename frontend/src/{core => }/libraries/ace/mode-rdoc.js (100%) rename frontend/src/{core => }/libraries/ace/mode-rhtml.js (100%) rename frontend/src/{core => }/libraries/ace/mode-ruby.js (100%) rename frontend/src/{core => }/libraries/ace/mode-rust.js (100%) rename frontend/src/{core => }/libraries/ace/mode-sass.js (100%) rename frontend/src/{core => }/libraries/ace/mode-scad.js (100%) rename frontend/src/{core => }/libraries/ace/mode-scala.js (100%) rename frontend/src/{core => }/libraries/ace/mode-scheme.js (100%) rename frontend/src/{core => }/libraries/ace/mode-scss.js (100%) rename frontend/src/{core => }/libraries/ace/mode-sh.js (100%) rename frontend/src/{core => }/libraries/ace/mode-sjs.js (100%) rename frontend/src/{core => }/libraries/ace/mode-smarty.js (100%) rename frontend/src/{core => }/libraries/ace/mode-snippets.js (100%) rename frontend/src/{core => }/libraries/ace/mode-soy_template.js (100%) rename frontend/src/{core => }/libraries/ace/mode-space.js (100%) rename frontend/src/{core => }/libraries/ace/mode-sql.js (100%) rename frontend/src/{core => }/libraries/ace/mode-sqlserver.js (100%) rename frontend/src/{core => }/libraries/ace/mode-stylus.js (100%) rename frontend/src/{core => }/libraries/ace/mode-svg.js (100%) rename frontend/src/{core => }/libraries/ace/mode-swift.js (100%) rename frontend/src/{core => }/libraries/ace/mode-swig.js (100%) rename frontend/src/{core => }/libraries/ace/mode-tcl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-tex.js (100%) rename frontend/src/{core => }/libraries/ace/mode-text.js (100%) rename frontend/src/{core => }/libraries/ace/mode-textile.js (100%) rename frontend/src/{core => }/libraries/ace/mode-toml.js (100%) rename frontend/src/{core => }/libraries/ace/mode-twig.js (100%) rename frontend/src/{core => }/libraries/ace/mode-typescript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-vala.js (100%) rename frontend/src/{core => }/libraries/ace/mode-vbscript.js (100%) rename frontend/src/{core => }/libraries/ace/mode-velocity.js (100%) rename frontend/src/{core => }/libraries/ace/mode-verilog.js (100%) rename frontend/src/{core => }/libraries/ace/mode-vhdl.js (100%) rename frontend/src/{core => }/libraries/ace/mode-xml.js (100%) rename frontend/src/{core => }/libraries/ace/mode-xquery.js (100%) rename frontend/src/{core => }/libraries/ace/mode-yaml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/abap.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/abc.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/actionscript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ada.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/apache_conf.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/applescript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/asciidoc.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/assembly_x86.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/autohotkey.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/batchfile.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/c9search.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/c_cpp.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/cirru.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/clojure.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/cobol.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/coffee.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/coldfusion.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/csharp.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/css.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/curly.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/d.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/dart.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/diff.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/django.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/dockerfile.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/dot.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/eiffel.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ejs.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/elixir.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/elm.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/erlang.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/forth.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ftl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/gcode.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/gherkin.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/gitignore.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/glsl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/golang.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/groovy.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/haml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/handlebars.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/haskell.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/haxe.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/html.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/html_elixir.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/html_ruby.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ini.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/io.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/jack.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/jade.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/java.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/javascript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/json.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/jsoniq.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/jsp.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/jsx.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/julia.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/latex.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/lean.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/less.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/liquid.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/lisp.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/live_script.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/livescript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/logiql.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/lsl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/lua.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/luapage.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/lucene.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/makefile.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/markdown.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mask.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/matlab.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/maze.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mel.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mips_assembler.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mipsassembler.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mushcode.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/mysql.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/nix.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/objectivec.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ocaml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/pascal.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/perl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/pgsql.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/php.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/plain_text.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/powershell.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/praat.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/prolog.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/properties.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/protobuf.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/python.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/r.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/rdoc.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/rhtml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/ruby.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/rust.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/sass.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/scad.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/scala.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/scheme.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/scss.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/sh.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/sjs.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/smarty.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/snippets.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/soy_template.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/space.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/sql.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/sqlserver.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/stylus.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/svg.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/swift.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/swig.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/tcl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/tex.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/text.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/textile.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/toml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/twig.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/typescript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/vala.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/vbscript.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/velocity.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/verilog.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/vhdl.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/xml.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/xquery.js (100%) rename frontend/src/{core => }/libraries/ace/snippets/yaml.js (100%) rename frontend/src/{core => }/libraries/ace/theme-ambiance.js (100%) rename frontend/src/{core => }/libraries/ace/theme-chaos.js (100%) rename frontend/src/{core => }/libraries/ace/theme-chrome.js (100%) rename frontend/src/{core => }/libraries/ace/theme-clouds.js (100%) rename frontend/src/{core => }/libraries/ace/theme-clouds_midnight.js (100%) rename frontend/src/{core => }/libraries/ace/theme-cobalt.js (100%) rename frontend/src/{core => }/libraries/ace/theme-crimson_editor.js (100%) rename frontend/src/{core => }/libraries/ace/theme-dawn.js (100%) rename frontend/src/{core => }/libraries/ace/theme-dreamweaver.js (100%) rename frontend/src/{core => }/libraries/ace/theme-eclipse.js (100%) rename frontend/src/{core => }/libraries/ace/theme-github.js (100%) rename frontend/src/{core => }/libraries/ace/theme-idle_fingers.js (100%) rename frontend/src/{core => }/libraries/ace/theme-iplastic.js (100%) rename frontend/src/{core => }/libraries/ace/theme-katzenmilch.js (100%) rename frontend/src/{core => }/libraries/ace/theme-kr_theme.js (100%) rename frontend/src/{core => }/libraries/ace/theme-kuroir.js (100%) rename frontend/src/{core => }/libraries/ace/theme-merbivore.js (100%) rename frontend/src/{core => }/libraries/ace/theme-merbivore_soft.js (100%) rename frontend/src/{core => }/libraries/ace/theme-mono_industrial.js (100%) rename frontend/src/{core => }/libraries/ace/theme-monokai.js (100%) rename frontend/src/{core => }/libraries/ace/theme-pastel_on_dark.js (100%) rename frontend/src/{core => }/libraries/ace/theme-solarized_dark.js (100%) rename frontend/src/{core => }/libraries/ace/theme-solarized_light.js (100%) rename frontend/src/{core => }/libraries/ace/theme-sqlserver.js (100%) rename frontend/src/{core => }/libraries/ace/theme-terminal.js (100%) rename frontend/src/{core => }/libraries/ace/theme-textmate.js (100%) rename frontend/src/{core => }/libraries/ace/theme-tomorrow.js (100%) rename frontend/src/{core => }/libraries/ace/theme-tomorrow_night.js (100%) rename frontend/src/{core => }/libraries/ace/theme-tomorrow_night_blue.js (100%) rename frontend/src/{core => }/libraries/ace/theme-tomorrow_night_bright.js (100%) rename frontend/src/{core => }/libraries/ace/theme-tomorrow_night_eighties.js (100%) rename frontend/src/{core => }/libraries/ace/theme-twilight.js (100%) rename frontend/src/{core => }/libraries/ace/theme-vibrant_ink.js (100%) rename frontend/src/{core => }/libraries/ace/theme-xcode.js (100%) rename frontend/src/{core => }/libraries/ace/worker-coffee.js (100%) rename frontend/src/{core => }/libraries/ace/worker-css.js (100%) rename frontend/src/{core => }/libraries/ace/worker-html.js (100%) rename frontend/src/{core => }/libraries/ace/worker-javascript.js (100%) rename frontend/src/{core => }/libraries/ace/worker-json.js (100%) rename frontend/src/{core => }/libraries/ace/worker-lua.js (100%) rename frontend/src/{core => }/libraries/ace/worker-php.js (100%) rename frontend/src/{core => }/libraries/ace/worker-xml.js (100%) rename frontend/src/{core => }/libraries/ace/worker-xquery.js (100%) rename frontend/src/{core => }/libraries/backbone-forms-lists.js (100%) rename frontend/src/{core => }/libraries/backbone-forms.js (100%) rename frontend/src/{core => }/libraries/backbone.js (100%) rename frontend/src/{core => }/libraries/backbone.localStorage.js (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/blank.gif (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_background.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_hex.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_hsb_b.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_hsb_h.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_hsb_s.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_indic.gif (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_overlay.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_rgb_b.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_rgb_g.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_rgb_r.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_select.gif (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/colorpicker_submit.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_background.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_hex.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_hsb_b.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_hsb_h.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_hsb_s.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_indic.gif (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_rgb_b.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_rgb_g.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_rgb_r.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/custom_submit.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/select.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/select2.png (100%) rename frontend/src/{core => }/libraries/colorPicker/assets/slider.png (100%) rename frontend/src/{core => }/libraries/colorPicker/css/colorpicker.less (100%) rename frontend/src/{core => }/libraries/colorPicker/js/colorpicker.js (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/HELP-US-OUT.txt (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/css/font-awesome.css (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/css/font-awesome.min.css (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/FontAwesome.otf (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff (100%) rename frontend/src/{core => }/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 (100%) rename frontend/src/{core => }/libraries/handlebars.js (100%) rename frontend/src/{core => }/libraries/imageReady.js (100%) rename frontend/src/{core => }/libraries/inview.js (100%) rename frontend/src/{core => }/libraries/jquery-ui.min.js (100%) rename frontend/src/{core => }/libraries/jquery.form.js (100%) rename frontend/src/{core => }/libraries/jquery.js (100%) rename frontend/src/{core => }/libraries/jquery.jsoneditor.min.js (100%) rename frontend/src/{core => }/libraries/jquery.scrollTo.min.js (100%) rename frontend/src/{core => }/libraries/jquery.tagsinput.min.js (100%) rename frontend/src/{core => }/libraries/json2.js (100%) rename frontend/src/{core => }/libraries/mediaelement-and-player.js (100%) rename frontend/src/{core => }/libraries/modernizr.js (100%) rename frontend/src/{core => }/libraries/moment.min.js (100%) rename frontend/src/{core => }/libraries/pikaday/css/pikaday.less (100%) rename frontend/src/{core => }/libraries/pikaday/js/pikaday.js (100%) rename frontend/src/{core => }/libraries/polyglot.min.js (100%) rename frontend/src/{core => }/libraries/require.js (100%) rename frontend/src/{core => }/libraries/scrollTo.js (100%) rename frontend/src/{core => }/libraries/sweetalert.min.js (100%) rename frontend/src/{core => }/libraries/typeahead.js (100%) rename frontend/src/{core => }/libraries/underscore.js (100%) rename frontend/src/{core => }/libraries/velocity.js (100%) rename frontend/src/{core/actions/actions.js => modules/actions/index.js} (100%) rename frontend/src/{core => modules}/actions/less/actions.less (100%) rename frontend/src/{core => modules}/actions/templates/actions.hbs (100%) rename frontend/src/{core => modules}/actions/views/actionsView.js (100%) rename frontend/src/{core => modules}/assetManagement/assets/background.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/bigplay.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/bigplay.svg (100%) rename frontend/src/{core => modules}/assetManagement/assets/controls-ted.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/controls-wmp-bg.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/controls-wmp.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/controls.png (100%) rename frontend/src/{core => modules}/assetManagement/assets/controls.svg (100%) rename frontend/src/{core => modules}/assetManagement/assets/flashmediaelement.swf (100%) rename frontend/src/{core => modules}/assetManagement/assets/loading.gif (100%) rename frontend/src/{core => modules}/assetManagement/assets/silverlightmediaelement.xap (100%) rename frontend/src/{core => modules}/assetManagement/collections/assetCollection.js (100%) rename frontend/src/{core/assetManagement/assetManagement.js => modules/assetManagement/index.js} (100%) rename frontend/src/{core => modules}/assetManagement/less/asset.less (99%) rename frontend/src/{core => modules}/assetManagement/less/assetManagementModalTags.less (100%) rename frontend/src/{core => modules}/assetManagement/less/assetManagementNew.less (86%) rename frontend/src/{core => modules}/assetManagement/less/mej.less (100%) rename frontend/src/{core => modules}/assetManagement/models/assetModel.js (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagement.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementCollection.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementListItem.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementModalAutofill.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementModalFilters.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementModalNewAsset.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementModalTags.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementNewAsset.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementNewAssetSidebar.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementPreview.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetManagementSidebar.hbs (100%) rename frontend/src/{core => modules}/assetManagement/templates/assetPicker.hbs (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementCollectionView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementItemView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementModalAutofillView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementModalFiltersView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementModalNewAssetView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementModalTagsView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementModalView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementNewAssetSidebarView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementNewAssetView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementPreviewView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementSidebarView.js (100%) rename frontend/src/{core => modules}/assetManagement/views/assetManagementView.js (100%) rename frontend/src/{core/dashboard/dashboard.js => modules/dashboard/index.js} (100%) rename frontend/src/{core => modules}/dashboard/less/dashboard.less (100%) rename frontend/src/{core => modules}/dashboard/templates/dashboard.hbs (100%) rename frontend/src/{core => modules}/dashboard/templates/dashboardSidebar.hbs (100%) rename frontend/src/{core => modules}/dashboard/templates/home.hbs (100%) rename frontend/src/{core => modules}/dashboard/views/dashboardSidebarView.js (100%) rename frontend/src/{core => modules}/dashboard/views/dashboardView.js (100%) rename frontend/src/{core => modules}/editor/article/index.js (100%) rename frontend/src/{core => modules}/editor/article/templates/editorArticleEdit.hbs (100%) rename frontend/src/{core => modules}/editor/article/templates/editorArticleEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/article/views/editorArticleEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/article/views/editorArticleEditView.js (100%) rename frontend/src/{core => modules}/editor/block/index.js (100%) rename frontend/src/{core => modules}/editor/block/templates/editorBlockEdit.hbs (100%) rename frontend/src/{core => modules}/editor/block/templates/editorBlockEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/block/views/editorBlockEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/block/views/editorBlockEditView.js (100%) rename frontend/src/{core => modules}/editor/component/index.js (100%) rename frontend/src/{core => modules}/editor/component/templates/editorComponentEdit.hbs (100%) rename frontend/src/{core => modules}/editor/component/templates/editorComponentEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/component/views/editorComponentEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/component/views/editorComponentEditView.js (100%) rename frontend/src/{core => modules}/editor/config/collections/editorConfigCollection.js (100%) rename frontend/src/{core => modules}/editor/config/index.js (100%) rename frontend/src/{core => modules}/editor/config/templates/editorConfigEdit.hbs (100%) rename frontend/src/{core => modules}/editor/config/templates/editorConfigEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/config/views/editorConfigEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/config/views/editorConfigEditView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/index.js (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editing-overlay-component-list.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editing-overlay-panel.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorMenu.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorMenuItem.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorMenuLayer.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorPage.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorPageArticle.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorPageBlock.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorPageComponent.less (100%) rename frontend/src/{core => modules}/editor/contentObject/less/editorPageComponentList.less (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorMenu.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorMenuItem.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorMenuLayer.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorMenuSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPage.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageArticle.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageBlock.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageComponent.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageComponentList.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageComponentListItem.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageComponentListSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageComponentPasteZone.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageEdit.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/templates/editorPageSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorMenuItemView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorMenuLayerView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorMenuSidebarView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorMenuView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageArticleView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageBlockView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageComponentListItemView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageComponentListSidebarView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageComponentListView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageComponentPasteZoneView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageComponentView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageEditView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageSidebarView.js (100%) rename frontend/src/{core => modules}/editor/contentObject/views/editorPageView.js (100%) rename frontend/src/{core => modules}/editor/course/index.js (100%) rename frontend/src/{core => modules}/editor/course/templates/editorCourseEdit.hbs (100%) rename frontend/src/{core => modules}/editor/course/templates/editorCourseEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/course/views/editorCourseEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/course/views/editorCourseEditView.js (100%) rename frontend/src/{core => modules}/editor/extensions/index.js (100%) rename frontend/src/{core => modules}/editor/extensions/less/extensions.less (100%) rename frontend/src/{core => modules}/editor/extensions/templates/editorExtensionsEdit.hbs (100%) rename frontend/src/{core => modules}/editor/extensions/templates/editorExtensionsEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/extensions/views/editorExtensionsEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/extensions/views/editorExtensionsEditView.js (100%) rename frontend/src/{core => modules}/editor/global/collections/editorCollection.js (100%) rename frontend/src/{core => modules}/editor/global/editorDataLoader.js (100%) rename frontend/src/{core => modules}/editor/global/helpers.js (100%) rename frontend/src/{core => modules}/editor/global/less/editor.less (100%) rename frontend/src/{core => modules}/editor/global/templates/editor.hbs (100%) rename frontend/src/{core => modules}/editor/global/templates/editorPasteZone.hbs (100%) rename frontend/src/{core => modules}/editor/global/templates/partials/part_editorCommon.hbs (100%) rename frontend/src/{core => modules}/editor/global/templates/partials/part_editorItemSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/global/templates/partials/part_editorMenu.hbs (100%) rename frontend/src/{core => modules}/editor/global/templates/partials/part_settingsGeneral.hbs (100%) rename frontend/src/{core => modules}/editor/global/views/editorOriginView.js (100%) rename frontend/src/{core => modules}/editor/global/views/editorPasteZoneView.js (100%) rename frontend/src/{core => modules}/editor/global/views/editorView.js (100%) rename frontend/src/{core/editor/editor.js => modules/editor/index.js} (100%) rename frontend/src/{core => modules}/editor/menuSettings/collections/editorMenuSettingsCollection.js (100%) rename frontend/src/{core => modules}/editor/menuSettings/index.js (100%) rename frontend/src/{core => modules}/editor/menuSettings/less/menusettings.less (100%) rename frontend/src/{core => modules}/editor/menuSettings/templates/editorMenuSettingsEdit.hbs (100%) rename frontend/src/{core => modules}/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/menuSettings/templates/editorMenuSettingsItem.hbs (100%) rename frontend/src/{core => modules}/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/menuSettings/views/editorMenuSettingsEditView.js (100%) rename frontend/src/{core => modules}/editor/menuSettings/views/editorMenuSettingsView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/collections/editorThemeCollection.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/index.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/less/editorTheme.less (100%) rename frontend/src/{core => modules}/editor/selectTheme/templates/editorThemeCollection.hbs (100%) rename frontend/src/{core => modules}/editor/selectTheme/templates/editorThemeCollectionSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/selectTheme/templates/editorThemeEdit.hbs (100%) rename frontend/src/{core => modules}/editor/selectTheme/templates/editorThemeEditSidebar.hbs (100%) rename frontend/src/{core => modules}/editor/selectTheme/templates/editorThemeItem.hbs (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeCollectionSidebarView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeCollectionView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeEditSidebarView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeEditView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeItemView.js (100%) rename frontend/src/{core => modules}/editor/selectTheme/views/editorThemeView.js (100%) rename frontend/src/{core/filters/filters.js => modules/filters/index.js} (100%) rename frontend/src/{core => modules}/filters/less/typeAhead.less (100%) rename frontend/src/{core => modules}/filters/templates/typeAhead.hbs (100%) rename frontend/src/{core => modules}/filters/views/typeAheadView.js (100%) rename frontend/src/{core/globalMenu/globalMenu.js => modules/globalMenu/index.js} (100%) rename frontend/src/{core => modules}/globalMenu/less/globalMenu.less (100%) rename frontend/src/{core => modules}/globalMenu/templates/globalMenu.hbs (100%) rename frontend/src/{core => modules}/globalMenu/templates/globalMenuItem.hbs (100%) rename frontend/src/{core => modules}/globalMenu/views/globalMenuItemView.js (100%) rename frontend/src/{core => modules}/globalMenu/views/globalMenuView.js (100%) rename frontend/src/{core/help/help.js => modules/help/index.js} (100%) rename frontend/src/{core/location/location.js => modules/location/index.js} (100%) rename frontend/src/{core => modules}/location/less/location.less (100%) rename frontend/src/{core => modules}/location/templates/locationTitle.hbs (100%) rename frontend/src/{core => modules}/location/views/locationTitleView.js (100%) rename frontend/src/{core/modal/modal.js => modules/modal/index.js} (100%) rename frontend/src/{core => modules}/modal/less/modal.less (98%) rename frontend/src/{core => modules}/modal/models/modalModel.js (100%) rename frontend/src/{core => modules}/modal/templates/modal.hbs (100%) rename frontend/src/{core => modules}/modal/views/modalView.js (100%) create mode 100644 frontend/src/modules/modules.js rename frontend/src/{core => modules}/navigation/less/navigation.less (100%) rename frontend/src/{core => modules}/navigation/templates/navigation.hbs (100%) rename frontend/src/{core => modules}/navigation/views/navigationView.js (100%) rename frontend/src/{core/notify/notify.js => modules/notify/index.js} (100%) rename frontend/src/{core => modules}/notify/plugins/alert/assets/sweetalert.css (100%) rename frontend/src/{core => modules}/notify/plugins/alert/index.js (100%) rename frontend/src/{core => modules}/notify/plugins/alert/less/alert.less (100%) rename frontend/src/{core => modules}/notify/plugins/console/index.js (100%) rename frontend/src/{core/options/options.js => modules/options/index.js} (100%) rename frontend/src/{core => modules}/options/less/options.less (100%) rename frontend/src/{core => modules}/options/templates/options.hbs (100%) rename frontend/src/{core => modules}/options/templates/optionsGroup.hbs (100%) rename frontend/src/{core => modules}/options/templates/optionsItem.hbs (100%) rename frontend/src/{core => modules}/options/views/optionsView.js (100%) rename frontend/src/{core => modules}/pluginManagement/collections/componentTypeCollection.js (100%) rename frontend/src/{core => modules}/pluginManagement/collections/extensionTypeCollection.js (100%) rename frontend/src/{core => modules}/pluginManagement/collections/menuTypeCollection.js (100%) rename frontend/src/{core => modules}/pluginManagement/collections/themeTypeCollection.js (100%) rename frontend/src/{core/pluginManagement/pluginManagement.js => modules/pluginManagement/index.js} (100%) rename frontend/src/{core => modules}/pluginManagement/less/pluginManagement.less (88%) rename frontend/src/{core => modules}/pluginManagement/less/pluginType.less (100%) rename frontend/src/{core => modules}/pluginManagement/models/componentTypeModel.js (100%) rename frontend/src/{core => modules}/pluginManagement/models/extensionTypeModel.js (100%) rename frontend/src/{core => modules}/pluginManagement/models/menuTypeModel.js (100%) rename frontend/src/{core => modules}/pluginManagement/models/themeTypeModel.js (100%) rename frontend/src/{core => modules}/pluginManagement/templates/pluginManagement.hbs (100%) rename frontend/src/{core => modules}/pluginManagement/templates/pluginManagementSidebar.hbs (100%) rename frontend/src/{core => modules}/pluginManagement/templates/pluginManagementUpload.hbs (100%) rename frontend/src/{core => modules}/pluginManagement/templates/pluginManagementUploadSidebar.hbs (100%) rename frontend/src/{core => modules}/pluginManagement/templates/pluginType.hbs (100%) rename frontend/src/{core => modules}/pluginManagement/views/pluginManagementSidebarView.js (100%) rename frontend/src/{core => modules}/pluginManagement/views/pluginManagementUploadSidebarView.js (100%) rename frontend/src/{core => modules}/pluginManagement/views/pluginManagementUploadView.js (100%) rename frontend/src/{core => modules}/pluginManagement/views/pluginManagementView.js (100%) rename frontend/src/{core => modules}/pluginManagement/views/pluginTypeView.js (100%) rename frontend/src/{core => modules}/project/collections/myProjectCollection.js (100%) rename frontend/src/{core => modules}/project/collections/projectCollection.js (100%) rename frontend/src/{core => modules}/project/collections/sharedProjectCollection.js (100%) rename frontend/src/{core => modules}/project/less/project.less (99%) rename frontend/src/{core => modules}/project/templates/project.hbs (100%) rename frontend/src/{core => modules}/project/templates/sharedProject.hbs (100%) rename frontend/src/{core => modules}/project/views/projectView.js (100%) rename frontend/src/{core => modules}/project/views/sharedProjectView.js (100%) rename frontend/src/{core/scaffold/scaffold.js => modules/scaffold/index.js} (100%) rename frontend/src/{core => modules}/scaffold/less/codeEditor.less (100%) rename frontend/src/{core => modules}/scaffold/less/colorPicker.less (100%) rename frontend/src/{core => modules}/scaffold/less/field.less (100%) rename frontend/src/{core => modules}/scaffold/less/forms.less (100%) rename frontend/src/{core => modules}/scaffold/less/modal.less (100%) rename frontend/src/{core => modules}/scaffold/less/scaffoldAsset.less (100%) rename frontend/src/{core => modules}/scaffold/less/textArea.less (100%) rename frontend/src/{core => modules}/scaffold/models/schemasModel.js (100%) rename frontend/src/{core => modules}/scaffold/scaffoldOverrides.js (100%) rename frontend/src/{core => modules}/scaffold/schemas.js (100%) rename frontend/src/{core => modules}/scaffold/templates/field.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/fieldset.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldAsset.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldCodeEditor.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldColorPicker.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldDisplayTitle.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldEditHtml.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldItemsModal.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldModalOverlay.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldQuestionButton.hbs (100%) rename frontend/src/{core => modules}/scaffold/templates/scaffoldTextArea.hbs (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldAssetView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldBooleanView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldCodeEditorView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldColorPickerView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldDisplayTitleView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldItemsModalView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldQuestionButtonView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldTagsView.js (100%) rename frontend/src/{core => modules}/scaffold/views/scaffoldTextAreaView.js (100%) rename frontend/src/{core/sidebar/sidebar.js => modules/sidebar/index.js} (100%) rename frontend/src/{core => modules}/sidebar/less/sidebar.less (98%) rename frontend/src/{core => modules}/sidebar/less/sidebarFilter.less (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebar.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarBreadcrumb.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarDivide.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarFieldsetFilter.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarFilter.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarRowFilter.hbs (100%) rename frontend/src/{core => modules}/sidebar/templates/sidebarUpdateButton.hbs (100%) rename frontend/src/{core => modules}/sidebar/views/sidebarFieldsetFilterView.js (100%) rename frontend/src/{core => modules}/sidebar/views/sidebarFilterView.js (100%) rename frontend/src/{core => modules}/sidebar/views/sidebarItemView.js (100%) rename frontend/src/{core => modules}/sidebar/views/sidebarView.js (100%) rename frontend/src/{core => modules}/user/assets/adapt-learning-logo.png (100%) rename frontend/src/{core => modules}/user/assets/adapt-logo.png (100%) rename frontend/src/{core => modules}/user/assets/login_bg.jpg (100%) rename frontend/src/{core/user/user.js => modules/user/index.js} (100%) rename frontend/src/{core => modules}/user/less/forgotPassword.less (100%) rename frontend/src/{core => modules}/user/less/login.less (98%) rename frontend/src/{core => modules}/user/less/logout.less (100%) rename frontend/src/{core => modules}/user/less/resetPassword.less (100%) rename frontend/src/{core => modules}/user/less/userProfile.less (96%) rename frontend/src/{core => modules}/user/models/sessionModel.js (100%) rename frontend/src/{core => modules}/user/models/userPasswordResetModel.js (100%) rename frontend/src/{core => modules}/user/models/userProfileModel.js (100%) rename frontend/src/{core => modules}/user/templates/forgotPassword.hbs (100%) rename frontend/src/{core => modules}/user/templates/login.hbs (100%) rename frontend/src/{core => modules}/user/templates/resetPassword.hbs (100%) rename frontend/src/{core => modules}/user/templates/userProfile.hbs (100%) rename frontend/src/{core => modules}/user/templates/userProfileSidebar.hbs (100%) rename frontend/src/{core => modules}/user/views/forgotPasswordView.js (100%) rename frontend/src/{core => modules}/user/views/loginView.js (100%) rename frontend/src/{core => modules}/user/views/resetPasswordView.js (100%) rename frontend/src/{core => modules}/user/views/userProfileSidebarView.js (100%) rename frontend/src/{core => modules}/user/views/userProfileView.js (100%) diff --git a/frontend/src/core/app/app.js b/frontend/src/core/app.js similarity index 100% rename from frontend/src/core/app/app.js rename to frontend/src/core/app.js diff --git a/frontend/src/core/app/assets/adapt-learning-logo-outline.png b/frontend/src/core/assets/adapt-learning-logo-outline.png similarity index 100% rename from frontend/src/core/app/assets/adapt-learning-logo-outline.png rename to frontend/src/core/assets/adapt-learning-logo-outline.png diff --git a/frontend/src/core/app/assets/ajax-loader.gif b/frontend/src/core/assets/ajax-loader.gif similarity index 100% rename from frontend/src/core/app/assets/ajax-loader.gif rename to frontend/src/core/assets/ajax-loader.gif diff --git a/frontend/src/core/app/assets/transparency-light.png b/frontend/src/core/assets/transparency-light.png similarity index 100% rename from frontend/src/core/app/assets/transparency-light.png rename to frontend/src/core/assets/transparency-light.png diff --git a/frontend/src/core/tags/collections/tagsCollection.js b/frontend/src/core/collections/tagsCollection.js similarity index 100% rename from frontend/src/core/tags/collections/tagsCollection.js rename to frontend/src/core/collections/tagsCollection.js diff --git a/frontend/src/core/app/config.js b/frontend/src/core/config.js similarity index 100% rename from frontend/src/core/app/config.js rename to frontend/src/core/config.js diff --git a/frontend/src/core/app/contentPane.js b/frontend/src/core/contentPane.js similarity index 100% rename from frontend/src/core/app/contentPane.js rename to frontend/src/core/contentPane.js diff --git a/frontend/src/core/app/contextMenu.js b/frontend/src/core/contextMenu.js similarity index 100% rename from frontend/src/core/app/contextMenu.js rename to frontend/src/core/contextMenu.js diff --git a/frontend/src/core/app/helpers.js b/frontend/src/core/helpers.js similarity index 100% rename from frontend/src/core/app/helpers.js rename to frontend/src/core/helpers.js diff --git a/frontend/src/core/app/less/_reset.less b/frontend/src/core/less/_reset.less similarity index 100% rename from frontend/src/core/app/less/_reset.less rename to frontend/src/core/less/_reset.less diff --git a/frontend/src/core/app/less/app.less b/frontend/src/core/less/app.less similarity index 100% rename from frontend/src/core/app/less/app.less rename to frontend/src/core/less/app.less diff --git a/frontend/src/core/app/less/columns.less b/frontend/src/core/less/columns.less similarity index 100% rename from frontend/src/core/app/less/columns.less rename to frontend/src/core/less/columns.less diff --git a/frontend/src/core/app/less/contentPane.less b/frontend/src/core/less/contentPane.less similarity index 100% rename from frontend/src/core/app/less/contentPane.less rename to frontend/src/core/less/contentPane.less diff --git a/frontend/src/core/app/less/contextMenu.less b/frontend/src/core/less/contextMenu.less similarity index 100% rename from frontend/src/core/app/less/contextMenu.less rename to frontend/src/core/less/contextMenu.less diff --git a/frontend/src/core/app/less/forms.less b/frontend/src/core/less/forms.less similarity index 100% rename from frontend/src/core/app/less/forms.less rename to frontend/src/core/less/forms.less diff --git a/frontend/src/core/app/less/helpers.less b/frontend/src/core/less/helpers.less similarity index 100% rename from frontend/src/core/app/less/helpers.less rename to frontend/src/core/less/helpers.less diff --git a/frontend/src/core/app/less/permissions.less b/frontend/src/core/less/permissions.less similarity index 80% rename from frontend/src/core/app/less/permissions.less rename to frontend/src/core/less/permissions.less index 23a364e7af..818e094e5e 100644 --- a/frontend/src/core/app/less/permissions.less +++ b/frontend/src/core/less/permissions.less @@ -1,5 +1,5 @@ -@import '../../../less/sharedStyles.less'; -@import '../../../less/variables.less'; +@import 'sharedStyles'; +@import 'variables'; .permissions { .form-container-style; diff --git a/frontend/src/less/sharedStyles.less b/frontend/src/core/less/sharedStyles.less similarity index 100% rename from frontend/src/less/sharedStyles.less rename to frontend/src/core/less/sharedStyles.less diff --git a/frontend/src/core/app/less/tables.less b/frontend/src/core/less/tables.less similarity index 91% rename from frontend/src/core/app/less/tables.less rename to frontend/src/core/less/tables.less index c510485376..fd2c03d094 100644 --- a/frontend/src/core/app/less/tables.less +++ b/frontend/src/core/less/tables.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; .tb-title { background-color: #9cabc4; diff --git a/frontend/src/less/variables.less b/frontend/src/core/less/variables.less similarity index 100% rename from frontend/src/less/variables.less rename to frontend/src/core/less/variables.less diff --git a/frontend/src/core/app/models/articleModel.js b/frontend/src/core/models/articleModel.js similarity index 100% rename from frontend/src/core/app/models/articleModel.js rename to frontend/src/core/models/articleModel.js diff --git a/frontend/src/core/app/models/blockModel.js b/frontend/src/core/models/blockModel.js similarity index 100% rename from frontend/src/core/app/models/blockModel.js rename to frontend/src/core/models/blockModel.js diff --git a/frontend/src/core/app/models/clipboardModel.js b/frontend/src/core/models/clipboardModel.js similarity index 100% rename from frontend/src/core/app/models/clipboardModel.js rename to frontend/src/core/models/clipboardModel.js diff --git a/frontend/src/core/app/models/componentModel.js b/frontend/src/core/models/componentModel.js similarity index 100% rename from frontend/src/core/app/models/componentModel.js rename to frontend/src/core/models/componentModel.js diff --git a/frontend/src/core/app/models/componentTypeModel.js b/frontend/src/core/models/componentTypeModel.js similarity index 100% rename from frontend/src/core/app/models/componentTypeModel.js rename to frontend/src/core/models/componentTypeModel.js diff --git a/frontend/src/core/app/models/configModel.js b/frontend/src/core/models/configModel.js similarity index 100% rename from frontend/src/core/app/models/configModel.js rename to frontend/src/core/models/configModel.js diff --git a/frontend/src/core/app/models/contentModel.js b/frontend/src/core/models/contentModel.js similarity index 100% rename from frontend/src/core/app/models/contentModel.js rename to frontend/src/core/models/contentModel.js diff --git a/frontend/src/core/app/models/contentObjectModel.js b/frontend/src/core/models/contentObjectModel.js similarity index 100% rename from frontend/src/core/app/models/contentObjectModel.js rename to frontend/src/core/models/contentObjectModel.js diff --git a/frontend/src/core/app/models/courseAssetModel.js b/frontend/src/core/models/courseAssetModel.js similarity index 100% rename from frontend/src/core/app/models/courseAssetModel.js rename to frontend/src/core/models/courseAssetModel.js diff --git a/frontend/src/core/app/models/courseModel.js b/frontend/src/core/models/courseModel.js similarity index 100% rename from frontend/src/core/app/models/courseModel.js rename to frontend/src/core/models/courseModel.js diff --git a/frontend/src/core/app/models/extensionModel.js b/frontend/src/core/models/extensionModel.js similarity index 100% rename from frontend/src/core/app/models/extensionModel.js rename to frontend/src/core/models/extensionModel.js diff --git a/frontend/src/core/app/models/themeTypeModel.js b/frontend/src/core/models/themeTypeModel.js similarity index 100% rename from frontend/src/core/app/models/themeTypeModel.js rename to frontend/src/core/models/themeTypeModel.js diff --git a/frontend/src/core/app/origin.js b/frontend/src/core/origin.js similarity index 100% rename from frontend/src/core/app/origin.js rename to frontend/src/core/origin.js diff --git a/frontend/src/core/app/permissions.js b/frontend/src/core/permissions.js similarity index 100% rename from frontend/src/core/app/permissions.js rename to frontend/src/core/permissions.js diff --git a/frontend/src/core/app/permissions.md b/frontend/src/core/permissions.md similarity index 100% rename from frontend/src/core/app/permissions.md rename to frontend/src/core/permissions.md diff --git a/frontend/src/core/app/router.js b/frontend/src/core/router.js similarity index 100% rename from frontend/src/core/app/router.js rename to frontend/src/core/router.js diff --git a/frontend/src/core/app/templates/contentPane.hbs b/frontend/src/core/templates/contentPane.hbs similarity index 100% rename from frontend/src/core/app/templates/contentPane.hbs rename to frontend/src/core/templates/contentPane.hbs diff --git a/frontend/src/core/app/templates/contextMenu.hbs b/frontend/src/core/templates/contextMenu.hbs similarity index 100% rename from frontend/src/core/app/templates/contextMenu.hbs rename to frontend/src/core/templates/contextMenu.hbs diff --git a/frontend/src/core/app/templates/contextMenuItem.hbs b/frontend/src/core/templates/contextMenuItem.hbs similarity index 100% rename from frontend/src/core/app/templates/contextMenuItem.hbs rename to frontend/src/core/templates/contextMenuItem.hbs diff --git a/frontend/src/core/app/templates/permissions.hbs b/frontend/src/core/templates/permissions.hbs similarity index 100% rename from frontend/src/core/app/templates/permissions.hbs rename to frontend/src/core/templates/permissions.hbs diff --git a/frontend/src/core/app/views/contentPaneView.js b/frontend/src/core/views/contentPaneView.js similarity index 100% rename from frontend/src/core/app/views/contentPaneView.js rename to frontend/src/core/views/contentPaneView.js diff --git a/frontend/src/core/app/views/contextMenuView.js b/frontend/src/core/views/contextMenuView.js similarity index 100% rename from frontend/src/core/app/views/contextMenuView.js rename to frontend/src/core/views/contextMenuView.js diff --git a/frontend/src/core/app/views/originView.js b/frontend/src/core/views/originView.js similarity index 100% rename from frontend/src/core/app/views/originView.js rename to frontend/src/core/views/originView.js diff --git a/frontend/src/core/app/views/permissionsView.js b/frontend/src/core/views/permissionsView.js similarity index 100% rename from frontend/src/core/app/views/permissionsView.js rename to frontend/src/core/views/permissionsView.js diff --git a/frontend/src/core/libraries/ace/ace.js b/frontend/src/libraries/ace/ace.js similarity index 100% rename from frontend/src/core/libraries/ace/ace.js rename to frontend/src/libraries/ace/ace.js diff --git a/frontend/src/core/libraries/ace/ext-beautify.js b/frontend/src/libraries/ace/ext-beautify.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-beautify.js rename to frontend/src/libraries/ace/ext-beautify.js diff --git a/frontend/src/core/libraries/ace/ext-chromevox.js b/frontend/src/libraries/ace/ext-chromevox.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-chromevox.js rename to frontend/src/libraries/ace/ext-chromevox.js diff --git a/frontend/src/core/libraries/ace/ext-elastic_tabstops_lite.js b/frontend/src/libraries/ace/ext-elastic_tabstops_lite.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-elastic_tabstops_lite.js rename to frontend/src/libraries/ace/ext-elastic_tabstops_lite.js diff --git a/frontend/src/core/libraries/ace/ext-emmet.js b/frontend/src/libraries/ace/ext-emmet.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-emmet.js rename to frontend/src/libraries/ace/ext-emmet.js diff --git a/frontend/src/core/libraries/ace/ext-error_marker.js b/frontend/src/libraries/ace/ext-error_marker.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-error_marker.js rename to frontend/src/libraries/ace/ext-error_marker.js diff --git a/frontend/src/core/libraries/ace/ext-keybinding_menu.js b/frontend/src/libraries/ace/ext-keybinding_menu.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-keybinding_menu.js rename to frontend/src/libraries/ace/ext-keybinding_menu.js diff --git a/frontend/src/core/libraries/ace/ext-language_tools.js b/frontend/src/libraries/ace/ext-language_tools.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-language_tools.js rename to frontend/src/libraries/ace/ext-language_tools.js diff --git a/frontend/src/core/libraries/ace/ext-linking.js b/frontend/src/libraries/ace/ext-linking.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-linking.js rename to frontend/src/libraries/ace/ext-linking.js diff --git a/frontend/src/core/libraries/ace/ext-modelist.js b/frontend/src/libraries/ace/ext-modelist.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-modelist.js rename to frontend/src/libraries/ace/ext-modelist.js diff --git a/frontend/src/core/libraries/ace/ext-old_ie.js b/frontend/src/libraries/ace/ext-old_ie.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-old_ie.js rename to frontend/src/libraries/ace/ext-old_ie.js diff --git a/frontend/src/core/libraries/ace/ext-searchbox.js b/frontend/src/libraries/ace/ext-searchbox.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-searchbox.js rename to frontend/src/libraries/ace/ext-searchbox.js diff --git a/frontend/src/core/libraries/ace/ext-settings_menu.js b/frontend/src/libraries/ace/ext-settings_menu.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-settings_menu.js rename to frontend/src/libraries/ace/ext-settings_menu.js diff --git a/frontend/src/core/libraries/ace/ext-spellcheck.js b/frontend/src/libraries/ace/ext-spellcheck.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-spellcheck.js rename to frontend/src/libraries/ace/ext-spellcheck.js diff --git a/frontend/src/core/libraries/ace/ext-split.js b/frontend/src/libraries/ace/ext-split.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-split.js rename to frontend/src/libraries/ace/ext-split.js diff --git a/frontend/src/core/libraries/ace/ext-static_highlight.js b/frontend/src/libraries/ace/ext-static_highlight.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-static_highlight.js rename to frontend/src/libraries/ace/ext-static_highlight.js diff --git a/frontend/src/core/libraries/ace/ext-statusbar.js b/frontend/src/libraries/ace/ext-statusbar.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-statusbar.js rename to frontend/src/libraries/ace/ext-statusbar.js diff --git a/frontend/src/core/libraries/ace/ext-textarea.js b/frontend/src/libraries/ace/ext-textarea.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-textarea.js rename to frontend/src/libraries/ace/ext-textarea.js diff --git a/frontend/src/core/libraries/ace/ext-themelist.js b/frontend/src/libraries/ace/ext-themelist.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-themelist.js rename to frontend/src/libraries/ace/ext-themelist.js diff --git a/frontend/src/core/libraries/ace/ext-whitespace.js b/frontend/src/libraries/ace/ext-whitespace.js similarity index 100% rename from frontend/src/core/libraries/ace/ext-whitespace.js rename to frontend/src/libraries/ace/ext-whitespace.js diff --git a/frontend/src/core/libraries/ace/keybinding-emacs.js b/frontend/src/libraries/ace/keybinding-emacs.js similarity index 100% rename from frontend/src/core/libraries/ace/keybinding-emacs.js rename to frontend/src/libraries/ace/keybinding-emacs.js diff --git a/frontend/src/core/libraries/ace/keybinding-vim.js b/frontend/src/libraries/ace/keybinding-vim.js similarity index 100% rename from frontend/src/core/libraries/ace/keybinding-vim.js rename to frontend/src/libraries/ace/keybinding-vim.js diff --git a/frontend/src/core/libraries/ace/mode-abap.js b/frontend/src/libraries/ace/mode-abap.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-abap.js rename to frontend/src/libraries/ace/mode-abap.js diff --git a/frontend/src/core/libraries/ace/mode-abc.js b/frontend/src/libraries/ace/mode-abc.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-abc.js rename to frontend/src/libraries/ace/mode-abc.js diff --git a/frontend/src/core/libraries/ace/mode-actionscript.js b/frontend/src/libraries/ace/mode-actionscript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-actionscript.js rename to frontend/src/libraries/ace/mode-actionscript.js diff --git a/frontend/src/core/libraries/ace/mode-ada.js b/frontend/src/libraries/ace/mode-ada.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ada.js rename to frontend/src/libraries/ace/mode-ada.js diff --git a/frontend/src/core/libraries/ace/mode-apache_conf.js b/frontend/src/libraries/ace/mode-apache_conf.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-apache_conf.js rename to frontend/src/libraries/ace/mode-apache_conf.js diff --git a/frontend/src/core/libraries/ace/mode-applescript.js b/frontend/src/libraries/ace/mode-applescript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-applescript.js rename to frontend/src/libraries/ace/mode-applescript.js diff --git a/frontend/src/core/libraries/ace/mode-asciidoc.js b/frontend/src/libraries/ace/mode-asciidoc.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-asciidoc.js rename to frontend/src/libraries/ace/mode-asciidoc.js diff --git a/frontend/src/core/libraries/ace/mode-assembly_x86.js b/frontend/src/libraries/ace/mode-assembly_x86.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-assembly_x86.js rename to frontend/src/libraries/ace/mode-assembly_x86.js diff --git a/frontend/src/core/libraries/ace/mode-autohotkey.js b/frontend/src/libraries/ace/mode-autohotkey.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-autohotkey.js rename to frontend/src/libraries/ace/mode-autohotkey.js diff --git a/frontend/src/core/libraries/ace/mode-batchfile.js b/frontend/src/libraries/ace/mode-batchfile.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-batchfile.js rename to frontend/src/libraries/ace/mode-batchfile.js diff --git a/frontend/src/core/libraries/ace/mode-c9search.js b/frontend/src/libraries/ace/mode-c9search.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-c9search.js rename to frontend/src/libraries/ace/mode-c9search.js diff --git a/frontend/src/core/libraries/ace/mode-c_cpp.js b/frontend/src/libraries/ace/mode-c_cpp.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-c_cpp.js rename to frontend/src/libraries/ace/mode-c_cpp.js diff --git a/frontend/src/core/libraries/ace/mode-cirru.js b/frontend/src/libraries/ace/mode-cirru.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-cirru.js rename to frontend/src/libraries/ace/mode-cirru.js diff --git a/frontend/src/core/libraries/ace/mode-clojure.js b/frontend/src/libraries/ace/mode-clojure.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-clojure.js rename to frontend/src/libraries/ace/mode-clojure.js diff --git a/frontend/src/core/libraries/ace/mode-cobol.js b/frontend/src/libraries/ace/mode-cobol.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-cobol.js rename to frontend/src/libraries/ace/mode-cobol.js diff --git a/frontend/src/core/libraries/ace/mode-coffee.js b/frontend/src/libraries/ace/mode-coffee.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-coffee.js rename to frontend/src/libraries/ace/mode-coffee.js diff --git a/frontend/src/core/libraries/ace/mode-coldfusion.js b/frontend/src/libraries/ace/mode-coldfusion.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-coldfusion.js rename to frontend/src/libraries/ace/mode-coldfusion.js diff --git a/frontend/src/core/libraries/ace/mode-csharp.js b/frontend/src/libraries/ace/mode-csharp.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-csharp.js rename to frontend/src/libraries/ace/mode-csharp.js diff --git a/frontend/src/core/libraries/ace/mode-css.js b/frontend/src/libraries/ace/mode-css.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-css.js rename to frontend/src/libraries/ace/mode-css.js diff --git a/frontend/src/core/libraries/ace/mode-curly.js b/frontend/src/libraries/ace/mode-curly.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-curly.js rename to frontend/src/libraries/ace/mode-curly.js diff --git a/frontend/src/core/libraries/ace/mode-d.js b/frontend/src/libraries/ace/mode-d.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-d.js rename to frontend/src/libraries/ace/mode-d.js diff --git a/frontend/src/core/libraries/ace/mode-dart.js b/frontend/src/libraries/ace/mode-dart.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-dart.js rename to frontend/src/libraries/ace/mode-dart.js diff --git a/frontend/src/core/libraries/ace/mode-diff.js b/frontend/src/libraries/ace/mode-diff.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-diff.js rename to frontend/src/libraries/ace/mode-diff.js diff --git a/frontend/src/core/libraries/ace/mode-django.js b/frontend/src/libraries/ace/mode-django.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-django.js rename to frontend/src/libraries/ace/mode-django.js diff --git a/frontend/src/core/libraries/ace/mode-dockerfile.js b/frontend/src/libraries/ace/mode-dockerfile.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-dockerfile.js rename to frontend/src/libraries/ace/mode-dockerfile.js diff --git a/frontend/src/core/libraries/ace/mode-dot.js b/frontend/src/libraries/ace/mode-dot.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-dot.js rename to frontend/src/libraries/ace/mode-dot.js diff --git a/frontend/src/core/libraries/ace/mode-eiffel.js b/frontend/src/libraries/ace/mode-eiffel.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-eiffel.js rename to frontend/src/libraries/ace/mode-eiffel.js diff --git a/frontend/src/core/libraries/ace/mode-ejs.js b/frontend/src/libraries/ace/mode-ejs.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ejs.js rename to frontend/src/libraries/ace/mode-ejs.js diff --git a/frontend/src/core/libraries/ace/mode-elixir.js b/frontend/src/libraries/ace/mode-elixir.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-elixir.js rename to frontend/src/libraries/ace/mode-elixir.js diff --git a/frontend/src/core/libraries/ace/mode-elm.js b/frontend/src/libraries/ace/mode-elm.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-elm.js rename to frontend/src/libraries/ace/mode-elm.js diff --git a/frontend/src/core/libraries/ace/mode-erlang.js b/frontend/src/libraries/ace/mode-erlang.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-erlang.js rename to frontend/src/libraries/ace/mode-erlang.js diff --git a/frontend/src/core/libraries/ace/mode-forth.js b/frontend/src/libraries/ace/mode-forth.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-forth.js rename to frontend/src/libraries/ace/mode-forth.js diff --git a/frontend/src/core/libraries/ace/mode-ftl.js b/frontend/src/libraries/ace/mode-ftl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ftl.js rename to frontend/src/libraries/ace/mode-ftl.js diff --git a/frontend/src/core/libraries/ace/mode-gcode.js b/frontend/src/libraries/ace/mode-gcode.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-gcode.js rename to frontend/src/libraries/ace/mode-gcode.js diff --git a/frontend/src/core/libraries/ace/mode-gherkin.js b/frontend/src/libraries/ace/mode-gherkin.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-gherkin.js rename to frontend/src/libraries/ace/mode-gherkin.js diff --git a/frontend/src/core/libraries/ace/mode-gitignore.js b/frontend/src/libraries/ace/mode-gitignore.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-gitignore.js rename to frontend/src/libraries/ace/mode-gitignore.js diff --git a/frontend/src/core/libraries/ace/mode-glsl.js b/frontend/src/libraries/ace/mode-glsl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-glsl.js rename to frontend/src/libraries/ace/mode-glsl.js diff --git a/frontend/src/core/libraries/ace/mode-golang.js b/frontend/src/libraries/ace/mode-golang.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-golang.js rename to frontend/src/libraries/ace/mode-golang.js diff --git a/frontend/src/core/libraries/ace/mode-groovy.js b/frontend/src/libraries/ace/mode-groovy.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-groovy.js rename to frontend/src/libraries/ace/mode-groovy.js diff --git a/frontend/src/core/libraries/ace/mode-haml.js b/frontend/src/libraries/ace/mode-haml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-haml.js rename to frontend/src/libraries/ace/mode-haml.js diff --git a/frontend/src/core/libraries/ace/mode-handlebars.js b/frontend/src/libraries/ace/mode-handlebars.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-handlebars.js rename to frontend/src/libraries/ace/mode-handlebars.js diff --git a/frontend/src/core/libraries/ace/mode-haskell.js b/frontend/src/libraries/ace/mode-haskell.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-haskell.js rename to frontend/src/libraries/ace/mode-haskell.js diff --git a/frontend/src/core/libraries/ace/mode-haxe.js b/frontend/src/libraries/ace/mode-haxe.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-haxe.js rename to frontend/src/libraries/ace/mode-haxe.js diff --git a/frontend/src/core/libraries/ace/mode-html.js b/frontend/src/libraries/ace/mode-html.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-html.js rename to frontend/src/libraries/ace/mode-html.js diff --git a/frontend/src/core/libraries/ace/mode-html_elixir.js b/frontend/src/libraries/ace/mode-html_elixir.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-html_elixir.js rename to frontend/src/libraries/ace/mode-html_elixir.js diff --git a/frontend/src/core/libraries/ace/mode-html_ruby.js b/frontend/src/libraries/ace/mode-html_ruby.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-html_ruby.js rename to frontend/src/libraries/ace/mode-html_ruby.js diff --git a/frontend/src/core/libraries/ace/mode-ini.js b/frontend/src/libraries/ace/mode-ini.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ini.js rename to frontend/src/libraries/ace/mode-ini.js diff --git a/frontend/src/core/libraries/ace/mode-io.js b/frontend/src/libraries/ace/mode-io.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-io.js rename to frontend/src/libraries/ace/mode-io.js diff --git a/frontend/src/core/libraries/ace/mode-jack.js b/frontend/src/libraries/ace/mode-jack.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-jack.js rename to frontend/src/libraries/ace/mode-jack.js diff --git a/frontend/src/core/libraries/ace/mode-jade.js b/frontend/src/libraries/ace/mode-jade.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-jade.js rename to frontend/src/libraries/ace/mode-jade.js diff --git a/frontend/src/core/libraries/ace/mode-java.js b/frontend/src/libraries/ace/mode-java.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-java.js rename to frontend/src/libraries/ace/mode-java.js diff --git a/frontend/src/core/libraries/ace/mode-javascript.js b/frontend/src/libraries/ace/mode-javascript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-javascript.js rename to frontend/src/libraries/ace/mode-javascript.js diff --git a/frontend/src/core/libraries/ace/mode-json.js b/frontend/src/libraries/ace/mode-json.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-json.js rename to frontend/src/libraries/ace/mode-json.js diff --git a/frontend/src/core/libraries/ace/mode-jsoniq.js b/frontend/src/libraries/ace/mode-jsoniq.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-jsoniq.js rename to frontend/src/libraries/ace/mode-jsoniq.js diff --git a/frontend/src/core/libraries/ace/mode-jsp.js b/frontend/src/libraries/ace/mode-jsp.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-jsp.js rename to frontend/src/libraries/ace/mode-jsp.js diff --git a/frontend/src/core/libraries/ace/mode-jsx.js b/frontend/src/libraries/ace/mode-jsx.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-jsx.js rename to frontend/src/libraries/ace/mode-jsx.js diff --git a/frontend/src/core/libraries/ace/mode-julia.js b/frontend/src/libraries/ace/mode-julia.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-julia.js rename to frontend/src/libraries/ace/mode-julia.js diff --git a/frontend/src/core/libraries/ace/mode-latex.js b/frontend/src/libraries/ace/mode-latex.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-latex.js rename to frontend/src/libraries/ace/mode-latex.js diff --git a/frontend/src/core/libraries/ace/mode-lean.js b/frontend/src/libraries/ace/mode-lean.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-lean.js rename to frontend/src/libraries/ace/mode-lean.js diff --git a/frontend/src/core/libraries/ace/mode-less.js b/frontend/src/libraries/ace/mode-less.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-less.js rename to frontend/src/libraries/ace/mode-less.js diff --git a/frontend/src/core/libraries/ace/mode-liquid.js b/frontend/src/libraries/ace/mode-liquid.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-liquid.js rename to frontend/src/libraries/ace/mode-liquid.js diff --git a/frontend/src/core/libraries/ace/mode-lisp.js b/frontend/src/libraries/ace/mode-lisp.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-lisp.js rename to frontend/src/libraries/ace/mode-lisp.js diff --git a/frontend/src/core/libraries/ace/mode-live_script.js b/frontend/src/libraries/ace/mode-live_script.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-live_script.js rename to frontend/src/libraries/ace/mode-live_script.js diff --git a/frontend/src/core/libraries/ace/mode-livescript.js b/frontend/src/libraries/ace/mode-livescript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-livescript.js rename to frontend/src/libraries/ace/mode-livescript.js diff --git a/frontend/src/core/libraries/ace/mode-logiql.js b/frontend/src/libraries/ace/mode-logiql.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-logiql.js rename to frontend/src/libraries/ace/mode-logiql.js diff --git a/frontend/src/core/libraries/ace/mode-lsl.js b/frontend/src/libraries/ace/mode-lsl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-lsl.js rename to frontend/src/libraries/ace/mode-lsl.js diff --git a/frontend/src/core/libraries/ace/mode-lua.js b/frontend/src/libraries/ace/mode-lua.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-lua.js rename to frontend/src/libraries/ace/mode-lua.js diff --git a/frontend/src/core/libraries/ace/mode-luapage.js b/frontend/src/libraries/ace/mode-luapage.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-luapage.js rename to frontend/src/libraries/ace/mode-luapage.js diff --git a/frontend/src/core/libraries/ace/mode-lucene.js b/frontend/src/libraries/ace/mode-lucene.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-lucene.js rename to frontend/src/libraries/ace/mode-lucene.js diff --git a/frontend/src/core/libraries/ace/mode-makefile.js b/frontend/src/libraries/ace/mode-makefile.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-makefile.js rename to frontend/src/libraries/ace/mode-makefile.js diff --git a/frontend/src/core/libraries/ace/mode-markdown.js b/frontend/src/libraries/ace/mode-markdown.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-markdown.js rename to frontend/src/libraries/ace/mode-markdown.js diff --git a/frontend/src/core/libraries/ace/mode-mask.js b/frontend/src/libraries/ace/mode-mask.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mask.js rename to frontend/src/libraries/ace/mode-mask.js diff --git a/frontend/src/core/libraries/ace/mode-matlab.js b/frontend/src/libraries/ace/mode-matlab.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-matlab.js rename to frontend/src/libraries/ace/mode-matlab.js diff --git a/frontend/src/core/libraries/ace/mode-maze.js b/frontend/src/libraries/ace/mode-maze.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-maze.js rename to frontend/src/libraries/ace/mode-maze.js diff --git a/frontend/src/core/libraries/ace/mode-mel.js b/frontend/src/libraries/ace/mode-mel.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mel.js rename to frontend/src/libraries/ace/mode-mel.js diff --git a/frontend/src/core/libraries/ace/mode-mips_assembler.js b/frontend/src/libraries/ace/mode-mips_assembler.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mips_assembler.js rename to frontend/src/libraries/ace/mode-mips_assembler.js diff --git a/frontend/src/core/libraries/ace/mode-mipsassembler.js b/frontend/src/libraries/ace/mode-mipsassembler.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mipsassembler.js rename to frontend/src/libraries/ace/mode-mipsassembler.js diff --git a/frontend/src/core/libraries/ace/mode-mushcode.js b/frontend/src/libraries/ace/mode-mushcode.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mushcode.js rename to frontend/src/libraries/ace/mode-mushcode.js diff --git a/frontend/src/core/libraries/ace/mode-mysql.js b/frontend/src/libraries/ace/mode-mysql.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-mysql.js rename to frontend/src/libraries/ace/mode-mysql.js diff --git a/frontend/src/core/libraries/ace/mode-nix.js b/frontend/src/libraries/ace/mode-nix.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-nix.js rename to frontend/src/libraries/ace/mode-nix.js diff --git a/frontend/src/core/libraries/ace/mode-objectivec.js b/frontend/src/libraries/ace/mode-objectivec.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-objectivec.js rename to frontend/src/libraries/ace/mode-objectivec.js diff --git a/frontend/src/core/libraries/ace/mode-ocaml.js b/frontend/src/libraries/ace/mode-ocaml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ocaml.js rename to frontend/src/libraries/ace/mode-ocaml.js diff --git a/frontend/src/core/libraries/ace/mode-pascal.js b/frontend/src/libraries/ace/mode-pascal.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-pascal.js rename to frontend/src/libraries/ace/mode-pascal.js diff --git a/frontend/src/core/libraries/ace/mode-perl.js b/frontend/src/libraries/ace/mode-perl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-perl.js rename to frontend/src/libraries/ace/mode-perl.js diff --git a/frontend/src/core/libraries/ace/mode-pgsql.js b/frontend/src/libraries/ace/mode-pgsql.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-pgsql.js rename to frontend/src/libraries/ace/mode-pgsql.js diff --git a/frontend/src/core/libraries/ace/mode-php.js b/frontend/src/libraries/ace/mode-php.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-php.js rename to frontend/src/libraries/ace/mode-php.js diff --git a/frontend/src/core/libraries/ace/mode-plain_text.js b/frontend/src/libraries/ace/mode-plain_text.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-plain_text.js rename to frontend/src/libraries/ace/mode-plain_text.js diff --git a/frontend/src/core/libraries/ace/mode-powershell.js b/frontend/src/libraries/ace/mode-powershell.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-powershell.js rename to frontend/src/libraries/ace/mode-powershell.js diff --git a/frontend/src/core/libraries/ace/mode-praat.js b/frontend/src/libraries/ace/mode-praat.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-praat.js rename to frontend/src/libraries/ace/mode-praat.js diff --git a/frontend/src/core/libraries/ace/mode-prolog.js b/frontend/src/libraries/ace/mode-prolog.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-prolog.js rename to frontend/src/libraries/ace/mode-prolog.js diff --git a/frontend/src/core/libraries/ace/mode-properties.js b/frontend/src/libraries/ace/mode-properties.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-properties.js rename to frontend/src/libraries/ace/mode-properties.js diff --git a/frontend/src/core/libraries/ace/mode-protobuf.js b/frontend/src/libraries/ace/mode-protobuf.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-protobuf.js rename to frontend/src/libraries/ace/mode-protobuf.js diff --git a/frontend/src/core/libraries/ace/mode-python.js b/frontend/src/libraries/ace/mode-python.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-python.js rename to frontend/src/libraries/ace/mode-python.js diff --git a/frontend/src/core/libraries/ace/mode-r.js b/frontend/src/libraries/ace/mode-r.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-r.js rename to frontend/src/libraries/ace/mode-r.js diff --git a/frontend/src/core/libraries/ace/mode-rdoc.js b/frontend/src/libraries/ace/mode-rdoc.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-rdoc.js rename to frontend/src/libraries/ace/mode-rdoc.js diff --git a/frontend/src/core/libraries/ace/mode-rhtml.js b/frontend/src/libraries/ace/mode-rhtml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-rhtml.js rename to frontend/src/libraries/ace/mode-rhtml.js diff --git a/frontend/src/core/libraries/ace/mode-ruby.js b/frontend/src/libraries/ace/mode-ruby.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-ruby.js rename to frontend/src/libraries/ace/mode-ruby.js diff --git a/frontend/src/core/libraries/ace/mode-rust.js b/frontend/src/libraries/ace/mode-rust.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-rust.js rename to frontend/src/libraries/ace/mode-rust.js diff --git a/frontend/src/core/libraries/ace/mode-sass.js b/frontend/src/libraries/ace/mode-sass.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-sass.js rename to frontend/src/libraries/ace/mode-sass.js diff --git a/frontend/src/core/libraries/ace/mode-scad.js b/frontend/src/libraries/ace/mode-scad.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-scad.js rename to frontend/src/libraries/ace/mode-scad.js diff --git a/frontend/src/core/libraries/ace/mode-scala.js b/frontend/src/libraries/ace/mode-scala.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-scala.js rename to frontend/src/libraries/ace/mode-scala.js diff --git a/frontend/src/core/libraries/ace/mode-scheme.js b/frontend/src/libraries/ace/mode-scheme.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-scheme.js rename to frontend/src/libraries/ace/mode-scheme.js diff --git a/frontend/src/core/libraries/ace/mode-scss.js b/frontend/src/libraries/ace/mode-scss.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-scss.js rename to frontend/src/libraries/ace/mode-scss.js diff --git a/frontend/src/core/libraries/ace/mode-sh.js b/frontend/src/libraries/ace/mode-sh.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-sh.js rename to frontend/src/libraries/ace/mode-sh.js diff --git a/frontend/src/core/libraries/ace/mode-sjs.js b/frontend/src/libraries/ace/mode-sjs.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-sjs.js rename to frontend/src/libraries/ace/mode-sjs.js diff --git a/frontend/src/core/libraries/ace/mode-smarty.js b/frontend/src/libraries/ace/mode-smarty.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-smarty.js rename to frontend/src/libraries/ace/mode-smarty.js diff --git a/frontend/src/core/libraries/ace/mode-snippets.js b/frontend/src/libraries/ace/mode-snippets.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-snippets.js rename to frontend/src/libraries/ace/mode-snippets.js diff --git a/frontend/src/core/libraries/ace/mode-soy_template.js b/frontend/src/libraries/ace/mode-soy_template.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-soy_template.js rename to frontend/src/libraries/ace/mode-soy_template.js diff --git a/frontend/src/core/libraries/ace/mode-space.js b/frontend/src/libraries/ace/mode-space.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-space.js rename to frontend/src/libraries/ace/mode-space.js diff --git a/frontend/src/core/libraries/ace/mode-sql.js b/frontend/src/libraries/ace/mode-sql.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-sql.js rename to frontend/src/libraries/ace/mode-sql.js diff --git a/frontend/src/core/libraries/ace/mode-sqlserver.js b/frontend/src/libraries/ace/mode-sqlserver.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-sqlserver.js rename to frontend/src/libraries/ace/mode-sqlserver.js diff --git a/frontend/src/core/libraries/ace/mode-stylus.js b/frontend/src/libraries/ace/mode-stylus.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-stylus.js rename to frontend/src/libraries/ace/mode-stylus.js diff --git a/frontend/src/core/libraries/ace/mode-svg.js b/frontend/src/libraries/ace/mode-svg.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-svg.js rename to frontend/src/libraries/ace/mode-svg.js diff --git a/frontend/src/core/libraries/ace/mode-swift.js b/frontend/src/libraries/ace/mode-swift.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-swift.js rename to frontend/src/libraries/ace/mode-swift.js diff --git a/frontend/src/core/libraries/ace/mode-swig.js b/frontend/src/libraries/ace/mode-swig.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-swig.js rename to frontend/src/libraries/ace/mode-swig.js diff --git a/frontend/src/core/libraries/ace/mode-tcl.js b/frontend/src/libraries/ace/mode-tcl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-tcl.js rename to frontend/src/libraries/ace/mode-tcl.js diff --git a/frontend/src/core/libraries/ace/mode-tex.js b/frontend/src/libraries/ace/mode-tex.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-tex.js rename to frontend/src/libraries/ace/mode-tex.js diff --git a/frontend/src/core/libraries/ace/mode-text.js b/frontend/src/libraries/ace/mode-text.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-text.js rename to frontend/src/libraries/ace/mode-text.js diff --git a/frontend/src/core/libraries/ace/mode-textile.js b/frontend/src/libraries/ace/mode-textile.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-textile.js rename to frontend/src/libraries/ace/mode-textile.js diff --git a/frontend/src/core/libraries/ace/mode-toml.js b/frontend/src/libraries/ace/mode-toml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-toml.js rename to frontend/src/libraries/ace/mode-toml.js diff --git a/frontend/src/core/libraries/ace/mode-twig.js b/frontend/src/libraries/ace/mode-twig.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-twig.js rename to frontend/src/libraries/ace/mode-twig.js diff --git a/frontend/src/core/libraries/ace/mode-typescript.js b/frontend/src/libraries/ace/mode-typescript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-typescript.js rename to frontend/src/libraries/ace/mode-typescript.js diff --git a/frontend/src/core/libraries/ace/mode-vala.js b/frontend/src/libraries/ace/mode-vala.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-vala.js rename to frontend/src/libraries/ace/mode-vala.js diff --git a/frontend/src/core/libraries/ace/mode-vbscript.js b/frontend/src/libraries/ace/mode-vbscript.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-vbscript.js rename to frontend/src/libraries/ace/mode-vbscript.js diff --git a/frontend/src/core/libraries/ace/mode-velocity.js b/frontend/src/libraries/ace/mode-velocity.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-velocity.js rename to frontend/src/libraries/ace/mode-velocity.js diff --git a/frontend/src/core/libraries/ace/mode-verilog.js b/frontend/src/libraries/ace/mode-verilog.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-verilog.js rename to frontend/src/libraries/ace/mode-verilog.js diff --git a/frontend/src/core/libraries/ace/mode-vhdl.js b/frontend/src/libraries/ace/mode-vhdl.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-vhdl.js rename to frontend/src/libraries/ace/mode-vhdl.js diff --git a/frontend/src/core/libraries/ace/mode-xml.js b/frontend/src/libraries/ace/mode-xml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-xml.js rename to frontend/src/libraries/ace/mode-xml.js diff --git a/frontend/src/core/libraries/ace/mode-xquery.js b/frontend/src/libraries/ace/mode-xquery.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-xquery.js rename to frontend/src/libraries/ace/mode-xquery.js diff --git a/frontend/src/core/libraries/ace/mode-yaml.js b/frontend/src/libraries/ace/mode-yaml.js similarity index 100% rename from frontend/src/core/libraries/ace/mode-yaml.js rename to frontend/src/libraries/ace/mode-yaml.js diff --git a/frontend/src/core/libraries/ace/snippets/abap.js b/frontend/src/libraries/ace/snippets/abap.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/abap.js rename to frontend/src/libraries/ace/snippets/abap.js diff --git a/frontend/src/core/libraries/ace/snippets/abc.js b/frontend/src/libraries/ace/snippets/abc.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/abc.js rename to frontend/src/libraries/ace/snippets/abc.js diff --git a/frontend/src/core/libraries/ace/snippets/actionscript.js b/frontend/src/libraries/ace/snippets/actionscript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/actionscript.js rename to frontend/src/libraries/ace/snippets/actionscript.js diff --git a/frontend/src/core/libraries/ace/snippets/ada.js b/frontend/src/libraries/ace/snippets/ada.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ada.js rename to frontend/src/libraries/ace/snippets/ada.js diff --git a/frontend/src/core/libraries/ace/snippets/apache_conf.js b/frontend/src/libraries/ace/snippets/apache_conf.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/apache_conf.js rename to frontend/src/libraries/ace/snippets/apache_conf.js diff --git a/frontend/src/core/libraries/ace/snippets/applescript.js b/frontend/src/libraries/ace/snippets/applescript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/applescript.js rename to frontend/src/libraries/ace/snippets/applescript.js diff --git a/frontend/src/core/libraries/ace/snippets/asciidoc.js b/frontend/src/libraries/ace/snippets/asciidoc.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/asciidoc.js rename to frontend/src/libraries/ace/snippets/asciidoc.js diff --git a/frontend/src/core/libraries/ace/snippets/assembly_x86.js b/frontend/src/libraries/ace/snippets/assembly_x86.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/assembly_x86.js rename to frontend/src/libraries/ace/snippets/assembly_x86.js diff --git a/frontend/src/core/libraries/ace/snippets/autohotkey.js b/frontend/src/libraries/ace/snippets/autohotkey.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/autohotkey.js rename to frontend/src/libraries/ace/snippets/autohotkey.js diff --git a/frontend/src/core/libraries/ace/snippets/batchfile.js b/frontend/src/libraries/ace/snippets/batchfile.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/batchfile.js rename to frontend/src/libraries/ace/snippets/batchfile.js diff --git a/frontend/src/core/libraries/ace/snippets/c9search.js b/frontend/src/libraries/ace/snippets/c9search.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/c9search.js rename to frontend/src/libraries/ace/snippets/c9search.js diff --git a/frontend/src/core/libraries/ace/snippets/c_cpp.js b/frontend/src/libraries/ace/snippets/c_cpp.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/c_cpp.js rename to frontend/src/libraries/ace/snippets/c_cpp.js diff --git a/frontend/src/core/libraries/ace/snippets/cirru.js b/frontend/src/libraries/ace/snippets/cirru.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/cirru.js rename to frontend/src/libraries/ace/snippets/cirru.js diff --git a/frontend/src/core/libraries/ace/snippets/clojure.js b/frontend/src/libraries/ace/snippets/clojure.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/clojure.js rename to frontend/src/libraries/ace/snippets/clojure.js diff --git a/frontend/src/core/libraries/ace/snippets/cobol.js b/frontend/src/libraries/ace/snippets/cobol.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/cobol.js rename to frontend/src/libraries/ace/snippets/cobol.js diff --git a/frontend/src/core/libraries/ace/snippets/coffee.js b/frontend/src/libraries/ace/snippets/coffee.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/coffee.js rename to frontend/src/libraries/ace/snippets/coffee.js diff --git a/frontend/src/core/libraries/ace/snippets/coldfusion.js b/frontend/src/libraries/ace/snippets/coldfusion.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/coldfusion.js rename to frontend/src/libraries/ace/snippets/coldfusion.js diff --git a/frontend/src/core/libraries/ace/snippets/csharp.js b/frontend/src/libraries/ace/snippets/csharp.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/csharp.js rename to frontend/src/libraries/ace/snippets/csharp.js diff --git a/frontend/src/core/libraries/ace/snippets/css.js b/frontend/src/libraries/ace/snippets/css.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/css.js rename to frontend/src/libraries/ace/snippets/css.js diff --git a/frontend/src/core/libraries/ace/snippets/curly.js b/frontend/src/libraries/ace/snippets/curly.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/curly.js rename to frontend/src/libraries/ace/snippets/curly.js diff --git a/frontend/src/core/libraries/ace/snippets/d.js b/frontend/src/libraries/ace/snippets/d.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/d.js rename to frontend/src/libraries/ace/snippets/d.js diff --git a/frontend/src/core/libraries/ace/snippets/dart.js b/frontend/src/libraries/ace/snippets/dart.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/dart.js rename to frontend/src/libraries/ace/snippets/dart.js diff --git a/frontend/src/core/libraries/ace/snippets/diff.js b/frontend/src/libraries/ace/snippets/diff.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/diff.js rename to frontend/src/libraries/ace/snippets/diff.js diff --git a/frontend/src/core/libraries/ace/snippets/django.js b/frontend/src/libraries/ace/snippets/django.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/django.js rename to frontend/src/libraries/ace/snippets/django.js diff --git a/frontend/src/core/libraries/ace/snippets/dockerfile.js b/frontend/src/libraries/ace/snippets/dockerfile.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/dockerfile.js rename to frontend/src/libraries/ace/snippets/dockerfile.js diff --git a/frontend/src/core/libraries/ace/snippets/dot.js b/frontend/src/libraries/ace/snippets/dot.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/dot.js rename to frontend/src/libraries/ace/snippets/dot.js diff --git a/frontend/src/core/libraries/ace/snippets/eiffel.js b/frontend/src/libraries/ace/snippets/eiffel.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/eiffel.js rename to frontend/src/libraries/ace/snippets/eiffel.js diff --git a/frontend/src/core/libraries/ace/snippets/ejs.js b/frontend/src/libraries/ace/snippets/ejs.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ejs.js rename to frontend/src/libraries/ace/snippets/ejs.js diff --git a/frontend/src/core/libraries/ace/snippets/elixir.js b/frontend/src/libraries/ace/snippets/elixir.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/elixir.js rename to frontend/src/libraries/ace/snippets/elixir.js diff --git a/frontend/src/core/libraries/ace/snippets/elm.js b/frontend/src/libraries/ace/snippets/elm.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/elm.js rename to frontend/src/libraries/ace/snippets/elm.js diff --git a/frontend/src/core/libraries/ace/snippets/erlang.js b/frontend/src/libraries/ace/snippets/erlang.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/erlang.js rename to frontend/src/libraries/ace/snippets/erlang.js diff --git a/frontend/src/core/libraries/ace/snippets/forth.js b/frontend/src/libraries/ace/snippets/forth.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/forth.js rename to frontend/src/libraries/ace/snippets/forth.js diff --git a/frontend/src/core/libraries/ace/snippets/ftl.js b/frontend/src/libraries/ace/snippets/ftl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ftl.js rename to frontend/src/libraries/ace/snippets/ftl.js diff --git a/frontend/src/core/libraries/ace/snippets/gcode.js b/frontend/src/libraries/ace/snippets/gcode.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/gcode.js rename to frontend/src/libraries/ace/snippets/gcode.js diff --git a/frontend/src/core/libraries/ace/snippets/gherkin.js b/frontend/src/libraries/ace/snippets/gherkin.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/gherkin.js rename to frontend/src/libraries/ace/snippets/gherkin.js diff --git a/frontend/src/core/libraries/ace/snippets/gitignore.js b/frontend/src/libraries/ace/snippets/gitignore.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/gitignore.js rename to frontend/src/libraries/ace/snippets/gitignore.js diff --git a/frontend/src/core/libraries/ace/snippets/glsl.js b/frontend/src/libraries/ace/snippets/glsl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/glsl.js rename to frontend/src/libraries/ace/snippets/glsl.js diff --git a/frontend/src/core/libraries/ace/snippets/golang.js b/frontend/src/libraries/ace/snippets/golang.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/golang.js rename to frontend/src/libraries/ace/snippets/golang.js diff --git a/frontend/src/core/libraries/ace/snippets/groovy.js b/frontend/src/libraries/ace/snippets/groovy.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/groovy.js rename to frontend/src/libraries/ace/snippets/groovy.js diff --git a/frontend/src/core/libraries/ace/snippets/haml.js b/frontend/src/libraries/ace/snippets/haml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/haml.js rename to frontend/src/libraries/ace/snippets/haml.js diff --git a/frontend/src/core/libraries/ace/snippets/handlebars.js b/frontend/src/libraries/ace/snippets/handlebars.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/handlebars.js rename to frontend/src/libraries/ace/snippets/handlebars.js diff --git a/frontend/src/core/libraries/ace/snippets/haskell.js b/frontend/src/libraries/ace/snippets/haskell.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/haskell.js rename to frontend/src/libraries/ace/snippets/haskell.js diff --git a/frontend/src/core/libraries/ace/snippets/haxe.js b/frontend/src/libraries/ace/snippets/haxe.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/haxe.js rename to frontend/src/libraries/ace/snippets/haxe.js diff --git a/frontend/src/core/libraries/ace/snippets/html.js b/frontend/src/libraries/ace/snippets/html.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/html.js rename to frontend/src/libraries/ace/snippets/html.js diff --git a/frontend/src/core/libraries/ace/snippets/html_elixir.js b/frontend/src/libraries/ace/snippets/html_elixir.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/html_elixir.js rename to frontend/src/libraries/ace/snippets/html_elixir.js diff --git a/frontend/src/core/libraries/ace/snippets/html_ruby.js b/frontend/src/libraries/ace/snippets/html_ruby.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/html_ruby.js rename to frontend/src/libraries/ace/snippets/html_ruby.js diff --git a/frontend/src/core/libraries/ace/snippets/ini.js b/frontend/src/libraries/ace/snippets/ini.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ini.js rename to frontend/src/libraries/ace/snippets/ini.js diff --git a/frontend/src/core/libraries/ace/snippets/io.js b/frontend/src/libraries/ace/snippets/io.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/io.js rename to frontend/src/libraries/ace/snippets/io.js diff --git a/frontend/src/core/libraries/ace/snippets/jack.js b/frontend/src/libraries/ace/snippets/jack.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/jack.js rename to frontend/src/libraries/ace/snippets/jack.js diff --git a/frontend/src/core/libraries/ace/snippets/jade.js b/frontend/src/libraries/ace/snippets/jade.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/jade.js rename to frontend/src/libraries/ace/snippets/jade.js diff --git a/frontend/src/core/libraries/ace/snippets/java.js b/frontend/src/libraries/ace/snippets/java.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/java.js rename to frontend/src/libraries/ace/snippets/java.js diff --git a/frontend/src/core/libraries/ace/snippets/javascript.js b/frontend/src/libraries/ace/snippets/javascript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/javascript.js rename to frontend/src/libraries/ace/snippets/javascript.js diff --git a/frontend/src/core/libraries/ace/snippets/json.js b/frontend/src/libraries/ace/snippets/json.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/json.js rename to frontend/src/libraries/ace/snippets/json.js diff --git a/frontend/src/core/libraries/ace/snippets/jsoniq.js b/frontend/src/libraries/ace/snippets/jsoniq.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/jsoniq.js rename to frontend/src/libraries/ace/snippets/jsoniq.js diff --git a/frontend/src/core/libraries/ace/snippets/jsp.js b/frontend/src/libraries/ace/snippets/jsp.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/jsp.js rename to frontend/src/libraries/ace/snippets/jsp.js diff --git a/frontend/src/core/libraries/ace/snippets/jsx.js b/frontend/src/libraries/ace/snippets/jsx.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/jsx.js rename to frontend/src/libraries/ace/snippets/jsx.js diff --git a/frontend/src/core/libraries/ace/snippets/julia.js b/frontend/src/libraries/ace/snippets/julia.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/julia.js rename to frontend/src/libraries/ace/snippets/julia.js diff --git a/frontend/src/core/libraries/ace/snippets/latex.js b/frontend/src/libraries/ace/snippets/latex.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/latex.js rename to frontend/src/libraries/ace/snippets/latex.js diff --git a/frontend/src/core/libraries/ace/snippets/lean.js b/frontend/src/libraries/ace/snippets/lean.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/lean.js rename to frontend/src/libraries/ace/snippets/lean.js diff --git a/frontend/src/core/libraries/ace/snippets/less.js b/frontend/src/libraries/ace/snippets/less.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/less.js rename to frontend/src/libraries/ace/snippets/less.js diff --git a/frontend/src/core/libraries/ace/snippets/liquid.js b/frontend/src/libraries/ace/snippets/liquid.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/liquid.js rename to frontend/src/libraries/ace/snippets/liquid.js diff --git a/frontend/src/core/libraries/ace/snippets/lisp.js b/frontend/src/libraries/ace/snippets/lisp.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/lisp.js rename to frontend/src/libraries/ace/snippets/lisp.js diff --git a/frontend/src/core/libraries/ace/snippets/live_script.js b/frontend/src/libraries/ace/snippets/live_script.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/live_script.js rename to frontend/src/libraries/ace/snippets/live_script.js diff --git a/frontend/src/core/libraries/ace/snippets/livescript.js b/frontend/src/libraries/ace/snippets/livescript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/livescript.js rename to frontend/src/libraries/ace/snippets/livescript.js diff --git a/frontend/src/core/libraries/ace/snippets/logiql.js b/frontend/src/libraries/ace/snippets/logiql.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/logiql.js rename to frontend/src/libraries/ace/snippets/logiql.js diff --git a/frontend/src/core/libraries/ace/snippets/lsl.js b/frontend/src/libraries/ace/snippets/lsl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/lsl.js rename to frontend/src/libraries/ace/snippets/lsl.js diff --git a/frontend/src/core/libraries/ace/snippets/lua.js b/frontend/src/libraries/ace/snippets/lua.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/lua.js rename to frontend/src/libraries/ace/snippets/lua.js diff --git a/frontend/src/core/libraries/ace/snippets/luapage.js b/frontend/src/libraries/ace/snippets/luapage.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/luapage.js rename to frontend/src/libraries/ace/snippets/luapage.js diff --git a/frontend/src/core/libraries/ace/snippets/lucene.js b/frontend/src/libraries/ace/snippets/lucene.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/lucene.js rename to frontend/src/libraries/ace/snippets/lucene.js diff --git a/frontend/src/core/libraries/ace/snippets/makefile.js b/frontend/src/libraries/ace/snippets/makefile.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/makefile.js rename to frontend/src/libraries/ace/snippets/makefile.js diff --git a/frontend/src/core/libraries/ace/snippets/markdown.js b/frontend/src/libraries/ace/snippets/markdown.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/markdown.js rename to frontend/src/libraries/ace/snippets/markdown.js diff --git a/frontend/src/core/libraries/ace/snippets/mask.js b/frontend/src/libraries/ace/snippets/mask.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mask.js rename to frontend/src/libraries/ace/snippets/mask.js diff --git a/frontend/src/core/libraries/ace/snippets/matlab.js b/frontend/src/libraries/ace/snippets/matlab.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/matlab.js rename to frontend/src/libraries/ace/snippets/matlab.js diff --git a/frontend/src/core/libraries/ace/snippets/maze.js b/frontend/src/libraries/ace/snippets/maze.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/maze.js rename to frontend/src/libraries/ace/snippets/maze.js diff --git a/frontend/src/core/libraries/ace/snippets/mel.js b/frontend/src/libraries/ace/snippets/mel.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mel.js rename to frontend/src/libraries/ace/snippets/mel.js diff --git a/frontend/src/core/libraries/ace/snippets/mips_assembler.js b/frontend/src/libraries/ace/snippets/mips_assembler.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mips_assembler.js rename to frontend/src/libraries/ace/snippets/mips_assembler.js diff --git a/frontend/src/core/libraries/ace/snippets/mipsassembler.js b/frontend/src/libraries/ace/snippets/mipsassembler.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mipsassembler.js rename to frontend/src/libraries/ace/snippets/mipsassembler.js diff --git a/frontend/src/core/libraries/ace/snippets/mushcode.js b/frontend/src/libraries/ace/snippets/mushcode.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mushcode.js rename to frontend/src/libraries/ace/snippets/mushcode.js diff --git a/frontend/src/core/libraries/ace/snippets/mysql.js b/frontend/src/libraries/ace/snippets/mysql.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/mysql.js rename to frontend/src/libraries/ace/snippets/mysql.js diff --git a/frontend/src/core/libraries/ace/snippets/nix.js b/frontend/src/libraries/ace/snippets/nix.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/nix.js rename to frontend/src/libraries/ace/snippets/nix.js diff --git a/frontend/src/core/libraries/ace/snippets/objectivec.js b/frontend/src/libraries/ace/snippets/objectivec.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/objectivec.js rename to frontend/src/libraries/ace/snippets/objectivec.js diff --git a/frontend/src/core/libraries/ace/snippets/ocaml.js b/frontend/src/libraries/ace/snippets/ocaml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ocaml.js rename to frontend/src/libraries/ace/snippets/ocaml.js diff --git a/frontend/src/core/libraries/ace/snippets/pascal.js b/frontend/src/libraries/ace/snippets/pascal.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/pascal.js rename to frontend/src/libraries/ace/snippets/pascal.js diff --git a/frontend/src/core/libraries/ace/snippets/perl.js b/frontend/src/libraries/ace/snippets/perl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/perl.js rename to frontend/src/libraries/ace/snippets/perl.js diff --git a/frontend/src/core/libraries/ace/snippets/pgsql.js b/frontend/src/libraries/ace/snippets/pgsql.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/pgsql.js rename to frontend/src/libraries/ace/snippets/pgsql.js diff --git a/frontend/src/core/libraries/ace/snippets/php.js b/frontend/src/libraries/ace/snippets/php.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/php.js rename to frontend/src/libraries/ace/snippets/php.js diff --git a/frontend/src/core/libraries/ace/snippets/plain_text.js b/frontend/src/libraries/ace/snippets/plain_text.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/plain_text.js rename to frontend/src/libraries/ace/snippets/plain_text.js diff --git a/frontend/src/core/libraries/ace/snippets/powershell.js b/frontend/src/libraries/ace/snippets/powershell.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/powershell.js rename to frontend/src/libraries/ace/snippets/powershell.js diff --git a/frontend/src/core/libraries/ace/snippets/praat.js b/frontend/src/libraries/ace/snippets/praat.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/praat.js rename to frontend/src/libraries/ace/snippets/praat.js diff --git a/frontend/src/core/libraries/ace/snippets/prolog.js b/frontend/src/libraries/ace/snippets/prolog.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/prolog.js rename to frontend/src/libraries/ace/snippets/prolog.js diff --git a/frontend/src/core/libraries/ace/snippets/properties.js b/frontend/src/libraries/ace/snippets/properties.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/properties.js rename to frontend/src/libraries/ace/snippets/properties.js diff --git a/frontend/src/core/libraries/ace/snippets/protobuf.js b/frontend/src/libraries/ace/snippets/protobuf.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/protobuf.js rename to frontend/src/libraries/ace/snippets/protobuf.js diff --git a/frontend/src/core/libraries/ace/snippets/python.js b/frontend/src/libraries/ace/snippets/python.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/python.js rename to frontend/src/libraries/ace/snippets/python.js diff --git a/frontend/src/core/libraries/ace/snippets/r.js b/frontend/src/libraries/ace/snippets/r.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/r.js rename to frontend/src/libraries/ace/snippets/r.js diff --git a/frontend/src/core/libraries/ace/snippets/rdoc.js b/frontend/src/libraries/ace/snippets/rdoc.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/rdoc.js rename to frontend/src/libraries/ace/snippets/rdoc.js diff --git a/frontend/src/core/libraries/ace/snippets/rhtml.js b/frontend/src/libraries/ace/snippets/rhtml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/rhtml.js rename to frontend/src/libraries/ace/snippets/rhtml.js diff --git a/frontend/src/core/libraries/ace/snippets/ruby.js b/frontend/src/libraries/ace/snippets/ruby.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/ruby.js rename to frontend/src/libraries/ace/snippets/ruby.js diff --git a/frontend/src/core/libraries/ace/snippets/rust.js b/frontend/src/libraries/ace/snippets/rust.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/rust.js rename to frontend/src/libraries/ace/snippets/rust.js diff --git a/frontend/src/core/libraries/ace/snippets/sass.js b/frontend/src/libraries/ace/snippets/sass.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/sass.js rename to frontend/src/libraries/ace/snippets/sass.js diff --git a/frontend/src/core/libraries/ace/snippets/scad.js b/frontend/src/libraries/ace/snippets/scad.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/scad.js rename to frontend/src/libraries/ace/snippets/scad.js diff --git a/frontend/src/core/libraries/ace/snippets/scala.js b/frontend/src/libraries/ace/snippets/scala.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/scala.js rename to frontend/src/libraries/ace/snippets/scala.js diff --git a/frontend/src/core/libraries/ace/snippets/scheme.js b/frontend/src/libraries/ace/snippets/scheme.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/scheme.js rename to frontend/src/libraries/ace/snippets/scheme.js diff --git a/frontend/src/core/libraries/ace/snippets/scss.js b/frontend/src/libraries/ace/snippets/scss.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/scss.js rename to frontend/src/libraries/ace/snippets/scss.js diff --git a/frontend/src/core/libraries/ace/snippets/sh.js b/frontend/src/libraries/ace/snippets/sh.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/sh.js rename to frontend/src/libraries/ace/snippets/sh.js diff --git a/frontend/src/core/libraries/ace/snippets/sjs.js b/frontend/src/libraries/ace/snippets/sjs.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/sjs.js rename to frontend/src/libraries/ace/snippets/sjs.js diff --git a/frontend/src/core/libraries/ace/snippets/smarty.js b/frontend/src/libraries/ace/snippets/smarty.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/smarty.js rename to frontend/src/libraries/ace/snippets/smarty.js diff --git a/frontend/src/core/libraries/ace/snippets/snippets.js b/frontend/src/libraries/ace/snippets/snippets.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/snippets.js rename to frontend/src/libraries/ace/snippets/snippets.js diff --git a/frontend/src/core/libraries/ace/snippets/soy_template.js b/frontend/src/libraries/ace/snippets/soy_template.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/soy_template.js rename to frontend/src/libraries/ace/snippets/soy_template.js diff --git a/frontend/src/core/libraries/ace/snippets/space.js b/frontend/src/libraries/ace/snippets/space.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/space.js rename to frontend/src/libraries/ace/snippets/space.js diff --git a/frontend/src/core/libraries/ace/snippets/sql.js b/frontend/src/libraries/ace/snippets/sql.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/sql.js rename to frontend/src/libraries/ace/snippets/sql.js diff --git a/frontend/src/core/libraries/ace/snippets/sqlserver.js b/frontend/src/libraries/ace/snippets/sqlserver.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/sqlserver.js rename to frontend/src/libraries/ace/snippets/sqlserver.js diff --git a/frontend/src/core/libraries/ace/snippets/stylus.js b/frontend/src/libraries/ace/snippets/stylus.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/stylus.js rename to frontend/src/libraries/ace/snippets/stylus.js diff --git a/frontend/src/core/libraries/ace/snippets/svg.js b/frontend/src/libraries/ace/snippets/svg.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/svg.js rename to frontend/src/libraries/ace/snippets/svg.js diff --git a/frontend/src/core/libraries/ace/snippets/swift.js b/frontend/src/libraries/ace/snippets/swift.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/swift.js rename to frontend/src/libraries/ace/snippets/swift.js diff --git a/frontend/src/core/libraries/ace/snippets/swig.js b/frontend/src/libraries/ace/snippets/swig.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/swig.js rename to frontend/src/libraries/ace/snippets/swig.js diff --git a/frontend/src/core/libraries/ace/snippets/tcl.js b/frontend/src/libraries/ace/snippets/tcl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/tcl.js rename to frontend/src/libraries/ace/snippets/tcl.js diff --git a/frontend/src/core/libraries/ace/snippets/tex.js b/frontend/src/libraries/ace/snippets/tex.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/tex.js rename to frontend/src/libraries/ace/snippets/tex.js diff --git a/frontend/src/core/libraries/ace/snippets/text.js b/frontend/src/libraries/ace/snippets/text.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/text.js rename to frontend/src/libraries/ace/snippets/text.js diff --git a/frontend/src/core/libraries/ace/snippets/textile.js b/frontend/src/libraries/ace/snippets/textile.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/textile.js rename to frontend/src/libraries/ace/snippets/textile.js diff --git a/frontend/src/core/libraries/ace/snippets/toml.js b/frontend/src/libraries/ace/snippets/toml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/toml.js rename to frontend/src/libraries/ace/snippets/toml.js diff --git a/frontend/src/core/libraries/ace/snippets/twig.js b/frontend/src/libraries/ace/snippets/twig.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/twig.js rename to frontend/src/libraries/ace/snippets/twig.js diff --git a/frontend/src/core/libraries/ace/snippets/typescript.js b/frontend/src/libraries/ace/snippets/typescript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/typescript.js rename to frontend/src/libraries/ace/snippets/typescript.js diff --git a/frontend/src/core/libraries/ace/snippets/vala.js b/frontend/src/libraries/ace/snippets/vala.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/vala.js rename to frontend/src/libraries/ace/snippets/vala.js diff --git a/frontend/src/core/libraries/ace/snippets/vbscript.js b/frontend/src/libraries/ace/snippets/vbscript.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/vbscript.js rename to frontend/src/libraries/ace/snippets/vbscript.js diff --git a/frontend/src/core/libraries/ace/snippets/velocity.js b/frontend/src/libraries/ace/snippets/velocity.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/velocity.js rename to frontend/src/libraries/ace/snippets/velocity.js diff --git a/frontend/src/core/libraries/ace/snippets/verilog.js b/frontend/src/libraries/ace/snippets/verilog.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/verilog.js rename to frontend/src/libraries/ace/snippets/verilog.js diff --git a/frontend/src/core/libraries/ace/snippets/vhdl.js b/frontend/src/libraries/ace/snippets/vhdl.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/vhdl.js rename to frontend/src/libraries/ace/snippets/vhdl.js diff --git a/frontend/src/core/libraries/ace/snippets/xml.js b/frontend/src/libraries/ace/snippets/xml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/xml.js rename to frontend/src/libraries/ace/snippets/xml.js diff --git a/frontend/src/core/libraries/ace/snippets/xquery.js b/frontend/src/libraries/ace/snippets/xquery.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/xquery.js rename to frontend/src/libraries/ace/snippets/xquery.js diff --git a/frontend/src/core/libraries/ace/snippets/yaml.js b/frontend/src/libraries/ace/snippets/yaml.js similarity index 100% rename from frontend/src/core/libraries/ace/snippets/yaml.js rename to frontend/src/libraries/ace/snippets/yaml.js diff --git a/frontend/src/core/libraries/ace/theme-ambiance.js b/frontend/src/libraries/ace/theme-ambiance.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-ambiance.js rename to frontend/src/libraries/ace/theme-ambiance.js diff --git a/frontend/src/core/libraries/ace/theme-chaos.js b/frontend/src/libraries/ace/theme-chaos.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-chaos.js rename to frontend/src/libraries/ace/theme-chaos.js diff --git a/frontend/src/core/libraries/ace/theme-chrome.js b/frontend/src/libraries/ace/theme-chrome.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-chrome.js rename to frontend/src/libraries/ace/theme-chrome.js diff --git a/frontend/src/core/libraries/ace/theme-clouds.js b/frontend/src/libraries/ace/theme-clouds.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-clouds.js rename to frontend/src/libraries/ace/theme-clouds.js diff --git a/frontend/src/core/libraries/ace/theme-clouds_midnight.js b/frontend/src/libraries/ace/theme-clouds_midnight.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-clouds_midnight.js rename to frontend/src/libraries/ace/theme-clouds_midnight.js diff --git a/frontend/src/core/libraries/ace/theme-cobalt.js b/frontend/src/libraries/ace/theme-cobalt.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-cobalt.js rename to frontend/src/libraries/ace/theme-cobalt.js diff --git a/frontend/src/core/libraries/ace/theme-crimson_editor.js b/frontend/src/libraries/ace/theme-crimson_editor.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-crimson_editor.js rename to frontend/src/libraries/ace/theme-crimson_editor.js diff --git a/frontend/src/core/libraries/ace/theme-dawn.js b/frontend/src/libraries/ace/theme-dawn.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-dawn.js rename to frontend/src/libraries/ace/theme-dawn.js diff --git a/frontend/src/core/libraries/ace/theme-dreamweaver.js b/frontend/src/libraries/ace/theme-dreamweaver.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-dreamweaver.js rename to frontend/src/libraries/ace/theme-dreamweaver.js diff --git a/frontend/src/core/libraries/ace/theme-eclipse.js b/frontend/src/libraries/ace/theme-eclipse.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-eclipse.js rename to frontend/src/libraries/ace/theme-eclipse.js diff --git a/frontend/src/core/libraries/ace/theme-github.js b/frontend/src/libraries/ace/theme-github.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-github.js rename to frontend/src/libraries/ace/theme-github.js diff --git a/frontend/src/core/libraries/ace/theme-idle_fingers.js b/frontend/src/libraries/ace/theme-idle_fingers.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-idle_fingers.js rename to frontend/src/libraries/ace/theme-idle_fingers.js diff --git a/frontend/src/core/libraries/ace/theme-iplastic.js b/frontend/src/libraries/ace/theme-iplastic.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-iplastic.js rename to frontend/src/libraries/ace/theme-iplastic.js diff --git a/frontend/src/core/libraries/ace/theme-katzenmilch.js b/frontend/src/libraries/ace/theme-katzenmilch.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-katzenmilch.js rename to frontend/src/libraries/ace/theme-katzenmilch.js diff --git a/frontend/src/core/libraries/ace/theme-kr_theme.js b/frontend/src/libraries/ace/theme-kr_theme.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-kr_theme.js rename to frontend/src/libraries/ace/theme-kr_theme.js diff --git a/frontend/src/core/libraries/ace/theme-kuroir.js b/frontend/src/libraries/ace/theme-kuroir.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-kuroir.js rename to frontend/src/libraries/ace/theme-kuroir.js diff --git a/frontend/src/core/libraries/ace/theme-merbivore.js b/frontend/src/libraries/ace/theme-merbivore.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-merbivore.js rename to frontend/src/libraries/ace/theme-merbivore.js diff --git a/frontend/src/core/libraries/ace/theme-merbivore_soft.js b/frontend/src/libraries/ace/theme-merbivore_soft.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-merbivore_soft.js rename to frontend/src/libraries/ace/theme-merbivore_soft.js diff --git a/frontend/src/core/libraries/ace/theme-mono_industrial.js b/frontend/src/libraries/ace/theme-mono_industrial.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-mono_industrial.js rename to frontend/src/libraries/ace/theme-mono_industrial.js diff --git a/frontend/src/core/libraries/ace/theme-monokai.js b/frontend/src/libraries/ace/theme-monokai.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-monokai.js rename to frontend/src/libraries/ace/theme-monokai.js diff --git a/frontend/src/core/libraries/ace/theme-pastel_on_dark.js b/frontend/src/libraries/ace/theme-pastel_on_dark.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-pastel_on_dark.js rename to frontend/src/libraries/ace/theme-pastel_on_dark.js diff --git a/frontend/src/core/libraries/ace/theme-solarized_dark.js b/frontend/src/libraries/ace/theme-solarized_dark.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-solarized_dark.js rename to frontend/src/libraries/ace/theme-solarized_dark.js diff --git a/frontend/src/core/libraries/ace/theme-solarized_light.js b/frontend/src/libraries/ace/theme-solarized_light.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-solarized_light.js rename to frontend/src/libraries/ace/theme-solarized_light.js diff --git a/frontend/src/core/libraries/ace/theme-sqlserver.js b/frontend/src/libraries/ace/theme-sqlserver.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-sqlserver.js rename to frontend/src/libraries/ace/theme-sqlserver.js diff --git a/frontend/src/core/libraries/ace/theme-terminal.js b/frontend/src/libraries/ace/theme-terminal.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-terminal.js rename to frontend/src/libraries/ace/theme-terminal.js diff --git a/frontend/src/core/libraries/ace/theme-textmate.js b/frontend/src/libraries/ace/theme-textmate.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-textmate.js rename to frontend/src/libraries/ace/theme-textmate.js diff --git a/frontend/src/core/libraries/ace/theme-tomorrow.js b/frontend/src/libraries/ace/theme-tomorrow.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-tomorrow.js rename to frontend/src/libraries/ace/theme-tomorrow.js diff --git a/frontend/src/core/libraries/ace/theme-tomorrow_night.js b/frontend/src/libraries/ace/theme-tomorrow_night.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-tomorrow_night.js rename to frontend/src/libraries/ace/theme-tomorrow_night.js diff --git a/frontend/src/core/libraries/ace/theme-tomorrow_night_blue.js b/frontend/src/libraries/ace/theme-tomorrow_night_blue.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-tomorrow_night_blue.js rename to frontend/src/libraries/ace/theme-tomorrow_night_blue.js diff --git a/frontend/src/core/libraries/ace/theme-tomorrow_night_bright.js b/frontend/src/libraries/ace/theme-tomorrow_night_bright.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-tomorrow_night_bright.js rename to frontend/src/libraries/ace/theme-tomorrow_night_bright.js diff --git a/frontend/src/core/libraries/ace/theme-tomorrow_night_eighties.js b/frontend/src/libraries/ace/theme-tomorrow_night_eighties.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-tomorrow_night_eighties.js rename to frontend/src/libraries/ace/theme-tomorrow_night_eighties.js diff --git a/frontend/src/core/libraries/ace/theme-twilight.js b/frontend/src/libraries/ace/theme-twilight.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-twilight.js rename to frontend/src/libraries/ace/theme-twilight.js diff --git a/frontend/src/core/libraries/ace/theme-vibrant_ink.js b/frontend/src/libraries/ace/theme-vibrant_ink.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-vibrant_ink.js rename to frontend/src/libraries/ace/theme-vibrant_ink.js diff --git a/frontend/src/core/libraries/ace/theme-xcode.js b/frontend/src/libraries/ace/theme-xcode.js similarity index 100% rename from frontend/src/core/libraries/ace/theme-xcode.js rename to frontend/src/libraries/ace/theme-xcode.js diff --git a/frontend/src/core/libraries/ace/worker-coffee.js b/frontend/src/libraries/ace/worker-coffee.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-coffee.js rename to frontend/src/libraries/ace/worker-coffee.js diff --git a/frontend/src/core/libraries/ace/worker-css.js b/frontend/src/libraries/ace/worker-css.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-css.js rename to frontend/src/libraries/ace/worker-css.js diff --git a/frontend/src/core/libraries/ace/worker-html.js b/frontend/src/libraries/ace/worker-html.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-html.js rename to frontend/src/libraries/ace/worker-html.js diff --git a/frontend/src/core/libraries/ace/worker-javascript.js b/frontend/src/libraries/ace/worker-javascript.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-javascript.js rename to frontend/src/libraries/ace/worker-javascript.js diff --git a/frontend/src/core/libraries/ace/worker-json.js b/frontend/src/libraries/ace/worker-json.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-json.js rename to frontend/src/libraries/ace/worker-json.js diff --git a/frontend/src/core/libraries/ace/worker-lua.js b/frontend/src/libraries/ace/worker-lua.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-lua.js rename to frontend/src/libraries/ace/worker-lua.js diff --git a/frontend/src/core/libraries/ace/worker-php.js b/frontend/src/libraries/ace/worker-php.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-php.js rename to frontend/src/libraries/ace/worker-php.js diff --git a/frontend/src/core/libraries/ace/worker-xml.js b/frontend/src/libraries/ace/worker-xml.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-xml.js rename to frontend/src/libraries/ace/worker-xml.js diff --git a/frontend/src/core/libraries/ace/worker-xquery.js b/frontend/src/libraries/ace/worker-xquery.js similarity index 100% rename from frontend/src/core/libraries/ace/worker-xquery.js rename to frontend/src/libraries/ace/worker-xquery.js diff --git a/frontend/src/core/libraries/backbone-forms-lists.js b/frontend/src/libraries/backbone-forms-lists.js similarity index 100% rename from frontend/src/core/libraries/backbone-forms-lists.js rename to frontend/src/libraries/backbone-forms-lists.js diff --git a/frontend/src/core/libraries/backbone-forms.js b/frontend/src/libraries/backbone-forms.js similarity index 100% rename from frontend/src/core/libraries/backbone-forms.js rename to frontend/src/libraries/backbone-forms.js diff --git a/frontend/src/core/libraries/backbone.js b/frontend/src/libraries/backbone.js similarity index 100% rename from frontend/src/core/libraries/backbone.js rename to frontend/src/libraries/backbone.js diff --git a/frontend/src/core/libraries/backbone.localStorage.js b/frontend/src/libraries/backbone.localStorage.js similarity index 100% rename from frontend/src/core/libraries/backbone.localStorage.js rename to frontend/src/libraries/backbone.localStorage.js diff --git a/frontend/src/core/libraries/colorPicker/assets/blank.gif b/frontend/src/libraries/colorPicker/assets/blank.gif similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/blank.gif rename to frontend/src/libraries/colorPicker/assets/blank.gif diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_background.png b/frontend/src/libraries/colorPicker/assets/colorpicker_background.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_background.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_background.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_hex.png b/frontend/src/libraries/colorPicker/assets/colorpicker_hex.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_hex.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_hex.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_b.png b/frontend/src/libraries/colorPicker/assets/colorpicker_hsb_b.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_b.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_hsb_b.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_h.png b/frontend/src/libraries/colorPicker/assets/colorpicker_hsb_h.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_h.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_hsb_h.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_s.png b/frontend/src/libraries/colorPicker/assets/colorpicker_hsb_s.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_hsb_s.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_hsb_s.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_indic.gif b/frontend/src/libraries/colorPicker/assets/colorpicker_indic.gif similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_indic.gif rename to frontend/src/libraries/colorPicker/assets/colorpicker_indic.gif diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_overlay.png b/frontend/src/libraries/colorPicker/assets/colorpicker_overlay.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_overlay.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_overlay.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_b.png b/frontend/src/libraries/colorPicker/assets/colorpicker_rgb_b.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_b.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_rgb_b.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_g.png b/frontend/src/libraries/colorPicker/assets/colorpicker_rgb_g.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_g.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_rgb_g.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_r.png b/frontend/src/libraries/colorPicker/assets/colorpicker_rgb_r.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_rgb_r.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_rgb_r.png diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_select.gif b/frontend/src/libraries/colorPicker/assets/colorpicker_select.gif similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_select.gif rename to frontend/src/libraries/colorPicker/assets/colorpicker_select.gif diff --git a/frontend/src/core/libraries/colorPicker/assets/colorpicker_submit.png b/frontend/src/libraries/colorPicker/assets/colorpicker_submit.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/colorpicker_submit.png rename to frontend/src/libraries/colorPicker/assets/colorpicker_submit.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_background.png b/frontend/src/libraries/colorPicker/assets/custom_background.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_background.png rename to frontend/src/libraries/colorPicker/assets/custom_background.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_hex.png b/frontend/src/libraries/colorPicker/assets/custom_hex.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_hex.png rename to frontend/src/libraries/colorPicker/assets/custom_hex.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_hsb_b.png b/frontend/src/libraries/colorPicker/assets/custom_hsb_b.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_hsb_b.png rename to frontend/src/libraries/colorPicker/assets/custom_hsb_b.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_hsb_h.png b/frontend/src/libraries/colorPicker/assets/custom_hsb_h.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_hsb_h.png rename to frontend/src/libraries/colorPicker/assets/custom_hsb_h.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_hsb_s.png b/frontend/src/libraries/colorPicker/assets/custom_hsb_s.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_hsb_s.png rename to frontend/src/libraries/colorPicker/assets/custom_hsb_s.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_indic.gif b/frontend/src/libraries/colorPicker/assets/custom_indic.gif similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_indic.gif rename to frontend/src/libraries/colorPicker/assets/custom_indic.gif diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_rgb_b.png b/frontend/src/libraries/colorPicker/assets/custom_rgb_b.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_rgb_b.png rename to frontend/src/libraries/colorPicker/assets/custom_rgb_b.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_rgb_g.png b/frontend/src/libraries/colorPicker/assets/custom_rgb_g.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_rgb_g.png rename to frontend/src/libraries/colorPicker/assets/custom_rgb_g.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_rgb_r.png b/frontend/src/libraries/colorPicker/assets/custom_rgb_r.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_rgb_r.png rename to frontend/src/libraries/colorPicker/assets/custom_rgb_r.png diff --git a/frontend/src/core/libraries/colorPicker/assets/custom_submit.png b/frontend/src/libraries/colorPicker/assets/custom_submit.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/custom_submit.png rename to frontend/src/libraries/colorPicker/assets/custom_submit.png diff --git a/frontend/src/core/libraries/colorPicker/assets/select.png b/frontend/src/libraries/colorPicker/assets/select.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/select.png rename to frontend/src/libraries/colorPicker/assets/select.png diff --git a/frontend/src/core/libraries/colorPicker/assets/select2.png b/frontend/src/libraries/colorPicker/assets/select2.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/select2.png rename to frontend/src/libraries/colorPicker/assets/select2.png diff --git a/frontend/src/core/libraries/colorPicker/assets/slider.png b/frontend/src/libraries/colorPicker/assets/slider.png similarity index 100% rename from frontend/src/core/libraries/colorPicker/assets/slider.png rename to frontend/src/libraries/colorPicker/assets/slider.png diff --git a/frontend/src/core/libraries/colorPicker/css/colorpicker.less b/frontend/src/libraries/colorPicker/css/colorpicker.less similarity index 100% rename from frontend/src/core/libraries/colorPicker/css/colorpicker.less rename to frontend/src/libraries/colorPicker/css/colorpicker.less diff --git a/frontend/src/core/libraries/colorPicker/js/colorpicker.js b/frontend/src/libraries/colorPicker/js/colorpicker.js similarity index 100% rename from frontend/src/core/libraries/colorPicker/js/colorpicker.js rename to frontend/src/libraries/colorPicker/js/colorpicker.js diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/HELP-US-OUT.txt b/frontend/src/libraries/font-awesome-4.5.0/HELP-US-OUT.txt similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/HELP-US-OUT.txt rename to frontend/src/libraries/font-awesome-4.5.0/HELP-US-OUT.txt diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/css/font-awesome.css b/frontend/src/libraries/font-awesome-4.5.0/css/font-awesome.css similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/css/font-awesome.css rename to frontend/src/libraries/font-awesome-4.5.0/css/font-awesome.css diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/css/font-awesome.min.css b/frontend/src/libraries/font-awesome-4.5.0/css/font-awesome.min.css similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/css/font-awesome.min.css rename to frontend/src/libraries/font-awesome-4.5.0/css/font-awesome.min.css diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/FontAwesome.otf b/frontend/src/libraries/font-awesome-4.5.0/fonts/FontAwesome.otf similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/FontAwesome.otf rename to frontend/src/libraries/font-awesome-4.5.0/fonts/FontAwesome.otf diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot b/frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot rename to frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.eot diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg b/frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg rename to frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.svg diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf b/frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf rename to frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff b/frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff rename to frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff diff --git a/frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 b/frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 similarity index 100% rename from frontend/src/core/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 rename to frontend/src/libraries/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 diff --git a/frontend/src/core/libraries/handlebars.js b/frontend/src/libraries/handlebars.js similarity index 100% rename from frontend/src/core/libraries/handlebars.js rename to frontend/src/libraries/handlebars.js diff --git a/frontend/src/core/libraries/imageReady.js b/frontend/src/libraries/imageReady.js similarity index 100% rename from frontend/src/core/libraries/imageReady.js rename to frontend/src/libraries/imageReady.js diff --git a/frontend/src/core/libraries/inview.js b/frontend/src/libraries/inview.js similarity index 100% rename from frontend/src/core/libraries/inview.js rename to frontend/src/libraries/inview.js diff --git a/frontend/src/core/libraries/jquery-ui.min.js b/frontend/src/libraries/jquery-ui.min.js similarity index 100% rename from frontend/src/core/libraries/jquery-ui.min.js rename to frontend/src/libraries/jquery-ui.min.js diff --git a/frontend/src/core/libraries/jquery.form.js b/frontend/src/libraries/jquery.form.js similarity index 100% rename from frontend/src/core/libraries/jquery.form.js rename to frontend/src/libraries/jquery.form.js diff --git a/frontend/src/core/libraries/jquery.js b/frontend/src/libraries/jquery.js similarity index 100% rename from frontend/src/core/libraries/jquery.js rename to frontend/src/libraries/jquery.js diff --git a/frontend/src/core/libraries/jquery.jsoneditor.min.js b/frontend/src/libraries/jquery.jsoneditor.min.js similarity index 100% rename from frontend/src/core/libraries/jquery.jsoneditor.min.js rename to frontend/src/libraries/jquery.jsoneditor.min.js diff --git a/frontend/src/core/libraries/jquery.scrollTo.min.js b/frontend/src/libraries/jquery.scrollTo.min.js similarity index 100% rename from frontend/src/core/libraries/jquery.scrollTo.min.js rename to frontend/src/libraries/jquery.scrollTo.min.js diff --git a/frontend/src/core/libraries/jquery.tagsinput.min.js b/frontend/src/libraries/jquery.tagsinput.min.js similarity index 100% rename from frontend/src/core/libraries/jquery.tagsinput.min.js rename to frontend/src/libraries/jquery.tagsinput.min.js diff --git a/frontend/src/core/libraries/json2.js b/frontend/src/libraries/json2.js similarity index 100% rename from frontend/src/core/libraries/json2.js rename to frontend/src/libraries/json2.js diff --git a/frontend/src/core/libraries/mediaelement-and-player.js b/frontend/src/libraries/mediaelement-and-player.js similarity index 100% rename from frontend/src/core/libraries/mediaelement-and-player.js rename to frontend/src/libraries/mediaelement-and-player.js diff --git a/frontend/src/core/libraries/modernizr.js b/frontend/src/libraries/modernizr.js similarity index 100% rename from frontend/src/core/libraries/modernizr.js rename to frontend/src/libraries/modernizr.js diff --git a/frontend/src/core/libraries/moment.min.js b/frontend/src/libraries/moment.min.js similarity index 100% rename from frontend/src/core/libraries/moment.min.js rename to frontend/src/libraries/moment.min.js diff --git a/frontend/src/core/libraries/pikaday/css/pikaday.less b/frontend/src/libraries/pikaday/css/pikaday.less similarity index 100% rename from frontend/src/core/libraries/pikaday/css/pikaday.less rename to frontend/src/libraries/pikaday/css/pikaday.less diff --git a/frontend/src/core/libraries/pikaday/js/pikaday.js b/frontend/src/libraries/pikaday/js/pikaday.js similarity index 100% rename from frontend/src/core/libraries/pikaday/js/pikaday.js rename to frontend/src/libraries/pikaday/js/pikaday.js diff --git a/frontend/src/core/libraries/polyglot.min.js b/frontend/src/libraries/polyglot.min.js similarity index 100% rename from frontend/src/core/libraries/polyglot.min.js rename to frontend/src/libraries/polyglot.min.js diff --git a/frontend/src/core/libraries/require.js b/frontend/src/libraries/require.js similarity index 100% rename from frontend/src/core/libraries/require.js rename to frontend/src/libraries/require.js diff --git a/frontend/src/core/libraries/scrollTo.js b/frontend/src/libraries/scrollTo.js similarity index 100% rename from frontend/src/core/libraries/scrollTo.js rename to frontend/src/libraries/scrollTo.js diff --git a/frontend/src/core/libraries/sweetalert.min.js b/frontend/src/libraries/sweetalert.min.js similarity index 100% rename from frontend/src/core/libraries/sweetalert.min.js rename to frontend/src/libraries/sweetalert.min.js diff --git a/frontend/src/core/libraries/typeahead.js b/frontend/src/libraries/typeahead.js similarity index 100% rename from frontend/src/core/libraries/typeahead.js rename to frontend/src/libraries/typeahead.js diff --git a/frontend/src/core/libraries/underscore.js b/frontend/src/libraries/underscore.js similarity index 100% rename from frontend/src/core/libraries/underscore.js rename to frontend/src/libraries/underscore.js diff --git a/frontend/src/core/libraries/velocity.js b/frontend/src/libraries/velocity.js similarity index 100% rename from frontend/src/core/libraries/velocity.js rename to frontend/src/libraries/velocity.js diff --git a/frontend/src/core/actions/actions.js b/frontend/src/modules/actions/index.js similarity index 100% rename from frontend/src/core/actions/actions.js rename to frontend/src/modules/actions/index.js diff --git a/frontend/src/core/actions/less/actions.less b/frontend/src/modules/actions/less/actions.less similarity index 100% rename from frontend/src/core/actions/less/actions.less rename to frontend/src/modules/actions/less/actions.less diff --git a/frontend/src/core/actions/templates/actions.hbs b/frontend/src/modules/actions/templates/actions.hbs similarity index 100% rename from frontend/src/core/actions/templates/actions.hbs rename to frontend/src/modules/actions/templates/actions.hbs diff --git a/frontend/src/core/actions/views/actionsView.js b/frontend/src/modules/actions/views/actionsView.js similarity index 100% rename from frontend/src/core/actions/views/actionsView.js rename to frontend/src/modules/actions/views/actionsView.js diff --git a/frontend/src/core/assetManagement/assets/background.png b/frontend/src/modules/assetManagement/assets/background.png similarity index 100% rename from frontend/src/core/assetManagement/assets/background.png rename to frontend/src/modules/assetManagement/assets/background.png diff --git a/frontend/src/core/assetManagement/assets/bigplay.png b/frontend/src/modules/assetManagement/assets/bigplay.png similarity index 100% rename from frontend/src/core/assetManagement/assets/bigplay.png rename to frontend/src/modules/assetManagement/assets/bigplay.png diff --git a/frontend/src/core/assetManagement/assets/bigplay.svg b/frontend/src/modules/assetManagement/assets/bigplay.svg similarity index 100% rename from frontend/src/core/assetManagement/assets/bigplay.svg rename to frontend/src/modules/assetManagement/assets/bigplay.svg diff --git a/frontend/src/core/assetManagement/assets/controls-ted.png b/frontend/src/modules/assetManagement/assets/controls-ted.png similarity index 100% rename from frontend/src/core/assetManagement/assets/controls-ted.png rename to frontend/src/modules/assetManagement/assets/controls-ted.png diff --git a/frontend/src/core/assetManagement/assets/controls-wmp-bg.png b/frontend/src/modules/assetManagement/assets/controls-wmp-bg.png similarity index 100% rename from frontend/src/core/assetManagement/assets/controls-wmp-bg.png rename to frontend/src/modules/assetManagement/assets/controls-wmp-bg.png diff --git a/frontend/src/core/assetManagement/assets/controls-wmp.png b/frontend/src/modules/assetManagement/assets/controls-wmp.png similarity index 100% rename from frontend/src/core/assetManagement/assets/controls-wmp.png rename to frontend/src/modules/assetManagement/assets/controls-wmp.png diff --git a/frontend/src/core/assetManagement/assets/controls.png b/frontend/src/modules/assetManagement/assets/controls.png similarity index 100% rename from frontend/src/core/assetManagement/assets/controls.png rename to frontend/src/modules/assetManagement/assets/controls.png diff --git a/frontend/src/core/assetManagement/assets/controls.svg b/frontend/src/modules/assetManagement/assets/controls.svg similarity index 100% rename from frontend/src/core/assetManagement/assets/controls.svg rename to frontend/src/modules/assetManagement/assets/controls.svg diff --git a/frontend/src/core/assetManagement/assets/flashmediaelement.swf b/frontend/src/modules/assetManagement/assets/flashmediaelement.swf similarity index 100% rename from frontend/src/core/assetManagement/assets/flashmediaelement.swf rename to frontend/src/modules/assetManagement/assets/flashmediaelement.swf diff --git a/frontend/src/core/assetManagement/assets/loading.gif b/frontend/src/modules/assetManagement/assets/loading.gif similarity index 100% rename from frontend/src/core/assetManagement/assets/loading.gif rename to frontend/src/modules/assetManagement/assets/loading.gif diff --git a/frontend/src/core/assetManagement/assets/silverlightmediaelement.xap b/frontend/src/modules/assetManagement/assets/silverlightmediaelement.xap similarity index 100% rename from frontend/src/core/assetManagement/assets/silverlightmediaelement.xap rename to frontend/src/modules/assetManagement/assets/silverlightmediaelement.xap diff --git a/frontend/src/core/assetManagement/collections/assetCollection.js b/frontend/src/modules/assetManagement/collections/assetCollection.js similarity index 100% rename from frontend/src/core/assetManagement/collections/assetCollection.js rename to frontend/src/modules/assetManagement/collections/assetCollection.js diff --git a/frontend/src/core/assetManagement/assetManagement.js b/frontend/src/modules/assetManagement/index.js similarity index 100% rename from frontend/src/core/assetManagement/assetManagement.js rename to frontend/src/modules/assetManagement/index.js diff --git a/frontend/src/core/assetManagement/less/asset.less b/frontend/src/modules/assetManagement/less/asset.less similarity index 99% rename from frontend/src/core/assetManagement/less/asset.less rename to frontend/src/modules/assetManagement/less/asset.less index 65ac86d404..fd7d1d9549 100644 --- a/frontend/src/core/assetManagement/less/asset.less +++ b/frontend/src/modules/assetManagement/less/asset.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; .asset-picker-filters { padding: 10px; diff --git a/frontend/src/core/assetManagement/less/assetManagementModalTags.less b/frontend/src/modules/assetManagement/less/assetManagementModalTags.less similarity index 100% rename from frontend/src/core/assetManagement/less/assetManagementModalTags.less rename to frontend/src/modules/assetManagement/less/assetManagementModalTags.less diff --git a/frontend/src/core/assetManagement/less/assetManagementNew.less b/frontend/src/modules/assetManagement/less/assetManagementNew.less similarity index 86% rename from frontend/src/core/assetManagement/less/assetManagementNew.less rename to frontend/src/modules/assetManagement/less/assetManagementNew.less index 40d8b1fa77..3d8660ed89 100644 --- a/frontend/src/core/assetManagement/less/assetManagementNew.less +++ b/frontend/src/modules/assetManagement/less/assetManagementNew.less @@ -1,5 +1,5 @@ -@import '../../../less/sharedStyles.less'; -@import '../../../less/variables.less'; +@import 'sharedStyles'; +@import 'variables'; .asset-management-new-asset { .form-container-style; diff --git a/frontend/src/core/assetManagement/less/mej.less b/frontend/src/modules/assetManagement/less/mej.less similarity index 100% rename from frontend/src/core/assetManagement/less/mej.less rename to frontend/src/modules/assetManagement/less/mej.less diff --git a/frontend/src/core/assetManagement/models/assetModel.js b/frontend/src/modules/assetManagement/models/assetModel.js similarity index 100% rename from frontend/src/core/assetManagement/models/assetModel.js rename to frontend/src/modules/assetManagement/models/assetModel.js diff --git a/frontend/src/core/assetManagement/templates/assetManagement.hbs b/frontend/src/modules/assetManagement/templates/assetManagement.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagement.hbs rename to frontend/src/modules/assetManagement/templates/assetManagement.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementCollection.hbs b/frontend/src/modules/assetManagement/templates/assetManagementCollection.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementCollection.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementCollection.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementListItem.hbs b/frontend/src/modules/assetManagement/templates/assetManagementListItem.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementListItem.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementListItem.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs b/frontend/src/modules/assetManagement/templates/assetManagementModalAutofill.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementModalAutofill.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementModalAutofill.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs b/frontend/src/modules/assetManagement/templates/assetManagementModalFilters.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementModalFilters.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementModalFilters.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs b/frontend/src/modules/assetManagement/templates/assetManagementModalNewAsset.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementModalNewAsset.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementModalNewAsset.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementModalTags.hbs b/frontend/src/modules/assetManagement/templates/assetManagementModalTags.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementModalTags.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementModalTags.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs b/frontend/src/modules/assetManagement/templates/assetManagementNewAsset.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementNewAsset.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementNewAsset.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementNewAssetSidebar.hbs b/frontend/src/modules/assetManagement/templates/assetManagementNewAssetSidebar.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementNewAssetSidebar.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementNewAssetSidebar.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementPreview.hbs b/frontend/src/modules/assetManagement/templates/assetManagementPreview.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementPreview.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementPreview.hbs diff --git a/frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs b/frontend/src/modules/assetManagement/templates/assetManagementSidebar.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetManagementSidebar.hbs rename to frontend/src/modules/assetManagement/templates/assetManagementSidebar.hbs diff --git a/frontend/src/core/assetManagement/templates/assetPicker.hbs b/frontend/src/modules/assetManagement/templates/assetPicker.hbs similarity index 100% rename from frontend/src/core/assetManagement/templates/assetPicker.hbs rename to frontend/src/modules/assetManagement/templates/assetPicker.hbs diff --git a/frontend/src/core/assetManagement/views/assetManagementCollectionView.js b/frontend/src/modules/assetManagement/views/assetManagementCollectionView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementCollectionView.js rename to frontend/src/modules/assetManagement/views/assetManagementCollectionView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementItemView.js b/frontend/src/modules/assetManagement/views/assetManagementItemView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementItemView.js rename to frontend/src/modules/assetManagement/views/assetManagementItemView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js b/frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementModalAutofillView.js rename to frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementModalFiltersView.js b/frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementModalFiltersView.js rename to frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementModalNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementModalNewAssetView.js rename to frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementModalTagsView.js b/frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementModalTagsView.js rename to frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementModalView.js b/frontend/src/modules/assetManagement/views/assetManagementModalView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementModalView.js rename to frontend/src/modules/assetManagement/views/assetManagementModalView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementNewAssetSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementNewAssetSidebarView.js rename to frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementNewAssetView.js rename to frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementPreviewView.js b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementPreviewView.js rename to frontend/src/modules/assetManagement/views/assetManagementPreviewView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementSidebarView.js rename to frontend/src/modules/assetManagement/views/assetManagementSidebarView.js diff --git a/frontend/src/core/assetManagement/views/assetManagementView.js b/frontend/src/modules/assetManagement/views/assetManagementView.js similarity index 100% rename from frontend/src/core/assetManagement/views/assetManagementView.js rename to frontend/src/modules/assetManagement/views/assetManagementView.js diff --git a/frontend/src/core/dashboard/dashboard.js b/frontend/src/modules/dashboard/index.js similarity index 100% rename from frontend/src/core/dashboard/dashboard.js rename to frontend/src/modules/dashboard/index.js diff --git a/frontend/src/core/dashboard/less/dashboard.less b/frontend/src/modules/dashboard/less/dashboard.less similarity index 100% rename from frontend/src/core/dashboard/less/dashboard.less rename to frontend/src/modules/dashboard/less/dashboard.less diff --git a/frontend/src/core/dashboard/templates/dashboard.hbs b/frontend/src/modules/dashboard/templates/dashboard.hbs similarity index 100% rename from frontend/src/core/dashboard/templates/dashboard.hbs rename to frontend/src/modules/dashboard/templates/dashboard.hbs diff --git a/frontend/src/core/dashboard/templates/dashboardSidebar.hbs b/frontend/src/modules/dashboard/templates/dashboardSidebar.hbs similarity index 100% rename from frontend/src/core/dashboard/templates/dashboardSidebar.hbs rename to frontend/src/modules/dashboard/templates/dashboardSidebar.hbs diff --git a/frontend/src/core/dashboard/templates/home.hbs b/frontend/src/modules/dashboard/templates/home.hbs similarity index 100% rename from frontend/src/core/dashboard/templates/home.hbs rename to frontend/src/modules/dashboard/templates/home.hbs diff --git a/frontend/src/core/dashboard/views/dashboardSidebarView.js b/frontend/src/modules/dashboard/views/dashboardSidebarView.js similarity index 100% rename from frontend/src/core/dashboard/views/dashboardSidebarView.js rename to frontend/src/modules/dashboard/views/dashboardSidebarView.js diff --git a/frontend/src/core/dashboard/views/dashboardView.js b/frontend/src/modules/dashboard/views/dashboardView.js similarity index 100% rename from frontend/src/core/dashboard/views/dashboardView.js rename to frontend/src/modules/dashboard/views/dashboardView.js diff --git a/frontend/src/core/editor/article/index.js b/frontend/src/modules/editor/article/index.js similarity index 100% rename from frontend/src/core/editor/article/index.js rename to frontend/src/modules/editor/article/index.js diff --git a/frontend/src/core/editor/article/templates/editorArticleEdit.hbs b/frontend/src/modules/editor/article/templates/editorArticleEdit.hbs similarity index 100% rename from frontend/src/core/editor/article/templates/editorArticleEdit.hbs rename to frontend/src/modules/editor/article/templates/editorArticleEdit.hbs diff --git a/frontend/src/core/editor/article/templates/editorArticleEditSidebar.hbs b/frontend/src/modules/editor/article/templates/editorArticleEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/article/templates/editorArticleEditSidebar.hbs rename to frontend/src/modules/editor/article/templates/editorArticleEditSidebar.hbs diff --git a/frontend/src/core/editor/article/views/editorArticleEditSidebarView.js b/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/article/views/editorArticleEditSidebarView.js rename to frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js diff --git a/frontend/src/core/editor/article/views/editorArticleEditView.js b/frontend/src/modules/editor/article/views/editorArticleEditView.js similarity index 100% rename from frontend/src/core/editor/article/views/editorArticleEditView.js rename to frontend/src/modules/editor/article/views/editorArticleEditView.js diff --git a/frontend/src/core/editor/block/index.js b/frontend/src/modules/editor/block/index.js similarity index 100% rename from frontend/src/core/editor/block/index.js rename to frontend/src/modules/editor/block/index.js diff --git a/frontend/src/core/editor/block/templates/editorBlockEdit.hbs b/frontend/src/modules/editor/block/templates/editorBlockEdit.hbs similarity index 100% rename from frontend/src/core/editor/block/templates/editorBlockEdit.hbs rename to frontend/src/modules/editor/block/templates/editorBlockEdit.hbs diff --git a/frontend/src/core/editor/block/templates/editorBlockEditSidebar.hbs b/frontend/src/modules/editor/block/templates/editorBlockEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/block/templates/editorBlockEditSidebar.hbs rename to frontend/src/modules/editor/block/templates/editorBlockEditSidebar.hbs diff --git a/frontend/src/core/editor/block/views/editorBlockEditSidebarView.js b/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/block/views/editorBlockEditSidebarView.js rename to frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js diff --git a/frontend/src/core/editor/block/views/editorBlockEditView.js b/frontend/src/modules/editor/block/views/editorBlockEditView.js similarity index 100% rename from frontend/src/core/editor/block/views/editorBlockEditView.js rename to frontend/src/modules/editor/block/views/editorBlockEditView.js diff --git a/frontend/src/core/editor/component/index.js b/frontend/src/modules/editor/component/index.js similarity index 100% rename from frontend/src/core/editor/component/index.js rename to frontend/src/modules/editor/component/index.js diff --git a/frontend/src/core/editor/component/templates/editorComponentEdit.hbs b/frontend/src/modules/editor/component/templates/editorComponentEdit.hbs similarity index 100% rename from frontend/src/core/editor/component/templates/editorComponentEdit.hbs rename to frontend/src/modules/editor/component/templates/editorComponentEdit.hbs diff --git a/frontend/src/core/editor/component/templates/editorComponentEditSidebar.hbs b/frontend/src/modules/editor/component/templates/editorComponentEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/component/templates/editorComponentEditSidebar.hbs rename to frontend/src/modules/editor/component/templates/editorComponentEditSidebar.hbs diff --git a/frontend/src/core/editor/component/views/editorComponentEditSidebarView.js b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/component/views/editorComponentEditSidebarView.js rename to frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js diff --git a/frontend/src/core/editor/component/views/editorComponentEditView.js b/frontend/src/modules/editor/component/views/editorComponentEditView.js similarity index 100% rename from frontend/src/core/editor/component/views/editorComponentEditView.js rename to frontend/src/modules/editor/component/views/editorComponentEditView.js diff --git a/frontend/src/core/editor/config/collections/editorConfigCollection.js b/frontend/src/modules/editor/config/collections/editorConfigCollection.js similarity index 100% rename from frontend/src/core/editor/config/collections/editorConfigCollection.js rename to frontend/src/modules/editor/config/collections/editorConfigCollection.js diff --git a/frontend/src/core/editor/config/index.js b/frontend/src/modules/editor/config/index.js similarity index 100% rename from frontend/src/core/editor/config/index.js rename to frontend/src/modules/editor/config/index.js diff --git a/frontend/src/core/editor/config/templates/editorConfigEdit.hbs b/frontend/src/modules/editor/config/templates/editorConfigEdit.hbs similarity index 100% rename from frontend/src/core/editor/config/templates/editorConfigEdit.hbs rename to frontend/src/modules/editor/config/templates/editorConfigEdit.hbs diff --git a/frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs b/frontend/src/modules/editor/config/templates/editorConfigEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/config/templates/editorConfigEditSidebar.hbs rename to frontend/src/modules/editor/config/templates/editorConfigEditSidebar.hbs diff --git a/frontend/src/core/editor/config/views/editorConfigEditSidebarView.js b/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/config/views/editorConfigEditSidebarView.js rename to frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js diff --git a/frontend/src/core/editor/config/views/editorConfigEditView.js b/frontend/src/modules/editor/config/views/editorConfigEditView.js similarity index 100% rename from frontend/src/core/editor/config/views/editorConfigEditView.js rename to frontend/src/modules/editor/config/views/editorConfigEditView.js diff --git a/frontend/src/core/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js similarity index 100% rename from frontend/src/core/editor/contentObject/index.js rename to frontend/src/modules/editor/contentObject/index.js diff --git a/frontend/src/core/editor/contentObject/less/editing-overlay-component-list.less b/frontend/src/modules/editor/contentObject/less/editing-overlay-component-list.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editing-overlay-component-list.less rename to frontend/src/modules/editor/contentObject/less/editing-overlay-component-list.less diff --git a/frontend/src/core/editor/contentObject/less/editing-overlay-panel.less b/frontend/src/modules/editor/contentObject/less/editing-overlay-panel.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editing-overlay-panel.less rename to frontend/src/modules/editor/contentObject/less/editing-overlay-panel.less diff --git a/frontend/src/core/editor/contentObject/less/editorMenu.less b/frontend/src/modules/editor/contentObject/less/editorMenu.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorMenu.less rename to frontend/src/modules/editor/contentObject/less/editorMenu.less diff --git a/frontend/src/core/editor/contentObject/less/editorMenuItem.less b/frontend/src/modules/editor/contentObject/less/editorMenuItem.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorMenuItem.less rename to frontend/src/modules/editor/contentObject/less/editorMenuItem.less diff --git a/frontend/src/core/editor/contentObject/less/editorMenuLayer.less b/frontend/src/modules/editor/contentObject/less/editorMenuLayer.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorMenuLayer.less rename to frontend/src/modules/editor/contentObject/less/editorMenuLayer.less diff --git a/frontend/src/core/editor/contentObject/less/editorPage.less b/frontend/src/modules/editor/contentObject/less/editorPage.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorPage.less rename to frontend/src/modules/editor/contentObject/less/editorPage.less diff --git a/frontend/src/core/editor/contentObject/less/editorPageArticle.less b/frontend/src/modules/editor/contentObject/less/editorPageArticle.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorPageArticle.less rename to frontend/src/modules/editor/contentObject/less/editorPageArticle.less diff --git a/frontend/src/core/editor/contentObject/less/editorPageBlock.less b/frontend/src/modules/editor/contentObject/less/editorPageBlock.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorPageBlock.less rename to frontend/src/modules/editor/contentObject/less/editorPageBlock.less diff --git a/frontend/src/core/editor/contentObject/less/editorPageComponent.less b/frontend/src/modules/editor/contentObject/less/editorPageComponent.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorPageComponent.less rename to frontend/src/modules/editor/contentObject/less/editorPageComponent.less diff --git a/frontend/src/core/editor/contentObject/less/editorPageComponentList.less b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less similarity index 100% rename from frontend/src/core/editor/contentObject/less/editorPageComponentList.less rename to frontend/src/modules/editor/contentObject/less/editorPageComponentList.less diff --git a/frontend/src/core/editor/contentObject/templates/editorMenu.hbs b/frontend/src/modules/editor/contentObject/templates/editorMenu.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorMenu.hbs rename to frontend/src/modules/editor/contentObject/templates/editorMenu.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorMenuItem.hbs b/frontend/src/modules/editor/contentObject/templates/editorMenuItem.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorMenuItem.hbs rename to frontend/src/modules/editor/contentObject/templates/editorMenuItem.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs b/frontend/src/modules/editor/contentObject/templates/editorMenuLayer.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorMenuLayer.hbs rename to frontend/src/modules/editor/contentObject/templates/editorMenuLayer.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorMenuSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorMenuSidebar.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorMenuSidebar.hbs rename to frontend/src/modules/editor/contentObject/templates/editorMenuSidebar.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPage.hbs b/frontend/src/modules/editor/contentObject/templates/editorPage.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPage.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPage.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageArticle.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageArticle.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageBlock.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageBlock.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageComponent.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageComponent.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageComponentList.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageComponentList.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageComponentListItem.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageComponentListItem.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageComponentListSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageComponentListSidebar.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageComponentPasteZone.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageComponentPasteZone.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageEdit.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageEdit.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageEditSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageEditSidebar.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs diff --git a/frontend/src/core/editor/contentObject/templates/editorPageSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageSidebar.hbs similarity index 100% rename from frontend/src/core/editor/contentObject/templates/editorPageSidebar.hbs rename to frontend/src/modules/editor/contentObject/templates/editorPageSidebar.hbs diff --git a/frontend/src/core/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorMenuItemView.js rename to frontend/src/modules/editor/contentObject/views/editorMenuItemView.js diff --git a/frontend/src/core/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorMenuLayerView.js rename to frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js diff --git a/frontend/src/core/editor/contentObject/views/editorMenuSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorMenuSidebarView.js rename to frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js diff --git a/frontend/src/core/editor/contentObject/views/editorMenuView.js b/frontend/src/modules/editor/contentObject/views/editorMenuView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorMenuView.js rename to frontend/src/modules/editor/contentObject/views/editorMenuView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageArticleView.js b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageArticleView.js rename to frontend/src/modules/editor/contentObject/views/editorPageArticleView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageBlockView.js b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageBlockView.js rename to frontend/src/modules/editor/contentObject/views/editorPageBlockView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageComponentListItemView.js rename to frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageComponentListSidebarView.js rename to frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentListView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageComponentListView.js rename to frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentPasteZoneView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageComponentPasteZoneView.js rename to frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageComponentView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageComponentView.js rename to frontend/src/modules/editor/contentObject/views/editorPageComponentView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageEditSidebarView.js rename to frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageEditView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageEditView.js rename to frontend/src/modules/editor/contentObject/views/editorPageEditView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageSidebarView.js rename to frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js diff --git a/frontend/src/core/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js similarity index 100% rename from frontend/src/core/editor/contentObject/views/editorPageView.js rename to frontend/src/modules/editor/contentObject/views/editorPageView.js diff --git a/frontend/src/core/editor/course/index.js b/frontend/src/modules/editor/course/index.js similarity index 100% rename from frontend/src/core/editor/course/index.js rename to frontend/src/modules/editor/course/index.js diff --git a/frontend/src/core/editor/course/templates/editorCourseEdit.hbs b/frontend/src/modules/editor/course/templates/editorCourseEdit.hbs similarity index 100% rename from frontend/src/core/editor/course/templates/editorCourseEdit.hbs rename to frontend/src/modules/editor/course/templates/editorCourseEdit.hbs diff --git a/frontend/src/core/editor/course/templates/editorCourseEditSidebar.hbs b/frontend/src/modules/editor/course/templates/editorCourseEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/course/templates/editorCourseEditSidebar.hbs rename to frontend/src/modules/editor/course/templates/editorCourseEditSidebar.hbs diff --git a/frontend/src/core/editor/course/views/editorCourseEditSidebarView.js b/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/course/views/editorCourseEditSidebarView.js rename to frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js diff --git a/frontend/src/core/editor/course/views/editorCourseEditView.js b/frontend/src/modules/editor/course/views/editorCourseEditView.js similarity index 100% rename from frontend/src/core/editor/course/views/editorCourseEditView.js rename to frontend/src/modules/editor/course/views/editorCourseEditView.js diff --git a/frontend/src/core/editor/extensions/index.js b/frontend/src/modules/editor/extensions/index.js similarity index 100% rename from frontend/src/core/editor/extensions/index.js rename to frontend/src/modules/editor/extensions/index.js diff --git a/frontend/src/core/editor/extensions/less/extensions.less b/frontend/src/modules/editor/extensions/less/extensions.less similarity index 100% rename from frontend/src/core/editor/extensions/less/extensions.less rename to frontend/src/modules/editor/extensions/less/extensions.less diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs b/frontend/src/modules/editor/extensions/templates/editorExtensionsEdit.hbs similarity index 100% rename from frontend/src/core/editor/extensions/templates/editorExtensionsEdit.hbs rename to frontend/src/modules/editor/extensions/templates/editorExtensionsEdit.hbs diff --git a/frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs b/frontend/src/modules/editor/extensions/templates/editorExtensionsEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/extensions/templates/editorExtensionsEditSidebar.hbs rename to frontend/src/modules/editor/extensions/templates/editorExtensionsEditSidebar.hbs diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/extensions/views/editorExtensionsEditSidebarView.js rename to frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js diff --git a/frontend/src/core/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js similarity index 100% rename from frontend/src/core/editor/extensions/views/editorExtensionsEditView.js rename to frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js diff --git a/frontend/src/core/editor/global/collections/editorCollection.js b/frontend/src/modules/editor/global/collections/editorCollection.js similarity index 100% rename from frontend/src/core/editor/global/collections/editorCollection.js rename to frontend/src/modules/editor/global/collections/editorCollection.js diff --git a/frontend/src/core/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js similarity index 100% rename from frontend/src/core/editor/global/editorDataLoader.js rename to frontend/src/modules/editor/global/editorDataLoader.js diff --git a/frontend/src/core/editor/global/helpers.js b/frontend/src/modules/editor/global/helpers.js similarity index 100% rename from frontend/src/core/editor/global/helpers.js rename to frontend/src/modules/editor/global/helpers.js diff --git a/frontend/src/core/editor/global/less/editor.less b/frontend/src/modules/editor/global/less/editor.less similarity index 100% rename from frontend/src/core/editor/global/less/editor.less rename to frontend/src/modules/editor/global/less/editor.less diff --git a/frontend/src/core/editor/global/templates/editor.hbs b/frontend/src/modules/editor/global/templates/editor.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/editor.hbs rename to frontend/src/modules/editor/global/templates/editor.hbs diff --git a/frontend/src/core/editor/global/templates/editorPasteZone.hbs b/frontend/src/modules/editor/global/templates/editorPasteZone.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/editorPasteZone.hbs rename to frontend/src/modules/editor/global/templates/editorPasteZone.hbs diff --git a/frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs b/frontend/src/modules/editor/global/templates/partials/part_editorCommon.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/partials/part_editorCommon.hbs rename to frontend/src/modules/editor/global/templates/partials/part_editorCommon.hbs diff --git a/frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs b/frontend/src/modules/editor/global/templates/partials/part_editorItemSidebar.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/partials/part_editorItemSidebar.hbs rename to frontend/src/modules/editor/global/templates/partials/part_editorItemSidebar.hbs diff --git a/frontend/src/core/editor/global/templates/partials/part_editorMenu.hbs b/frontend/src/modules/editor/global/templates/partials/part_editorMenu.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/partials/part_editorMenu.hbs rename to frontend/src/modules/editor/global/templates/partials/part_editorMenu.hbs diff --git a/frontend/src/core/editor/global/templates/partials/part_settingsGeneral.hbs b/frontend/src/modules/editor/global/templates/partials/part_settingsGeneral.hbs similarity index 100% rename from frontend/src/core/editor/global/templates/partials/part_settingsGeneral.hbs rename to frontend/src/modules/editor/global/templates/partials/part_settingsGeneral.hbs diff --git a/frontend/src/core/editor/global/views/editorOriginView.js b/frontend/src/modules/editor/global/views/editorOriginView.js similarity index 100% rename from frontend/src/core/editor/global/views/editorOriginView.js rename to frontend/src/modules/editor/global/views/editorOriginView.js diff --git a/frontend/src/core/editor/global/views/editorPasteZoneView.js b/frontend/src/modules/editor/global/views/editorPasteZoneView.js similarity index 100% rename from frontend/src/core/editor/global/views/editorPasteZoneView.js rename to frontend/src/modules/editor/global/views/editorPasteZoneView.js diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/modules/editor/global/views/editorView.js similarity index 100% rename from frontend/src/core/editor/global/views/editorView.js rename to frontend/src/modules/editor/global/views/editorView.js diff --git a/frontend/src/core/editor/editor.js b/frontend/src/modules/editor/index.js similarity index 100% rename from frontend/src/core/editor/editor.js rename to frontend/src/modules/editor/index.js diff --git a/frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js b/frontend/src/modules/editor/menuSettings/collections/editorMenuSettingsCollection.js similarity index 100% rename from frontend/src/core/editor/menuSettings/collections/editorMenuSettingsCollection.js rename to frontend/src/modules/editor/menuSettings/collections/editorMenuSettingsCollection.js diff --git a/frontend/src/core/editor/menuSettings/index.js b/frontend/src/modules/editor/menuSettings/index.js similarity index 100% rename from frontend/src/core/editor/menuSettings/index.js rename to frontend/src/modules/editor/menuSettings/index.js diff --git a/frontend/src/core/editor/menuSettings/less/menusettings.less b/frontend/src/modules/editor/menuSettings/less/menusettings.less similarity index 100% rename from frontend/src/core/editor/menuSettings/less/menusettings.less rename to frontend/src/modules/editor/menuSettings/less/menusettings.less diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs b/frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsEdit.hbs similarity index 100% rename from frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEdit.hbs rename to frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsEdit.hbs diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs b/frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs rename to frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsEditSidebar.hbs diff --git a/frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs b/frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsItem.hbs similarity index 100% rename from frontend/src/core/editor/menuSettings/templates/editorMenuSettingsItem.hbs rename to frontend/src/modules/editor/menuSettings/templates/editorMenuSettingsItem.hbs diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js rename to frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js similarity index 100% rename from frontend/src/core/editor/menuSettings/views/editorMenuSettingsEditView.js rename to frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js diff --git a/frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js similarity index 100% rename from frontend/src/core/editor/menuSettings/views/editorMenuSettingsView.js rename to frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js diff --git a/frontend/src/core/editor/selectTheme/collections/editorThemeCollection.js b/frontend/src/modules/editor/selectTheme/collections/editorThemeCollection.js similarity index 100% rename from frontend/src/core/editor/selectTheme/collections/editorThemeCollection.js rename to frontend/src/modules/editor/selectTheme/collections/editorThemeCollection.js diff --git a/frontend/src/core/editor/selectTheme/index.js b/frontend/src/modules/editor/selectTheme/index.js similarity index 100% rename from frontend/src/core/editor/selectTheme/index.js rename to frontend/src/modules/editor/selectTheme/index.js diff --git a/frontend/src/core/editor/selectTheme/less/editorTheme.less b/frontend/src/modules/editor/selectTheme/less/editorTheme.less similarity index 100% rename from frontend/src/core/editor/selectTheme/less/editorTheme.less rename to frontend/src/modules/editor/selectTheme/less/editorTheme.less diff --git a/frontend/src/core/editor/selectTheme/templates/editorThemeCollection.hbs b/frontend/src/modules/editor/selectTheme/templates/editorThemeCollection.hbs similarity index 100% rename from frontend/src/core/editor/selectTheme/templates/editorThemeCollection.hbs rename to frontend/src/modules/editor/selectTheme/templates/editorThemeCollection.hbs diff --git a/frontend/src/core/editor/selectTheme/templates/editorThemeCollectionSidebar.hbs b/frontend/src/modules/editor/selectTheme/templates/editorThemeCollectionSidebar.hbs similarity index 100% rename from frontend/src/core/editor/selectTheme/templates/editorThemeCollectionSidebar.hbs rename to frontend/src/modules/editor/selectTheme/templates/editorThemeCollectionSidebar.hbs diff --git a/frontend/src/core/editor/selectTheme/templates/editorThemeEdit.hbs b/frontend/src/modules/editor/selectTheme/templates/editorThemeEdit.hbs similarity index 100% rename from frontend/src/core/editor/selectTheme/templates/editorThemeEdit.hbs rename to frontend/src/modules/editor/selectTheme/templates/editorThemeEdit.hbs diff --git a/frontend/src/core/editor/selectTheme/templates/editorThemeEditSidebar.hbs b/frontend/src/modules/editor/selectTheme/templates/editorThemeEditSidebar.hbs similarity index 100% rename from frontend/src/core/editor/selectTheme/templates/editorThemeEditSidebar.hbs rename to frontend/src/modules/editor/selectTheme/templates/editorThemeEditSidebar.hbs diff --git a/frontend/src/core/editor/selectTheme/templates/editorThemeItem.hbs b/frontend/src/modules/editor/selectTheme/templates/editorThemeItem.hbs similarity index 100% rename from frontend/src/core/editor/selectTheme/templates/editorThemeItem.hbs rename to frontend/src/modules/editor/selectTheme/templates/editorThemeItem.hbs diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeCollectionSidebarView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeCollectionSidebarView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeCollectionView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeCollectionView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeEditSidebarView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeEditSidebarView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeEditView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeEditView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeItemView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeItemView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js diff --git a/frontend/src/core/editor/selectTheme/views/editorThemeView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeView.js similarity index 100% rename from frontend/src/core/editor/selectTheme/views/editorThemeView.js rename to frontend/src/modules/editor/selectTheme/views/editorThemeView.js diff --git a/frontend/src/core/filters/filters.js b/frontend/src/modules/filters/index.js similarity index 100% rename from frontend/src/core/filters/filters.js rename to frontend/src/modules/filters/index.js diff --git a/frontend/src/core/filters/less/typeAhead.less b/frontend/src/modules/filters/less/typeAhead.less similarity index 100% rename from frontend/src/core/filters/less/typeAhead.less rename to frontend/src/modules/filters/less/typeAhead.less diff --git a/frontend/src/core/filters/templates/typeAhead.hbs b/frontend/src/modules/filters/templates/typeAhead.hbs similarity index 100% rename from frontend/src/core/filters/templates/typeAhead.hbs rename to frontend/src/modules/filters/templates/typeAhead.hbs diff --git a/frontend/src/core/filters/views/typeAheadView.js b/frontend/src/modules/filters/views/typeAheadView.js similarity index 100% rename from frontend/src/core/filters/views/typeAheadView.js rename to frontend/src/modules/filters/views/typeAheadView.js diff --git a/frontend/src/core/globalMenu/globalMenu.js b/frontend/src/modules/globalMenu/index.js similarity index 100% rename from frontend/src/core/globalMenu/globalMenu.js rename to frontend/src/modules/globalMenu/index.js diff --git a/frontend/src/core/globalMenu/less/globalMenu.less b/frontend/src/modules/globalMenu/less/globalMenu.less similarity index 100% rename from frontend/src/core/globalMenu/less/globalMenu.less rename to frontend/src/modules/globalMenu/less/globalMenu.less diff --git a/frontend/src/core/globalMenu/templates/globalMenu.hbs b/frontend/src/modules/globalMenu/templates/globalMenu.hbs similarity index 100% rename from frontend/src/core/globalMenu/templates/globalMenu.hbs rename to frontend/src/modules/globalMenu/templates/globalMenu.hbs diff --git a/frontend/src/core/globalMenu/templates/globalMenuItem.hbs b/frontend/src/modules/globalMenu/templates/globalMenuItem.hbs similarity index 100% rename from frontend/src/core/globalMenu/templates/globalMenuItem.hbs rename to frontend/src/modules/globalMenu/templates/globalMenuItem.hbs diff --git a/frontend/src/core/globalMenu/views/globalMenuItemView.js b/frontend/src/modules/globalMenu/views/globalMenuItemView.js similarity index 100% rename from frontend/src/core/globalMenu/views/globalMenuItemView.js rename to frontend/src/modules/globalMenu/views/globalMenuItemView.js diff --git a/frontend/src/core/globalMenu/views/globalMenuView.js b/frontend/src/modules/globalMenu/views/globalMenuView.js similarity index 100% rename from frontend/src/core/globalMenu/views/globalMenuView.js rename to frontend/src/modules/globalMenu/views/globalMenuView.js diff --git a/frontend/src/core/help/help.js b/frontend/src/modules/help/index.js similarity index 100% rename from frontend/src/core/help/help.js rename to frontend/src/modules/help/index.js diff --git a/frontend/src/core/location/location.js b/frontend/src/modules/location/index.js similarity index 100% rename from frontend/src/core/location/location.js rename to frontend/src/modules/location/index.js diff --git a/frontend/src/core/location/less/location.less b/frontend/src/modules/location/less/location.less similarity index 100% rename from frontend/src/core/location/less/location.less rename to frontend/src/modules/location/less/location.less diff --git a/frontend/src/core/location/templates/locationTitle.hbs b/frontend/src/modules/location/templates/locationTitle.hbs similarity index 100% rename from frontend/src/core/location/templates/locationTitle.hbs rename to frontend/src/modules/location/templates/locationTitle.hbs diff --git a/frontend/src/core/location/views/locationTitleView.js b/frontend/src/modules/location/views/locationTitleView.js similarity index 100% rename from frontend/src/core/location/views/locationTitleView.js rename to frontend/src/modules/location/views/locationTitleView.js diff --git a/frontend/src/core/modal/modal.js b/frontend/src/modules/modal/index.js similarity index 100% rename from frontend/src/core/modal/modal.js rename to frontend/src/modules/modal/index.js diff --git a/frontend/src/core/modal/less/modal.less b/frontend/src/modules/modal/less/modal.less similarity index 98% rename from frontend/src/core/modal/less/modal.less rename to frontend/src/modules/modal/less/modal.less index 181b2821f3..4f309373b7 100644 --- a/frontend/src/core/modal/less/modal.less +++ b/frontend/src/modules/modal/less/modal.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; // Modal styling // ============== diff --git a/frontend/src/core/modal/models/modalModel.js b/frontend/src/modules/modal/models/modalModel.js similarity index 100% rename from frontend/src/core/modal/models/modalModel.js rename to frontend/src/modules/modal/models/modalModel.js diff --git a/frontend/src/core/modal/templates/modal.hbs b/frontend/src/modules/modal/templates/modal.hbs similarity index 100% rename from frontend/src/core/modal/templates/modal.hbs rename to frontend/src/modules/modal/templates/modal.hbs diff --git a/frontend/src/core/modal/views/modalView.js b/frontend/src/modules/modal/views/modalView.js similarity index 100% rename from frontend/src/core/modal/views/modalView.js rename to frontend/src/modules/modal/views/modalView.js diff --git a/frontend/src/modules/modules.js b/frontend/src/modules/modules.js new file mode 100644 index 0000000000..fde8483880 --- /dev/null +++ b/frontend/src/modules/modules.js @@ -0,0 +1 @@ +require(['/modules/actions/index.js','/modules/assetManagement/index.js','/modules/dashboard/index.js','/modules/editor/index.js','/modules/filters/index.js','/modules/globalMenu/index.js','/modules/help/index.js','/modules/location/index.js','/modules/modal/index.js','/modules/navigation/index.js','/modules/notify/index.js','/modules/options/index.js','/modules/pluginManagement/index.js','/modules/project/index.js','/modules/scaffold/index.js','/modules/sidebar/index.js','/modules/user/index.js']); \ No newline at end of file diff --git a/frontend/src/core/navigation/less/navigation.less b/frontend/src/modules/navigation/less/navigation.less similarity index 100% rename from frontend/src/core/navigation/less/navigation.less rename to frontend/src/modules/navigation/less/navigation.less diff --git a/frontend/src/core/navigation/templates/navigation.hbs b/frontend/src/modules/navigation/templates/navigation.hbs similarity index 100% rename from frontend/src/core/navigation/templates/navigation.hbs rename to frontend/src/modules/navigation/templates/navigation.hbs diff --git a/frontend/src/core/navigation/views/navigationView.js b/frontend/src/modules/navigation/views/navigationView.js similarity index 100% rename from frontend/src/core/navigation/views/navigationView.js rename to frontend/src/modules/navigation/views/navigationView.js diff --git a/frontend/src/core/notify/notify.js b/frontend/src/modules/notify/index.js similarity index 100% rename from frontend/src/core/notify/notify.js rename to frontend/src/modules/notify/index.js diff --git a/frontend/src/core/notify/plugins/alert/assets/sweetalert.css b/frontend/src/modules/notify/plugins/alert/assets/sweetalert.css similarity index 100% rename from frontend/src/core/notify/plugins/alert/assets/sweetalert.css rename to frontend/src/modules/notify/plugins/alert/assets/sweetalert.css diff --git a/frontend/src/core/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js similarity index 100% rename from frontend/src/core/notify/plugins/alert/index.js rename to frontend/src/modules/notify/plugins/alert/index.js diff --git a/frontend/src/core/notify/plugins/alert/less/alert.less b/frontend/src/modules/notify/plugins/alert/less/alert.less similarity index 100% rename from frontend/src/core/notify/plugins/alert/less/alert.less rename to frontend/src/modules/notify/plugins/alert/less/alert.less diff --git a/frontend/src/core/notify/plugins/console/index.js b/frontend/src/modules/notify/plugins/console/index.js similarity index 100% rename from frontend/src/core/notify/plugins/console/index.js rename to frontend/src/modules/notify/plugins/console/index.js diff --git a/frontend/src/core/options/options.js b/frontend/src/modules/options/index.js similarity index 100% rename from frontend/src/core/options/options.js rename to frontend/src/modules/options/index.js diff --git a/frontend/src/core/options/less/options.less b/frontend/src/modules/options/less/options.less similarity index 100% rename from frontend/src/core/options/less/options.less rename to frontend/src/modules/options/less/options.less diff --git a/frontend/src/core/options/templates/options.hbs b/frontend/src/modules/options/templates/options.hbs similarity index 100% rename from frontend/src/core/options/templates/options.hbs rename to frontend/src/modules/options/templates/options.hbs diff --git a/frontend/src/core/options/templates/optionsGroup.hbs b/frontend/src/modules/options/templates/optionsGroup.hbs similarity index 100% rename from frontend/src/core/options/templates/optionsGroup.hbs rename to frontend/src/modules/options/templates/optionsGroup.hbs diff --git a/frontend/src/core/options/templates/optionsItem.hbs b/frontend/src/modules/options/templates/optionsItem.hbs similarity index 100% rename from frontend/src/core/options/templates/optionsItem.hbs rename to frontend/src/modules/options/templates/optionsItem.hbs diff --git a/frontend/src/core/options/views/optionsView.js b/frontend/src/modules/options/views/optionsView.js similarity index 100% rename from frontend/src/core/options/views/optionsView.js rename to frontend/src/modules/options/views/optionsView.js diff --git a/frontend/src/core/pluginManagement/collections/componentTypeCollection.js b/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js similarity index 100% rename from frontend/src/core/pluginManagement/collections/componentTypeCollection.js rename to frontend/src/modules/pluginManagement/collections/componentTypeCollection.js diff --git a/frontend/src/core/pluginManagement/collections/extensionTypeCollection.js b/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js similarity index 100% rename from frontend/src/core/pluginManagement/collections/extensionTypeCollection.js rename to frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js diff --git a/frontend/src/core/pluginManagement/collections/menuTypeCollection.js b/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js similarity index 100% rename from frontend/src/core/pluginManagement/collections/menuTypeCollection.js rename to frontend/src/modules/pluginManagement/collections/menuTypeCollection.js diff --git a/frontend/src/core/pluginManagement/collections/themeTypeCollection.js b/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js similarity index 100% rename from frontend/src/core/pluginManagement/collections/themeTypeCollection.js rename to frontend/src/modules/pluginManagement/collections/themeTypeCollection.js diff --git a/frontend/src/core/pluginManagement/pluginManagement.js b/frontend/src/modules/pluginManagement/index.js similarity index 100% rename from frontend/src/core/pluginManagement/pluginManagement.js rename to frontend/src/modules/pluginManagement/index.js diff --git a/frontend/src/core/pluginManagement/less/pluginManagement.less b/frontend/src/modules/pluginManagement/less/pluginManagement.less similarity index 88% rename from frontend/src/core/pluginManagement/less/pluginManagement.less rename to frontend/src/modules/pluginManagement/less/pluginManagement.less index 9114a4976f..b220157366 100644 --- a/frontend/src/core/pluginManagement/less/pluginManagement.less +++ b/frontend/src/modules/pluginManagement/less/pluginManagement.less @@ -1,4 +1,4 @@ -@import '../../../less/sharedStyles.less'; +@import 'sharedStyles'; .pluginManagement { &-inner { diff --git a/frontend/src/core/pluginManagement/less/pluginType.less b/frontend/src/modules/pluginManagement/less/pluginType.less similarity index 100% rename from frontend/src/core/pluginManagement/less/pluginType.less rename to frontend/src/modules/pluginManagement/less/pluginType.less diff --git a/frontend/src/core/pluginManagement/models/componentTypeModel.js b/frontend/src/modules/pluginManagement/models/componentTypeModel.js similarity index 100% rename from frontend/src/core/pluginManagement/models/componentTypeModel.js rename to frontend/src/modules/pluginManagement/models/componentTypeModel.js diff --git a/frontend/src/core/pluginManagement/models/extensionTypeModel.js b/frontend/src/modules/pluginManagement/models/extensionTypeModel.js similarity index 100% rename from frontend/src/core/pluginManagement/models/extensionTypeModel.js rename to frontend/src/modules/pluginManagement/models/extensionTypeModel.js diff --git a/frontend/src/core/pluginManagement/models/menuTypeModel.js b/frontend/src/modules/pluginManagement/models/menuTypeModel.js similarity index 100% rename from frontend/src/core/pluginManagement/models/menuTypeModel.js rename to frontend/src/modules/pluginManagement/models/menuTypeModel.js diff --git a/frontend/src/core/pluginManagement/models/themeTypeModel.js b/frontend/src/modules/pluginManagement/models/themeTypeModel.js similarity index 100% rename from frontend/src/core/pluginManagement/models/themeTypeModel.js rename to frontend/src/modules/pluginManagement/models/themeTypeModel.js diff --git a/frontend/src/core/pluginManagement/templates/pluginManagement.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagement.hbs similarity index 100% rename from frontend/src/core/pluginManagement/templates/pluginManagement.hbs rename to frontend/src/modules/pluginManagement/templates/pluginManagement.hbs diff --git a/frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs similarity index 100% rename from frontend/src/core/pluginManagement/templates/pluginManagementSidebar.hbs rename to frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs diff --git a/frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs similarity index 100% rename from frontend/src/core/pluginManagement/templates/pluginManagementUpload.hbs rename to frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs diff --git a/frontend/src/core/pluginManagement/templates/pluginManagementUploadSidebar.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs similarity index 100% rename from frontend/src/core/pluginManagement/templates/pluginManagementUploadSidebar.hbs rename to frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs diff --git a/frontend/src/core/pluginManagement/templates/pluginType.hbs b/frontend/src/modules/pluginManagement/templates/pluginType.hbs similarity index 100% rename from frontend/src/core/pluginManagement/templates/pluginType.hbs rename to frontend/src/modules/pluginManagement/templates/pluginType.hbs diff --git a/frontend/src/core/pluginManagement/views/pluginManagementSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js similarity index 100% rename from frontend/src/core/pluginManagement/views/pluginManagementSidebarView.js rename to frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js diff --git a/frontend/src/core/pluginManagement/views/pluginManagementUploadSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js similarity index 100% rename from frontend/src/core/pluginManagement/views/pluginManagementUploadSidebarView.js rename to frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js diff --git a/frontend/src/core/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js similarity index 100% rename from frontend/src/core/pluginManagement/views/pluginManagementUploadView.js rename to frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js diff --git a/frontend/src/core/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js similarity index 100% rename from frontend/src/core/pluginManagement/views/pluginManagementView.js rename to frontend/src/modules/pluginManagement/views/pluginManagementView.js diff --git a/frontend/src/core/pluginManagement/views/pluginTypeView.js b/frontend/src/modules/pluginManagement/views/pluginTypeView.js similarity index 100% rename from frontend/src/core/pluginManagement/views/pluginTypeView.js rename to frontend/src/modules/pluginManagement/views/pluginTypeView.js diff --git a/frontend/src/core/project/collections/myProjectCollection.js b/frontend/src/modules/project/collections/myProjectCollection.js similarity index 100% rename from frontend/src/core/project/collections/myProjectCollection.js rename to frontend/src/modules/project/collections/myProjectCollection.js diff --git a/frontend/src/core/project/collections/projectCollection.js b/frontend/src/modules/project/collections/projectCollection.js similarity index 100% rename from frontend/src/core/project/collections/projectCollection.js rename to frontend/src/modules/project/collections/projectCollection.js diff --git a/frontend/src/core/project/collections/sharedProjectCollection.js b/frontend/src/modules/project/collections/sharedProjectCollection.js similarity index 100% rename from frontend/src/core/project/collections/sharedProjectCollection.js rename to frontend/src/modules/project/collections/sharedProjectCollection.js diff --git a/frontend/src/core/project/less/project.less b/frontend/src/modules/project/less/project.less similarity index 99% rename from frontend/src/core/project/less/project.less rename to frontend/src/modules/project/less/project.less index 04cfa2cbd0..1f267663fb 100644 --- a/frontend/src/core/project/less/project.less +++ b/frontend/src/modules/project/less/project.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; @toolbar-height: 30px; @preview-height: 247px; diff --git a/frontend/src/core/project/templates/project.hbs b/frontend/src/modules/project/templates/project.hbs similarity index 100% rename from frontend/src/core/project/templates/project.hbs rename to frontend/src/modules/project/templates/project.hbs diff --git a/frontend/src/core/project/templates/sharedProject.hbs b/frontend/src/modules/project/templates/sharedProject.hbs similarity index 100% rename from frontend/src/core/project/templates/sharedProject.hbs rename to frontend/src/modules/project/templates/sharedProject.hbs diff --git a/frontend/src/core/project/views/projectView.js b/frontend/src/modules/project/views/projectView.js similarity index 100% rename from frontend/src/core/project/views/projectView.js rename to frontend/src/modules/project/views/projectView.js diff --git a/frontend/src/core/project/views/sharedProjectView.js b/frontend/src/modules/project/views/sharedProjectView.js similarity index 100% rename from frontend/src/core/project/views/sharedProjectView.js rename to frontend/src/modules/project/views/sharedProjectView.js diff --git a/frontend/src/core/scaffold/scaffold.js b/frontend/src/modules/scaffold/index.js similarity index 100% rename from frontend/src/core/scaffold/scaffold.js rename to frontend/src/modules/scaffold/index.js diff --git a/frontend/src/core/scaffold/less/codeEditor.less b/frontend/src/modules/scaffold/less/codeEditor.less similarity index 100% rename from frontend/src/core/scaffold/less/codeEditor.less rename to frontend/src/modules/scaffold/less/codeEditor.less diff --git a/frontend/src/core/scaffold/less/colorPicker.less b/frontend/src/modules/scaffold/less/colorPicker.less similarity index 100% rename from frontend/src/core/scaffold/less/colorPicker.less rename to frontend/src/modules/scaffold/less/colorPicker.less diff --git a/frontend/src/core/scaffold/less/field.less b/frontend/src/modules/scaffold/less/field.less similarity index 100% rename from frontend/src/core/scaffold/less/field.less rename to frontend/src/modules/scaffold/less/field.less diff --git a/frontend/src/core/scaffold/less/forms.less b/frontend/src/modules/scaffold/less/forms.less similarity index 100% rename from frontend/src/core/scaffold/less/forms.less rename to frontend/src/modules/scaffold/less/forms.less diff --git a/frontend/src/core/scaffold/less/modal.less b/frontend/src/modules/scaffold/less/modal.less similarity index 100% rename from frontend/src/core/scaffold/less/modal.less rename to frontend/src/modules/scaffold/less/modal.less diff --git a/frontend/src/core/scaffold/less/scaffoldAsset.less b/frontend/src/modules/scaffold/less/scaffoldAsset.less similarity index 100% rename from frontend/src/core/scaffold/less/scaffoldAsset.less rename to frontend/src/modules/scaffold/less/scaffoldAsset.less diff --git a/frontend/src/core/scaffold/less/textArea.less b/frontend/src/modules/scaffold/less/textArea.less similarity index 100% rename from frontend/src/core/scaffold/less/textArea.less rename to frontend/src/modules/scaffold/less/textArea.less diff --git a/frontend/src/core/scaffold/models/schemasModel.js b/frontend/src/modules/scaffold/models/schemasModel.js similarity index 100% rename from frontend/src/core/scaffold/models/schemasModel.js rename to frontend/src/modules/scaffold/models/schemasModel.js diff --git a/frontend/src/core/scaffold/scaffoldOverrides.js b/frontend/src/modules/scaffold/scaffoldOverrides.js similarity index 100% rename from frontend/src/core/scaffold/scaffoldOverrides.js rename to frontend/src/modules/scaffold/scaffoldOverrides.js diff --git a/frontend/src/core/scaffold/schemas.js b/frontend/src/modules/scaffold/schemas.js similarity index 100% rename from frontend/src/core/scaffold/schemas.js rename to frontend/src/modules/scaffold/schemas.js diff --git a/frontend/src/core/scaffold/templates/field.hbs b/frontend/src/modules/scaffold/templates/field.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/field.hbs rename to frontend/src/modules/scaffold/templates/field.hbs diff --git a/frontend/src/core/scaffold/templates/fieldset.hbs b/frontend/src/modules/scaffold/templates/fieldset.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/fieldset.hbs rename to frontend/src/modules/scaffold/templates/fieldset.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldAsset.hbs b/frontend/src/modules/scaffold/templates/scaffoldAsset.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldAsset.hbs rename to frontend/src/modules/scaffold/templates/scaffoldAsset.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldCodeEditor.hbs b/frontend/src/modules/scaffold/templates/scaffoldCodeEditor.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldCodeEditor.hbs rename to frontend/src/modules/scaffold/templates/scaffoldCodeEditor.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldColorPicker.hbs b/frontend/src/modules/scaffold/templates/scaffoldColorPicker.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldColorPicker.hbs rename to frontend/src/modules/scaffold/templates/scaffoldColorPicker.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldDisplayTitle.hbs b/frontend/src/modules/scaffold/templates/scaffoldDisplayTitle.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldDisplayTitle.hbs rename to frontend/src/modules/scaffold/templates/scaffoldDisplayTitle.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldEditHtml.hbs b/frontend/src/modules/scaffold/templates/scaffoldEditHtml.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldEditHtml.hbs rename to frontend/src/modules/scaffold/templates/scaffoldEditHtml.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldItemsModal.hbs b/frontend/src/modules/scaffold/templates/scaffoldItemsModal.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldItemsModal.hbs rename to frontend/src/modules/scaffold/templates/scaffoldItemsModal.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldModalOverlay.hbs b/frontend/src/modules/scaffold/templates/scaffoldModalOverlay.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldModalOverlay.hbs rename to frontend/src/modules/scaffold/templates/scaffoldModalOverlay.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldQuestionButton.hbs b/frontend/src/modules/scaffold/templates/scaffoldQuestionButton.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldQuestionButton.hbs rename to frontend/src/modules/scaffold/templates/scaffoldQuestionButton.hbs diff --git a/frontend/src/core/scaffold/templates/scaffoldTextArea.hbs b/frontend/src/modules/scaffold/templates/scaffoldTextArea.hbs similarity index 100% rename from frontend/src/core/scaffold/templates/scaffoldTextArea.hbs rename to frontend/src/modules/scaffold/templates/scaffoldTextArea.hbs diff --git a/frontend/src/core/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldAssetView.js rename to frontend/src/modules/scaffold/views/scaffoldAssetView.js diff --git a/frontend/src/core/scaffold/views/scaffoldBooleanView.js b/frontend/src/modules/scaffold/views/scaffoldBooleanView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldBooleanView.js rename to frontend/src/modules/scaffold/views/scaffoldBooleanView.js diff --git a/frontend/src/core/scaffold/views/scaffoldCodeEditorView.js b/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldCodeEditorView.js rename to frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js diff --git a/frontend/src/core/scaffold/views/scaffoldColorPickerView.js b/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldColorPickerView.js rename to frontend/src/modules/scaffold/views/scaffoldColorPickerView.js diff --git a/frontend/src/core/scaffold/views/scaffoldDisplayTitleView.js b/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldDisplayTitleView.js rename to frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js diff --git a/frontend/src/core/scaffold/views/scaffoldItemsModalView.js b/frontend/src/modules/scaffold/views/scaffoldItemsModalView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldItemsModalView.js rename to frontend/src/modules/scaffold/views/scaffoldItemsModalView.js diff --git a/frontend/src/core/scaffold/views/scaffoldQuestionButtonView.js b/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldQuestionButtonView.js rename to frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js diff --git a/frontend/src/core/scaffold/views/scaffoldTagsView.js b/frontend/src/modules/scaffold/views/scaffoldTagsView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldTagsView.js rename to frontend/src/modules/scaffold/views/scaffoldTagsView.js diff --git a/frontend/src/core/scaffold/views/scaffoldTextAreaView.js b/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js similarity index 100% rename from frontend/src/core/scaffold/views/scaffoldTextAreaView.js rename to frontend/src/modules/scaffold/views/scaffoldTextAreaView.js diff --git a/frontend/src/core/sidebar/sidebar.js b/frontend/src/modules/sidebar/index.js similarity index 100% rename from frontend/src/core/sidebar/sidebar.js rename to frontend/src/modules/sidebar/index.js diff --git a/frontend/src/core/sidebar/less/sidebar.less b/frontend/src/modules/sidebar/less/sidebar.less similarity index 98% rename from frontend/src/core/sidebar/less/sidebar.less rename to frontend/src/modules/sidebar/less/sidebar.less index 47f0af650c..8f1cabc981 100644 --- a/frontend/src/core/sidebar/less/sidebar.less +++ b/frontend/src/modules/sidebar/less/sidebar.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; .sidebar { position:fixed; top:0; diff --git a/frontend/src/core/sidebar/less/sidebarFilter.less b/frontend/src/modules/sidebar/less/sidebarFilter.less similarity index 100% rename from frontend/src/core/sidebar/less/sidebarFilter.less rename to frontend/src/modules/sidebar/less/sidebarFilter.less diff --git a/frontend/src/core/sidebar/templates/sidebar.hbs b/frontend/src/modules/sidebar/templates/sidebar.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebar.hbs rename to frontend/src/modules/sidebar/templates/sidebar.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarBreadcrumb.hbs b/frontend/src/modules/sidebar/templates/sidebarBreadcrumb.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarBreadcrumb.hbs rename to frontend/src/modules/sidebar/templates/sidebarBreadcrumb.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarDivide.hbs b/frontend/src/modules/sidebar/templates/sidebarDivide.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarDivide.hbs rename to frontend/src/modules/sidebar/templates/sidebarDivide.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarFieldsetFilter.hbs b/frontend/src/modules/sidebar/templates/sidebarFieldsetFilter.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarFieldsetFilter.hbs rename to frontend/src/modules/sidebar/templates/sidebarFieldsetFilter.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarFilter.hbs b/frontend/src/modules/sidebar/templates/sidebarFilter.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarFilter.hbs rename to frontend/src/modules/sidebar/templates/sidebarFilter.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarRowFilter.hbs b/frontend/src/modules/sidebar/templates/sidebarRowFilter.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarRowFilter.hbs rename to frontend/src/modules/sidebar/templates/sidebarRowFilter.hbs diff --git a/frontend/src/core/sidebar/templates/sidebarUpdateButton.hbs b/frontend/src/modules/sidebar/templates/sidebarUpdateButton.hbs similarity index 100% rename from frontend/src/core/sidebar/templates/sidebarUpdateButton.hbs rename to frontend/src/modules/sidebar/templates/sidebarUpdateButton.hbs diff --git a/frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js b/frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js similarity index 100% rename from frontend/src/core/sidebar/views/sidebarFieldsetFilterView.js rename to frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js diff --git a/frontend/src/core/sidebar/views/sidebarFilterView.js b/frontend/src/modules/sidebar/views/sidebarFilterView.js similarity index 100% rename from frontend/src/core/sidebar/views/sidebarFilterView.js rename to frontend/src/modules/sidebar/views/sidebarFilterView.js diff --git a/frontend/src/core/sidebar/views/sidebarItemView.js b/frontend/src/modules/sidebar/views/sidebarItemView.js similarity index 100% rename from frontend/src/core/sidebar/views/sidebarItemView.js rename to frontend/src/modules/sidebar/views/sidebarItemView.js diff --git a/frontend/src/core/sidebar/views/sidebarView.js b/frontend/src/modules/sidebar/views/sidebarView.js similarity index 100% rename from frontend/src/core/sidebar/views/sidebarView.js rename to frontend/src/modules/sidebar/views/sidebarView.js diff --git a/frontend/src/core/user/assets/adapt-learning-logo.png b/frontend/src/modules/user/assets/adapt-learning-logo.png similarity index 100% rename from frontend/src/core/user/assets/adapt-learning-logo.png rename to frontend/src/modules/user/assets/adapt-learning-logo.png diff --git a/frontend/src/core/user/assets/adapt-logo.png b/frontend/src/modules/user/assets/adapt-logo.png similarity index 100% rename from frontend/src/core/user/assets/adapt-logo.png rename to frontend/src/modules/user/assets/adapt-logo.png diff --git a/frontend/src/core/user/assets/login_bg.jpg b/frontend/src/modules/user/assets/login_bg.jpg similarity index 100% rename from frontend/src/core/user/assets/login_bg.jpg rename to frontend/src/modules/user/assets/login_bg.jpg diff --git a/frontend/src/core/user/user.js b/frontend/src/modules/user/index.js similarity index 100% rename from frontend/src/core/user/user.js rename to frontend/src/modules/user/index.js diff --git a/frontend/src/core/user/less/forgotPassword.less b/frontend/src/modules/user/less/forgotPassword.less similarity index 100% rename from frontend/src/core/user/less/forgotPassword.less rename to frontend/src/modules/user/less/forgotPassword.less diff --git a/frontend/src/core/user/less/login.less b/frontend/src/modules/user/less/login.less similarity index 98% rename from frontend/src/core/user/less/login.less rename to frontend/src/modules/user/less/login.less index 9c0221903f..563ff757f0 100644 --- a/frontend/src/core/user/less/login.less +++ b/frontend/src/modules/user/less/login.less @@ -1,4 +1,4 @@ -@import '../../../less/variables.less'; +@import 'variables'; .module-user { &.location-login, diff --git a/frontend/src/core/user/less/logout.less b/frontend/src/modules/user/less/logout.less similarity index 100% rename from frontend/src/core/user/less/logout.less rename to frontend/src/modules/user/less/logout.less diff --git a/frontend/src/core/user/less/resetPassword.less b/frontend/src/modules/user/less/resetPassword.less similarity index 100% rename from frontend/src/core/user/less/resetPassword.less rename to frontend/src/modules/user/less/resetPassword.less diff --git a/frontend/src/core/user/less/userProfile.less b/frontend/src/modules/user/less/userProfile.less similarity index 96% rename from frontend/src/core/user/less/userProfile.less rename to frontend/src/modules/user/less/userProfile.less index d581d6a82d..6f14d9aff8 100644 --- a/frontend/src/core/user/less/userProfile.less +++ b/frontend/src/modules/user/less/userProfile.less @@ -1,4 +1,4 @@ -@import '../../../less/variables'; +@import 'variables'; .user-profile { .error-text { diff --git a/frontend/src/core/user/models/sessionModel.js b/frontend/src/modules/user/models/sessionModel.js similarity index 100% rename from frontend/src/core/user/models/sessionModel.js rename to frontend/src/modules/user/models/sessionModel.js diff --git a/frontend/src/core/user/models/userPasswordResetModel.js b/frontend/src/modules/user/models/userPasswordResetModel.js similarity index 100% rename from frontend/src/core/user/models/userPasswordResetModel.js rename to frontend/src/modules/user/models/userPasswordResetModel.js diff --git a/frontend/src/core/user/models/userProfileModel.js b/frontend/src/modules/user/models/userProfileModel.js similarity index 100% rename from frontend/src/core/user/models/userProfileModel.js rename to frontend/src/modules/user/models/userProfileModel.js diff --git a/frontend/src/core/user/templates/forgotPassword.hbs b/frontend/src/modules/user/templates/forgotPassword.hbs similarity index 100% rename from frontend/src/core/user/templates/forgotPassword.hbs rename to frontend/src/modules/user/templates/forgotPassword.hbs diff --git a/frontend/src/core/user/templates/login.hbs b/frontend/src/modules/user/templates/login.hbs similarity index 100% rename from frontend/src/core/user/templates/login.hbs rename to frontend/src/modules/user/templates/login.hbs diff --git a/frontend/src/core/user/templates/resetPassword.hbs b/frontend/src/modules/user/templates/resetPassword.hbs similarity index 100% rename from frontend/src/core/user/templates/resetPassword.hbs rename to frontend/src/modules/user/templates/resetPassword.hbs diff --git a/frontend/src/core/user/templates/userProfile.hbs b/frontend/src/modules/user/templates/userProfile.hbs similarity index 100% rename from frontend/src/core/user/templates/userProfile.hbs rename to frontend/src/modules/user/templates/userProfile.hbs diff --git a/frontend/src/core/user/templates/userProfileSidebar.hbs b/frontend/src/modules/user/templates/userProfileSidebar.hbs similarity index 100% rename from frontend/src/core/user/templates/userProfileSidebar.hbs rename to frontend/src/modules/user/templates/userProfileSidebar.hbs diff --git a/frontend/src/core/user/views/forgotPasswordView.js b/frontend/src/modules/user/views/forgotPasswordView.js similarity index 100% rename from frontend/src/core/user/views/forgotPasswordView.js rename to frontend/src/modules/user/views/forgotPasswordView.js diff --git a/frontend/src/core/user/views/loginView.js b/frontend/src/modules/user/views/loginView.js similarity index 100% rename from frontend/src/core/user/views/loginView.js rename to frontend/src/modules/user/views/loginView.js diff --git a/frontend/src/core/user/views/resetPasswordView.js b/frontend/src/modules/user/views/resetPasswordView.js similarity index 100% rename from frontend/src/core/user/views/resetPasswordView.js rename to frontend/src/modules/user/views/resetPasswordView.js diff --git a/frontend/src/core/user/views/userProfileSidebarView.js b/frontend/src/modules/user/views/userProfileSidebarView.js similarity index 100% rename from frontend/src/core/user/views/userProfileSidebarView.js rename to frontend/src/modules/user/views/userProfileSidebarView.js diff --git a/frontend/src/core/user/views/userProfileView.js b/frontend/src/modules/user/views/userProfileView.js similarity index 100% rename from frontend/src/core/user/views/userProfileView.js rename to frontend/src/modules/user/views/userProfileView.js From 4e0721d9dc043bbc9aee70d9c84b5c66b384e81a Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:04:16 +0100 Subject: [PATCH 074/296] Rename less references --- frontend/src/less/navigation.less | 2 +- frontend/src/less/sidebar.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/less/navigation.less b/frontend/src/less/navigation.less index cb20ff06bc..791132d7ee 100644 --- a/frontend/src/less/navigation.less +++ b/frontend/src/less/navigation.less @@ -1,4 +1,4 @@ -@import 'variables.less'; +@import 'variables'; @import 'fonts.less'; .navigation { diff --git a/frontend/src/less/sidebar.less b/frontend/src/less/sidebar.less index 581e9a07bf..2acc9ae70b 100644 --- a/frontend/src/less/sidebar.less +++ b/frontend/src/less/sidebar.less @@ -1,4 +1,4 @@ -@import 'variables.less'; +@import 'variables'; @import 'buttons.less'; // Used for editing the color of buttons in the sdiebar From 77cd1c84f4317401856e88cdccaab5819c742e18 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:05:15 +0100 Subject: [PATCH 075/296] Move userManagement into modules --- .../userManagement/collections/userCollection.js | 0 frontend/src/{plugins => modules}/userManagement/helpers.js | 0 frontend/src/{plugins => modules}/userManagement/index.js | 0 .../userManagement/less/userManagement.less | 4 ++-- .../{plugins => modules}/userManagement/models/userModel.js | 0 .../{plugins => modules}/userManagement/templates/addUser.hbs | 0 .../userManagement/templates/addUserSidebar.hbs | 0 .../{plugins => modules}/userManagement/templates/user.hbs | 0 .../userManagement/templates/userManagement.hbs | 0 .../userManagement/templates/userManagementSidebar.hbs | 0 .../userManagement/views/addUserSidebarView.js | 0 .../{plugins => modules}/userManagement/views/addUserView.js | 0 .../userManagement/views/userManagementSidebarView.js | 0 .../userManagement/views/userManagementView.js | 0 .../src/{plugins => modules}/userManagement/views/userView.js | 0 15 files changed, 2 insertions(+), 2 deletions(-) rename frontend/src/{plugins => modules}/userManagement/collections/userCollection.js (100%) rename frontend/src/{plugins => modules}/userManagement/helpers.js (100%) rename frontend/src/{plugins => modules}/userManagement/index.js (100%) rename frontend/src/{plugins => modules}/userManagement/less/userManagement.less (96%) rename frontend/src/{plugins => modules}/userManagement/models/userModel.js (100%) rename frontend/src/{plugins => modules}/userManagement/templates/addUser.hbs (100%) rename frontend/src/{plugins => modules}/userManagement/templates/addUserSidebar.hbs (100%) rename frontend/src/{plugins => modules}/userManagement/templates/user.hbs (100%) rename frontend/src/{plugins => modules}/userManagement/templates/userManagement.hbs (100%) rename frontend/src/{plugins => modules}/userManagement/templates/userManagementSidebar.hbs (100%) rename frontend/src/{plugins => modules}/userManagement/views/addUserSidebarView.js (100%) rename frontend/src/{plugins => modules}/userManagement/views/addUserView.js (100%) rename frontend/src/{plugins => modules}/userManagement/views/userManagementSidebarView.js (100%) rename frontend/src/{plugins => modules}/userManagement/views/userManagementView.js (100%) rename frontend/src/{plugins => modules}/userManagement/views/userView.js (100%) diff --git a/frontend/src/plugins/userManagement/collections/userCollection.js b/frontend/src/modules/userManagement/collections/userCollection.js similarity index 100% rename from frontend/src/plugins/userManagement/collections/userCollection.js rename to frontend/src/modules/userManagement/collections/userCollection.js diff --git a/frontend/src/plugins/userManagement/helpers.js b/frontend/src/modules/userManagement/helpers.js similarity index 100% rename from frontend/src/plugins/userManagement/helpers.js rename to frontend/src/modules/userManagement/helpers.js diff --git a/frontend/src/plugins/userManagement/index.js b/frontend/src/modules/userManagement/index.js similarity index 100% rename from frontend/src/plugins/userManagement/index.js rename to frontend/src/modules/userManagement/index.js diff --git a/frontend/src/plugins/userManagement/less/userManagement.less b/frontend/src/modules/userManagement/less/userManagement.less similarity index 96% rename from frontend/src/plugins/userManagement/less/userManagement.less rename to frontend/src/modules/userManagement/less/userManagement.less index e5e67d7842..3d305884a4 100644 --- a/frontend/src/plugins/userManagement/less/userManagement.less +++ b/frontend/src/modules/userManagement/less/userManagement.less @@ -1,5 +1,5 @@ -@import '../../../less/sharedStyles.less'; -@import '../../../less/variables.less'; +@import 'sharedStyles'; +@import 'variables'; @user-hover-bg-colour: #f3faff; @user-hover-borderl-colour: #8ea3af; diff --git a/frontend/src/plugins/userManagement/models/userModel.js b/frontend/src/modules/userManagement/models/userModel.js similarity index 100% rename from frontend/src/plugins/userManagement/models/userModel.js rename to frontend/src/modules/userManagement/models/userModel.js diff --git a/frontend/src/plugins/userManagement/templates/addUser.hbs b/frontend/src/modules/userManagement/templates/addUser.hbs similarity index 100% rename from frontend/src/plugins/userManagement/templates/addUser.hbs rename to frontend/src/modules/userManagement/templates/addUser.hbs diff --git a/frontend/src/plugins/userManagement/templates/addUserSidebar.hbs b/frontend/src/modules/userManagement/templates/addUserSidebar.hbs similarity index 100% rename from frontend/src/plugins/userManagement/templates/addUserSidebar.hbs rename to frontend/src/modules/userManagement/templates/addUserSidebar.hbs diff --git a/frontend/src/plugins/userManagement/templates/user.hbs b/frontend/src/modules/userManagement/templates/user.hbs similarity index 100% rename from frontend/src/plugins/userManagement/templates/user.hbs rename to frontend/src/modules/userManagement/templates/user.hbs diff --git a/frontend/src/plugins/userManagement/templates/userManagement.hbs b/frontend/src/modules/userManagement/templates/userManagement.hbs similarity index 100% rename from frontend/src/plugins/userManagement/templates/userManagement.hbs rename to frontend/src/modules/userManagement/templates/userManagement.hbs diff --git a/frontend/src/plugins/userManagement/templates/userManagementSidebar.hbs b/frontend/src/modules/userManagement/templates/userManagementSidebar.hbs similarity index 100% rename from frontend/src/plugins/userManagement/templates/userManagementSidebar.hbs rename to frontend/src/modules/userManagement/templates/userManagementSidebar.hbs diff --git a/frontend/src/plugins/userManagement/views/addUserSidebarView.js b/frontend/src/modules/userManagement/views/addUserSidebarView.js similarity index 100% rename from frontend/src/plugins/userManagement/views/addUserSidebarView.js rename to frontend/src/modules/userManagement/views/addUserSidebarView.js diff --git a/frontend/src/plugins/userManagement/views/addUserView.js b/frontend/src/modules/userManagement/views/addUserView.js similarity index 100% rename from frontend/src/plugins/userManagement/views/addUserView.js rename to frontend/src/modules/userManagement/views/addUserView.js diff --git a/frontend/src/plugins/userManagement/views/userManagementSidebarView.js b/frontend/src/modules/userManagement/views/userManagementSidebarView.js similarity index 100% rename from frontend/src/plugins/userManagement/views/userManagementSidebarView.js rename to frontend/src/modules/userManagement/views/userManagementSidebarView.js diff --git a/frontend/src/plugins/userManagement/views/userManagementView.js b/frontend/src/modules/userManagement/views/userManagementView.js similarity index 100% rename from frontend/src/plugins/userManagement/views/userManagementView.js rename to frontend/src/modules/userManagement/views/userManagementView.js diff --git a/frontend/src/plugins/userManagement/views/userView.js b/frontend/src/modules/userManagement/views/userView.js similarity index 100% rename from frontend/src/plugins/userManagement/views/userView.js rename to frontend/src/modules/userManagement/views/userView.js From fa6cda8ef78300de80a77545304e71484e5a987a Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:05:34 +0100 Subject: [PATCH 076/296] Remove unused package --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index c775ee49cd..a7576cbdbd 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,6 @@ "grunt-merge-json": "^0.9.5", "grunt-mocha-test": "~0.7.0", "grunt-open": "~0.2.2", - "grunt-requirejs-bundle": "~0.0.7", "handlebars": "^4.0.5", "handlebars-form-helpers": "0.1.3", "hbs": "2.4.0", From c8c3f63201d6eb4cea5ba926e2a46633a2350c70 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:08:05 +0100 Subject: [PATCH 077/296] Remove unused config.js --- config.js | 72 ------------------------------------------------------- 1 file changed, 72 deletions(-) delete mode 100644 config.js diff --git a/config.js b/config.js deleted file mode 100644 index c5cabb0667..0000000000 --- a/config.js +++ /dev/null @@ -1,72 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -require.config({ - paths: { - jquery: 'core/libraries/jquery', - underscore: 'core/libraries/underscore', - backbone: 'core/libraries/backbone', - modernizr: 'core/libraries/modernizr', - handlebars: 'core/libraries/handlebars', - coreJS: 'core', - templates: 'templates/templates', - polyglot: 'core/libraries/polyglot.min', - jsoneditor: 'core/libraries/jquery.jsoneditor.min', - 'jquery-ui': 'core/libraries/jquery-ui.min', - 'jquery-form' : 'core/libraries/jquery.form', - velocity: 'core/libraries/velocity', - scrollTo: 'core/libraries/scrollTo', - 'mediaelement-and-player' : 'core/libraries/mediaelement-and-player', - editorPage: 'core/editor/page', - editorMenu: 'core/editor/menu', - editorCourse: 'core/editor/course', - editorConfig: 'core/editor/config', - editorTheme: 'core/editor/theme', - editorGlobal: 'core/editor/global', - editorExtensions: 'core/editor/extensions', - tagsInput: 'core/libraries/jquery.tagsinput.min.js' - }, - shim: { - jquery: [ - - ], - backbone: { - deps: [ - 'underscore', - 'jquery' - ], - exports: 'Backbone' - }, - underscore: { - exports: '_' - }, - handlebars: { - exports: 'Handlebars' - }, - polyglot: { - exports: 'Polyglot' - }, - jsoneditor: { - deps: ['jquery'], - exports: 'JsonEditor' - }, - velocity: { - deps: ['jquery'], - exports: 'velocity' - }, - scrollTo: { - deps: ['jquery'], - exports: 'scrollTo' - }, - 'jquery-ui': { - deps: ['jquery'], - exports: "$" - }, - 'jquery-form': { - deps: ['jquery'], - exports: "$" - }, - 'tagsInput': { - deps: ['jquery'], - exports: "$" - } - } -}); \ No newline at end of file From a6464532dc8e57e6d60aea22c166f02178e174d8 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 28 Mar 2017 16:08:20 +0100 Subject: [PATCH 078/296] Refactor config.js --- frontend/src/core/config.js | 216 +++++++++++++++++------------------- 1 file changed, 102 insertions(+), 114 deletions(-) diff --git a/frontend/src/core/config.js b/frontend/src/core/config.js index ad2e96b599..f3801dd40e 100644 --- a/frontend/src/core/config.js +++ b/frontend/src/core/config.js @@ -1,118 +1,106 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE require.config({ - baseUrl: '../../', - paths: { - jquery: 'core/libraries/jquery', - underscore: 'core/libraries/underscore', - backbone: 'core/libraries/backbone', - modernizr: 'core/libraries/modernizr', - handlebars: 'core/libraries/handlebars', - inview: 'core/libraries/inview', - imageReady: 'core/libraries/imageReady', - templates: 'templates/templates', - polyglot: 'core/libraries/polyglot.min', - sweetalert: 'core/libraries/sweetalert.min', - backboneForms:'core/libraries/backbone-forms', - backboneFormsLists:'core/libraries/backbone-forms-lists', - jsoneditor: 'core/libraries/jquery.jsoneditor.min', - 'jquery-ui': 'core/libraries/jquery-ui.min', - 'jquery-form' : 'core/libraries/jquery.form', - typeahead: 'core/libraries/typeahead', - velocity: 'core/libraries/velocity', - scrollTo: 'core/libraries/scrollTo', - colorPicker: 'core/libraries/colorPicker/js/colorpicker', - 'mediaelement' : 'core/libraries/mediaelement-and-player', - editorPage: 'core/editor/page', - editorMenu: 'core/editor/menu', - editorCourse: 'core/editor/course', - editorConfig: 'core/editor/config', - editorTheme: 'core/editor/theme', - editorMenuSettings: 'core/editor/menuSettings', - editorGlobal: 'core/editor/global', - editorExtensions: 'core/editor/extensions', - tags: 'core/libraries/jquery.tagsinput.min', - ace: 'core/libraries/ace', - pikaday: 'core/libraries/pikaday/js/pikaday', - moment: 'core/libraries/moment.min' - }, - shim: { - jquery: [ - - ], - backbone: { - deps: [ - 'underscore', - 'jquery' - ], - exports: 'Backbone' - }, - underscore: { - exports: '_' - }, - handlebars: { - exports: 'Handlebars' - }, - templates: { - deps:['handlebars'] - }, - polyglot: { - exports: 'Polyglot' - }, - sweetalert: { - deps: ['jquery'], - exports: 'sweetAlert' - }, - jsoneditor: { - deps: ['jquery'], - exports: 'JsonEditor' - }, - moment: { - exports: 'moment' - }, - 'mediaelement': { - deps: ['jquery'], - exports: 'mediaelement' - }, - velocity: { - deps: ['jquery'], - exports: 'velocity' - }, - scrollTo: { - deps: ['jquery'], - exports: 'scrollTo' - }, - 'jquery-ui': { - deps: ['jquery'], - exports: "$" - }, - 'jquery-form': { - deps: ['jquery'], - exports: "$" - }, - backboneForms: { - deps: ['backbone'] - }, - backboneFormsLists: { - deps: ['backboneForms'] - }, - inview: { - deps: [ - 'jquery' - ], - exports: 'inview' - }, - imageReady: { - deps: [ - 'jquery' - ], - exports: 'imageready' - }, - ace: { - exports: 'ace/ace' - }, - tags: { - deps: ['jquery'], - exports: "$" - } + paths: { + // third-party libs + ace: 'core/libraries/ace', + backbone: 'core/libraries/backbone', + backboneForms:'core/libraries/backbone-forms', + backboneFormsLists:'core/libraries/backbone-forms-lists', + colorPicker: 'core/libraries/colorPicker/js/colorpicker', + handlebars: 'core/libraries/handlebars', + imageReady: 'core/libraries/imageReady', + inview: 'core/libraries/inview', + jquery: 'core/libraries/jquery', + 'jquery-form' : 'core/libraries/jquery.form', + 'jquery-ui': 'core/libraries/jquery-ui.min', + jsoneditor: 'core/libraries/jquery.jsoneditor.min', + mediaelement : 'core/libraries/mediaelement-and-player', + modernizr: 'core/libraries/modernizr', + moment: 'core/libraries/moment.min', + pikaday: 'core/libraries/pikaday/js/pikaday', + polyglot: 'core/libraries/polyglot.min', + scrollTo: 'core/libraries/scrollTo', + sweetalert: 'core/libraries/sweetalert.min', + tags: 'core/libraries/jquery.tagsinput.min', + typeahead: 'core/libraries/typeahead', + underscore: 'core/libraries/underscore', + velocity: 'core/libraries/velocity', + // internal aliases + templates: 'templates/templates' + }, + shim: { + // third-party + ace: { + exports: 'ace/ace' + }, + backbone: { + deps: ['underscore','jquery'], + exports: 'Backbone' + }, + backboneForms: { + deps: ['backbone'] + }, + backboneFormsLists: { + deps: ['backboneForms'] + }, + colorPicker: { + deps: ['jquery'], + }, + handlebars: { + exports: 'Handlebars' + }, + imageReady: { + deps: ['jquery'], + exports: 'imageready' + }, + inview: { + deps: ['jquery'], + exports: 'inview' + }, + 'jquery-form': { + deps: ['jquery'], + exports: "$" + }, + 'jquery-ui': { + deps: ['jquery'], + exports: "$" + }, + jsoneditor: { + deps: ['jquery'], + exports: 'JsonEditor' + }, + mediaelement: { + deps: ['jquery'], + exports: 'mediaelement' + }, + moment: { + exports: 'moment' + }, + polyglot: { + exports: 'Polyglot' + }, + scrollTo: { + deps: ['jquery'], + exports: 'scrollTo' + }, + sweetalert: { + deps: ['jquery'], + exports: 'sweetAlert' + }, + tags: { + deps: ['jquery'], + exports: "$" + }, + underscore: { + exports: '_' + }, + velocity: { + deps: ['jquery'], + exports: 'velocity' + }, + // internal + templates: { + deps:['handlebars'] } + } }); From 5e985786f71e4a273b974b11b512b781a07dc43e Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 09:33:58 +0100 Subject: [PATCH 079/296] Make paths relative, load modules dynamically --- frontend/src/core/app.js | 110 +++++------------- frontend/src/core/config.js | 49 ++++---- frontend/src/core/contentPane.js | 2 +- frontend/src/core/contextMenu.js | 4 +- frontend/src/core/helpers.js | 2 +- .../src/core/models/componentTypeModel.js | 2 +- frontend/src/core/models/contentModel.js | 2 +- .../src/core/models/contentObjectModel.js | 2 +- frontend/src/core/models/courseAssetModel.js | 2 +- frontend/src/core/models/courseModel.js | 4 +- frontend/src/core/models/extensionModel.js | 2 +- frontend/src/core/models/themeTypeModel.js | 2 +- frontend/src/core/permissions.js | 2 +- frontend/src/core/router.js | 4 +- frontend/src/core/views/contentPaneView.js | 2 +- frontend/src/core/views/contextMenuView.js | 2 +- frontend/src/core/views/originView.js | 2 +- frontend/src/core/views/permissionsView.js | 2 +- frontend/src/modules/actions/index.js | 32 +++-- .../src/modules/actions/views/actionsView.js | 2 +- .../collections/assetCollection.js | 4 +- frontend/src/modules/assetManagement/index.js | 16 +-- .../views/assetManagementCollectionView.js | 18 +-- .../views/assetManagementItemView.js | 4 +- .../views/assetManagementModalAutofillView.js | 2 +- .../views/assetManagementModalFiltersView.js | 10 +- .../views/assetManagementModalNewAssetView.js | 10 +- .../views/assetManagementModalTagsView.js | 4 +- .../views/assetManagementModalView.js | 14 +-- .../assetManagementNewAssetSidebarView.js | 4 +- .../views/assetManagementNewAssetView.js | 8 +- .../views/assetManagementPreviewView.js | 6 +- .../views/assetManagementSidebarView.js | 4 +- .../views/assetManagementView.js | 12 +- frontend/src/modules/dashboard/index.js | 12 +- .../dashboard/views/dashboardSidebarView.js | 4 +- .../modules/dashboard/views/dashboardView.js | 16 +-- frontend/src/modules/editor/article/index.js | 4 +- .../views/editorArticleEditSidebarView.js | 6 +- .../article/views/editorArticleEditView.js | 2 +- frontend/src/modules/editor/block/index.js | 4 +- .../block/views/editorBlockEditSidebarView.js | 4 +- .../editor/block/views/editorBlockEditView.js | 2 +- .../src/modules/editor/component/index.js | 4 +- .../views/editorComponentEditSidebarView.js | 4 +- .../views/editorComponentEditView.js | 2 +- .../collections/editorConfigCollection.js | 2 +- frontend/src/modules/editor/config/index.js | 4 +- .../views/editorConfigEditSidebarView.js | 4 +- .../config/views/editorConfigEditView.js | 2 +- .../src/modules/editor/contentObject/index.js | 4 +- .../contentObject/views/editorMenuItemView.js | 2 +- .../views/editorMenuLayerView.js | 8 +- .../views/editorMenuSidebarView.js | 4 +- .../contentObject/views/editorMenuView.js | 2 +- .../views/editorPageArticleView.js | 4 +- .../views/editorPageBlockView.js | 4 +- .../views/editorPageComponentListItemView.js | 4 +- .../editorPageComponentListSidebarView.js | 6 +- .../views/editorPageComponentListView.js | 2 +- .../views/editorPageComponentPasteZoneView.js | 2 +- .../views/editorPageComponentView.js | 2 +- .../views/editorPageEditSidebarView.js | 4 +- .../contentObject/views/editorPageEditView.js | 2 +- .../views/editorPageSidebarView.js | 4 +- .../contentObject/views/editorPageView.js | 6 +- frontend/src/modules/editor/course/index.js | 4 +- .../views/editorCourseEditSidebarView.js | 4 +- .../course/views/editorCourseEditView.js | 4 +- .../src/modules/editor/extensions/index.js | 2 +- .../views/editorExtensionsEditSidebarView.js | 4 +- .../views/editorExtensionsEditView.js | 4 +- .../global/collections/editorCollection.js | 2 +- .../modules/editor/global/editorDataLoader.js | 22 ++-- frontend/src/modules/editor/global/helpers.js | 2 +- .../editor/global/views/editorOriginView.js | 6 +- .../global/views/editorPasteZoneView.js | 4 +- .../modules/editor/global/views/editorView.js | 12 +- frontend/src/modules/editor/index.js | 2 +- .../src/modules/editor/menuSettings/index.js | 4 +- .../editorMenuSettingsEditSidebarView.js | 4 +- .../views/editorMenuSettingsEditView.js | 2 +- .../views/editorMenuSettingsView.js | 4 +- .../src/modules/editor/selectTheme/index.js | 4 +- .../views/editorThemeCollectionSidebarView.js | 4 +- .../views/editorThemeCollectionView.js | 2 +- .../views/editorThemeEditSidebarView.js | 4 +- .../selectTheme/views/editorThemeEditView.js | 2 +- .../selectTheme/views/editorThemeItemView.js | 4 +- .../selectTheme/views/editorThemeView.js | 4 +- frontend/src/modules/filters/index.js | 6 +- .../modules/filters/views/typeAheadView.js | 2 +- frontend/src/modules/globalMenu/index.js | 10 +- .../globalMenu/views/globalMenuItemView.js | 2 +- .../globalMenu/views/globalMenuView.js | 8 +- frontend/src/modules/help/index.js | 2 +- frontend/src/modules/location/index.js | 4 +- .../location/views/locationTitleView.js | 2 +- frontend/src/modules/modal/index.js | 4 +- frontend/src/modules/modal/views/modalView.js | 2 +- frontend/src/modules/modules.js | 2 +- frontend/src/modules/navigation/index.js | 3 + .../navigation/views/navigationView.js | 4 +- frontend/src/modules/notify/index.js | 2 +- .../src/modules/notify/plugins/alert/index.js | 2 +- .../modules/notify/plugins/console/index.js | 2 +- frontend/src/modules/options/index.js | 6 +- .../src/modules/options/views/optionsView.js | 2 +- .../collections/componentTypeCollection.js | 2 +- .../collections/extensionTypeCollection.js | 2 +- .../collections/menuTypeCollection.js | 2 +- .../collections/themeTypeCollection.js | 2 +- .../src/modules/pluginManagement/index.js | 10 +- .../models/componentTypeModel.js | 6 - .../models/extensionTypeModel.js | 6 - .../pluginManagement/models/menuTypeModel.js | 6 - .../pluginManagement/models/themeTypeModel.js | 6 - .../views/pluginManagementSidebarView.js | 4 +- .../pluginManagementUploadSidebarView.js | 4 +- .../views/pluginManagementUploadView.js | 12 +- .../views/pluginManagementView.js | 18 +-- .../pluginManagement/views/pluginTypeView.js | 4 +- .../collections/myProjectCollection.js | 2 +- .../project/collections/projectCollection.js | 2 +- .../collections/sharedProjectCollection.js | 2 +- frontend/src/modules/project/index.js | 3 + .../src/modules/project/views/projectView.js | 4 +- .../project/views/sharedProjectView.js | 4 +- frontend/src/modules/scaffold/index.js | 44 +++---- .../modules/scaffold/models/schemasModel.js | 2 +- frontend/src/modules/scaffold/schemas.js | 4 +- .../scaffold/views/scaffoldAssetView.js | 8 +- .../scaffold/views/scaffoldBooleanView.js | 2 +- .../scaffold/views/scaffoldCodeEditorView.js | 16 +-- .../scaffold/views/scaffoldColorPickerView.js | 2 +- .../views/scaffoldDisplayTitleView.js | 2 +- .../scaffold/views/scaffoldItemsModalView.js | 2 +- .../views/scaffoldQuestionButtonView.js | 2 +- .../scaffold/views/scaffoldTagsView.js | 18 +-- .../scaffold/views/scaffoldTextAreaView.js | 2 +- frontend/src/modules/sidebar/index.js | 6 +- .../views/sidebarFieldsetFilterView.js | 2 +- .../sidebar/views/sidebarFilterView.js | 4 +- .../modules/sidebar/views/sidebarItemView.js | 8 +- .../src/modules/sidebar/views/sidebarView.js | 10 +- frontend/src/modules/user/index.js | 16 +-- .../src/modules/user/models/sessionModel.js | 2 +- .../user/models/userPasswordResetModel.js | 2 +- .../modules/user/models/userProfileModel.js | 2 +- .../modules/user/templates/forgotPassword.hbs | 4 +- frontend/src/modules/user/templates/login.hbs | 2 +- .../modules/user/templates/resetPassword.hbs | 4 +- .../modules/user/views/forgotPasswordView.js | 6 +- frontend/src/modules/user/views/loginView.js | 4 +- .../modules/user/views/resetPasswordView.js | 4 +- .../user/views/userProfileSidebarView.js | 8 +- .../src/modules/user/views/userProfileView.js | 4 +- .../collections/userCollection.js | 2 +- .../src/modules/userManagement/helpers.js | 2 +- frontend/src/modules/userManagement/index.js | 12 +- .../views/addUserSidebarView.js | 4 +- .../userManagement/views/addUserView.js | 6 +- .../views/userManagementSidebarView.js | 4 +- .../views/userManagementView.js | 14 +-- .../modules/userManagement/views/userView.js | 6 +- lib/application.js | 8 +- routes/index/index.hbs | 17 ++- 167 files changed, 474 insertions(+), 552 deletions(-) create mode 100644 frontend/src/modules/navigation/index.js create mode 100644 frontend/src/modules/project/index.js diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index 5f75aa26ec..b0b6a337b1 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -1,105 +1,53 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE require([ - 'templates', - 'polyglot', - 'sweetalert', - 'core/app/origin', - 'core/app/router', - 'core/app/permissions', - 'core/app/contentPane', - 'core/user/user', - 'core/help/help', - 'core/dashboard/dashboard', - 'core/editor/editor', - 'core/assetManagement/assetManagement', - 'core/pluginManagement/pluginManagement', - 'core/user/models/sessionModel', - 'core/navigation/views/navigationView', - 'core/globalMenu/globalMenu', - 'core/sidebar/sidebar', - 'core/app/helpers', - 'core/app/contextMenu', - 'core/location/location', - 'plugins/plugins', - 'core/notify/notify', - 'core/options/options', - 'core/scaffold/scaffold', - 'core/modal/modal', - 'core/filters/filters', - 'core/actions/actions', - 'jquery-ui', - 'jquery-form', - 'inview', - 'imageReady', - 'mediaelement', - 'velocity', - 'scrollTo', - 'ace/ace' -], function ( - Templates, - Polyglot, - SweetAlert, - Origin, - Router, - Permissions, - ContentPane, - User, - Help, - Dashboard, - Editor, - AssetManagement, - PluginManagement, - SessionModel, - NavigationView, - GlobalMenu, - Sidebar, - Helpers, - ContextMenu, - Location, - Notify, - Options, - Scaffold, - Modal, - JQueryUI, - JQueryForm, - Inview, - ImageReady, - MediaElement -) { - + 'polyglot', + 'core/origin', + 'core/router', + 'modules/user/models/sessionModel', + 'modules/navigation/views/navigationView', + // third-party libs + 'ace/ace', + 'imageReady', + 'inview', + 'jqueryForm', + 'jqueryUI', + 'mediaelement', + 'scrollTo', + 'sweetalert', + 'velocity', + // internal + 'templates/templates', + 'modules/modules', + 'plugins/plugins', + +], function onLibrariesLoaded(Polyglot, Origin, Router, SessionModel, NavigationView) { // Read in the configuration values/constants $.getJSON('config/config.json', function(configData) { Origin.constants = configData; var locale = localStorage.getItem('lang') || 'en'; - // Get the language file $.getJSON('lang/' + locale, function(data) { // Instantiate Polyglot with phrases - window.polyglot = new Polyglot({phrases: data}); - - Origin.sessionModel = new SessionModel(); + window.polyglot = new Polyglot({ phrases: data }); Origin.router = new Router(); + Origin.sessionModel = new SessionModel(); Origin.sessionModel.fetch({ success: function(data) { // This callback is called from the schemasModel.js in scaffold as the schemas // need to load before the app loads Origin.trigger('app:userCreated', function() { - - $('#app').before(new NavigationView({model: Origin.sessionModel}).$el); - Origin.trigger('app:dataReady'); - // Defer here is good - give anything tapping in app:dataReady event - // time to do their thang! - _.defer(function() { - Origin.initialize(); - }); + // TODO move this to the navigation modules folder + $('#app').before(new NavigationView({ model: Origin.sessionModel }).$el); + Origin.trigger('app:dataReady'); + // Defer here is good - give anything tapping in app:dataReady event + // time to do their thang! + _.defer(Origin.initialize); }); - } }); }); }); - }); diff --git a/frontend/src/core/config.js b/frontend/src/core/config.js index f3801dd40e..9fdebea299 100644 --- a/frontend/src/core/config.js +++ b/frontend/src/core/config.js @@ -2,31 +2,28 @@ require.config({ paths: { // third-party libs - ace: 'core/libraries/ace', - backbone: 'core/libraries/backbone', - backboneForms:'core/libraries/backbone-forms', - backboneFormsLists:'core/libraries/backbone-forms-lists', - colorPicker: 'core/libraries/colorPicker/js/colorpicker', - handlebars: 'core/libraries/handlebars', - imageReady: 'core/libraries/imageReady', - inview: 'core/libraries/inview', - jquery: 'core/libraries/jquery', - 'jquery-form' : 'core/libraries/jquery.form', - 'jquery-ui': 'core/libraries/jquery-ui.min', - jsoneditor: 'core/libraries/jquery.jsoneditor.min', - mediaelement : 'core/libraries/mediaelement-and-player', - modernizr: 'core/libraries/modernizr', - moment: 'core/libraries/moment.min', - pikaday: 'core/libraries/pikaday/js/pikaday', - polyglot: 'core/libraries/polyglot.min', - scrollTo: 'core/libraries/scrollTo', - sweetalert: 'core/libraries/sweetalert.min', - tags: 'core/libraries/jquery.tagsinput.min', - typeahead: 'core/libraries/typeahead', - underscore: 'core/libraries/underscore', - velocity: 'core/libraries/velocity', - // internal aliases - templates: 'templates/templates' + ace: 'libraries/ace', + backbone: 'libraries/backbone', + backboneForms:'libraries/backbone-forms', + backboneFormsLists:'libraries/backbone-forms-lists', + colorPicker: 'libraries/colorPicker/js/colorpicker', + handlebars: 'libraries/handlebars', + imageReady: 'libraries/imageReady', + inview: 'libraries/inview', + jquery: 'libraries/jquery', + jqueryForm : 'libraries/jquery.form', + jqueryUI: 'libraries/jquery-ui.min', + jsoneditor: 'libraries/jquery.jsoneditor.min', + mediaelement : 'libraries/mediaelement-and-player', + modernizr: 'libraries/modernizr', + moment: 'libraries/moment.min', + pikaday: 'libraries/pikaday/js/pikaday', + polyglot: 'libraries/polyglot.min', + scrollTo: 'libraries/scrollTo', + sweetalert: 'libraries/sweetalert.min', + typeahead: 'libraries/typeahead', + underscore: 'libraries/underscore', + velocity: 'libraries/velocity' }, shim: { // third-party @@ -99,7 +96,7 @@ require.config({ exports: 'velocity' }, // internal - templates: { + 'templates/templates': { deps:['handlebars'] } } diff --git a/frontend/src/core/contentPane.js b/frontend/src/core/contentPane.js index 9de955640d..e6eca993df 100644 --- a/frontend/src/core/contentPane.js +++ b/frontend/src/core/contentPane.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContentPaneView = require('./views/contentPaneView'); var contentPaneView; diff --git a/frontend/src/core/contextMenu.js b/frontend/src/core/contextMenu.js index da0a51a140..dc916534bf 100644 --- a/frontend/src/core/contextMenu.js +++ b/frontend/src/core/contextMenu.js @@ -6,9 +6,9 @@ */ define(function(require) { - var ContextMenuView = require('core/app/views/contextMenuView'); + var ContextMenuView = require('core/views/contextMenuView'); var ContextMenuCollection = new Backbone.Collection(); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContextMenu = {}; diff --git a/frontend/src/core/helpers.js b/frontend/src/core/helpers.js index b6bfea3a6a..219f616356 100644 --- a/frontend/src/core/helpers.js +++ b/frontend/src/core/helpers.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var moment = require('moment'); var helpers = { diff --git a/frontend/src/core/models/componentTypeModel.js b/frontend/src/core/models/componentTypeModel.js index 9eb5cdc425..4b61be0d30 100644 --- a/frontend/src/core/models/componentTypeModel.js +++ b/frontend/src/core/models/componentTypeModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var ContentModel = require('core/app/models/contentModel'); + var ContentModel = require('core/models/contentModel'); var ComponentTypeModel = ContentModel.extend({ idAttribute: '_id', diff --git a/frontend/src/core/models/contentModel.js b/frontend/src/core/models/contentModel.js index 2bfc5de075..2ffc6f69c4 100644 --- a/frontend/src/core/models/contentModel.js +++ b/frontend/src/core/models/contentModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContentModel = Backbone.Model.extend({ idAttribute: '_id', diff --git a/frontend/src/core/models/contentObjectModel.js b/frontend/src/core/models/contentObjectModel.js index d340e3b57b..e1dfca6428 100644 --- a/frontend/src/core/models/contentObjectModel.js +++ b/frontend/src/core/models/contentObjectModel.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContentModel = require('./contentModel'); var ContentObjectModel = ContentModel.extend({ diff --git a/frontend/src/core/models/courseAssetModel.js b/frontend/src/core/models/courseAssetModel.js index fd95ad8c4d..3b584e3df2 100644 --- a/frontend/src/core/models/courseAssetModel.js +++ b/frontend/src/core/models/courseAssetModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var CourseAssetModel = Backbone.Model.extend({ idAttribute: '_id', diff --git a/frontend/src/core/models/courseModel.js b/frontend/src/core/models/courseModel.js index af86c673ca..89e54ebc6d 100644 --- a/frontend/src/core/models/courseModel.js +++ b/frontend/src/core/models/courseModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var Helpers = require('core/app/helpers'); + var Origin = require('core/origin'); + var Helpers = require('core/helpers'); var ContentModel = require('./contentModel'); var CourseModel = ContentModel.extend({ diff --git a/frontend/src/core/models/extensionModel.js b/frontend/src/core/models/extensionModel.js index 21b81cde05..e5e5146d4c 100644 --- a/frontend/src/core/models/extensionModel.js +++ b/frontend/src/core/models/extensionModel.js @@ -6,7 +6,7 @@ define(function(require) { urlRoot: '/api/extensiontype', idAttribute: '_id', _type: 'extension', - + initialize: function(){ } }); diff --git a/frontend/src/core/models/themeTypeModel.js b/frontend/src/core/models/themeTypeModel.js index cdbc26b61c..5bd3a4b6cf 100644 --- a/frontend/src/core/models/themeTypeModel.js +++ b/frontend/src/core/models/themeTypeModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ThemeTypeModel = Backbone.Model.extend({ idAttribute: '_id', diff --git a/frontend/src/core/permissions.js b/frontend/src/core/permissions.js index 609cd4f91c..81d81a15b2 100644 --- a/frontend/src/core/permissions.js +++ b/frontend/src/core/permissions.js @@ -2,7 +2,7 @@ define(function(require) { var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var operations = ["create", "read", "update", "delete"]; var separators = ["/", ":"]; diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index bc79b64fe2..fa4076aeb1 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var PermissionsView = require('core/app/views/permissionsView'); + var Origin = require('core/origin'); + var PermissionsView = require('core/views/permissionsView'); var Router = Backbone.Router.extend({ routes: { diff --git a/frontend/src/core/views/contentPaneView.js b/frontend/src/core/views/contentPaneView.js index c2f8e29108..bdac03184a 100644 --- a/frontend/src/core/views/contentPaneView.js +++ b/frontend/src/core/views/contentPaneView.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContentPaneView = Backbone.View.extend({ className: 'contentPane', diff --git a/frontend/src/core/views/contextMenuView.js b/frontend/src/core/views/contextMenuView.js index 143ca01000..8ea14e7209 100644 --- a/frontend/src/core/views/contextMenuView.js +++ b/frontend/src/core/views/contextMenuView.js @@ -6,7 +6,7 @@ define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ContextMenuView = Backbone.View.extend({ diff --git a/frontend/src/core/views/originView.js b/frontend/src/core/views/originView.js index ad7cb73213..0b65d72cf2 100644 --- a/frontend/src/core/views/originView.js +++ b/frontend/src/core/views/originView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var OriginView = Backbone.View.extend({ settings: { diff --git a/frontend/src/core/views/permissionsView.js b/frontend/src/core/views/permissionsView.js index 4ba124b656..864fedb66f 100644 --- a/frontend/src/core/views/permissionsView.js +++ b/frontend/src/core/views/permissionsView.js @@ -2,7 +2,7 @@ define(function(require){ var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var PermissionsView = Backbone.View.extend({ diff --git a/frontend/src/modules/actions/index.js b/frontend/src/modules/actions/index.js index d692e82ae3..d3367977ed 100644 --- a/frontend/src/modules/actions/index.js +++ b/frontend/src/modules/actions/index.js @@ -1,21 +1,17 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var Origin = require('core/origin'); + var ActionsView = require('./views/actionsView').js; - var Origin = require('core/app/origin'); - var ActionsView = require('core/actions/views/actionsView'); - - var Actions = {}; - - Actions.add = function(options, $element) { - - // Expects options to contain: - // _items: list of select options - array of objects containing text, value and applyButtonText as keys - // placeholderText: first item in the select options - // buttonText: Action button text - $element.append(new ActionsView(options).$el); - - } - - Origin.actions = Actions; - -}); \ No newline at end of file + Origin.actions = { + add: function(options, $element) { + /** + * Expects options to contain: + * _items: list of select options - array of objects containing text, value and applyButtonText as keys + * placeholderText: first item in the select options + * buttonText: Action button text + */ + $element.append(new ActionsView(options).$el); + } + } +}); diff --git a/frontend/src/modules/actions/views/actionsView.js b/frontend/src/modules/actions/views/actionsView.js index 2cc3de011c..c2b8338628 100644 --- a/frontend/src/modules/actions/views/actionsView.js +++ b/frontend/src/modules/actions/views/actionsView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); var ActionsView = Backbone.View.extend({ diff --git a/frontend/src/modules/assetManagement/collections/assetCollection.js b/frontend/src/modules/assetManagement/collections/assetCollection.js index ceeda00df1..f583ebf031 100644 --- a/frontend/src/modules/assetManagement/collections/assetCollection.js +++ b/frontend/src/modules/assetManagement/collections/assetCollection.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var AssetModel = require('core/assetManagement/models/assetModel'); + var AssetModel = require('../models/assetModel'); var AssetCollection = Backbone.Collection.extend({ @@ -18,4 +18,4 @@ define(function(require) { return AssetCollection; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/assetManagement/index.js b/frontend/src/modules/assetManagement/index.js index 9cc383e04f..b30566b078 100644 --- a/frontend/src/modules/assetManagement/index.js +++ b/frontend/src/modules/assetManagement/index.js @@ -1,13 +1,13 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var AssetCollection = require('core/assetManagement/collections/assetCollection'); - var AssetManagementView = require('core/assetManagement/views/assetManagementView'); - var AssetManagementSidebarView = require('core/assetManagement/views/assetManagementSidebarView'); - var AssetManagementNewAssetView = require('core/assetManagement/views/assetManagementNewAssetView'); - var AssetManagementNewAssetSidebarView = require('core/assetManagement/views/assetManagementNewAssetSidebarView'); - var TagsCollection = require('core/tags/collections/tagsCollection'); + var Origin = require('core/origin'); + var AssetModel = require('./models/assetModel'); + var AssetCollection = require('./collections/assetCollection'); + var AssetManagementView = require('./views/assetManagementView'); + var AssetManagementSidebarView = require('./views/assetManagementSidebarView'); + var AssetManagementNewAssetView = require('./views/assetManagementNewAssetView'); + var AssetManagementNewAssetSidebarView = require('./views/assetManagementNewAssetSidebarView'); + var TagsCollection = require('core/collections/tagsCollection'); Origin.on('router:assetManagement', function(location, subLocation, action) { Origin.assetManagement = {}; diff --git a/frontend/src/modules/assetManagement/views/assetManagementCollectionView.js b/frontend/src/modules/assetManagement/views/assetManagementCollectionView.js index 2fc570bd35..ce196eb7fe 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementCollectionView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementCollectionView.js @@ -3,11 +3,11 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var AssetItemView = require('core/assetManagement/views/assetManagementItemView'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var AssetManagementPreview = require('core/assetManagement/views/assetManagementPreviewView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var AssetItemView = require('./assetManagementItemView'); + var AssetModel = require('../models/assetModel'); + var AssetManagementPreview = require('./assetManagementPreviewView'); var AssetCollectionView = OriginView.extend({ @@ -44,7 +44,7 @@ define(function(require){ } // FIX: Purely and lovingly put in for a rendering issue with chrome. - // For when the items being re-rendering after a search return an + // For when the items being re-rendering after a search return an // amount of items that means the container is not scrollable if (this.assetLimit < this.assetDenominator) { $('.asset-management-assets-container').hide(); @@ -63,7 +63,7 @@ define(function(require){ $assetContainer.off('scroll'); $assetContainer.on('scroll', _.bind(function() { - + var scrollTop = $assetContainer.scrollTop(); var scrollableHeight = $assetContainerInner.height(); var containerHeight = $assetContainer.height(); @@ -96,7 +96,7 @@ define(function(require){ if (!Origin.permissions.hasPermissions(["*"])) { this.search = _.extend(this.search, {_isDeleted: false}); - } + } this.search = _.extend(this.search, { tags: { @@ -122,7 +122,7 @@ define(function(require){ skip: this.assetLimit, limit: this.assetDenominator, sort: this.sort - } + } }, success: _.bind(function() { // On successful collection fetching set lazy render to enabled diff --git a/frontend/src/modules/assetManagement/views/assetManagementItemView.js b/frontend/src/modules/assetManagement/views/assetManagementItemView.js index d9374fd54c..af370bdd51 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementItemView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementItemView.js @@ -3,8 +3,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var AssetItemView = OriginView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js b/frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js index 6864643101..715033a021 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalAutofillView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); var AssetManagementModalAutofillView = Backbone.View.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js b/frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js index 2c7f72fcfa..6245d39cd8 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalFiltersView.js @@ -1,12 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); - var AssetManagementModalTagsView = require('core/assetManagement/views/assetManagementModalTagsView'); - var AssetManagementModalNewAssetView = require('core/assetManagement/views/assetManagementModalNewAssetView'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var TagsCollection = require('core/tags/collections/tagsCollection'); + var AssetManagementModalTagsView = require('./assetManagementModalTagsView'); + var AssetManagementModalNewAssetView = require('./assetManagementModalNewAssetView'); + var AssetModel = require('../models/assetModel'); + var TagsCollection = require('core/collections/tagsCollection'); var AssetManagementModalFiltersView = Backbone.View.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js index d3047660fb..dda3e659db 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js @@ -2,10 +2,10 @@ define(function(require){ var Backbone = require('backbone'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var TagsInput = require('core/libraries/jquery.tagsinput.min'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); + var AssetModel = require('../models/assetModel'); + var TagsInput = require('libraries/jquery.tagsinput.min'); var AssetManagementNewAssetView = OriginView.extend({ @@ -86,7 +86,7 @@ define(function(require){ if (!this.validateInput()) { return false; } - + var title = this.$('.asset-title').val(); var description = this.$('.asset-description').val(); // If model is new then uploadFile diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js b/frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js index 3381d87321..1036f8791f 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalTagsView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var AssetManagementModalTagsView = OriginView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalView.js b/frontend/src/modules/assetManagement/views/assetManagementModalView.js index cdaa593551..6ab909531c 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalView.js @@ -2,13 +2,13 @@ define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var AssetManagementCollectionView = require('core/assetManagement/views/assetManagementCollectionView'); - var AssetManagementPreviewView = require('core/assetManagement/views/assetManagementPreviewView'); - var AssetManagementView = require('core/assetManagement/views/assetManagementView'); - var AssetManagementModalFiltersView = require('core/assetManagement/views/assetManagementModalFiltersView'); - var AssetManagementModelAutofillView = require('core/assetManagement/views/assetManagementModalAutofillView'); + var Origin = require('core/origin'); + var AssetModel = require('../models/assetModel'); + var AssetManagementCollectionView = require('./assetManagementCollectionView'); + var AssetManagementPreviewView = require('./assetManagementPreviewView'); + var AssetManagementView = require('./assetManagementView'); + var AssetManagementModalFiltersView = require('./assetManagementModalFiltersView'); + var AssetManagementModelAutofillView = require('./assetManagementModalAutofillView'); var AssetManagementModalView = AssetManagementView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js index 1e58ec48a6..15a53eb1c0 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var AssetManagementNewAssetSidebarView = SidebarItemView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js index 2a63f42039..2d1ffd0355 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js @@ -2,10 +2,10 @@ define(function(require){ var Backbone = require('backbone'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var TagsInput = require('core/libraries/jquery.tagsinput.min'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); + var AssetModel = require('../models/assetModel'); + var TagsInput = require('libraries/jquery.tagsinput.min'); var AssetManagementNewAssetView = OriginView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js index 874df41490..16df40be45 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js @@ -2,8 +2,8 @@ define(function(require){ var Backbone = require('backbone'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var AssetManagementPreviewView = OriginView.extend({ @@ -28,7 +28,7 @@ define(function(require){ mejs.plugins.silverlight[0].types.push('video/x-ms-wmv'); mejs.plugins.silverlight[0].types.push('audio/x-ms-wma'); var mediaElement = this.$('audio, video').mediaelementplayer({ - pluginPath:'adaptbuilder/css/assets/', + pluginPath:'css/assets/', features: ['playpause','progress','current','duration'] }); } diff --git a/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js index 2d0dcce9bb..7bf10f4149 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var AssetManagementSidebarView = SidebarItemView.extend({ diff --git a/frontend/src/modules/assetManagement/views/assetManagementView.js b/frontend/src/modules/assetManagement/views/assetManagementView.js index 072a9ab4c6..dbc757171c 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementView.js @@ -3,11 +3,11 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var AssetManagementCollectionView = require('core/assetManagement/views/assetManagementCollectionView'); - var AssetManagementPreviewView = require('core/assetManagement/views/assetManagementPreviewView'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); + var AssetModel = require('../models/assetModel'); + var AssetManagementCollectionView = require('./assetManagementCollectionView'); + var AssetManagementPreviewView = require('./assetManagementPreviewView'); var AssetManagementView = OriginView.extend({ @@ -59,7 +59,7 @@ define(function(require){ onAssetDeleted: function() { this.$('.asset-management-no-preview').show(); } - + }, { template: 'assetManagement' }); diff --git a/frontend/src/modules/dashboard/index.js b/frontend/src/modules/dashboard/index.js index 8d80625206..7ea47e96d8 100644 --- a/frontend/src/modules/dashboard/index.js +++ b/frontend/src/modules/dashboard/index.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var DashboardView = require('core/dashboard/views/dashboardView'); - var DashboardSidebarView = require('core/dashboard/views/dashboardSidebarView'); - var MyProjectCollection = require('core/project/collections/myProjectCollection'); - var SharedProjectCollection = require('core/project/collections/sharedProjectCollection'); - var TagsCollection = require('core/tags/collections/tagsCollection'); + var Origin = require('core/origin'); + var DashboardView = require('./views/dashboardView'); + var DashboardSidebarView = require('./views/dashboardSidebarView'); + var MyProjectCollection = require('modules/project/collections/myProjectCollection'); + var SharedProjectCollection = require('modules/project/collections/sharedProjectCollection'); + var TagsCollection = require('core/collections/tagsCollection'); Origin.on('router:dashboard', function(location, subLocation, action) { diff --git a/frontend/src/modules/dashboard/views/dashboardSidebarView.js b/frontend/src/modules/dashboard/views/dashboardSidebarView.js index 3abbf481ac..b971a1baa3 100644 --- a/frontend/src/modules/dashboard/views/dashboardSidebarView.js +++ b/frontend/src/modules/dashboard/views/dashboardSidebarView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var DashboardSidebarView = SidebarItemView.extend({ settings: { diff --git a/frontend/src/modules/dashboard/views/dashboardView.js b/frontend/src/modules/dashboard/views/dashboardView.js index e84c3c2a34..6f4ab2b5c3 100644 --- a/frontend/src/modules/dashboard/views/dashboardView.js +++ b/frontend/src/modules/dashboard/views/dashboardView.js @@ -3,11 +3,11 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var ProjectView = require('core/project/views/projectView'); - var SharedProjectView = require('core/project/views/sharedProjectView'); - var ProjectCollection = require('core/project/collections/projectCollection'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var ProjectView = require('modules/project/views/projectView'); + var SharedProjectView = require('modules/project/views/sharedProjectView'); + var ProjectCollection = require('modules/project/collections/projectCollection'); var DashboardView = OriginView.extend({ @@ -56,7 +56,7 @@ define(function(require){ this.collectionLength = 0; this.shouldStopFetches = false; - + }, resizeDashboard: function() { @@ -118,7 +118,7 @@ define(function(require){ }, sortDescending: function(shouldRenderProjects) { - + this.sort = { title: -1 } @@ -235,7 +235,7 @@ define(function(require){ skip: this.courseLimit, limit: this.courseDenominator, sort: this.sort - } + } }, success: _.bind(function(data) { diff --git a/frontend/src/modules/editor/article/index.js b/frontend/src/modules/editor/article/index.js index 4e8f672629..5db7038587 100644 --- a/frontend/src/modules/editor/article/index.js +++ b/frontend/src/modules/editor/article/index.js @@ -1,10 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); var Helpers = require('../global/helpers'); - var ArticleModel = require('core/app/models/articleModel'); + var ArticleModel = require('core/models/articleModel'); var EditorArticleEditSidebarView = require('./views/editorArticleEditSidebarView'); var EditorArticleEditView = require('./views/editorArticleEditView'); diff --git a/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js b/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js index 4842b0f547..2dc5457329 100644 --- a/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js +++ b/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorArticleEditSidebarView = SidebarItemView.extend({ events: { @@ -11,7 +11,7 @@ define(function(require) { }, postRender: function() { - + }, saveEditing: function(event) { diff --git a/frontend/src/modules/editor/article/views/editorArticleEditView.js b/frontend/src/modules/editor/article/views/editorArticleEditView.js index e02bcfd084..c28cd1738e 100644 --- a/frontend/src/modules/editor/article/views/editorArticleEditView.js +++ b/frontend/src/modules/editor/article/views/editorArticleEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorArticleEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/block/index.js b/frontend/src/modules/editor/block/index.js index f9f54a516b..56fb7e7e00 100644 --- a/frontend/src/modules/editor/block/index.js +++ b/frontend/src/modules/editor/block/index.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); var Helpers = require('../global/helpers'); - var BlockModel = require('core/app/models/blockModel'); + var BlockModel = require('core/models/blockModel'); var EditorBlockEditView = require('./views/editorBlockEditView'); var EditorBlockEditSidebarView = require('./views/editorBlockEditSidebarView'); diff --git a/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js b/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js index 6882c9ecc8..1379504f40 100644 --- a/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js +++ b/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorBlockEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/block/views/editorBlockEditView.js b/frontend/src/modules/editor/block/views/editorBlockEditView.js index f4273b70c8..422071b3a7 100644 --- a/frontend/src/modules/editor/block/views/editorBlockEditView.js +++ b/frontend/src/modules/editor/block/views/editorBlockEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorBlockEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/component/index.js b/frontend/src/modules/editor/component/index.js index d7e48438b0..c628896e55 100644 --- a/frontend/src/modules/editor/component/index.js +++ b/frontend/src/modules/editor/component/index.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); var Helpers = require('../global/helpers'); - var ComponentModel = require('core/app/models/componentModel'); + var ComponentModel = require('core/models/componentModel'); var EditorComponentEditView = require('./views/editorComponentEditView'); var EditorComponentEditSidebarView = require('./views/editorComponentEditSidebarView'); diff --git a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js index 6f2d94a1bd..2792ee9a75 100644 --- a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js +++ b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorComponentEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/component/views/editorComponentEditView.js b/frontend/src/modules/editor/component/views/editorComponentEditView.js index f746a65729..42c6954d1c 100644 --- a/frontend/src/modules/editor/component/views/editorComponentEditView.js +++ b/frontend/src/modules/editor/component/views/editorComponentEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorComponentEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/config/collections/editorConfigCollection.js b/frontend/src/modules/editor/config/collections/editorConfigCollection.js index 968dae2de8..fc45a7102d 100644 --- a/frontend/src/modules/editor/config/collections/editorConfigCollection.js +++ b/frontend/src/modules/editor/config/collections/editorConfigCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var ConfigCollection = Backbone.Collection.extend({ model: ConfigModel, diff --git a/frontend/src/modules/editor/config/index.js b/frontend/src/modules/editor/config/index.js index f74c67c324..4b61bd7deb 100644 --- a/frontend/src/modules/editor/config/index.js +++ b/frontend/src/modules/editor/config/index.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var EditorConfigEditView = require('./views/editorConfigEditView'); var EditorConfigEditSidebarView = require('./views/editorConfigEditSidebarView'); diff --git a/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js b/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js index fc5b263ccb..a138bc4758 100644 --- a/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js +++ b/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorConfigEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/config/views/editorConfigEditView.js b/frontend/src/modules/editor/config/views/editorConfigEditView.js index 36a8c19034..1ccc33367b 100644 --- a/frontend/src/modules/editor/config/views/editorConfigEditView.js +++ b/frontend/src/modules/editor/config/views/editorConfigEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorConfigEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js index e3628c6c80..11cc1b7d0a 100644 --- a/frontend/src/modules/editor/contentObject/index.js +++ b/frontend/src/modules/editor/contentObject/index.js @@ -3,10 +3,10 @@ define(function(require) { /** * This module handles both sections/menus and pages. */ - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); - var ContentObjectModel = require('core/app/models/contentObjectModel'); + var ContentObjectModel = require('core/models/contentObjectModel'); var EditorMenuSidebarView = require('./views/editorMenuSidebarView'); var EditorPageComponentListView = require('./views/editorPageComponentListView'); var EditorPageComponentListSidebarView = require('./views/editorPageComponentListSidebarView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index d029d1efb0..c1f60a07b8 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorMenuItemView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js index c4d95de9bb..370a7524c2 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var ArticleModel = require('core/app/models/articleModel'); - var BlockModel = require('core/app/models/blockModel'); - var ContentObjectModel = require('core/app/models/contentObjectModel'); + var Origin = require('core/origin'); + var ArticleModel = require('core/models/articleModel'); + var BlockModel = require('core/models/blockModel'); + var ContentObjectModel = require('core/models/contentObjectModel'); var EditorMenuItemView = require('./editorMenuItemView'); var EditorOriginView = require('../../global/views/editorOriginView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js index 978d819649..e27afaa0ca 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuSidebarView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorMenuSidebarView = SidebarItemView.extend({ // If adding 'events', extend from the base view diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuView.js b/frontend/src/modules/editor/contentObject/views/editorMenuView.js index 65e5c5e428..24646f70a0 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuView.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorMenuLayerView = require('./editorMenuLayerView'); var EditorMenuItemView = require('./editorMenuItemView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js index 2a50c871fe..d4efab944c 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js @@ -2,9 +2,9 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var BlockModel = require('core/app/models/blockModel'); + var BlockModel = require('core/models/blockModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageBlockView = require('./editorPageBlockView'); var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js index 0b8a34d856..8ff2758b38 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js @@ -2,9 +2,9 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ComponentModel = require('core/app/models/componentModel'); + var ComponentModel = require('core/models/componentModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageComponentView = require('./editorPageComponentView'); var EditorPageComponentPasteZoneView = require('./editorPageComponentPasteZoneView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js index 2a830e445d..264deece4c 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ComponentModel = require('core/app/models/componentModel'); + var ComponentModel = require('core/models/componentModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageComponentView = require('./editorPageComponentView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js index 5698bcb16b..5cd5eca53b 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js @@ -1,10 +1,10 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ComponentModel = require('core/app/models/componentModel'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var ComponentModel = require('core/models/componentModel'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorPageComponentListSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js index 86ad1e2c23..25d578bd92 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js @@ -2,7 +2,7 @@ define(function(require) { var _ = require('underscore'); var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageComponentListItemView = require('./editorPageComponentListItemView'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js index 1713eb2be0..669ea1dd9f 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentPasteZoneView.js @@ -2,7 +2,7 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); var EditorPageComponentPasteZone = EditorPasteZoneView.extend({ diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js index 7a1abfb6c4..ea8ef26a7b 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js @@ -2,7 +2,7 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageComponentView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js index 7cd759b312..688611b4bf 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorPageEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageEditView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditView.js index 279b8c00e9..4644c19f90 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageEditView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js index 86e58dde6d..bc1db95010 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorPageSidebarView = SidebarItemView.extend({ // If adding 'events', extend from the base view diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index 97ff560df8..5a244e43cb 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -2,10 +2,10 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ArticleModel = require('core/app/models/articleModel'); - var ContentModel = require('core/app/models/contentModel'); + var ArticleModel = require('core/models/articleModel'); + var ContentModel = require('core/models/contentModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorPageArticleView = require('./editorPageArticleView'); var EditorPasteZoneView = require('../../global/views/editorPasteZoneView'); diff --git a/frontend/src/modules/editor/course/index.js b/frontend/src/modules/editor/course/index.js index 513a9571be..a1aa642bc7 100644 --- a/frontend/src/modules/editor/course/index.js +++ b/frontend/src/modules/editor/course/index.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); - var CourseModel = require('core/app/models/courseModel'); + var CourseModel = require('core/models/courseModel'); var EditorCourseEditView = require('./views/editorCourseEditView'); var EditorCourseEditSidebarView = require('./views/editorCourseEditSidebarView'); diff --git a/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js b/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js index 50032e44e6..cb7104b7fd 100644 --- a/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js +++ b/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorCourseEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/course/views/editorCourseEditView.js b/frontend/src/modules/editor/course/views/editorCourseEditView.js index 7210ca5e40..cf1b273cc0 100644 --- a/frontend/src/modules/editor/course/views/editorCourseEditView.js +++ b/frontend/src/modules/editor/course/views/editorCourseEditView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorCourseEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/extensions/index.js b/frontend/src/modules/editor/extensions/index.js index 5149523cda..ecf908c172 100644 --- a/frontend/src/modules/editor/extensions/index.js +++ b/frontend/src/modules/editor/extensions/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); var EditorExtensionsEditView = require('./views/editorExtensionsEditView'); diff --git a/frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js index 37a0f27701..3317a7dab2 100644 --- a/frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js +++ b/frontend/src/modules/editor/extensions/views/editorExtensionsEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorExtensionsEditSidebarView = SidebarItemView.extend({}, { template: 'editorExtensionsEditSidebar' diff --git a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js index 91a11d6581..2c3c21bb98 100644 --- a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var EditorOriginView = require('../../global/views/editorOriginView'); var EditorExtensionsEditView = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/global/collections/editorCollection.js b/frontend/src/modules/editor/global/collections/editorCollection.js index 9b019a93e1..f7fcb4df3c 100644 --- a/frontend/src/modules/editor/global/collections/editorCollection.js +++ b/frontend/src/modules/editor/global/collections/editorCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorCollection = Backbone.Collection.extend({ initialize : function(models, options){ diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index efb277fc14..85dc1494e6 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -1,19 +1,19 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var _ = require('underscore'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); - var ArticleModel = require('core/app/models/articleModel'); - var BlockModel = require('core/app/models/blockModel'); - var ClipboardModel = require('core/app/models/clipboardModel'); - var ComponentModel = require('core/app/models/componentModel'); - var ComponentTypeModel = require('core/app/models/componentTypeModel'); - var ContentObjectModel = require('core/app/models/contentObjectModel'); - var ConfigModel = require('core/app/models/configModel'); - var CourseAssetModel = require('core/app/models/courseAssetModel'); - var CourseModel = require('core/app/models/courseModel'); + var ArticleModel = require('core/models/articleModel'); + var BlockModel = require('core/models/blockModel'); + var ClipboardModel = require('core/models/clipboardModel'); + var ComponentModel = require('core/models/componentModel'); + var ComponentTypeModel = require('core/models/componentTypeModel'); + var ContentObjectModel = require('core/models/contentObjectModel'); + var ConfigModel = require('core/models/configModel'); + var CourseAssetModel = require('core/models/courseAssetModel'); + var CourseModel = require('core/models/courseModel'); var EditorCollection = require('../global/collections/editorCollection'); - var ExtensionModel = require('core/app/models/extensionModel'); + var ExtensionModel = require('core/models/extensionModel'); // used to check what's preloaded var globalData = { diff --git a/frontend/src/modules/editor/global/helpers.js b/frontend/src/modules/editor/global/helpers.js index 90000e3ece..342db89737 100644 --- a/frontend/src/modules/editor/global/helpers.js +++ b/frontend/src/modules/editor/global/helpers.js @@ -1,5 +1,5 @@ define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var helpers = { /** diff --git a/frontend/src/modules/editor/global/views/editorOriginView.js b/frontend/src/modules/editor/global/views/editorOriginView.js index fd3abb0fcf..a6e628f8ee 100644 --- a/frontend/src/modules/editor/global/views/editorOriginView.js +++ b/frontend/src/modules/editor/global/views/editorOriginView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var Helpers = require('core/app/helpers'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var Helpers = require('core/helpers'); var EditorOriginView = OriginView.extend({ events: { diff --git a/frontend/src/modules/editor/global/views/editorPasteZoneView.js b/frontend/src/modules/editor/global/views/editorPasteZoneView.js index f41118063c..863a77beca 100644 --- a/frontend/src/modules/editor/global/views/editorPasteZoneView.js +++ b/frontend/src/modules/editor/global/views/editorPasteZoneView.js @@ -2,8 +2,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); - var Helpers = require('core/app/helpers'); + var Origin = require('core/origin'); + var Helpers = require('core/helpers'); var EditorOriginView = require('./editorOriginView'); var EditorPasteZone = EditorOriginView.extend({ diff --git a/frontend/src/modules/editor/global/views/editorView.js b/frontend/src/modules/editor/global/views/editorView.js index 326863420c..e6eed9eba2 100644 --- a/frontend/src/modules/editor/global/views/editorView.js +++ b/frontend/src/modules/editor/global/views/editorView.js @@ -5,17 +5,17 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); - var helpers = require('core/app/helpers'); + var Origin = require('core/origin'); + var helpers = require('core/helpers'); var EditorOriginView = require('./editorOriginView'); var EditorMenuView = require('../../contentObject/views/editorMenuView'); var EditorPageView = require('../../contentObject/views/editorPageView'); - var ContentObjectModel = require('core/app/models/contentObjectModel'); - var ArticleModel = require('core/app/models/articleModel'); - var BlockModel = require('core/app/models/blockModel'); - var ComponentModel = require('core/app/models/componentModel'); + var ContentObjectModel = require('core/models/contentObjectModel'); + var ArticleModel = require('core/models/articleModel'); + var BlockModel = require('core/models/blockModel'); + var ComponentModel = require('core/models/componentModel'); var EditorView = EditorOriginView.extend({ className: "editor-view", diff --git a/frontend/src/modules/editor/index.js b/frontend/src/modules/editor/index.js index 4b56525852..b83f533f0b 100644 --- a/frontend/src/modules/editor/index.js +++ b/frontend/src/modules/editor/index.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('./global/editorDataLoader'); // load the submodules require([ diff --git a/frontend/src/modules/editor/menuSettings/index.js b/frontend/src/modules/editor/menuSettings/index.js index 770ada820f..beee205586 100644 --- a/frontend/src/modules/editor/menuSettings/index.js +++ b/frontend/src/modules/editor/menuSettings/index.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var EditorMenuSettingsEditView = require('./views/editorMenuSettingsEditView'); var EditorMenuSettingsEditSidebarView = require('./views/editorMenuSettingsEditSidebarView'); diff --git a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js index 2789304c40..2f040d830f 100644 --- a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js +++ b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorMenuSettingsEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js index 338f17eb7d..7b5d64739d 100644 --- a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js +++ b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var MenuSettingsCollection = require('../collections/editorMenuSettingsCollection'); var MenuSettingsView = require('./editorMenuSettingsView'); diff --git a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js index 9b7a4a8087..a0b4a5c8fc 100644 --- a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js +++ b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsView.js @@ -2,8 +2,8 @@ define(function(require){ var Handlebars = require('handlebars'); var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var MenuSettingsView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/modules/editor/selectTheme/index.js b/frontend/src/modules/editor/selectTheme/index.js index b6f22ade9e..44e781367b 100644 --- a/frontend/src/modules/editor/selectTheme/index.js +++ b/frontend/src/modules/editor/selectTheme/index.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorData = require('../global/editorDataLoader'); - var ConfigModel = require('core/app/models/configModel'); + var ConfigModel = require('core/models/configModel'); var EditorThemeCollectionView = require('./views/editorThemeCollectionView'); var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView'); diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js index b02b2f12a1..702b370201 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorThemeCollectionSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js index 2b366741cf..8b4ce7453d 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var ThemeCollection = require('../collections/editorThemeCollection'); diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js index 073c821018..e3908069e5 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeEditSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorThemeEditSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js index 13482531a3..ed5325012a 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var EditorOriginView = require('../../global/views/editorOriginView'); var ThemeCollection = require('../collections/editorThemeCollection'); diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js index 58ddd17b49..378a7e8b34 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeItemView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var ThemeItemView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeView.js index e71b89f16c..6627e54899 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeView.js @@ -2,8 +2,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var ThemeView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/modules/filters/index.js b/frontend/src/modules/filters/index.js index 569bccf9d5..dba33e48d7 100644 --- a/frontend/src/modules/filters/index.js +++ b/frontend/src/modules/filters/index.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var TypeAheadView = require('core/filters/views/typeAheadView'); + var Origin = require('core/origin'); + var TypeAheadView = require('modules/filters/views/typeAheadView'); var Filters = {}; @@ -20,4 +20,4 @@ define(function(require) { Origin.filters = Filters; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/filters/views/typeAheadView.js b/frontend/src/modules/filters/views/typeAheadView.js index 2a20c20102..2f91e75f27 100644 --- a/frontend/src/modules/filters/views/typeAheadView.js +++ b/frontend/src/modules/filters/views/typeAheadView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Typeahead = require('typeahead'); var TypeAheadView = Backbone.View.extend({ diff --git a/frontend/src/modules/globalMenu/index.js b/frontend/src/modules/globalMenu/index.js index d96de8ec14..0be5128f10 100644 --- a/frontend/src/modules/globalMenu/index.js +++ b/frontend/src/modules/globalMenu/index.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var GlobalMenuView = require('core/globalMenu/views/globalMenuView'); + var Origin = require('core/origin'); + var GlobalMenuView = require('./views/globalMenuView'); // Create GlobalMenu object var GlobalMenu = {}; @@ -27,7 +27,7 @@ define(function(require) { // Push item to GlobalMenuStore GlobalMenuStore.add(itemObject); } - + } // Method for adding a sub item to the global menu @@ -78,7 +78,7 @@ define(function(require) { }); // if login as another user reset the collection as per that user's permissions - Origin.on('login:loginas', function() { + Origin.on('login:loginas', function() { GlobalMenuStore.remove(GlobalMenuStore.models); }); @@ -106,4 +106,4 @@ define(function(require) { Origin.globalMenu = GlobalMenu; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/globalMenu/views/globalMenuItemView.js b/frontend/src/modules/globalMenu/views/globalMenuItemView.js index 0f6ac9a71d..8835e536cc 100644 --- a/frontend/src/modules/globalMenu/views/globalMenuItemView.js +++ b/frontend/src/modules/globalMenu/views/globalMenuItemView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var GlobalMenuItemView = Backbone.View.extend({ diff --git a/frontend/src/modules/globalMenu/views/globalMenuView.js b/frontend/src/modules/globalMenu/views/globalMenuView.js index 1dc3a7948d..820bfdedcc 100644 --- a/frontend/src/modules/globalMenu/views/globalMenuView.js +++ b/frontend/src/modules/globalMenu/views/globalMenuView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/app/origin'); - var GlobalMenuItemView = require('core/globalMenu/views/globalMenuItemView'); + + var Origin = require('core/origin'); + var GlobalMenuItemView = require('./globalMenuItemView'); var GlobalMenuView = Backbone.View.extend({ @@ -60,4 +60,4 @@ define(function(require) { return GlobalMenuView; -}) \ No newline at end of file +}) diff --git a/frontend/src/modules/help/index.js b/frontend/src/modules/help/index.js index 3381309a4c..0fb0016aab 100644 --- a/frontend/src/modules/help/index.js +++ b/frontend/src/modules/help/index.js @@ -1,5 +1,5 @@ define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); Origin.on('navigation:help', function() { openWikiLink(getLink()); diff --git a/frontend/src/modules/location/index.js b/frontend/src/modules/location/index.js index 8a6e2d5273..b10101808b 100644 --- a/frontend/src/modules/location/index.js +++ b/frontend/src/modules/location/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var LocationTitleView = require('core/location/views/locationTitleView'); + var Origin = require('core/origin'); + var LocationTitleView = require('./views/locationTitleView'); Origin.once('app:dataReady', function() { $('.location-title').html(new LocationTitleView().$el); diff --git a/frontend/src/modules/location/views/locationTitleView.js b/frontend/src/modules/location/views/locationTitleView.js index 001fce0740..a800e06456 100644 --- a/frontend/src/modules/location/views/locationTitleView.js +++ b/frontend/src/modules/location/views/locationTitleView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); var LocationTitleView = Backbone.View.extend({ diff --git a/frontend/src/modules/modal/index.js b/frontend/src/modules/modal/index.js index 56e03bcd3d..35136cc6a2 100644 --- a/frontend/src/modules/modal/index.js +++ b/frontend/src/modules/modal/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var ModalView = require('core/modal/views/modalView'); + var Origin = require('core/origin'); + var ModalView = require('./views/modalView'); Origin.on('modal:open', function(view, options, context) { new ModalView({ diff --git a/frontend/src/modules/modal/views/modalView.js b/frontend/src/modules/modal/views/modalView.js index 3b3112a313..0d8683dca8 100644 --- a/frontend/src/modules/modal/views/modalView.js +++ b/frontend/src/modules/modal/views/modalView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ModalView = Backbone.View.extend({ diff --git a/frontend/src/modules/modules.js b/frontend/src/modules/modules.js index fde8483880..6548e9ca5b 100644 --- a/frontend/src/modules/modules.js +++ b/frontend/src/modules/modules.js @@ -1 +1 @@ -require(['/modules/actions/index.js','/modules/assetManagement/index.js','/modules/dashboard/index.js','/modules/editor/index.js','/modules/filters/index.js','/modules/globalMenu/index.js','/modules/help/index.js','/modules/location/index.js','/modules/modal/index.js','/modules/navigation/index.js','/modules/notify/index.js','/modules/options/index.js','/modules/pluginManagement/index.js','/modules/project/index.js','/modules/scaffold/index.js','/modules/sidebar/index.js','/modules/user/index.js']); \ No newline at end of file +require(['modules/actions/index','modules/assetManagement/index','modules/dashboard/index','modules/editor/index','modules/filters/index','modules/globalMenu/index','modules/help/index','modules/location/index','modules/modal/index','modules/navigation/index','modules/notify/index','modules/options/index','modules/pluginManagement/index','modules/project/index','modules/scaffold/index','modules/sidebar/index','modules/user/index','modules/userManagement/index']); \ No newline at end of file diff --git a/frontend/src/modules/navigation/index.js b/frontend/src/modules/navigation/index.js new file mode 100644 index 0000000000..8e937ea614 --- /dev/null +++ b/frontend/src/modules/navigation/index.js @@ -0,0 +1,3 @@ +define(function(require) { + console.log('TODO set up to load navigation view'); +}); diff --git a/frontend/src/modules/navigation/views/navigationView.js b/frontend/src/modules/navigation/views/navigationView.js index 55718c42b0..c70977e732 100644 --- a/frontend/src/modules/navigation/views/navigationView.js +++ b/frontend/src/modules/navigation/views/navigationView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var NavigationView = OriginView.extend({ tagName: 'nav', diff --git a/frontend/src/modules/notify/index.js b/frontend/src/modules/notify/index.js index b383da0fe8..e38715c140 100644 --- a/frontend/src/modules/notify/index.js +++ b/frontend/src/modules/notify/index.js @@ -2,7 +2,7 @@ define(function(require) { var _ = require('underscore'); var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Notify = Origin.Notify; diff --git a/frontend/src/modules/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js index 5f7d046cfa..dc37c129cc 100644 --- a/frontend/src/modules/notify/plugins/alert/index.js +++ b/frontend/src/modules/notify/plugins/alert/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var _ = require('underscore'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var SweetAlert = require('sweetalert'); function getSettings(data) { diff --git a/frontend/src/modules/notify/plugins/console/index.js b/frontend/src/modules/notify/plugins/console/index.js index d89f862b78..dd0269bc53 100644 --- a/frontend/src/modules/notify/plugins/console/index.js +++ b/frontend/src/modules/notify/plugins/console/index.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var _ = require('underscore'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Console = function(data) { if(_.isString(data)) return console.log(data); diff --git a/frontend/src/modules/options/index.js b/frontend/src/modules/options/index.js index f2a385cdde..9b23a2ee77 100644 --- a/frontend/src/modules/options/index.js +++ b/frontend/src/modules/options/index.js @@ -3,8 +3,8 @@ define(function(require) { - var Origin = require('core/app/origin'); - var OptionsView = require('core/options/views/optionsView'); + var Origin = require('core/origin'); + var OptionsView = require('./views/optionsView'); var Options = {}; @@ -17,4 +17,4 @@ define(function(require) { Origin.options = Options; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/options/views/optionsView.js b/frontend/src/modules/options/views/optionsView.js index c2c17f7ab2..1e08f8b018 100644 --- a/frontend/src/modules/options/views/optionsView.js +++ b/frontend/src/modules/options/views/optionsView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); var OptionsView = Backbone.View.extend({ diff --git a/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js b/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js index 2a8607b081..32a7effbc1 100644 --- a/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var ComponentTypeModel = require('core/pluginManagement/models/componentTypeModel'); + var ComponentTypeModel = require('../models/componentTypeModel'); var ComponentTypeCollection = Backbone.Collection.extend({ model: ComponentTypeModel, diff --git a/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js b/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js index 15ef190ab7..78ad666f72 100644 --- a/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var ExtensionTypeModel = require('core/pluginManagement/models/extensionTypeModel'); + var ExtensionTypeModel = require('../models/extensionTypeModel'); var ExtensionTypeCollection = Backbone.Collection.extend({ diff --git a/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js b/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js index 09e83381de..a4b5bd46cd 100644 --- a/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var MenuTypeModel = require('core/pluginManagement/models/menuTypeModel'); + var MenuTypeModel = require('../models/menuTypeModel'); var MenuTypeCollection = Backbone.Collection.extend({ diff --git a/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js b/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js index de5c780e1d..1a369807b0 100644 --- a/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var ThemeTypeModel = require('core/pluginManagement/models/themeTypeModel'); + var ThemeTypeModel = require('../models/themeTypeModel'); var ThemeTypeCollection = Backbone.Collection.extend({ diff --git a/frontend/src/modules/pluginManagement/index.js b/frontend/src/modules/pluginManagement/index.js index 4d630d395a..2a0e5680fc 100644 --- a/frontend/src/modules/pluginManagement/index.js +++ b/frontend/src/modules/pluginManagement/index.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var PluginManagementView = require('core/pluginManagement/views/pluginManagementView'); - var PluginManagementUploadView = require('core/pluginManagement/views/pluginManagementUploadView'); - var PluginManagementSidebarView = require('core/pluginManagement/views/pluginManagementSidebarView'); - var PluginManagementUploadSidebarView = require('core/pluginManagement/views/pluginManagementUploadSidebarView'); + var Origin = require('core/origin'); + var PluginManagementView = require('./views/pluginManagementView'); + var PluginManagementUploadView = require('./views/pluginManagementUploadView'); + var PluginManagementSidebarView = require('./views/pluginManagementSidebarView'); + var PluginManagementUploadSidebarView = require('./views/pluginManagementUploadSidebarView'); Origin.on('router:pluginManagement', function(location, subLocation, action) { if (!location) { diff --git a/frontend/src/modules/pluginManagement/models/componentTypeModel.js b/frontend/src/modules/pluginManagement/models/componentTypeModel.js index d7ea24731e..8a2467a408 100644 --- a/frontend/src/modules/pluginManagement/models/componentTypeModel.js +++ b/frontend/src/modules/pluginManagement/models/componentTypeModel.js @@ -1,17 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('core/app/origin'); var ComponentTypeModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/componenttype' - }); return ComponentTypeModel; - }); diff --git a/frontend/src/modules/pluginManagement/models/extensionTypeModel.js b/frontend/src/modules/pluginManagement/models/extensionTypeModel.js index aa104bbab0..a8214231da 100644 --- a/frontend/src/modules/pluginManagement/models/extensionTypeModel.js +++ b/frontend/src/modules/pluginManagement/models/extensionTypeModel.js @@ -1,17 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('core/app/origin'); var ExtensionTypeModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/extensiontype' - }); return ExtensionTypeModel; - }); diff --git a/frontend/src/modules/pluginManagement/models/menuTypeModel.js b/frontend/src/modules/pluginManagement/models/menuTypeModel.js index ac1b7bb528..59f4907567 100644 --- a/frontend/src/modules/pluginManagement/models/menuTypeModel.js +++ b/frontend/src/modules/pluginManagement/models/menuTypeModel.js @@ -1,17 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('core/app/origin'); var MenuTypeModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/menutype' - }); return MenuTypeModel; - }); diff --git a/frontend/src/modules/pluginManagement/models/themeTypeModel.js b/frontend/src/modules/pluginManagement/models/themeTypeModel.js index bd2679dd43..23054f14e1 100644 --- a/frontend/src/modules/pluginManagement/models/themeTypeModel.js +++ b/frontend/src/modules/pluginManagement/models/themeTypeModel.js @@ -1,17 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); - var Origin = require('core/app/origin'); var ThemeTypeModel = Backbone.Model.extend({ - idAttribute: '_id', - urlRoot: '/api/themetype' - }); return ThemeTypeModel; - }); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js index 3a07077ae5..5879367c1f 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var PluginManagementSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js index d28cfa375c..57e55203eb 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var PluginManagementUploadSidebarView = SidebarItemView.extend({ diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index 2e81a6c12a..51de031363 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -2,11 +2,11 @@ define(function(require){ var _ = require('underscore'); var Backbone = require('backbone'); - var Helpers = require('core/app/helpers'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); - var AssetModel = require('core/assetManagement/models/assetModel'); - var TagsInput = require('core/libraries/jquery.tagsinput.min'); + var Helpers = require('core/helpers'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); + var AssetModel = require('modules/assetManagement/models/assetModel'); + var TagsInput = require('libraries/jquery.tagsinput.min'); var PluginManagementUploadView = OriginView.extend({ @@ -26,7 +26,7 @@ define(function(require){ uploadFile: function() { var self = this; - + if(this.validate()) { $('.loading').show(); this.$('.plugin-form').ajaxSubmit({ diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index 7159e6805d..161813ee45 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -3,15 +3,15 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var Helpers = require('core/app/helpers'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - - var PluginTypeView = require('core/pluginManagement/views/pluginTypeView'); - var ExtensionTypeCollection = require('core/pluginManagement/collections/extensionTypeCollection'); - var ThemeTypeCollection = require('core/pluginManagement/collections/themeTypeCollection'); - var ComponentTypeCollection = require('core/pluginManagement/collections/componentTypeCollection'); - var MenuTypeCollection = require('core/pluginManagement/collections/menuTypeCollection'); + var Helpers = require('core/helpers'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + + var PluginTypeView = require('./pluginTypeView'); + var ExtensionTypeCollection = require('../collections/extensionTypeCollection'); + var ThemeTypeCollection = require('../collections/themeTypeCollection'); + var ComponentTypeCollection = require('../collections/componentTypeCollection'); + var MenuTypeCollection = require('../collections/menuTypeCollection'); var PluginManagementView = OriginView.extend({ pluginType: "plugin", diff --git a/frontend/src/modules/pluginManagement/views/pluginTypeView.js b/frontend/src/modules/pluginManagement/views/pluginTypeView.js index 9ff3c2bafa..b73d95ae99 100644 --- a/frontend/src/modules/pluginManagement/views/pluginTypeView.js +++ b/frontend/src/modules/pluginManagement/views/pluginTypeView.js @@ -3,8 +3,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var PluginTypeView = OriginView.extend({ diff --git a/frontend/src/modules/project/collections/myProjectCollection.js b/frontend/src/modules/project/collections/myProjectCollection.js index ea7660bba4..1bb4628aa5 100644 --- a/frontend/src/modules/project/collections/myProjectCollection.js +++ b/frontend/src/modules/project/collections/myProjectCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var CourseModel = require('core/app/models/courseModel'); + var CourseModel = require('core/models/courseModel'); var MyProjectCollection = Backbone.Collection.extend({ model: CourseModel, diff --git a/frontend/src/modules/project/collections/projectCollection.js b/frontend/src/modules/project/collections/projectCollection.js index eadc8ffc50..b21fbec17b 100644 --- a/frontend/src/modules/project/collections/projectCollection.js +++ b/frontend/src/modules/project/collections/projectCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var CourseModel = require('core/app/models/courseModel'); + var CourseModel = require('core/models/courseModel'); var ProjectCollection = Backbone.Collection.extend({ model: CourseModel, diff --git a/frontend/src/modules/project/collections/sharedProjectCollection.js b/frontend/src/modules/project/collections/sharedProjectCollection.js index c2a27f2cb2..ea536e450d 100644 --- a/frontend/src/modules/project/collections/sharedProjectCollection.js +++ b/frontend/src/modules/project/collections/sharedProjectCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var CourseModel = require('core/app/models/courseModel'); + var CourseModel = require('core/models/courseModel'); var SharedProjectCollection = Backbone.Collection.extend({ model: CourseModel, diff --git a/frontend/src/modules/project/index.js b/frontend/src/modules/project/index.js new file mode 100644 index 0000000000..a5167c6991 --- /dev/null +++ b/frontend/src/modules/project/index.js @@ -0,0 +1,3 @@ +define(function(require) { + console.log('TODO remove project module'); +}); diff --git a/frontend/src/modules/project/views/projectView.js b/frontend/src/modules/project/views/projectView.js index 1e1299ba64..24968e7c49 100644 --- a/frontend/src/modules/project/views/projectView.js +++ b/frontend/src/modules/project/views/projectView.js @@ -3,8 +3,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var ProjectView = OriginView.extend({ diff --git a/frontend/src/modules/project/views/sharedProjectView.js b/frontend/src/modules/project/views/sharedProjectView.js index 4958d9be92..75d099c485 100644 --- a/frontend/src/modules/project/views/sharedProjectView.js +++ b/frontend/src/modules/project/views/sharedProjectView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var SharedProjectView = OriginView.extend({ tagName: 'li', diff --git a/frontend/src/modules/scaffold/index.js b/frontend/src/modules/scaffold/index.js index 6766ee5b92..25cea628af 100644 --- a/frontend/src/modules/scaffold/index.js +++ b/frontend/src/modules/scaffold/index.js @@ -1,22 +1,22 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var _ = require('underscore'); var BackboneForms = require('backboneForms'); var BackboneFormsLists = require('backboneFormsLists'); - var ScaffoldItemsModalView = require('core/scaffold/views/scaffoldItemsModalView'); - var ScaffoldImageView = require('core/scaffold/views/scaffoldAssetView'); - var ScaffoldBooleanView = require('core/scaffold/views/scaffoldBooleanView'); - var ScaffoldTagsView = require('core/scaffold/views/scaffoldTagsView'); - var ScaffoldQuestionButtonView = require('core/scaffold/views/scaffoldQuestionButtonView'); - var ScaffoldColorPickerView = require('core/scaffold/views/scaffoldColorPickerView'); - var ScaffoldDisplayTitleView = require('core/scaffold/views/scaffoldDisplayTitleView'); - var ScaffoldCodeEditorView = require('core/scaffold/views/scaffoldCodeEditorView'); - var ScaffoldTextAreaView = require('core/scaffold/views/scaffoldTextAreaView'); - var Schemas = require('core/scaffold/schemas'); - var Overrides = require('core/scaffold/scaffoldOverrides'); - var Helpers = require('core/app/helpers'); + var ScaffoldItemsModalView = require('./views/scaffoldItemsModalView'); + var ScaffoldImageView = require('./views/scaffoldAssetView'); + var ScaffoldBooleanView = require('./views/scaffoldBooleanView'); + var ScaffoldTagsView = require('./views/scaffoldTagsView'); + var ScaffoldQuestionButtonView = require('./views/scaffoldQuestionButtonView'); + var ScaffoldColorPickerView = require('./views/scaffoldColorPickerView'); + var ScaffoldDisplayTitleView = require('./views/scaffoldDisplayTitleView'); + var ScaffoldCodeEditorView = require('./views/scaffoldCodeEditorView'); + var ScaffoldTextAreaView = require('./views/scaffoldTextAreaView'); + var Schemas = require('./schemas'); + var Overrides = require('./scaffoldOverrides'); + var Helpers = require('core/helpers'); var ActiveItemsModal = 0; var isOverlayActive = false; @@ -107,7 +107,7 @@ define(function(require) { _.each(objectSchema, function(field, key) { setupSchemaFields(field, key, objectSchema, scaffoldObjectSchema); }); - + } else if (field.type != 'object' || field.inputType) { var validators = []; @@ -129,7 +129,7 @@ define(function(require) { console.log('No validator of that sort - please register: "' + validator + '" by using Origin.scaffold.addCustomValidator(name, validatorMethod)'); } // If match is found - add the method - validators.push(customValidator.validatorMethod); + validators.push(customValidator.validatorMethod); } } } @@ -169,7 +169,7 @@ define(function(require) { if (field.title) { scaffoldSchema[key].title = field.title; - + } else if (field.type === 'object' || field.type === 'array') { scaffoldSchema[key].title = ''; scaffoldSchema[key].legend = field.legend; @@ -217,7 +217,7 @@ define(function(require) { properties: { legend: 'Properties', fields: [] - }, + }, settings :{ legend: 'Settings', fields: [] @@ -267,7 +267,7 @@ define(function(require) { if (!schema._extensions) { delete fieldsets.extensions; } - + // Delete empty field sets if (fieldsets.settings.fields.length === 0) { delete fieldsets.settings; @@ -317,16 +317,16 @@ define(function(require) { schema = _.pick(schema, 'customStyle'); break; } - + options.model.schema = buildSchema(schema, options, type); options.fieldsets = buildFieldsets(schema, options); alternativeModel = options.alternativeModelToSave; alternativeAttribute = options.alternativeAttributeToSave; currentModel = options.model; - + var form = new Backbone.Form(options).render(); currentForm = form; - + return form; } catch (e) { alert(e.message); @@ -424,4 +424,4 @@ define(function(require) { Origin.scaffold = Scaffold; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/scaffold/models/schemasModel.js b/frontend/src/modules/scaffold/models/schemasModel.js index feb8647d1f..8f2779466c 100644 --- a/frontend/src/modules/scaffold/models/schemasModel.js +++ b/frontend/src/modules/scaffold/models/schemasModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var SchemasModel = Backbone.Model.extend({ diff --git a/frontend/src/modules/scaffold/schemas.js b/frontend/src/modules/scaffold/schemas.js index c4f98c4ae4..2203c6da2c 100644 --- a/frontend/src/modules/scaffold/schemas.js +++ b/frontend/src/modules/scaffold/schemas.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SchemasModel = require('core/scaffold/models/schemasModel'); + var Origin = require('core/origin'); + var SchemasModel = require('./models/schemasModel'); var Schemas = function(schemaName) { var configModel = Origin.editor.data.config; diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js index bd65fac332..de1dcf053f 100644 --- a/frontend/src/modules/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/modules/scaffold/views/scaffoldAssetView.js @@ -3,10 +3,10 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); - var AssetManagementModalView = require('core/assetManagement/views/assetManagementModalView'); - var AssetCollection = require('core/assetManagement/collections/assetCollection'); - var CourseAssetModel = require('core/app/models/courseAssetModel'); + var Origin = require('core/origin'); + var AssetManagementModalView = require('modules/assetManagement/views/assetManagementModalView'); + var AssetCollection = require('modules/assetManagement/collections/assetCollection'); + var CourseAssetModel = require('core/models/courseAssetModel'); var ScaffoldAssetView = Backbone.Form.editors.Base.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldBooleanView.js b/frontend/src/modules/scaffold/views/scaffoldBooleanView.js index d77b228684..75e6680ac4 100644 --- a/frontend/src/modules/scaffold/views/scaffoldBooleanView.js +++ b/frontend/src/modules/scaffold/views/scaffoldBooleanView.js @@ -3,7 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ScaffoldBooleanView = Backbone.Form.editors.Select.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js b/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js index aedd1c7429..ede357230c 100644 --- a/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js +++ b/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js @@ -3,7 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ScaffoldCodeEditorView = Backbone.Form.editors.Base.extend({ @@ -16,7 +16,7 @@ define(function(require) { initialize: function(options) { // Call parent constructor Backbone.Form.editors.Base.prototype.initialize.call(this, options); - + // Check which mode the code editor should be in var fieldType = options.schema.fieldType; var mode = fieldType.mode; @@ -27,19 +27,19 @@ define(function(require) { } var schemaParts = fieldType.split(':'); - + if (schemaParts.length == 1) { this.mode = 'text'; } else { this.mode = schemaParts[1]; } }, - + render: function() { this.setValue(this.value); _.defer(_.bind(function() { - window.ace.config.set("basePath", "./adaptbuilder/js/ace"); + window.ace.config.set("basePath", "./build/js/ace"); this.editor = window.ace.edit(this.$el[0]); var session = this.editor.getSession(); @@ -50,7 +50,7 @@ define(function(require) { session.on('changeAnnotation', _.bind(this.onChangeAnnotation, this)); this.editor.setValue(this.value); }, this)); - + return this; }, @@ -117,8 +117,8 @@ define(function(require) { Origin.scaffold.addCustomField('CodeEditor:less', ScaffoldCodeEditorView); Origin.scaffold.addCustomField('CodeEditor', ScaffoldCodeEditorView); }) - + return ScaffoldCodeEditorView; -}) \ No newline at end of file +}) diff --git a/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js b/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js index 59ad75c572..898eb22a8b 100644 --- a/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js +++ b/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js @@ -3,7 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ColorPicker = require('colorPicker'); var ScaffoldColorPickerView = Backbone.Form.editors.Text.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js b/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js index 5a44b11161..1bbcf7410d 100644 --- a/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js +++ b/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js @@ -3,7 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ScaffoldDisplayTitleView = Backbone.Form.editors.Text.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldItemsModalView.js b/frontend/src/modules/scaffold/views/scaffoldItemsModalView.js index 2d5d7cc01d..310a5712d2 100644 --- a/frontend/src/modules/scaffold/views/scaffoldItemsModalView.js +++ b/frontend/src/modules/scaffold/views/scaffoldItemsModalView.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ScaffoldItemsModalView = Backbone.View.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js b/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js index 701ae2bf70..14d61d79b6 100644 --- a/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js +++ b/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js @@ -3,7 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var ScaffoldQuestionButtonView = Backbone.Form.editors.Text.extend({ diff --git a/frontend/src/modules/scaffold/views/scaffoldTagsView.js b/frontend/src/modules/scaffold/views/scaffoldTagsView.js index 03d0cfc97d..d0fd17d40a 100644 --- a/frontend/src/modules/scaffold/views/scaffoldTagsView.js +++ b/frontend/src/modules/scaffold/views/scaffoldTagsView.js @@ -3,10 +3,10 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var jQuery = require('jquery'); - var TagsInput = require('core/libraries/jquery.tagsinput.min'); - var Helpers = require('core/app/helpers'); + var TagsInput = require('libraries/jquery.tagsinput.min'); + var Helpers = require('core/helpers'); var ScaffoldTagsView = Backbone.Form.editors.Base.extend({ @@ -37,7 +37,7 @@ define(function(require) { this.options = options; // Call parent constructor Backbone.Form.editors.Base.prototype.initialize.call(this, options); - + }, render: function() { @@ -48,10 +48,10 @@ define(function(require) { onAddTag: _.bind(this.onAddTag, this), onRemoveTag: _.bind(this.onRemoveTag, this), 'minChars' : 3, - 'maxChars' : 30 + 'maxChars' : 30 }); }, this), 500) - + return this; }, @@ -110,10 +110,10 @@ define(function(require) { Origin.on('app:dataReady', function() { // Add Image editor to the list of editors - Origin.scaffold.addCustomField('Tags', ScaffoldTagsView) + Origin.scaffold.addCustomField('Tags', ScaffoldTagsView) }) - + return ScaffoldTagsView; -}) \ No newline at end of file +}) diff --git a/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js b/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js index f312edba4d..21f93a968e 100644 --- a/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js +++ b/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); var BackboneForms = require('backboneForms'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var TextAreaBlankView = Backbone.Form.editors.TextArea.extend({ render: function() { diff --git a/frontend/src/modules/sidebar/index.js b/frontend/src/modules/sidebar/index.js index 04d8626b6d..66a5b3f4b4 100644 --- a/frontend/src/modules/sidebar/index.js +++ b/frontend/src/modules/sidebar/index.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarContainerView = require('core/sidebar/views/sidebarView'); + var Origin = require('core/origin'); + var SidebarContainerView = require('./views/sidebarView'); var Sidebar = {}; @@ -28,4 +28,4 @@ define(function(require) { // Push sidebar to Origin object Origin.sidebar = Sidebar; -}) \ No newline at end of file +}) diff --git a/frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js b/frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js index 434d361ad7..f856d947ee 100644 --- a/frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js +++ b/frontend/src/modules/sidebar/views/sidebarFieldsetFilterView.js @@ -1,6 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var Backbone = require('backbone'); var SidebarFieldsetFilterView = Backbone.View.extend({ diff --git a/frontend/src/modules/sidebar/views/sidebarFilterView.js b/frontend/src/modules/sidebar/views/sidebarFilterView.js index 8196fee6cf..26ae58ea5c 100644 --- a/frontend/src/modules/sidebar/views/sidebarFilterView.js +++ b/frontend/src/modules/sidebar/views/sidebarFilterView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var SidebarFilterView = OriginView.extend({ diff --git a/frontend/src/modules/sidebar/views/sidebarItemView.js b/frontend/src/modules/sidebar/views/sidebarItemView.js index a3559b94b2..9dcc6d4107 100644 --- a/frontend/src/modules/sidebar/views/sidebarItemView.js +++ b/frontend/src/modules/sidebar/views/sidebarItemView.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var SidebarFieldsetFilterView = require('core/sidebar/views/sidebarFieldsetFilterView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var SidebarFieldsetFilterView = require('./sidebarFieldsetFilterView'); var Backbone = require('backbone'); - var Helpers = require('core/app/helpers'); + var Helpers = require('core/helpers'); var SidebarItemView = OriginView.extend({ diff --git a/frontend/src/modules/sidebar/views/sidebarView.js b/frontend/src/modules/sidebar/views/sidebarView.js index c4eb688dfd..e41be3ecc5 100644 --- a/frontend/src/modules/sidebar/views/sidebarView.js +++ b/frontend/src/modules/sidebar/views/sidebarView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var SidebarFilterView = require('core/sidebar/views/sidebarFilterView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var SidebarFilterView = require('./sidebarFilterView'); var Sidebar = OriginView.extend({ @@ -13,7 +13,7 @@ define(function(require) { this.render(); this.listenTo(Origin, 'sidebar:sidebarContainer:update', this.updateViews); this.listenTo(Origin, 'sidebar:sidebarFilter:add', this.addFilterView); - this.listenTo(Origin, 'sidebar:sidebarContainer:hide', this.hideSidebar); + this.listenTo(Origin, 'sidebar:sidebarContainer:hide', this.hideSidebar); }, updateViews: function($element, options) { @@ -68,4 +68,4 @@ define(function(require) { return Sidebar; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/user/index.js b/frontend/src/modules/user/index.js index de88fe1fc8..a592350b5b 100644 --- a/frontend/src/modules/user/index.js +++ b/frontend/src/modules/user/index.js @@ -1,15 +1,15 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var LoginView = require('core/user/views/loginView'); - var UserProfileView = require('core/user/views/userProfileView'); - var UserProfileSidebarView = require('core/user/views/userProfileSidebarView'); - var UserProfileModel = require('core/user/models/userProfileModel'); + var Origin = require('core/origin'); + var LoginView = require('./views/loginView'); + var UserProfileView = require('./views/userProfileView'); + var UserProfileSidebarView = require('./views/userProfileSidebarView'); + var UserProfileModel = require('./models/userProfileModel'); - var ForgotPasswordView = require('core/user/views/forgotPasswordView'); - var ResetPasswordView = require('core/user/views/resetPasswordView'); - var UserPasswordResetModel = require('core/user/models/userPasswordResetModel'); + var ForgotPasswordView = require('./views/forgotPasswordView'); + var ResetPasswordView = require('./views/resetPasswordView'); + var UserPasswordResetModel = require('./models/userPasswordResetModel'); Origin.on('navigation:user:logout', function() { Origin.router.navigate('#/user/logout'); diff --git a/frontend/src/modules/user/models/sessionModel.js b/frontend/src/modules/user/models/sessionModel.js index 0a11022ed9..2dbcdfd628 100644 --- a/frontend/src/modules/user/models/sessionModel.js +++ b/frontend/src/modules/user/models/sessionModel.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var SessionModel = Backbone.Model.extend({ diff --git a/frontend/src/modules/user/models/userPasswordResetModel.js b/frontend/src/modules/user/models/userPasswordResetModel.js index 0d6064b57d..2c1d280251 100644 --- a/frontend/src/modules/user/models/userPasswordResetModel.js +++ b/frontend/src/modules/user/models/userPasswordResetModel.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var UserPasswordResetModel = Backbone.Model.extend({ diff --git a/frontend/src/modules/user/models/userProfileModel.js b/frontend/src/modules/user/models/userProfileModel.js index 3c6cec3877..56238d43b2 100644 --- a/frontend/src/modules/user/models/userProfileModel.js +++ b/frontend/src/modules/user/models/userProfileModel.js @@ -2,7 +2,7 @@ define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var _ = require('underscore'); var UserProfileModel = Backbone.Model.extend({ diff --git a/frontend/src/modules/user/templates/forgotPassword.hbs b/frontend/src/modules/user/templates/forgotPassword.hbs index 6b3da02438..c6e0697c66 100644 --- a/frontend/src/modules/user/templates/forgotPassword.hbs +++ b/frontend/src/modules/user/templates/forgotPassword.hbs @@ -1,5 +1,5 @@ @@ -28,4 +28,4 @@
{{t 'app.hasyouremailchanged'}} {{t 'app.forgotpasswordfooter'}}
-
\ No newline at end of file +
diff --git a/frontend/src/modules/user/templates/login.hbs b/frontend/src/modules/user/templates/login.hbs index 597a1a1930..0faab1c001 100644 --- a/frontend/src/modules/user/templates/login.hbs +++ b/frontend/src/modules/user/templates/login.hbs @@ -1,6 +1,6 @@ \ No newline at end of file +
diff --git a/frontend/src/modules/user/views/forgotPasswordView.js b/frontend/src/modules/user/views/forgotPasswordView.js index fe64df0872..c752a827a6 100644 --- a/frontend/src/modules/user/views/forgotPasswordView.js +++ b/frontend/src/modules/user/views/forgotPasswordView.js @@ -1,9 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Helpers = require('core/app/helpers'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var Helpers = require('core/helpers'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var ForgotPasswordView = OriginView.extend({ tagName: "div", diff --git a/frontend/src/modules/user/views/loginView.js b/frontend/src/modules/user/views/loginView.js index 15bc6066d2..d96145f595 100644 --- a/frontend/src/modules/user/views/loginView.js +++ b/frontend/src/modules/user/views/loginView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var LoginView = OriginView.extend({ diff --git a/frontend/src/modules/user/views/resetPasswordView.js b/frontend/src/modules/user/views/resetPasswordView.js index 46977a80ba..1cb5775738 100644 --- a/frontend/src/modules/user/views/resetPasswordView.js +++ b/frontend/src/modules/user/views/resetPasswordView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var ResetPasswordView = OriginView.extend({ tagName: "div", diff --git a/frontend/src/modules/user/views/userProfileSidebarView.js b/frontend/src/modules/user/views/userProfileSidebarView.js index 1255a66c6d..dd0a589c62 100644 --- a/frontend/src/modules/user/views/userProfileSidebarView.js +++ b/frontend/src/modules/user/views/userProfileSidebarView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var Backbone = require('backbone'); var UserProfileSidebarView = SidebarItemView.extend({ @@ -29,4 +29,4 @@ define(function(require) { return UserProfileSidebarView; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/user/views/userProfileView.js b/frontend/src/modules/user/views/userProfileView.js index cc007757e9..48ec1c77ba 100644 --- a/frontend/src/modules/user/views/userProfileView.js +++ b/frontend/src/modules/user/views/userProfileView.js @@ -2,8 +2,8 @@ define(function(require){ var Backbone = require('backbone'); var Handlebars = require('handlebars'); - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); var UserProfileView = OriginView.extend({ tagName: 'div', diff --git a/frontend/src/modules/userManagement/collections/userCollection.js b/frontend/src/modules/userManagement/collections/userCollection.js index d6a42dc349..b125daecbf 100644 --- a/frontend/src/modules/userManagement/collections/userCollection.js +++ b/frontend/src/modules/userManagement/collections/userCollection.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); - var UserModel = require('../models/userModel.js'); + var UserModel = require('../models/userModel'); var UserCollection = Backbone.Collection.extend({ model: UserModel, diff --git a/frontend/src/modules/userManagement/helpers.js b/frontend/src/modules/userManagement/helpers.js index 51b0bf86a5..6e26d99bc8 100644 --- a/frontend/src/modules/userManagement/helpers.js +++ b/frontend/src/modules/userManagement/helpers.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var Handlebars = require('handlebars'); - var Origin = require('core/app/origin'); + var Origin = require('core/origin'); var jsHelpers = { // shortcut for jQuery ajax diff --git a/frontend/src/modules/userManagement/index.js b/frontend/src/modules/userManagement/index.js index ee5a04bc45..7f287b35a3 100644 --- a/frontend/src/modules/userManagement/index.js +++ b/frontend/src/modules/userManagement/index.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var UserManagementView = require('./views/userManagementView.js'); - var UserManagementSidebarView = require('./views/userManagementSidebarView.js'); - var AddUserView = require('./views/addUserView.js'); - var AddUserSidebarView = require('./views/addUserSidebarView.js'); - var CustomHelpers = require('./helpers.js'); + var Origin = require('core/origin'); + var UserManagementView = require('./views/userManagementView'); + var UserManagementSidebarView = require('./views/userManagementSidebarView'); + var AddUserView = require('./views/addUserView'); + var AddUserSidebarView = require('./views/addUserSidebarView'); + var CustomHelpers = require('./helpers'); var isReady = false; var data = { diff --git a/frontend/src/modules/userManagement/views/addUserSidebarView.js b/frontend/src/modules/userManagement/views/addUserSidebarView.js index 6166ad15cd..fbe188e5b2 100644 --- a/frontend/src/modules/userManagement/views/addUserSidebarView.js +++ b/frontend/src/modules/userManagement/views/addUserSidebarView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var AddUserSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/userManagement/views/addUserView.js b/frontend/src/modules/userManagement/views/addUserView.js index 5323705621..690d2625fe 100644 --- a/frontend/src/modules/userManagement/views/addUserView.js +++ b/frontend/src/modules/userManagement/views/addUserView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Helpers = require('core/app/helpers'); - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); + var Helpers = require('core/helpers'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var AddUserView = OriginView.extend({ tagName: 'div', diff --git a/frontend/src/modules/userManagement/views/userManagementSidebarView.js b/frontend/src/modules/userManagement/views/userManagementSidebarView.js index 9c0d6b615b..7f1ca7b38b 100644 --- a/frontend/src/modules/userManagement/views/userManagementSidebarView.js +++ b/frontend/src/modules/userManagement/views/userManagementSidebarView.js @@ -1,7 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/app/origin'); - var SidebarItemView = require('core/sidebar/views/sidebarItemView'); + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var UserManagementSidebarView = SidebarItemView.extend({ events: { diff --git a/frontend/src/modules/userManagement/views/userManagementView.js b/frontend/src/modules/userManagement/views/userManagementView.js index a73099eaa8..72e208491a 100644 --- a/frontend/src/modules/userManagement/views/userManagementView.js +++ b/frontend/src/modules/userManagement/views/userManagementView.js @@ -1,11 +1,11 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Origin = require('core/app/origin'); - var OriginView = require('core/app/views/originView'); - var Helpers = require('core/app/helpers'); - var UserCollection = require('../collections/userCollection.js'); - var UserModel = require('../models/userModel.js'); - var UserView = require('../views/userView.js'); + var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); + var Helpers = require('core/helpers'); + var UserCollection = require('../collections/userCollection'); + var UserModel = require('../models/userModel'); + var UserView = require('../views/userView'); var UserManagementView = OriginView.extend({ tagName: 'div', @@ -68,7 +68,7 @@ define(function(require){ onDataFetched: function(models, reponse, options) { this.render(); } - + }, { template: 'userManagement' }); diff --git a/frontend/src/modules/userManagement/views/userView.js b/frontend/src/modules/userManagement/views/userView.js index de6ba05473..d6626a3a06 100644 --- a/frontend/src/modules/userManagement/views/userView.js +++ b/frontend/src/modules/userManagement/views/userView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var OriginView = require('core/app/views/originView'); - var Origin = require('core/app/origin'); - var Helpers = require('../helpers.js'); + var OriginView = require('core/views/originView'); + var Origin = require('core/origin'); + var Helpers = require('../helpers'); var UserView = OriginView.extend({ tagName: 'div', diff --git a/lib/application.js b/lib/application.js index 79c8efc0d9..2e2f61cee9 100644 --- a/lib/application.js +++ b/lib/application.js @@ -311,12 +311,12 @@ Origin.prototype.createServer = function (options, cb) { requestDomain.run(next); }); - - - server.use(auth.initialize()); server.use(auth.session()); - server.use(express.static(path.join(app.configuration.serverRoot, 'frontend', 'src'))); + server.use(express.static(path.join(require('./configuration').serverRoot, 'frontend', 'build'))); + if(!app.configuration.getConfig('isProduction')) { + server.use(express.static(path.join(app.configuration.serverRoot, 'frontend', 'src'))); + } server.use(permissions.policyChecker()); diff --git a/routes/index/index.hbs b/routes/index/index.hbs index d76ddffbc1..cd56eaca5f 100644 --- a/routes/index/index.hbs +++ b/routes/index/index.hbs @@ -3,16 +3,16 @@ {{productName}} - - - + + + {{#if isProduction}} - + {{else}} - - - + + + {{/if}} @@ -37,14 +37,13 @@
-
From 841d15d6d5837752d0fab872ba2d4fbd16caae68 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 09:42:47 +0100 Subject: [PATCH 080/296] Move assets from old build folder --- .../src/core/assets/adapt-learning-white.png | Bin 0 -> 14393 bytes frontend/src/core/assets/adapt-logo.png | Bin 0 -> 7462 bytes frontend/src/core/assets/favicon.png | Bin 0 -> 1209 bytes .../assets/component-icons/accordion.png | Bin 0 -> 325 bytes .../assets/component-icons/assessment.png | Bin 0 -> 412 bytes .../assets/component-icons/blank.png | Bin 0 -> 229 bytes .../assets/component-icons/default.png | Bin 0 -> 2481 bytes .../assets/component-icons/gmcq.png | Bin 0 -> 876 bytes .../assets/component-icons/graphic.png | Bin 0 -> 618 bytes .../assets/component-icons/hot-graphic.png | Bin 0 -> 853 bytes .../assets/component-icons/matching.png | Bin 0 -> 393 bytes .../assets/component-icons/mcq.png | Bin 0 -> 642 bytes .../assets/component-icons/media.png | Bin 0 -> 533 bytes .../assets/component-icons/narrative.png | Bin 0 -> 446 bytes .../assets/component-icons/slider.png | Bin 0 -> 717 bytes .../assets/component-icons/text.png | Bin 0 -> 481 bytes .../editor/selectTheme/assets/theme_bg.png | Bin 0 -> 1151 bytes .../modules/navigation/assets/top-bar-1080.jpg | Bin 0 -> 7443 bytes .../modules/navigation/assets/top-bar-2560.jpg | Bin 0 -> 4237 bytes 19 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 frontend/src/core/assets/adapt-learning-white.png create mode 100644 frontend/src/core/assets/adapt-logo.png create mode 100644 frontend/src/core/assets/favicon.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/accordion.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/assessment.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/blank.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/default.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/gmcq.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/graphic.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/hot-graphic.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/matching.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/mcq.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/media.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/narrative.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/slider.png create mode 100644 frontend/src/modules/editor/contentObject/assets/component-icons/text.png create mode 100644 frontend/src/modules/editor/selectTheme/assets/theme_bg.png create mode 100644 frontend/src/modules/navigation/assets/top-bar-1080.jpg create mode 100644 frontend/src/modules/navigation/assets/top-bar-2560.jpg diff --git a/frontend/src/core/assets/adapt-learning-white.png b/frontend/src/core/assets/adapt-learning-white.png new file mode 100644 index 0000000000000000000000000000000000000000..2fec6f5c19c90966568c296ec72d73937efd5b18 GIT binary patch literal 14393 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 literal 0 HcmV?d00001 diff --git a/frontend/src/core/assets/adapt-logo.png b/frontend/src/core/assets/adapt-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8012693bc9cf46a4230cf9538c559c25e7672dc7 GIT binary patch literal 7462 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

cSfTl_%X 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 S)7^hh0svA;6JD)g8S#I$*aHIq literal 0 HcmV?d00001 diff --git a/frontend/src/core/assets/favicon.png b/frontend/src/core/assets/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..d160ad28f4dff13c2cf20d623b315e19b4b91940 GIT binary patch literal 1209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*9U+m@_g%B1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+* zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxSU1_g&``n5OwZ87 z)XdCKN5ROz&`93^h|F{iO{`4Ktc=VRpg;*|TTx1yRgjAt)Gi>;Rw<*Tq`*pFzr4I$ zuiRKKzbIYb(9+TpWQLKEE>MMTab;dfVufyAu`kBtHuNWFoz#!AFNG#Ad)HBe}%?0@jth%@)C>7xhtg4GcDhpEegHnt0 zON)|$@sXws(+mtd{1$-}0$pR}Uz7=ql*AmD{N&Qy)VvZ;7h5Huj9yA+ij{$p1uzuN zO$^M949qMH4J`~Tj9o3A&7GVLOwG*AU0`Nl(`#(u=3;K(=4j~ZYU~I!#KP6Y z!qCXb*~!Sl2&UIFuec;JFF6%vZzj-Qs9sCFdaay`QWHz^i$e1Ab6_bTAS1sdzc?em zK*2fKOhLmpF*!32B%le3Ac%imQj0RnQd8WD@^clyA#9b2#RY_Y4$+%JPN?Yv9itCQ z9!SXrCIn1_ASOKV13B>QlbQ$2GeyA6vEk7F*}#nT+|$J|q~cc6pa1{unN=Gm1~EtU zy^C%1?i20EUhqat;a~4n2ANqm8+R~uyk799-r)}85&MgxMh`EHim9qLRU!3HExZ^$$UQk(@Ik;M!Q+`=Ht$S`Y;1W-`2 z#5JNMI6tkVJh3R1!7(L2DOJHUH!(dmC^a#qvhZZ84N%b~PZ!6Kid%1HKIA-PAkeD+ zNUn@E_P_(BGU3w6X#%Qx4|obERWxc}>1ukwfB&PLOs?1en!R^UtMa}smUKzczv1QR zxXR)}(Vm@e!x#kCf8inYU(5 z3heqT>`}aigK5%ogW?GsPoj+G+Uk@wUD&#>cx^^5R})+J_HVmgi*>}T9XXr?ngpI) z*Y%42wq7o3icLME=n`=`_Ki0EaktaqG>@i@Z$+0&Uz6 zW6cU!I=LNU8U$0At(lY!oNgZA+ek!C@^H>oC8pnsZHpM!C-`dzO*EX$ zuJ5M6{^5vc%7V+MmTi_?#!Nx%Jv>?pw&fWxWEnhN{an^LB{Ts5 DyVsd! literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/blank.png b/frontend/src/modules/editor/contentObject/assets/component-icons/blank.png new file mode 100644 index 0000000000000000000000000000000000000000..e9d79ee0688bfe11766d709d335198ae7092c459 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^#z3sh!3HEP%Z)YyDb50q$YKTtZeb8+WSBKa0w^e1 z;u=vBoS#-wo>-L1;Fyx1l&avFo0y&&l$w}QS$Hzl2B@gW)5S5Q;?|p+j=T*9JgpD6 zv&vUE9O_BPHEm+CS+IoJXp-W>)Bp8y`{Qp#Pu`tvy-q7L{7u9=-;xvA5yxKYWOuFD zp?`Y*EYrXP4UEieJQ4;87!2n+{oePc0=33w2b0!t8Za=|@prr~&Cmkc&fw|l=d#Wz Gp$P!VF-O4w literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/default.png b/frontend/src/modules/editor/contentObject/assets/component-icons/default.png new file mode 100644 index 0000000000000000000000000000000000000000..f19dff255f7c1bbd1380a1c80303f8ea4e20e38f GIT binary patch literal 2481 zcmZ`*3pkW%8y>RdT+%_KWg0n@n6twe)5Q!Kj2NS6*_y*QnVM5GV~v%Nq$sDHOY67^ zrB-c)QA(oCA*o1VxAl`$%2Mj5|C^!A?`r3|zWLtwdG7nYpZoc~XRbNw>$62q8>$U~ zK=ddcWEyzKfR~x(V({BB9DNbIsYz&CTp{P%*1iBYS|X1i2?U~JsJPT1d8dpZ5Dhq& z9w-f@dgEC_zAb|-WCFG_z6eA^AOsm6T=D@a119711QNW=8LmX&!L=fcfWwp!>0W1e zAk`N}5{dyB&K7HngcG%4Fc?A1=HO{$_c=PabB2dXr6N265gs0H8;-FRigzPWj*gB9 zBpQK6+kglgNrXVkkl6?%X0wNUIfo2LSYob7$`uM=igOuEVVKkz4p#_${mj-W<#Ohg z1d=&hph1KpgFx9L5#OQ#GVZ_76q$deu~}bTiNeG@r6)EE0q_7mAdpHx9_pKNU~j(? z|F1|HLo_RjG5y zW?~_cB;*Oj{vrkoP!y)5sDu`xl`=u|G8nL1^D-(46(XC3mxM9*04%A>(*mEF^4<3b z_90Zl1jIMd1n^D3Q-y3UCxXn70z@7?lbX8Il-aNQGj$ zP{<=HUGNoK7{(TKurNPIB_I@2q%u{rBdd&pGfUJ4nP29gs4cMOAA~@@v!ak)=z&_V zf~Y)tfYJ18`J2`iJCf*?9U9iyR1Z?d5v&DS+X`p#oAIhf4Y*EE-c^xH=bcB5`8wwJ zhdbMRNSmyFTE4F7P@=_(Rp&g^`0L`~-rU`N^7rHWg`p1)=Uf_h=W1Qa4gb8m?b^_% zYnXsTzYQk*i8wM9b19qWH{xYJaOG6ZJ+G|BO#=;;cKN;2!LEYIZd&Npq{3|V?kVPe zZ%)1CM08bTNk*i6B>5gr@Tj1M(q=|_ZI=P$m6eVZHm1iQ!GBHA=1#cS(@ z$1kNn1wqc$>0<`U^77vvZ%G#nPnc%@!!FXylJ+-3X#Mq=qMYb=rDxM=HObG@$NQp$ zao*QO&4Uz69_Q8Bl~k^Yq0vy$#6Kw5IPm-Q|s_OoPafvd!*g4eQ%Zkr$Ek;EB zY*#|Su6RSc+}@7Ugrubu1$Lb5N7A#hD-N*d({BXF-AoG8UcNw0 z1t+_da~fc{TxZJ}0@?kU#*LH7Ys#-0?crGt?F=iWylbluy#C*oxZ0nqW-5Ew^liBG z%QjbB%Bn@@d|^<}dn+0ik2l2RjaZt2C-v~b0?LL5CCAdr;z<_FADVR3)nJiltTa!0 z=Wvb46<(68P-PH-A6eozaULC1J z)aFuiW?!7chp}dl40XK|EzlVG&B?wymhUh5?0j5S@qQ$LTpPAgvo?5bQo=fi8&6Nk z4;~R2wv?^Rx|VpU>42qQaXC3}25 z%eMIK-P|?hMn8Y}$S6g~89kFRBrZxFhSRJr-{1Rio7&2%?W6WdM_n$WO;+t(N-hil zZeCtodZD)%p*psBv|x9CLU8r! z{mfJoQfR&2&7q)#XiGNU=|r#HYjk2w?Vv?SCSIJ3xgJWKG4S%Ax$jw z(zPw{H8RETOzWx^we5PvMY=OD=@U+yvW^doEk&46ofwoftm1zZ#m$F&-gVc({{epv B+};2H literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/gmcq.png b/frontend/src/modules/editor/contentObject/assets/component-icons/gmcq.png new file mode 100644 index 0000000000000000000000000000000000000000..068d7886fe8a44c57e5d293416571448347ec8eb GIT binary patch literal 876 zcmV-y1C#uTP);2sDega|XsY~(oh#@Sa)MjGwL_Il^@%r_oyD&z5({SR{G*{A`R zO;BHG9)b>DU8{xi_=@eo0MI&IIOs;gun}kg00%R`U;^JlT$e!mpeGE+-v)4e0t`Um zj}}`E*}~9_fsNVf$N}iOE4BdAibcG7FSiG^HFop-Np|7bKeL~H{=x3No zMBwM3ui^KQcK#?gT4!KE!V*Qo+1Lqc5#0s{LYt|dM1m}aFI zTp1M#ggts}N7aW}5c;FkpRkW{9k99u38Y6xE-F|v?(2X(NfZACc+Ho=#i1x>NU2tg z!dRCTF>y2%?f2=0X)6j0aWMgfN!b?rC}GX3?&I-%s=AMBMX{tJE_DbX9t$}1_cDO; zDZ|dxbr?E^=dnOq7+hpLsyveI*8n~BFbd1M*lr44Ooj<-6RD!)vrQ1J*0000Y0-+P68?+m=Opr<}kWSDn0E7h)1MmEn z;SGeu5o^zooizlMp8*#zd`HGH@QqW3fWjd>9)ZWDX&mp-K$kqSQpm4dG9*yQhfacB zLPhWMNQpAwDI=e^5cfkmqUiY?^4G?SM_}PCrhJL)lj%#rh=4XDrp;QzTx#uTfx-)T z%zd(@W;-Pv9Bo@Y3rNg_7w~A%b2?TR&PY z8xd$KIU%q0(+~z194(ucLZSm)OltltB`+H1kz>kXggHc+jKXyjTpYv8%$i3inQbWt zASbdyvIZ_Vn!*|zD~3>CB0KMyq-Uvv3y#)xs_i-+Nh_tjG;}t^1sf=I8#`aq8(14f z3XzCpJ{saeg_leRFG3R+iN;G&=FUR!o6;tk_3X4Gx^!YGk|(sGjXlEQ;y*}<7h!;l zu4$|a>B0~fT~oxB{GtV1bWK|sUPRAv!Im&pyojFTf-U)}RALh%_S07y3!T>pwO_!m zrO$XQTEB+%E4{jIt7&qZlG||6VE!Kw%+-%;wEGcY0BgChQ2@Sbod5s;07*qoM6N<$ Ef@H!4aR2}S literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/hot-graphic.png b/frontend/src/modules/editor/contentObject/assets/component-icons/hot-graphic.png new file mode 100644 index 0000000000000000000000000000000000000000..07977f678ecb5e699fc1edf0d673c723c60f1a45 GIT binary patch literal 853 zcmV-b1FHOqP)laT+_jTiW@v_v zfZAWsbRlfGqDYZI4ey2L$iCb;cFuOMebVV1=k9#pz4v|h?n>kFn3-;CpD(tcdI6w!seIgNdR^_0rl+D09T^L zZoge%c%sMnZ36VVT48%@kJ;18lI(8`(H=fn!5ctWGCl07Ws9xbW%lqMS9Nbee}^0B zkS*Q*mVuyF!av@v+SBKaN99Sq`J^)O7}{|3mmLkSBK=JSRgZ#No@uaIeK39g>W@TF z%!-Na6dWuEF%nlEZ; zPe&+lrx!f!#i=TWA@ms}$kK!M)3Gq29gAraai<%a1OoCj0O432iF7AYR60*JXt9Iy zRG&oUT%5lYR1RmN;}~K)n&Z#RKiAw3K4{O8=r(yFQ_DM{^(5RB&86(cd{D%rW`d^6 zS#Rt-M;>+3B(cz^cO#%M{*jne`Z0;{A}imf#V8IGP1Y6CCTBq&DLF{uQkbV?lidmD zgA_t_jrnB4FP_j#ag&{_E=hAcgXn3J$m9nq!DKOoIS@iq*E%{U0-lmbDto2Dqs;lm z7vND*R$J8jJjP3|Ch4=VHwuMK4~i}nO}V+kjHGnt$ozAtHWE%G>pKlUHK>G_A}3ItFoVq!kHvSvkW>42 f07nGFKLG{+_y`_u9ON)U00000NkvXXu0mjflk$MK literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/matching.png b/frontend/src/modules/editor/contentObject/assets/component-icons/matching.png new file mode 100644 index 0000000000000000000000000000000000000000..580bbe0b2d6b836381f4a18f254d0feb6a5ac4e9 GIT binary patch literal 393 zcmeAS@N?(olHy`uVBq!ia0vp^#z3sX!3H9Wm^gtHXMsm#F#`j)FbFd;%$g$s6qGD+ zjVKAuPb(=;EJ|f?Ovz75Rq)JBOiv9;O-!jQJeg|4z`!Wx>EaktaVzQ1|Nr*Q7x%Su zOGrpOl58`JIKh(2Q`+C~_dwGb>*p%xEktS=eIoxmng|~@U|Kv+^6Qxu>29{huVx0G zzaX?hU`3=lgC=uSx@VX9;Gxz?QU;zUILp;OK1`8R19{JBO3;+v^an4DeaVUDgXx~F{L@+T76ENzLQICvz zgve5h$|Z>ckO}}|10Ys_3O@ki3qZU9SVBIaww>^Lgc`*!&;tTMY61}z>_Q+e0NVLs z&=tQx0}Y^|PE0ESq~-xs&)~@;PzN0VVtx{|fz%$LmS?DyM;4%a!cmlq!9j$RL5h=w z;q#w=3senFY|iG_WxO4ABH2rH?G;C&|Omt1HUj3#5$&IDj7FVrbA5 zW>{e+iOmRos2KyEv z$0q1~>?xeh%fiHvt_VqaQXDKqn?bi20VW9tLTc1`*cfITiG$f+fcXQIPslZk?iC^o zfI=VS2_9gKfRb9#rPt`0eQ?+8FaXLAFi%9BdQLM>P@J@YHS+;NYR-Q60ZdNc33`GU zvuGV77jb1)Q0esy7#lY~|02eW0WW?h;F4$r)*Z79#c|aiM43T1j{uXz0t!R)BGimQ zk=YZlwY5N%;ej{b@g=Q~P`!hr(FhDtP(Q-~>M%I?46Qdn`2>e29H4p!PY)65AO&b& zgAf3zQJ|J5s9ujiJ4y+_TDpPWJw%#Rh){=4V4x!y9Yq=S$f!p~h)0Ia{0I|~71&@0 c3jqQQ0KSsERMpM!{Qv*}07*qoM6N<$f+0Ws2LJ#7 literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/media.png b/frontend/src/modules/editor/contentObject/assets/component-icons/media.png new file mode 100644 index 0000000000000000000000000000000000000000..df20762450dcfbbaf37bc2f4b1e2e627d8641daa GIT binary patch literal 533 zcmV+w0_y#VP)4$f!o#h;MEuKP^b+#aq3_bh=pbR!0AM~L z0UmE4hu_#Z3kXBP?V1OejH&ps$t!)stFK3tH!8g&Uw#EC`qgtnzSsx@bJ#^HFl5@Nv?<0d= zteAPW+#dlCjXsCvm?B?4?VF*_cGcxVW9y8~{6#S!2IQZBI6saQ$EkZHnSn!+F98Ms X5a58}I-UM800000NkvXXu0mjfr;g-m literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/narrative.png b/frontend/src/modules/editor/contentObject/assets/component-icons/narrative.png new file mode 100644 index 0000000000000000000000000000000000000000..3c43c8ecb8888810c43a187542605cf5e6606899 GIT binary patch literal 446 zcmV;v0YUzWP)HX+E%6X%G76~CXqT5O@vwq|OOfKBe)Yl(??$kAc@!|14jGk~v48t%C!!T~B zZqbaPCT%U%jUi03-UX&bv+l`ka8nzq1Jc;dLQ61#&6r7H+*=HVCyd=cU?j-0<+#pZ zL}*KG7zHAIc+et@+&e*ANlPfP-H&E<>|fDUwS8AQ6)@K>+GuTa3Q1X8nvS-Wu298>{m0+Ui~ ze&}wt!ua?p%OGi4kXQW$Ak%7s8~McG^`o-irx+wA9~Hp)x0zuWhGDqXL{>$sDRuy) oxL$dAo~y=N*i{l$WM2Xd01P8pEe2|2&;S4c07*qoM6N<$g6)E^s{jB1 literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/slider.png b/frontend/src/modules/editor/contentObject/assets/component-icons/slider.png new file mode 100644 index 0000000000000000000000000000000000000000..9176e9600efc8b7a932b101e5cba31ac6d23cac9 GIT binary patch literal 717 zcmV;;0y6!HP)?QU;zUILp;OK1`C;nfhRy9o(0A_=OoWK6n$W{@8N$C&BQQFz^F$?Ju>Q% zQICvzWY~Gc;PubHM}GbL{{zSdRa*bw{`&j$%b$N8w6KhY7KQ>HoF&Z0Jayf(FASTX ze_?p`;}2NeQItz6R+g_=ftxi-fR#xPDD+`4$4CGtGt;EVQ_mS@-v0pi1PJVZ{f!~% z+zXb&Z@$TX`t$GnpiWvq2QKKk^^W=GmtQ#5)L(zg@cqv}IZ(_ER*yLR`1_xG6EHb} z051y@L!X`~gA@k~C|NO-s0zUqPQU+=>CbC zi8I{%{0p4CKL7d0kgmwj(5NX4j*&C(e=u+}GpfT{uS9@EU<-W#$uR=7KmbThASF~l zj{p4UKb#GUiL)Pmg83kifIOwn%LeE3u#l7>3do8Ppzl8bJ>vk%yu{k{`sW`7CsE!w zAd?Xk3#sQ`f@1{~`X+)LU{8R=Kmf!C=A(B&=42v`#~Y}Oz^?9pDt4>{e*XLaGWX&u zHjv}-0gwk}I9Vr(vojYA#*Wp8-~ayim#GT<<;9b1{3Ll8botnS0zJ_%Xp3K9y0748 zW!kpNO!6Nn`Jm?^P{~!PF7%6yiP3_Z6(UV)c2Ra_zmLEFRrctLmIGsm{lT~29Lx-i ze+&fJS%A%!qwGwKF+gPx27MC+1c0&94x~WX0N7j+fC^s#dh!D;?4y}Skidn}X8fo} zMm;j>kx`F~dStKz7W7u+P>zv>!yrNy0t6TU!noJv7XtK~00000NkvXXu0mjfy6Zz5 literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/contentObject/assets/component-icons/text.png b/frontend/src/modules/editor/contentObject/assets/component-icons/text.png new file mode 100644 index 0000000000000000000000000000000000000000..41ae4123f164b0d89a773caf67591f7615cccef7 GIT binary patch literal 481 zcmV<70UrK|P)Pde-XQV~G>1BhQBNpS$N1eE;%O`8N%J`0%twgJtU0Aw4`z}*Ev^DhwX86dC# zVtFWA9fulu9O7y~ybbCRdm4B~fTWm#hC0Y04}o|AlDGm=QQnBACjsg~SWJTS9iV|{ z9+2Z1Fb#~-2BhTY0P_s8IFcOPGeG$TgCfsRsr(-_c?On5K9FJwG(E#C8XS2B=<^4- z(k31~7jOi~fae*C!DybLQJ$d&7&P?^HNa?|8O<}Jd1g4|8DNqDh4KXCPyvb^z!&X< zInM}SNiz2MqJ1#unFr7&zW|a058#XTL7QiwZM6ncLlBq66oLx_QO{f$EMou((4OO9 z1SIDf1sbLI0m(D8sw3#1XUOTC4Kx@X(H!**y^Chp)WA@WnT5k3Viq!jrU8cw00=Mu X^M!m3s|GlI00000NkvXXu0mjf{LHf+ literal 0 HcmV?d00001 diff --git a/frontend/src/modules/editor/selectTheme/assets/theme_bg.png b/frontend/src/modules/editor/selectTheme/assets/theme_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..58ca4223961d97022b692974d18ecf3ef5747bc7 GIT binary patch literal 1151 zcmbVLO=#3W6pqx2Raz8OvOlPGs!y$|=G0bDWzNGUezhji982VowX_UQ3vFilZ4wo~ZCeYpd& zh1|Fq*~H7PPtX*VZY%qyH3Tu;4+kAD!+e{6%+QXVVR}C9;qNe3wGIoTK4kMSL?eMk>M_t%1(V$U+figlqLB{<4k?N`tRZW} zg&xjo8HU`%ZO4{%qeV@&Bqc#H1f2sw(G^8WB{)?P4K0;asvN6fIaLrvT~c{b5CPDE zq^m7b3$JU0OA?cbDmLqd*z_z|_3IG76>R%Iv9cOK6QiJj&~UW_x{C;-u!wwG?MczS zj%TA%7!_yvtr`rR6VNsS>bCye)w_fym3?d)Mza{n4Nla@`&_l&#m;G@B3$Vzi<9= z>G06qw_|Osi;Is?DLudSMzhg#?)LT^nC?$LDNerH@;Alvi61qa6Wh)to?f^X4R}`X K(q`I^j{gGB4{-qi literal 0 HcmV?d00001 diff --git a/frontend/src/modules/navigation/assets/top-bar-1080.jpg b/frontend/src/modules/navigation/assets/top-bar-1080.jpg new file mode 100644 index 0000000000000000000000000000000000000000..10db9115de40911e43f24bff2ff026452ae96a40 GIT binary patch literal 7443 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 I(sJK_0b{C3rT_o{ literal 0 HcmV?d00001 diff --git a/frontend/src/modules/navigation/assets/top-bar-2560.jpg b/frontend/src/modules/navigation/assets/top-bar-2560.jpg new file mode 100644 index 0000000000000000000000000000000000000000..927dd47da47b0f6b6613649f3f52cfa0a24b74b0 GIT binary patch literal 4237 zcmbVO4OA0X7JidtVhBGbC2%xUosC<}(uDj#2t>i8B(&7B2KCe^+cq&7Bt#NSf&^>r z5PEuY^ib{MUu~C zy!+k1H}~Cl-}8Rq{Sr*mxXh&h6c(ld26#x`n}DsZGFoZ?0%#DP2Y~lWYHgX*S*Z|- ztd4Yp$+iMdH`*#hE<>eAk}ej3dGlSB2BQUcVk_{KW@|3*_VIQeW;W&Wmdc96MV0w@ znfa-;c6{;L-!Cz)wHR|uy!m<9JeR^%QCWdI4VbH9mDQne#i>MLf)};kK+x*!k>a=E;~M^#r>r&njB+w3bvlAN3zkyt8{N`+8E=%}$e4KAV8F+1o%jXR8X zbEVU4vtmAvh84CdXD$!Ubo>)4DvOFjj-zI)qQduGer<3iiLJFTol79war*nfm@x0>RcX_q?^npg$b9+P1$0pP%O(> zAPva`hn@{FtksYIg5%9hGCIpTcj6IuCL znJQJtw$SQu8mvY<7~2eE2W+!`)mD*j#|=)KeTmJsDp&>DGMm%pD6>^!`T71;$M{7C zquJ^Mf9G4M@$XjScJmtCRA9GNVE#-i%u!~MAuly#8sS=t4RRUGfKejM#$g7G((G(` zhBVWZRchb`>`nh~21RgEB44>oD4!q%YtlCiZ3f7Mwi9lJd&mwqi}w~t@NWTN>VTUP z@m>V406L9ELuqsrrN_|W6U(5}8L@FpW-OB#$BOe4D=uLwYidGVVj_o=nD}T)O3I_N zLWE42G9^APej1B4jhn%iLq*bFd_38)AgP}m5Sjd(u;s{rDshdl)#6e^7l zL8yp?!zg_U3t|YBN<{&MIxa*gY>DbOk5G#Zt7~7EK9Tq*-XeDf+h-p}2-`aV;;0A= zO=W}m;M5m+)-VM>L*g%{HjEzsnR(66Qr8Pd?h@{R9#yw;^{Hh)Ole$J+FH(!G>#R% z$>{6pg;x>&~b|4YM{cyx}5F_srK8Ra`<)pk*OSlwgpJfE<2R zQFZ+Lc&b+8kv*srYlcg=TaIj!H*{Xu_EsfNm8{|t2N`|r_bawHot?3I^vZzcmgmN6 zI{eTBtz`kC*2Sxm87*A5096-rILQ=G3j(xSM5$Z?P#Q=ESd@tgynr?Ra7nW#icH?t zze}TxB0zU<`ezi_2Q8CP22(o-cz8UP#DA~&g_#4xM1-pB-f8PkWeL^$m#2-(24}sx zL>*K^&VBy%$gvkr+)5YCuWzzk;T5&d#Z`8 zm(j}oiDfs>c3s~#S6kJ2s(#RXo7Mk}v$d&@qjAevI$lRHM}wklm7d@OlH%cQAfR`^ zgii#eE-ifb^3z?>L<{h~ltD{gBN<@?K>OY(AcO=vYi)^oB>*h&bQ*JO(rElXGD7oU z;oNvQgpt@VO7FKBs9Qrzt6W9#dcf1!NfEO^~9`uV;xm4*pEF_ptvan$@EY* zD2oB2w!~Ha^-^6^TM@x-hGzoJGUKdC8TLKz%*t9_7kGhEIZlElZNproLWLHCb<&j66|e>0K`l zwPR;bO)mESL%rDgBbQ5u?q1z;YUc0{ZvI2Tq*33QG56oEcVv#kF9FfXCGLqk%2s8Bi2D_`Ap!*8;7i2e zo8!5nFk&>SMdbbD{_s8wKtlD3eX};ux@LTFMzw29HNWXA{`Pqvt7L~OBW+n6Rua%6 z@H9mKI7nRTb?(;Ebny(bg#+8lWx9RP)50kr1!`l@)$`S-uYI@mQ$|YxS?_B)aFGyw zy^2$?+1KN_+fLV>nQ21 zc-OU~9VJyC1$)0ASKMpc`SJ$?bsxFOpk9=>;3Mkdxm|+pVh#}YmM7=|n6oC2+}*pD z^74XjW9;3d{;e2k$O4E`t3&}uIpen@yM~lWT#tZ7C;0;QJBgxhj}jI*yyzg;NALY? zA3k(J*NSb#>XqfboO?E6GMd%`hw#Ef9Heydx?;(C`+2@NN6cAI2J@qzF7Ji^^f zA>lzz!r%q&jF7IqTl0d`a3$%|vRtIvJ?!On~Pc(%hLUM-~4lLe|*+LrcvBXz=Y|b_=4;Wj~=t_+h^6`&;$ Date: Wed, 29 Mar 2017 12:05:52 +0100 Subject: [PATCH 081/296] Removed hard-coded img --- frontend/src/modules/user/less/login.less | 220 +++++++++--------- .../modules/user/templates/forgotPassword.hbs | 4 +- frontend/src/modules/user/templates/login.hbs | 4 +- .../modules/user/templates/resetPassword.hbs | 4 +- 4 files changed, 117 insertions(+), 115 deletions(-) diff --git a/frontend/src/modules/user/less/login.less b/frontend/src/modules/user/less/login.less index 563ff757f0..38fda621ab 100644 --- a/frontend/src/modules/user/less/login.less +++ b/frontend/src/modules/user/less/login.less @@ -1,125 +1,133 @@ @import 'variables'; .module-user { - &.location-login, - &.location-forgot, - &.location-reset { - max-width: 450px; - margin: 0 auto; - color: #fff; - background: url(assets/login_bg.jpg) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; - .sidebar, .navigation, .location-title { - display: none; - } - #app { - margin-left: 0px; - } - a { - color: #fff; - } - - button.small { - font-size: 16px; - margin: 0 auto; - display: block; - width: 200px; - margin-top: 20px; - height: 80%; - } - } - - .login-logo { - img { - margin: 0 auto; - display: block; - } + &.location-login, + &.location-forgot, + &.location-reset { + max-width: 450px; + margin: 0 auto; + color: #fff; + background: url(assets/login_bg.jpg) no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + + .sidebar, .navigation, .location-title { + display: none; + } + + #app { + margin-left: 0px; + } + + a { + color: #fff; + } + + button.small { + font-size: 16px; + margin: 0 auto; + display: block; + width: 200px; + margin-top: 20px; + height: 80%; } + } - .login-title { - text-align: center; - font-size: 32px; - margin-top: 60px; - margin-bottom: 40px; + .login-logo { + height: 123px; + background-image: url('assets/adapt-learning-logo-white.png'); + background-position: center; + background-repeat: no-repeat; + } + + .login-title { + text-align: center; + font-size: 32px; + margin-top: 60px; + margin-bottom: 40px; + } + + #loginError { + width: 425px; + text-align: center; + background-color: rgba(0,0,0,0.2); + border-radius: 4px; + margin: 5px 0; + padding: 10px; + + i.fa { + color: @alert-color; + font-size: 110%; + margin-right: 5px; } - #loginError { - width: 425px; - text-align: center; - background-color: rgba(0,0,0,0.2); - border-radius: 4px; - margin: 5px 0; - padding: 10px; - i.fa { - color: @alert-color; - font-size: 110%; - margin-right: 5px; - } - #loginErrorMessage { - font-size: 110%; - color:white; - position: static; - } + #loginErrorMessage { + font-size: 110%; + color:white; + position: static; } + } + + .login-fields, .forgot-password-form { + margin: 20px 0 20px 0; + position: relative; - .login-fields, .forgot-password-form { - margin: 20px 0 20px 0; - position: relative; - - .login-input-username, .login-input-password, .input-username-email { - font-size: 20px; - border-radius: 4px; - border: 0; - padding: 11px 20px; - background-color: fade(#fff, 40%); - color: white; - margin-bottom: 5px; - height: 40px; - } - input::-webkit-input-placeholder{ - color: white; - } - input:-moz-placeholder { - color: white; - } - - .input-username-email, .login-input-password, .login-input-username { - width: 405px; - } - - button { - margin-bottom: 5px; - width: 445px; - height: 65px; - font-size: 20px; - } + .login-input-username, + .login-input-password, + .input-username-email { + font-size: 20px; + border-radius: 4px; + border: 0; + padding: 11px 20px; + background-color: fade(#fff, 40%); + color: white; + margin-bottom: 5px; + height: 40px; } - .login-remember-me { - float: left; - font-size: 15px; - margin-left: 40px; + input::-webkit-input-placeholder, + input:-moz-placeholder { + color: white; } - .remember-me-label { - padding-left: 10px; - display: inline; + .input-username-email, + .login-input-password, + .login-input-username { + width: 405px; } - .remember-me-checkbox { - vertical-align: middle; + button { + margin-bottom: 5px; + width: 445px; + height: 65px; + font-size: 20px; } + } + + .login-remember-me { + float: left; + font-size: 15px; + margin-left: 40px; + } + + .remember-me-label { + padding-left: 10px; + display: inline; + } + + .remember-me-checkbox { + vertical-align: middle; + } - .login-forgot-password { - float: right; - margin-right: 80px; - a { - font-size: 15px; - color: white; - text-decoration: none; - } + .login-forgot-password { + float: right; + margin-right: 80px; + a { + font-size: 15px; + color: white; + text-decoration: none; } + } } diff --git a/frontend/src/modules/user/templates/forgotPassword.hbs b/frontend/src/modules/user/templates/forgotPassword.hbs index c6e0697c66..5c72b1d44b 100644 --- a/frontend/src/modules/user/templates/forgotPassword.hbs +++ b/frontend/src/modules/user/templates/forgotPassword.hbs @@ -1,6 +1,4 @@ -

+ diff --git a/frontend/src/modules/user/templates/login.hbs b/frontend/src/modules/user/templates/login.hbs index 0faab1c001..dc839701df 100644 --- a/frontend/src/modules/user/templates/login.hbs +++ b/frontend/src/modules/user/templates/login.hbs @@ -1,7 +1,5 @@
diff --git a/frontend/src/modules/project/templates/sharedProject.hbs b/frontend/src/modules/projects/templates/sharedProject.hbs similarity index 100% rename from frontend/src/modules/project/templates/sharedProject.hbs rename to frontend/src/modules/projects/templates/sharedProject.hbs diff --git a/frontend/src/modules/project/views/projectView.js b/frontend/src/modules/projects/views/projectView.js similarity index 53% rename from frontend/src/modules/project/views/projectView.js rename to frontend/src/modules/projects/views/projectView.js index 24968e7c49..79e1d9a444 100644 --- a/frontend/src/modules/project/views/projectView.js +++ b/frontend/src/modules/projects/views/projectView.js @@ -1,37 +1,33 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - +define(function(require) { + var _ = require('underscore'); var Backbone = require('backbone'); var Handlebars = require('handlebars'); var OriginView = require('core/views/originView'); var Origin = require('core/origin'); var ProjectView = OriginView.extend({ - - tagName: 'li', - className: 'project-list-item', + tagName: 'li', events: { - 'dblclick' : 'editProject', - 'click' : 'selectProject', - 'click a.open-context-course' : 'openContextMenu', - 'click a.course-delete' : 'deleteProjectPrompt', - 'click .projects-details-tags-button-show' : 'onProjectShowTagsButtonClicked', - 'click .projects-details-tags-button-hide' : 'onProjectHideTagsButtonClicked', - // Preview events - 'mouseover .pos.large' : 'showLargePreview', - 'mouseover .pos.medium' : 'showMediumPreview', - 'mouseover .pos.small' : 'showSmallPreview', - 'mouseout .pos.medium, .pos.small': 'showLargePreview' + 'dblclick': 'editProject', + 'click': 'selectProject', + 'click a.open-context-course': 'openContextMenu', + 'click a.course-delete': 'deleteProjectPrompt', + 'click .projects-details-tags-button-show': 'onProjectShowTagsButtonClicked', + 'click .projects-details-tags-button-hide': 'onProjectHideTagsButtonClicked', }, preRender: function() { - this.listenTo(Origin, 'dashboard:dashboardView:removeSubViews', this.remove); this.listenTo(this, 'remove', this.remove); + + this.listenTo(Origin, { + 'dashboard:dashboardView:removeSubViews': this.remove, + 'dashboard:projectView:itemSelected': this.deselectItem, + 'dashboard:dashboardView:deselectItem': this.deselectItem + }); this.listenTo(Origin, 'editorView:deleteProject:' + this.model.get('_id'), this.deleteProject); - this.listenTo(Origin, 'dashboard:projectView:itemSelected', this.deselectItem); - this.listenTo(Origin, 'dashboard:dashboardView:deselectItem', this.deselectItem); this.on('contextMenu:course:editSettings', this.editProjectSettings); this.on('contextMenu:course:edit', this.editProject); @@ -41,32 +37,26 @@ define(function(require){ this.model.set('heroImageURI', this.model.getHeroImageURI()); }, - openContextMenu: function (e) { - e.stopPropagation(); - e.preventDefault(); - + openContextMenu: function(event) { + if(event) { + event.stopPropagation(); + event.preventDefault(); + } Origin.trigger('contextMenu:open', this, e); }, editProjectSettings: function(event) { - if (event) { - event.preventDefault(); - } - + event && event.preventDefault(); Origin.router.navigate('#/editor/' + this.model.get('_id') + '/settings', { trigger: true }); }, editProject: function(event) { - if (event) { - event.preventDefault(); - } - + event && event.preventDefault(); Origin.router.navigate('#/editor/' + this.model.get('_id') + '/menu', { trigger: true }); }, selectProject: function(event) { event && event.preventDefault(); - this.selectItem(); }, @@ -83,7 +73,6 @@ define(function(require){ deleteProjectPrompt: function(event) { event && event.preventDefault(); - if(this.model.get('_isShared') === true) { Origin.Notify.confirm({ type: 'warning', @@ -92,14 +81,14 @@ define(function(require){ destructive: true, callback: _.bind(this.deleteProjectConfirm, this) }); - } else { - Origin.Notify.confirm({ - type: 'warning', - title: window.polyglot.t('app.deleteproject'), - text: window.polyglot.t('app.confirmdeleteproject') + '

' + window.polyglot.t('app.confirmdeleteprojectwarning'), - callback: _.bind(this.deleteProjectConfirm, this) - }); + return; } + Origin.Notify.confirm({ + type: 'warning', + title: window.polyglot.t('app.deleteproject'), + text: window.polyglot.t('app.confirmdeleteproject') + '

' + window.polyglot.t('app.confirmdeleteprojectwarning'), + callback: _.bind(this.deleteProjectConfirm, this) + }); }, deleteProjectConfirm: function(confirmed) { @@ -110,21 +99,12 @@ define(function(require){ }, deleteProject: function(event) { - var self = this; - - self.model.destroy({ - success: function(model, response, options) { - self.remove() - }, + this.model.destroy({ + success: _.bind(this.remove, this), error: function(model, response, options) { - var errorMsg = function() { - Origin.Notify.alert({ - type: 'error', - text: response.responseJSON.message - }); - }; - - _.delay(errorMsg, 1000); + _.delay(function() { + Origin.Notify.alert({ type: 'error', text: response.responseJSON.message }); + }, 1000); } }); }, @@ -133,52 +113,32 @@ define(function(require){ $.ajax({ url: this.model.getDuplicateURI(), success: function (data) { - Origin.router.navigate('/editor/' + data.newCourseId + '/settings', {trigger: true}); + Origin.router.navigate('/editor/' + data.newCourseId + '/settings', { trigger: true }); }, error: function() { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorduplication') - }); + Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorduplication') }); } }); }, - showLargePreview: function() { - this.$('iframe').removeClass(); - this.$('iframe').addClass('preview-large'); - }, - - showMediumPreview: function() { - this.$('iframe').removeClass(); - this.$('iframe').addClass('preview-medium'); - }, - - showSmallPreview: function() { - this.$('iframe').removeClass(); - this.$('iframe').addClass('preview-small'); - }, - onProjectShowTagsButtonClicked: function(event) { - event.preventDefault(); - event.stopPropagation(); - this.$('.tag-container').show().velocity({ - opacity: 1 - }); + if(event) { + event.preventDefault(); + event.stopPropagation(); + } + this.$('.tag-container').show().velocity({ opacity: 1 }); }, onProjectHideTagsButtonClicked: function(event) { - event.preventDefault(); - event.stopPropagation(); - this.$('.tag-container').velocity({ - opacity: 0 - }).hide(); + if(event) { + event.preventDefault(); + event.stopPropagation(); + } + this.$('.tag-container').velocity({ opacity: 0 }).hide(); } - }, { template: 'project' }); return ProjectView; - }); diff --git a/frontend/src/modules/dashboard/views/dashboardSidebarView.js b/frontend/src/modules/projects/views/projectsSidebarView.js similarity index 78% rename from frontend/src/modules/dashboard/views/dashboardSidebarView.js rename to frontend/src/modules/projects/views/projectsSidebarView.js index b971a1baa3..5da2d2f6df 100644 --- a/frontend/src/modules/dashboard/views/dashboardSidebarView.js +++ b/frontend/src/modules/projects/views/projectsSidebarView.js @@ -3,20 +3,20 @@ define(function(require) { var Origin = require('core/origin'); var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); - var DashboardSidebarView = SidebarItemView.extend({ + var ProjectsSidebarView = SidebarItemView.extend({ settings: { autoRender: true }, events: { - 'click .dashboard-sidebar-add-course': 'addCourse', - 'click .dashboard-sidebar-my-courses': 'gotoMyCourses', - 'click .dashboard-sidebar-shared-courses': 'gotoSharedCourses', + 'click .projects-sidebar-add-course': 'addCourse', + 'click .projects-sidebar-my-courses': 'gotoMyCourses', + 'click .projects-sidebar-shared-courses': 'gotoSharedCourses', 'click .sidebar-filter-clear': 'clearFilterInput', - 'click .dashboard-sidebar-tag': 'onFilterButtonClicked', - 'click .dashboard-sidebar-add-tag': 'onAddTagClicked', - 'click .dashboard-sidebar-row-filter': 'onFilterRemovedClicked', - 'keyup .dashboard-sidebar-filter-search-input': 'filterProjectsByTitle' + 'click .projects-sidebar-tag': 'onFilterButtonClicked', + 'click .projects-sidebar-add-tag': 'onAddTagClicked', + 'click .projects-sidebar-row-filter': 'onFilterRemovedClicked', + 'keyup .projects-sidebar-filter-search-input': 'filterProjectsByTitle' }, postRender: function() { @@ -28,15 +28,15 @@ define(function(require) { }, highlightSearchBox: function(){ - this.$('.dashboard-sidebar-filter-search-input').removeClass('search-highlight'); - if (this.$('.dashboard-sidebar-filter-search-input').val()) { - this.$('.dashboard-sidebar-filter-search-input').addClass('search-highlight'); + this.$('.projects-sidebar-filter-search-input').removeClass('search-highlight'); + if (this.$('.projects-sidebar-filter-search-input').val()) { + this.$('.projects-sidebar-filter-search-input').addClass('search-highlight'); } }, updateUI: function(userPreferences) { if (userPreferences.search) { - this.$('.dashboard-sidebar-filter-search-input').val(userPreferences.search); + this.$('.projects-sidebar-filter-search-input').val(userPreferences.search); } this.highlightSearchBox(); if (userPreferences.tags) { @@ -69,7 +69,7 @@ define(function(require) { event && event.preventDefault(); var $currentTarget = $(event.currentTarget); - $currentTarget.prev('.dashboard-sidebar-filter-input').val('').trigger('keyup', [true]); + $currentTarget.prev('.projects-sidebar-filter-input').val('').trigger('keyup', [true]); this.highlightSearchBox(); }, @@ -128,11 +128,11 @@ define(function(require) { var template = Handlebars.templates['sidebarRowFilter']; var data = { rowClasses: 'sidebar-row-filter', - buttonClasses:'dashboard-sidebar-row-filter', + buttonClasses:'projects-sidebar-row-filter', tag: tag }; - this.$('.dashboard-sidebar-add-tag').parent().after(template(data)); + this.$('.projects-sidebar-add-tag').parent().after(template(data)); }, onFilterRemovedClicked: function(event) { @@ -150,8 +150,8 @@ define(function(require) { $(event.currentTarget).parent().remove(); } }, { - template: 'dashboardSidebar' + template: 'projectsSidebar' }); - return DashboardSidebarView; + return ProjectsSidebarView; }); diff --git a/frontend/src/modules/dashboard/views/dashboardView.js b/frontend/src/modules/projects/views/projectsView.js similarity index 71% rename from frontend/src/modules/dashboard/views/dashboardView.js rename to frontend/src/modules/projects/views/projectsView.js index 6f4ab2b5c3..4a6183692b 100644 --- a/frontend/src/modules/dashboard/views/dashboardView.js +++ b/frontend/src/modules/projects/views/projectsView.js @@ -1,46 +1,40 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); var Handlebars = require('handlebars'); var Origin = require('core/origin'); var OriginView = require('core/views/originView'); - var ProjectView = require('modules/project/views/projectView'); - var SharedProjectView = require('modules/project/views/sharedProjectView'); - var ProjectCollection = require('modules/project/collections/projectCollection'); - - var DashboardView = OriginView.extend({ + var ProjectView = require('./projectView'); + var SharedProjectView = require('./sharedProjectView'); + var ProjectsView = OriginView.extend({ + className: 'projects', settings: { autoRender: true, preferencesKey: 'dashboard' }, - className: 'dashboard', - preRender: function(options) { this.setupFilterSettings(); - this.listenTo(Origin, 'window:resize', this.resizeDashboard); - - this.listenTo(Origin, 'dashboard:layout:grid', this.switchLayoutToGrid); - this.listenTo(Origin, 'dashboard:layout:list', this.switchLayoutToList); - // These need to pass in true to re-render the collections - this.listenTo(Origin, 'dashboard:sort:asc', function() { - this.sortAscending(true); + this.listenTo(Origin, { + 'window:resize': this.resizeDashboard, + 'dashboard:layout:grid': this.switchLayoutToGrid, + 'dashboard:layout:list': this.switchLayoutToList, + 'dashboard:dashboardSidebarView:filterBySearch': this.filterBySearchInput, + 'dashboard:dashboardSidebarView:filterByTags': this.filterCoursesByTags, + 'dashboard:sidebarFilter:add': this.addTag, + 'dashboard:sidebarFilter:remove': this.removeTag, + // These need to pass in true to re-render the collections + 'dashboard:sort:asc': function() { this.sortAscending(true); }, + 'dashboard:sort:desc': function() { this.sortDescending(true); }, + 'dashboard:sort:updated': function() { this.sortLastUpdated(true); } }); - this.listenTo(Origin, 'dashboard:sort:desc', function() { - this.sortDescending(true); - }); - this.listenTo(Origin, 'dashboard:sort:updated', function() { - this.sortLastUpdated(true); + + this.listenTo(this.collection, { + 'add': this.appendProjectItem, + 'sync': this.checkIfCollectionIsEmpty }); - this.listenTo(Origin, 'dashboard:dashboardSidebarView:filterBySearch', this.filterBySearchInput); - this.listenTo(Origin, 'dashboard:dashboardSidebarView:filterByTags', this.filterCoursesByTags); - this.listenTo(Origin, 'dashboard:sidebarFilter:add', this.addTag); - this.listenTo(Origin, 'dashboard:sidebarFilter:remove', this.removeTag); - this.listenTo(this.collection, 'add', this.appendProjectItem); - this.listenTo(this.collection, 'sync', this.checkIfCollectionIsEmpty) }, setupFilterSettings: function() { @@ -49,14 +43,12 @@ define(function(require){ this.search = {}; this.courseLimit = -32; this.courseDenominator = 32; - // Set empty filters this.filters = []; this.tags = []; this.collectionLength = 0; this.shouldStopFetches = false; - }, resizeDashboard: function() { @@ -68,18 +60,14 @@ define(function(require){ }, checkIfCollectionIsEmpty: function() { - if (this.collection.length === 0) { - this.$('.dashboard-no-projects').removeClass('display-none'); - } else { - this.$('.dashboard-no-projects').addClass('display-none'); - } + this.$('.no-projects').toggleClass('display-none', this.collection.length > 0); }, postRender: function() { this.setupUserPreferences(); // Fake a scroll trigger - just incase the limit is too low and no scroll bars - $('.dashboard-projects').trigger('scroll'); + this.getProjectsContainer().trigger('scroll'); this.lazyRenderCollection(); this.resizeDashboard(); this.setViewToReady(); @@ -87,66 +75,31 @@ define(function(require){ }, switchLayoutToList: function() { - var $container = $('.dashboard-projects'); - - $container.removeClass('grid-layout').addClass('list-layout'); - + this.getProjectsContainer().removeClass('grid-layout').addClass('list-layout'); this.setUserPreference('layout','list'); }, switchLayoutToGrid: function() { - var $container = $('.dashboard-projects'); - - $container.removeClass('list-layout').addClass('grid-layout'); - + this.getProjectsContainer().removeClass('list-layout').addClass('grid-layout'); this.setUserPreference('layout','grid'); }, sortAscending: function(shouldRenderProjects) { - - this.sort = { - title: 1 - }; - + this.sort = { title: 1 }; this.setUserPreference('sort','asc'); - if (shouldRenderProjects) { - - this.updateCollection(true); - - } - + if(shouldRenderProjects) this.updateCollection(true); }, sortDescending: function(shouldRenderProjects) { - - this.sort = { - title: -1 - } - + this.sort = { title: -1 }; this.setUserPreference('sort','desc'); - - if (shouldRenderProjects) { - - this.updateCollection(true); - - } - + if(shouldRenderProjects) this.updateCollection(true); }, sortLastUpdated: function(shouldRenderProjects) { - - this.sort = { - updatedAt: -1 - } - + this.sort = { updatedAt: -1 }; this.setUserPreference('sort','updated'); - - if (shouldRenderProjects) { - - this.updateCollection(true); - - } - + if (shouldRenderProjects) this.updateCollection(true); }, setupUserPreferences: function() { @@ -159,7 +112,6 @@ define(function(require){ } else { this.switchLayoutToGrid(); } - // Check if there's any user preferences for search and tags // then set on this view if (userPreferences) { @@ -169,7 +121,6 @@ define(function(require){ this.tags = (_.pluck(userPreferences.tags, 'id') || []); this.setUserPreference('tags', userPreferences.tags); } - // Check if sort is set and sort the collection if (userPreferences && userPreferences.sort === 'desc') { this.sortDescending(); @@ -178,7 +129,6 @@ define(function(require){ } else { this.sortAscending(); } - // Once everything has been setup // refresh the userPreferences object userPreferences = this.getUserPreferences(); @@ -193,38 +143,33 @@ define(function(require){ this.updateCollection(false); }, + getProjectsContainer: function() { + return this.$('.projects-list'); + }, + emptyProjectsContainer: function() { // Trigger event to kill zombie views Origin.trigger('dashboard:dashboardView:removeSubViews'); - // Empty collection container - this.$('.dashboard-projects').empty(); + this.getProjectsContainer().empty(); }, updateCollection: function(reset) { // If removing items, we need to reset our limits if (reset) { - // Empty container this.emptyProjectsContainer(); // Reset fetches cache this.shouldStopFetches = false; - this.courseLimit = 0; this.collectionLength = 0; this.collection.reset(); } - - this.search = _.extend(this.search, { - tags: { - $all: this.tags - } - }); - + this.search = _.extend(this.search, { tags: { $all: this.tags } }); // This is set when the fetched amount is equal to the collection length // Stops any further fetches and HTTP requests if (this.shouldStopFetches) { - return; + return; } this.collection.fetch({ @@ -238,7 +183,6 @@ define(function(require){ } }, success: _.bind(function(data) { - // On successful collection fetching set lazy render to enabled if (this.collectionLength === this.collection.length) { this.shouldStopFetches = true; @@ -246,30 +190,26 @@ define(function(require){ this.shouldStopFetches = false; this.collectionLength = this.collection.length; } - this.isCollectionFetching = false; }, this) }); }, appendProjectItem: function(projectModel) { - projectModel.attributes.title=this.highlight(projectModel.attributes.title) if (!projectModel.isEditable()) { - this.$('.dashboard-projects').append(new SharedProjectView({ model: projectModel }).$el); + this.getProjectsContainer().append(new SharedProjectView({ model: projectModel }).$el); } else { - this.$('.dashboard-projects').append(new ProjectView({ model: projectModel }).$el); + this.getProjectsContainer().append(new ProjectView({ model: projectModel }).$el); } }, highlight: function(text){ - regExpEscape = function(str){ var specials = /[.*+?|()\[\]{}\\$^]/g; // .*+?|()[]{}\$^ return str.replace(specials, "\\$&"); }; - var userPreferences =this.getUserPreferences() var search = userPreferences.search || ''; var regex = new RegExp( regExpEscape(search), "gi"); @@ -284,10 +224,7 @@ define(function(require){ removeTag: function(filterType) { // remove filter from this.filters - this.tags = _.filter(this.tags, function(item) { - return item != filterType; - }); - + this.tags = _.filter(this.tags, function(item) { return item != filterType; }); this.filterCollection(); }, @@ -317,9 +254,8 @@ define(function(require){ }, setupLazyScrolling: function() { - - var $projectContainer = $('.dashboard'); - var $projectContainerInner = $('.dashboard-inner'); + var $projectContainer = $('.projects'); + var $projectContainerInner = $('.projects-inner'); // Remove event before attaching $projectContainer.off('scroll'); @@ -327,7 +263,6 @@ define(function(require){ var scrollTop = $projectContainer.scrollTop(); var scrollableHeight = $projectContainerInner.height(); var containerHeight = $projectContainer.height(); - // If the scroll position of the assets container is // near the bottom if ((scrollableHeight-containerHeight) - scrollTop < 30) { @@ -336,14 +271,11 @@ define(function(require){ this.lazyRenderCollection(); } } - }, this)); } - }, { - template: 'dashboard' - }) - - return DashboardView; + template: 'projects' + }); + return ProjectsView; }); diff --git a/frontend/src/modules/project/views/sharedProjectView.js b/frontend/src/modules/projects/views/sharedProjectView.js similarity index 100% rename from frontend/src/modules/project/views/sharedProjectView.js rename to frontend/src/modules/projects/views/sharedProjectView.js From 3cebdd34139913fe6c94b7f6c7c06e5ad0697eab Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 13:43:51 +0100 Subject: [PATCH 088/296] Remove images folder --- frontend/src/images/login_bg.jpg | Bin 69827 -> 0 bytes frontend/src/images/origami-project.jpg | Bin 69146 -> 0 bytes frontend/src/images/theme_bg.png | Bin 1631 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 frontend/src/images/login_bg.jpg delete mode 100644 frontend/src/images/origami-project.jpg delete mode 100644 frontend/src/images/theme_bg.png diff --git a/frontend/src/images/login_bg.jpg b/frontend/src/images/login_bg.jpg deleted file mode 100644 index 5a9bebd658e5a33f97a45b9e4a330d3089e77434..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69827 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�W5SoV6&WTOI2!?J@tTMJd{2-mVoZlvkD1 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

jZygE96$o)pQL#S!fs zc>w%$wMADva`P}Uk}@Y6pCTjXAR+v;83k9}g%$(}jZHGbVf0~^0Rs?34UilL!|?&> z_zsi0h8cCoM{9Io_=aDw`@#MgNI9q#a|)i8agYp`!{g#QOl`w;raA~Y1Hyq(m?-yj z{Ba!lSB?zfx~euy(^W7r!?Zr1kl;EFx$Wa@^-z=^VTX%>^AM7RovIJNsP|$dghI_7 zod-z@Y9?VRieUbs&OV&@4!Dm&l1&aM!w=BDihFT1EDU6S4xi5!HSE*fpCWr|UP2x? z!C;`+2quxPIBy=i$cYijnatK6$e^)VD$(c>%8X1uWbI^=I)y5PBBg0NrP$54xe)&V zcG=z=9%7UNRt@OfAnO&vp$Anmj^G0EpNKkDaQXIA>brOC1)RMHdOGaWO>cED9FCIR?eJaNXwTZsj)e?fcc8xmglMKAOT9$Yn}Z zBo0()nKcGb5Kz@|Y&(O#v^vyw`bNv)aV(x!y7Iv}C=e8q)v7CyfC{?BqvC2tM-WaS2uH3{XJcrrg?ZAbCpg8b>Na-%D6SG&^m-1E z{{ZASG=pS}fsBxXf|`aYM4~whIOg1Va?TgJ@o)iq>j|P!{{Y-7T0h6sRi-|3yG72A zZ2P^&yM-w$2GhJ-Pa|}sI>Js*fgX#{PGjH9!F>wxYAT3BEFSOi9b3V12 zkoK(RwU*52s}^f!rEy>HDQ;oD-QuGj>7#?TOpl^uSxPe_w`|EG-aXQd6*|%KO2?>I zC2Hu1Iu^<%sHRdJx}CfmxZE$e_D1`N-zCGwpvwb;9n=-@mIm{v_B!f}_&LQu_m8rD z*z8v1HooHR6Iw$vvfJKAN$hUG{;PYq>l+d?F)>M(qsA$R=Z{(avL!0P+H#l*P!Iqz zLOn7W&xUd5t=8uHjT13X&kgS!jiCjm$@NfsLHlP+ICqQvV~y*^nzKlz%!?7iOhD)^ z;Hx}Mxz;J&6}Wey9NfTBT}*+yM+5^La194>yM?uO=VSiwxFb(_E9kbiLKWwe*a@zb zUb0C-6l4Kns%1A~`x(hQ>B|oq*=1Wzvf42%{rjPK?IJ%75~J0)l=)zTP}FMfRy8LE zylKzelg?Zj#sSG3VHL)%=|g9Vs}-yF4kRuVw-PBS32u^&a0)M8LTnK_?3t>%jsdcO zqNPkuP}d*XoLk#H0RhiKg5F|PT>k*7zHQt4 z%dR`x4%jreTMq`?q_LLm*;!|unKh(kKvrn|GHxAwp1h43R7OcwCa4?JF^AK}bH3li zHq+3`ML-qASV>kutjA3&fgrgK8yI&SW5+-!RN!J%k!e#((*gkHCBWMM8$cB4Yr6l-b+^{@wN+3XFPWFi9w+1DjT$*QNv+$N>a9vETmO z-~@Bm9XHWpDz$0T3Jmm8p{ZXFelS53hyFw3vjdH@@Wy)UBm~VxYk;j}{{T^`rvi{v zN@E{A<>|jr9B8Q$pf5v%?c^%PN|ply(_J$OL&VgRSW)7vmMJR&jjd5!%g4Nld9+pe1ql~&u+8Xv zO%n>`-CCI$5P<<(eZD=)hWp6`%-F7)yE1}xQ%wQU)@FO7Dv4vg+wLZjX0D|XK&nba zsz20m{cq*eq_s#3gd5Xsn+!H(71HzcfrlZr*Ve!Tl9D&AC-ZaQNfKLJmxwNXULD{f8k(w4fhdpGDddZY>tkc)1ou4AeKQ4TM- z-%wo7xR4cHgsB8;^Cq zsORJN53^gET3_6_*=?@ah7eCY0h4mv(k(^}tTDE@p0KyfkX2<5G=FiqM*Mdf##{$P zrPP&CgwuXU+m+osRNbW& zow``=94=rk#TC|6#vE({I=PmPD8PyZ32vYSP$(5ZqNpCl002Fh`PYv6d-)#f>D}(+ za?Z?kGdU!dE!38-Wc4`W!2l=KjCO$hgu}LT(`{f5i;T-AMe9%p?Kn3`xyXidu;ct~ z(@Mb0-Hv(u%xQstYz7UwhzEyHFah({EBRvuLX6EZlCU|13LXAm}wVL_|BWoc9h#&*7b8DpHwa3p|DDu1teIroYP#?T);Y)YJne8Nl~_A;13s zPzUi1Cz>5Y9X8FpJQ6J$j6T%^_m2!kE7upKvD9*cAXR`wK)@If9Oq%cY&zyQ9jPVr z0Y?~qxW6}bQ4FnBKbPC~`*7UBGIJL6s5wl;>^Vas7y$q`hP8I_JPo2x40cB$cL-diDiRFjBiC70g_I^zW_0dnEa)Et&cRnas5b={wQV9b^AQ`PdVXWpHx6i4puc8LJCX5hPRL!8djI7W-O174DYjWc5M{E=%IN)ru+}Azmf9 zuU@TLBNIt#WE69jlkyO#%c3f)V^#93Q$?eoF;^mKreh)NnNS+_+_(oX>~D2;Ywk}5 zy`JBCvwK~}B2B&EXVW5(bGMo`W3CAeSdwBcfE--b&EBrl{bBt(@{3LtJ4MPac-G?; z{?9WHpR=3g9LD3}Te~)pDNDFlN{=nV!64I$$%VS62S`NbO!**}yB)+Zbl)N!pvGCzx>5fcg7(YLzD+TA(#a-+nN>L%Vymlnd$DUCOtx zWkKoP4Q#96Ld+#oPMtCIJ@k#wXYM!CpBmh+pVi)W>r=H|l65hgZz3q&{6k4-ZQNJe z_u7MeAmO`($}rHaB;ubp>I2f3{ymxouZ7TJDj5 zr#voWl@Iw{NHjhwYNx~;C*Ah#tB`Fs9D9&iTJ9SK&;naqsM33R2l?V~RFVBI0Cgs+ z%Y+=eIJg^qomeIkjj4uxFDG0XQNyI`ja;q&0FiSEgivo9Vkm)uQv&Fuk$rF~q9xUp zaQ^UY+uvuS?k^>oA)dh+3-uIIZsMTP8ucx8RFWVDW!p&7rj$M0uchu$$3Cd%?1u!m zdF(faOWmqR)ae%6Jz1rh&qUjZk{QW09-L}UxdmfoO0{O@YrMt2^sLs#x^~K=-S<98a)38NQo)6*+z6C;tGL+~cRJ(>l^q>W;Tkihu@I(G>~- z(}{+g!-9DNluz0L+8`Mz005v~(uN39lmGw&Vt@buV^U4jvzB9#IImk~5ZkO#AOTi@ z9-w6NB*8!f zKR?8DSq7R9w+lm|VLF`j&KFh@ zARr-;59tq>fQB?;rjgeyBzZkY&2t_;7}Qn*m+Jt?8w4LM_W5t21tjItm@Va1T~0Hu zSRR{`_LRzyrZ(8X^#KfiJ#<4xwW6FZN#xQRR0NUj$7EGFoW7(WBt;4i zJp`^~E781gEQ@xSpqaab0DH0lxPW}aV9`Y?zJJ39iFA-+H3P5Tj;c5^sg6gt7}%R< ziL$FDAPD_vhr_Sv~#qaxxxN`p7Te;eAGD2azMQqeAFygsx zRlr77WeU;ZTL={}ae*N__yk?&a9J00ks`N|0+{1MMO1^W zXvh)G0Bt0K0I171PU~;&?+(1OyW&>z-`rZP+|Y!b)yE}sts0|NnV7TN4F$uNGrd3)jbzH8TQ#y80v1lQAgGWC zD!z_*Q!`DfX$Pc5L`uDna-Utz-P@!}<(Y~oWvBs5vJBdQ3b3Y-pkxjX8+CY+{JnO*8o76d zNvRpx9YmouV{nQG2l>P5kt$^9`Muc#V0%u^3eDHBm-bE36w$(jhFRAU&DHHi~$f*{U3fKUcZ!MaHi zqagwpD5O#(J*CNhkkyWHP9Mg2O^5dWF=rL5ML=f&G_p`odXk?z4`S3H@KK5_?r(EB z?{>F#-nsteaeXO~onkD@Zxb;lu|N-|t(mNZG_Czo8sodAOyHtk&;kHsv@$pm@e%Xa zPQd;+Zr~BbKwOl4tAz1m&G#MsxDg)!4e~x=owM-LPeALfe7N2n!3-Kl#rFGC4`nq0 zASMDB5E6lM84>LO$dBW#wX)@3ws>qg44}Jz!(ZKrDPFWr#Z@fzSm{@6>-ROG7qrEs zx}|9{t#M^tL7mzFpdg{xxL3HQ5($U2ft(Py*WB?gH+9Obd9?O%w=J`@lG-bgs7Nj4 zp?H`A5!RxpU0I{l+8INzI@=!Nb88LyAp+b%wgZDAcVw)O#@c!f+hq=LgI3 z`!_}vqGTT~ja;nUs_IUc2(uXbHL;SZBys~v%$$N?>`ov;A|gFXI&9?bKHF*Bq1)L| zYBtf6KA-~J%pKylU{A#)NmQm~jXXvqJUxfscaNv}JKJk3m5*?h7SJJL_7Hk;PkOAN znnQIUjzDOtfuC2Eh8cvB0^?v0@zgZuobemWDvc_0_TbqB1O3Ge^$+3t=(afW$6qrF zp13z|+y|(AA>+_;9RtT9uT%5FY388PwE%Uejsz-z2xPlsI1acU55rma91$BIi3JTX zM)ipo0Upn)rE+ds#KzGj7c^RdVIJ2%S>5Ng@^yp&*78IevJvW$Mk->o!^VBGhh?GqH2bA~_nTVQCRFOu5CxyHd{@cF&6Gv1B4v zQb{>hWdxfnlAfq|`2}(nGz9xkx7a^_hIlN1g-Ok+_NVX9FK!^u8SwWl@*TPLZU(bA z4ab*TT#Ur`AIH2!)sl7l6^t@d{P8zbN#$~jWaVHd?nbIs!9y7p5kbR-eu2%QgdrtBF zk9pi|g@f)ez_&NHn{Z~7S#66kSYq|A7~I~^B}~%k(zJ>&EDnB;C&$n=SumZfN=D56 z)Cw`M3OGVWvtq3_O*>6OMhSF;>=LNGDVUwgYO2vik`j=>A^F0ig$^GryK|YfCmCSy+l9DPZL@i`gIhh zBEs)6i2h-by-id(WlHCljt$D}rWB3ZKAM6bSAcxO!#W^Fa~1Q9EPI&sBUAKW$JzJ& z_%|z}{UThCZU8%aW2blNq~bQFcwTN$P^dXj3Ut82t|c&vJ=rjTpS*Gy9r7EFGv}b` z1bOL98YOt!R5hvVU*Umbk1FO*x806? z;$nhl$+~u!2XNds9rL3GO{s95s$0R8D#6$QnXoww_YQDAeR}A+d8*h^tO)5D z@$vA-ayjiBWKM0w+1SJ7w^0BA&`f`Tz{KHvs&zM0UbyY|iG~Ne1JfD6hI;2-^ohnz z+8`Oz-S+Uu!0b$Z;ZO_Hw*%C6>EW#UUC%XVi0bL&>Ut+~*b)Qv-Gr zw^7i~y4zbF%FQ+0-^r!{Iy6whp>^q+x^(IRmNq_V8iS@L(rmrD-uFvx-|`6zJ2w)w zYn{?vu6S>^9o*bZE&WZg)7I8wCM%1(bzhgWK_k;qt|e_>gm^MdZaum{+<5DR7UYQH z-TlV#A1s4M?fF5Ct{Jmn{pEwZRAdB8(y1Q1q@_%w{{UJbj=_`^Sz!y789UH(p5=(?7~=d#=_U8p2yyNvu*O zw3EuDIz-mmVbOH0LS*#FKzq?+#8xkFS7zr`g<{dhC~;N4+s!VwQY=IbTY;?hm$XWx zEt+f7LPA#a%5exeu(N1lgj7rm2IOb}v7DJnA@q^R=Yzd1vseS@-)!=0g;z{*Sj66? ztgjktxm5##F z2UxBpskphnwJ&j0SVB__S^%yGzy~G(@et@A4C>O96OikVpXR!cz}KzXU9upT_f?wDY)DTtDyO4Y46KF{czwjTsulpFb2Vp z&Xu+}_EJShT4pe8nC=UiZqd3W?p4#3&QzPWNS#co>l~#hc!=n!XM)xj zy1HPt(IY#t=%|3R8vB$SDzdY@+;1YV+mWQcxRoM}K&g2oV2Gf5OE3c#aWBdoJMAuw z49naHCO)QDr-Coq8XsiJX58}gKXa5}Jj$wiixZTz#gdVgcO2eH=tgh_GEr| z&Nk3=C2ND4`sYCgpM5`tX@c2?CkDqMfJ6iYL(gEqgT&Yar^)BIdBgX|~Ts zaYrsIklZB%lO;mn_Q+V+xaenKZ@v4JfDc_A$L(h!?XKe;zTqTSTRqD+%Uvgz)m0*^ zBt({qWdv$bsT(#%r9ie0)c1>w_hV>l{h}#tH_KE{o3xUyA$JGO6xu?|3l%y^(<*sH ziRM>o(Dt*#KInb&+SK=d$bibUd6w1(JT*##m_#Z(XGMxC@kw&3lF#JgBrccBiiC33 zsB#?^tq@St4#dejN4c{iKTtMpBxb(lCoG4w4--@DrX4j|A2-Px_KyMgW6|djw&MB~ zFN!D@I{Q|({vzTDhWCb*xf5AdiL@{>sa!vNwK6L>`KgyH$TvvN)i5Oe(xd69YzTn# zs8dR5r-xk5GEs@B=uTDf1KEwDcvks8aBnbfM3Z&Kw|HJdxuTJ+ZxAGG1?Du3;o^@_ zcMQ#U$Q_}S2hq|ffumobDzSp(3d$bb1@ky2>bP=bI0Dsd97kTY~ERMjSU zty7z>$OL?#GH|1o0^|@y!4{5ksz|Eki-Z>{h@9k1#vy~ar8Y_y>&187vzPJPK2x-k zcI)ePl?RGfCyoCA%@c-=z3X2be9ZShh;RL`=Np%9`4WZRwyVa5M$9arP{nZ=@k@xA zCQkq#Pf&5qq@bI$Jx`>@0`?mKAaK}6$6Hsnpy{8t9L!s(VgWuzAW)8n3KV1nt9n3S z>@j z>mHEOSW>6M9v5xu2qY&+G}T&thrb2@uqFVJkJ@7nL$ulL&rQSi(K>aVYAP_a$|7Gu znw9o=doj=)0wS5a`?I%qn278K-)&<-a78dNFt#h5N%8jM<2qF5^o2gd2I1Olfq;4l z;CkyT8mj6BqXClQNhI`&>3+WN#{yGw1CaFq$`regK@T3$$Bux>Ou(SQ@yb|{s57em zUhlsg)^?UqDaqPl9EtPg=f96l85D0uDrzay32ts+EgHzQVryJ<2gL)JqmIDbb{zJI zY$e;Sb?-#!2l|dN^U5SDazXZ}#-DfxQ@c43924pg?()twFH1^O!^Z_1p(Mc8tU7z~ zzpS^JbKl+B+&S*gT>0Zz(w_QLt_A8`Ql4E^tt;b-`u^Jd-)l8DlRdLAvPjmRAkKT3 z`1R#UpqGqfY2kd&*4Y6bmR@GH2iSGhX~ zc)}vXxOyx4+C@YcF_0RLzv(g3N&O*ED~tU42kw_1y5!Jyo18}l*^*-0K)#dz0LLWE zL3>-c%#mxgm4T3;l_N^rOxmO>4UpS--pMFk0rrcH}ZexJ49q7L#qzhPd@v zRV7pEi->JO(;-R~(ySe%C2E=0-F9A6!23UMxN#es+ufg#?flOENVbKrhFK=Ek`ZM4 zPT{_?iLIl%){KuVFKG>mEX8NlK#{h~aR)b3Eca?6mKn<&Ra#-U9B_M7ZJcv&sm)cZ z&=VY&N#sW{F)k}_cxFATQ_D-mip$BO37$E##oMf*QP=KwTQ2owHTK+OlI0_RM%(ov zbTNf#;+(3KHt0W6Na|cu(^o1^o$nRdJBQmoL$~qXQY`H@ORLBqaNd~O?iRN&-A_C_ zb>`f%%C`x-NbD_bF0`e)7hAclqn0%?Mt|;a$TQYk4;9DRIR2Mcm6+rD^{xW_NVhYy zHs#JCT^9)P+@!KiQX|-s#XcDY8MJbu=%9O}h>YBj5j5y83?&-gGD|57p84bO* z+i5gzBwLsW`MG5T0jEhYCX-MBAx#BMG5-L$S2WtV-wER1PrOfi+%Mr9*5$r#`)%E` z+ex$TXy4l*w*i=}-m)dz$to;uBPu+q3o0#cR*@4QJ-GuMGuO|=HDFM!F-x1=pp7Dx zCl1?YfMVnbQicErJMZ!jEiOb9&m1Mi!+M5>fEpja1_`qu2!BzBrUPIB{&~@w2VR&$ z_d2|lXZ_eQAbq$2gaAZC00GpW5642na#*&aD#ydwjlXbAqk#Y@{0<#{8XCDCIbf!< zR~e}X+`_f{cwyh;X8e-;w(BPj)7tVsCUKoMPm$>ydg{vFpcjio3zi7MR*;`v+a(yf zeIoRRC?cU(Q_~U^!J$qXWo*hycyz4Uyk`96Wn^ZSvH;BDkwBD9jHpi2gWJqNsf$0g{jOk4$HL;RP0oZZ=n#B)V zWseC_%_?x8mS^6O{X3V>raUvRWz)dpV+4$}BjZv(FAwGT;e)$Zo4Y}7;t)XO5ikgD z8UFzG^wz%a5a5C^=5ej!OL#LMY(&Gbl?+3GMMTVqSx~KiTM80bGur>E!6QwN<$i! zd1O9V(L#b~&Ol>ND%Fld67#lyC(CzxO`meOhSuI$0C}Z#M2<1$k(rpNs-R*9pj?eA zLlKFa?(^L@wg#LHFYN34f5K1G`1=0WyOAw}sxT1P%-YW132 zue-b_wp%Ctt=Z^M$?67@;nIdepo+*yStMe7-4Y~IrXGmB26I{$vVBtd$Q7UKDeeRcTuX}08 zUd{Et9=RT+q~v5!ni!;Sg=U4kq!J6Jms-`SBD*!+4Y#|TWp@igvGO}t^lvSL4MDlzi;xvO2wEN4F+W8_Wb%`xc3=CHNKFaxER7oCcKKUlU7zzEKo@CG1gDE zgF%uqZ5y@!0Ft2@YGC0)yl~yKq*y#6Yj=uZZA2uqC&Cki+7rC;j$tG3* z0I7g~{A2=T9x@|NbsTlh+D=hWX+IV=D>Re7w5O%h@%%7gE{H~W)D#jzI;?5MyXlulGbAOL1V z9)N!j{W0735)kStLCHtxz=(GkJVc}506NE@SwbG8JRSYQIOJ*2)d{A3Plx4=47t03 zRKyB%7^9FJk3ql)1~(lERB6)P1`Co&1cGStVn$%+?#uV%F60W4k}HE3=`b7V$8dc2 zz~fnh0^peIg0~&XAaq-jGBwMu`2CJK7EDU1j8O$leD(&z{{WB6;6EK3^5CEcAUfd~ z-3Xk>o_BAAd%oVx2~Ef-xlD4EB@P|JP%wxTz&&x{qRMHGfReTAg>ld7T#rx$n2M2F z(2pEr?~m$weaUzCcK2s)y?XWdYd(tTu6k*Les*75)2i#$Px1SG*z?sto#$ zUfp*C#UQ47T}qNa%)b(zp@1V3=Z|tt$BXYaJd}zsPX4U(45fD~3(u+QuS~(;^ zB+~Q|1FWKlP}Nn-INu}STc!U18r*G`P1?%iOd>V_Pi*WyUh1?88d%Ad&HDGVd0;y;#vmrAcHCvgiQ1X2({7z|p8_hdX!S8*ahLcA4(& zZ|r+-yok-M)bj@(L`1og-djIi+B;cDSfgl#!bH)Aj53DDnEwEJJb;HL`=jP-9D8J0 zMWu0fTZ>@L;_uiqLavfE*9pg}s){#3s?Xz=R1szgN2YU|?UN!x8MXezaTVd+s@ith zV-a86#Mie92_R2+eP$W-(uER&iZszc7@=>f{^LvBKKbukj5kkrvu&Q9)ny~1qcx`7 zzb_jdATxTbvQO$us(C$H%_F{eY-^1BQX#uTw50&gLC!KG^Bp~qu0z^!4mW#>%Eq}a zSaF+>NSQizf|-a_C=7{CVq03VN@`p$khMmmiHJOFs_ z(jkPy^$27KzyNWco;nF&KI|^Hwr6o)jE~Fh;e=C}l91-Xv%lkj@g0XcAjv~Rj)n^@ zN&+wAPPm%Yi%Oo}J*~gys~s}We~-J))Y`;R_~s>)k0VYcXS^jtVJRIYCX=$$V=GM~ zrCuv4(IN_jSnU;b)j>$Z3j6WQK7XEC?6xsaaXplYYN2bR)|nP*Nl`&5qr+I_Izq%; z0xOG5`bO=z;k_N%+BmyXT=ljW^l?ch+&R*iM7$yp*AnWj~!Iz}g#6!A3N zFDY_up}#KjZ2tfpl+k>FO5@iQxa#$5+g&Y%Ir_F(D&3XI8%Ellb8JFLrq&qX;gGNQ zE16RL3K5XLp6=S}TZ`EtnXcnoUr5QVX1R^lGcu}^Dx^|=v&i~njgFPn8%`xfj5b#` zklR?tJR;6UyY)nVn?r3PG=djrq)jBT{))!Bqme~lNnKb>**VpeH$O!CX_}zeE|wl% z_UkRlNMF|B=)e6t9an0bwQu}yQ;?5YtNLW~I=M|If~!6}YV&7IrpkVbY7WZs{>OZ= zy4z!#-WzMfD$2Jq7WHA1LK~w-RxIITqedIhdJi!t1n#>|)4cJ$%WB_bhVDE218*!X zZ5UGp#9E{lpcP~)g{2IV6&DB?`BV&71=hA|EzZMMBhivV5=iLB$sHp%Qc@MtNj`&< zS*h})M-QRhAgZXF>P1r+gOM(EW_)XYhm&kpo8(FnE};%qwb0;|k~;KYk}D`aAOquy z2ku7&y6yh}GTiu;%X*XT_e~zEX%fUhcx4Nofhh;{{S6z;C~D! zXd1a^?9Uqj?a)3r4a78NSVmQbXYm-pL;yGV@4h|((|vdm_~XuwXv6}((bN2Jp)F#- ztx@&iyiUlGjKNUidahA4n5cVbKQy*OTR=; zB6SB^28{V-E9sX8JzDZD#G>aC4o3oPjzc>Ed_F;~(Cdv%YBUOF&6)f<0fxeDxUNG7 zQ0>NghmiHychY%On%Ay6ovLJvAqUH(SNP&NU1|lAO;Rk79H#Iw0N^46kP!h42|z>e z9cb?@M5;y}E;Gmtn^ck7$KoC(t2?(*Az+LuW5w>bS* z(g~s!|uGa3q&3WQ0Yw3OPu(Og{09J7=*h zWseUc2q>r~@a~mvn$8=7iXy0`sQt;lkomUS8h$Cb*=}$KsE$x=C!p}v`jD~q=N^8{ zN}dV+=AEJ5WJ@06?E9}Dx*&r*6x?kA_oxuvMz!hWoR1ojo54BmwaqEbn~s38m%a;s zZm3b~*2?`(Pmv!()hzYtDH{YO-oq|1W|LhRH6$FZCV>pfEf8*!2%FI{L5ke?w{W|8 zxm#|VmfL@}?v}R;JQBQ2V-iNyQ|ia6DpXMU#ZZysiIK;9f!R*>Y&W|G!@lg>{=>Lg z$!&LS4azL-4C$fJ+fC`*YSO^1BWg$#gO(x9g^Wye)3ZW4UEOu?1g%0r!4@LY6{q=g z4B^37LAu{`R%a?}36o4kVjt-*K(w9*%TL%ViMx?9I?_w|rnZS#|E>ra1(uZOhZLfSzAF^W@Q3L)wM?SS!6 z1b#YB@k>BYQ`7ljY!_B*R8!?spM^d6H$n4v2`E)g8BaclhxHq;XbArRQ0SJ5NZb|i z>xFRL+ug#;F%(1O_Mc^Oz^5rhr%>LQfDdjA0%X8EL^2{EIzKbzQBnKxtyM_KmSaa1 zr4PgY2N)NkVu6p^WJe%V20yGb+9m<;+d>flXe+M-J>wCn=wYr@r^Vr1cPx@UpeH%g zK08Eu6v7<<2RIDlLHT#CKoNt+>26n3GbEJzf&6d;?$aH>PN|FnA_fr=AY-6!kphO4 zENnW^3~HL@76(mT&1w#G{k6**{rYGLN+&3aguw)&J>j?XkK!2CJrB_@es^NV9x=2WbSx z#@pw8gU?)i@cMFB+llA4-8q_>q`)=$?G5K2O4(?d*HxBGwh-VQ0;BqiQi?qb{`BG2U`WcBXFkaA-V1?U^xJ5Ch#TQSP972D(6eOgZ4!ZFqxv7#;Z z6|eDgb1{tVcN@$b_dzqptSypmjSlSVD7XluLpLeKVbm?{rqTZZd2gEs8MTJ#pK;w1 z(rF|MBZ#1PmgZ??QbRx@j!_%b{75u{PAqHc3gNgH{pZX#jl*YyZrS+D@7DJAzO|LP zlJX09Hv1bpDWg*c=<`ixZr}*3M3uy)6$U)VHA#1J22phtS!GsHb=<6BRaMtm;;QSa zaS;_3SyKs)VG$7#5!KA9Mi?YOEMNct$ORbz_W?nVnY+8W8aAGCT2>{ACZv<^Ih_1S z!@(4QCW!+$&M~&bnlUpDVtPve!}{%1gRTN*rKA|yoZ5Vz!U9~nw4&X%%GHc-T;D*%#v!Ha8WRThP0CI z))4Lqw@W-LxX3jmZ0a4xd8!f_z#!_=T6ohA#?!=iYpt#KXl-YGrY8#WtZdOE9W+@S z0u`H3Dx`vQ(^?vOYvZP|wqI=Y86FQm7Rbs)@nrhER-b$h9IHoGF`Hacb~f+6ueY% zYRMBT(9+?!soCY=+ZybV+e5Q1-yh0I2B<@@im}LsfJ+!j7^JmBc#=vA5-QZkQoYH` zaU7I1vRpw-_klITQlGj+SC){u`*DT$F5s?}tWC73xpd|(*8x3Nj8;BeTDMWe3zdwh zB&oovnF8Hk{{Y+n05Y^;Hk|wv)D*08ku9LPln{ecRDv~s| z4;uQQ44QT|4zLf=cW9O4eFz#R^D^pfLPgWy`{*^ut96~!YZ(a|VPwLaXN_l3ii>8= zlx@;ak0WOrhb2jI=<-u%F|6LaZr(0Dhe4nnbcj$vIG}6H3uuA8d8sY8=VJ9QQWT z@mhP!6lLx3JVhVL+>ZO(iZ?60K#$|(;HTp(5f(+5N1oQnG#NMoVbo)Sx>L|GgR_&H zzJ1%@?%Q_ZdrY!z2|L8r!pZKmI;b(Mml3pd^+BwRGDe_HOHy1P{{U!zOq?fbhhXl9 zA&TFUPi(Ub_uV1e%&6={j|H6RDA5s8A`A;kH5Vwq5jy|0B*T+1&D|;S1=Q;K= zZTSP+Ec;Ng&sD5(632;DkrtZKSB)Cv(HgA%gP9RTOvvbfiOz5^yxq9x-OuE=pDE1v zoZD0t&frO+G|2o>PJKtOlmQWQnI?c7M1K5sSLyG9Z3lJje{wCi>%ag@GY_vc#In~- z&6qGpp>?tOg@_OU1&IK+L{y*w-Phm&)24Lx5$wc41bE|PI3N#EA3e7HdgIGM%x8}X zwVG+Jb?NzMjFnJ7)KLroXS90lid*& z=``Q$cQ9MPNjh8QqXKB!ono1!mMI5{li~(1v+0YpI|c92_SM_|X9$yJbi%|>BDF6tG*kt4JSu@R7Hu1wAHNjOa> z2>r?!?oC3KM3e&*zycbujup$cj(f%I`EJHf$lga%g!!SBPMM&S*zrgTpJ)MwOfgJd z)a{=k?B{Sd9^LYA4&%1URb@~_cQ7~-TinH3);ow9L`$MiP<`K&yYKP|M1J9dSs;f|vFc!vHG^%bUOqr(z1maqX(&N5!W5dQ$~#`*Hjx0a{C;hE%7 zu{wvsf5c);!K?s~;~SKsINWiJX=a^3VW`|)p_R{tbN$#*CZ-onQfzcXBrt#ph+rP@ z5{QN}2HZTcp*(eop?Wk;kx~ItJ%vp{9@>MAUB2LByN>1-bhwW-bz-ihbSlb20xOXO z5!7HhK$<{u5j4n|mvZD&A$v+LUN}+Hw*~;lS9a-BsHw*%Q9}ugA|fNCHk)0B+X=SY zAcor9xpI+4v7vU&pGp9_nC8ZnIN$DEt9;~lLjM4f-repu%MwJg+|4BNEK!0Zj7cjq z`e+FVwV(vk9SEt&Y?omH5ZFXI@BDPEC^;UO)k!fPWHdixj^uQ6eF_f4)WA5-I%Ikd zjuEKLb;hDwiC@U)$?d?@ov4>XhCeL>)1rl3uxPnfkiEqiQkfclN9-}&9+(3OkJ4h`6CeA7rZJ2Uo`LBD z@qAV5gN5UPNU7=R$xpZN@%s#D4~$|0Y6oeGBlTk=p1%Omo{bw)^gb9*^RDswQVJ2{ zjf&+&z*YK1Ono9dfrB{_A1w6N3M+Xt(~m6D!oM&mU&F?u+x#)i9japjo{C}FzHyK* zaP=Rahv}#qbsYZyZV4AMvk3%iLGI~XWRFkWBiMn9t2MYgMf&tMUE*AGZ}zYKJS1@dEu@h-5Yq z4*~KJ*E4knv6d#r#kiP=SLu~UxBPHbQf6W}6jmr;P9Sm!jtoKiM4})i5h#~o-*C}Z z&_yaV7YMRI>QU8zD(Jw5RtF-iq=p1gf<`tw-s5#>@$NfxvO#?eizHG;#bk~|VA05q zq!n~v85u}rUkDb_{{Yjs9@uvKmxsB#z1qjiElSBCmG*57VYwyD!HNFuCBeD4 zhB-&2b!h9S&}0~Z@loUJ35Wjg!?dILbqz{rl!K`C!~xuH!$u-P2&e4BklekcAp-y) z03q}8-^)u-P-Bj~B*-b#2Ed`aL`N9_=p+2}JSNKp%PEmIM|=*$+TLHga4pPkHX7yHXHgyHuAma?9RC1Kl!AnokphoiFN=G$!Acnne8&|TeO#4jqa0>upqOMF}R`_k=cmzRVi5&wNi}LdW=}d z1>UW9y^1SdD7KBpQiV|z!Y!)8MvNdnT`$r$T^SWXBcUDZzyAQCFLQwYnCp^Zcp(Vd z{1C7I01&HjiJVnu8OynN>7;orHCb6mb{9vko`A_RAy#lwrf^Mkj&lLH^LrHcGYOOB zZe?K1!J1YDLaMK*$5xR~D50fALr_z%TRVs?VJPD2+7MAxsEJ5o%*+>_kR!t!*Tqa1)JQ3c80$O#n=+z`wSI~IQnK%Nfr3Xv*|XgD&i(VoWGz@ zU4vCrGN({Ccdt)9!an-H66(^G0tEmKWRPwi#bzS zRHV4ZdCO*=q7CZ*0J#*bmvEugD z83Idpk!Z06s3*!>Fk`31h+p*?^)GkX{oMBNjBN5n$>N49nCF}ovGnIwFMV1V00Y!fb&jI$7u)JN%wrEs-~a+;ZFW0; z%VQqbw8I^)+Y;$W;~G^*?`Az&n3iLiII4bCyl>pQd7qK;OS$(A`sK?>G|j2p9|2sE z5M+pfQ3gt&VOErg6u2qz&__Lf06sVjX?dwNIh=Aak544h7w*8H+>9Uw4$$}j`T6{{ zihFwCR6YSf!CRSC10X76zzvW9&f%~CZ>$od@4@jwB>98n_MVmZ0oNVjBwf9DjC&MR ze)a0M&OL%@G7IVi{eo0zVyyi{he;h~ABmUmC zC36PQR=YLU4Y}i+as6Vv=!wZUvVHnR6dpZAG+Qc|tAz|DPgK8ixl6p>-0u<{Qr=w4 za7pX>(lo!YFdv3KpzJnlUNg1W@tai(YqnV1S*nhdwt_e-mw_>p_n*fNKQ>c&Qu)MA z`9AnI8Hr9ev>K^5H!7QlYQ#B~BGMDEGZPMxP2_^CXA?5Yx>P}{Wt@6MF@(S)B0ics zn;#A3&BQl}0&(5)RS3*zkY9WeHhC&sts#@35(rrM;un2%_96S9+m-GQ7=+2qxV5~G zA}ZEPy{4v1h{Zh5C5slih~3|xqY$H$M6zX9u@G*#*OVSTmx!a;I> z_YdRz@R~hwBOka^E_3}`WAWdnh%kfH9B!9)YE&{B`^FC<<37;fDTl)a3;+f|M|=le z860IzMnf8{$8Z-2RfuLj&VxU1?xr4?HwGb7&OkBRVE7I?j+C!YemGs;AkV0ZsT4R^ zcNB1N@c_VwK@ZQbo{v%pr;a$e;Fc$?DyN|yBOhdQ`t;}+{{SsvmcM=tf?^JXT7AD} zHUZD!;qdAmJakbF;4{M1WGzVzK=8(+)OY=N`Sr%yF>6nL63-HA1P>v{KwF?2A{fTQ zfycw)jTkb*M~b4VYfQf^bs~a60SpKa^#GfE59T__&+owl_G7rX0+a`EF-?+>h!VM?I7kxV;ELs1TRDO7}$%Dxe(4r`nG$9oPfr|I)QV+XN9q8_jsSm7gRW$X<%y9A z5vX(10V8A6O>i+o>Jjel5XL|}gTq-wDs>zedwOP%(;pAN?b8dAs8v(+%v}8&hvDI+ zTB<3IctoOKRcoundvU=w$s}&#fj|cx00TZc2m`3W<(ayg;AkAXZXe^P%SHo1mJ!Pf zxh8^``0k2Oz?-hycAZ^AQac&y`P1Z6UU)3Zw1( z@YUL7K&UH|=Kw$cp%25Rb+5UWi&OR(?)DA4^+)_w%=`ZU!^aUC;Uouge$#J}$N+|N zJu)GT;5EeG&sQ|V{{YABG{6fAuiBWiFJ!z`?dzZYyISdT0mgR@Pp4S!Px($hMU;ev zyNd~EYY>ME+pdt3EmVh?p|nyl%Iu^WD44^)b=>3D-7>^Z?Cx#2b6K{9cXMk6s`^w+ z!PhL&#^h^`X_3;aRudxW8ct?=_G4>{ZQyqM%EpMdbKJM9=dYDxhB+ikm68}`Nj%h3 z6R~eFGz-Z80PQ0}=2!-lONC;7+_g4#tID=Hz81H@#;+Y~epkeIUzSiFMM9P)d8|TC zkaP&9jCyYVlPBqVnrnCHw#3lP#?r~;DGE%IA!Ul1T}rFD&}3wI>#53uJk+DLu*kI=aFWiXO+!vQpf_cI!--tG+E=E=P`sh;0WX-dmK?tfmglY?ON>E1hZ2 zLR?XDn}0y4wF8<`eKTF%q22b#VvOwiV4v26x6Ay?>y6@%QOitdfT{w%Q00k`0RXqGG973+0sBqx01@%<0Qd%y%O;$$)ou0yKpB^> zLHs`Ncjt$j+2nlH*W70vGK5WaomS+Was#6?RHb&=g%PprP98P`BH&k9s?8EGCQ=;6 z+yDb}13TYdMtJ`KX*av5+fB^&zbhF(@!dMZ{{ZP`IFz4Ddlt+QLETl-wWAk zK}E7gx)t`-;#JGU)7y)Cxj zu1aGr;nIi6%2dD%ojgmn#6sMOSQJ_dV-8hJ#Zcg&rlCN)g;pgS+wJiNpo8rh5#k60 zV-e<|!8NDsB874}0tp8?5J>UGOZ&LtA>uAY2}owhBShq1zOdFCv?^(mwjxQY0g! z$m7ITi2ky>6CY;#lGl3#1}@!i`tG*+0ip*4eAR&Ve5{VXl|a>RBqprdsT!DxM4|#2 zz~D!y_;mONpTB>GA$*Ic$__yIe*XZ&24`p@1KYj>a1jjt9s{px_TxGnbT!8kumuD* z0*{Yy2y7b3CYZ$u&4T6b!K-FPAd~>T=I|VJ`Fu1J`!G{Tpm`3d4^Lpik*NVb!si$s zxB%bBK4Fpk^kUY8jA?JkEu{Yd>+Qm!vVd}6L^4spczr$sJ#rr%3c63b8X2PX5{vPU zo*!?&0`b#szmJEH&sf)=y8#x%NG6LWHSQ0Wp4;QZHuDW;xEY7c4Fy2(#sI|-*mvkZ zh=)-A8t^pxuv^=cnjbxX54xDn-7+3yzTJ2DZ=q_Z-GcsDYSt72I{yG1W3Dmt4-X!h z(6v*p6E(3psHcuT$d2C~@;`4?)2IWC0mL(pABSA|hWXY>9ys@+^wb7e`@G$A{(W`rLjv?3nO2zB zxO=mWzwOB5^44l8fqc7Cl+O?qQ+F5uH{bBv!{x4RYIDT5ndmfNQYY;&2nIIB-d#LA zv~Zyq*T@RBNx`939)LLj@Xr4LJnI>Z7Ewqw$A4JD8;`^@;qlO`fEc~_;&%bR)t``n z0FRb&tW@JV2aaO^R(164@gBWCUmXPXsllkayrV28-#Rc5O`Hgbl)ud0dC?LY?-m?hzcE!-4b8G5BkXoR*V3J{x+ZR>MzPV&OluA1zZMZ&ywOyF#^*Q<9uOU%1Vp z4I^UJx$=J=`i{}#dzH9FoSIbW`tetE-Lj68YBEeyDaX=PM3rNE&&IChwYTNFP(+&C zG#5`oS#4z+M5>?@B#}7?GGd2e>LIS9gt&{7_}DoZ+_lU+gYFH@o0G1W_A>mG!WNHOp-?U{X-09U3AR#> zq_t-EMvR@0QCBie#VY(#q)Y&N3b4uw9bcF_}hidH2hDw9TA;&Vu1Axo8J8j+sYYX0oPitWF@ zR5*)@Il;x#lOik9JWyKM0%zOw8bffbn(mBRfm%&Si&RroA%VklnZiqoYLzGAp-!61 z=kH*i>EQW+9MQ5UEK}5T=>mWfLo{sWO$-}I4)sxzjmP9H?jW^_f0tkx(IIDXEI4mO0gzx!y3M@rSrxQ4;CcfDH%yKgSCKc7aL-0WN&QaQN@nIyQvkR9zB^diY?e^1?t+ zKtuq)NPI`kL&QT~trrGFhDm8ohJ)E(@au+R)hG#ypICr>L9pO(9Y;PJ?X6|RlodE} zwhI$0Wzb{~yT=nx`(97TSNY1}$`$z-0$6y;gm+Pu>F332m8lC{!&=m&c~Kw?gO(^Y zTnzA9cCJJWAO|ORa73@F{m$w>6}IiDtZgoLU}SJSqtS*(jac*roYhB;lkCNceGc*K z1JCzu+E+n)ZL+e%86#VIv%-={s&gR_m1h2*P*<)m4ZQlZNya=iM~|OQxEFE@K`#JR z$rQWA15#+S|LD^%kAgTpM1H}M}NFq+i|^$N)aaH?30ur z9cgC}dyM}8`->3w;KPKi{@kp5*9lO*+^1ytt&Ei6t@kQaY|5b|#uXI~#he4QVjg{w z=T}I*%Q*zjn|BHNWfeqwTFY;!-skhXhuV8##N(FqkiM+5JgWdEh2>zeTdtn8c{1yz zx)<+s`XB5cXSUe6AAS3UaSehiIJb)0D`vYYDkHa#UDfQMkxIt}8{zdM_=A(m7rr)| zGphdp6>&Tj7NF8e$)cxZmyw&~d6ooROu;E zB4zOy6lVe-P#D<}&NH`9hP_M!%*VtU5TY^emeC4%;Or5vm1khbpZ^9{f6ivjq#5h>(ut+ z+P#$fvA8d`M*uk;v%lm%TK0Y&F^VN9N1GV+%Z!MIL$BlhU>eSK#x%$9<&LFUGjtpX z?SbpQuxbSlOncKpz}GrsncNhkfZX0gw`lojKwwmi8UQPe0nSGo2H4M#?}656Y3{*l zv8z=@EAPg?a6U%s*W>4ooqRRwet&PZa6Lk_rhjj>FS1`>gX0o{QR?*IcBdki6x=LW!rKnEZWtZZFF>1C*`8%;;J>1JB}%tyZw=I%6# zR*hac03d%&L9Z5%P7Bb;pL2*CBvQ3Gg5V`I{l-+MV48N1F1WiZ@9nY912#OHJP9{HLIPcSCvRd*U^706- zFPZ9_RCd?m-9Uf;0KK|4(Z=lH03(WZw_4U~odMLu`SFBSHG$%S9lSZA*d8$$au80G zDV34^r3)$3SZ{ym38n&>3Rh<~{wua|Tbmu0{$0y@OTu?cnc}#H zJCG(QivNpexd+xuFmL2B=Q>lzU*@Q zOI;WMok(A8NAvN)ttcl3%K`rY7%|Ib{o*uh{+UQ~e((;H762tw#7M~szyP2a#UP|6 z?hr0S2!EFOIlgwECFsfORCk3_eZ!8$voj%pEGaevrUhdtIj1X0qcKFLh)ulhe473RG!kw-HA$6A9`}axq_5 zNODurA@OCh-S3x>M}5ofW3=3jg9)vob&v)Osc_Ou3p6I&f$GGXy)ao9SF8$QMHMOU z8h_fv1;5+PXN2fp?c{@vtlYcAe1#)qu+%HBRIxCQw{gTxy2SC(pFtr&DsoA_eC=r9 zoiWfWr4{>pD&H=52=>%{-r6}ga)n_9&|8Hii_7{YN3IW%6$x)nt)+l9Ct12 zxL9(pAhL+Y#5!o@>sL{Xo0y59qH8Ksq);C7XF9STAr+(?S8ayESDMi*p$j91S8@;r zW)7<0vuY$ds}B$kDEqoIZkJug-!6B^QrmTtbh&9EQjD<^D;14eHh9@lNL6HZLI5gA zp}vT0?JP=M0+b$+E8K*`+Q3GNBG`mGa&`tv zt_4zRxtmcwT7Exw=l5k?TCp>KNHq6;{{Uy-;ey-eB>U>O@hTP2_T?|a{L1+j=j3if z=H5h{<_fGVdP}@c6}t-6(#=8Q=Xc2yEZtbu6G>L=JpoLmeBo4;Pr!{osyzPy(^AE2 z?KA)bUkvi=f?HX9zZz3l-I*qzf8mI+#PxsfsWTmWtI;_+l~0OcNtQL6li@0q8BS!J zpI;V2r{@fOZt@SLCiX`>nu_4H7lfk_Q7O`D=Qd^BA(~dEtf;sMFGiEqq8{w=I0kzij~= z_WFXz<}cj_`SpZX{{XvFD`Wo1c4&_o`9a6B^u@2I=nww@mE_g!)#mo%t2vP71C-n^ zaE|7AsAKA#$JY6y?XS!L`aPOJPi7W~nNcVLsfk0xdx{`EcOR&AvHt+uj&Y4g>WY5s z7@^0XV(bi)2Q^NbM|0pXXm$2+e1xN%Lt}0m8Axs40k7XM*;Kc zoOzDn(?=T9&5cv~Rr2G$R_za`>BrN#cHif|ur&B!oW0e@LYZs_c?0GmT#2^EaykAQ z#$Fil_`UeRih^&Xq5-ydE(7Jb_-iAlzZlE#$4s9Cl86UD01zL?Vb(AoCN?OkztT9) z+lS%-k?E}X;0M#ny>XEhGCxTCJA^a%{B_}sksUn8JY=G#2W_$$>DS|t)^HXHOwM0w zV{EOE?I;f6jN`B3A+KdmelnsuW^>0gih^&frYXPrM5FoOM||rerd=>EB{TNtU)hav ueElU69~_B#etE_<@4pzLe^JJAwsY8~e6k(Co^h{b?#3w{I{yGXfB)HE`sWz{ diff --git a/frontend/src/images/theme_bg.png b/frontend/src/images/theme_bg.png deleted file mode 100644 index 60f00e75aecdecdd65ea74d49f1bf013a4b22fcc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1631 zcmbVMdrT8|96zu;idLC20h!~{DyXsTU7@|UP^4V1qoD=lG0~COYkSyE+N;;o7K{O; z%hb&AP%}|C#mDA0nLMU*n+!%=zz0(Xia5m0IJY5=i8^0EcSY*9#Q4W9x!m{ryYJ`o zeg8IRroYAsnG*s407sLm%3{6}=1mL^1OUGkeMNjmiKMYSI-4w@oj64RN)u@yK#dh& zMPw1Usc6kKtH)`$IVKCmluYQt?Lt@p39VLdUK7?1I*a%x zjOSWAa*FJPFpF@IYbhhsj{=?#%+&71j=Y9UH1Z6}!ZZahRFTHDR>DSWR0=NhM_{s; zSx=Wl|BQ zVz^{Te4G!fu{mhmW+Z%mEsWnuY|0CnqaIJRYE60mbOZVb9A*QoP+nzaTkUW-??Q#A;dK6) zJ9FIQEdK)VrgDVWu|5%O@n?lz-g{#Iv~ch@-Ijj&wD^rFxvYquqnfUJ<6}=Sz|Sr0 z`}sJ>++EVV@JI9T7fW>qcGVwLWQofL*=kT9^aD6L)m?UT6oqT5s@RLp2UZ6KgZ4|n zqT(~jL9PDA%3XD-0bws6qWRrwe$=tTp2nqTTd|}gbl{F{`N`*kzI)}u@te`$`1DhI z%O1`OEtxX-h{M0Qyms(Jtu-@!-iDI0hq0k0e%EItkM4LW?QBTQU(s6@S`NY729F<0 z-`<}KxbX#79_Q`pA1iLjSRf5f!RG%Gwnx4oq>ZzEotgSQlgg;J9=LXLZg<`HMYn1O zW^^uV)_SytncH@rnim6a)(rI;1a9cnXt!*5sQvEc_Mi3zg{?UG&DJfm_qBoev4*P7 z>e5Z`o}6B9J{);^cVDj-{veIdy1uV+>jq&TJu>%8@v#wEqhuu*@u1T1N!nGF>LcLx zu5Uxip-`36$R8^mcga?wdU;_3(&pQ5cYZiJYf;BFUPi^9*u$5vHzkbZ-U#M&)KpA)Y{>0W?0%r_ znSY<%c<|$dKEof`VoQE_?RW&9QGUg`Y0MGc)}1_4N=ka_sMs{*$>7!-9CzK_=A`$? l^Vpq8sqx&5dq+FqW}vt8Pjkha Date: Wed, 29 Mar 2017 14:12:14 +0100 Subject: [PATCH 089/296] Merge root less with module less --- frontend/src/core/less/app.less | 18 +- frontend/src/{ => core}/less/buttons.less | 0 frontend/src/{ => core}/less/fonts.less | 0 frontend/src/core/less/sharedStyles.less | 10 +- frontend/src/less/editor.less | 30 -- frontend/src/less/global.less | 6 - frontend/src/less/globalMenu.less | 13 - frontend/src/less/location.less | 16 - frontend/src/less/menuEditor.less | 78 ----- frontend/src/less/menuSelect.less | 26 -- frontend/src/less/navigation.less | 42 --- frontend/src/less/options.less | 34 --- frontend/src/less/pageEditor.less | 109 ------- frontend/src/less/project.less | 26 -- frontend/src/less/sidebar.less | 69 ----- frontend/src/less/themeSelect.less | 26 -- frontend/src/less/user.less | 7 - .../editor/contentObject/less/editorMenu.less | 83 +++++- .../editor/contentObject/less/editorPage.less | 176 ++++++++--- .../less/editorPageComponentList.less | 18 +- .../editor/extensions/less/extensions.less | 2 +- .../modules/editor/global/less/editor.less | 28 ++ .../menuSettings/less/menusettings.less | 37 ++- .../editor/selectTheme/less/editorTheme.less | 28 +- .../modules/globalMenu/less/globalMenu.less | 129 ++++++-- .../src/modules/location/less/location.less | 16 + .../modules/navigation/less/navigation.less | 100 ++----- .../navigation/templates/navigation.hbs | 2 +- .../notify/plugins/alert/less/alert.less | 2 +- .../src/modules/options/less/options.less | 58 +++- .../src/modules/projects/views/projectView.js | 2 +- .../src/{ => modules/scaffold}/less/tags.less | 0 .../src/modules/sidebar/less/sidebar.less | 280 +++++++++++------- 33 files changed, 700 insertions(+), 771 deletions(-) rename frontend/src/{ => core}/less/buttons.less (100%) rename frontend/src/{ => core}/less/fonts.less (100%) delete mode 100644 frontend/src/less/editor.less delete mode 100644 frontend/src/less/global.less delete mode 100644 frontend/src/less/globalMenu.less delete mode 100644 frontend/src/less/location.less delete mode 100644 frontend/src/less/menuEditor.less delete mode 100644 frontend/src/less/menuSelect.less delete mode 100644 frontend/src/less/navigation.less delete mode 100644 frontend/src/less/options.less delete mode 100644 frontend/src/less/pageEditor.less delete mode 100644 frontend/src/less/project.less delete mode 100644 frontend/src/less/sidebar.less delete mode 100644 frontend/src/less/themeSelect.less delete mode 100644 frontend/src/less/user.less rename frontend/src/{ => modules/scaffold}/less/tags.less (100%) diff --git a/frontend/src/core/less/app.less b/frontend/src/core/less/app.less index 62cf807a0e..991fb4e013 100644 --- a/frontend/src/core/less/app.less +++ b/frontend/src/core/less/app.less @@ -1,7 +1,14 @@ +@import 'variables'; + html { overflow-y: hidden; } +body { + background-color:@ui-content-color; + color:@sidebar-color; +} + #app { margin-top:60px; margin-left:250px; @@ -12,7 +19,7 @@ html { } span.error { - color: red; + color: @alert-color; } // Loading overlay styling @@ -28,7 +35,8 @@ span.error { text-align: center; opacity:1; transition: opacity 0.3s; - background-color:#F3FCFE; + background-color: @ui-content-color; + &.fade-out { opacity: 0; } @@ -43,7 +51,7 @@ span.error { .loading-inner { margin-top: 25%; } - + @loading-icon-size: 8px; .loading-logo { @@ -91,10 +99,10 @@ span.error { } @keyframes sk-bouncedelay { - 0%, 80%, 100% { + 0%, 80%, 100% { -webkit-transform: scale(0); transform: scale(0); - } 40% { + } 40% { -webkit-transform: scale(1.0); transform: scale(1.0); } diff --git a/frontend/src/less/buttons.less b/frontend/src/core/less/buttons.less similarity index 100% rename from frontend/src/less/buttons.less rename to frontend/src/core/less/buttons.less diff --git a/frontend/src/less/fonts.less b/frontend/src/core/less/fonts.less similarity index 100% rename from frontend/src/less/fonts.less rename to frontend/src/core/less/fonts.less diff --git a/frontend/src/core/less/sharedStyles.less b/frontend/src/core/less/sharedStyles.less index ac0e76040f..e0b873c946 100644 --- a/frontend/src/core/less/sharedStyles.less +++ b/frontend/src/core/less/sharedStyles.less @@ -15,4 +15,12 @@ white-space: nowrap; text-overflow: ellipsis; width: 90%; -} \ No newline at end of file +} + +.no-select { + -webkit-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + cursor: default; +} diff --git a/frontend/src/less/editor.less b/frontend/src/less/editor.less deleted file mode 100644 index fc15db865f..0000000000 --- a/frontend/src/less/editor.less +++ /dev/null @@ -1,30 +0,0 @@ -@import 'variables'; - -.editor-item-settings, -.editor-menu-item-settings { - a { - color:@primary-color; - transition: all 0.3s; - - &:hover { - color:darken(@primary-color,5%); - } - } -} - -.syncing { - transform: scale(0.8, 0.8); - opacity:0.6; -} - -.synced { - transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; - transform: scale(1, 1); - opacity:1; -} - -.not-synced { - transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; - transform: scale(0.4, 0.4); - opacity:0; -} diff --git a/frontend/src/less/global.less b/frontend/src/less/global.less deleted file mode 100644 index 22f9934695..0000000000 --- a/frontend/src/less/global.less +++ /dev/null @@ -1,6 +0,0 @@ -@import 'variables'; - -body { - background-color:@ui-content-color; - color:@sidebar-color; -} \ No newline at end of file diff --git a/frontend/src/less/globalMenu.less b/frontend/src/less/globalMenu.less deleted file mode 100644 index 6ba5eef1c7..0000000000 --- a/frontend/src/less/globalMenu.less +++ /dev/null @@ -1,13 +0,0 @@ -@import 'variables'; - -.global-menu { - background-color:@primary-color; - a { - color:@navigation-text-color; - border-bottom:1px solid lighten(@primary-color, 10%); - &:hover { - background-color:lighten(@primary-color, 10%); - color:@navigation-text-color; - } - } -} diff --git a/frontend/src/less/location.less b/frontend/src/less/location.less deleted file mode 100644 index a2b9a5f5f7..0000000000 --- a/frontend/src/less/location.less +++ /dev/null @@ -1,16 +0,0 @@ -@import 'variables'; -@import 'fonts.less'; - -.location-title { - font-family: @font-title; - background-color:@location-background-color; - border-bottom: 1px solid fade(@primary-color, 20%); -} - -.location-title-inner { - font-size: 17px; - font-weight:600; - line-height: 20px; - padding:25px; - color:@location-title; -} diff --git a/frontend/src/less/menuEditor.less b/frontend/src/less/menuEditor.less deleted file mode 100644 index de48500ce6..0000000000 --- a/frontend/src/less/menuEditor.less +++ /dev/null @@ -1,78 +0,0 @@ -@import 'variables'; - -.editor-menu-item { - - background-color: #fff; - transition: box-shadow 0.3s; - box-shadow: 0px 0px 1px 1px #EEE; - &:hover { - box-shadow: 0px 0px 3px 3px #e0e0e0; - cursor: pointer; - .project-settings { - top:0%; - opacity:1; - } - } - - &.expanded { - - .editor-menu-item-inner { - color:#fff; - background-color: @primary-color; - transition:background-color 0s; - border:1px solid @primary-color; - } - - &.content-type-menu .editor-menu-item-pin { - border-left: 10px solid @primary-color; - } - - .editor-menu-item-settings { - a { - color:#fff; - transition:all 0.3s; - &:hover { - color:darken(#fff, 10%); - } - } - } - } - - &.selected { - - .editor-menu-item-inner { - color:#fff; - background-color: @primary-color; - border:1px solid @primary-color; - } - - &.content-type-menu .editor-menu-item-pin { - border-left: 10px solid @primary-color; - } - - .editor-menu-item-settings { - a { - color:#fff; - transition:all 0.3s; - &:hover { - color:darken(#fff, 10%); - } - } - } - } -} - -.editor-menu-layer-actions { - .primary-hollow { - i{ - color: @primary-color; - } - &:hover, - &:active, - &:focus { - i { - color: @white; - } - } - } -} diff --git a/frontend/src/less/menuSelect.less b/frontend/src/less/menuSelect.less deleted file mode 100644 index 937bf4dcbe..0000000000 --- a/frontend/src/less/menuSelect.less +++ /dev/null @@ -1,26 +0,0 @@ -@import 'variables'; - -.menu-settings-list-item { - font-weight: 100; - background-color:#fff; - border: 1px solid #d6f2f9; - transition:background-color 0.3s; - transition:all 0.3s; - &:hover { - box-shadow: 0 0 5px 2px #CBE1E6; - } - &.selected { - background-color: @primary-color; - color: @button-primary-text-color; - .name { - color: #d6f2f9; - } - } - .display-name { - font-size: 175%; - } - .description { - font-size: 110%; - color: #a6c2ca; - } -} diff --git a/frontend/src/less/navigation.less b/frontend/src/less/navigation.less deleted file mode 100644 index 791132d7ee..0000000000 --- a/frontend/src/less/navigation.less +++ /dev/null @@ -1,42 +0,0 @@ -@import 'variables'; -@import 'fonts.less'; - -.navigation { - background:url("assets/top-bar-1080.jpg"); - @media (min-width: 1920px) { - background:url("assets/top-bar-2560.jpg"); - } - background-position: right; - border-bottom:1px solid rgba(0,0,0,0.15); - font-size: 15px; - font-family: @font-title; -} - -.navigation-item { - color:@navigation-text-color; -} - -.navigation-left { - .navigation-product-name { - -webkit-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - cursor: default; - } -} - -.navigation-right { - .navigation-user-logout { - padding: 0px 25px; - } - a { - // transition:all 0.3s; - &:hover { - text-decoration: underline; - &.navigation-user-logout { - text-decoration: none; - } - } - } -} \ No newline at end of file diff --git a/frontend/src/less/options.less b/frontend/src/less/options.less deleted file mode 100644 index cba70e467d..0000000000 --- a/frontend/src/less/options.less +++ /dev/null @@ -1,34 +0,0 @@ -@import 'variables'; - -.options { - a { - color:@option-color; - margin-left:30px; - &:hover { - transition:color 0.3s; - color:@option-hover-color; - } - &.selected { - transition:color 0.3s; - color:@option-selected-color; - } - } - - &-group { - float:left; - padding:4px 0px; - // border-left:1px solid darken(#e0e8f7, 20%); - i { - font-size: 18px; - } - } -} - -.option-value-item { - display: inline-block; - padding-right: 20px; -} - -.option-value-title { - margin-left: 15px; -} diff --git a/frontend/src/less/pageEditor.less b/frontend/src/less/pageEditor.less deleted file mode 100644 index d84dd100a1..0000000000 --- a/frontend/src/less/pageEditor.less +++ /dev/null @@ -1,109 +0,0 @@ -@import 'variables'; - -.page { - .paste-zone { - margin: 0 0 30px 0; - &-inner { - text-align: center; - padding: 0; - } - .btn { - padding: 12px 60px; - margin: 0 10px; - } - } - .page-components .paste-zone a { - padding: 7px 35px; - margin: 20px 0 0 0; - } -} - - -.editing-overlay-component-option { - background-color:#e8e8e8; - transition:background-color 0.2s; - &:hover { - background-color:darken(#e8e8e8, 10%); - } - &.selected { - background-color:darken(#e8e8e8, 20%); - } -} - -.editing-overlay-component-layout-option { - border:none; - border-right:1px solid #b7caed; - padding:0px 10px; - float:left; - background-color:#fff; - color:#3e4960; - transition:all 0.2s; - &:hover { - color:#fff; - background-color:lighten(@secondary-color, 20%); - } - &.selected { - color:#fff; - background-color:@secondary-color; - } -} - -.article, -.block, -.component { - &.hovering { - box-shadow: 0px 0px 5px 2px #CBE1E6; - position:relative; - } -} - -.block .add-control { - padding: 0 5px 5px 5px; -} - -.add-control { - .add-article, .add-block, .add-component { - font-size: 16px; - font-weight: 600; - width: 100%; - padding: 0; - line-height: 50px; - text-align: center; - color: @primary-color; - border: 1px dashed @primary-color; - transition: all 0s; - - &.add-article { - background-color:#F6FBFE; - margin-bottom: 50px; - } - - &.add-block { - background-color:#EAF8FB; - width: 96%; - margin: 0 2% 10px; - } - - &.add-component { - background-color: #D6F3F9; - &.left, - &.right { - width: 48%; - position: relative; - top: -100px; - float: left; - } - &.right { - float: right; - } - } - - &:hover, &:focus { - padding: 0; - line-height: 50px; - text-align: center; - color: @primary-color; - border: 1px solid @primary-color; - } - } -} diff --git a/frontend/src/less/project.less b/frontend/src/less/project.less deleted file mode 100644 index 7ccf845e70..0000000000 --- a/frontend/src/less/project.less +++ /dev/null @@ -1,26 +0,0 @@ -@import 'variables'; -@import 'buttons.less'; - -.project-list-item { - background-color:@white; - color:#9d9d9d; - text-align:center; - &.selected { - .projects-details-label, .project-detail-title-inner { - color:#fff; - } - .projects-details-tags-button, - .projects-details-value { - button { - .white-hollow; - } - } - } - .open-context-icon { - float:left; - } - - .project-detail-title-inner, .project-settings a { - color: @primary-color; - } -} \ No newline at end of file diff --git a/frontend/src/less/sidebar.less b/frontend/src/less/sidebar.less deleted file mode 100644 index 2acc9ae70b..0000000000 --- a/frontend/src/less/sidebar.less +++ /dev/null @@ -1,69 +0,0 @@ -@import 'variables'; -@import 'buttons.less'; - -// Used for editing the color of buttons in the sdiebar - -.sidebar { - background-color:@sidebar-color; - color:@sidebar-text-color; - a { - transition:all 0.3s; - color:@sidebar-text-color; - &:hover, &:focus { - color:darken(@sidebar-text-color, 10%); - } - } - button { - &[class^="action-"], - &[class*=" action-"] { - margin: 5px 25px; - width: 200px; - height: 50px; - border-width: 1px; - border-style: solid; - border-radius:@button-radius; - font-size: 15px; - text-align: center; - i { - margin-right: 5px; - } - } - } - - .sidebar-item-title { - background-color:@sidebar-color; - color:@sidebar-title-text-color; - } - - - .sidebar-progress { - z-index: 1; - width: 0px; - height:100%; - position: absolute; - background: darken(@secondary-color, 10%); - left: 0px; - top: 0px; - opacity: 0.3; - } - - .sidebar-row, .sidebar-breadcrumb { - button, a { - margin: 0; - color:@sidebar-text-color; - transition:all 0.3s; - &:hover { - color:@sidebar-item-hover-text-color; - } - } - } - - .sidebar-divide { - background-color:@sidebar-color; - h3 { - font-size:13px; - font-weight:600; - } - } - -} \ No newline at end of file diff --git a/frontend/src/less/themeSelect.less b/frontend/src/less/themeSelect.less deleted file mode 100644 index b75d785fbd..0000000000 --- a/frontend/src/less/themeSelect.less +++ /dev/null @@ -1,26 +0,0 @@ -@import 'variables'; - -.theme-list-item { - font-weight: 100; - background-color:#fff; - transition:background-color 0.3s; - transition:all 0.3s; - border: 1px solid #d6f2f9; - &:hover { - box-shadow: 0 0 5px 2px #CBE1E6; - } - &.selected { - background-color: @primary-color; - color: @button-primary-text-color; - .description { - color: #d6f2f9; - } - } - .display-name { - font-size: 175%; - } - .description { - font-size: 110%; - color: #a6c2ca; - } -} diff --git a/frontend/src/less/user.less b/frontend/src/less/user.less deleted file mode 100644 index 134a93f525..0000000000 --- a/frontend/src/less/user.less +++ /dev/null @@ -1,7 +0,0 @@ -@import 'variables'; - -.module-user { - &.location-login { - background-color:@ui-content-color; - } -} \ No newline at end of file diff --git a/frontend/src/modules/editor/contentObject/less/editorMenu.less b/frontend/src/modules/editor/contentObject/less/editorMenu.less index e442ede118..e7ba812132 100644 --- a/frontend/src/modules/editor/contentObject/less/editorMenu.less +++ b/frontend/src/modules/editor/contentObject/less/editorMenu.less @@ -1,5 +1,84 @@ +@import 'variables'; + .editor-menu { - &-inner { - height:100%; + &-inner { + height:100%; + } +} + +.editor-menu-item { + + background-color: #fff; + transition: box-shadow 0.3s; + box-shadow: 0px 0px 1px 1px #EEE; + &:hover { + box-shadow: 0px 0px 3px 3px #e0e0e0; + cursor: pointer; + .project-settings { + top:0%; + opacity:1; + } + } + + &.expanded { + + .editor-menu-item-inner { + color:#fff; + background-color: @primary-color; + transition:background-color 0s; + border:1px solid @primary-color; + } + + &.content-type-menu .editor-menu-item-pin { + border-left: 10px solid @primary-color; + } + + .editor-menu-item-settings { + a { + color:#fff; + transition:all 0.3s; + &:hover { + color:darken(#fff, 10%); + } + } + } + } + + &.selected { + + .editor-menu-item-inner { + color:#fff; + background-color: @primary-color; + border:1px solid @primary-color; + } + + &.content-type-menu .editor-menu-item-pin { + border-left: 10px solid @primary-color; + } + + .editor-menu-item-settings { + a { + color:#fff; + transition:all 0.3s; + &:hover { + color:darken(#fff, 10%); + } + } + } + } +} + +.editor-menu-layer-actions { + .primary-hollow { + i{ + color: @primary-color; + } + &:hover, + &:active, + &:focus { + i { + color: @white; + } } + } } diff --git a/frontend/src/modules/editor/contentObject/less/editorPage.less b/frontend/src/modules/editor/contentObject/less/editorPage.less index 132fcbb81e..c70668b883 100644 --- a/frontend/src/modules/editor/contentObject/less/editorPage.less +++ b/frontend/src/modules/editor/contentObject/less/editorPage.less @@ -1,56 +1,164 @@ -.page-edit-button { - font-size:16px; - text-decoration: none; - color: #34bee0; - transition: all 0.3s; +@import 'variables'; + +.page { + .paste-zone { + margin: 0 0 30px 0; + &-inner { + text-align: center; + padding: 0; + } + .btn { + padding: 12px 60px; + margin: 0 10px; + } + } + .page-components .paste-zone a { + padding: 7px 35px; + margin: 20px 0 0 0; + } +} + +.editing-overlay-component-option { + background-color:#e8e8e8; + transition:background-color 0.2s; + &:hover { + background-color:darken(#e8e8e8, 10%); + } + &.selected { + background-color:darken(#e8e8e8, 20%); + } +} + +.editing-overlay-component-layout-option { + border:none; + border-right:1px solid #b7caed; + padding:0px 10px; + float:left; + background-color:#fff; + color:#3e4960; + transition:all 0.2s; &:hover { - color:#15a4fa; + color:#fff; + background-color:lighten(@secondary-color, 20%); + } + &.selected { + color:#fff; + background-color:@secondary-color; } } +.article, +.block, +.component { + &.hovering { + box-shadow: 0px 0px 5px 2px #CBE1E6; + position:relative; + } +} + +.block .add-control { + padding: 0 5px 5px 5px; +} + +.add-control { + .add-article, .add-block, .add-component { + font-size: 16px; + font-weight: 600; + width: 100%; + padding: 0; + line-height: 50px; + text-align: center; + color: @primary-color; + border: 1px dashed @primary-color; + transition: all 0s; + + &.add-article { + background-color:#F6FBFE; + margin-bottom: 50px; + } + + &.add-block { + background-color:#EAF8FB; + width: 96%; + margin: 0 2% 10px; + } + + &.add-component { + background-color: #D6F3F9; + &.left, + &.right { + width: 48%; + position: relative; + top: -100px; + float: left; + } + &.right { + float: right; + } + } + + &:hover, &:focus { + padding: 0; + line-height: 50px; + text-align: center; + color: @primary-color; + border: 1px solid @primary-color; + } + } +} + + +.page-edit-button { + font-size:16px; + text-decoration: none; + color: #34bee0; + transition: all 0.3s; + &:hover { + color:#15a4fa; + } +} + .page-inner { - padding:30px; - .editor-item-settings { - top: 9px; - left: 5px; - [class$="-delete"], [class*="-delete "] { - position: absolute; - right: 20px - } + padding:30px; + .editor-item-settings { + top: 9px; + left: 5px; + [class$="-delete"], + [class*="-delete "] { + position: absolute; + right: 20px } + } } .page-detail { - position: relative; - height: 100%; - background-color: white; - padding: 15px; - border: 1px solid #D2E4E6; - cursor: pointer; - &:hover { - box-shadow: 0px 0px 5px 2px #CBE1E6; - } + position: relative; + height: 100%; + background-color: white; + padding: 15px; + border: 1px solid #D2E4E6; + cursor: pointer; + &:hover { + box-shadow: 0px 0px 5px 2px #CBE1E6; + } } .editor-inner { - > .page { + > .page { .title { - font-size: 16px; - font-weight: 400; + font-size: 16px; + font-weight: 400; } - .description { - font-size: 16px; + font-size: 16px; } - .page-edit-panel { - position: absolute; - right: 0; - top: 0; + position: absolute; + right: 0; + top: 0; } - .page-articles { - margin:20px 0px; + margin:20px 0px; } } } diff --git a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less index 3403407748..f558041d77 100644 --- a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less +++ b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less @@ -1,3 +1,5 @@ +@import 'variables'; + .editor-component-list { .click-capture { width: 100vw; @@ -8,10 +10,6 @@ top:0px; // to avoid flicker when first rendered right:-100vw; - /* - left:0px; - width:100%; - */ height:100%; z-index:500; @@ -38,7 +36,7 @@ &-sidebar-header { border-bottom: 1px solid #CCCCCC; } - + &-sidebar-title-inner { padding:20px 20px 0px; font-weight: 700; @@ -142,7 +140,7 @@ } &:hover { - background-color:#f3fcfe; + background-color: @ui-content-color; } &-inner { @@ -154,18 +152,16 @@ &-display-name { font-weight:600; } - + &-version, &-name { margin-top:6px; font-size:11px; } &-overlay { - //position:absolute; top:0; width:100%; height:100%; - //background-color:rgba(156, 171, 196, 0.8); } &-overlay-inner { @@ -205,10 +201,10 @@ &.adapt-contrib- { &assessmentResults { background-image: url("assets/component-icons/assessment.png"); - } + } &blank { background-image: url("assets/component-icons/blank.png"); - } + } &accordion { background-image: url("assets/component-icons/accordion.png"); } diff --git a/frontend/src/modules/editor/extensions/less/extensions.less b/frontend/src/modules/editor/extensions/less/extensions.less index 265914f48d..5be86fcedd 100644 --- a/frontend/src/modules/editor/extensions/less/extensions.less +++ b/frontend/src/modules/editor/extensions/less/extensions.less @@ -1,4 +1,4 @@ -@import '../../../../less/fonts.less'; +@import 'fonts'; .extension-checkbox-column { vertical-align: middle; diff --git a/frontend/src/modules/editor/global/less/editor.less b/frontend/src/modules/editor/global/less/editor.less index 52a58b9d3b..d91ee671ae 100644 --- a/frontend/src/modules/editor/global/less/editor.less +++ b/frontend/src/modules/editor/global/less/editor.less @@ -1,3 +1,5 @@ +@import 'variables'; + .editor-view { .editor-container { @@ -124,6 +126,15 @@ } } +.editor-item-settings a, +.editor-menu-item-settings a { + color:@primary-color; + transition: all 0.3s; + &:hover { + color:darken(@primary-color,5%); + } +} + i.asset-selector { cursor: pointer; padding-left: 10px; @@ -137,3 +148,20 @@ i.asset-clear { .sweet-alert .key { font-weight: bold; } + +.syncing { + transform: scale(0.8, 0.8); + opacity:0.6; +} + +.synced { + transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; + transform: scale(1, 1); + opacity:1; +} + +.not-synced { + transition:transform 0.3s cubic-bezier(0.8, 0.0, 0.2, 1), opacity 0.3s cubic-bezier(0.8, 0.0, 0.2, 1)!important; + transform: scale(0.4, 0.4); + opacity:0; +} diff --git a/frontend/src/modules/editor/menuSettings/less/menusettings.less b/frontend/src/modules/editor/menuSettings/less/menusettings.less index 78faa5a9aa..45c6ac4ff0 100644 --- a/frontend/src/modules/editor/menuSettings/less/menusettings.less +++ b/frontend/src/modules/editor/menuSettings/less/menusettings.less @@ -1,3 +1,19 @@ +@import 'variables'; + +.menu-settings-list-item { + + + .display-name { + font-size: 175%; + } + .description { + font-size: 110%; + color: #a6c2ca; + } +} + + + .menu-settings-list { padding-left: 30px; padding-top: 30px; @@ -13,15 +29,28 @@ overflow: hidden; border-radius: 3px; float: left; + font-weight: 100; + background-color:#fff; + border: 1px solid #d6f2f9; + transition:background-color 0.3s; + transition:all 0.3s; + &:hover { - cursor: pointer; - } - &-inner { - padding: 20px; + cursor: pointer; + box-shadow: 0 0 5px 2px #CBE1E6; } &.selected { + background-color: @primary-color; + color: @button-primary-text-color; + .name { + color: #d6f2f9; + } .description { color: white; } } + + &-inner { + padding: 20px; + } } diff --git a/frontend/src/modules/editor/selectTheme/less/editorTheme.less b/frontend/src/modules/editor/selectTheme/less/editorTheme.less index 4431615a7d..766556698b 100644 --- a/frontend/src/modules/editor/selectTheme/less/editorTheme.less +++ b/frontend/src/modules/editor/selectTheme/less/editorTheme.less @@ -1,3 +1,5 @@ +@import 'variables'; + .theme-list { padding-left: 30px; padding-top: 30px; @@ -13,18 +15,38 @@ overflow: hidden; border-radius: 3px; float: left; + font-weight: 100; + background-color:#fff; + transition:background-color 0.3s; + transition:all 0.3s; + border: 1px solid #d6f2f9; + &.selected { + background-color: @primary-color; + color: @button-primary-text-color; + .description { + color: #d6f2f9; + } + } &:hover { - cursor: pointer; + cursor: pointer; + box-shadow: 0 0 5px 2px #CBE1E6; } &-inner { padding: 20px; - .theme-header { padding-bottom: 30px; } } + + .display-name { + font-size: 175%; + } + .description { + font-size: 110%; + color: #a6c2ca; + } } .theme-palette { @@ -34,7 +56,7 @@ width: 60px; float: left; position: relative; - background: url(/images/theme_bg.png) top left no-repeat; + background: url(/css/assets/theme_bg.png) top left no-repeat; margin-left: 0; margin-right: 18px; diff --git a/frontend/src/modules/globalMenu/less/globalMenu.less b/frontend/src/modules/globalMenu/less/globalMenu.less index a93c440e50..66f9854b97 100644 --- a/frontend/src/modules/globalMenu/less/globalMenu.less +++ b/frontend/src/modules/globalMenu/less/globalMenu.less @@ -1,36 +1,113 @@ +@import 'variables'; + .global-menu { + display:none; + top:61px; + position:absolute; + width:260px; + background-color:@primary-color; + + a { + display:block; + color:@navigation-text-color; + text-decoration: none; + border-bottom:1px solid lighten(@primary-color, 10%); + &:hover { + background-color:lighten(@primary-color, 10%); + color:@navigation-text-color; + } + } + + .global-menu-inner { + border-left: 1px solid rgba(0,0,0,0.1); + border-right: 1px solid rgba(0,0,0,0.1); + } + + .global-menu-submenu { display:none; - top:61px; - position:absolute; width:260px; - a { - display:block; - text-decoration: none; - } + position:absolute; + background-color:#FFF; + border-top:1px solid #FFF; + border-left:1px solid #FFF; + } - .global-menu-inner { - border-left: 1px solid rgba(0,0,0,0.1); - border-right: 1px solid rgba(0,0,0,0.1); - } + .global-menu-item-inner { + padding:14px 18px; + } - .global-menu-submenu { - display:none; - width:260px; - position:absolute; - background-color:#FFF; - border-top:1px solid #FFF; - border-left:1px solid #FFF; - } + .global-menu-item-text-inner { + color: white; + } +} - .global-menu-item { +#global-menu-icon { + width: 30px; + position: relative; + -webkit-transform: rotate(0deg); + -moz-transform: rotate(0deg); + -o-transform: rotate(0deg); + transform: rotate(0deg); + -webkit-transition: .5s ease-in-out; + -moz-transition: .5s ease-in-out; + -o-transition: .5s ease-in-out; + transition: .5s ease-in-out; + cursor: pointer; +} - } +#global-menu-icon span { + display: block; + position: absolute; + height: 2px; + width: 22px; + background: #fff; + border-radius: 5px; + -webkit-transform-origin: left center; + -moz-transform-origin: left center; + -o-transform-origin: left center; + transform-origin: left center; + -webkit-transition: .25s ease-in-out; + -moz-transition: .25s ease-in-out; + -o-transition: .25s ease-in-out; + transition: .25s ease-in-out; +} - .global-menu-item-inner { - padding:14px 18px; - } +#global-menu-icon.open span{ + height: 12px; + width: 12px; + -webkit-transform: rotate(45deg); + -moz-transform: rotate(45deg); + -o-transform: rotate(45deg); + transform: rotate(45deg); + border-radius: 0; +} - .global-menu-item-text-inner { - color: white; - } +#global-menu-icon span:nth-child(1) { + top: 12px; + left: 10px; +} + +#global-menu-icon span:nth-child(2) { + top: 19px; + left: 10px; +} + +#global-menu-icon span:nth-child(3) { + top: 26px; + left: 10px; +} + +#global-menu-icon.open span:nth-child(1) { + top: 6px; + left: 15px; +} + +#global-menu-icon.open span:nth-child(2) { + top: 14px; + left: 23px; +} + +#global-menu-icon.open span:nth-child(3) { + top: 14px; + left: 7px; } diff --git a/frontend/src/modules/location/less/location.less b/frontend/src/modules/location/less/location.less index e69de29bb2..ec27554522 100644 --- a/frontend/src/modules/location/less/location.less +++ b/frontend/src/modules/location/less/location.less @@ -0,0 +1,16 @@ +@import 'variables'; +@import 'fonts'; + +.location-title { + font-family: @font-title; + background-color:@location-background-color; + border-bottom: 1px solid fade(@primary-color, 20%); +} + +.location-title-inner { + font-size: 17px; + font-weight:600; + line-height: 20px; + padding:25px; + color:@location-title; +} diff --git a/frontend/src/modules/navigation/less/navigation.less b/frontend/src/modules/navigation/less/navigation.less index 3302e92856..b700c6a181 100644 --- a/frontend/src/modules/navigation/less/navigation.less +++ b/frontend/src/modules/navigation/less/navigation.less @@ -1,3 +1,7 @@ +@import 'variables'; +@import 'fonts'; +@import 'sharedStyles'; + .navigation { position:fixed; top:0px; @@ -5,6 +9,14 @@ width:100%; height:60px; z-index:500; + background:url("assets/top-bar-1080.jpg"); + @media (min-width: 1920px) { + background:url("assets/top-bar-2560.jpg"); + } + background-position: right; + border-bottom:1px solid rgba(0,0,0,0.15); + font-size: 15px; + font-family: @font-title; } .navigation-inner { @@ -18,6 +30,7 @@ text-decoration:none; margin:0px; padding:0px 20px; + color:@navigation-text-color; .navigation-left & { float:left; } @@ -26,6 +39,9 @@ .navigation-left { width:50%; float:left; + .navigation-product-name { + .no-select; + } } .navigation-right { @@ -33,79 +49,21 @@ padding-right: 20px; float:right; text-align:right; + + .navigation-user-logout { + padding: 0px 25px; + } + + a { + &:hover { + text-decoration: underline; + &.navigation-user-logout { + text-decoration: none; + } + } + } } .navigation-loginas-background { background:#aa3141; } - -#global-menu-icon { - width: 30px; - position: relative; - -webkit-transform: rotate(0deg); - -moz-transform: rotate(0deg); - -o-transform: rotate(0deg); - transform: rotate(0deg); - -webkit-transition: .5s ease-in-out; - -moz-transition: .5s ease-in-out; - -o-transition: .5s ease-in-out; - transition: .5s ease-in-out; - cursor: pointer; -} - -#global-menu-icon span { - display: block; - position: absolute; - height: 2px; - width: 22px; - background: #fff; - border-radius: 5px; - -webkit-transform-origin: left center; - -moz-transform-origin: left center; - -o-transform-origin: left center; - transform-origin: left center; - -webkit-transition: .25s ease-in-out; - -moz-transition: .25s ease-in-out; - -o-transition: .25s ease-in-out; - transition: .25s ease-in-out; -} - -#global-menu-icon.open span{ - height: 12px; - width: 12px; - -webkit-transform: rotate(45deg); - -moz-transform: rotate(45deg); - -o-transform: rotate(45deg); - transform: rotate(45deg); - border-radius: 0; -} - -#global-menu-icon span:nth-child(1) { - top: 12px; - left: 10px; -} - -#global-menu-icon span:nth-child(2) { - top: 19px; - left: 10px; -} - -#global-menu-icon span:nth-child(3) { - top: 26px; - left: 10px; -} - -#global-menu-icon.open span:nth-child(1) { - top: 6px; - left: 15px; -} - -#global-menu-icon.open span:nth-child(2) { - top: 14px; - left: 23px; -} - -#global-menu-icon.open span:nth-child(3) { - top: 14px; - left: 7px; -} diff --git a/frontend/src/modules/navigation/templates/navigation.hbs b/frontend/src/modules/navigation/templates/navigation.hbs index 4240002782..21c8e6b346 100644 --- a/frontend/src/modules/navigation/templates/navigation.hbs +++ b/frontend/src/modules/navigation/templates/navigation.hbs @@ -34,4 +34,4 @@ {{/if}}

-
\ No newline at end of file +
diff --git a/frontend/src/modules/notify/plugins/alert/less/alert.less b/frontend/src/modules/notify/plugins/alert/less/alert.less index 762bb15d2e..788c59dcf4 100644 --- a/frontend/src/modules/notify/plugins/alert/less/alert.less +++ b/frontend/src/modules/notify/plugins/alert/less/alert.less @@ -1,5 +1,5 @@ @import (inline) '../assets/sweetalert.css'; -@import '../../../../../less/buttons'; +@import 'buttons'; .sweet-alert { max-height: 91%; diff --git a/frontend/src/modules/options/less/options.less b/frontend/src/modules/options/less/options.less index a1f2455b9d..cbc66d28a0 100644 --- a/frontend/src/modules/options/less/options.less +++ b/frontend/src/modules/options/less/options.less @@ -1,20 +1,46 @@ +@import 'variables'; + .options { - position:absolute; - top:63px; - right:0px; + position:absolute; + top:63px; + right:0px; + + &-inner { + padding:13px; + } + + &-group { + float:left; + padding:4px 0px; + i { + font-size: 18px; + } + } - &-inner { - padding:13px; - } + a { + margin-left:10px; + margin-right:10px; + text-decoration: none; + text-align:center; + color:@option-color; + + &:hover { + transition:color 0.3s; + color:@option-hover-color; + } + &.selected { + transition:color 0.3s; + color:@option-selected-color; + } + + i { + margin-right:4px; + margin-bottom:3px; + } + } +} - a { - margin-left:10px; - margin-right:10px; - text-decoration: none; - text-align:center; - i { - margin-right:4px; - margin-bottom:3px; - } - } +.option-value-item { + display: inline-block; + padding-right: 20px; } diff --git a/frontend/src/modules/projects/views/projectView.js b/frontend/src/modules/projects/views/projectView.js index 79e1d9a444..aaef00e3bc 100644 --- a/frontend/src/modules/projects/views/projectView.js +++ b/frontend/src/modules/projects/views/projectView.js @@ -42,7 +42,7 @@ define(function(require) { event.stopPropagation(); event.preventDefault(); } - Origin.trigger('contextMenu:open', this, e); + Origin.trigger('contextMenu:open', this, event); }, editProjectSettings: function(event) { diff --git a/frontend/src/less/tags.less b/frontend/src/modules/scaffold/less/tags.less similarity index 100% rename from frontend/src/less/tags.less rename to frontend/src/modules/scaffold/less/tags.less diff --git a/frontend/src/modules/sidebar/less/sidebar.less b/frontend/src/modules/sidebar/less/sidebar.less index 8f1cabc981..272ef93a2f 100644 --- a/frontend/src/modules/sidebar/less/sidebar.less +++ b/frontend/src/modules/sidebar/less/sidebar.less @@ -1,159 +1,215 @@ @import 'variables'; + .sidebar { - position:fixed; - top:0; - left:0px; - width:250px; - height:100%; - overflow-y:auto; - overflow-x:hidden; - a { - text-decoration: none; + position:fixed; + top:0; + left:0px; + width:250px; + height:100%; + overflow-y:auto; + overflow-x:hidden; + background-color:@sidebar-color; + color:@sidebar-text-color; + + button { + &[class^="action-"], + &[class*=" action-"] { + margin: 5px 25px; + width: 200px; + height: 50px; + border-width: 1px; + border-style: solid; + border-radius:@button-radius; + font-size: 15px; + text-align: center; + i { + margin-right: 5px; + } } - .sidebar-filter-clear { - display:inline; - position: absolute; - left: 205px; - top: 25px; - width: 0px; - padding: 0; - background: none; - color: @sidebar-input-text-color; + } + + a { + color:@sidebar-text-color; + text-decoration: none; + transition:all 0.3s; + &:hover, + &:focus { + color:darken(@sidebar-text-color, 10%); } + } + .sidebar-filter-clear { + display:inline; + position: absolute; + left: 205px; + top: 25px; + width: 0px; + padding: 0; + background: none; + color: @sidebar-input-text-color; + } + + .sidebar-item-container { + position: relative; + height:100%; + } - .sidebar-item-container { - position: relative; - height:100%; + .sidebar-hide { + #app { + margin-left: 0px; } - - .sidebar-hide { - #app { - margin-left: 0px; - } - - .sidebar { - display: none; - } + .sidebar { + display: none; } - - .separator { - margin-top: 20px; + } + + .separator { + margin-top: 20px; + } + + .sidebar-row, .sidebar-breadcrumb { + button, a { + margin: 0; + color:@sidebar-text-color; + transition:all 0.3s; + &:hover { + color:@sidebar-item-hover-text-color; + } } - - .sidebar-row { - .error { - position: inherit; - top: inherit; - left: inherit; + } + + .sidebar-row { + .error { + position: inherit; + top: inherit; + left: inherit; + color: white !important; + i { color: white !important; - i { - color: white !important; - } - } - .sidebar-row-input input { - margin: 10px 25px; - width: 180px; - height: 25px; - font-size: @sidebar-input-font-size; - border-radius: @button-radius; - border-color: @sidebar-input-color; - background: @sidebar-input-color; - color: @sidebar-input-text-color; - text-align: left; } } + .sidebar-row-input input { + margin: 10px 25px; + width: 180px; + height: 25px; + font-size: @sidebar-input-font-size; + border-radius: @button-radius; + border-color: @sidebar-input-color; + background: @sidebar-input-color; + color: @sidebar-input-text-color; + text-align: left; + } + } } .sidebar-inner { - padding: 61px 0 25px 0; + padding: 61px 0 25px 0; } .sidebar-breadcrumb { - position:relative; - top: -40px; + position:relative; + top: -40px; } .sidebar-breadcrumb-inner { - display:block; - padding:30px 30px; - font-size: @sidebar-input-font-size; - i { - color: @secondary-color; - margin-right:8px; - } + display:block; + padding:30px 30px; + font-size: @sidebar-input-font-size; + i { + color: @secondary-color; + margin-right:8px; + } +} + +.sidebar-progress { + z-index: 1; + width: 0px; + height:100%; + position: absolute; + background: darken(@secondary-color, 10%); + left: 0px; + top: 0px; + opacity: 0.3; } .sidebar-item { - position:relative; - left:10%; - opacity:0; - label { - display:block; - margin-bottom:4px; - } + position:relative; + left:10%; + opacity:0; + label { + display:block; + margin-bottom:4px; + } } .sidebar-row, select.sidebar-row { - display:block; - position: relative; - button { - font-size: @sidebar-input-font-size; - background:none; - border:none; - width:100%; - padding:18px 30px; - text-align:left; - - i { - margin-right:8px; - - &.fa-toggle-off, .fa-toggle-on { - float: right; - color:@secondary-color; - font-size: 20px; - } - - &.fa-chevron-right, &.primary-color { - color:@secondary-color; - } - &.fa-times { - color:@sidebar-input-text-color; - } - } + display:block; + position: relative; + button { + font-size: @sidebar-input-font-size; + background:none; + border:none; + width:100%; + padding:18px 30px; + text-align:left; + + i { + margin-right:8px; + &.fa-toggle-off, + .fa-toggle-on { + float: right; + color:@secondary-color; + font-size: 20px; + } + &.fa-chevron-right, + &.primary-color { + color:@secondary-color; + } + &.fa-times { + color:@sidebar-input-text-color; + } } + } } .sidebar-item-title { - text-align:center; + background-color:@sidebar-color; + color:@sidebar-title-text-color; + text-align:center; } .sidebar-item-title-inner { - padding:30px 20px; - font-size: @sidebar-input-font-size; - font-weight: 200; + padding:30px 20px; + font-size: @sidebar-input-font-size; + font-weight: 200; } .sidebar-divide { - text-align:center; - i { - margin-right:4px; - } + background-color:@sidebar-color; + text-align:center; + + h3 { + font-size:13px; + font-weight:600; + } + i { + margin-right:4px; + } } .sidebar-divide-inner { - padding:20px; + padding:20px; } .sidebar-fieldset-filter.error { - @alert-color:#de6262; - background: @alert-color; - color:#fff; - &:hover { - background: darken(@alert-color, 10%); - } + @alert-color:#de6262; + background: @alert-color; + color:#fff; + &:hover { + background: darken(@alert-color, 10%); + } } button.sidebar-tag { - padding: 14px 15px 14px 30px; + padding: 14px 15px 14px 30px; } From 1b4a8e7196fd1444ebf219f25b1aa2ef5a3afa2f Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 15:16:11 +0100 Subject: [PATCH 090/296] Remove hard-coded type inference --- frontend/src/modules/scaffold/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/modules/scaffold/index.js b/frontend/src/modules/scaffold/index.js index 25cea628af..d5d1f5ff7f 100644 --- a/frontend/src/modules/scaffold/index.js +++ b/frontend/src/modules/scaffold/index.js @@ -284,13 +284,14 @@ define(function(require) { Scaffold.buildForm = function(options) { try { - - // This shouldn't need to check whether this is not set - // _type:'config' should be set on the model - var type = options.model.get('_type') || options.schemaType || 'config'; + var type = options.model.get('_type') || options.schemaType || options.model._type; var initialType = type; switch (type) { + case 'component': + type = 'config'; + break; + case 'component': type = options.model.get('_component'); break; From 2deea72e56914fce90e448f6e6ba6a6690c34e9b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 15:16:17 +0100 Subject: [PATCH 091/296] Remove log --- frontend/src/modules/editor/course/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/modules/editor/course/index.js b/frontend/src/modules/editor/course/index.js index a1aa642bc7..290fb479dd 100644 --- a/frontend/src/modules/editor/course/index.js +++ b/frontend/src/modules/editor/course/index.js @@ -18,7 +18,6 @@ define(function(require) { }); function renderCourseEdit() { - console.log(Origin.location.module); (new CourseModel({ _id: Origin.location.route1 })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); From 2d3eae1be315debc125955409ed27c7161a7a3b9 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 15:23:04 +0100 Subject: [PATCH 092/296] Rename variables.less to colours.less --- frontend/src/core/less/app.less | 2 +- frontend/src/core/less/buttons.less | 2 +- .../less/{variables.less => colours.less} | 1 - frontend/src/core/less/fonts.less | 32 +++++++++---------- frontend/src/core/less/permissions.less | 2 +- frontend/src/core/less/tables.less | 2 +- .../modules/assetManagement/less/asset.less | 2 +- .../less/assetManagementNew.less | 2 +- .../editor/contentObject/less/editorMenu.less | 2 +- .../editor/contentObject/less/editorPage.less | 2 +- .../less/editorPageComponentList.less | 2 +- .../modules/editor/global/less/editor.less | 2 +- .../menuSettings/less/menusettings.less | 2 +- .../editor/selectTheme/less/editorTheme.less | 2 +- .../modules/globalMenu/less/globalMenu.less | 2 +- .../src/modules/location/less/location.less | 2 +- frontend/src/modules/modal/less/modal.less | 2 +- .../modules/navigation/less/navigation.less | 4 +-- .../src/modules/options/less/options.less | 2 +- .../src/modules/projects/less/qproject.less | 2 +- frontend/src/modules/scaffold/less/tags.less | 2 +- .../src/modules/sidebar/less/sidebar.less | 6 ++-- frontend/src/modules/user/less/login.less | 2 +- .../src/modules/user/less/userProfile.less | 2 +- .../userManagement/less/userManagement.less | 2 +- 25 files changed, 43 insertions(+), 42 deletions(-) rename frontend/src/core/less/{variables.less => colours.less} (99%) diff --git a/frontend/src/core/less/app.less b/frontend/src/core/less/app.less index 991fb4e013..791c6e95ea 100644 --- a/frontend/src/core/less/app.less +++ b/frontend/src/core/less/app.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; html { overflow-y: hidden; diff --git a/frontend/src/core/less/buttons.less b/frontend/src/core/less/buttons.less index 2c167fdea1..adeab1f6ba 100644 --- a/frontend/src/core/less/buttons.less +++ b/frontend/src/core/less/buttons.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; button { border:none; diff --git a/frontend/src/core/less/variables.less b/frontend/src/core/less/colours.less similarity index 99% rename from frontend/src/core/less/variables.less rename to frontend/src/core/less/colours.less index 5ce881ffc4..25e02881d1 100644 --- a/frontend/src/core/less/variables.less +++ b/frontend/src/core/less/colours.less @@ -43,7 +43,6 @@ @sidebar-title-text-color:@white; @sidebar-color:@tertiary-color; -@sidebar-input-font-size:15px; @sidebar-text-color:@primary-color; @sidebar-item-hover-color:lighten(@tertiary-color, 10%); @sidebar-item-hover-text-color:white; diff --git a/frontend/src/core/less/fonts.less b/frontend/src/core/less/fonts.less index 7140ebc002..6894874e22 100644 --- a/frontend/src/core/less/fonts.less +++ b/frontend/src/core/less/fonts.less @@ -1,46 +1,46 @@ -@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700|Raleway:400,700); +@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700|Raleway:500,700); @font-title: 'Raleway', sans-serif; @font-family: 'Open Sans', sans-serif; @font-size:13px; -@font-weight:400; +@font-weight:500; // Fonts sizes body { - font-family:@font-family; - font-size: @font-size; - font-weight:@font-weight; + font-family:@font-family; + font-size: @font-size; + font-weight:@font-weight; } h1 { - font-size:15px; - font-family: @font-title; - font-weight:300; + font-size:15px; + font-family: @font-title; + font-weight:300; } h2 { - font-weight:300; + font-weight:300; } h3 { - font-weight:300; + font-weight:300; } h4 { - font-weight:200; + font-weight:200; } h5 { - font-weight:200; + font-weight:200; } h6 { - font-weight:200; + font-weight:200; } button, input, textarea { - font-family:@font-family; - font-size:13px; -} \ No newline at end of file + font-family:@font-family; + font-size:13px; +} diff --git a/frontend/src/core/less/permissions.less b/frontend/src/core/less/permissions.less index 818e094e5e..d8e657efb1 100644 --- a/frontend/src/core/less/permissions.less +++ b/frontend/src/core/less/permissions.less @@ -1,5 +1,5 @@ @import 'sharedStyles'; -@import 'variables'; +@import 'colours'; .permissions { .form-container-style; diff --git a/frontend/src/core/less/tables.less b/frontend/src/core/less/tables.less index fd2c03d094..96889fb8ab 100644 --- a/frontend/src/core/less/tables.less +++ b/frontend/src/core/less/tables.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .tb-title { background-color: #9cabc4; diff --git a/frontend/src/modules/assetManagement/less/asset.less b/frontend/src/modules/assetManagement/less/asset.less index fd7d1d9549..0d67e975b8 100644 --- a/frontend/src/modules/assetManagement/less/asset.less +++ b/frontend/src/modules/assetManagement/less/asset.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .asset-picker-filters { padding: 10px; diff --git a/frontend/src/modules/assetManagement/less/assetManagementNew.less b/frontend/src/modules/assetManagement/less/assetManagementNew.less index 3d8660ed89..8c4ef2feb3 100644 --- a/frontend/src/modules/assetManagement/less/assetManagementNew.less +++ b/frontend/src/modules/assetManagement/less/assetManagementNew.less @@ -1,5 +1,5 @@ @import 'sharedStyles'; -@import 'variables'; +@import 'colours'; .asset-management-new-asset { .form-container-style; diff --git a/frontend/src/modules/editor/contentObject/less/editorMenu.less b/frontend/src/modules/editor/contentObject/less/editorMenu.less index e7ba812132..7a661a1c76 100644 --- a/frontend/src/modules/editor/contentObject/less/editorMenu.less +++ b/frontend/src/modules/editor/contentObject/less/editorMenu.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .editor-menu { &-inner { diff --git a/frontend/src/modules/editor/contentObject/less/editorPage.less b/frontend/src/modules/editor/contentObject/less/editorPage.less index c70668b883..a43301f81f 100644 --- a/frontend/src/modules/editor/contentObject/less/editorPage.less +++ b/frontend/src/modules/editor/contentObject/less/editorPage.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .page { .paste-zone { diff --git a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less index f558041d77..3b0b4af4ab 100644 --- a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less +++ b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .editor-component-list { .click-capture { diff --git a/frontend/src/modules/editor/global/less/editor.less b/frontend/src/modules/editor/global/less/editor.less index d91ee671ae..530468a1b6 100644 --- a/frontend/src/modules/editor/global/less/editor.less +++ b/frontend/src/modules/editor/global/less/editor.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .editor-view { diff --git a/frontend/src/modules/editor/menuSettings/less/menusettings.less b/frontend/src/modules/editor/menuSettings/less/menusettings.less index 45c6ac4ff0..c05db390e5 100644 --- a/frontend/src/modules/editor/menuSettings/less/menusettings.less +++ b/frontend/src/modules/editor/menuSettings/less/menusettings.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .menu-settings-list-item { diff --git a/frontend/src/modules/editor/selectTheme/less/editorTheme.less b/frontend/src/modules/editor/selectTheme/less/editorTheme.less index 766556698b..72f15de25b 100644 --- a/frontend/src/modules/editor/selectTheme/less/editorTheme.less +++ b/frontend/src/modules/editor/selectTheme/less/editorTheme.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .theme-list { padding-left: 30px; diff --git a/frontend/src/modules/globalMenu/less/globalMenu.less b/frontend/src/modules/globalMenu/less/globalMenu.less index 66f9854b97..4a7956c92d 100644 --- a/frontend/src/modules/globalMenu/less/globalMenu.less +++ b/frontend/src/modules/globalMenu/less/globalMenu.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .global-menu { display:none; diff --git a/frontend/src/modules/location/less/location.less b/frontend/src/modules/location/less/location.less index ec27554522..25f597469d 100644 --- a/frontend/src/modules/location/less/location.less +++ b/frontend/src/modules/location/less/location.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; @import 'fonts'; .location-title { diff --git a/frontend/src/modules/modal/less/modal.less b/frontend/src/modules/modal/less/modal.less index 4f309373b7..0e485c3a72 100644 --- a/frontend/src/modules/modal/less/modal.less +++ b/frontend/src/modules/modal/less/modal.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; // Modal styling // ============== diff --git a/frontend/src/modules/navigation/less/navigation.less b/frontend/src/modules/navigation/less/navigation.less index b700c6a181..5d4260aed3 100644 --- a/frontend/src/modules/navigation/less/navigation.less +++ b/frontend/src/modules/navigation/less/navigation.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; @import 'fonts'; @import 'sharedStyles'; @@ -53,7 +53,7 @@ .navigation-user-logout { padding: 0px 25px; } - + a { &:hover { text-decoration: underline; diff --git a/frontend/src/modules/options/less/options.less b/frontend/src/modules/options/less/options.less index cbc66d28a0..3761852a25 100644 --- a/frontend/src/modules/options/less/options.less +++ b/frontend/src/modules/options/less/options.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .options { position:absolute; diff --git a/frontend/src/modules/projects/less/qproject.less b/frontend/src/modules/projects/less/qproject.less index c53c24e0e3..3ce8450b09 100644 --- a/frontend/src/modules/projects/less/qproject.less +++ b/frontend/src/modules/projects/less/qproject.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; @toolbar-height: 30px; diff --git a/frontend/src/modules/scaffold/less/tags.less b/frontend/src/modules/scaffold/less/tags.less index 479fd7e101..1d5ef36b42 100644 --- a/frontend/src/modules/scaffold/less/tags.less +++ b/frontend/src/modules/scaffold/less/tags.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; div.tagsinput { border:1px solid #CCC; diff --git a/frontend/src/modules/sidebar/less/sidebar.less b/frontend/src/modules/sidebar/less/sidebar.less index 272ef93a2f..d6d348f726 100644 --- a/frontend/src/modules/sidebar/less/sidebar.less +++ b/frontend/src/modules/sidebar/less/sidebar.less @@ -1,4 +1,6 @@ -@import 'variables'; +@import 'colours'; + +@sidebar-input-font-size:15px; .sidebar { position:fixed; @@ -10,7 +12,7 @@ overflow-x:hidden; background-color:@sidebar-color; color:@sidebar-text-color; - + button { &[class^="action-"], &[class*=" action-"] { diff --git a/frontend/src/modules/user/less/login.less b/frontend/src/modules/user/less/login.less index 38fda621ab..58208c9dbf 100644 --- a/frontend/src/modules/user/less/login.less +++ b/frontend/src/modules/user/less/login.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .module-user { &.location-login, diff --git a/frontend/src/modules/user/less/userProfile.less b/frontend/src/modules/user/less/userProfile.less index 6f14d9aff8..532ef45212 100644 --- a/frontend/src/modules/user/less/userProfile.less +++ b/frontend/src/modules/user/less/userProfile.less @@ -1,4 +1,4 @@ -@import 'variables'; +@import 'colours'; .user-profile { .error-text { diff --git a/frontend/src/modules/userManagement/less/userManagement.less b/frontend/src/modules/userManagement/less/userManagement.less index 3d305884a4..d3a3f98264 100644 --- a/frontend/src/modules/userManagement/less/userManagement.less +++ b/frontend/src/modules/userManagement/less/userManagement.less @@ -1,5 +1,5 @@ @import 'sharedStyles'; -@import 'variables'; +@import 'colours'; @user-hover-bg-colour: #f3faff; @user-hover-borderl-colour: #8ea3af; From 2e7f6a057c30c1e9619539052d40731a19090687 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 16:14:15 +0100 Subject: [PATCH 093/296] Move view code from router --- frontend/src/core/origin.js | 125 ++++++++++++--------- frontend/src/core/router.js | 32 +----- frontend/src/core/views/originView.js | 2 +- frontend/src/core/views/permissionsView.js | 2 +- 4 files changed, 77 insertions(+), 84 deletions(-) diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index 79e3b75e12..f750775fb6 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -3,75 +3,94 @@ define(function(require){ var _ = require('underscore'); var Backbone = require('backbone'); - var Origin = { - location: {} - }; - var pluginTaps = []; + var $loading; - _.extend(Origin, Backbone.Events); - - Origin.initialize = _.once(function() { - Origin.tap('initialize', function() { - initialize(); - }); - }); - - function initialize() { - Origin.trigger('origin:initialize'); - Backbone.history.start(); - Origin.trigger('origin:hideLoading'); - } - - Origin.tap = function(location, callback) { - // Sets up a loading system for plugins to tap into the location - // and load their data before everything else kicks off - var currentLocationPlugins = _.where(pluginTaps, {location: location}); - var currentLocationPluginsLength = currentLocationPlugins.length; - if (currentLocationPluginsLength === 0) { - callback(); - } else { + var Origin = { + initialize: _.once(function() { + // set up loading asap + $loading = $('.loading'); + hideLoading(); + // let other code know we're about to initialise + Origin.tap('initialize', function() { + Origin.trigger('origin:initialize'); + Backbone.history.start(); + // Setup listeners for the loading screen + Origin.on('origin:hideLoading', hideLoading, this); + Origin.on('origin:showLoading', showLoading, this); + // abstracted window events to prevent keep adding/removing in views + $(window).on('resize', onResize); + $(document).on('keydown', onKeyDown); + }); + }), + /** + * Register a plugin to tap into a certain location before it loads + */ + registerPluginTap: function(location, pluginMethod) { + pluginTaps.push({ + location: location, + pluginMethod: pluginMethod + }); + }, + /** + * Sets up a loading system for plugins to tap into the location + * and load their data before everything else kicks off + */ + tap: function(location, callback) { + var currentLocationPlugins = _.where(pluginTaps, {location: location}); + var currentLocationPluginsLength = currentLocationPlugins.length; + if (currentLocationPluginsLength === 0) { + return callback(); + } + // iterates through matching currentLocationPlugins calling the funcs var count = 0; - // Goes through each plugin registered using Origin.registerPluginTap - // and that have the same location function callPlugin() { currentLocationPlugins[count].pluginMethod.call(null, function() { - if (++count === currentLocationPluginsLength) { - callback(); - } else { - callPlugin(); - } + var doneAll = ++count === currentLocationPluginsLength; + doneAll ? callback() : callPlugin(); }); } callPlugin(); + }, + /** + * Tells + */ + removeViews: function() { + Origin.trigger('remove:views'); } + }; + _.extend(Origin, Backbone.Events); + + /** + * Private functions + */ + + function showLoading(shouldHideTopBar) { + $loading + .removeClass('display-none fade-out') + .toggleClass('cover-top-bar', shouldHideTopBar); } - // Register a plugin to tap into a certain location before the location loads - Origin.registerPluginTap = function(location, pluginMethod) { - var pluginTap = { - location: location, - pluginMethod: pluginMethod - }; - pluginTaps.push(pluginTap); - }; + function hideLoading() { + $loading.addClass('fade-out'); + _.delay(_.bind(function() { + $loading + .addClass('display-none') + .removeClass('cover-top-bar'); + }, this), 300); + } - // Setup window events - // This is abstracted so we can listenTo and remove event callbacks - // when the view is removed without any extra code - $(window).on('resize', function(event) { + function onKeyDown(event) { + if($(event.target).is('input, textarea')) return; + Origin.trigger('key:down', event); + } + + function onResize(event) { var $window = $(this); var windowWidth = $window.width(); var windowHeight = $window.height(); Origin.trigger('window:resize', windowWidth, windowHeight); - }); - - $(document).on('keydown', function(event) { - if ($(event.target).is('input, textarea')) { - return; - } - Origin.trigger('key:down', event); - }); + } return Origin; }); diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index fa4076aeb1..fd6a8474fb 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -12,12 +12,6 @@ define(function(require) { }, initialize: function() { - // Setup listeners for the loading screen - Origin.on('router:hideLoading', this.hideLoading, this); - Origin.on('router:showLoading', this.showLoading, this); - // Store loading element - this.$loading = $('.loading'); - this.locationKeys = ['module', 'route1', 'route2', 'route3', 'route4']; }, @@ -31,7 +25,7 @@ define(function(require) { handleIndex: function() { // Show loading on any route - this.showLoading(); + Origin.trigger('origin:showLoading'); if (this.isUserAuthenticated()) { this.navigate('#/dashboard', { trigger: true }); @@ -52,9 +46,9 @@ define(function(require) { handleRoute: function(module, route1, route2, route3, route4) { // Show loading on any route - this.showLoading(); + Origin.trigger('origin:showLoading'); // Remove views - this.removeViews(); + Origin.removeViews(); // Check this user has permissions if (!Origin.permissions.checkRoute(Backbone.history.fragment)) { Origin.trigger('sidebar:sidebarContainer:hide'); @@ -89,26 +83,6 @@ define(function(require) { $('body').removeClass().addClass(locationClass); // Trigger router event Origin.trigger('router:' + module, route1, route2, route3, route4); - }, - - removeViews: function() { - Origin.trigger('remove:views'); - }, - - showLoading: function(shouldHideTopBar) { - // Sometimes you might want to disable the top bar too - if (shouldHideTopBar) { - this.$loading.removeClass('display-none fade-out').addClass('cover-top-bar'); - } else { - this.$loading.removeClass('display-none fade-out'); - } - }, - - hideLoading: function() { - this.$loading.addClass('fade-out'); - _.delay(_.bind(function() { - this.$loading.addClass('display-none').removeClass('cover-top-bar'); - }, this), 300); } }); diff --git a/frontend/src/core/views/originView.js b/frontend/src/core/views/originView.js index 0b65d72cf2..8508a8ff74 100644 --- a/frontend/src/core/views/originView.js +++ b/frontend/src/core/views/originView.js @@ -47,7 +47,7 @@ define(function(require){ }, setViewToReady: function() { - Origin.trigger('router:hideLoading'); + Origin.trigger('origin:hideLoading'); }, setUserPreference: function(key, value) { diff --git a/frontend/src/core/views/permissionsView.js b/frontend/src/core/views/permissionsView.js index 864fedb66f..6b64337c64 100644 --- a/frontend/src/core/views/permissionsView.js +++ b/frontend/src/core/views/permissionsView.js @@ -31,7 +31,7 @@ define(function(require){ }, setViewToReady: function() { - Origin.trigger('router:hideLoading'); + Origin.trigger('origin:hideLoading'); } }, { From 6a539d882e1b5475ee49e55fd462e2de9a55f753 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 16:14:35 +0100 Subject: [PATCH 094/296] Abstract location code --- frontend/src/core/router.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index fd6a8474fb..ceb6a88501 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -13,6 +13,18 @@ define(function(require) { initialize: function() { this.locationKeys = ['module', 'route1', 'route2', 'route3', 'route4']; + this.resetLocation(); + }, + + setLocation: function(routeArgs) { + this.resetLocation(); + _.each(this.locationKeys, function(key, index) { + Origin.location[key] = routeArgs[index]; + }); + }, + + resetLocation: function() { + Origin.location = {}; }, isUserAuthenticated: function() { @@ -68,11 +80,7 @@ define(function(require) { // Set previous location object Origin.previousLocation = Origin.location; this.evaluateDashboardRoute(); - // Set location object - Origin.location = {}; - _.each(this.locationKeys, function(locationKey, index) { - Origin.location[locationKey] = routeArguments[index]; - }); + this.setLocation(routeArguments); // Trigger location change Origin.trigger('location:change', Origin.location); From 23a2beaf7daa0b621d997c291e045f01b1131a20 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 29 Mar 2017 16:17:16 +0100 Subject: [PATCH 095/296] Amend comments --- frontend/src/core/origin.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index f750775fb6..b781bd7f5e 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -33,8 +33,7 @@ define(function(require){ }); }, /** - * Sets up a loading system for plugins to tap into the location - * and load their data before everything else kicks off + * Makes sure all 'tapped' plugin functions are executed before continuing */ tap: function(location, callback) { var currentLocationPlugins = _.where(pluginTaps, {location: location}); @@ -42,7 +41,6 @@ define(function(require){ if (currentLocationPluginsLength === 0) { return callback(); } - // iterates through matching currentLocationPlugins calling the funcs var count = 0; function callPlugin() { currentLocationPlugins[count].pluginMethod.call(null, function() { From 46f06944c0a4405afd9dfa343d5f2cf13471e885 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 09:23:33 +0100 Subject: [PATCH 096/296] Update Gruntfile.js --- Gruntfile.js | 617 ++++++++++++++++++++++++++------------------------- 1 file changed, 320 insertions(+), 297 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index ee78cebe16..5b3aa50b58 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,347 +1,370 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE module.exports = function(grunt) { require('matchdep').filterAll('grunt-*').forEach(grunt.loadNpmTasks); - // Project configuration. grunt.initConfig({ - pkg: grunt.file.readJSON('package.json'), - "merge-json": { - en: { - src: ['routes/lang/en-application.json','frontend/src/plugins/**/lang/en.json'], - dest: 'routes/lang/en.json', - } - }, - copy: { - main: { - files: [ - { - expand: true, - flatten: true, - src: ['frontend/src/core/**/assets/**','frontend/src/plugins/**/assets/**'], - dest: 'frontend/src/adaptbuilder/css/assets/', - filter: 'isFile' - }, - { - expand: true, - cwd: 'frontend/src/core/libraries/tinymce/', - src: ['plugins/**/*', 'skins/**/*', 'themes/**/*'], - dest: 'frontend/src/adaptbuilder/js/' - }, - { - expand: true, - flatten: true, - src: ['frontend/src/core/libraries/ace/**/*'], - dest: 'frontend/src/adaptbuilder/js/ace' - } - ] - } - }, - less: { - dev: { - options: { - baseUrl: 'frontend/src', + pkg: grunt.file.readJSON('package.json'), + "merge-json": { + en: { + src: [ + 'routes/lang/en-application.json', + 'frontend/src/**/lang/en.json' + ], + dest: 'routes/lang/en.json' + } + }, + copy: { + main: { + files: [ + { + expand: true, + flatten: true, src: [ - 'frontend/src/core/**/*.less', - 'frontend/src/less/**/*.less', - 'frontend/src/plugins/**/*.less' + 'frontend/src/core/**/assets/**', + 'frontend/src/modules/**/assets/**', + 'frontend/src/plugins/**/assets/**' ], - generateSourceMaps: true, - compress: false, - dest: 'frontend/src/adaptbuilder/css', - cssFilename: 'adapt.css', - mapFilename: 'adapt.css.map' - } - }, - compile: { - options: { - baseUrl: 'frontend/src', + dest: 'frontend/build/css/assets/', + filter: 'isFile' + }, + { + expand: true, + cwd: 'frontend/src/core/libraries/tinymce/', src: [ - 'frontend/src/core/**/*.less', - 'frontend/src/less/**/*.less', - 'frontend/src/plugins/**/*.less' + 'plugins/**/*', + 'skins/**/*', + 'themes/**/*' ], - generateSourceMaps: false, - compress: true, - dest: 'frontend/src/adaptbuilder/css', - cssFilename: 'adapt.css', - mapFilename: 'adapt.css.map' - } - } - }, - handlebars: { - compile: { - options: { - namespace:"Handlebars.templates", - processName: function(filePath) { - var newFilePath = filePath.split("/"); - newFilePath = newFilePath[newFilePath.length - 1].replace(/\.[^/.]+$/, ""); - return newFilePath; - }, - partialRegex: /^part_/, - partialsPathRegex: /\/partials\// + dest: 'frontend/build/js/' }, - files: { - "frontend/src/templates/templates.js": ["frontend/src/core/**/*.hbs", "frontend/src/plugins/**/*.hbs"] + { + expand: true, + flatten: true, + src: ['frontend/src/core/libraries/ace/**/*'], + dest: 'frontend/build/js/ace' } + ] + } + }, + less: { + dev: { + options: { + baseUrl: 'frontend/src', + src: [ + 'frontend/src/core/**/*.less', + 'frontend/src/modules/**/*.less', + 'frontend/src/plugins/**/*.less' + ], + paths: 'frontend/src/core/less', + generateSourceMaps: true, + compress: false, + dest: 'frontend/build/css', + cssFilename: 'adapt.css', + mapFilename: 'adapt.css.map' } }, - jscs: { - src: ['frontend/src/core/**/*.js','!frontend/src/core/libraries/**/*.js','lib/**/*.js','plugins/**/*.js','!plugins/content/**','routes/**/*.js','!**/node_modules/**'], + compile: { options: { - config: ".jscsrc", - reporter: "unix", - fix: true + baseUrl: 'frontend/src', + src: [ + 'frontend/src/core/**/*.less', + 'frontend/src/less/**/*.less', + 'frontend/src/modules/**/*.less', + 'frontend/src/plugins/**/*.less' + ], + paths: 'frontend/src/core/less', + generateSourceMaps: false, + compress: true, + dest: 'frontend/build/css', + cssFilename: 'adapt.css', + mapFilename: 'adapt.css.map' } - }, - jshint: { + } + }, + handlebars: { + compile: { options: { - reporter: require('jshint-stylish'), - curly: true, - undef: true, - asi: true, - eqnull: false, - sub: true - }, - frontend: { - options: { - browser: true, - es3: true, - jquery: true, - globals: { - Backbone: false, - Handlebars: false, - _: false, - define: false, - require: false - } + namespace:"Handlebars.templates", + processName: function(filePath) { + var newFilePath = filePath.split("/"); + newFilePath = newFilePath[newFilePath.length - 1].replace(/\.[^/.]+$/, ""); + return newFilePath; }, - files: { - src: ['frontend/src/core/**/*.js','!frontend/src/core/libraries/**/*.js'] - } + partialRegex: /^part_/, + partialsPathRegex: /\/partials\// }, - backend: { - options: { - node: true - }, - files: { - src: ['lib/**/*.js','plugins/**/*.js','!plugins/content/**','routes/**/*.js','!**/node_modules/**'] - } + files: { + "frontend/src/templates/templates.js": [ + "frontend/src/core/**/*.hbs", + "frontend/src/modules/**/*.hbs", + "frontend/src/plugins/**/*.hbs" + ] } + } + }, + jscs: { + src: [ + 'frontend/src/core/**/*.js', + 'frontend/src/modules/**/*.js', + '!frontend/src/libraries/**/*.js', + 'lib/**/*.js', + 'plugins/**/*.js', + '!plugins/content/**', + 'routes/**/*.js', + '!**/node_modules/**' + ], + options: { + config: ".jscsrc", + reporter: "unix", + fix: true + } + }, + jshint: { + options: { + reporter: require('jshint-stylish'), + curly: true, + undef: true, + asi: true, + eqnull: false, + sub: true }, - requirejs: { - dev: { - options: { - name: "core/app/app", - mainConfigFile: "frontend/src/core/app/config.js", - out: "frontend/src/adaptbuilder/js/origin.js", - generateSourceMaps: true, - preserveLicenseComments:true, - include: ['core/app/config'], - optimize: "none" + frontend: { + options: { + browser: true, + es3: true, + jquery: true, + globals: { + Backbone: false, + Handlebars: false, + _: false, + define: false, + require: false } }, - compile: { - options: { - name: "core/app/app", - mainConfigFile: "frontend/src/core/app/config.js", - out: "frontend/src/adaptbuilder/js/origin.js", - include: ['core/app/config'], - optimize:"uglify2" - } + files: { + src: [ + 'frontend/src/core/**/*.js', + 'frontend/src/modules/**/*.js', + '!frontend/src/libraries/**/*.js' + ] } }, - watch: { - handlebars: { - files: ['frontend/src/**/*.hbs'], - tasks: ['handlebars'] - }, - less: { - files: ['frontend/src/**/*.less'], - tasks: ['less:dev'] + backend: { + options: { + node: true }, - routes: { - files: ['routes/**/*.*'], - tasks: ['handlebars'] - } - }, - casperjs: { - files: ['./test_frontend/*.js', '!./test_frontend/login.js'] - }, - mochaTest: { - test: { - options: { - reporter: 'dot', - timeout: 3500, - require: ['should'], - ui: 'bdd', - globals: ['app'] - }, + files: { src: [ - 'test/*.js' + 'lib/**/*.js', + 'plugins/**/*.js', + '!plugins/content/**', + 'routes/**/*.js', + '!**/node_modules/**' ] } - }, - open: { - server: { - path: 'http://localhost:<%= server.options.port %>/' + } + }, + requirejs: { + dev: { + options: { + baseUrl: 'frontend/src', + name: 'core/app', + mainConfigFile: "frontend/src/core/config.js", + out: "frontend/build/js/origin.js", + generateSourceMaps: true, + preserveLicenseComments: true, + optimize: "none" } }, - server: { + compile: { options: { - port: getHttpPort() || process.env.PORT + baseUrl: 'frontend/src/', + name: 'core/app', + mainConfigFile: "frontend/src/core/config.js", + out: "frontend/build/js/origin.js", + optimize: "uglify2" } + } + }, + watch: { + handlebars: { + files: ['frontend/src/**/*.hbs'], + tasks: ['handlebars'] + }, + less: { + files: ['frontend/src/**/*.less'], + tasks: ['less:dev'] + }, + routes: { + files: ['routes/**/*.*'], + tasks: ['handlebars'] }, - requirePlugins: { - url: 'frontend/src/plugins/*', - dest: 'frontend/src/plugins' + lang: { + files: ['routes/lang/*.json'], + tasks: ['merge-json'] } - }); - - function getHttpPort() { - if (grunt.file.exists(__dirname + "/conf/config.json")) { - var config = require(__dirname + "/conf/config.json"); - return config.serverPort; - } else { - return false; + }, + casperjs: { + files: ['./test_frontend/*.js', '!./test_frontend/login.js'] + }, + mochaTest: { + test: { + options: { + reporter: 'dot', + timeout: 3500, + require: ['should'], + ui: 'bdd', + globals: ['app'] + }, + src: [ + 'test/*.js' + ] } - }; - - grunt.registerTask('build', 'Running build', function(mode) { - // To toggle compilation call either: - // grunt build:prod - or - // grunt build:dev - var configFile = 'conf/config.json'; - - if (grunt.file.exists(configFile)) { - var config = grunt.file.readJSON(configFile); - - // Check if we're in 'production' mode - config.isProduction = (mode === 'prod') - ? true - : false; - - var compilation = (config.isProduction) - ? 'compile' - : 'dev'; - - // Save the configuration - grunt.file.write(configFile, JSON.stringify(config, null, 2)); - - grunt.task.run(['requirePlugins', 'merge-json', 'copy', 'less:' + compilation, 'handlebars', 'requirejs:'+ compilation]); - } else { - grunt.task.run(['requirePlugins', 'copy', 'less:dev', 'handlebars', 'requirejs:dev']); + }, + open: { + server: { + path: 'http://localhost:<%= server.options.port %>/' } - }); - - grunt.registerTask('server', "Running Server", function() { - grunt.task.run(['requirePlugins', 'copy', 'less:dev', 'handlebars', 'open:server', 'watch']); - }); - - // Compiles frontend plugins - grunt.registerTask('requirePlugins', 'Compiling plugins', function() { - - var config = grunt.config.get('requirePlugins'); - var requirePaths = ''; - - // Go through each subfolder in the plugins directory - var foldersArray = grunt.file.expand({filter: "isDirectory"}, config.url); - - // Check if any plugins are available - if (foldersArray.length === 0) { - requirePaths += "'"; + }, + server: { + options: { + port: getHttpPort() || process.env.PORT } - foldersArray.forEach(function(path, index, folders) { - - // Strip off front of path to make relative path to config file - var relativePath = path.replace('frontend/src', ''); - var splitter = "','"; - - if (index === folders.length - 1) { - splitter = "'" - } - - requirePaths += relativePath + '/index.js' + splitter; - - - }); - - var requireStatement = "require(['" + requirePaths +"]);"; - grunt.file.write(config.dest + '/plugins.js', requireStatement); - + }, + requireBundle: { + modules: { + src: 'frontend/src/modules/*', + dest: 'frontend/src/modules/modules.js' + }, + plugins: { + src: 'frontend/src/plugins/*', + dest: 'frontend/src/plugins/plugins.js' + } + } + }); + + function getHttpPort() { + if (!grunt.file.exists(__dirname + "/conf/config.json")) { + return false; + } + var config = require(__dirname + "/conf/config.json"); + return config.serverPort; + }; + + /** + * Accepts 'build' and 'prod' params + * e.g. grunt build:prod + */ + grunt.registerTask('build', 'Running build', function(mode) { + var configFile = 'conf/config.json'; + + if (!grunt.file.exists(configFile)) { + return grunt.task.run(['requireBundle', 'copy', 'less:dev', 'handlebars', 'requirejs:dev']); + } + var config = grunt.file.readJSON(configFile); + // Check if we're in 'production' mode + config.isProduction = (mode === 'prod') ? true : false; + // Save the configuration + grunt.file.write(configFile, JSON.stringify(config, null, 2)); + // run the tasks + var compilation = (config.isProduction) ? 'compile' : 'dev'; + grunt.task.run(['requireBundle', 'merge-json', 'copy', 'less:' + compilation, 'handlebars', 'requirejs:'+ compilation]); + }); + + grunt.registerTask('server', "Running Server", function() { + grunt.task.run(['requireBundle', 'copy', 'less:dev', 'handlebars', 'open:server', 'watch']); + }); + + // Compiles frontend plugins + grunt.registerMultiTask('requireBundle', 'Generates a .js file with a bunch of imports for the path files', function() { + var requirePaths = ''; + // Go through each subfolder in the plugins directory + var foldersArray = grunt.file.expand({ filter: "isDirectory" }, this.data.src); + // Check if any plugins are available + if (foldersArray.length === 0) { + requirePaths += "'"; + } + foldersArray.forEach(function(path, index, folders) { + // Strip off front of path to make relative path to config file + var relativePath = path.replace(grunt.config.get('requirejs').dev.options.baseUrl, '').slice(1); + var splitter = "','"; + if (index === folders.length - 1) splitter = "'"; + requirePaths += relativePath + '/index' + splitter; }); - grunt.registerMultiTask('less', 'Compile Less files to CSS', function() { - var path = require('path'); - var less = require('less'); - var options = this.options({}); - var shouldGenerateSourceMaps = options.generateSourceMaps; - var destination = options.dest; - var mapFilename = options.mapFilename; - var imports = getImports(); - var lessOptions = getLessOptions(); - var sourceMapPath = path.join(destination, mapFilename); - var importsPath = sourceMapPath + '.imports'; - var done = this.async(); - - if (!shouldGenerateSourceMaps) removeSourceMaps(); - - less.render(imports, lessOptions, complete); - - function getImports() { - var src = options.src; - var ret = ''; - var appendImport = function(lessPath) { + var defineStatement = "define(['" + requirePaths +"]);"; + grunt.file.write(this.data.dest, defineStatement); + }); + + grunt.registerMultiTask('less', 'Compile Less files to CSS', function() { + var path = require('path'); + var less = require('less'); + var options = this.options({}); + var shouldGenerateSourceMaps = options.generateSourceMaps; + var destination = options.dest; + var mapFilename = options.mapFilename; + var imports = getImports(); + var lessOptions = getLessOptions(); + var sourceMapPath = path.join(destination, mapFilename); + var importsPath = sourceMapPath + '.imports'; + var done = this.async(); + + if (!shouldGenerateSourceMaps) removeSourceMaps(); + + less.render(imports, lessOptions, complete); + + function getImports() { + var src = options.src; + var ret = ''; + + for (var i = 0, l = src.length; i < l; i++) { + grunt.file.expand({ filter: options.filter }, src[i]).forEach(function(lessPath) { ret += '@import \'' + path.normalize(lessPath) + '\';\n'; + }); + } + return ret; + } + + function getLessOptions() { + var ret = { + compress: options.compress, + paths: options.paths + }; + if (shouldGenerateSourceMaps) { + ret.sourceMap = { + 'sourceMapFileInline': false, + 'outputSourceFiles': true, + 'sourceMapBasepath': 'src', + 'sourceMapURL': mapFilename }; - - for (var i = 0, l = src.length; i < l; i++) { - grunt.file.expand({ filter: options.filter }, src[i]).forEach(appendImport); - } - - return ret; } + return ret; + } - function getLessOptions() { - var ret = { 'compress': options.compress }; - - if (shouldGenerateSourceMaps) { - ret.sourceMap = { - 'sourceMapFileInline': false, - 'outputSourceFiles': true, - 'sourceMapBasepath': 'src', - 'sourceMapURL': mapFilename, - }; - } - - return ret; + function removeSourceMaps() { + if (grunt.file.exists(sourceMapPath)) { + grunt.file.delete(sourceMapPath, { force: true }); } - - function removeSourceMaps() { - if (grunt.file.exists(sourceMapPath)) { - grunt.file.delete(sourceMapPath, { force: true }); - } - if (grunt.file.exists(importsPath)) { - grunt.file.delete(importsPath, { force: true }); - } + if (grunt.file.exists(importsPath)) { + grunt.file.delete(importsPath, { force: true }); } + } - function complete(error, output) { - if (error) return grunt.fail.fatal(JSON.stringify(error, false, ' ')); + function complete(error, output) { + if (error) return grunt.fail.fatal(JSON.stringify(error, false, ' ')); - var outputMap = output.map; + var outputMap = output.map; - if (outputMap) { - grunt.file.write(sourceMapPath, outputMap); - grunt.file.write(importsPath, imports); - } - - grunt.file.write(path.join(destination, options.cssFilename), output.css); - done(); + if (outputMap) { + grunt.file.write(sourceMapPath, outputMap); + grunt.file.write(importsPath, imports); } - }); - - grunt.registerTask('default',['requirePlugins', 'less:dev', 'handlebars', 'watch']); - grunt.registerTask('test',['mochaTest']); - grunt.registerTask('test-ui', ['casperjs']); - + grunt.file.write(path.join(destination, options.cssFilename), output.css); + done(); + } + }); + + grunt.registerTask('default', ['merge-json', 'requireBundle', 'less:dev', 'handlebars', 'watch']); + grunt.registerTask('test', ['mochaTest']); + grunt.registerTask('test-ui', ['casperjs']); }; From 8a27d0b13381f40cb17b01f42cc745e54d2335d6 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 14:04:40 +0100 Subject: [PATCH 097/296] Add missing comma --- lib/helpers.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/helpers.js b/lib/helpers.js index a0842063c6..793c2b1e9b 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -226,6 +226,6 @@ exports = module.exports = { hasCoursePermission: hasCoursePermission, isMasterPreviewAccessible: isMasterPreviewAccessible, isValidEmail: isValidEmail, - replaceAll: replaceAll + replaceAll: replaceAll, cloneObject: cloneObject }; From 61181cfa7758ff80412d27289f7531e9554fb1be Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 17:34:48 +0100 Subject: [PATCH 098/296] Remove files added in merge --- .../editor/page/models/editorBlockModel.js | 39 ------------------- .../page/models/editorComponentModel.js | 35 ----------------- 2 files changed, 74 deletions(-) delete mode 100644 frontend/src/core/editor/page/models/editorBlockModel.js delete mode 100644 frontend/src/core/editor/page/models/editorComponentModel.js diff --git a/frontend/src/core/editor/page/models/editorBlockModel.js b/frontend/src/core/editor/page/models/editorBlockModel.js deleted file mode 100644 index e19ad16113..0000000000 --- a/frontend/src/core/editor/page/models/editorBlockModel.js +++ /dev/null @@ -1,39 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var EditorModel = require('editorGlobal/models/editorModel'); - - var EditorBlockModel = EditorModel.extend({ - urlRoot: '/api/content/block', - _parent: 'articles', - _siblings: 'blocks', - _children: 'components', - // Block specific properties - layoutOptions: null, - dragLayoutOptions: null, - // These are the only attributes which should be permitted on a save - // TODO look into this... - whitelistAttributes: [ - '_id', - '_courseId', - '_parentId', - '_layoutOptions', - '_type', - '_sortOrder', - '_classes', - '_isOptional', - '_isAvailable', - 'body', - 'displayTitle', - 'title', - '_extensions', - 'themeSettings', - '_onScreen' - ], - - initialize: function() { - // TODO interntional override? - } - }); - - return EditorBlockModel; -}); diff --git a/frontend/src/core/editor/page/models/editorComponentModel.js b/frontend/src/core/editor/page/models/editorComponentModel.js deleted file mode 100644 index 9c5a552590..0000000000 --- a/frontend/src/core/editor/page/models/editorComponentModel.js +++ /dev/null @@ -1,35 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var EditorComponentModel = EditorModel.extend({ - urlRoot: '/api/content/component', - _parent: 'blocks', - _siblings: 'components', - _children: false, - // These are the only attributes which should be permitted on a save - // TODO look into this... - whitelistAttributes: [ - '_id', - '_componentType', - '_courseId', - '_layout', - '_parentId', - '_type', - 'properties', - '_component', - '_extensions', - '_classes', - '_isOptional', - '_isAvailable', - 'body', - 'displayTitle', - 'title', - 'version', - 'themeSettings', - '_onScreen' - ], - - initialize: function() { - // TODO intentional override? - } - }); -}); From 1468a7289eec88b31e598981c2ca03b86cb2d1ac Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 17:35:11 +0100 Subject: [PATCH 099/296] Fix logo file names --- ...t-logo.png => adapt-learning-logo-white.png} | Bin .../src/core/assets/adapt-learning-white.png | Bin 14393 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename frontend/src/core/assets/{adapt-logo.png => adapt-learning-logo-white.png} (100%) delete mode 100644 frontend/src/core/assets/adapt-learning-white.png diff --git a/frontend/src/core/assets/adapt-logo.png b/frontend/src/core/assets/adapt-learning-logo-white.png similarity index 100% rename from frontend/src/core/assets/adapt-logo.png rename to frontend/src/core/assets/adapt-learning-logo-white.png diff --git a/frontend/src/core/assets/adapt-learning-white.png b/frontend/src/core/assets/adapt-learning-white.png deleted file mode 100644 index 2fec6f5c19c90966568c296ec72d73937efd5b18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14393 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 From c9af11b3424e4c919d946cfdd49d612fe084c012 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 10:05:57 +0100 Subject: [PATCH 100/296] Add routing abstraction to router --- frontend/src/core/router.js | 61 ++++++++++++++----- frontend/src/modules/assetManagement/index.js | 2 +- .../assetManagementNewAssetSidebarView.js | 48 +++++++-------- .../views/assetManagementNewAssetView.js | 4 +- .../views/assetManagementPreviewView.js | 2 +- .../views/assetManagementSidebarView.js | 2 +- .../views/editorComponentEditSidebarView.js | 2 +- .../contentObject/views/editorMenuItemView.js | 15 ++--- .../contentObject/views/editorMenuView.js | 2 +- .../views/editorPageArticleView.js | 3 +- .../views/editorPageBlockView.js | 3 +- .../editorPageComponentListSidebarView.js | 8 +-- .../views/editorPageComponentView.js | 3 +- .../contentObject/views/editorPageView.js | 2 +- .../course/views/editorCourseEditView.js | 2 +- .../navigation/views/navigationView.js | 2 +- .../src/modules/pluginManagement/index.js | 2 +- .../views/pluginManagementSidebarView.js | 17 ++---- .../pluginManagementUploadSidebarView.js | 2 +- .../views/pluginManagementUploadView.js | 4 +- .../views/pluginManagementView.js | 2 +- frontend/src/modules/projects/index.js | 4 +- .../src/modules/projects/views/projectView.js | 6 +- .../projects/views/projectsSidebarView.js | 6 +- .../projects/views/sharedProjectView.js | 2 +- .../modules/sidebar/views/sidebarItemView.js | 16 +++-- frontend/src/modules/user/index.js | 4 +- .../src/modules/user/models/sessionModel.js | 11 ++-- .../user/models/userPasswordResetModel.js | 8 +-- .../modules/user/views/forgotPasswordView.js | 2 +- frontend/src/modules/user/views/loginView.js | 6 +- .../modules/user/views/resetPasswordView.js | 4 +- frontend/src/modules/userManagement/index.js | 2 +- 33 files changed, 132 insertions(+), 127 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index ceb6a88501..2155a6d859 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -1,10 +1,12 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { + var _ = require('underscore'); var Backbone = require('backbone'); var Origin = require('core/origin'); var PermissionsView = require('core/views/permissionsView'); var Router = Backbone.Router.extend({ + homeRoute: '', routes: { '': 'handleIndex', '_=_': 'handleIndex', @@ -26,13 +28,52 @@ define(function(require) { resetLocation: function() { Origin.location = {}; }, + /** + * Allows modules/plugins to set a custom home route + */ + setHomeRoute: function(url) { + this.homeRoute = url; + }, isUserAuthenticated: function() { return Origin.sessionModel.get('isAuthenticated') ? true : false; }, - redirectToLogin: function() { - this.navigate('#/user/login', { trigger: true }); + // Persist any dashboard routing for 'Back to courses' link + // FIXME this shouldn't be here, or work like this... + evaluateDashboardRoute: function() { + var loc = Origin.location; + if (loc && loc.module == 'dashboard') { + var suffix = loc.route1 ? '/' + loc.route1 : ''; + Origin.dashboardRoute = '/#/dashboard' + suffix; + } + }, + + /** + * Routing + */ + + navigateTo: function(route, options) { + var prefix = '#/' + if(route.slice(0,2) !== prefix) { + route = prefix + route; + } + // use the global object in case we don't have a valid 'this' reference + Origin.router.navigate(route, _.defaults(options || {}, { trigger: true })); + }, + + navigateToLogin: function() { + // use the global object in case we don't have a valid 'this' reference + Origin.router.navigateTo('user/login'); + }, + + navigateToHome: function() { + // use the global object in case we don't have a valid 'this' reference + if(!this.homeRoute) { + console.log('Router.navigateToHome: cannot load homepage, homeRoute not set'); + return; + } + Origin.router.navigateTo(this.homeRoute); }, handleIndex: function() { @@ -40,19 +81,9 @@ define(function(require) { Origin.trigger('origin:showLoading'); if (this.isUserAuthenticated()) { - this.navigate('#/dashboard', { trigger: true }); + return this.navigateToHome(); } else { - return this.redirectToLogin(); - } - }, - - // Persist any dashboard routing for 'Back to courses' link - evaluateDashboardRoute: function() { - if (Origin.location && Origin.location.module == 'dashboard') { - var suffix = Origin.location.route1 - ? '/' + Origin.location.route1 - : ''; - Origin.dashboardRoute = '/#/dashboard' + suffix; + return this.navigateToLogin(); } }, @@ -73,7 +104,7 @@ define(function(require) { type: 'error', text: window.polyglot.t('app.errorsessionexpired') }); - return this.redirectToLogin(); + return this.navigateToLogin(); } var routeArguments = arguments; diff --git a/frontend/src/modules/assetManagement/index.js b/frontend/src/modules/assetManagement/index.js index 74e7419ed4..6112410d2e 100644 --- a/frontend/src/modules/assetManagement/index.js +++ b/frontend/src/modules/assetManagement/index.js @@ -49,7 +49,7 @@ define(function(require) { }); Origin.on('globalMenu:assetManagement:open', function() { - Origin.router.navigate('#/assetManagement', {trigger: true}); + Origin.router.navigateTo('assetManagement'); }); Origin.on('app:dataReady login:changed', function() { diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js index 15a53eb1c0..dd15b35d08 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js @@ -1,29 +1,25 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/origin'); - var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); - - var AssetManagementNewAssetSidebarView = SidebarItemView.extend({ - - events: { - 'click .asset-management-new-sidebar-save-button': 'onSaveNewAssetClicked', - 'click .asset-management-new-sidebar-cancel-button': 'onCancelNewAssetClicked' - }, - - onSaveNewAssetClicked: function() { - this.updateButton('.asset-management-new-sidebar-save-button', window.polyglot.t('app.saving')); - Origin.trigger('assetManagement:newAsset'); - }, - - onCancelNewAssetClicked: function() { - Origin.router.navigate('#/assetManagement', {trigger: true}); - } - - }, { - template: 'assetManagementNewAssetSidebar' - }); - - return AssetManagementNewAssetSidebarView; - + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); + + var AssetManagementNewAssetSidebarView = SidebarItemView.extend({ + events: { + 'click .asset-management-new-sidebar-save-button': 'onSaveNewAssetClicked', + 'click .asset-management-new-sidebar-cancel-button': 'onCancelNewAssetClicked' + }, + + onSaveNewAssetClicked: function() { + this.updateButton('.asset-management-new-sidebar-save-button', window.polyglot.t('app.saving')); + Origin.trigger('assetManagement:newAsset'); + }, + + onCancelNewAssetClicked: function() { + Origin.router.navigateTo('assetManagement'); + } + }, { + template: 'assetManagementNewAssetSidebar' + }); + + return AssetManagementNewAssetSidebarView; }); diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js index 2d1ffd0355..8c56630ecb 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js @@ -93,7 +93,7 @@ define(function(require){ }); }, success: function(model, response, options) { - Origin.router.navigate('#/assetManagement', {trigger:true}); + Origin.router.navigateTo('assetManagement'); } }) } @@ -134,7 +134,7 @@ define(function(require){ Origin.trigger('assetItemView:preview', self.model); }); - Origin.router.navigate('#/assetManagement', {trigger:true}); + Origin.router.navigateTo('assetManagement'); } }); diff --git a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js index 16df40be45..3466e5b743 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js @@ -44,7 +44,7 @@ define(function(require){ onEditButtonClicked: function(event) { event.preventDefault(); var assetId = this.model.get('_id'); - Origin.router.navigate('#/assetManagement/' + assetId + '/edit', {trigger: true}); + Origin.router.navigateTo('assetManagement/' + assetId + '/edit'); }, onDeleteButtonClicked: function(event) { diff --git a/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js index 7bf10f4149..e215b76b9d 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementSidebarView.js @@ -23,7 +23,7 @@ define(function(require) { }, onAddNewAssetClicked: function() { - Origin.router.navigate('#/assetManagement/new', { trigger: true }); + Origin.router.navigateTo('assetManagement/new'); }, onFilterButtonClicked: function(event) { diff --git a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js index 2792ee9a75..feee418fcc 100644 --- a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js +++ b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js @@ -20,7 +20,7 @@ define(function(require) { event.preventDefault(); var currentCourseId = Origin.editor.data.course.get('_id'); var currentPageId = this.model.getParent().getParent().getParent().get('_id'); - Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId); + Origin.router.navigateTo('editor/' + currentCourseId + '/page/' + currentPageId); } }, { template: 'editorComponentEditSidebar' diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index c1f60a07b8..0c3aca08f7 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -118,11 +118,11 @@ define(function(require){ }, gotoPageEditor: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/page/' + this.model.get('_id')); + Origin.router.navigateTo('editor/' + Origin.editor.data.course.get('_id') + '/page/' + this.model.get('_id')); }, gotoSubMenuEditor: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/menu/' + this.model.get('_id') + '/edit'); + Origin.router.navigateTo('editor/' + Origin.editor.data.course.get('_id') + '/menu/' + this.model.get('_id') + '/edit'); }, setItemAsSelected: function() { @@ -196,14 +196,7 @@ define(function(require){ var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var menuItemId = this.model.get('_id'); - - Origin.router.navigate('#/editor/' - + courseId - + '/' - + type - + '/' - + menuItemId - + '/edit', {trigger: true}); + Origin.router.navigateTo('editor/' + courseId + '/' + type + '/' + menuItemId + '/edit'); }, deleteItemPrompt: function(event) { @@ -251,7 +244,7 @@ define(function(require){ // We also need to navigate to the parent element - but if it's the courseId let's // navigate up to the menu var parentId = (this.model.get('_parentId') === Origin.editor.data.course.id) ? '' : '/' + this.model.get('_parentId'); - Origin.router.navigate('#editor/' + Origin.editor.data.course.id + '/menu' + parentId); + Origin.router.navigateTo('editor/' + Origin.editor.data.course.id + '/menu' + parentId); if (this.model.destroy()) { this.remove(); diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuView.js b/frontend/src/modules/editor/contentObject/views/editorMenuView.js index 24646f70a0..37c5011d80 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuView.js @@ -108,7 +108,7 @@ define(function(require){ // Store the ID of the currently selected contentObject Origin.editor.currentContentObjectId = selectedItemId; // Reset the address bar to allow persistance of the 'Back' button - Origin.router.navigate('#editor/' + Origin.editor.data.course.id + '/menu/' + selectedItemId); + Origin.router.navigateTo('editor/' + Origin.editor.data.course.id + '/menu/' + selectedItemId); }, /** diff --git a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js index d4efab944c..51d185b9fe 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js @@ -171,11 +171,10 @@ define(function(require){ }, loadArticleEdit: function (event) { - console.log('loadArticleEdit'); var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var id = this.model.get('_id'); - Origin.router.navigate('#/editor/' + courseId + '/' + type + '/' + id + '/edit', { trigger: true }); + Origin.router.navigateTo('editor/' + courseId + '/' + type + '/' + id + '/edit'); }, setupDragDrop: function() { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js index 8ff2758b38..d0af4f6dfd 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js @@ -223,11 +223,10 @@ define(function(require){ }, loadBlockEdit: function (event) { - console.log('loadBlockEdit'); var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var id = this.model.get('_id'); - Origin.router.navigate('#/editor/' + courseId + '/' + type + '/' + id + '/edit', { trigger: true }); + Origin.router.navigateTo('editor/' + courseId + '/' + type + '/' + id + '/edit'); }, showComponentList: function(event) { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js index 5cd5eca53b..6738c8a55e 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js @@ -91,12 +91,8 @@ define(function(require) { }, success: function(data) { Origin.trigger('editor:refreshData', function() { - Origin.router.navigate('#/editor/' - + Origin.editor.data.course.get('_id') - + '/component/' - + data.get('_id')); + Origin.router.navigateTo('editor/' + Origin.editor.data.course.get('_id') + '/component/' + data.get('_id')); }, this); - } }); }, @@ -110,7 +106,7 @@ define(function(require) { var currentPage = currentBlock.getParent().getParent(); var currentPageId = currentPage.get('_id'); - Origin.router.navigate('#/editor/' + currentCourseId + '/page/' + currentPageId); + Origin.router.navigateTo('editor/' + currentCourseId + '/page/' + currentPageId); } }, { template: 'editorPageComponentListSidebar' diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js index ea8ef26a7b..0693372b69 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js @@ -65,11 +65,10 @@ define(function(require){ }, loadComponentEdit: function () { - console.log('loadComponentEdit'); var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var id = this.model.get('_id'); - Origin.router.navigate('#/editor/' + courseId + '/' + type + '/' + id + '/edit', { trigger: true }); + Origin.router.navigateTo('editor/' + courseId + '/' + type + '/' + id + '/edit'); }, setupDragDrop: function() { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index 5a244e43cb..8e926de3cb 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -154,7 +154,7 @@ define(function(require){ event && event.preventDefault(); var courseId = this.model.get('_courseId'); var id = this.model.get('_id'); - Origin.router.navigate('#/editor/' + courseId + '/page/' + id + '/edit'); + Origin.router.navigateTo('editor/' + courseId + '/page/' + id + '/edit'); }, // TODO fragile HACK, refactor context menu code to allow what I want to do later... diff --git a/frontend/src/modules/editor/course/views/editorCourseEditView.js b/frontend/src/modules/editor/course/views/editorCourseEditView.js index cf1b273cc0..142fff0df1 100644 --- a/frontend/src/modules/editor/course/views/editorCourseEditView.js +++ b/frontend/src/modules/editor/course/views/editorCourseEditView.js @@ -45,7 +45,7 @@ define(function(require) { onSaveSuccess: function(model, response, options) { if (this.isNew) { - return Origin.router.navigate('#/editor/' + response._id + '/menu', {trigger: true}); + return Origin.router.navigateTo('editor/' + response._id + '/menu'); } else { EditorOriginView.prototype.onSaveSuccess.apply(this, arguments); } diff --git a/frontend/src/modules/navigation/views/navigationView.js b/frontend/src/modules/navigation/views/navigationView.js index c70977e732..0b76343d10 100644 --- a/frontend/src/modules/navigation/views/navigationView.js +++ b/frontend/src/modules/navigation/views/navigationView.js @@ -46,7 +46,7 @@ define(function(require){ delete sessionModel._revertLogin; Origin.trigger('login:changed'); Origin.trigger('globalMenu:refresh'); - Origin.router.navigate('#/dashboard', {trigger: true}); + Origin.router.navigateToHome(); }, failure: function (err) { Origin.Notify.alert({ diff --git a/frontend/src/modules/pluginManagement/index.js b/frontend/src/modules/pluginManagement/index.js index 2a0e5680fc..22ad59e971 100644 --- a/frontend/src/modules/pluginManagement/index.js +++ b/frontend/src/modules/pluginManagement/index.js @@ -22,7 +22,7 @@ define(function(require) { }); Origin.on('globalMenu:pluginManagement:open', function() { - Origin.router.navigate('#/pluginManagement', {trigger: true}); + Origin.router.navigateTo('pluginManagement'); }); var globalMenuObject = { diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js index 5879367c1f..acfb21e32f 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js @@ -11,12 +11,11 @@ define(function(require) { 'click .pluginManagement-sidebar-themes' : 'onManageThemesClicked', 'click .pluginManagement-sidebar-components' : 'onManageComponentsClicked', 'click .pluginManagement-sidebar-menus' : 'onManageMenusClicked', - 'click .pluginManagement-sidebar-getPlugins' : 'onGetPluginsClicked', - 'click .pluginManagement-sidebar-dashboard' : 'returnToDashboard' + 'click .pluginManagement-sidebar-getPlugins' : 'onGetPluginsClicked' }, onAddNewPluginClicked: function () { - Origin.router.navigate('#/pluginManagement/upload', { trigger: true }); + Origin.router.navigateTo('pluginManagement/upload'); }, onManageExtensionsClicked: function () { @@ -36,21 +35,15 @@ define(function(require) { }, onGetPluginsClicked: function () { - var win = window.open("https://www.adaptlearning.org/index.php/plugin-browser/", '_blank'); + window.open("https://www.adaptlearning.org/index.php/plugin-browser/", '_blank'); }, managePluginType: function (pluginType) { - Origin.router.navigate('#/pluginManagement/' + pluginType, {trigger: false}); - }, - - returnToDashboard: function() { - Origin.router.navigate('#/dashboard', {trigger:true}); - }, - + Origin.router.navigateTo('pluginManagement/' + pluginType); + } }, { template: 'pluginManagementSidebar' }); return PluginManagementSidebarView; - }); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js index 57e55203eb..93d1f5389c 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js @@ -17,7 +17,7 @@ define(function(require) { }, onCancelButtonClicked: function() { - Origin.router.navigate('#/pluginManagement', {trigger: true}); + Origin.router.navigateTo('pluginManagement'); } }, { diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index 51de031363..d87e21a245 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -48,7 +48,7 @@ define(function(require){ }); // go back to the upload, maybe handle this in the sidebar? - Origin.router.navigate('#/pluginManagement/upload', { trigger: true }); + Origin.router.navigateTo('pluginManagement/upload'); }, success: function(data, status, xhr) { Origin.trigger('scaffold:updateSchemas', function() { @@ -59,7 +59,7 @@ define(function(require){ $('.loading').hide(); var pluginType = data.pluginType ? data.pluginType : ''; - Origin.router.navigate('#/pluginManagement/' + pluginType, {trigger:true}); + Origin.router.navigateTo('pluginManagement/' + pluginType); }, this); } }); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index 161813ee45..af8a9b3740 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -84,7 +84,7 @@ define(function(require){ $.get(this.collection.url() + '&refreshplugins=1', function (data) { Origin.trigger('scaffold:updateSchemas', function() { - Origin.router.navigate('#/pluginManagement/' + pluginType, { trigger: true }); + Origin.router.navigateTo('pluginManagement/' + pluginType); }, this); }); diff --git a/frontend/src/modules/projects/index.js b/frontend/src/modules/projects/index.js index f61e4a8685..8c4f97a0fd 100644 --- a/frontend/src/modules/projects/index.js +++ b/frontend/src/modules/projects/index.js @@ -78,10 +78,10 @@ define(function(require) { }); Origin.on('globalMenu:dashboard:open', function() { - Origin.router.navigate('#/dashboard', { trigger: true }); + Origin.router.navigateTo('dashboard'); }); - Origin.on('app:dataReady login:changed', function() { + Origin.router.setHomeRoute('dashboard'); Origin.globalMenu.addItem({ "location": "global", "text": window.polyglot.t('app.dashboard'), diff --git a/frontend/src/modules/projects/views/projectView.js b/frontend/src/modules/projects/views/projectView.js index aaef00e3bc..96ecbe8789 100644 --- a/frontend/src/modules/projects/views/projectView.js +++ b/frontend/src/modules/projects/views/projectView.js @@ -47,12 +47,12 @@ define(function(require) { editProjectSettings: function(event) { event && event.preventDefault(); - Origin.router.navigate('#/editor/' + this.model.get('_id') + '/settings', { trigger: true }); + Origin.router.navigateTo('editor/' + this.model.get('_id') + '/settings'); }, editProject: function(event) { event && event.preventDefault(); - Origin.router.navigate('#/editor/' + this.model.get('_id') + '/menu', { trigger: true }); + Origin.router.navigateTo('editor/' + this.model.get('_id') + '/menu'); }, selectProject: function(event) { @@ -113,7 +113,7 @@ define(function(require) { $.ajax({ url: this.model.getDuplicateURI(), success: function (data) { - Origin.router.navigate('/editor/' + data.newCourseId + '/settings', { trigger: true }); + Origin.router.navigateTo('editor/' + data.newCourseId + '/settings'); }, error: function() { Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorduplication') }); diff --git a/frontend/src/modules/projects/views/projectsSidebarView.js b/frontend/src/modules/projects/views/projectsSidebarView.js index 5da2d2f6df..43843d61fa 100644 --- a/frontend/src/modules/projects/views/projectsSidebarView.js +++ b/frontend/src/modules/projects/views/projectsSidebarView.js @@ -46,15 +46,15 @@ define(function(require) { }, addCourse: function() { - Origin.router.navigate('#/project/new', { trigger: true }); + Origin.router.navigateTo('project/new'); }, gotoMyCourses: function() { - Origin.router.navigate('#/dashboard', { trigger: true }); + Origin.router.navigateTo('dashboard'); }, gotoSharedCourses: function() { - Origin.router.navigate('#/dashboard/shared', { trigger: true }); + Origin.router.navigateTo('dashboard/shared'); }, filterProjectsByTitle: function(event, filter) { diff --git a/frontend/src/modules/projects/views/sharedProjectView.js b/frontend/src/modules/projects/views/sharedProjectView.js index 75d099c485..6ee07404ad 100644 --- a/frontend/src/modules/projects/views/sharedProjectView.js +++ b/frontend/src/modules/projects/views/sharedProjectView.js @@ -73,7 +73,7 @@ define(function(require){ url: this.model.getDuplicateURI(), type: 'GET', success: function (data) { - Origin.router.navigate('/editor/' + data.newCourseId + '/settings', { trigger: true }); + Origin.router.navigateTo('editor/' + data.newCourseId + '/settings'); }, error: function() { Origin.Notify.alert({ diff --git a/frontend/src/modules/sidebar/views/sidebarItemView.js b/frontend/src/modules/sidebar/views/sidebarItemView.js index 9dcc6d4107..6e489cfcdf 100644 --- a/frontend/src/modules/sidebar/views/sidebarItemView.js +++ b/frontend/src/modules/sidebar/views/sidebarItemView.js @@ -97,24 +97,28 @@ define(function(require) { this.$el.velocity({'left': '0%', 'opacity': 1}, "easeOutQuad"); }, + navigateToEditorPage: function(page) { + Origin.router.navigateTo('editor/' + Origin.editor.data.course.get('_id') + '/' + page); + }, + editProject: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/settings', {trigger: true}); + this.navigateToEditorPage('settings'); }, editConfiguration: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/config', {trigger: true}); + this.navigateToEditorPage('config'); }, selectTheme: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/selecttheme', {trigger: true}); + this.navigateToEditorPage('selecttheme'); }, editMenu: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/menusettings', {trigger: true}); + this.navigateToEditorPage('menusettings'); }, manageExtensions: function() { - Origin.router.navigate('#/editor/' + Origin.editor.data.course.get('_id') + '/extensions', {trigger: true}); + this.navigateToEditorPage('extensions'); }, downloadProject: function() { @@ -130,7 +134,7 @@ define(function(require) { }, closeProject: function() { - Origin.router.navigate('#/dashboard'); + Origin.router.navigateTo('dashboard'); } }); diff --git a/frontend/src/modules/user/index.js b/frontend/src/modules/user/index.js index a592350b5b..9a0ea73e48 100644 --- a/frontend/src/modules/user/index.js +++ b/frontend/src/modules/user/index.js @@ -12,11 +12,11 @@ define(function(require) { var UserPasswordResetModel = require('./models/userPasswordResetModel'); Origin.on('navigation:user:logout', function() { - Origin.router.navigate('#/user/logout'); + Origin.router.navigateTo('user/logout'); }); Origin.on('navigation:user:profile', function() { - Origin.router.navigate('#/user/profile'); + Origin.router.navigateTo('user/profile'); }); Origin.on('router:user', function(location, subLocation, action) { diff --git a/frontend/src/modules/user/models/sessionModel.js b/frontend/src/modules/user/models/sessionModel.js index 2dbcdfd628..fe70ecf266 100644 --- a/frontend/src/modules/user/models/sessionModel.js +++ b/frontend/src/modules/user/models/sessionModel.js @@ -32,7 +32,7 @@ define(function(require) { self.set('_canRevert', false); Origin.trigger('login:changed'); - Origin.router.navigate('#/user/login', {trigger: true}); + Origin.router.navigateToLogin(); }); }, @@ -47,15 +47,12 @@ define(function(require) { if (jqXHR.success) { self.set('id', jqXHR.id); self.set('tenantId', jqXHR.tenantId); - self.set('email', jqXHR.email); + self.set('email', jqXHR.email); self.set('isAuthenticated', jqXHR.success); self.set('permissions', jqXHR.permissions); Origin.trigger('login:changed'); - - Origin.trigger('schemas:loadData', function() { - Origin.router.navigate('#/dashboard', {trigger: true}); - }); + Origin.trigger('schemas:loadData', Origin.router.navigateToHome); } }, error: function (jqXHR, textStatus, errorThrown) { @@ -73,4 +70,4 @@ define(function(require) { return SessionModel; -}); \ No newline at end of file +}); diff --git a/frontend/src/modules/user/models/userPasswordResetModel.js b/frontend/src/modules/user/models/userPasswordResetModel.js index 2c1d280251..e0f63cac2c 100644 --- a/frontend/src/modules/user/models/userPasswordResetModel.js +++ b/frontend/src/modules/user/models/userPasswordResetModel.js @@ -34,10 +34,8 @@ define(function(require) { validationErrors.confirmPassword = window.polyglot.t('app.validationpasswordmatch'); } } - - return _.isEmpty(validationErrors) - ? null - : validationErrors; + + return _.isEmpty(validationErrors) ? null : validationErrors; }, resetPassword: function () { @@ -53,7 +51,7 @@ define(function(require) { }, success: function (jqXHR, textStatus, errorThrown) { if (jqXHR.success) { - Origin.router.navigate('#/dashboard', {trigger: true}); + Origin.router.navigateToHome(); } }, error: function (jqXHR, textStatus, errorThrown) { diff --git a/frontend/src/modules/user/views/forgotPasswordView.js b/frontend/src/modules/user/views/forgotPasswordView.js index c752a827a6..0092963416 100644 --- a/frontend/src/modules/user/views/forgotPasswordView.js +++ b/frontend/src/modules/user/views/forgotPasswordView.js @@ -22,7 +22,7 @@ define(function(require) { goToLogin: function(e) { e && e.preventDefault(); - Origin.router.navigate('#/user/login', {trigger: true}); + Origin.router.navigateToLogin(); }, handleKeydown: function(e) { diff --git a/frontend/src/modules/user/views/loginView.js b/frontend/src/modules/user/views/loginView.js index d96145f595..9e408750e1 100644 --- a/frontend/src/modules/user/views/loginView.js +++ b/frontend/src/modules/user/views/loginView.js @@ -14,7 +14,7 @@ define(function(require) { 'keydown #login-input-username' : 'clearErrorStyling', 'keydown #login-input-password' : 'clearErrorStyling', 'click .login-form-submit' : 'submitLoginDetails', - 'click button.dash' : 'goToDash' + 'click button.dash' : 'goHome' }, preRender: function() { @@ -26,9 +26,9 @@ define(function(require) { Origin.trigger('login:loaded'); }, - goToDash: function(e) { + goHome: function(e) { e && e.preventDefault(); - Origin.router.navigate('#/dashboard', { trigger: true }); + Origin.router.navigateToHome(); }, handleEnterKey: function(e) { diff --git a/frontend/src/modules/user/views/resetPasswordView.js b/frontend/src/modules/user/views/resetPasswordView.js index 1cb5775738..5f96bdbc73 100644 --- a/frontend/src/modules/user/views/resetPasswordView.js +++ b/frontend/src/modules/user/views/resetPasswordView.js @@ -25,7 +25,7 @@ define(function(require) { goToLogin: function(e) { e && e.preventDefault(); - Origin.router.navigate('#/user/login', { trigger: true }); + Origin.router.navigateToLogin(); }, handleValidationError: function(model, error) { @@ -44,7 +44,7 @@ define(function(require) { verifyToken: function() { // Invalid token entered, take the user to login if (!this.model.get('user')) { - Origin.router.navigate('#/user/login', {trigger: true}); + Origin.router.navigateToLogin(); } }, diff --git a/frontend/src/modules/userManagement/index.js b/frontend/src/modules/userManagement/index.js index b3a159be4b..cae4b5a289 100644 --- a/frontend/src/modules/userManagement/index.js +++ b/frontend/src/modules/userManagement/index.js @@ -39,7 +39,7 @@ define(function(require) { }); Origin.on('globalMenu:userManagement:open', function() { - Origin.router.navigate('#/userManagement', {trigger: true}); + Origin.router.navigateTo('userManagement'); }); Origin.on('router:userManagement', function(location, subLocation, action) { From 0d303421ed799e26be8a4481902d9430ecd89b87 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 10:17:08 +0100 Subject: [PATCH 101/296] Add semicolon --- .../editor/contentObject/views/editorPageEditSidebarView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js index 688611b4bf..eb8ae9ee81 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving')) + this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving')); Origin.trigger('editorPageEditSidebar:views:save'); }, From 7a9798c64a6acc2ae525b3a4f57fa3ddce5c55ac Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 10:17:23 +0100 Subject: [PATCH 102/296] Fix editor templates whitespace --- .../contentObject/templates/editorPage.hbs | 10 +--- .../templates/editorPageArticle.hbs | 28 ++++------- .../templates/editorPageBlock.hbs | 19 ++------ .../templates/editorPageComponent.hbs | 25 ++++------ .../templates/editorPageComponentList.hbs | 40 ++++++++-------- .../templates/editorPageComponentListItem.hbs | 48 ++++++++----------- .../editorPageComponentListSidebar.hbs | 31 ++++-------- .../editorPageComponentPasteZone.hbs | 6 +-- .../templates/editorPageEdit.hbs | 3 +- .../templates/editorPageEditSidebar.hbs | 25 ++++------ 10 files changed, 88 insertions(+), 147 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/templates/editorPage.hbs b/frontend/src/modules/editor/contentObject/templates/editorPage.hbs index 76848b65fc..63babbea4f 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPage.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPage.hbs @@ -1,14 +1,8 @@

- - - - {{#if displayTitle}} - {{displayTitle}} - {{else}} - {{title}} - {{/if}} + + {{#if displayTitle}}{{displayTitle}}{{else}}{{title}}{{/if}}

{{body}}
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs index 4b0d698798..6b5ac97b0b 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageArticle.hbs @@ -1,26 +1,16 @@ {{>part_editorItemSidebar}}
- -
-
- -

- {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -

-
{{{body}}}
- -
+
+
+

{{#if displayTitle}}{{{displayTitle}}}{{else}}{{title}}{{/if}}

+
{{{body}}}
+
-
- -
- {{t 'app.addblock'}} -
+
+
+ {{t 'app.addblock'}} +
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs index f7dbc7399f..1d5ca0a219 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageBlock.hbs @@ -1,24 +1,15 @@ {{>part_editorItemSidebar}}
-
-

- {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -

+

{{#if displayTitle}}{{{displayTitle}}}{{else}}{{title}}{{/if}}

{{{body}}}
-
- + {{#if layoutOptions}} -
+
{{t 'app.addcomponent'}} -
+
{{/if}} - -
\ No newline at end of file +
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs index 75a131b912..bf45c2ccd4 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageComponent.hbs @@ -1,20 +1,11 @@ {{>part_editorItemSidebar}}
- -
- {{#if _componentTypeDisplayName}} -
{{_componentTypeDisplayName}}
- {{/if}} -

- {{#if displayTitle}} - {{{displayTitle}}} - {{else}} - {{title}} - {{/if}} -

-
{{{body}}}
- -
- -
\ No newline at end of file +
+ {{#if _componentTypeDisplayName}} +
{{_componentTypeDisplayName}}
+ {{/if}} +

{{#if displayTitle}}{{{displayTitle}}}{{else}}{{title}}{{/if}}

+
{{{body}}}
+
+
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs index 58af0dc0ec..bb0a36f805 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageComponentList.hbs @@ -1,31 +1,33 @@
-
+ +
+ +
- -
-

- {{t 'app.addcomponent'}} -

-
+
+

{{t 'app.addcomponent'}}

+
+
+
+ {{t 'app.pleaseselectcomponent'}} +
+
-
-
- {{t 'app.pleaseselectcomponent'}} -
+
+
+
- -
-
-
+
+
+
-
-
- +
-
\ No newline at end of file + +
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs index a175615141..1163282562 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListItem.hbs @@ -1,30 +1,24 @@
-
- {{#if displayName}} -
- {{displayName}} - {{#if description}}
{{description}}{{/if}} -
- {{/if}} +
+ {{#if displayName}} +
+ {{displayName}} + {{#if description}} +
{{description}} + {{/if}} +
+ {{/if}}
\ No newline at end of file +
+ {{#if availablePositions.left}} + {{t 'app.addtoleft'}} + {{/if}} + {{#if availablePositions.full}} + {{t 'app.addfullwidth'}} + {{/if}} + {{#if availablePositions.right}} + {{t 'app.addtoright'}} + {{/if}} +
+
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs index 6ba1e3889b..0c0e251496 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs @@ -1,23 +1,12 @@
-{{!--
-

- Component Select -

-
--}} - - - -
+ + + +
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs index 5a5a2c82d8..9f043f00e4 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageComponentPasteZone.hbs @@ -1,4 +1,4 @@
- {{t 'app.paste'}} - {{t 'app.cancel'}} -
\ No newline at end of file + {{t 'app.paste'}} + {{t 'app.cancel'}} +
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs index 11a8f6fdb6..24343eeb56 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageEdit.hbs @@ -1,2 +1 @@ -
-
+
diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs index 563645f425..caeec0502b 100644 --- a/frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs +++ b/frontend/src/modules/editor/contentObject/templates/editorPageEditSidebar.hbs @@ -1,19 +1,10 @@
-{{!--
-

- Page Edit -

-
--}} -
- - -
+
+ + +
From 11dde221e98336ce7ad99f842f2d0351fe45b122 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:06:17 +0100 Subject: [PATCH 103/296] Fix loading LESS --- frontend/src/core/less/app.less | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/frontend/src/core/less/app.less b/frontend/src/core/less/app.less index 791c6e95ea..537498d7d7 100644 --- a/frontend/src/core/less/app.less +++ b/frontend/src/core/less/app.less @@ -25,6 +25,8 @@ span.error { // Loading overlay styling // ======================= +@loading-icon-size: 8px; + .loading { width: 100vw; height: 100vh; @@ -43,17 +45,12 @@ span.error { &.cover-top-bar { position:fixed; z-index:50000; - .loading-inner { - margin-top:41px; - } } .loading-inner { margin-top: 25%; } - @loading-icon-size: 8px; - .loading-logo { margin-bottom: @loading-icon-size; img { @@ -61,13 +58,6 @@ span.error { } } - .loading-text { - h3 { - font-size: 16px; - font-weight: 500; - } - } - .loading-anim { margin: 0 auto 15px auto; text-align: center; From 27990026cd7b39a33536bc769bdcf5612ebafa76 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:07:06 +0100 Subject: [PATCH 104/296] Add callback to editorDataLoader.loadCourseData --- .../src/modules/editor/global/editorDataLoader.js | 4 +++- .../editor/global/views/editorOriginView.js | 15 +++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index 85dc1494e6..d472e7d621 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -62,8 +62,9 @@ define(function(require) { }, /** * Loads course-specific data + * Accepts callback for editor:refreshData */ - loadCourseData: function() { + loadCourseData: function(callback) { if(!preloader.hasLoadedGlobalData()) { return Origin.on('editor:dataPreloaded', preloader.loadCourseData); } @@ -90,6 +91,7 @@ define(function(require) { } // fetch all collections fetchEditorData(courseData, function() { + if(callback) callback.apply(Origin.editor.data); Origin.trigger('editor:dataLoaded'); }); }, diff --git a/frontend/src/modules/editor/global/views/editorOriginView.js b/frontend/src/modules/editor/global/views/editorOriginView.js index a6e628f8ee..f240aee0e7 100644 --- a/frontend/src/modules/editor/global/views/editorOriginView.js +++ b/frontend/src/modules/editor/global/views/editorOriginView.js @@ -177,7 +177,6 @@ define(function(require){ e.stopPropagation(); e.preventDefault(); } - console.log(this.mode.attributes); Origin.trigger('editorView:paste', this.model.get('_parentId'), $(event.target).data('sort-order'), $(event.target).data('paste-layout')); }, @@ -186,19 +185,19 @@ define(function(require){ Origin.trigger('editorView:pasteCancel', this.model); }, + onSaveSuccess: function() { + Origin.trigger('editor:refreshData', _.bind(function() { + Backbone.history.history.back(); + this.remove(); + }, this)); + }, + onSaveError: function(pTitle, pText) { var title = _.isString(pTitle) ? pTitle : window.polyglot.t('app.errordefaulttitle'); var text = _.isString(pText) ? pText : window.polyglot.t('app.errorsave'); Origin.Notify.alert({ type: 'error', title: title, text: text }); Origin.trigger('sidebar:resetButtons'); - }, - - onSaveSuccess: function() { - Origin.trigger('editor:refreshData', function() { - Backbone.history.history.back(); - this.remove(); - }, this); } }); From e94341908f8f6f34ad55e60cb321c1737e0d7036 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 09:22:31 +0100 Subject: [PATCH 105/296] Fix .no-projects styling --- frontend/src/modules/projects/less/projects.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/modules/projects/less/projects.less b/frontend/src/modules/projects/less/projects.less index cbe7c68892..d336974225 100644 --- a/frontend/src/modules/projects/less/projects.less +++ b/frontend/src/modules/projects/less/projects.less @@ -1,3 +1,5 @@ +@import 'colours'; + @default-project-bg: url(/css/assets/origami-project.jpg); .projects { @@ -125,8 +127,11 @@ ul.projects-options { border:none; } -.projects-no-projects { +.no-projects { text-align:center; + font-size: 16px; + margin-top: 10%; + color: @tertiary-color; } .sidebar-search-tag { From 1ef36839646d178a02313b61da41646ef35c1fde Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 09:21:37 +0100 Subject: [PATCH 106/296] Move navigation instantiation to its module folder --- frontend/src/core/app.js | 8 +++----- frontend/src/modules/navigation/index.js | 6 ++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index c28639d3d5..5d985cf6d4 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -55,19 +55,17 @@ 'modules/navigation/views/navigationView' ], function(Origin, Router, SessionModel, NavigationView) { Origin.router = new Router(); - Origin.sessionModel = new SessionModel(); Origin.sessionModel.fetch({ success: function(data) { - // need schemas before the app loads + // need the schemas before the app loads Origin.trigger('schemas:loadData', function() { - // TODO move this to the navigation modules folder - $('#app').before(new NavigationView({ model: Origin.sessionModel }).$el); Origin.trigger('app:dataReady'); // _.defer to give anything tapping into app:dataReady event time to execute _.defer(Origin.initialize); }); - } + }, + error: console.error }); }); } diff --git a/frontend/src/modules/navigation/index.js b/frontend/src/modules/navigation/index.js index 8e937ea614..8555f5fe7b 100644 --- a/frontend/src/modules/navigation/index.js +++ b/frontend/src/modules/navigation/index.js @@ -1,3 +1,5 @@ -define(function(require) { - console.log('TODO set up to load navigation view'); +define(['core/origin', './views/navigationView'], function(Origin, NavigationView) { + Origin.once('app:dataReady', function() { + $('#app').before(new NavigationView({ model: Origin.sessionModel }).$el); + }); }); From 36e756bc6a088dda9f1da91e1bb5ebf85f9ed295 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:37:51 +0100 Subject: [PATCH 107/296] Refactor route handler for readability --- frontend/src/core/router.js | 92 ++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 43 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index 2155a6d859..ecbd6ccea3 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -18,11 +18,24 @@ define(function(require) { this.resetLocation(); }, - setLocation: function(routeArgs) { + updateLocation: function(routeArgs) { + // save the previous location + Origin.previousLocation = Origin.location; + + this.evaluateDashboardRoute(); + this.resetLocation(); _.each(this.locationKeys, function(key, index) { Origin.location[key] = routeArgs[index]; }); + + var mod = routeArgs[0]; + var route1 = routeArgs[1]; + $('body') + .removeClass() + .addClass('module-' + mod + ((route1) ? ' location-' + route1 : '')); + + Origin.trigger('location:change', Origin.location); }, resetLocation: function() { @@ -39,6 +52,29 @@ define(function(require) { return Origin.sessionModel.get('isAuthenticated') ? true : false; }, + /** + * Checks user permissions for route + */ + verifyRoute: function(module, route1) { + // Check this user has permissions + if (!Origin.permissions.checkRoute(Backbone.history.fragment)) { + Origin.trigger('sidebar:sidebarContainer:hide'); + Origin.trigger('location:title:hide'); + $('.app-inner').append(new PermissionsView().$el); + return false; + } + // FIXME routes shouldn't be hard-coded + if(!this.isUserAuthenticated() && (module !== 'user' && route1 !== 'login')) { + Origin.Notify.alert({ + type: 'error', + text: window.polyglot.t('app.errorsessionexpired'), + callback: _.bind(this.navigateToLogin, this) + }); + return false; + } + return true; + }, + // Persist any dashboard routing for 'Back to courses' link // FIXME this shouldn't be here, or work like this... evaluateDashboardRoute: function() { @@ -53,74 +89,44 @@ define(function(require) { * Routing */ + navigateBack: function() { + Backbone.history.history.back(); + }, + navigateTo: function(route, options) { - var prefix = '#/' + var prefix = '#/'; if(route.slice(0,2) !== prefix) { route = prefix + route; } - // use the global object in case we don't have a valid 'this' reference + // use Origin.router.navigate in case we don't have a valid 'this' reference Origin.router.navigate(route, _.defaults(options || {}, { trigger: true })); }, navigateToLogin: function() { - // use the global object in case we don't have a valid 'this' reference + // use Origin.router.navigate in case we don't have a valid 'this' reference Origin.router.navigateTo('user/login'); }, navigateToHome: function() { - // use the global object in case we don't have a valid 'this' reference if(!this.homeRoute) { console.log('Router.navigateToHome: cannot load homepage, homeRoute not set'); return; } + // use Origin.router.navigate in case we don't have a valid 'this' reference Origin.router.navigateTo(this.homeRoute); }, handleIndex: function() { - // Show loading on any route Origin.trigger('origin:showLoading'); - - if (this.isUserAuthenticated()) { - return this.navigateToHome(); - } else { - return this.navigateToLogin(); - } + this.isUserAuthenticated() ? this.navigateToHome() : this.navigateToLogin(); }, handleRoute: function(module, route1, route2, route3, route4) { - // Show loading on any route - Origin.trigger('origin:showLoading'); - // Remove views Origin.removeViews(); - // Check this user has permissions - if (!Origin.permissions.checkRoute(Backbone.history.fragment)) { - Origin.trigger('sidebar:sidebarContainer:hide'); - Origin.trigger('location:title:hide'); - return $('.app-inner').append(new PermissionsView().$el); - } - // Verify the user is authenticated - if (!this.isUserAuthenticated() && (module !== 'user' && route1 !== 'login')) { - Origin.Notify.alert({ - type: 'error', - text: window.polyglot.t('app.errorsessionexpired') - }); - return this.navigateToLogin(); - } - - var routeArguments = arguments; - // Set previous location object - Origin.previousLocation = Origin.location; - this.evaluateDashboardRoute(); - this.setLocation(routeArguments); - // Trigger location change - Origin.trigger('location:change', Origin.location); - - var locationClass = 'module-' + Origin.location.module; - if (Origin.location.route1) { - locationClass += ' location-' + Origin.location.route1 + if(!this.verifyRoute(module, route1)) { + return; } - $('body').removeClass().addClass(locationClass); - // Trigger router event + this.updateLocation(arguments); Origin.trigger('router:' + module, route1, route2, route3, route4); } }); From 3a1253e05c41310e665d7a71216861df472ec836 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:38:05 +0100 Subject: [PATCH 108/296] Add defensive programming --- frontend/src/modules/editor/global/editorDataLoader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index d472e7d621..0dab0ce9a2 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -91,7 +91,7 @@ define(function(require) { } // fetch all collections fetchEditorData(courseData, function() { - if(callback) callback.apply(Origin.editor.data); + if(_.isFunction(callback)) callback.apply(Origin.editor.data); Origin.trigger('editor:dataLoaded'); }); }, From ac2e21b61fbff5efc4205ad726e50c6396021d00 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:38:18 +0100 Subject: [PATCH 109/296] Switch to router wrapper function --- frontend/src/modules/editor/global/views/editorOriginView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/global/views/editorOriginView.js b/frontend/src/modules/editor/global/views/editorOriginView.js index f240aee0e7..eb9ba61c65 100644 --- a/frontend/src/modules/editor/global/views/editorOriginView.js +++ b/frontend/src/modules/editor/global/views/editorOriginView.js @@ -187,7 +187,7 @@ define(function(require){ onSaveSuccess: function() { Origin.trigger('editor:refreshData', _.bind(function() { - Backbone.history.history.back(); + Origin.router.navigateBack(); this.remove(); }, this)); }, From b52a67261dca8d78a3408b77976175d9cdd14d65 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 09:20:36 +0100 Subject: [PATCH 110/296] Add Origin l10n wrapper for polyglot # Conflicts: # frontend/src/core/router.js # frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js # frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js # frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js # frontend/src/modules/user/views/userProfileView.js --- frontend/src/core/contextMenu.js | 24 ++++++++--------- frontend/src/core/helpers.js | 4 +-- frontend/src/core/l10n.js | 17 +++++++++--- frontend/src/core/router.js | 2 +- frontend/src/modules/assetManagement/index.js | 2 +- .../views/assetManagementModalNewAssetView.js | 6 ++--- .../assetManagementNewAssetSidebarView.js | 2 +- .../views/assetManagementNewAssetView.js | 6 ++--- .../views/assetManagementPreviewView.js | 8 +++--- .../views/editorArticleEditSidebarView.js | 2 +- .../block/views/editorBlockEditSidebarView.js | 2 +- .../views/editorComponentEditSidebarView.js | 2 +- .../views/editorConfigEditSidebarView.js | 2 +- .../src/modules/editor/contentObject/index.js | 4 +-- .../contentObject/views/editorMenuItemView.js | 4 +-- .../views/editorMenuLayerView.js | 14 +++++----- .../views/editorPageArticleView.js | 12 ++++----- .../views/editorPageBlockView.js | 10 +++---- .../views/editorPageComponentListItemView.js | 6 ++--- .../editorPageComponentListSidebarView.js | 12 ++++----- .../views/editorPageComponentView.js | 4 +-- .../views/editorPageEditSidebarView.js | 2 +- .../contentObject/views/editorPageView.js | 6 ++--- frontend/src/modules/editor/course/index.js | 8 +++--- .../views/editorCourseEditSidebarView.js | 2 +- .../views/editorExtensionsEditView.js | 6 ++--- .../modules/editor/global/editorDataLoader.js | 2 +- frontend/src/modules/editor/global/helpers.js | 2 +- .../editor/global/views/editorOriginView.js | 8 +++--- .../modules/editor/global/views/editorView.js | 18 ++++++------- .../editorMenuSettingsEditSidebarView.js | 2 +- .../views/editorMenuSettingsEditView.js | 2 +- .../views/editorThemeCollectionSidebarView.js | 2 +- .../views/editorThemeCollectionView.js | 4 +-- .../selectTheme/views/editorThemeEditView.js | 4 +-- .../navigation/views/navigationView.js | 2 +- .../src/modules/notify/plugins/alert/index.js | 18 ++++++------- .../pluginManagementUploadSidebarView.js | 2 +- .../views/pluginManagementUploadView.js | 6 ++--- .../views/pluginManagementView.js | 6 ++--- .../pluginManagement/views/pluginTypeView.js | 12 ++++----- frontend/src/modules/projects/index.js | 12 ++++----- .../src/modules/projects/views/projectView.js | 10 +++---- .../projects/views/projectsSidebarView.js | 2 +- .../projects/views/sharedProjectView.js | 4 +-- frontend/src/modules/scaffold/index.js | 10 +++---- .../modules/scaffold/models/schemasModel.js | 2 +- .../scaffold/views/scaffoldAssetView.js | 4 +-- frontend/src/modules/user/index.js | 2 +- .../user/models/userPasswordResetModel.js | 10 +++---- .../modules/user/models/userProfileModel.js | 8 +++--- frontend/src/modules/user/views/loginView.js | 8 +++--- .../modules/user/views/resetPasswordView.js | 2 +- .../user/views/userProfileSidebarView.js | 2 +- .../src/modules/user/views/userProfileView.js | 27 +++++++++---------- frontend/src/modules/userManagement/index.js | 2 +- .../userManagement/views/addUserView.js | 6 ++--- .../views/userManagementView.js | 2 +- .../modules/userManagement/views/userView.js | 16 +++++------ 59 files changed, 199 insertions(+), 189 deletions(-) diff --git a/frontend/src/core/contextMenu.js b/frontend/src/core/contextMenu.js index dc916534bf..fd72a70802 100644 --- a/frontend/src/core/contextMenu.js +++ b/frontend/src/core/contextMenu.js @@ -30,22 +30,22 @@ define(function(require) { // Setup context menu items var contextItems = [ { - title: window.polyglot.t('app.edit'), + title: Origin.l10n.t('app.edit'), className: 'context-menu-item', callbackEvent: "edit" }, { - title: window.polyglot.t('app.copy'), + title: Origin.l10n.t('app.copy'), className: 'context-menu-item', callbackEvent: "copy" }, { - title: window.polyglot.t('app.copyidtoclipboard'), + title: Origin.l10n.t('app.copyidtoclipboard'), className: 'context-menu-item', callbackEvent: "copyID" }, { - title: window.polyglot.t('app.delete'), + title: Origin.l10n.t('app.delete'), className: 'context-menu-item', callbackEvent: "delete" } @@ -58,12 +58,12 @@ define(function(require) { ContextMenu.addItem('page-min', [ { - title: window.polyglot.t('app.edit'), + title: Origin.l10n.t('app.edit'), className: 'context-menu-item', callbackEvent: "edit" }, { - title: window.polyglot.t('app.copyidtoclipboard'), + title: Origin.l10n.t('app.copyidtoclipboard'), className: 'context-menu-item', callbackEvent: "copyID" } @@ -75,22 +75,22 @@ define(function(require) { var courseContextItems = [ { - title: window.polyglot.t('app.editsettings'), + title: Origin.l10n.t('app.editsettings'), className: 'context-menu-item', callbackEvent: 'editSettings' }, { - title: window.polyglot.t('app.editcourse'), + title: Origin.l10n.t('app.editcourse'), className: 'context-menu-item', callbackEvent: 'edit' }, { - title: window.polyglot.t('app.copy'), + title: Origin.l10n.t('app.copy'), className: 'context-menu-item', callbackEvent: 'duplicate' }, { - title: window.polyglot.t('app.delete'), + title: Origin.l10n.t('app.delete'), className: 'context-menu-item', callbackEvent: 'delete' } @@ -100,12 +100,12 @@ define(function(require) { var sharedCourseContextItems = [ { - title: window.polyglot.t('app.duplicate'), + title: Origin.l10n.t('app.duplicate'), className: 'context-menu-item', callbackEvent: 'duplicate' }, { - title: window.polyglot.t('app.preview'), + title: Origin.l10n.t('app.preview'), className: 'context-menu-item', callbackEvent: 'preview' } diff --git a/frontend/src/core/helpers.js b/frontend/src/core/helpers.js index 219f616356..d914ee2c83 100644 --- a/frontend/src/core/helpers.js +++ b/frontend/src/core/helpers.js @@ -124,7 +124,7 @@ define(function(require){ for (var placeholder in options.hash) { options[placeholder] = options.hash[placeholder]; } - return (window.polyglot != undefined ? window.polyglot.t(str, options) : str); + return Origin.l10n.t(str, options); }, stripHtml: function(html) { return new Handlebars.SafeString(html); @@ -343,7 +343,7 @@ define(function(require){ Origin.Notify.alert({ type: 'error', - title: window.polyglot.t('app.validationfailed'), + title: Origin.l10n.t('app.validationfailed'), text: errorMessage, callback: _.bind(this.validateCourseConfirm, this) }); diff --git a/frontend/src/core/l10n.js b/frontend/src/core/l10n.js index 0ecd0a86cc..94dd1d9ae4 100644 --- a/frontend/src/core/l10n.js +++ b/frontend/src/core/l10n.js @@ -1,10 +1,21 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(['require', 'jquery', 'polyglot', 'core/origin'], function(require, $, Polyglot, Origin) { + var polyglot; + // set up global l10n object + Origin.l10n = { + t: function(string, data) { + if(!polyglot || !polyglot.t) { + return string; + } + return polyglot.t.apply(polyglot, arguments); + } + }; + /** + * Initialise from language file + */ var locale = localStorage.getItem('lang') || 'en'; - // Get the language file $.getJSON('lang/' + locale, function(data) { - // Instantiate Polyglot with phrases - window.polyglot = new Polyglot({ phrases: data }); + polyglot = new Polyglot({ phrases: data }); Origin.trigger('l10n:loaded'); }); }); diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index ecbd6ccea3..df6acd09d7 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -67,7 +67,7 @@ define(function(require) { if(!this.isUserAuthenticated() && (module !== 'user' && route1 !== 'login')) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorsessionexpired'), + text: Origin.l10n.t('app.errorsessionexpired'), callback: _.bind(this.navigateToLogin, this) }); return false; diff --git a/frontend/src/modules/assetManagement/index.js b/frontend/src/modules/assetManagement/index.js index 6112410d2e..29835a4b59 100644 --- a/frontend/src/modules/assetManagement/index.js +++ b/frontend/src/modules/assetManagement/index.js @@ -55,7 +55,7 @@ define(function(require) { Origin.on('app:dataReady login:changed', function() { Origin.globalMenu.addItem({ "location": "global", - "text": window.polyglot.t('app.assetmanagement'), + "text": Origin.l10n.t('app.assetmanagement'), "icon": "fa-file-image-o", "callbackEvent": "assetManagement:open", "sortOrder": 2 diff --git a/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js index dda3e659db..2a3b353476 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementModalNewAssetView.js @@ -64,7 +64,7 @@ define(function(require){ if (!$.trim($(el).val())) { validated = false; $(el).addClass('input-error'); - $(errormsg).text(window.polyglot.t('app.pleaseentervalue')); + $(errormsg).text(Origin.l10n.t('app.pleaseentervalue')); } else { $(el).removeClass('input-error'); $(errormsg).text(''); @@ -73,7 +73,7 @@ define(function(require){ if (!uploadFile.val()) { validated = false; $(uploadFile).addClass('input-error'); - $(uploadFileErrormsg).text(window.polyglot.t('app.pleaseaddfile')); + $(uploadFileErrormsg).text(Origin.l10n.t('app.pleaseaddfile')); } else { $(uploadFile).removeClass('input-error'); $(uploadFileErrormsg).text(''); @@ -101,7 +101,7 @@ define(function(require){ error: function(model, response, options) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorassetupdate') + text: Origin.l10n.t('app.errorassetupdate') }); }, success: _.bind(function(model, response, options) { diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js index dd15b35d08..90bec67e05 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetSidebarView.js @@ -10,7 +10,7 @@ define(function(require) { }, onSaveNewAssetClicked: function() { - this.updateButton('.asset-management-new-sidebar-save-button', window.polyglot.t('app.saving')); + this.updateButton('.asset-management-new-sidebar-save-button', Origin.l10n.t('app.saving')); Origin.trigger('assetManagement:newAsset'); }, diff --git a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js index 8c56630ecb..c445fb69eb 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementNewAssetView.js @@ -50,7 +50,7 @@ define(function(require){ if (!$.trim($(el).val())) { validated = false; $(el).addClass('input-error'); - $(errormsg).text(window.polyglot.t('app.pleaseentervalue')); + $(errormsg).text(Origin.l10n.t('app.pleaseentervalue')); } else { $(el).removeClass('input-error'); $(errormsg).text(''); @@ -60,7 +60,7 @@ define(function(require){ if (this.model.isNew() && !uploadFile.val()) { validated = false; $(uploadFile).addClass('input-error'); - $(uploadFileErrormsg).text(window.polyglot.t('app.pleaseaddfile')); + $(uploadFileErrormsg).text(Origin.l10n.t('app.pleaseaddfile')); } else { $(uploadFile).removeClass('input-error'); $(uploadFileErrormsg).text(''); @@ -89,7 +89,7 @@ define(function(require){ error: function(model, response, options) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorassetupdate') + text: Origin.l10n.t('app.errorassetupdate') }); }, success: function(model, response, options) { diff --git a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js index 3466e5b743..34c35deb95 100644 --- a/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js +++ b/frontend/src/modules/assetManagement/views/assetManagementPreviewView.js @@ -52,7 +52,7 @@ define(function(require){ Origin.Notify.confirm({ type: 'warning', - text: window.polyglot.t('app.assetconfirmdelete'), + text: Origin.l10n.t('app.assetconfirmdelete'), callback: _.bind(this.onDeleteConfirmed, this) }); }, @@ -76,7 +76,7 @@ define(function(require){ error: function(data) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errordeleteasset', { message: data.message }) + text: Origin.l10n.t('app.errordeleteasset', { message: data.message }) }); } }); @@ -89,7 +89,7 @@ define(function(require){ event.preventDefault(); Origin.Notify.confirm({ - text: window.polyglot.t('app.assetconfirmrestore'), + text: Origin.l10n.t('app.assetconfirmrestore'), callback: _.bind(this.onRestoreConfirmed, this) }); }, @@ -109,7 +109,7 @@ define(function(require){ error: function(data) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorrestoreasset', { message: data.message }) + text: Origin.l10n.t('app.errorrestoreasset', { message: data.message }) }); } }); diff --git a/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js b/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js index 2dc5457329..dd8d4a31dd 100644 --- a/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js +++ b/frontend/src/modules/editor/article/views/editorArticleEditSidebarView.js @@ -16,7 +16,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-article-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-article-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorArticleEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js b/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js index 1379504f40..f4e68dc074 100644 --- a/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js +++ b/frontend/src/modules/editor/block/views/editorBlockEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-block-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-block-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorBlockEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js index feee418fcc..f2f4478cc9 100644 --- a/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js +++ b/frontend/src/modules/editor/component/views/editorComponentEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event.preventDefault(); - this.updateButton('.editor-component-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-component-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorComponentEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js b/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js index a138bc4758..60cd78eadc 100644 --- a/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js +++ b/frontend/src/modules/editor/config/views/editorConfigEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-config-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-config-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorConfigEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js index 11cc1b7d0a..ac67c9199c 100644 --- a/frontend/src/modules/editor/contentObject/index.js +++ b/frontend/src/modules/editor/contentObject/index.js @@ -87,8 +87,8 @@ define(function(require) { var containingBlock = Origin.editor.data.blocks.findWhere({ _id: Origin.location.route3 }); var layoutOptions = containingBlock.get('layoutOptions'); var componentsModel = new Backbone.Model({ - title: window.polyglot.t('app.addcomponent'), - body: window.polyglot.t('app.pleaseselectcomponent'), + title: Origin.l10n.t('app.addcomponent'), + body: Origin.l10n.t('app.pleaseselectcomponent'), _parentId: route3, componentTypes: Origin.editor.data.componenttypes.toJSON(), layoutOptions: layoutOptions diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index 0c3aca08f7..d143301600 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -209,8 +209,8 @@ define(function(require){ Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deleteitem'+ this.model.get('_type')), - text: window.polyglot.t('app.confirmdelete' + this.model.get('_type')) + '
' + '
' + window.polyglot.t('app.confirmdeletewarning' + this.model.get('_type')), + title: Origin.l10n.t('app.deleteitem'+ this.model.get('_type')), + text: Origin.l10n.t('app.confirmdelete' + this.model.get('_type')) + '
' + '
' + Origin.l10n.t('app.confirmdeletewarning' + this.model.get('_type')), callback: function(isConfirmed) { self.onConfirmRemovePopup(isConfirmed); } diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js index 370a7524c2..02652f64be 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js @@ -67,10 +67,10 @@ define(function(require) { var newMenuItemModel = new ContentObjectModel({ _parentId: this._parentId, _courseId: Origin.editor.data.course.get('_id'), - title: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), - displayTitle: (type == 'page'? window.polyglot.t('app.placeholdernewpage') : window.polyglot.t('app.placeholdernewmenu')), + title: (type == 'page'? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), + displayTitle: (type == 'page'? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), body: '', - linkText: window.polyglot.t('app.view'), + linkText: Origin.l10n.t('app.view'), graphic: { alt: '', src: '' }, _type: type }); @@ -83,7 +83,7 @@ define(function(require) { newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), + text: Origin.l10n.t('app.errormenueditorbody'), }); _.delay(newMenuItemView.remove, 3000); }, @@ -114,11 +114,11 @@ define(function(require) { this.pageModel = model; this.pageView = newMenuItemView; typeToAdd = 'article'; - newChildTitle = window.polyglot.t('app.placeholdernewarticle'); + newChildTitle = Origin.l10n.t('app.placeholdernewarticle'); var newChildModel = new ArticleModel(); } else { typeToAdd = 'block'; - newChildTitle = window.polyglot.t('app.placeholdernewblock'); + newChildTitle = Origin.l10n.t('app.placeholdernewblock'); var newChildModel = new BlockModel(); } @@ -133,7 +133,7 @@ define(function(require) { newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errormenueditorbody'), + text: Origin.l10n.t('app.errormenueditorbody'), }); _.delay(newMenuItemView.remove, 3000); }, diff --git a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js index 51d185b9fe..31f3023da7 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js @@ -119,8 +119,8 @@ define(function(require){ }]; var newPageBlockModel = new BlockModel({ - title: window.polyglot.t('app.placeholdernewblock'), - displayTitle: window.polyglot.t('app.placeholdernewblock'), + title: Origin.l10n.t('app.placeholdernewblock'), + displayTitle: Origin.l10n.t('app.placeholdernewblock'), body: '', _parentId: self.model.get('_id'), _courseId: Origin.editor.data.course.get('_id'), @@ -130,7 +130,7 @@ define(function(require){ newPageBlockModel.save(null, { error: function() { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.erroraddingblock') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.erroraddingblock') }); }, success: function(model, response, options) { var newBlockView = self.addBlockView(model, true); @@ -146,8 +146,8 @@ define(function(require){ Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deletearticle'), - text: window.polyglot.t('app.confirmdeletearticle') + '
' + '
' + window.polyglot.t('app.confirmdeletearticlewarning'), + title: Origin.l10n.t('app.deletearticle'), + text: Origin.l10n.t('app.confirmdeletearticle') + '
' + '
' + Origin.l10n.t('app.confirmdeletearticlewarning'), callback: _.bind(this.deleteArticleConfirm, this) }); @@ -165,7 +165,7 @@ define(function(require){ this.model.destroy({ success: _.bind(this.remove, this), error: function(error) { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') }); } }); }, diff --git a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js index d0af4f6dfd..012fec0ff7 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js @@ -90,8 +90,8 @@ define(function(require){ Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deleteblock'), - text: window.polyglot.t('app.confirmdeleteblock') + '
' + '
' + window.polyglot.t('app.confirmdeleteblockwarning'), + title: Origin.l10n.t('app.deleteblock'), + text: Origin.l10n.t('app.confirmdeleteblock') + '
' + '
' + Origin.l10n.t('app.confirmdeleteblockwarning'), callback: _.bind(this.deleteBlockConfirm, this) }); }, @@ -106,7 +106,7 @@ define(function(require){ this.model.destroy({ success: _.bind(this.remove, this), error: function(model, response) { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') }); } }); }, @@ -236,8 +236,8 @@ define(function(require){ var layoutOptions = this.model.get('layoutOptions'); var componentSelectModel = new Backbone.Model({ - title: window.polyglot.t('app.addcomponent'), - body: window.polyglot.t('app.pleaseselectcomponent'), + title: Origin.l10n.t('app.addcomponent'), + body: Origin.l10n.t('app.pleaseselectcomponent'), _parentId: this.model.get('_id'), componentTypes: Origin.editor.data.componenttypes.toJSON(), layoutOptions: layoutOptions diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js index 264deece4c..511ec06c78 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListItemView.js @@ -70,8 +70,8 @@ define(function(require) { }); var newComponentModel = new ComponentModel({ - title: window.polyglot.t('app.placeholdernewcomponent'), - displayTitle: window.polyglot.t('app.placeholdernewcomponent'), + title: Origin.l10n.t('app.placeholdernewcomponent'), + displayTitle: Origin.l10n.t('app.placeholdernewcomponent'), body: '', _parentId: this._parentId, _courseId: Origin.editor.data.course.get('_id'), @@ -92,7 +92,7 @@ define(function(require) { newComponentModel.save(null, { error: function() { $('html').css('overflow-y', ''); - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.erroraddingcomponent') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.erroraddingcomponent') }); }, success: _.bind(function() { Origin.editor.data.components.add(newComponentModel); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js index 6738c8a55e..356f60a0c8 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js @@ -15,7 +15,7 @@ define(function(require) { onSaveClicked: function(event) { event && event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-component-list-sidebar-save', Origin.l10n.t('app.saving')); if(!this.model.get('component') || !this.model.get('layout')) { return; @@ -29,7 +29,7 @@ define(function(require) { var newComponentModel = new ComponentModel(); newComponentModel.save({ - title: window.polyglot.t('app.placeholdernewcomponent'), + title: Origin.l10n.t('app.placeholdernewcomponent'), displayTitle: '', body: '', _parentId: this.model.get('_parentId'), @@ -44,7 +44,7 @@ define(function(require) { error: function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.erroraddingcomponent') + text: Origin.l10n.t('app.erroraddingcomponent') }); }, success: function() { @@ -57,7 +57,7 @@ define(function(require) { onSaveAndEditClicked: function(event) { event && event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save-edit', window.polyglot.t('app.saving')); + this.updateButton('.editor-component-list-sidebar-save-edit', Origin.l10n.t('app.saving')); if(!this.model.get('component') || !this.model.get('layout')) { return; @@ -71,7 +71,7 @@ define(function(require) { var newComponentModel = new ComponentModel(); newComponentModel.save({ - title: window.polyglot.t('app.placeholdernewcomponent'), + title: Origin.l10n.t('app.placeholdernewcomponent'), displayTitle: '', body: '', _parentId: this.model.get('_parentId'), @@ -86,7 +86,7 @@ define(function(require) { error: function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.erroraddingcomponent') + text: Origin.l10n.t('app.erroraddingcomponent') }); }, success: function(data) { diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js index 0693372b69..817e5ffc68 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js @@ -43,8 +43,8 @@ define(function(require){ Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deletecomponent'), - text: window.polyglot.t('app.confirmdeletecomponent') + '
' + '
' + window.polyglot.t('app.confirmdeletecomponentwarning'), + title: Origin.l10n.t('app.deletecomponent'), + text: Origin.l10n.t('app.confirmdeletecomponent') + '
' + '
' + Origin.l10n.t('app.confirmdeletecomponentwarning'), callback: _.bind(this.deleteComponentConfirm, this) }); }, diff --git a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js index eb8ae9ee81..b0ed832abb 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-page-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-page-edit-sidebar-save', Origin.l10n.t('app.saving')) Origin.trigger('editorPageEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index 8e926de3cb..eafe9d12ed 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -125,8 +125,8 @@ define(function(require){ var _this = this; var newPageArticleModel = new ArticleModel({ - title: window.polyglot.t('app.placeholdernewarticle'), - displayTitle: window.polyglot.t('app.placeholdernewarticle'), + title: Origin.l10n.t('app.placeholdernewarticle'), + displayTitle: Origin.l10n.t('app.placeholdernewarticle'), body: '', _parentId: _this.model.get('_id'), _courseId: Origin.editor.data.course.get('_id'), @@ -139,7 +139,7 @@ define(function(require){ error: function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.erroraddingarticle') + text: Origin.l10n.t('app.erroraddingarticle') }); }, success: function(model, response, options) { diff --git a/frontend/src/modules/editor/course/index.js b/frontend/src/modules/editor/course/index.js index 290fb479dd..9e4dae03cc 100644 --- a/frontend/src/modules/editor/course/index.js +++ b/frontend/src/modules/editor/course/index.js @@ -21,7 +21,7 @@ define(function(require) { (new CourseModel({ _id: Origin.location.route1 })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: window.polyglot.t('app.editcourse') }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.editcourse') }); Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); } @@ -30,11 +30,11 @@ define(function(require) { function createNewCourse() { var model = new CourseModel({ - title: window.polyglot.t('app.placeholdernewcourse'), - displayTitle: window.polyglot.t('app.placeholdernewcourse') + title: Origin.l10n.t('app.placeholdernewcourse'), + displayTitle: Origin.l10n.t('app.placeholdernewcourse') }); var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: window.polyglot.t('app.addnewproject') }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.addnewproject') }); Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); } diff --git a/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js b/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js index cb7104b7fd..816690a280 100644 --- a/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js +++ b/frontend/src/modules/editor/course/views/editorCourseEditSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { save: function(event) { event && event.preventDefault(); - this.updateButton('.editor-project-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-project-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('projectEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js index d19d4877c9..b9b1d113a5 100644 --- a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js @@ -55,7 +55,7 @@ define(function(require) { postData: function(url) { $.post(url + this.model.get('_id'), { extensions: this.currentSelectedIds }, _.bind(function(result) { if(!result.success) { - return Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgeneric') }); + return Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgeneric') }); } this.refreshData(); }, this)); @@ -93,8 +93,8 @@ define(function(require) { Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deleteextension'), - text: window.polyglot.t('app.confirmdeleteextension'), + title: Origin.l10n.t('app.deleteextension'), + text: Origin.l10n.t('app.confirmdeleteextension'), callback: _.bind(this.onRemoveExtensionConfirmed, this) }); }, diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index 0dab0ce9a2..8d1cb2e6e9 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -212,7 +212,7 @@ define(function(require) { function onFetchError(model, response, options) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); } diff --git a/frontend/src/modules/editor/global/helpers.js b/frontend/src/modules/editor/global/helpers.js index 342db89737..039dca276d 100644 --- a/frontend/src/modules/editor/global/helpers.js +++ b/frontend/src/modules/editor/global/helpers.js @@ -20,7 +20,7 @@ define(function(require) { titleKey = 'editor' + type; } var modelTitle = model && model.get && model.get('title'); - var langString = window.polyglot.t('app.' + titleKey); + var langString = Origin.l10n.t('app.' + titleKey); Origin.trigger('location:title:update', { title: modelTitle || langString }); }, diff --git a/frontend/src/modules/editor/global/views/editorOriginView.js b/frontend/src/modules/editor/global/views/editorOriginView.js index eb9ba61c65..25939acaf0 100644 --- a/frontend/src/modules/editor/global/views/editorOriginView.js +++ b/frontend/src/modules/editor/global/views/editorOriginView.js @@ -102,11 +102,11 @@ define(function(require){ if (errors) { var errorText = - window.polyglot.t('app.validationfailedmessage') + "

" + + Origin.l10n.t('app.validationfailedmessage') + "

" + this.buildErrorMessage(errors, ''); // TODO remove when we've got a better solution - this.onSaveError(window.polyglot.t('app.validationfailed'), errorText); + this.onSaveError(Origin.l10n.t('app.validationfailed'), errorText); return; } @@ -193,8 +193,8 @@ define(function(require){ }, onSaveError: function(pTitle, pText) { - var title = _.isString(pTitle) ? pTitle : window.polyglot.t('app.errordefaulttitle'); - var text = _.isString(pText) ? pText : window.polyglot.t('app.errorsave'); + var title = _.isString(pTitle) ? pTitle : Origin.l10n.t('app.errordefaulttitle'); + var text = _.isString(pText) ? pText : Origin.l10n.t('app.errorsave'); Origin.Notify.alert({ type: 'error', title: title, text: text }); Origin.trigger('sidebar:resetButtons'); diff --git a/frontend/src/modules/editor/global/views/editorView.js b/frontend/src/modules/editor/global/views/editorView.js index e6eed9eba2..ef45628aa5 100644 --- a/frontend/src/modules/editor/global/views/editorView.js +++ b/frontend/src/modules/editor/global/views/editorView.js @@ -102,7 +102,7 @@ define(function(require){ Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); } }, @@ -111,7 +111,7 @@ define(function(require){ Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); } }); @@ -154,7 +154,7 @@ define(function(require){ Origin.Notify.alert({ type: 'error', - title: window.polyglot.t('app.exporterrortitle'), + title: Origin.l10n.t('app.exporterrortitle'), text: messageText }); } @@ -205,7 +205,7 @@ define(function(require){ self.resetPreviewProgress(); Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneratingpreview') + text: Origin.l10n.t('app.errorgeneratingpreview') }); } }, @@ -213,7 +213,7 @@ define(function(require){ self.resetPreviewProgress(); Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); } }); @@ -291,7 +291,7 @@ define(function(require){ }, this)).fail(_.bind(function (jqXHR, textStatus, errorThrown) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorcopy') + (jqXHR.message ? '\n\n' + jqXHR.message : '') + text: Origin.l10n.t('app.errorcopy') + (jqXHR.message ? '\n\n' + jqXHR.message : '') }); this.hidePasteZones(); }, this)); @@ -303,12 +303,12 @@ define(function(require){ if (helpers.copyStringToClipboard(id)) { Origin.Notify.alert({ type: 'success', - text: window.polyglot.t('app.copyidtoclipboardsuccess', { id: id }) + text: Origin.l10n.t('app.copyidtoclipboardsuccess', { id: id }) }); } else { Origin.Notify.alert({ type: 'warning', - text: window.polyglot.t('app.app.copyidtoclipboarderror', { id: id }) + text: Origin.l10n.t('app.app.copyidtoclipboarderror', { id: id }) }); } }, @@ -327,7 +327,7 @@ define(function(require){ }).fail(function(jqXHR, textStatus, errorThrown) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorpaste') + (jqXHR.message ? '\n\n' + jqXHR.message : '') + text: Origin.l10n.t('app.errorpaste') + (jqXHR.message ? '\n\n' + jqXHR.message : '') }); }); }, diff --git a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js index 2f040d830f..320641099a 100644 --- a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js +++ b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditSidebarView.js @@ -11,7 +11,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-menusettings-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-menusettings-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorMenuSettingsEditSidebar:views:save'); } }, { diff --git a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js index 7b5d64739d..a45a99def0 100644 --- a/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js +++ b/frontend/src/modules/editor/menuSettings/views/editorMenuSettingsEditView.js @@ -43,7 +43,7 @@ define(function(require) { event && event.preventDefault(); if(this.collection.findWhere({ _isSelected: true }) === undefined) { - return this.onSaveError(null, window.polyglot.t('app.errornomenuselected')); + return this.onSaveError(null, Origin.l10n.t('app.errornomenuselected')); } $.post('/api/menu/' + selectedMenu.get('_id') + '/makeitso/' + this.model.get('_courseId')) .error(this.onSaveError) diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js index 702b370201..9b0ffc1226 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { saveEditing: function(event) { event && event.preventDefault(); - this.updateButton('.editor-theme-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.editor-theme-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('editorThemeEditSidebar:views:save'); }, diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js index 8b4ce7453d..e970cccc88 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeCollectionView.js @@ -50,7 +50,7 @@ define(function(require) { Origin.trigger('sidebar:resetButtons'); Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errornothemeselected') + text: Origin.l10n.t('app.errornothemeselected') }); return; } @@ -59,7 +59,7 @@ define(function(require) { .error(function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorsave') + text: Origin.l10n.t('app.errorsave') }); }) .done(_.bind(function() { diff --git a/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js b/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js index ed5325012a..6624bfabf8 100644 --- a/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js +++ b/frontend/src/modules/editor/selectTheme/views/editorThemeEditView.js @@ -55,7 +55,7 @@ define(function(require) { if (selectedTheme === undefined) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errornothemeselected') + text: Origin.l10n.t('app.errornothemeselected') }); Origin.trigger('sidebar:resetButtons'); @@ -70,7 +70,7 @@ define(function(require) { .error(function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorsave') + text: Origin.l10n.t('app.errorsave') }); }) .done(_.bind(function() { diff --git a/frontend/src/modules/navigation/views/navigationView.js b/frontend/src/modules/navigation/views/navigationView.js index 0b76343d10..d2eafa9859 100644 --- a/frontend/src/modules/navigation/views/navigationView.js +++ b/frontend/src/modules/navigation/views/navigationView.js @@ -51,7 +51,7 @@ define(function(require){ failure: function (err) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorlogginginas') + text: Origin.l10n.t('app.errorlogginginas') }); } }); diff --git a/frontend/src/modules/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js index dc37c129cc..d4ba90a42b 100644 --- a/frontend/src/modules/notify/plugins/alert/index.js +++ b/frontend/src/modules/notify/plugins/alert/index.js @@ -15,21 +15,21 @@ define(function(require) { switch(data.type) { case 'confirm': data.type = null; - defaults.title = window.polyglot.t('app.confirmdefaulttitle'); + defaults.title = Origin.l10n.t('app.confirmdefaulttitle'); break; case 'warning': - defaults.title = window.polyglot.t('app.warningdefaulttitle'); + defaults.title = Origin.l10n.t('app.warningdefaulttitle'); break; case 'input': break; case 'success': - defaults.title = window.polyglot.t('app.successdefaulttitle'); + defaults.title = Origin.l10n.t('app.successdefaulttitle'); break; case 'info': - defaults.title = window.polyglot.t('app.infodefaulttitle'); + defaults.title = Origin.l10n.t('app.infodefaulttitle'); break; case 'error': - defaults.title = window.polyglot.t('app.errordefaulttitle'); + defaults.title = Origin.l10n.t('app.errordefaulttitle'); break; default: if (data.type) { @@ -78,8 +78,8 @@ define(function(require) { var defaults = { type: data.type || 'confirm', showCancelButton: true, - confirmButtonText: window.polyglot.t('app.confirmdefaultyes'), - cancelButtonText: window.polyglot.t('app.no') + confirmButtonText: Origin.l10n.t('app.confirmdefaultyes'), + cancelButtonText: Origin.l10n.t('app.no') }; openPopup(_.extend(defaults, data)); @@ -91,7 +91,7 @@ define(function(require) { var setWaitText = function(n) { $('.sweet-alert button.confirm').html( '' + - window.polyglot.t('app.confirmwait') + + Origin.l10n.t('app.confirmwait') + ' ' + n ); @@ -108,7 +108,7 @@ define(function(require) { clearInterval(interval); interval = setInterval(function() { if(--count > 0) { - $('.sweet-alert button.confirm').html('' + window.polyglot.t('app.confirmwait') + ' ' + count); + $('.sweet-alert button.confirm').html('' + Origin.l10n.t('app.confirmwait') + ' ' + count); } else { clearInterval(interval); $('.sweet-alert button.confirm').text(oldLabel); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js index 93d1f5389c..17d84472f9 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js @@ -12,7 +12,7 @@ define(function(require) { }, onSaveButtonClicked: function() { - this.updateButton('.pluginManagement-upload-sidebar-save-button', window.polyglot.t('app.saving')); + this.updateButton('.pluginManagement-upload-sidebar-save-button', Origin.l10n.t('app.saving')); Origin.trigger('pluginManagement:uploadPlugin'); }, diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index d87e21a245..112a7f425d 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -16,7 +16,7 @@ define(function(require){ }, preRender: function() { - Origin.trigger('location:title:update', {title: window.polyglot.t('app.uploadplugin')}); + Origin.trigger('location:title:update', {title: Origin.l10n.t('app.uploadplugin')}); this.listenTo(Origin, 'pluginManagement:uploadPlugin', this.uploadFile); }, @@ -43,7 +43,7 @@ define(function(require){ } Origin.Notify.alert({ type: 'error', - title: window.polyglot.t('app.uploadpluginerror'), + title: Origin.l10n.t('app.uploadpluginerror'), text: Helpers.decodeHTML(message) }); @@ -54,7 +54,7 @@ define(function(require){ Origin.trigger('scaffold:updateSchemas', function() { Origin.Notify.alert({ type: 'success', - text: window.polyglot.t('app.uploadpluginsuccess') + text: Origin.l10n.t('app.uploadpluginsuccess') }); $('.loading').hide(); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index af8a9b3740..ac4f331868 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -40,7 +40,7 @@ define(function(require){ }, preRender: function() { - Origin.trigger('location:title:update', { title: window.polyglot.t('app.' + this.pluginType + 'management') }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.' + this.pluginType + 'management') }); this.initialiseCollection(); }, @@ -66,7 +66,7 @@ define(function(require){ evaluatePluginTypeCount: function(pluginTypes) { if(pluginTypes.length === 0) { - this.$('.pluginManagement-plugins').append(window.polyglot.t('app.noplugintypes')); + this.$('.pluginManagement-plugins').append(Origin.l10n.t('app.noplugintypes')); } }, @@ -80,7 +80,7 @@ define(function(require){ return false; } - $btn.addClass('disabled').html(window.polyglot.t('app.updating')); + $btn.addClass('disabled').html(Origin.l10n.t('app.updating')); $.get(this.collection.url() + '&refreshplugins=1', function (data) { Origin.trigger('scaffold:updateSchemas', function() { diff --git a/frontend/src/modules/pluginManagement/views/pluginTypeView.js b/frontend/src/modules/pluginManagement/views/pluginTypeView.js index b73d95ae99..a8790abf4c 100644 --- a/frontend/src/modules/pluginManagement/views/pluginTypeView.js +++ b/frontend/src/modules/pluginManagement/views/pluginTypeView.js @@ -37,16 +37,16 @@ define(function(require){ return false; } - btn.html(window.polyglot.t('app.checking')); + btn.html(Origin.l10n.t('app.checking')); $.ajax({ 'method': 'GET', 'url': this.model.urlRoot + '/checkversion/' + this.model.get('_id') }).done(function (data) { if (data.isUpdateable) { - btn.removeClass('plugin-update-check').addClass('plugin-update-confirm').html(window.polyglot.t('app.updateplugin')); + btn.removeClass('plugin-update-check').addClass('plugin-update-confirm').html(Origin.l10n.t('app.updateplugin')); } else { btn.addClass('disabled'); - btn.html(window.polyglot.t('app.uptodate')); + btn.html(Origin.l10n.t('app.uptodate')); } }); @@ -61,7 +61,7 @@ define(function(require){ return false; } - btn.html(window.polyglot.t('app.updating')); + btn.html(Origin.l10n.t('app.updating')); btn.addClass('disabled'); // hit the update endpoint @@ -75,10 +75,10 @@ define(function(require){ if (_.contains(data.targets), that.model.get('_id')) { // Refresh the schemas Origin.trigger('scaffold:updateSchemas', function() { - btn.html(window.polyglot.t('app.uptodate')); + btn.html(Origin.l10n.t('app.uptodate')); }, this); } else { - btn.html(window.polyglot.t('app.updatefailed')); + btn.html(Origin.l10n.t('app.updatefailed')); } }); diff --git a/frontend/src/modules/projects/index.js b/frontend/src/modules/projects/index.js index 8c4f97a0fd..cc1e0d8464 100644 --- a/frontend/src/modules/projects/index.js +++ b/frontend/src/modules/projects/index.js @@ -13,35 +13,35 @@ define(function(require) { Origin.trigger('location:title:update', {title: 'Dashboard - viewing my courses'}); Origin.options.addItems([ { - title: window.polyglot.t('app.grid'), + title: Origin.l10n.t('app.grid'), icon: 'th', callbackEvent: 'dashboard:layout:grid', value: 'grid', group: 'layout', }, { - title: window.polyglot.t('app.list'), + title: Origin.l10n.t('app.list'), icon: 'list', callbackEvent: 'dashboard:layout:list', value: 'list', group: 'layout' }, { - title: window.polyglot.t('app.ascending'), + title: Origin.l10n.t('app.ascending'), icon: 'sort-alpha-asc', callbackEvent: 'dashboard:sort:asc', value: 'asc', group: 'sort' }, { - title: window.polyglot.t('app.descending'), + title: Origin.l10n.t('app.descending'), icon: 'sort-alpha-desc', callbackEvent: 'dashboard:sort:desc', value: 'desc', group: 'sort' }, { - title: window.polyglot.t('app.recent'), + title: Origin.l10n.t('app.recent'), icon: 'edit', callbackEvent: 'dashboard:sort:updated', value: 'updated', @@ -84,7 +84,7 @@ define(function(require) { Origin.router.setHomeRoute('dashboard'); Origin.globalMenu.addItem({ "location": "global", - "text": window.polyglot.t('app.dashboard'), + "text": Origin.l10n.t('app.dashboard'), "icon": "fa-home", "callbackEvent": "dashboard:open", "sortOrder": 1 diff --git a/frontend/src/modules/projects/views/projectView.js b/frontend/src/modules/projects/views/projectView.js index 96ecbe8789..89555801de 100644 --- a/frontend/src/modules/projects/views/projectView.js +++ b/frontend/src/modules/projects/views/projectView.js @@ -76,8 +76,8 @@ define(function(require) { if(this.model.get('_isShared') === true) { Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deletesharedproject'), - text: window.polyglot.t('app.confirmdeleteproject') + '

' + window.polyglot.t('app.confirmdeletesharedprojectwarning'), + title: Origin.l10n.t('app.deletesharedproject'), + text: Origin.l10n.t('app.confirmdeleteproject') + '

' + Origin.l10n.t('app.confirmdeletesharedprojectwarning'), destructive: true, callback: _.bind(this.deleteProjectConfirm, this) }); @@ -85,8 +85,8 @@ define(function(require) { } Origin.Notify.confirm({ type: 'warning', - title: window.polyglot.t('app.deleteproject'), - text: window.polyglot.t('app.confirmdeleteproject') + '

' + window.polyglot.t('app.confirmdeleteprojectwarning'), + title: Origin.l10n.t('app.deleteproject'), + text: Origin.l10n.t('app.confirmdeleteproject') + '

' + Origin.l10n.t('app.confirmdeleteprojectwarning'), callback: _.bind(this.deleteProjectConfirm, this) }); }, @@ -116,7 +116,7 @@ define(function(require) { Origin.router.navigateTo('editor/' + data.newCourseId + '/settings'); }, error: function() { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorduplication') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorduplication') }); } }); }, diff --git a/frontend/src/modules/projects/views/projectsSidebarView.js b/frontend/src/modules/projects/views/projectsSidebarView.js index 43843d61fa..3bd919d1cd 100644 --- a/frontend/src/modules/projects/views/projectsSidebarView.js +++ b/frontend/src/modules/projects/views/projectsSidebarView.js @@ -100,7 +100,7 @@ define(function(require) { }, this); Origin.trigger('sidebar:sidebarFilter:add', { - title: window.polyglot.t('app.filterbytag'), + title: Origin.l10n.t('app.filterbytag'), items: availableTags }); }, diff --git a/frontend/src/modules/projects/views/sharedProjectView.js b/frontend/src/modules/projects/views/sharedProjectView.js index 6ee07404ad..055eab7510 100644 --- a/frontend/src/modules/projects/views/sharedProjectView.js +++ b/frontend/src/modules/projects/views/sharedProjectView.js @@ -59,7 +59,7 @@ define(function(require){ promptDuplicateProject: function() { var self = this; Origin.Notify.confirm({ - text: window.polyglot.t('app.confirmduplicate'), + text: Origin.l10n.t('app.confirmduplicate'), callback: function(confirmed) { if (confirmed) { self.duplicateProject(); @@ -78,7 +78,7 @@ define(function(require){ error: function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorduplication') + text: Origin.l10n.t('app.errorduplication') }); } }); diff --git a/frontend/src/modules/scaffold/index.js b/frontend/src/modules/scaffold/index.js index 694526092e..ccbf175c68 100644 --- a/frontend/src/modules/scaffold/index.js +++ b/frontend/src/modules/scaffold/index.js @@ -73,7 +73,7 @@ define(function(require) { type: (Backbone.Form.editors[field.items.inputType]) ? field.items.inputType : 'List', itemType: 'Object', subSchema: field.items.properties, - confirmDelete: window.polyglot.t('app.confirmdelete'), + confirmDelete: Origin.l10n.t('app.confirmdelete'), fieldType: 'List' } } @@ -209,21 +209,21 @@ define(function(require) { // Setup default fieldsets var fieldsets = { general: { - legend: window.polyglot.t('app.general'), + legend: Origin.l10n.t('app.general'), fields: [] }, // ::TODO // I want to remove this please properties: { - legend: window.polyglot.t('app.properties'), + legend: Origin.l10n.t('app.properties'), fields: [] }, settings :{ - legend: window.polyglot.t('app.settings'), + legend: Origin.l10n.t('app.settings'), fields: [] }, extensions: { - legend: window.polyglot.t('app.extensions'), + legend: Origin.l10n.t('app.extensions'), fields: ['_extensions'] } }; diff --git a/frontend/src/modules/scaffold/models/schemasModel.js b/frontend/src/modules/scaffold/models/schemasModel.js index 231535619e..e8106bc2bf 100644 --- a/frontend/src/modules/scaffold/models/schemasModel.js +++ b/frontend/src/modules/scaffold/models/schemasModel.js @@ -20,7 +20,7 @@ define(function(require) { callback.call(); }, error: function() { - Origin.Notify.alert({ type: 'error', text: window.polyglot.t('app.errorgettingschemas') }); + Origin.Notify.alert({ type: 'error', text: Origin.l10n.t('app.errorgettingschemas') }); } }); } diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js index de1dcf053f..0133a3dc87 100644 --- a/frontend/src/modules/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/modules/scaffold/views/scaffoldAssetView.js @@ -236,7 +236,7 @@ define(function(require) { error: function(error) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorsaveasset') + text: Origin.l10n.t('app.errorsaveasset') }); }, success: function() { @@ -301,7 +301,7 @@ define(function(require) { error: function() { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorsaveasset') + text: Origin.l10n.t('app.errorsaveasset') }); }, success: function() { diff --git a/frontend/src/modules/user/index.js b/frontend/src/modules/user/index.js index 9a0ea73e48..c7773ad870 100644 --- a/frontend/src/modules/user/index.js +++ b/frontend/src/modules/user/index.js @@ -43,7 +43,7 @@ define(function(require) { break; case 'profile': settings.authenticate = true; - Origin.trigger('location:title:update', {title: window.polyglot.t('app.editprofiletitle')}); + Origin.trigger('location:title:update', {title: Origin.l10n.t('app.editprofiletitle')}); currentView = UserProfileView; break; } diff --git a/frontend/src/modules/user/models/userPasswordResetModel.js b/frontend/src/modules/user/models/userPasswordResetModel.js index e0f63cac2c..a4856d3963 100644 --- a/frontend/src/modules/user/models/userPasswordResetModel.js +++ b/frontend/src/modules/user/models/userPasswordResetModel.js @@ -20,18 +20,18 @@ define(function(require) { var validationErrors = {}; if (!attributes.password) { - validationErrors.password = window.polyglot.t('app.validationrequired'); + validationErrors.password = Origin.l10n.t('app.validationrequired'); } else { if (attributes.password.length < 8) { - validationErrors.password = window.polyglot.t('app.validationlength', {length: 8}); + validationErrors.password = Origin.l10n.t('app.validationlength', {length: 8}); } } if (!attributes.confirmPassword) { - validationErrors.confirmPassword = window.polyglot.t('app.validationrequired'); + validationErrors.confirmPassword = Origin.l10n.t('app.validationrequired'); } else { if (attributes.password !== attributes.confirmPassword) { - validationErrors.confirmPassword = window.polyglot.t('app.validationpasswordmatch'); + validationErrors.confirmPassword = Origin.l10n.t('app.validationpasswordmatch'); } } @@ -57,7 +57,7 @@ define(function(require) { error: function (jqXHR, textStatus, errorThrown) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); } }); diff --git a/frontend/src/modules/user/models/userProfileModel.js b/frontend/src/modules/user/models/userProfileModel.js index 56238d43b2..4d389c90e7 100644 --- a/frontend/src/modules/user/models/userProfileModel.js +++ b/frontend/src/modules/user/models/userProfileModel.js @@ -14,19 +14,19 @@ define(function(require) { var validationErrors = {}; if (!attributes.firstName) { - validationErrors.firstName = window.polyglot.t('app.validationrequired'); + validationErrors.firstName = Origin.l10n.t('app.validationrequired'); } if (!attributes.lastName) { - validationErrors.lastName = window.polyglot.t('app.validationrequired'); + validationErrors.lastName = Origin.l10n.t('app.validationrequired'); } if (attributes._isNewPassword) { if (!attributes.password) { - validationErrors.password = window.polyglot.t('app.validationrequired'); + validationErrors.password = Origin.l10n.t('app.validationrequired'); } else { if (attributes.password.length < 8) { - validationErrors.password = window.polyglot.t('app.validationlength', {length: 8}); + validationErrors.password = Origin.l10n.t('app.validationlength', {length: 8}); } } } diff --git a/frontend/src/modules/user/views/loginView.js b/frontend/src/modules/user/views/loginView.js index 9e408750e1..4e3a81c871 100644 --- a/frontend/src/modules/user/views/loginView.js +++ b/frontend/src/modules/user/views/loginView.js @@ -73,16 +73,16 @@ define(function(require) { switch (errorCode) { case LoginView.ERR_INVALID_CREDENTIALS: case LoginView.ERR_MISSING_FIELDS: - errorMessage = window.polyglot.t('app.invalidusernameorpassword'); + errorMessage = Origin.l10n.t('app.invalidusernameorpassword'); break; case LoginView.ERR_ACCOUNT_LOCKED: - errorMessage = window.polyglot.t('app.accountislocked'); + errorMessage = Origin.l10n.t('app.accountislocked'); break; case LoginView.ERR_TENANT_DISABLED: - errorMessage = window.polyglot.t('app.tenantnotenabled'); + errorMessage = Origin.l10n.t('app.tenantnotenabled'); break; case LoginView.ERR_ACCOUNT_INACTIVE: - errorMessage = window.polyglot.t('app.accountnotactive'); + errorMessage = Origin.l10n.t('app.accountnotactive'); break; } diff --git a/frontend/src/modules/user/views/resetPasswordView.js b/frontend/src/modules/user/views/resetPasswordView.js index 5f96bdbc73..1e6f787978 100644 --- a/frontend/src/modules/user/views/resetPasswordView.js +++ b/frontend/src/modules/user/views/resetPasswordView.js @@ -66,7 +66,7 @@ define(function(require) { error: _.bind(function(model, response, options) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.resetpassworderror') + text: Origin.l10n.t('app.resetpassworderror') }); },this) }); diff --git a/frontend/src/modules/user/views/userProfileSidebarView.js b/frontend/src/modules/user/views/userProfileSidebarView.js index dd0a589c62..ba629b5277 100644 --- a/frontend/src/modules/user/views/userProfileSidebarView.js +++ b/frontend/src/modules/user/views/userProfileSidebarView.js @@ -14,7 +14,7 @@ define(function(require) { save: function(event) { event.preventDefault(); - this.updateButton('.user-profile-edit-sidebar-save', window.polyglot.t('app.saving')); + this.updateButton('.user-profile-edit-sidebar-save', Origin.l10n.t('app.saving')); Origin.trigger('userProfileSidebar:views:save'); }, diff --git a/frontend/src/modules/user/views/userProfileView.js b/frontend/src/modules/user/views/userProfileView.js index 647d5b5759..28136d87af 100644 --- a/frontend/src/modules/user/views/userProfileView.js +++ b/frontend/src/modules/user/views/userProfileView.js @@ -36,7 +36,6 @@ define(function(require){ this.$('#' + key + 'Error').text(value); }, this); this.$('.error-text').removeClass('display-none'); - console.log(error); } }, @@ -47,19 +46,19 @@ define(function(require){ }, togglePasswordUI: function(model, showPaswordUI) { - var formSelector = 'div.change-password-section .form-group .inner'; - var buttonSelector = '.change-password'; + var formSelector = 'div.change-password-section .form-group .inner'; + var buttonSelector = '.change-password'; if (showPaswordUI) { this.$(formSelector).removeClass('display-none'); - this.$(buttonSelector).text(window.polyglot.t('app.cancel')); + this.$(buttonSelector).text(Origin.l10n.t('app.cancel')); } else { - this.$(buttonSelector).text(window.polyglot.t('app.changepassword')); + this.$(buttonSelector).text(Origin.l10n.t('app.changepassword')); this.$(formSelector).addClass('display-none'); this.$('#password').val('').removeClass('display-none'); this.$('#passwordText').val('').addClass('display-none'); - this.$('.toggle-password i').addClass('fa-eye').removeClass('fa-eye-slash'); + this.$('.toggle-password i').addClass('fa-eye').removeClass('fa-eye-slash'); this.$('.toggle-password').addClass('display-none'); this.$('#passwordError').html(''); @@ -73,7 +72,7 @@ define(function(require){ this.$('#passwordText').toggleClass('display-none'); this.$('#password').toggleClass('display-none'); - this.$('.toggle-password i').toggleClass('fa-eye').toggleClass('fa-eye-slash'); + this.$('.toggle-password i').toggleClass('fa-eye').toggleClass('fa-eye-slash'); }, indicatePasswordStrength: function(event) { @@ -89,16 +88,16 @@ define(function(require){ if (okRegex.test(password) === false) { var classes = 'alert alert-error'; - var htmlText = window.polyglot.t('app.validationlength', {length: 8}); + var htmlText = Origin.l10n.t('app.validationlength', {length: 8}); } else if (strongRegex.test(password)) { var classes = 'alert alert-success'; - var htmlText = window.polyglot.t('app.passwordindicatorstrong'); + var htmlText = Origin.l10n.t('app.passwordindicatorstrong'); } else if (mediumRegex.test(password)) { var classes = 'alert alert-info'; - var htmlText = window.polyglot.t('app.passwordindicatormedium'); + var htmlText = Origin.l10n.t('app.passwordindicatormedium'); } else { var classes = 'alert alert-info'; - var htmlText = window.polyglot.t('app.passwordindicatorweak'); + var htmlText = Origin.l10n.t('app.passwordindicatorweak'); } $passwordStrength.removeClass().addClass(classes).html(htmlText); @@ -113,7 +112,7 @@ define(function(require){ 'firstName': self.$('#firstName').val().trim(), 'lastName': self.$('#lastName').val().trim() }; - + if (self.model.get('_isNewPassword')) { toChange.password = self.$('#password').val(); } else { @@ -126,7 +125,7 @@ define(function(require){ error: function(model, response, optinos) { Origin.Notify.alert({ type: 'error', - text: window.polyglot.t('app.errorgeneric') + text: Origin.l10n.t('app.errorgeneric') }); }, success: function(model, response, options) { @@ -146,7 +145,7 @@ define(function(require){ }, onPasswordTextKeyup: function() { - + } }, { template: 'userProfile' diff --git a/frontend/src/modules/userManagement/index.js b/frontend/src/modules/userManagement/index.js index cae4b5a289..f3df21101d 100644 --- a/frontend/src/modules/userManagement/index.js +++ b/frontend/src/modules/userManagement/index.js @@ -28,7 +28,7 @@ define(function(require) { Origin.globalMenu.addItem({ "location": "global", - "text": window.polyglot.t('app.usermanagement'), + "text": Origin.l10n.t('app.usermanagement'), "icon": "fa-users", "sortOrder": 3, "callbackEvent": "userManagement:open" diff --git a/frontend/src/modules/userManagement/views/addUserView.js b/frontend/src/modules/userManagement/views/addUserView.js index 690d2625fe..ce4e8de80e 100644 --- a/frontend/src/modules/userManagement/views/addUserView.js +++ b/frontend/src/modules/userManagement/views/addUserView.js @@ -10,7 +10,7 @@ define(function(require){ createdUserId: false, preRender: function() { - Origin.trigger('location:title:update', { title: window.polyglot.t('app.addusertitle') }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.addusertitle') }); this.listenTo(Origin, 'userManagement:saveUser', this.saveNewUser); }, @@ -27,8 +27,8 @@ define(function(require){ this.$('.field-error').removeClass('display-none'); Origin.Notify.alert({ type: 'error', - title: window.polyglot.t('app.validationfailed'), - text: window.polyglot.t('app.invalidusernameoremail') + title: Origin.l10n.t('app.validationfailed'), + text: Origin.l10n.t('app.invalidusernameoremail') }); } return valid; diff --git a/frontend/src/modules/userManagement/views/userManagementView.js b/frontend/src/modules/userManagement/views/userManagementView.js index 72e208491a..bde5cbcd77 100644 --- a/frontend/src/modules/userManagement/views/userManagementView.js +++ b/frontend/src/modules/userManagement/views/userManagementView.js @@ -23,7 +23,7 @@ define(function(require){ initialize: function() { OriginView.prototype.initialize.apply(this, arguments); - Origin.trigger('location:title:update', { title: window.polyglot.t('app.usermanagementtitle') }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.usermanagementtitle') }); this.initData(); }, diff --git a/frontend/src/modules/userManagement/views/userView.js b/frontend/src/modules/userManagement/views/userView.js index d6626a3a06..a770b39292 100644 --- a/frontend/src/modules/userManagement/views/userView.js +++ b/frontend/src/modules/userManagement/views/userView.js @@ -164,7 +164,7 @@ define(function(require){ onResetLoginsClicked: function() { var self = this; Origin.Notify.confirm({ - text: window.polyglot.t('app.confirmresetlogins', { email: this.model.get('email') }), + text: Origin.l10n.t('app.confirmresetlogins', { email: this.model.get('email') }), callback: function(confirmed) { if(confirmed) self.updateModel('failedLoginCount', 0); } @@ -184,14 +184,14 @@ define(function(require){ var self = this; Origin.Notify.confirm({ type: 'input', - title: window.polyglot.t('app.resetpasswordtitle'), - text: window.polyglot.t('app.resetpasswordinstruction', { email: this.model.get('email') }), + title: Origin.l10n.t('app.resetpasswordtitle'), + text: Origin.l10n.t('app.resetpasswordinstruction', { email: this.model.get('email') }), inputType: 'password', confirmButtonText: 'Save', closeOnConfirm: false, callback: function(newPassword) { if(newPassword === false) return; - else if(newPassword === "") return swal.showInputError(window.polyglot.t('app.passwordempty')); + else if(newPassword === "") return swal.showInputError(Origin.l10n.t('app.passwordempty')); var postData = { "email": self.model.get('email'), "password": newPassword @@ -200,7 +200,7 @@ define(function(require){ self.model.fetch(); Origin.Notify.alert({ type: 'success', - text: window.polyglot.t('app.changepasswordtext', { email: self.model.get('email') }) + text: Origin.l10n.t('app.changepasswordtext', { email: self.model.get('email') }) }); }); } @@ -219,7 +219,7 @@ define(function(require){ var self = this; Origin.Notify.confirm({ type: 'confirm', - text: window.polyglot.t('app.confirmdeleteuser', { email: this.model.get('email') }), + text: Origin.l10n.t('app.confirmdeleteuser', { email: this.model.get('email') }), callback: function(confirmed) { if(confirmed) { self.model.destroy({ error: self.onError }); @@ -240,9 +240,9 @@ define(function(require){ switch(response.responseJSON.code) { // duplicate key case 11000: - return self.onError(window.polyglot.t('app.duplicateuservalueerror', data)); + return self.onError(Origin.l10n.t('app.duplicateuservalueerror', data)); default: - return self.onError(window.polyglot.t('app.uservalueerror')); + return self.onError(Origin.l10n.t('app.uservalueerror')); } } }); From 180c5754988dec6ea3abd3f0bfddb94a7f023313 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 30 Mar 2017 09:22:55 +0100 Subject: [PATCH 111/296] Fix component list icons and refactor file --- .../less/editorPageComponentList.less | 459 +++++++++--------- 1 file changed, 222 insertions(+), 237 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less index 3b0b4af4ab..22f3ac1a44 100644 --- a/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less +++ b/frontend/src/modules/editor/contentObject/less/editorPageComponentList.less @@ -1,250 +1,235 @@ @import 'colours'; .editor-component-list { - .click-capture { - width: 100vw; - height: 100vh; - z-index: 0; - } - position:fixed; - top:0px; - // to avoid flicker when first rendered - right:-100vw; - height:100%; - z-index:500; - - &-sidebar { - z-index: 5; - float:right; - width:440px; - height:100%; - background-color:#fff; - box-shadow:0px 0px 4px 0px #454545; - } - - &-sidebar-exit { - float: right; + position: fixed; + top: 0px; + // to avoid flicker when first rendered + right: -100vw; + height: 100%; + z-index: 500; + + .click-capture { + width: 100vw; + height: 100vh; + z-index: 0; + } + + &-sidebar { + z-index: 5; + float: right; + width: 440px; + height: 100%; + background-color: #fff; + box-shadow: 0px 0px 4px 0px #454545; + } + + &-sidebar-exit { + float: right; margin: 3px 10px; font-size: 150%; color: #7D7D7D; - &:hover { - cursor: pointer; - } - } + &:hover { + cursor: pointer; + } + } - &-sidebar-header { + &-sidebar-header { border-bottom: 1px solid #CCCCCC; - } - - &-sidebar-title-inner { - padding:20px 20px 0px; - font-weight: 700; - } - - &-sidebar-body-inner { - padding-left:20px; - } - - &-sidebar-search { - &-icon { - position: relative; - left: 380px; - top: 33px; - font-size: 130%; - color: #B7B4B4; - } - - &-field { - input { - margin: 0 0 25px 20px; - border-radius:0; - background-color: #F2F0F1; - } - } - } - - &-sidebar-list { - width: 100%; - overflow-y: auto; - overflow-x: hidden; - } - - - &-sidebar-filter-half { - float:left; - width:50%; - padding:18px 0px; - text-align:center; - } - - &-sidebar-filter-full { - float:left; - width:50%; - padding:18px 0px; - text-align:center; - } - - &-sidebar-filter-single { - width:100%; - padding:18px 0px; - background-color:#333c4e; - color:#fff; - text-align:center; - } - - &-sidebar-filter { - button { - background-color:#333c4e; - color:#9cabc4; - transition: all 0.3s; - &:hover { - background-color:#293141; - color:#fff; - } - &.selected { - background-color:#15a4fa; - color:#fff; - } - } - } - + } + + &-sidebar-title-inner { + padding: 20px 20px 0px; + font-weight: 700; + } + + &-sidebar-body-inner { + padding-left: 20px; + } + + &-sidebar-search { + &-icon { + position: relative; + left: 380px; + top: 33px; + font-size: 130%; + color: #B7B4B4; + } + + &-field input { + margin: 0 0 25px 20px; + border-radius: 0; + background-color: #F2F0F1; + } + } + + &-sidebar-list { + width: 100%; + overflow-y: auto; + overflow-x: hidden; + } + + &-sidebar-filter-half { + float: left; + width: 50%; + padding: 18px 0px; + text-align: center; + } + + &-sidebar-filter-full { + float: left; + width: 50%; + padding: 18px 0px; + text-align: center; + } + + &-sidebar-filter-single { + width: 100%; + padding: 18px 0px; + background-color: #333c4e; + color: #fff; + text-align: center; + } + + &-sidebar-filter button { + background-color: #333c4e; + color: #9cabc4; + transition: all 0.3s; + &:hover { + background-color: #293141; + color: #fff; + } + &.selected { + background-color: #15a4fa; + color: #fff; + } + } } .editor-component-list-item { - position:relative; - width:100%; - padding:0; - overflow:hidden; - text-align:left; - border-bottom:1px solid #ccc; - transition: background-color 0.3s; - cursor: pointer; - - &.restricted { - color: lightgray; - } - - &.selected { - background-color:darken(#e9f0fa, 10%); - &:hover { - background-color:darken(#e9f0fa, 10%); - } - &.restricted { - color: black; - } - } - - &-details { - padding-left: 75px; - } - - &:hover { - background-color: @ui-content-color; - } - - &-inner { - padding:20px; - min-height: 44px; - } - - - &-display-name { - font-weight:600; - } - - &-version, &-name { - margin-top:6px; - font-size:11px; - } - - &-overlay { - top:0; - width:100%; - height:100%; - } - - &-overlay-inner { - text-align: center; - padding-bottom: 10px; - } - - &-overlay-left { - float:left; - } - - &-overlay-right { - float:right; - } - - &-overlay-button { - width: 20%; - padding:0; - color:#9cabc4; - background-color:#333c4e; - transition:color 0.3s; - &:hover { - color:#fff; - background-color:#293141; - } - } - - &-overlay-button-inner { - display: block; - padding: 16px; - border-right:1px solid #454545; - } - - &-icon { - background-image: url("assets/component-icons/default.png"); - // core components, override above - &.adapt-contrib- { - &assessmentResults { - background-image: url("assets/component-icons/assessment.png"); - } - &blank { - background-image: url("assets/component-icons/blank.png"); - } - &accordion { - background-image: url("assets/component-icons/accordion.png"); - } - &graphic { - background-image: url("assets/component-icons/graphic.png"); - } - &gmcq { - background-image: url("assets/component-icons/gmcq.png"); - } - &hotgraphic { - background-image: url("assets/component-icons/hot-graphic.png"); - } - &matching { - background-image: url("assets/component-icons/matching.png"); - } - &media { - background-image: url("assets/component-icons/media.png"); - } - &mcq { - background-image: url("assets/component-icons/mcq.png"); - } - &narrative { - background-image: url("assets/component-icons/narrative.png"); - } - &slider { - background-image: url("assets/component-icons/slider.png"); - } - &text { - background-image: url("assets/component-icons/text.png"); - } - &textInput { - background-image: url("assets/component-icons/text.png"); - } - } - - background-repeat: no-repeat; - width: 55px; - height: 40px; - float: left; - margin: 5px 20px 0 0; - - } + position: relative; + width: 100%; + padding: 0; + overflow: hidden; + text-align: left; + border-bottom: 1px solid #ccc; + transition: background-color 0.3s; + cursor: pointer; + + &.restricted { + color: lightgray; + } + + &.selected { + background-color: darken(#e9f0fa, 10%); + &:hover { + background-color: darken(#e9f0fa, 10%); + } + &.restricted { + color: black; + } + } + + &-details { + padding-left: 75px; + } + + &:hover { + background-color: @ui-content-color; + } + + &-inner { + padding: 20px; + min-height: 44px; + } + + &-display-name { + font-weight: 600; + } + + &-version, + &-name { + margin-top: 6px; + font-size: 11px; + } + + &-overlay { + top: 0; + width: 100%; + height: 100%; + } + + &-overlay-inner { + text-align: center; + padding-bottom: 10px; + } + + &-overlay-left { + float: left; + } + + &-overlay-right { + float: right; + } + + &-overlay-button { + width: 20%; + } + + &-overlay-button-inner { + display: block; + padding: 16px; + border-right: 1px solid #454545; + } + + &-icon { + width: 55px; + height: 40px; + float: left; + margin: 5px 20px 0 0; + background-repeat: no-repeat; + background-image: url("assets/default.png"); + // core components, override above + &.adapt-contrib- { + &assessmentResults { + background-image: url("assets/assessment.png"); + } + &blank { + background-image: url("assets/blank.png"); + } + &accordion { + background-image: url("assets/accordion.png"); + } + &graphic { + background-image: url("assets/graphic.png"); + } + &gmcq { + background-image: url("assets/gmcq.png"); + } + &hotgraphic { + background-image: url("assets/hot-graphic.png"); + } + &matching { + background-image: url("assets/matching.png"); + } + &media { + background-image: url("assets/media.png"); + } + &mcq { + background-image: url("assets/mcq.png"); + } + &narrative { + background-image: url("assets/narrative.png"); + } + &slider { + background-image: url("assets/slider.png"); + } + &text { + background-image: url("assets/text.png"); + } + &textInput { + background-image: url("assets/text.png"); + } + } + } } From dbca2aeb57f859b4ea98b4b513c7b649980d0201 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 31 Mar 2017 11:53:10 +0100 Subject: [PATCH 112/296] Remove permissions.md Added to wiki --- frontend/src/core/permissions.md | 73 -------------------------------- 1 file changed, 73 deletions(-) delete mode 100644 frontend/src/core/permissions.md diff --git a/frontend/src/core/permissions.md b/frontend/src/core/permissions.md deleted file mode 100644 index 415ac816af..0000000000 --- a/frontend/src/core/permissions.md +++ /dev/null @@ -1,73 +0,0 @@ -# Permissions - -This module uses the users permissions statements to lock down the front-end views. This module can be accessed in three ways: - -- Through the router -- Through the Origin.permissions object -- Through a Handlebars template helper - -This module also takes into consideration the wild card statements ``"urn:x-adapt:{{tenantid}}/*"`` and ``"urn:x-adapt:*/*"`` - -## API - -##### - Origin.permissions.addRoute(route, permissions) - -This method adds a route to the permissions object that is checked when the Backbone Router tries to navigate. The route argument should be in the following format: - -If the hash url is ``#/userManagement`` then the route should be ``"userManagement"`` - -The permissions argument is an array of permissions the user has to meet before being allowed to access this view. The permissions argument should be in the following format: - -If the permission statement is ``"urn:x-adapt:{{tenantid}}/api/extensiontype/*"`` with a delete request then the permission array item should be ``"{{tenantid}}/extensiontype/*:delete"`` - -Permissions for views should be added on two events, ``'app:dataReady login:changed'`` due to the way the user can log out and log back in with different permissions: - -``` -Origin.on('app:dataReady login:changed', function() { - - var permissions = ["{{tenantid}}/extensiontype/*:update"]; - // This locks down the route #/pluginManagement to users who have the - // permissions "urn:x-adapt:{{tenantid}}/api/extensiontype/*" and - // a request of "update" - Origin.permissions.addRoute('pluginManagement', permissions); - -}); -``` - -##### - Origin.permissions.hasPermissions(permissionsArray) - -This method checks against the permissionsArray object and the current users permissions to make sure the users permissions match all the permissions being passed in. This is mainly used to hide UI elements like the GlobalMenu items. - -The permissions array format is the same as the permissions array passed in ``Origin.permissions.addRoute`` method. - -``` -Origin.on('app:dataReady login:changed', function() { - - var permissions = ["{{tenantid}}/extensiontype/*:update"]; - // Only add the global menu item if the user has the correct permissions - if (Origin.permissions.hasPermissions(permissions)) { - Origin.globalMenu.addItem(globalMenuObject); - } - -}); -``` - -##### - Origin.permissions.checkRoute(route) - -Used by the router to check the user has the correct permissions - -##### - {{#ifHasPermissions "permissions"}} (Handlebars helper) - -This helper can be used within views to hide certain UI elements like 'edit' or 'delete' buttons. This is like the default Handlebars #if helper and can be used with a ``{{else}}``. The permissions should be separated by a comma: - -``` -{{#ifHasPermissions "{{tenantid}}/extensiontype/*:delete, {{tenantid}}/componenttype/*:delete"}} - -{{else}} - -{{/ifHasPermissions}} -``` \ No newline at end of file From 99219323f2bbad7230571a469e821f6ee7198717 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 3 Apr 2017 10:28:36 +0100 Subject: [PATCH 113/296] Refactor options files --- frontend/src/modules/options/index.js | 23 +- .../src/modules/options/views/optionsView.js | 210 ++++++++---------- 2 files changed, 95 insertions(+), 138 deletions(-) diff --git a/frontend/src/modules/options/index.js b/frontend/src/modules/options/index.js index 9b23a2ee77..e66578c51e 100644 --- a/frontend/src/modules/options/index.js +++ b/frontend/src/modules/options/index.js @@ -1,20 +1,13 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -// A module that offers options inside the title bar - define(function(require) { + var Origin = require('core/origin'); + var OptionsView = require('./views/optionsView'); - var Origin = require('core/origin'); - var OptionsView = require('./views/optionsView'); - - var Options = {}; - - Options.addItems = function(items) { - - var itemsCollection = new Backbone.Collection(items); - $('#app').prepend(new OptionsView({collection:itemsCollection}).$el); - - } - - Origin.options = Options; + var Options = { + addItems: function(items) { + $('#app').prepend(new OptionsView({ collection: new Backbone.Collection(items) }).$el); + } + }; + Origin.options = Options; }); diff --git a/frontend/src/modules/options/views/optionsView.js b/frontend/src/modules/options/views/optionsView.js index 1e08f8b018..17c28447f3 100644 --- a/frontend/src/modules/options/views/optionsView.js +++ b/frontend/src/modules/options/views/optionsView.js @@ -1,125 +1,89 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/origin'); - var Backbone = require('backbone'); - - var OptionsView = Backbone.View.extend({ - - className: 'options', - - initialize: function() { - this.eventsToTrigger = []; - this.listenTo(Origin, 'remove:views', this.remove); - this.listenTo(Origin, 'options:update:ui', this.updateUI); - this.render(); - }, - - events: { - 'click a': 'onOptionClicked' - }, - - render: function() { - var template = Handlebars.templates[this.constructor.template]; - this.$el.html(template()); - _.defer(_.bind(function() { - this.postRender(); - }, this)); - return this; - }, - - updateUI: function(userPreferences) { - // Wait until current render has finished - // Then go through each preference and add a class - _.defer(_.bind(function() { - _.each(userPreferences, function(preference) { - // If preferences are not classes to be added - // return this ship home - if (_.isArray(preference)) { - return; - } - this.$('a.option-value-' + preference).addClass('selected'); - }, this) - }, this)); - - }, - - postRender: function() { - // First sort out the groups - this.sortAndRenderGroups(); - // Add a defer to make sure the groups are rendered - _.defer(_.bind(this.renderOptions, this)); - - }, - - sortAndRenderGroups: function() { - // Find all possible groups - var groups = this.collection.pluck('group'); - var availableGroups = _.uniq(groups); - - var template = Handlebars.templates['optionsGroup']; - - _.each(availableGroups, function(group) { - this.$('.options-inner').append(template({group:group})); - }); - - }, - - renderOptions: function() { - - var template = Handlebars.templates['optionsItem']; - - // Go through each item and check if it has a group - // If it does - render into that group - this.collection.each(function(item) { - - var itemGroup = item.get('group') - var $parent = this.$('.options-inner'); - - if (_.indexOf(this.eventsToTrigger, item.get('callbackEvent')) > -1) { - item.set('selected', true); - } - - var data = item.toJSON(); - - if (itemGroup) { - $parent = this.$('.options-group-' + itemGroup); - } - $parent.append(template(data)); - - }, this); - - }, - - setSelectedOption: function(selectedOption) { - var group = selectedOption.attr('data-group'); - var callbackEvent = selectedOption.attr('data-callback'); - - // If this item is in a group toggle all group items to not selected - if (group && !selectedOption.hasClass('selected')) { - - this.$('.options-group-' + group + ' a').removeClass('selected'); - selectedOption.addClass('selected'); - Origin.trigger(callbackEvent); - - } else { - // How should we handle items not in groups? Should they be toggles? - } - - }, - - onOptionClicked: function(event) { - event.preventDefault(); - - var $selectedOption = $(event.currentTarget); - - this.setSelectedOption($selectedOption); - } - - }, { - template: 'options' - }); - - return OptionsView; - -}); \ No newline at end of file + var Origin = require('core/origin'); + var Backbone = require('backbone'); + + var OptionsView = Backbone.View.extend({ + className: 'options', + + events: { + 'click a': 'onOptionClicked' + }, + + initialize: function() { + this.eventsToTrigger = []; + + this.listenTo(Origin, { + 'remove:views': this.remove, + 'options:update:ui': this.updateUI + }); + this.render(); + }, + + render: function() { + var template = Handlebars.templates[this.constructor.template]; + this.$el.html(template()); + _.defer(_.bind(this.postRender, this)); + return this; + }, + + renderOptions: function() { + var template = Handlebars.templates['optionsItem']; + // Go through each item and check if it has a group + // If it does - render into that group + this.collection.each(function(item) { + if (_.indexOf(this.eventsToTrigger, item.get('callbackEvent')) > -1) { + item.set('selected', true); + } + var itemGroup = item.get('group') + var parentSelector = (itemGroup) ? '.options-group-' + itemGroup : '.options-inner'; + $(parentSelector).append(template(item.toJSON())); + }, this); + }, + + postRender: function() { + this.sortAndRenderGroups(); + // Add a defer to make sure the groups are rendered + _.defer(_.bind(this.renderOptions, this)); + }, + + updateUI: function(userPreferences) { + // set selected preferences + _.defer(_.bind(function() { + _.each(userPreferences, function(preference) { + if (_.isArray(preference)) return; + this.$('a.option-value-' + preference).addClass('selected'); + }, this); + }, this)); + }, + + sortAndRenderGroups: function() { + var availableGroups = _.uniq(this.collection.pluck('group')); + var template = Handlebars.templates['optionsGroup']; + _.each(availableGroups, function(group) { + this.$('.options-inner').append(template({ group: group })); + }); + }, + + setSelectedOption: function(selectedOption) { + var group = selectedOption.attr('data-group'); + var callbackEvent = selectedOption.attr('data-callback'); + // If this item is in a group toggle all group items to not selected + if(!group || selectedOption.hasClass('selected')) { + return; + } + this.$('.options-group-' + group + ' a').removeClass('selected'); + selectedOption.addClass('selected'); + Origin.trigger(callbackEvent); + }, + + onOptionClicked: function(event) { + event && event.preventDefault(); + this.setSelectedOption($(event.currentTarget)); + } + }, { + template: 'options' + }); + + return OptionsView; +}); From 963c3ffeae611cffd95dcf890564dea08b542b6f Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:26:39 +0100 Subject: [PATCH 114/296] Move app initialisation code to origin.js --- frontend/src/core/app.js | 50 +++++----------- frontend/src/core/origin.js | 111 ++++++++++++++++++++++++------------ 2 files changed, 87 insertions(+), 74 deletions(-) diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index 5d985cf6d4..44ce8dd948 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -1,5 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE (function() { + var origin; + function loadLibraries(callback) { require([ 'ace/ace', @@ -22,52 +24,30 @@ 'core/permissions', 'core/l10n', 'core/constants', - 'core/helpers', 'core/contextMenu', 'core/contentPane' - ], function(Templates, Origin) { + ], function(Templates, Origin, Router) { + origin = Origin; + origin.router = new Router(); + var constantsLoaded = false; var l10nLoaded = false; - Origin.once('constants:loaded', function() { + origin.once('constants:loaded', function() { constantsLoaded = true; if(l10nLoaded) callback(); }); - Origin.once('l10n:loaded', function() { + origin.once('l10n:loaded', function() { l10nLoaded = true; if(constantsLoaded) callback(); }); }); } - function loadModules(callback) { - require(['modules/modules'], callback); - } - - function loadPlugins(callback) { - require(['plugins/plugins'], callback); - } - - function initialiseApp() { + function loadAddOns(callback) { require([ - 'core/origin', - 'core/router', - 'modules/user/models/sessionModel', - 'modules/navigation/views/navigationView' - ], function(Origin, Router, SessionModel, NavigationView) { - Origin.router = new Router(); - Origin.sessionModel = new SessionModel(); - Origin.sessionModel.fetch({ - success: function(data) { - // need the schemas before the app loads - Origin.trigger('schemas:loadData', function() { - Origin.trigger('app:dataReady'); - // _.defer to give anything tapping into app:dataReady event time to execute - _.defer(Origin.initialize); - }); - }, - error: console.error - }); - }); + 'modules/modules', + 'plugins/plugins' + ], callback); } /** @@ -75,10 +55,8 @@ */ loadLibraries(function() { loadCore(function() { - loadModules(function() { - loadPlugins(function() { - initialiseApp(); - }); + loadAddOns(function() { + origin.initialize(); }); }); }); diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index b781bd7f5e..26dcfc07e1 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -2,67 +2,84 @@ define(function(require){ var _ = require('underscore'); var Backbone = require('backbone'); + var SessionModel = require('modules/user/models/sessionModel'); - var pluginTaps = []; + var initialized = false; + var eventTaps = []; var $loading; - var Origin = { + var Origin = _.extend({}, Backbone.Events, { + debug: true, + /** + * Performs the necessary set-up steps + */ initialize: _.once(function() { - // set up loading asap - $loading = $('.loading'); - hideLoading(); - // let other code know we're about to initialise - Origin.tap('initialize', function() { - Origin.trigger('origin:initialize'); - Backbone.history.start(); - // Setup listeners for the loading screen - Origin.on('origin:hideLoading', hideLoading, this); - Origin.on('origin:showLoading', showLoading, this); - // abstracted window events to prevent keep adding/removing in views - $(window).on('resize', onResize); - $(document).on('keydown', onKeyDown); + (new SessionModel()).fetch({ + success: function(model) { + Origin.sessionModel = model; + // need the schemas before the app loads + Origin.trigger('schemas:loadData', function() { + Origin.trigger('origin:dataReady'); + initLoading(); + initialized = true; + Origin.trigger('origin:initialize'); + }); + }, + error: console.error }); + listenToWindowEvents(); }), /** - * Register a plugin to tap into a certain location before it loads + * Whether the Origin object has loaded + */ + hasInitialized: function() { + return initialized; + }, + /** + * Override to allow for tapping and debug logging + * TODO this is probably very inefficient, look into this */ - registerPluginTap: function(location, pluginMethod) { - pluginTaps.push({ - location: location, - pluginMethod: pluginMethod + trigger: function(eventName, data) { + var args = arguments; + callTaps(eventName, function() { + if(Origin.debug){ + console.log('Origin.trigger:', eventName, (data ? data : '')); + } + Backbone.Events.trigger.apply(Origin, args); }); }, /** - * Makes sure all 'tapped' plugin functions are executed before continuing + * Register a function to tap into a certain event before it fires */ - tap: function(location, callback) { - var currentLocationPlugins = _.where(pluginTaps, {location: location}); - var currentLocationPluginsLength = currentLocationPlugins.length; - if (currentLocationPluginsLength === 0) { - return callback(); - } - var count = 0; - function callPlugin() { - currentLocationPlugins[count].pluginMethod.call(null, function() { - var doneAll = ++count === currentLocationPluginsLength; - doneAll ? callback() : callPlugin(); - }); - } - callPlugin(); + tap: function(event, callback) { + eventTaps.push({ event: event, callback: callback }); }, /** - * Tells + * Tells views to clean themselves up */ removeViews: function() { Origin.trigger('remove:views'); } - }; - _.extend(Origin, Backbone.Events); + }); /** * Private functions */ + function initLoading() { + $loading = $('.loading'); + hideLoading(); + + Origin.on('origin:hideLoading', hideLoading, Origin); + Origin.on('origin:showLoading', showLoading, Origin); + } + + // abstracted window events + function listenToWindowEvents() { + $(document).on('keydown', onKeyDown); + $(window).on('resize', onResize); + } + function showLoading(shouldHideTopBar) { $loading .removeClass('display-none fade-out') @@ -78,6 +95,24 @@ define(function(require){ }, this), 300); } + /** + * Calls all 'tapped' functions before continuing + */ + function callTaps(event, callback) { + var taps = _.where(eventTaps, { event: event }); + // recurse + function callTap() { + var tap = taps.pop(); + if(!tap) return callback(); + tap.callback.call(Origin, callTap); + } + callTap(); + } + + /** + * Event handling + */ + function onKeyDown(event) { if($(event.target).is('input, textarea')) return; Origin.trigger('key:down', event); From 2ed2d1daf6796cd32727ddc989818ddfa829e2e7 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:27:31 +0100 Subject: [PATCH 115/296] Fix permissionsView imports --- frontend/src/core/views/permissionsView.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/core/views/permissionsView.js b/frontend/src/core/views/permissionsView.js index 6b64337c64..2578927231 100644 --- a/frontend/src/core/views/permissionsView.js +++ b/frontend/src/core/views/permissionsView.js @@ -1,8 +1,8 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - - var Backbone = require('backbone'); - var Origin = require('core/origin'); +// define(function(require) { +define(['require', 'backbone', 'core/origin'], function(require, Backbone, Origin) { + // var Backbone = require('backbone'); + // var Origin = require('core/origin'); var PermissionsView = Backbone.View.extend({ @@ -40,4 +40,4 @@ define(function(require){ return PermissionsView; -}); \ No newline at end of file +}); From 4f1ee632d44daeff2ef8c50dee13f5400d2d495b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:30:07 +0100 Subject: [PATCH 116/296] Update references to dataReady event --- frontend/src/modules/assetManagement/index.js | 2 +- frontend/src/modules/editor/index.js | 2 +- frontend/src/modules/location/index.js | 2 +- frontend/src/modules/navigation/index.js | 2 +- frontend/src/modules/pluginManagement/index.js | 2 +- frontend/src/modules/projects/index.js | 3 ++- frontend/src/modules/scaffold/views/scaffoldAssetView.js | 2 +- frontend/src/modules/scaffold/views/scaffoldBooleanView.js | 2 +- frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js | 2 +- frontend/src/modules/scaffold/views/scaffoldColorPickerView.js | 2 +- .../src/modules/scaffold/views/scaffoldDisplayTitleView.js | 2 +- .../src/modules/scaffold/views/scaffoldQuestionButtonView.js | 2 +- frontend/src/modules/scaffold/views/scaffoldTagsView.js | 2 +- frontend/src/modules/scaffold/views/scaffoldTextAreaView.js | 2 +- frontend/src/modules/sidebar/index.js | 2 +- frontend/src/modules/userManagement/index.js | 2 +- 16 files changed, 17 insertions(+), 16 deletions(-) diff --git a/frontend/src/modules/assetManagement/index.js b/frontend/src/modules/assetManagement/index.js index 29835a4b59..d9ddcc5a5a 100644 --- a/frontend/src/modules/assetManagement/index.js +++ b/frontend/src/modules/assetManagement/index.js @@ -52,7 +52,7 @@ define(function(require) { Origin.router.navigateTo('assetManagement'); }); - Origin.on('app:dataReady login:changed', function() { + Origin.on('origin:dataReady login:changed', function() { Origin.globalMenu.addItem({ "location": "global", "text": Origin.l10n.t('app.assetmanagement'), diff --git a/frontend/src/modules/editor/index.js b/frontend/src/modules/editor/index.js index b83f533f0b..49a0b528bb 100644 --- a/frontend/src/modules/editor/index.js +++ b/frontend/src/modules/editor/index.js @@ -15,7 +15,7 @@ define(function(require) { './selectTheme/index' ]); // loads editor data - Origin.on('app:dataReady login:changed', EditorData.loadGlobalData); + Origin.on('origin:dataReady login:changed', EditorData.loadGlobalData); Origin.on('router:editor editor:refreshData', EditorData.loadCourseData); Origin.on('editor:resetData', EditorData.reset); }); diff --git a/frontend/src/modules/location/index.js b/frontend/src/modules/location/index.js index b10101808b..4fe55a1039 100644 --- a/frontend/src/modules/location/index.js +++ b/frontend/src/modules/location/index.js @@ -3,7 +3,7 @@ define(function(require) { var Origin = require('core/origin'); var LocationTitleView = require('./views/locationTitleView'); - Origin.once('app:dataReady', function() { + Origin.once('origin:dataReady', function() { $('.location-title').html(new LocationTitleView().$el); }); }) diff --git a/frontend/src/modules/navigation/index.js b/frontend/src/modules/navigation/index.js index 8555f5fe7b..c51416f534 100644 --- a/frontend/src/modules/navigation/index.js +++ b/frontend/src/modules/navigation/index.js @@ -1,5 +1,5 @@ define(['core/origin', './views/navigationView'], function(Origin, NavigationView) { - Origin.once('app:dataReady', function() { + Origin.once('origin:dataReady', function() { $('#app').before(new NavigationView({ model: Origin.sessionModel }).$el); }); }); diff --git a/frontend/src/modules/pluginManagement/index.js b/frontend/src/modules/pluginManagement/index.js index 22ad59e971..c380d68352 100644 --- a/frontend/src/modules/pluginManagement/index.js +++ b/frontend/src/modules/pluginManagement/index.js @@ -33,7 +33,7 @@ define(function(require) { "sortOrder": 3 }; - Origin.on('app:dataReady login:changed', function() { + Origin.on('origin:dataReady login:changed', function() { var permissions = ["{{tenantid}}/extensiontype/*:update"]; Origin.permissions.addRoute('pluginManagement', permissions); if (Origin.permissions.hasPermissions(permissions)) { diff --git a/frontend/src/modules/projects/index.js b/frontend/src/modules/projects/index.js index cc1e0d8464..75c4e6d1cd 100644 --- a/frontend/src/modules/projects/index.js +++ b/frontend/src/modules/projects/index.js @@ -80,7 +80,8 @@ define(function(require) { Origin.on('globalMenu:dashboard:open', function() { Origin.router.navigateTo('dashboard'); }); - Origin.on('app:dataReady login:changed', function() { + + Origin.on('origin:dataReady login:changed', function() { Origin.router.setHomeRoute('dashboard'); Origin.globalMenu.addItem({ "location": "global", diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js index 0133a3dc87..b0f9a9c9a0 100644 --- a/frontend/src/modules/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/modules/scaffold/views/scaffoldAssetView.js @@ -329,7 +329,7 @@ define(function(require) { template: "scaffoldAsset" }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('Asset:image', ScaffoldAssetView); Origin.scaffold.addCustomField('Asset:audio', ScaffoldAssetView); diff --git a/frontend/src/modules/scaffold/views/scaffoldBooleanView.js b/frontend/src/modules/scaffold/views/scaffoldBooleanView.js index 75e6680ac4..d2c69b7af6 100644 --- a/frontend/src/modules/scaffold/views/scaffoldBooleanView.js +++ b/frontend/src/modules/scaffold/views/scaffoldBooleanView.js @@ -47,7 +47,7 @@ define(function(require) { }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('Boolean', ScaffoldBooleanView) }) diff --git a/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js b/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js index ede357230c..772db85586 100644 --- a/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js +++ b/frontend/src/modules/scaffold/views/scaffoldCodeEditorView.js @@ -110,7 +110,7 @@ define(function(require) { template: 'scaffoldCodeEditor' }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add code editor to the list of editors // Anything after "CodeEditor:" can correspond to the ACE editor mode types Origin.scaffold.addCustomField('CodeEditor:javascript', ScaffoldCodeEditorView); diff --git a/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js b/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js index 898eb22a8b..afc3364b04 100644 --- a/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js +++ b/frontend/src/modules/scaffold/views/scaffoldColorPickerView.js @@ -73,7 +73,7 @@ define(function(require) { template: "scaffoldColorPicker" }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { Origin.scaffold.addCustomField('ColorPicker', ScaffoldColorPickerView); }) diff --git a/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js b/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js index 1bbcf7410d..4fc1363980 100644 --- a/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js +++ b/frontend/src/modules/scaffold/views/scaffoldDisplayTitleView.js @@ -148,7 +148,7 @@ define(function(require) { template: 'scaffoldDisplayTitle' }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('DisplayTitle', ScaffoldDisplayTitleView) }) diff --git a/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js b/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js index 14d61d79b6..741f9b976c 100644 --- a/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js +++ b/frontend/src/modules/scaffold/views/scaffoldQuestionButtonView.js @@ -100,7 +100,7 @@ define(function(require) { template: 'scaffoldQuestionButton' }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('QuestionButton', ScaffoldQuestionButtonView) }) diff --git a/frontend/src/modules/scaffold/views/scaffoldTagsView.js b/frontend/src/modules/scaffold/views/scaffoldTagsView.js index d0fd17d40a..71b6cbb50e 100644 --- a/frontend/src/modules/scaffold/views/scaffoldTagsView.js +++ b/frontend/src/modules/scaffold/views/scaffoldTagsView.js @@ -108,7 +108,7 @@ define(function(require) { } }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('Tags', ScaffoldTagsView) }) diff --git a/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js b/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js index 21f93a968e..70bccf81cd 100644 --- a/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js +++ b/frontend/src/modules/scaffold/views/scaffoldTextAreaView.js @@ -16,7 +16,7 @@ define(function(require) { } }); - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { // Add Image editor to the list of editors Origin.scaffold.addCustomField('TextArea:blank', TextAreaBlankView); }); diff --git a/frontend/src/modules/sidebar/index.js b/frontend/src/modules/sidebar/index.js index 66a5b3f4b4..28f98ff5b7 100644 --- a/frontend/src/modules/sidebar/index.js +++ b/frontend/src/modules/sidebar/index.js @@ -21,7 +21,7 @@ define(function(require) { } // Append sidebar to body - Origin.once('app:dataReady', function() { + Origin.once('origin:dataReady', function() { $('body').append(new SidebarContainerView().$el); }); diff --git a/frontend/src/modules/userManagement/index.js b/frontend/src/modules/userManagement/index.js index f3df21101d..b51c2a177e 100644 --- a/frontend/src/modules/userManagement/index.js +++ b/frontend/src/modules/userManagement/index.js @@ -14,7 +14,7 @@ define(function(require) { allTenants: new Backbone.Collection() }; - Origin.on('app:dataReady login:changed', function() { + Origin.on('origin:dataReady login:changed', function() { Origin.permissions.addRoute('userManagement', data.featurePermissions); if (Origin.permissions.hasPermissions(data.featurePermissions)) { From 89c41de7cb393667438b3b707deed32b45214124 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:30:31 +0100 Subject: [PATCH 117/296] Update references to dataReady event --- frontend/src/core/contentPane.js | 2 +- frontend/src/core/contextMenu.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/src/core/contentPane.js b/frontend/src/core/contentPane.js index e6eca993df..9fc74691d2 100644 --- a/frontend/src/core/contentPane.js +++ b/frontend/src/core/contentPane.js @@ -11,7 +11,7 @@ define(function(require) { } }; - Origin.on('app:dataReady', function() { + Origin.on('origin:dataReady', function() { contentPaneView = new ContentPaneView(); $('.app-inner').append(contentPaneView.$el); }); diff --git a/frontend/src/core/contextMenu.js b/frontend/src/core/contextMenu.js index fd72a70802..791e4e64e7 100644 --- a/frontend/src/core/contextMenu.js +++ b/frontend/src/core/contextMenu.js @@ -26,7 +26,7 @@ define(function(require) { var init = function() { new ContextMenuView({collection: ContextMenuCollection}); - + // Setup context menu items var contextItems = [ { @@ -70,7 +70,7 @@ define(function(require) { ]); // Set the section/menu menu options - contextItems.splice(_.indexOf(contextItems, _.findWhere(contextItems, { callbackEvent : "copy"})), 1); + contextItems.splice(_.indexOf(contextItems, _.findWhere(contextItems, { callbackEvent : "copy"})), 1); ContextMenu.addItem('menu', contextItems); var courseContextItems = [ @@ -113,8 +113,8 @@ define(function(require) { ContextMenu.addItem('sharedcourse', sharedCourseContextItems); } - - Origin.once('app:dataReady', function() { + + Origin.once('origin:dataReady', function() { init(); }); From 0de8cf4bcc5e685fcf7b4ddf5a2bbce73e5e6748 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:31:01 +0100 Subject: [PATCH 118/296] Fix broken scope reference --- frontend/src/core/router.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index df6acd09d7..129af789b2 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -108,12 +108,12 @@ define(function(require) { }, navigateToHome: function() { - if(!this.homeRoute) { - console.log('Router.navigateToHome: cannot load homepage, homeRoute not set'); + if(!Origin.router.homeRoute) { + console.trace('Router.navigateToHome: cannot load homepage, homeRoute not set'); return; } // use Origin.router.navigate in case we don't have a valid 'this' reference - Origin.router.navigateTo(this.homeRoute); + Origin.router.navigateTo(Origin.router.homeRoute); }, handleIndex: function() { From 27f833552008126596682c13ef802564c1f92393 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:31:50 +0100 Subject: [PATCH 119/296] Add editor events to help simplify routing --- frontend/src/modules/editor/article/index.js | 22 +++--- frontend/src/modules/editor/block/index.js | 21 +++--- .../src/modules/editor/component/index.js | 12 +--- frontend/src/modules/editor/config/index.js | 20 ++---- .../src/modules/editor/contentObject/index.js | 69 +++++++------------ .../views/editorMenuLayerView.js | 13 ++-- frontend/src/modules/editor/course/index.js | 8 +-- .../src/modules/editor/extensions/index.js | 35 ++++------ .../modules/editor/global/editorDataLoader.js | 3 + frontend/src/modules/editor/index.js | 65 +++++++++++++---- .../src/modules/editor/menuSettings/index.js | 36 +++++----- .../src/modules/editor/selectTheme/index.js | 38 +++++----- 12 files changed, 163 insertions(+), 179 deletions(-) diff --git a/frontend/src/modules/editor/article/index.js b/frontend/src/modules/editor/article/index.js index 5db7038587..436e079a46 100644 --- a/frontend/src/modules/editor/article/index.js +++ b/frontend/src/modules/editor/article/index.js @@ -1,24 +1,22 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('core/origin'); - var EditorData = require('../global/editorDataLoader'); var Helpers = require('../global/helpers'); var ArticleModel = require('core/models/articleModel'); var EditorArticleEditSidebarView = require('./views/editorArticleEditSidebarView'); var EditorArticleEditView = require('./views/editorArticleEditView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 === 'article' && route4 === 'edit') { - (new ArticleModel({ _id: route3 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Helpers.setPageTitle(model); - Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); - Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); - } - }); + Origin.on('editor:article', function(data) { + if(data.action !== 'edit') { + return; + } + (new ArticleModel({ _id: data.id })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Helpers.setPageTitle(model); + Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); } }); }); diff --git a/frontend/src/modules/editor/block/index.js b/frontend/src/modules/editor/block/index.js index 56fb7e7e00..0a81ff463c 100644 --- a/frontend/src/modules/editor/block/index.js +++ b/frontend/src/modules/editor/block/index.js @@ -9,17 +9,16 @@ define(function(require) { var EditorBlockEditView = require('./views/editorBlockEditView'); var EditorBlockEditSidebarView = require('./views/editorBlockEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 === 'block' && route4 === 'edit') { - (new BlockModel({ _id: route3 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Helpers.setPageTitle(model); - Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); - Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); - } - }); + Origin.on('editor:block', function(data) { + if(data.action !== 'edit') { + return; + } + (new BlockModel({ _id: data.id })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Helpers.setPageTitle(model); + Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); + Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); } }); }); diff --git a/frontend/src/modules/editor/component/index.js b/frontend/src/modules/editor/component/index.js index c628896e55..14e16792fb 100644 --- a/frontend/src/modules/editor/component/index.js +++ b/frontend/src/modules/editor/component/index.js @@ -9,14 +9,8 @@ define(function(require) { var EditorComponentEditView = require('./views/editorComponentEditView'); var EditorComponentEditSidebarView = require('./views/editorComponentEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if (route2 === 'component') handleEditComponent(); - }); - }); - - function handleEditComponent() { - (new ComponentModel({ _id: Origin.location.route3 })).fetch({ + Origin.on('editor:component', function(data) { + (new ComponentModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); var displayName = getComponentDisplayName(model); @@ -25,7 +19,7 @@ define(function(require) { Origin.contentPane.setView(EditorComponentEditView, { model: model, form: form }); } }); - } + }); function getComponentDisplayName(model) { var componentType = _.find(Origin.editor.data.componenttypes.models, function(m) { diff --git a/frontend/src/modules/editor/config/index.js b/frontend/src/modules/editor/config/index.js index 4b61bd7deb..87ba6dc322 100644 --- a/frontend/src/modules/editor/config/index.js +++ b/frontend/src/modules/editor/config/index.js @@ -1,25 +1,19 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('core/origin'); - var EditorData = require('../global/editorDataLoader'); var ConfigModel = require('core/models/configModel'); var EditorConfigEditView = require('./views/editorConfigEditView'); var EditorConfigEditSidebarView = require('./views/editorConfigEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 !== 'config') { - return; + Origin.on('editor:config', function(data) { + (new ConfigModel({ _courseId: Origin.location.route1 })).fetch({ + success: function(model) { + var form = Origin.scaffold.buildForm({ model: model }); + Origin.trigger('location:title:update', { title: 'Edit configuration' }); + Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); + Origin.contentPane.setView(EditorConfigEditView, { model: model, form: form }); } - (new ConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: 'Edit configuration' }); - Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); - Origin.contentPane.setView(EditorConfigEditView, { model: model, form: form }); - } - }); }); }); }); diff --git a/frontend/src/modules/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js index ac67c9199c..96da11596c 100644 --- a/frontend/src/modules/editor/contentObject/index.js +++ b/frontend/src/modules/editor/contentObject/index.js @@ -4,43 +4,40 @@ define(function(require) { * This module handles both sections/menus and pages. */ var Origin = require('core/origin'); - var EditorData = require('../global/editorDataLoader'); var ContentObjectModel = require('core/models/contentObjectModel'); var EditorMenuSidebarView = require('./views/editorMenuSidebarView'); var EditorPageComponentListView = require('./views/editorPageComponentListView'); - var EditorPageComponentListSidebarView = require('./views/editorPageComponentListSidebarView'); var EditorPageEditView = require('./views/editorPageEditView'); var EditorPageEditSidebarView = require('./views/editorPageEditSidebarView'); var EditorPageSidebarView = require('./views/editorPageSidebarView'); var EditorView = require('../global/views/editorView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - var isCOEdit = (route2 === 'page' || route2 === 'menu') && route4 === "edit"; - var isBlockAdd = route2 === 'block' && route4 === 'add'; + Origin.on('editor:contentObject', function(data) { + if(data.action === 'edit') renderContentObjectEdit(data); + else if(data.id) renderPageStructure(data); + else renderMenuStructure(data); + }); - if(isCOEdit) { - renderContentObjectEdit(); - } - else if(route2 === 'page') { - renderPageStructure(); - } - else if(route2 === 'menu') { - renderMenuStructure(); - } - else if(isBlockAdd) { - /** - * Odd one, but block -> add, so we're actually adding a component - * We're handling here because it comes from a page - */ - handleNewComponent(); - } + // component add is just a page overlay view, so handling it here + Origin.on('editor:block', function(data) { + if(data.action === 'add') { + return; + } + var containingBlock = Origin.editor.data.blocks.findWhere({ _id: Origin.location.route3 }); + var layoutOptions = containingBlock.get('layoutOptions'); + var componentsModel = new Backbone.Model({ + title: Origin.l10n.t('app.addcomponent'), + body: Origin.l10n.t('app.pleaseselectcomponent'), + _parentId: route3, + componentTypes: Origin.editor.data.componenttypes.toJSON(), + layoutOptions: layoutOptions }); + Origin.contentPane.setView(EditorPageComponentListView, { model: componentsModel }); }); - function renderContentObjectEdit() { - (new ContentObjectModel({ _id: Origin.location.route3 })).fetch({ + function renderContentObjectEdit(data) { + (new ContentObjectModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); // TODO this should be properly localised @@ -52,7 +49,7 @@ define(function(require) { }); } - function renderPageStructure() { + function renderPageStructure(data) { Origin.trigger('location:title:update', { title: 'Page editor' }); Origin.sidebar.addView(new EditorPageSidebarView().$el, { @@ -62,14 +59,14 @@ define(function(require) { Origin.contentPane.setView(EditorView, { currentCourseId: Origin.location.route1, currentView: 'page', - currentPageId: (Origin.location.route3 || null) + currentPageId: (data.id || null) }); } - function renderMenuStructure() { + function renderMenuStructure(data) { Origin.trigger('location:title:update', { title: 'Menu editor' }); - Origin.editor.currentContentObjectId = Origin.location.route3; + Origin.editor.currentContentObjectId = data.id; Origin.editor.scrollTo = 0; Origin.sidebar.addView(new EditorMenuSidebarView().$el, { @@ -79,21 +76,7 @@ define(function(require) { Origin.contentPane.setView(EditorView, { currentCourseId: Origin.location.route1, currentView: 'menu', - currentPageId: (Origin.location.route3 || null) + currentPageId: (data.id || null) }); } - - function handleNewComponent() { - var containingBlock = Origin.editor.data.blocks.findWhere({ _id: Origin.location.route3 }); - var layoutOptions = containingBlock.get('layoutOptions'); - var componentsModel = new Backbone.Model({ - title: Origin.l10n.t('app.addcomponent'), - body: Origin.l10n.t('app.pleaseselectcomponent'), - _parentId: route3, - componentTypes: Origin.editor.data.componenttypes.toJSON(), - layoutOptions: layoutOptions - }); - Origin.sidebar.addView(new EditorPageComponentListSidebarView({ model: componentsModel }).$el); - Origin.contentPane.setView(EditorPageComponentListView, { model: componentsModel }); - } }); diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js index 02652f64be..388aeaf0af 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js @@ -67,8 +67,8 @@ define(function(require) { var newMenuItemModel = new ContentObjectModel({ _parentId: this._parentId, _courseId: Origin.editor.data.course.get('_id'), - title: (type == 'page'? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), - displayTitle: (type == 'page'? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), + title: (type == 'page' ? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), + displayTitle: (type == 'page' ? Origin.l10n.t('app.placeholdernewpage') : Origin.l10n.t('app.placeholdernewmenu')), body: '', linkText: Origin.l10n.t('app.view'), graphic: { alt: '', src: '' }, @@ -91,13 +91,12 @@ define(function(require) { Origin.editor.data.contentObjects.add(model); // Force setting the data-id attribute as this is required for drag-drop sorting newMenuItemView.$el.children('.editor-menu-item-inner').attr('data-id', model.get('_id')); - - if (type == 'page') { + if (type === 'page') { // HACK -- This should be removed and placed on the server-side - return this.addNewPageArticleAndBlock(model, newMenuItemView); - } else { - newMenuItemView.$el.removeClass('syncing').addClass('synced'); + this.addNewPageArticleAndBlock(model, newMenuItemView); + return; } + newMenuItemView.$el.removeClass('syncing').addClass('synced'); this.setHeight(); }, this) }); diff --git a/frontend/src/modules/editor/course/index.js b/frontend/src/modules/editor/course/index.js index 9e4dae03cc..1f58d784d5 100644 --- a/frontend/src/modules/editor/course/index.js +++ b/frontend/src/modules/editor/course/index.js @@ -1,7 +1,6 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Origin = require('core/origin'); - var EditorData = require('../global/editorDataLoader'); var CourseModel = require('core/models/courseModel'); var EditorCourseEditView = require('./views/editorCourseEditView'); @@ -10,12 +9,7 @@ define(function(require) { Origin.on('router:project', function(route1, route2, route3, route4) { if(route1 === 'new') createNewCourse(); }); - - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 === 'settings') renderCourseEdit(); - }); - }); + Origin.on('editor:course', renderCourseEdit); function renderCourseEdit() { (new CourseModel({ _id: Origin.location.route1 })).fetch({ diff --git a/frontend/src/modules/editor/extensions/index.js b/frontend/src/modules/editor/extensions/index.js index ecf908c172..378ad585e5 100644 --- a/frontend/src/modules/editor/extensions/index.js +++ b/frontend/src/modules/editor/extensions/index.js @@ -2,31 +2,24 @@ define(function(require) { var Backbone = require('backbone'); var Origin = require('core/origin'); - var EditorData = require('../global/editorDataLoader'); var EditorExtensionsEditView = require('./views/editorExtensionsEditView'); var EditorExtensionsEditSidebarView = require('./views/editorExtensionsEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 !== 'extensions') { - return; - } - Origin.trigger('location:title:update', { title: 'Manage extensions' }); - - // Check whether the user came from the page editor or menu editor - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } - - Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }); - Origin.contentPane.setView(EditorExtensionsEditView, { model: new Backbone.Model({ _id: route1 }) }); + Origin.on('editor:extensions', function(data) { + Origin.trigger('location:title:update', { title: 'Manage extensions' }); + var route1 = Origin.location.route1; + // Check whether the user came from the page editor or menu editor + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; + backButtonText = "Back to page"; + } + Origin.sidebar.addView(new EditorExtensionsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute }); + Origin.contentPane.setView(EditorExtensionsEditView, { model: new Backbone.Model({ _id: route1 }) }); }); }); diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index 8d1cb2e6e9..c77ef48d7e 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -107,6 +107,9 @@ define(function(require) { */ waitForLoad: function(callback) { // console.trace('waitForLoad:', preloader.hasLoadedGlobalData(), preloader.hasLoadedCourseData(), preloader.hasLoadedData()); + if(preloader.hasLoadedData()) { + return callback.apply(this); + } if(!preloader.hasLoadedGlobalData()) { // console.log('- listening to preloader'); Origin.once('editor:dataPreloaded', function(){ diff --git a/frontend/src/modules/editor/index.js b/frontend/src/modules/editor/index.js index 49a0b528bb..456558e0cd 100644 --- a/frontend/src/modules/editor/index.js +++ b/frontend/src/modules/editor/index.js @@ -1,21 +1,56 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var Origin = require('core/origin'); - var EditorData = require('./global/editorDataLoader'); - // load the submodules - require([ - './article/index', - './block/index', - './component/index', - './config/index', - './contentObject/index', - './course/index', - './extensions/index', - './menuSettings/index', - './selectTheme/index' - ]); +define([ + 'require', + 'core/origin', + './global/editorDataLoader', + './article/index', + './block/index', + './component/index', + './config/index', + './contentObject/index', + './course/index', + './extensions/index', + './menuSettings/index', + './selectTheme/index' +], function(require, Origin, EditorData) { // loads editor data Origin.on('origin:dataReady login:changed', EditorData.loadGlobalData); Origin.on('router:editor editor:refreshData', EditorData.loadCourseData); Origin.on('editor:resetData', EditorData.reset); + // handle routing + Origin.on('router:editor', function(route1, route2, route3, route4) { + EditorData.waitForLoad(triggerEvent); + }); + /** + * Acts as a sub-router to send out more useful events + */ + function triggerEvent() { + var route2 = Origin.location.route2; + var type; + switch(route2) { + case 'article': + case 'block': + case 'component': + case 'config': + case 'extensions': + case 'menusettings': + case 'selecttheme': + type = route2; + break; + case 'page': + case 'menu': + type = 'contentObject'; + break; + case 'settings': + type = 'course'; + break; + default: + // TODO ??? + } + Origin.trigger('editor:' + type, { + type: route2, + id: Origin.location.route3, + action: Origin.location.route4 + }); + } }); diff --git a/frontend/src/modules/editor/menuSettings/index.js b/frontend/src/modules/editor/menuSettings/index.js index beee205586..64b382aeee 100644 --- a/frontend/src/modules/editor/menuSettings/index.js +++ b/frontend/src/modules/editor/menuSettings/index.js @@ -7,28 +7,24 @@ define(function(require) { var EditorMenuSettingsEditView = require('./views/editorMenuSettingsEditView'); var EditorMenuSettingsEditSidebarView = require('./views/editorMenuSettingsEditSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 !== 'menusettings') { - return; - } - (new ConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - Origin.trigger('location:title:update', {title: 'Select menu'}); + Origin.on('editor:menusettings', function(data) { + var route1 = Origin.location.route1; + (new ConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', {title: 'Select menu'}); - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } - Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }); - Origin.contentPane.setView(EditorMenuSettingsEditView, { model: model }); + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; + if (data.type === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + data.id; + backButtonText = "Back to page"; } - }); + Origin.sidebar.addView(new EditorMenuSettingsEditSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorMenuSettingsEditView, { model: model }); + } }); }); }); diff --git a/frontend/src/modules/editor/selectTheme/index.js b/frontend/src/modules/editor/selectTheme/index.js index 44e781367b..a06f59ffe1 100644 --- a/frontend/src/modules/editor/selectTheme/index.js +++ b/frontend/src/modules/editor/selectTheme/index.js @@ -7,30 +7,26 @@ define(function(require) { var EditorThemeCollectionView = require('./views/editorThemeCollectionView'); var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView'); - Origin.on('router:editor', function(route1, route2, route3, route4) { - EditorData.waitForLoad(function() { - if(route2 !== 'selecttheme') { - return; - } - (new ConfigModel({ _courseId: route1 })).fetch({ - success: function(model) { - Origin.trigger('location:title:update', { title: 'Select theme' }); - - var backButtonRoute = "/#/editor/" + route1 + "/menu"; - var backButtonText = "Back to menu"; + Origin.on('editor:selecttheme', function(data) { + var route1 = Origin.location.route1; + (new ConfigModel({ _courseId: route1 })).fetch({ + success: function(model) { + Origin.trigger('location:title:update', { title: 'Select theme' }); - if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; - backButtonText = "Back to page"; - } + var backButtonRoute = "/#/editor/" + route1 + "/menu"; + var backButtonText = "Back to menu"; - Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, { - "backButtonText": backButtonText, - "backButtonRoute": backButtonRoute - }); - Origin.contentPane.setView(EditorThemeCollectionView, { model: model }); + if (Origin.previousLocation.route2 === "page") { + backButtonRoute = "/#/editor/" + route1 + "/page/" + data.id; + backButtonText = "Back to page"; } - }); + + Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, { + "backButtonText": backButtonText, + "backButtonRoute": backButtonRoute + }); + Origin.contentPane.setView(EditorThemeCollectionView, { model: model }); + } }); }); }); From 3ceded1820fd3a3714b9134523a1322bdd888fa7 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:32:21 +0100 Subject: [PATCH 120/296] Fix whitespace --- frontend/src/modules/projects/index.js | 97 +++++++++++++------------- 1 file changed, 47 insertions(+), 50 deletions(-) diff --git a/frontend/src/modules/projects/index.js b/frontend/src/modules/projects/index.js index 75c4e6d1cd..5c3dd7576a 100644 --- a/frontend/src/modules/projects/index.js +++ b/frontend/src/modules/projects/index.js @@ -8,58 +8,55 @@ define(function(require) { var TagsCollection = require('core/collections/tagsCollection'); Origin.on('router:dashboard', function(location, subLocation, action) { + Origin.trigger('location:title:update', {title: 'Dashboard - viewing my courses'}); + Origin.options.addItems([ + { + title: Origin.l10n.t('app.grid'), + icon: 'th', + callbackEvent: 'dashboard:layout:grid', + value: 'grid', + group: 'layout', + }, + { + title: Origin.l10n.t('app.list'), + icon: 'list', + callbackEvent: 'dashboard:layout:list', + value: 'list', + group: 'layout' + }, + { + title: Origin.l10n.t('app.ascending'), + icon: 'sort-alpha-asc', + callbackEvent: 'dashboard:sort:asc', + value: 'asc', + group: 'sort' + }, + { + title: Origin.l10n.t('app.descending'), + icon: 'sort-alpha-desc', + callbackEvent: 'dashboard:sort:desc', + value: 'desc', + group: 'sort' + }, + { + title: Origin.l10n.t('app.recent'), + icon: 'edit', + callbackEvent: 'dashboard:sort:updated', + value: 'updated', + group: 'sort' + } + ]); - Origin.tap('dashboard', function() { - Origin.trigger('location:title:update', {title: 'Dashboard - viewing my courses'}); - Origin.options.addItems([ - { - title: Origin.l10n.t('app.grid'), - icon: 'th', - callbackEvent: 'dashboard:layout:grid', - value: 'grid', - group: 'layout', - }, - { - title: Origin.l10n.t('app.list'), - icon: 'list', - callbackEvent: 'dashboard:layout:list', - value: 'list', - group: 'layout' - }, - { - title: Origin.l10n.t('app.ascending'), - icon: 'sort-alpha-asc', - callbackEvent: 'dashboard:sort:asc', - value: 'asc', - group: 'sort' - }, - { - title: Origin.l10n.t('app.descending'), - icon: 'sort-alpha-desc', - callbackEvent: 'dashboard:sort:desc', - value: 'desc', - group: 'sort' - }, - { - title: Origin.l10n.t('app.recent'), - icon: 'edit', - callbackEvent: 'dashboard:sort:updated', - value: 'updated', - group: 'sort' - } - ]); + var tagsCollection = new TagsCollection(); - var tagsCollection = new TagsCollection(); - - tagsCollection.fetch({ - success: function() { - Origin.sidebar.addView(new ProjectsSidebarView({ collection: tagsCollection }).$el); - Origin.trigger('dashboard:loaded', { type: location || 'all' }); - }, - error: function() { - console.log('Error occured getting the tags collection - try refreshing your page'); - } - }); + tagsCollection.fetch({ + success: function() { + Origin.sidebar.addView(new ProjectsSidebarView({ collection: tagsCollection }).$el); + Origin.trigger('dashboard:loaded', { type: location || 'all' }); + }, + error: function() { + console.log('Error occured getting the tags collection - try refreshing your page'); + } }); }); From 7447917275d9f1e6fd8089cee484b1e98eef7c8c Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:32:31 +0100 Subject: [PATCH 121/296] Remove unused files --- .../editorPageComponentListSidebar.hbs | 12 -- .../editorPageComponentListSidebarView.js | 116 ------------------ 2 files changed, 128 deletions(-) delete mode 100644 frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs delete mode 100644 frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js diff --git a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs b/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs deleted file mode 100644 index 0c0e251496..0000000000 --- a/frontend/src/modules/editor/contentObject/templates/editorPageComponentListSidebar.hbs +++ /dev/null @@ -1,12 +0,0 @@ -
- - - -
-
diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js deleted file mode 100644 index 356f60a0c8..0000000000 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentListSidebarView.js +++ /dev/null @@ -1,116 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - var Backbone = require('backbone'); - var Origin = require('core/origin'); - - var ComponentModel = require('core/models/componentModel'); - var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); - - var EditorPageComponentListSidebarView = SidebarItemView.extend({ - events: { - 'click .editor-component-list-sidebar-save': 'onSaveClicked', - 'click .editor-component-list-sidebar-save-edit': 'onSaveAndEditClicked', - 'click .editor-component-list-sidebar-cancel': 'cancelEditing' - }, - - onSaveClicked: function(event) { - event && event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save', Origin.l10n.t('app.saving')); - - if(!this.model.get('component') || !this.model.get('layout')) { - return; - } - - var componentType = _.find(Origin.editor.data.componenttypes.models, function(type){ - return type.get('name') == this.model.get('component'); - }, this); - - var _this = this; - var newComponentModel = new ComponentModel(); - - newComponentModel.save({ - title: Origin.l10n.t('app.placeholdernewcomponent'), - displayTitle: '', - body: '', - _parentId: this.model.get('_parentId'), - _courseId: Origin.editor.data.course.get('_id'), - _type: 'component', - _componentType: componentType.get('_id'), - _component: componentType.get('component'), - _layout: this.model.get('layout'), - version: componentType.get('version') - }, - { - error: function() { - Origin.Notify.alert({ - type: 'error', - text: Origin.l10n.t('app.erroraddingcomponent') - }); - }, - success: function() { - Origin.trigger('editor:refreshData', function() { - Backbone.history.history.back(); - }, this); - } - }); - }, - - onSaveAndEditClicked: function(event) { - event && event.preventDefault(); - this.updateButton('.editor-component-list-sidebar-save-edit', Origin.l10n.t('app.saving')); - - if(!this.model.get('component') || !this.model.get('layout')) { - return; - } - - var componentType = _.find(Origin.editor.data.componenttypes.models, function(type){ - return type.get('name') == this.model.get('component'); - }, this); - - var _this = this; - var newComponentModel = new ComponentModel(); - - newComponentModel.save({ - title: Origin.l10n.t('app.placeholdernewcomponent'), - displayTitle: '', - body: '', - _parentId: this.model.get('_parentId'), - _courseId: Origin.editor.data.course.get('_id'), - _type: 'component', - _componentType: componentType.get('_id'), - _component: componentType.get('component'), - _layout: this.model.get('layout'), - version: componentType.get('version') - }, - { - error: function() { - Origin.Notify.alert({ - type: 'error', - text: Origin.l10n.t('app.erroraddingcomponent') - }); - }, - success: function(data) { - Origin.trigger('editor:refreshData', function() { - Origin.router.navigateTo('editor/' + Origin.editor.data.course.get('_id') + '/component/' + data.get('_id')); - }, this); - } - }); - }, - - cancelEditing: function(event) { - event && event.preventDefault(); - var currentCourseId = Origin.location.route1; - var currentBlockId = Origin.location.route3; - var currentBlock = Origin.editor.data.blocks.findWhere({_id: currentBlockId}); - // Don't like this line but until we have findAncestor this will do - var currentPage = currentBlock.getParent().getParent(); - var currentPageId = currentPage.get('_id'); - - Origin.router.navigateTo('editor/' + currentCourseId + '/page/' + currentPageId); - } - }, { - template: 'editorPageComponentListSidebar' - }); - - return EditorPageComponentListSidebarView; -}); From 48f1d67293744499ea61f0821a772f8c853b30d4 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:33:02 +0100 Subject: [PATCH 122/296] Refactor context menu code --- .../src/core/views/contextMenuItemView.js | 37 +++++ frontend/src/core/views/contextMenuView.js | 145 +++++------------- 2 files changed, 78 insertions(+), 104 deletions(-) create mode 100644 frontend/src/core/views/contextMenuItemView.js diff --git a/frontend/src/core/views/contextMenuItemView.js b/frontend/src/core/views/contextMenuItemView.js new file mode 100644 index 0000000000..129c147e7a --- /dev/null +++ b/frontend/src/core/views/contextMenuItemView.js @@ -0,0 +1,37 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Handlebars = require('handlebars'); + var Origin = require('core/origin'); + + var ContextMenuItemView = Backbone.View.extend({ + className: 'context-menu-item', + + events: { + 'click .context-menu-item-open': 'onContextMenuItemClicked' + }, + + initialize: function() { + this.listenTo(Origin, 'contextMenu:empty', this.remove); + this.render(); + }, + + render: function() { + var data = this.model.toJSON(); + var template = Handlebars.templates['contextMenuItem']; + $(this.el).html(template(data)).appendTo('.context-menu-holder'); + return this; + }, + + onContextMenuItemClicked: function(event) { + event && event.preventDefault(); + + var callbackEvent = this.model.get('callbackEvent'); + this.model.get('contextView').trigger('contextMenu:' + this.model.get('type') + ':' + callbackEvent); + + Origin.trigger('contextMenu:closeContextMenu'); + } + }); + + return ContextMenuItemView; +}); diff --git a/frontend/src/core/views/contextMenuView.js b/frontend/src/core/views/contextMenuView.js index 8ea14e7209..a38af9303b 100644 --- a/frontend/src/core/views/contextMenuView.js +++ b/frontend/src/core/views/contextMenuView.js @@ -1,152 +1,89 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -/* -* ContextMenu -* Maintainers - Kevin Corry -*/ define(function(require) { - var Backbone = require('backbone'); var Origin = require('core/origin'); + var ContextMenuItemView = require('./contextMenuItemView'); var ContextMenuView = Backbone.View.extend({ - className: 'context-menu', - contextView : {}, + events: { + 'click .context-menu-close':'onCloseContextMenu' + }, + initialize: function() { this._isVisible = false; - this.listenTo(Origin, 'contextMenu:open', function(view, e) { - this.contextView = view; - var type = view.model.get('_type'); - - if (type == 'course') { - if (!view.model.isEditable()) { - type = 'sharedcourse'; - } - } - - this.onOpenContextMenu(type, e); + this.listenTo(Origin, { + 'contextMenu:open': this.toggleMenu, + 'contextMenu:closeContextMenu remove remove:views': this.hideMenu }); - this.listenTo(Origin, 'contextMenu:closeContextMenu', this.onCloseContextMenu); - this.listenTo(Origin, 'remove', this.onCloseContextMenu); - this.listenTo(Origin, 'remove:views', this.onCloseContextMenu); this.render(); }, - events: { - 'click .context-menu-close':'onCloseContextMenu' - }, - render: function() { var template = Handlebars.templates['contextMenu']; $(this.el).html(template).appendTo('body'); return this; }, - onCloseContextMenu: function(event) { - event && event.preventDefault(); - - this._isVisible = false; - this.hideContextMenu(); - }, - - onOpenContextMenu: function(type, e) { - this.type = type; + renderItems: function() { + this.$('.context-menu-holder').empty(); + Origin.trigger('contextMenu:empty'); - if (this._isVisible) { - this._isVisible = false; - this.hideContextMenu(); - } + var contextView = this.contextView; - this._isVisible = true; - this.showContextMenu(true, e); + _.each(this.collection.where({ type: this.type }), function(item) { + item.set('contextView', contextView); + new ContextMenuItemView({ model: item }); + }); }, - showContextMenu: function(emptyContextMenu, e) { - if (emptyContextMenu) { - this.emptyContextMenu(); - this.renderItems(); - Origin.trigger('contextMenu:openedItemView'); + toggleMenu: function(view, e) { + if(this._isVisible) { + return this.hideMenu(); } + this.setMenu(view, $(e.currentTarget)); + this.showMenu(); + }, - var newCSS = { - position: 'absolute', - left: $(e.currentTarget).offset().left + $(e.currentTarget).width() + 10, - top: $(e.currentTarget).offset().top-($(e.currentTarget).height()/2) - }; - - this.$el.css(newCSS).removeClass('display-none'); + setMenu: function(view, $parent) { + this.contextView = view; - this.addBodyEvent(); + var type = view.model.get('_type'); + if (type === 'course' && !view.model.isEditable()) type = 'sharedcourse'; + this.type = type; - Origin.trigger('contextMenu:opened'); - }, + this.renderItems(); - emptyContextMenu: function() { - this.$('.context-menu-holder').empty(); + this.$el.css({ + position: 'absolute', + left: $parent.offset().left + $parent.width() + 10, + top: $parent.offset().top - ($parent.height()/2) + }); }, - renderItems: function() { - Origin.trigger('contextMenu:empty'); - this.emptyContextMenu(); - var contextView = this.contextView; - var filtered = this.collection.where({type:this.type}); - _.each(filtered, function(item) { - item.set('contextView', contextView); - new ContextMenuItemView({model: item}); - }); + showMenu: function() { + this.$el.removeClass('display-none'); + this._isVisible = true; + this.addBodyEvent(); + Origin.trigger('contextMenu:opened'); }, - hideContextMenu: function() { + hideMenu: function() { this.$el.addClass('display-none'); + this._isVisible = false; this.removeBodyEvent(); Origin.trigger('contextMenu:closed'); }, addBodyEvent: function() { - $('html').one('click', _.bind(function() { - this.onCloseContextMenu(); - }, this)); + $('html').one('click', _.bind(this.hideMenu, this)); }, removeBodyEvent: function() { $('html').off('click'); } - }); - - var ContextMenuItemView = Backbone.View.extend({ - - className: 'context-menu-item', - - initialize: function() { - this.listenTo(Origin, 'contextMenu:empty', this.remove); - this.render(); - }, - - events: { - 'click .context-menu-item-open': 'onContextMenuItemClicked' - }, - - render: function() { - var data = this.model.toJSON(); - var template = Handlebars.templates['contextMenuItem']; - $(this.el).html(template(data)).appendTo('.context-menu-holder'); - return this; - }, - - onContextMenuItemClicked: function(event) { - event.preventDefault(); - - var callbackEvent = this.model.get('callbackEvent'); - this.model.get('contextView').trigger('contextMenu:' + this.model.get('type') + ':' + callbackEvent); - - Origin.trigger('contextMenu:closeContextMenu'); - } - - }); - return ContextMenuView; - }); From d03f9e3e36e36c65b177b13b14098700478f4dbd Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:42:59 +0100 Subject: [PATCH 123/296] Move context menu code to modules/ --- frontend/src/core/contextMenu.js | 123 ------------------ frontend/src/modules/contextMenu/index.js | 101 ++++++++++++++ .../contextMenu}/less/contextMenu.less | 0 .../contextMenu}/templates/contextMenu.hbs | 0 .../templates/contextMenuItem.hbs | 0 .../contextMenu}/views/contextMenuItemView.js | 0 .../contextMenu}/views/contextMenuView.js | 5 +- 7 files changed, 103 insertions(+), 126 deletions(-) delete mode 100644 frontend/src/core/contextMenu.js create mode 100644 frontend/src/modules/contextMenu/index.js rename frontend/src/{core => modules/contextMenu}/less/contextMenu.less (100%) rename frontend/src/{core => modules/contextMenu}/templates/contextMenu.hbs (100%) rename frontend/src/{core => modules/contextMenu}/templates/contextMenuItem.hbs (100%) rename frontend/src/{core => modules/contextMenu}/views/contextMenuItemView.js (100%) rename frontend/src/{core => modules/contextMenu}/views/contextMenuView.js (96%) diff --git a/frontend/src/core/contextMenu.js b/frontend/src/core/contextMenu.js deleted file mode 100644 index 791e4e64e7..0000000000 --- a/frontend/src/core/contextMenu.js +++ /dev/null @@ -1,123 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -/* -* Context Menu -* License - https://github.com/adaptlearning/adapt_framework/blob/master/LICENSE -* Maintainers - Kevin Corry -*/ -define(function(require) { - - var ContextMenuView = require('core/views/contextMenuView'); - var ContextMenuCollection = new Backbone.Collection(); - var Origin = require('core/origin'); - - var ContextMenu = {}; - - ContextMenu.addItem = function(type, contextMenuObject) { - if (contextMenuObject.length > 1) { - _.each(contextMenuObject, function (object) { - object.type = type; - ContextMenuCollection.add(object); - }); - } else { - contextMenuObject.type = type; - ContextMenuCollection.add(contextMenuObject); - } - } - - var init = function() { - new ContextMenuView({collection: ContextMenuCollection}); - - // Setup context menu items - var contextItems = [ - { - title: Origin.l10n.t('app.edit'), - className: 'context-menu-item', - callbackEvent: "edit" - }, - { - title: Origin.l10n.t('app.copy'), - className: 'context-menu-item', - callbackEvent: "copy" - }, - { - title: Origin.l10n.t('app.copyidtoclipboard'), - className: 'context-menu-item', - callbackEvent: "copyID" - }, - { - title: Origin.l10n.t('app.delete'), - className: 'context-menu-item', - callbackEvent: "delete" - } - ]; - - ContextMenu.addItem('article', contextItems); - ContextMenu.addItem('block', contextItems); - ContextMenu.addItem('component', contextItems); - ContextMenu.addItem('page', contextItems); - - ContextMenu.addItem('page-min', [ - { - title: Origin.l10n.t('app.edit'), - className: 'context-menu-item', - callbackEvent: "edit" - }, - { - title: Origin.l10n.t('app.copyidtoclipboard'), - className: 'context-menu-item', - callbackEvent: "copyID" - } - ]); - - // Set the section/menu menu options - contextItems.splice(_.indexOf(contextItems, _.findWhere(contextItems, { callbackEvent : "copy"})), 1); - ContextMenu.addItem('menu', contextItems); - - var courseContextItems = [ - { - title: Origin.l10n.t('app.editsettings'), - className: 'context-menu-item', - callbackEvent: 'editSettings' - }, - { - title: Origin.l10n.t('app.editcourse'), - className: 'context-menu-item', - callbackEvent: 'edit' - }, - { - title: Origin.l10n.t('app.copy'), - className: 'context-menu-item', - callbackEvent: 'duplicate' - }, - { - title: Origin.l10n.t('app.delete'), - className: 'context-menu-item', - callbackEvent: 'delete' - } - ]; - - ContextMenu.addItem('course', courseContextItems); - - var sharedCourseContextItems = [ - { - title: Origin.l10n.t('app.duplicate'), - className: 'context-menu-item', - callbackEvent: 'duplicate' - }, - { - title: Origin.l10n.t('app.preview'), - className: 'context-menu-item', - callbackEvent: 'preview' - } - ]; - - ContextMenu.addItem('sharedcourse', sharedCourseContextItems); - } - - Origin.once('origin:dataReady', function() { - init(); - }); - - Origin.contextMenu = ContextMenu; - -}); diff --git a/frontend/src/modules/contextMenu/index.js b/frontend/src/modules/contextMenu/index.js new file mode 100644 index 0000000000..6c1f09ab3e --- /dev/null +++ b/frontend/src/modules/contextMenu/index.js @@ -0,0 +1,101 @@ +// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE +define(function(require) { + var Backbone = require('backbone'); + var Origin = require('core/origin'); + var ContextMenuView = require('./views/contextMenuView'); + + // Public API + Origin.contextMenu = ContextMenu = { + addItem: function(type, contextMenuObject) { + if (contextMenuObject.length > 1) { + _.each(contextMenuObject, function (object) { + object.type = type; + menuItems.add(object); + }); + } else { + contextMenuObject.type = type; + menuItems.add(contextMenuObject); + } + } + }; + + Origin.on('origin:dataReady login:changed', init); + + // Privates + + var menuItems; + var view; + + function init() { + menuItems = new Backbone.Collection(); + setUpMenuItems(); + + if(view) view.remove(); + view = new ContextMenuView({ collection: menuItems }); + }; + + function setUpMenuItems() { + ContextMenu.addItem('article', getDefaultItems()); + ContextMenu.addItem('block', getDefaultItems()); + ContextMenu.addItem('component', getDefaultItems()); + ContextMenu.addItem('page', getDefaultItems()); + ContextMenu.addItem('menu', getDefaultItems(['copy'])); + ContextMenu.addItem('page-min', getDefaultItems(['copy','delete'])); + ContextMenu.addItem('sharedcourse', [ + { + title: Origin.l10n.t('app.duplicate'), + className: 'context-menu-item', + callbackEvent: 'duplicate' + }, + { + title: Origin.l10n.t('app.preview'), + className: 'context-menu-item', + callbackEvent: 'preview' + } + ]); + var courseItems = getDefaultItems(['copyID']); + var superPerms = ["*/*:create","*/*:read","*/*:update","*/*:delete"]; + if (Origin.permissions.hasPermissions(superPerms)) { + courseItems.push({ + title: Origin.l10n.t('app.export'), + className: 'context-menu-item', + callbackEvent: 'export' + }); + } + ContextMenu.addItem('course', courseItems); + }; + + /* + * returns the default list excluding anything in [blacklist] (uses event name) + */ + function getDefaultItems(blacklist) { + var DEFAULT_ITEMS = [ + { + title: Origin.l10n.t('app.edit'), + className: 'context-menu-item', + callbackEvent: "edit" + }, + { + title: Origin.l10n.t('app.copy'), + className: 'context-menu-item', + callbackEvent: "copy" + }, + { + title: Origin.l10n.t('app.copyidtoclipboard'), + className: 'context-menu-item', + callbackEvent: "copyID" + }, + { + title: Origin.l10n.t('app.delete'), + className: 'context-menu-item', + callbackEvent: "delete" + } + ]; + if(!blacklist) { + return DEFAULT_ITEMS; + } + return _.filter(DEFAULT_ITEMS, function(item) { + return blacklist.indexOf(item.callbackEvent) < 0; + }); + }; +}); diff --git a/frontend/src/core/less/contextMenu.less b/frontend/src/modules/contextMenu/less/contextMenu.less similarity index 100% rename from frontend/src/core/less/contextMenu.less rename to frontend/src/modules/contextMenu/less/contextMenu.less diff --git a/frontend/src/core/templates/contextMenu.hbs b/frontend/src/modules/contextMenu/templates/contextMenu.hbs similarity index 100% rename from frontend/src/core/templates/contextMenu.hbs rename to frontend/src/modules/contextMenu/templates/contextMenu.hbs diff --git a/frontend/src/core/templates/contextMenuItem.hbs b/frontend/src/modules/contextMenu/templates/contextMenuItem.hbs similarity index 100% rename from frontend/src/core/templates/contextMenuItem.hbs rename to frontend/src/modules/contextMenu/templates/contextMenuItem.hbs diff --git a/frontend/src/core/views/contextMenuItemView.js b/frontend/src/modules/contextMenu/views/contextMenuItemView.js similarity index 100% rename from frontend/src/core/views/contextMenuItemView.js rename to frontend/src/modules/contextMenu/views/contextMenuItemView.js diff --git a/frontend/src/core/views/contextMenuView.js b/frontend/src/modules/contextMenu/views/contextMenuView.js similarity index 96% rename from frontend/src/core/views/contextMenuView.js rename to frontend/src/modules/contextMenu/views/contextMenuView.js index a38af9303b..387ec8af88 100644 --- a/frontend/src/core/views/contextMenuView.js +++ b/frontend/src/modules/contextMenu/views/contextMenuView.js @@ -31,10 +31,8 @@ define(function(require) { this.$('.context-menu-holder').empty(); Origin.trigger('contextMenu:empty'); - var contextView = this.contextView; - _.each(this.collection.where({ type: this.type }), function(item) { - item.set('contextView', contextView); + item.set('contextView', this.contextView); new ContextMenuItemView({ model: item }); }); }, @@ -85,5 +83,6 @@ define(function(require) { $('html').off('click'); } }); + return ContextMenuView; }); From bea973e135e73118099922f540982b14a7a52cfa Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:44:08 +0100 Subject: [PATCH 124/296] Add focus event support to Origin --- frontend/src/core/app.js | 1 - frontend/src/core/origin.js | 11 +++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index 44ce8dd948..adf12ff06e 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -24,7 +24,6 @@ 'core/permissions', 'core/l10n', 'core/constants', - 'core/contextMenu', 'core/contentPane' ], function(Templates, Origin, Router) { origin = Origin; diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index 26dcfc07e1..d86c5e6f6b 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -78,6 +78,7 @@ define(function(require){ function listenToWindowEvents() { $(document).on('keydown', onKeyDown); $(window).on('resize', onResize); + $(window).on('blur focus', onFocusBlur); } function showLoading(shouldHideTopBar) { @@ -125,5 +126,15 @@ define(function(require){ Origin.trigger('window:resize', windowWidth, windowHeight); } + function onFocusBlur(event) { + var $win = $('window'); + var prevType = $win.data("prevType"); + // prevent double-firing + if(prevType === event.type) return; + // send out Origin events + var eventName = (event.type === 'focus') ? 'active' : 'inactive'; + Origin.trigger('window:' + eventName, event); + } + return Origin; }); From 3a77f3703a9df8e4be90e3b0d4cc34e0c4facbec Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 5 Apr 2017 16:49:11 +0100 Subject: [PATCH 125/296] Move content pane files to modules/ --- .../src/{core/contentPane.js => modules/contentPane/index.js} | 0 frontend/src/{core => modules/contentPane}/less/contentPane.less | 0 .../src/{core => modules/contentPane}/templates/contentPane.hbs | 0 .../src/{core => modules/contentPane}/views/contentPaneView.js | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename frontend/src/{core/contentPane.js => modules/contentPane/index.js} (100%) rename frontend/src/{core => modules/contentPane}/less/contentPane.less (100%) rename frontend/src/{core => modules/contentPane}/templates/contentPane.hbs (100%) rename frontend/src/{core => modules/contentPane}/views/contentPaneView.js (100%) diff --git a/frontend/src/core/contentPane.js b/frontend/src/modules/contentPane/index.js similarity index 100% rename from frontend/src/core/contentPane.js rename to frontend/src/modules/contentPane/index.js diff --git a/frontend/src/core/less/contentPane.less b/frontend/src/modules/contentPane/less/contentPane.less similarity index 100% rename from frontend/src/core/less/contentPane.less rename to frontend/src/modules/contentPane/less/contentPane.less diff --git a/frontend/src/core/templates/contentPane.hbs b/frontend/src/modules/contentPane/templates/contentPane.hbs similarity index 100% rename from frontend/src/core/templates/contentPane.hbs rename to frontend/src/modules/contentPane/templates/contentPane.hbs diff --git a/frontend/src/core/views/contentPaneView.js b/frontend/src/modules/contentPane/views/contentPaneView.js similarity index 100% rename from frontend/src/core/views/contentPaneView.js rename to frontend/src/modules/contentPane/views/contentPaneView.js From 80d0d62f4ca1c1c364bc5beffb026d04ba59974d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sun, 2 Apr 2017 16:21:49 +0100 Subject: [PATCH 126/296] Remove content pane loading --- frontend/src/core/app.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index adf12ff06e..efc6180c47 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -23,8 +23,7 @@ 'core/router', 'core/permissions', 'core/l10n', - 'core/constants', - 'core/contentPane' + 'core/constants' ], function(Templates, Origin, Router) { origin = Origin; origin.router = new Router(); From 03474291bd928ff022cdf00318eafaec0be402c7 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sun, 2 Apr 2017 16:53:44 +0100 Subject: [PATCH 127/296] Remove permissions view Added Router.blockUser access which displays a Notify --- frontend/src/core/less/colours.less | 9 ++-- frontend/src/core/less/permissions.less | 30 ------------- frontend/src/core/less/sharedStyles.less | 11 +++++ frontend/src/core/router.js | 32 +++++++++----- frontend/src/core/templates/permissions.hbs | 14 ------ frontend/src/core/views/permissionsView.js | 43 ------------------- .../src/modules/notify/plugins/alert/index.js | 4 +- .../notify/plugins/alert/less/alert.less | 23 ++++++++-- frontend/src/modules/user/less/login.less | 11 +---- 9 files changed, 61 insertions(+), 116 deletions(-) delete mode 100644 frontend/src/core/less/permissions.less delete mode 100644 frontend/src/core/templates/permissions.hbs delete mode 100644 frontend/src/core/views/permissionsView.js diff --git a/frontend/src/core/less/colours.less b/frontend/src/core/less/colours.less index 25e02881d1..497b80b7ba 100644 --- a/frontend/src/core/less/colours.less +++ b/frontend/src/core/less/colours.less @@ -30,9 +30,12 @@ @ui-content-header-color:#e0e8f7; @ui-content-color:#f3fcfe; -@warning-color:#ffa08d; -@alert-color:#ff5567; -@disabled-color:#454545; +@alert-color: #ff5567; +@warning-color: #ffa08d; +@info-color: fade(@primary-color, 60%); +@success-color: @secondary-color; + +@disabled-color: #454545; /*/////////// // Layout colors diff --git a/frontend/src/core/less/permissions.less b/frontend/src/core/less/permissions.less deleted file mode 100644 index d8e657efb1..0000000000 --- a/frontend/src/core/less/permissions.less +++ /dev/null @@ -1,30 +0,0 @@ -@import 'sharedStyles'; -@import 'colours'; - -.permissions { - .form-container-style; - text-align:center; - top: 20px; - position: relative; - - > .inner { - padding: 40px; - - .permissions-icon i { - font-size:56px; - color:@alert-color; - } - - .title { - margin: 20px 0; - font-size: 16px; - font-weight: 600; - } - - .body { - .inner { - margin-bottom: 20px; - } - } - } -} diff --git a/frontend/src/core/less/sharedStyles.less b/frontend/src/core/less/sharedStyles.less index 572a451c6d..9c15e114a0 100644 --- a/frontend/src/core/less/sharedStyles.less +++ b/frontend/src/core/less/sharedStyles.less @@ -27,3 +27,14 @@ user-select: none; cursor: default; } + +.no-ui { + background: url(assets/login_bg.jpg) no-repeat center center fixed; + -webkit-background-size: cover; + -moz-background-size: cover; + -o-background-size: cover; + background-size: cover; + .sidebar, .navigation, .location-title { + display: none; + } +} diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index 129af789b2..096b5464c9 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -3,7 +3,6 @@ define(function(require) { var _ = require('underscore'); var Backbone = require('backbone'); var Origin = require('core/origin'); - var PermissionsView = require('core/views/permissionsView'); var Router = Backbone.Router.extend({ homeRoute: '', @@ -57,24 +56,37 @@ define(function(require) { */ verifyRoute: function(module, route1) { // Check this user has permissions - if (!Origin.permissions.checkRoute(Backbone.history.fragment)) { - Origin.trigger('sidebar:sidebarContainer:hide'); - Origin.trigger('location:title:hide'); - $('.app-inner').append(new PermissionsView().$el); + if(!Origin.permissions.checkRoute(Backbone.history.fragment)) { + this.blockUserAccess(); return false; } // FIXME routes shouldn't be hard-coded if(!this.isUserAuthenticated() && (module !== 'user' && route1 !== 'login')) { - Origin.Notify.alert({ - type: 'error', - text: Origin.l10n.t('app.errorsessionexpired'), - callback: _.bind(this.navigateToLogin, this) - }); + this.blockUserAccess(Origin.l10n.t('app.errorsessionexpired'), true); return false; } return true; }, + /** + * Boots user to the login screen with an error message + */ + blockUserAccess: function(message, hideUI) { + if(hideUI) { + $('body').addClass('no-ui'); + Origin.trigger('remove:views'); + } + var cb = hideUI ? Origin.router.navigateToLogin : Origin.router.navigateToHome; + + Origin.Notify.alert({ + type: 'error', + title: Origin.l10n.t('app.errorpagenoaccesstitle'), + text: message || Origin.l10n.t('app.errorpagenoaccess'), + confirmButtonText: Origin.l10n.t('app.ok'), + callback: cb + }); + }, + // Persist any dashboard routing for 'Back to courses' link // FIXME this shouldn't be here, or work like this... evaluateDashboardRoute: function() { diff --git a/frontend/src/core/templates/permissions.hbs b/frontend/src/core/templates/permissions.hbs deleted file mode 100644 index fdfcdcadfa..0000000000 --- a/frontend/src/core/templates/permissions.hbs +++ /dev/null @@ -1,14 +0,0 @@ -
-
- -
-
- {{t 'app.errorpagenoaccesstitle'}} -
-
-
- {{t 'app.errorpagenoaccess'}} -
- {{t 'app.dashboard'}} -
-
\ No newline at end of file diff --git a/frontend/src/core/views/permissionsView.js b/frontend/src/core/views/permissionsView.js deleted file mode 100644 index 2578927231..0000000000 --- a/frontend/src/core/views/permissionsView.js +++ /dev/null @@ -1,43 +0,0 @@ -// LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -// define(function(require) { -define(['require', 'backbone', 'core/origin'], function(require, Backbone, Origin) { - // var Backbone = require('backbone'); - // var Origin = require('core/origin'); - - var PermissionsView = Backbone.View.extend({ - - className: 'permissions', - - initialize: function(options) { - this.preRender(options); - this.render(); - this.listenTo(Origin, 'remove:views', this.remove); - }, - - preRender: function() {}, - - render: function() { - var data = this.model ? this.model.toJSON() : null; - var template = Handlebars.templates[this.constructor.template]; - this.$el.html(template(data)); - _.defer(_.bind(function() { - this.postRender(); - }, this)); - return this; - }, - - postRender: function() { - this.setViewToReady(); - }, - - setViewToReady: function() { - Origin.trigger('origin:hideLoading'); - } - - }, { - template: 'permissions' - }); - - return PermissionsView; - -}); diff --git a/frontend/src/modules/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js index d4ba90a42b..6edbece9e3 100644 --- a/frontend/src/modules/notify/plugins/alert/index.js +++ b/frontend/src/modules/notify/plugins/alert/index.js @@ -40,9 +40,8 @@ define(function(require) { } data.type = null; } - // combine settings, overwriting defaults with param - return _.extend(defaults, data); + return _.defaults(data, defaults); }; function openPopup(data) { @@ -122,7 +121,6 @@ define(function(require) { var init = function() { Origin.Notify.register('alert', Alert); Origin.Notify.register('confirm', Confirm); - // shortcuts to override window methods window.alert = alert = Alert; window.confirm = confirm = Confirm; diff --git a/frontend/src/modules/notify/plugins/alert/less/alert.less b/frontend/src/modules/notify/plugins/alert/less/alert.less index 788c59dcf4..c0dba5116a 100644 --- a/frontend/src/modules/notify/plugins/alert/less/alert.less +++ b/frontend/src/modules/notify/plugins/alert/less/alert.less @@ -1,5 +1,6 @@ @import (inline) '../assets/sweetalert.css'; @import 'buttons'; +@import 'colours'; .sweet-alert { max-height: 91%; @@ -7,6 +8,8 @@ button { min-width: 100px; + margin: 10px 5px 20px 5px; + &.cancel { .btn; .primary-hollow; @@ -18,10 +21,22 @@ font-size: 115%; } } - .sa-icon.sa-warning { - border-color: #bb1919; - .sa-dot, .sa-body { - background-color: #bb1919; + .sa-icon { + &.sa-error { + border-color: @alert-color; + .sa-line { background-color: @alert-color; } + } + &.sa-warning { + border-color: @warning-color; + .sa-dot, .sa-body { background-color: @warning-color; } + } + &.sa-info { + border-color: @info-color; + &:before, &:after { background-color: @info-color; } + } + &.sa-success { + .sa-line { background-color: @success-color; } + .sa-placeholder { border-color: fade(@success-color, 20%); } } } diff --git a/frontend/src/modules/user/less/login.less b/frontend/src/modules/user/less/login.less index 58208c9dbf..c42f6c65b3 100644 --- a/frontend/src/modules/user/less/login.less +++ b/frontend/src/modules/user/less/login.less @@ -4,18 +4,11 @@ &.location-login, &.location-forgot, &.location-reset { + .no-ui; + max-width: 450px; margin: 0 auto; color: #fff; - background: url(assets/login_bg.jpg) no-repeat center center fixed; - -webkit-background-size: cover; - -moz-background-size: cover; - -o-background-size: cover; - background-size: cover; - - .sidebar, .navigation, .location-title { - display: none; - } #app { margin-left: 0px; From 6288792658c832479187fd6025c86b1a76ee211f Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sun, 2 Apr 2017 16:54:16 +0100 Subject: [PATCH 128/296] Fix whitespace --- frontend/src/modules/contentPane/views/contentPaneView.js | 2 +- frontend/src/modules/notify/plugins/alert/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/contentPane/views/contentPaneView.js b/frontend/src/modules/contentPane/views/contentPaneView.js index bdac03184a..190b63b448 100644 --- a/frontend/src/modules/contentPane/views/contentPaneView.js +++ b/frontend/src/modules/contentPane/views/contentPaneView.js @@ -19,7 +19,7 @@ define(function(require) { }, listenToEvents: function() { - this.listenTo(Origin, 'remove:views', this.removeView ); + this.listenTo(Origin, 'remove:views', this.removeView); this.$el.scroll(_.bind(this.onScroll, this)); $(window).on('resize', _.bind(this.resize, this)); }, diff --git a/frontend/src/modules/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js index 6edbece9e3..d2472d72f8 100644 --- a/frontend/src/modules/notify/plugins/alert/index.js +++ b/frontend/src/modules/notify/plugins/alert/index.js @@ -33,7 +33,7 @@ define(function(require) { break; default: if (data.type) { - Origin. Notify.console({ + Origin.Notify.console({ type: 'error', text: '"' + data.type + '" is not a valid alert type' }); From 3075466b352ee0a414449b710a79eede0856af04 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sun, 2 Apr 2017 16:54:32 +0100 Subject: [PATCH 129/296] Turn off Origin.debug --- frontend/src/core/origin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index d86c5e6f6b..3433f91296 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -9,7 +9,7 @@ define(function(require){ var $loading; var Origin = _.extend({}, Backbone.Events, { - debug: true, + debug: false, /** * Performs the necessary set-up steps */ From 718abd94d374344ee04fbc0ad50dc60332f4722b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sun, 2 Apr 2017 16:57:23 +0100 Subject: [PATCH 130/296] Add Backbone.history.start() --- frontend/src/core/router.js | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index 096b5464c9..a52ceb0ca5 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -13,6 +13,9 @@ define(function(require) { }, initialize: function() { + this.listenTo(Origin, { + 'origin:initialize': this.onOriginInitialize + }); this.locationKeys = ['module', 'route1', 'route2', 'route3', 'route4']; this.resetLocation(); }, @@ -140,6 +143,16 @@ define(function(require) { } this.updateLocation(arguments); Origin.trigger('router:' + module, route1, route2, route3, route4); + }, + + /** + * Event handling + */ + + onOriginInitialize: function() { + Backbone.history.start(); + }, + } }); From 39822bf87a7b766fda53516de45deccc8ceb2c9c Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 6 Apr 2017 18:10:49 +0100 Subject: [PATCH 131/296] Remove success boolean from response This should use status codes --- plugins/auth/local/index.js | 81 ++++++++++++++----------------------- 1 file changed, 31 insertions(+), 50 deletions(-) diff --git a/plugins/auth/local/index.js b/plugins/auth/local/index.js index e9a69e4aba..04b742c284 100644 --- a/plugins/auth/local/index.js +++ b/plugins/auth/local/index.js @@ -108,68 +108,49 @@ LocalAuth.prototype.authenticate = function (req, res, next) { if (error) { return next(error); } - - if (!user) { - // Check if a valid email was used - res.statusCode = 401; - return res.json({ success: false, errorCode: info.errorCode}); - } else { - // check user is not deleted - if (user._isDeleted) { - res.statusCode = 401; - return res.json({ success: false, errorCode: ERROR_CODES.ACCOUNT_INACTIVE }); + if(!user) { + return res.status(401).json({ errorCode: info.errorCode}); + } + // check user is not deleted + if (user._isDeleted) { + return res.status(401).json({ errorCode: ERROR_CODES.ACCOUNT_INACTIVE }); + } + // check tenant is enabled + self.isTenantEnabled(user, function (err, isEnabled) { + if (!isEnabled) { + return res.status(401).json({ errorCode: ERROR_CODES.TENANT_DISABLED }); } - - // check tenant is enabled - self.isTenantEnabled(user, function (err, isEnabled) { - if (!isEnabled) { - // don't allow login - res.statusCode = 401; - return res.json({ success: false, errorCode: ERROR_CODES.TENANT_DISABLED }); + // Store the login details + req.logIn(user, function (error) { + if (error) { + return next(error); } - - // Store the login details - req.logIn(user, function (error) { + usermanager.logAccess(user, function(error) { if (error) { return next(error); } - - usermanager.logAccess(user, function(error) { + //Used to get the users permissions + permissions.getUserPermissions(user._id, function(error, userPermissions) { if (error) { return next(error); } - - - //Used to get the users permissions - permissions.getUserPermissions(user._id, function(error, userPermissions) { - if (error) { - return next(error); - } - res.statusCode = 200; - - if (req.body.shouldPersist && req.body.shouldPersist == 'true') { - // Session is persisted for 2 weeks if the user has set 'Remember me' - req.session.cookie.maxAge = 14 * 24 * 3600000; - } else { - req.session.cookie.expires = false; - } - - var userSession = req.session.passport.user; - - return res.json({ - success: true, - id: user._id, - email: user.email, - tenantId: user._tenantId, - tenantName: userSession.tenant.name, - permissions: userPermissions - }); + if (req.body.shouldPersist && req.body.shouldPersist == 'true') { + // Session is persisted for 2 weeks if the user has set 'Remember me' + req.session.cookie.maxAge = 14 * 24 * 3600000; + } else { + req.session.cookie.expires = false; + } + return res.status(200).json({ + id: user._id, + email: user.email, + tenantId: user._tenantId, + tenantName: req.session.passport.user.tenant.name, + permissions: userPermissions }); }); }); }); - } - + }); })(req, res, next); }; From 3efee836293026b5728b3655b984ffad7a518252 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 6 Apr 2017 18:10:57 +0100 Subject: [PATCH 132/296] Refactor sessionModel --- .../src/modules/user/models/sessionModel.js | 91 +++++++------------ 1 file changed, 34 insertions(+), 57 deletions(-) diff --git a/frontend/src/modules/user/models/sessionModel.js b/frontend/src/modules/user/models/sessionModel.js index fe70ecf266..cd90f4de63 100644 --- a/frontend/src/modules/user/models/sessionModel.js +++ b/frontend/src/modules/user/models/sessionModel.js @@ -1,73 +1,50 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require) { - - var Backbone = require('backbone'); - var Origin = require('core/origin'); - +define(['require', 'backbone', 'core/origin'], function(require, Backbone, Origin) { var SessionModel = Backbone.Model.extend({ - + url: "/api/authcheck", defaults: { - isAuthenticated: false, id: '', tenantId: '', email: '', - otherLoginLinks: [] + isAuthenticated: false, + permissions: [], + otherLoginLinks: [], + _canRevert: false }, - url: "/api/authcheck", - - initialize: function() {}, - - logout: function () { - var self = this; - - $.post( - '/api/logout', - function() { - self.set('isAuthenticated', false); - self.set('id', ''); - self.set('tenantId', ''); - self.set('email', ''); - self.set('permissions', []); - self.set('_canRevert', false); - - Origin.trigger('login:changed'); - Origin.router.navigateToLogin(); - }); + initialize: function() { }, login: function (username, password, shouldPersist) { - var self = this; - - $.ajax({ - method: 'post', - url: '/api/login', - data: {email: username, password: password, shouldPersist: shouldPersist}, - success: function (jqXHR, textStatus, errorThrown) { - if (jqXHR.success) { - self.set('id', jqXHR.id); - self.set('tenantId', jqXHR.tenantId); - self.set('email', jqXHR.email); - self.set('isAuthenticated', jqXHR.success); - self.set('permissions', jqXHR.permissions); - - Origin.trigger('login:changed'); - Origin.trigger('schemas:loadData', Origin.router.navigateToHome); - } - }, - error: function (jqXHR, textStatus, errorThrown) { - var errorCode = 1; - - if (jqXHR.responseJSON && jqXHR.responseJSON.errorCode) { - errorCode = jqXHR.responseJSON.errorCode; - } - - Origin.trigger('login:failed', errorCode); - } + var postData = { + email: username, + password: password, + shouldPersist: shouldPersist + }; + $.post('/api/login', postData, _.bind(function (jqXHR, textStatus, errorThrown) { + this.set({ + id: jqXHR.id, + tenantId: jqXHR.tenantId, + email: jqXHR.email, + isAuthenticated: true, + permissions: jqXHR.permissions + }); + Origin.trigger('login:changed'); + Origin.trigger('schemas:loadData', Origin.router.navigateToHome); + }, this)).fail(function(jqXHR, textStatus, errorThrown) { + Origin.trigger('login:failed', (jqXHR.responseJSON && jqXHR.responseJSON.errorCode) || 1); }); - } + }, + + logout: function () { + $.post('/api/logout', _.bind(function() { + // revert to the defaults + this.set(this.defaults); + Origin.trigger('login:changed'); + Origin.router.navigateToLogin(); + }, this)); + }, }); return SessionModel; - }); From 278ef2f2c3423c13282db9fcd0f0cba28e450746 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 6 Apr 2017 18:31:30 +0100 Subject: [PATCH 133/296] Remove extra bracket --- frontend/src/core/router.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index a52ceb0ca5..49334f3c08 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -151,8 +151,6 @@ define(function(require) { onOriginInitialize: function() { Backbone.history.start(); - }, - } }); From 4db728810b70d2eb4b7dd5eab8bb20feeddfc105 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 10 Apr 2017 13:30:50 +0100 Subject: [PATCH 134/296] THEBIGBUGFIX: Fix form styles (#1568) * Fix broken margin * Remove commented code * Convert tabs to spaces * Update sharedStyles.less * Remove extraneous bracket * Remove nesting * Remove uneven padding --- frontend/src/core/scaffold/less/forms.less | 156 ++++++++++----------- frontend/src/less/sharedStyles.less | 20 +-- 2 files changed, 83 insertions(+), 93 deletions(-) diff --git a/frontend/src/core/scaffold/less/forms.less b/frontend/src/core/scaffold/less/forms.less index 4056a4f952..660e2d3caa 100644 --- a/frontend/src/core/scaffold/less/forms.less +++ b/frontend/src/core/scaffold/less/forms.less @@ -1,111 +1,101 @@ -.form-container { - margin: 30px 0; -} - // apply border to only the top level fieldset .form-container > form > div > fieldset { - border: 1px solid #d6f2f9; - margin: 20px; - padding-bottom: 15px; - max-width: 800px; + border: 1px solid #d6f2f9; + margin: 20px; + padding-bottom: 15px; + max-width: 800px; } fieldset { - margin: 0 0 30px 20px; - background-color: #fff; - /*width: 80%;*/ - form form & { - padding-bottom: 0px; - } - label { - cursor: auto; - } + margin: 0 0 30px 20px; + background-color: #fff; + form form & { + padding-bottom: 0px; + } + label { + cursor: auto; + } } -form { - .error { - top: inherit; - left: inherit; - font-size: inherit; - position: inherit; - } +form .error { + top: inherit; + left: inherit; + font-size: inherit; + position: inherit; } .legend { - display: block; - legend { - padding: 25px 0 10px 30px; - font-size:16px; - /*cursor: pointer;*/ - font-weight:600; - } - .fieldset-object & { - color:#3e4960; - font-weight:bold; - text-decoration: underline; - legend { - padding:0; - margin-bottom:0px; - } - } + display: block; + legend { + padding: 25px 0 10px 30px; + font-size:16px; + font-weight:600; + } + .fieldset-object & { + color:#3e4960; + font-weight:bold; + text-decoration: underline; + legend { + padding:0; + margin-bottom:0px; + } + } } .fieldset-object .field { - padding:18px 0px; - &-object { - padding:18px 20px; - } + padding:18px 0px; + &-object { + padding:18px 20px; + } } -.field-object { - .legend { - cursor: pointer; - } +.field-object .legend { + cursor: pointer; } .field { - padding:18px 30px; - &-object { - padding:8px 10px; - border:1px solid #aaa; - border-radius:3px; - margin-bottom:20px; - } - i { - color: #3e4960; - transition:color 0.3s; - &:hover { - color:#15a4fa; - } - } + padding:18px 30px; + &-object { + padding:8px 10px; + border:1px solid #aaa; + border-radius:3px; + margin-bottom:20px; + } + i { + color: #3e4960; + transition:color 0.3s; + &:hover { + color:#15a4fa; + } + } } .list-item { - border: 1px solid #aaa; - border-radius: 2px; - padding: 15px; - margin-bottom: 10px; - cursor: pointer; - word-wrap: break-word; - &:hover { - border-color: #696969; - } - span { - display:inline-block; - float:left; - width:88%; - } - button { - float:right; - padding: 1px 8px; - font-size: 140%; - } + border: 1px solid #aaa; + border-radius: 2px; + padding: 15px; + margin-bottom: 10px; + cursor: pointer; + word-wrap: break-word; + &:hover { + border-color: #696969; + } + span { + display:inline-block; + float:left; + width:88%; + } + button { + float:right; + padding: 1px 8px; + font-size: 140%; + } } .collapsed { - display:none; + display:none; } .expanded { - display:block; + display:block; } diff --git a/frontend/src/less/sharedStyles.less b/frontend/src/less/sharedStyles.less index 678721673d..71e318b6e8 100644 --- a/frontend/src/less/sharedStyles.less +++ b/frontend/src/less/sharedStyles.less @@ -1,16 +1,16 @@ - // Page-style form background .form-container-style { - max-width: 800px; - margin: 20px; - border: 1px solid #d6f2f9; - background-color: #fff; - > .inner { - padding: 30px; - .form-group { - border-bottom: none; - } + max-width: 800px; + margin: 20px; + border: 1px solid #d6f2f9; + background-color: #fff; + > .inner { + padding: 30px; + form .form-group { + padding-bottom: 0; + border-bottom: none; } + } } .no-wrap { From e7d1347abfefccba3b0abbd1fac5c4272a949447 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 14:41:39 +0100 Subject: [PATCH 135/296] Remove logs --- frontend/src/modules/editor/global/editorDataLoader.js | 3 --- frontend/src/modules/scaffold/views/scaffoldAssetView.js | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/frontend/src/modules/editor/global/editorDataLoader.js b/frontend/src/modules/editor/global/editorDataLoader.js index c77ef48d7e..84a21cdc8f 100644 --- a/frontend/src/modules/editor/global/editorDataLoader.js +++ b/frontend/src/modules/editor/global/editorDataLoader.js @@ -106,18 +106,15 @@ define(function(require) { * Makes sure all data has been loaded and calls callback */ waitForLoad: function(callback) { - // console.trace('waitForLoad:', preloader.hasLoadedGlobalData(), preloader.hasLoadedCourseData(), preloader.hasLoadedData()); if(preloader.hasLoadedData()) { return callback.apply(this); } if(!preloader.hasLoadedGlobalData()) { - // console.log('- listening to preloader'); Origin.once('editor:dataPreloaded', function(){ if(preloader.hasLoadedData()) return callback.apply(this); }); } if(!preloader.hasLoadedCourseData()) { - // console.log('- listening to loader'); Origin.once('editor:dataLoaded', function(){ if(preloader.hasLoadedData()) return callback.apply(this); }); diff --git a/frontend/src/modules/scaffold/views/scaffoldAssetView.js b/frontend/src/modules/scaffold/views/scaffoldAssetView.js index b0f9a9c9a0..62be98dadd 100644 --- a/frontend/src/modules/scaffold/views/scaffoldAssetView.js +++ b/frontend/src/modules/scaffold/views/scaffoldAssetView.js @@ -180,9 +180,7 @@ define(function(require) { } }, - onCancel: function(data) { - // console.log('cancelled', data); - } + onCancel: function(data) {} }, this); }, From 85707047186de9382546e3756b7a7cdf988a4e8b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 14:42:03 +0100 Subject: [PATCH 136/296] Fix bug with routing forcing trigger:true --- frontend/src/core/router.js | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/frontend/src/core/router.js b/frontend/src/core/router.js index 49334f3c08..515028b866 100644 --- a/frontend/src/core/router.js +++ b/frontend/src/core/router.js @@ -13,9 +13,7 @@ define(function(require) { }, initialize: function() { - this.listenTo(Origin, { - 'origin:initialize': this.onOriginInitialize - }); + this.listenTo(Origin, 'origin:initialize', this.onOriginInitialize); this.locationKeys = ['module', 'route1', 'route2', 'route3', 'route4']; this.resetLocation(); }, @@ -104,17 +102,27 @@ define(function(require) { * Routing */ + formatRoute: function(route) { + /** + * We remove leading slashes as they force trigger:true regardless of the + * options passed to Backbone.Router.navigate + * See https://github.com/jashkenas/backbone/issues/786 + */ + if(route[0] === '/') return route.slice(1); + return route; + }, + + persistRoute: function(route) { + Origin.router.navigate(this.formatRoute(route)); + }, + navigateBack: function() { Backbone.history.history.back(); }, - navigateTo: function(route, options) { - var prefix = '#/'; - if(route.slice(0,2) !== prefix) { - route = prefix + route; - } + navigateTo: function(route) { // use Origin.router.navigate in case we don't have a valid 'this' reference - Origin.router.navigate(route, _.defaults(options || {}, { trigger: true })); + Origin.router.navigate(this.formatRoute(route), { trigger: true }); }, navigateToLogin: function() { From 905cb7df234f4579b165970859b46f3d50d6ebfe Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 14:43:08 +0100 Subject: [PATCH 137/296] Fix broken context menu --- frontend/src/modules/contextMenu/views/contextMenuView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/contextMenu/views/contextMenuView.js b/frontend/src/modules/contextMenu/views/contextMenuView.js index 387ec8af88..edffae9f1d 100644 --- a/frontend/src/modules/contextMenu/views/contextMenuView.js +++ b/frontend/src/modules/contextMenu/views/contextMenuView.js @@ -34,7 +34,7 @@ define(function(require) { _.each(this.collection.where({ type: this.type }), function(item) { item.set('contextView', this.contextView); new ContextMenuItemView({ model: item }); - }); + }, this); }, toggleMenu: function(view, e) { @@ -83,6 +83,6 @@ define(function(require) { $('html').off('click'); } }); - + return ContextMenuView; }); From 52dbf796923ebdff847872358d056bf53e306fb1 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 15:04:31 +0100 Subject: [PATCH 138/296] Fix bug with event inheritance --- .../editor/contentObject/views/editorPageArticleView.js | 2 +- .../modules/editor/contentObject/views/editorPageBlockView.js | 2 +- .../editor/contentObject/views/editorPageComponentView.js | 4 ++-- .../src/modules/editor/contentObject/views/editorPageView.js | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js index 31f3023da7..2728be69be 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageArticleView.js @@ -13,7 +13,7 @@ define(function(require){ className: 'article editable article-draggable', tagName: 'div', - events: _.extend(EditorOriginView.prototype.events, { + events: _.extend({}, EditorOriginView.prototype.events, { 'click a.add-block': 'addBlock', 'click a.article-delete': 'deleteArticlePrompt', 'click a.open-context-article': 'openContextMenu', diff --git a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js index 012fec0ff7..05c542c6a0 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageBlockView.js @@ -18,7 +18,7 @@ define(function(require){ autoRender: false }, - events: _.extend(EditorOriginView.prototype.events, { + events: _.extend({}, EditorOriginView.prototype.events, { 'click a.block-delete': 'deleteBlockPrompt', 'click a.add-component': 'showComponentList', 'click a.open-context-block': 'openContextMenu', diff --git a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js index 817e5ffc68..a7387ea3f2 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageComponentView.js @@ -9,7 +9,7 @@ define(function(require){ className: 'component editable component-draggable', tagName: 'div', - events: _.extend(EditorOriginView.prototype.events, { + events: _.extend({}, EditorOriginView.prototype.events, { 'click a.component-delete': 'deleteComponentPrompt', 'click a.component-move': 'evaluateMove', 'click a.open-context-component': 'openContextMenu', @@ -64,7 +64,7 @@ define(function(require){ } }, - loadComponentEdit: function () { + loadComponentEdit: function(event) { var courseId = Origin.editor.data.course.get('_id'); var type = this.model.get('_type'); var id = this.model.get('_id'); diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index eafe9d12ed..498ed686e4 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -16,12 +16,12 @@ define(function(require){ childrenCount: 0, childrenRenderedCount: 0, - events: { + events: _.extend({}, EditorOriginView.prototype.events, { 'click a.add-article': 'addArticle', 'click a.page-edit-button': 'openContextMenu', 'dblclick .page-detail': 'loadPageEdit', 'click .paste-cancel': 'onPasteCancel' - }, + }), preRender: function() { this.setupChildCount(); From cae47fb42b4e0c88fe75a3f6b169c8af26399cbd Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 15:09:22 +0100 Subject: [PATCH 139/296] Refactor menu code --- .../contentObject/views/editorMenuItemView.js | 149 ++++++------------ .../views/editorMenuLayerView.js | 26 ++- .../contentObject/views/editorMenuView.js | 104 +++++------- 3 files changed, 104 insertions(+), 175 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index d143301600..ed586e19a8 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -8,6 +8,8 @@ define(function(require){ tagName: "div", autoScrollTimer: false, + clickTimer, + clickTimerActive: false, events: { 'click .editor-menu-item-inner': 'onMenuItemClicked', @@ -17,104 +19,74 @@ define(function(require){ }, preRender: function() { - this.setupEvents(); this.setupClasses(); }, postRender: function() { - // setup drag - this.$el.closest('.editor-menu').on('mousemove', _.bind(this.handleDrag, this)); + this.setupEvents(); // Check if the current item is expanded and update the next menuLayerView // This can end up being recursive if an item is selected inside a few menu items - if (this.model.get('_isExpanded')) { + if(this.model.get('_isExpanded')) { Origin.trigger('editorView:menuView:updateSelectedItem', this); } }, remove: function() { this.$el.closest('.editor-menu-layer').off('mousemove'); - - // Call original remove EditorOriginView.prototype.remove.apply(this, arguments); }, setupEvents: function() { this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(this.model, 'change:_isExpanded', this.onExpandedChange); - this.listenTo(this.model, 'change:_isSelected', this.onSelectedChange); + this.listenTo(this.model, { + 'change:_isExpanded': this.onExpandedChange, + 'change:_isSelected': this.onSelectedChange + }); // Handle the context menu clicks - this.on('contextMenu:menu:edit', this.editMenuItem); - this.on('contextMenu:menu:copy', this.copyMenuItem); - this.on('contextMenu:menu:copyID', this.copyID); - this.on('contextMenu:menu:delete', this.deleteItemPrompt); - - this.on('contextMenu:page:edit', this.editMenuItem); - this.on('contextMenu:page:copy', this.copyMenuItem); - this.on('contextMenu:page:copyID', this.copyID); - this.on('contextMenu:page:delete', this.deleteItemPrompt); + this.on({ + 'contextMenu:menu:edit': this.editMenuItem, + 'contextMenu:menu:copy': this.copyMenuItem, + 'contextMenu:menu:copyID': this.copyID, + 'contextMenu:menu:delete': this.deleteItemPrompt + }); + + this.$el.closest('.editor-menu').on('mousemove', _.bind(this.handleDrag, this)); }, setupClasses: function() { var classString = ''; - if (this.model.get('_isSelected')) { - classString += 'selected '; - } - if (this.model.get('_isExpanded')) { - classString += 'expanded '; - } + if (this.model.get('_isSelected')) classString += 'selected '; + if(this.model.get('_isExpanded')) classString += 'expanded '; classString += ('content-type-'+this.model.get('_type')); - this.$el.addClass(classString); }, onMenuItemClicked: function(event) { - // TODO - Fix this to the view not the model - // Boo - jQuery doesn't allow dblclick and single click on the same element - // time for a timer timing clicks against time delay - var delay = 300; - var timer = null; - // Needing to store this on the model as global variables - // cause an issue that double click loses scope - var clicks = this.model.get('clicks'); - this.model.set('clicks', clicks ? clicks : 0); - - var currentClicks = this.model.get('clicks') + 1; - this.model.set('clicks', currentClicks); - // No matter what type of click - select the item straight away + event && event.preventDefault(); + // select item regardless of single/double click this.setItemAsSelected(); - - if(currentClicks === 1) { - timer = setTimeout(_.bind(function() { this.model.set('clicks', 0); }, this), delay); - } else if (currentClicks === 2) { - clearTimeout(timer); - // Only if the current double clicked it is a page item - if (this.model.get('_type') == 'page') { - this.gotoPageEditor(); - } else if (this.model.get('_type') == 'menu') { - this.gotoSubMenuEditor(); - } - this.model.set('clicks', 0); + // handle double-click + if(this.clickTimerActive) { + return this.onMenuItemDoubleClicked(event); } + this.clickTimerActive = true; + // jQuery doesn't allow dblclick and click on the same element, so have to do it ourselves + this.clickTimer = window.setTimeout(_.bind(function() { + this.clickTimerActive = false; + window.clearTimeout(this.clickTimer); + }, this), 300); }, - selectedLevel: function() { - $(".editor-menu-layer").each(function() { - if($(this).hasClass("selected")){ - $(this).removeClass("selected"); - } - }); - if($(this.el).hasClass("content-type-menu")) { - $(this.el).parent().parent().next().addClass("selected"); + onMenuItemDoubleClicked: function(event) { + event && event.preventDefault(); + var type = this.model.get('_type'); + if(type === 'page') { + this.gotoPageEditor(); } - else { - $(this.el).parent().parent().addClass("selected"); + else if(type === 'menu') { + this.gotoSubMenuEditor(); } - event && event.preventDefault(); - }, - - onMenuItemDblClicked: function(event) { - event && event.preventDefault(); }, gotoPageEditor: function() { @@ -126,30 +98,20 @@ define(function(require){ }, setItemAsSelected: function() { - // If this item is already selected please do nothing - // because sometimes nothing is quite compelling - if (this.model.get('_isSelected')) return; - // When item is clicked check whether this a menu item or not - var isMenuType = (this.model.get('_type') === 'menu'); - - // If this view is already expanded - reset to no be expanded - // this will trigger the events to remove child views - if (this.model.get('_isExpanded')) { - this.model.set({'_isExpanded' : false}); - } else { + if(this.model.get('_isSelected')) { + return; + } + if(!this.model.get('_isExpanded')) { this.setSiblingsSelectedState(); this.setParentSelectedState(); } - - this.model.set({ '_isExpanded' : (isMenuType ? true : false) }); - - this.model.set({ '_isSelected': true }); - + this.model.set({ + _isExpanded: this.model.get('_type') === 'menu', + _isSelected: true + }); // This event passes out the view to the editorMenuView to add // a editorMenuLayerView and setup this.subView Origin.trigger('editorView:menuView:updateSelectedItem', this); - - this.selectedLevel(); }, setParentSelectedState: function() { @@ -158,7 +120,7 @@ define(function(require){ setSiblingsSelectedState: function() { this.model.getSiblings().each(function(sibling) { - sibling.set({'_isSelected': false, '_isExpanded': false}); + sibling.set({ _isSelected: false, _isExpanded: false }); }); }, @@ -169,21 +131,17 @@ define(function(require){ }, onSelectedChange: function(model, isSelected) { - // This is used to toggle between _isSelected on the model - this.$el.toggleClass('selected', !isSelected); + this.$el.toggleClass('selected', isSelected); }, onExpandedChange: function(model, isExpanded) { var isMenuType = (this.model.get('_type') === 'menu'); - if (isExpanded) { - //Origin.trigger('editorView:menuView:updateSelectedItem', this); + if(isExpanded) { this.$el.addClass('expanded'); } else { // If not expanded unselect and unexpand child - this will work // recursively as _isExpanded will keep getting set - if (isMenuType) { - this.setChildrenSelectedState(); - } + if(isMenuType) this.setChildrenSelectedState(); this.$el.removeClass('expanded'); } // If this item is not meant to be expanded - remove subView @@ -215,7 +173,6 @@ define(function(require){ self.onConfirmRemovePopup(isConfirmed); } }); - }, onConfirmRemovePopup: function(isConfirmed) { @@ -237,23 +194,21 @@ define(function(require){ deleteItem: function(event) { this.stopListening(Origin, 'editorView:cancelRemoveItem:'+ this.model.get('_id'), this.cancelDeleteItem); - this.model.set({_isExpanded:false, _isSelected: false}); + this.model.set({ _isExpanded: false, _isSelected: false }); // When deleting an item - the parent needs to be selected - this.model.getParent().set({_isSelected:true, _isExpanded: true}); + this.model.getParent().set({ _isSelected:true, _isExpanded: true }); // We also need to navigate to the parent element - but if it's the courseId let's // navigate up to the menu var parentId = (this.model.get('_parentId') === Origin.editor.data.course.id) ? '' : '/' + this.model.get('_parentId'); Origin.router.navigateTo('editor/' + Origin.editor.data.course.id + '/menu' + parentId); - if (this.model.destroy()) { - this.remove(); - } + if(this.model.destroy()) this.remove(); }, cancelDeleteItem: function() { this.stopListening(Origin, 'editorView:removeItem:'+ this.model.get('_id'), this.deleteItem); - this.model.set({_isSelected: true}); + this.model.set({ _isSelected: true }); }, enableDrag: function(event) { diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js index 388aeaf0af..e4d3cf7413 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuLayerView.js @@ -18,18 +18,17 @@ define(function(require) { }, preRender: function(options) { - if (options._parentId) { - this._parentId = options._parentId; - } - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); - this.listenTo(Origin, 'editorMenuView:removeMenuViews', this.remove); + if(options._parentId) this._parentId = options._parentId; + + this.listenTo(Origin, { + 'editorView:removeSubViews': this.remove, + 'editorMenuView:removeMenuViews': this.remove + }); }, postRender: function() { - if (this._parentId) { - // Append the parentId value to the container to allow us to move pages, etc. - this.$el.attr('data-parentId', this._parentId); - } + // Append the parentId value to the container to allow us to move pages, etc. + if(this._parentId) this.$el.attr('data-parentId', this._parentId); this.setHeight(); }, @@ -62,7 +61,7 @@ define(function(require) { * @param {String} type Given contentObject type, i.e. 'menu' or 'page' */ addMenuItem: function(event, type) { - event.preventDefault(); + event && event.preventDefault(); var newMenuItemModel = new ContentObjectModel({ _parentId: this._parentId, @@ -76,10 +75,9 @@ define(function(require) { }); // Instantly add the view for UI purposes var newMenuItemView = this.addMenuItemView(newMenuItemModel); - // Save the model newMenuItemModel.save(null, { error: function(error) { - // If there's an error show the menu item fading out and alert + // fade out menu item and alert newMenuItemView.$el.removeClass('syncing').addClass('not-synced'); Origin.Notify.alert({ type: 'error', @@ -156,12 +154,12 @@ define(function(require) { }, pasteMenuItem: function(event) { - event.preventDefault(); + event && event.preventDefault(); Origin.trigger('editorView:paste', this._parentId, this.$('.editor-menu-item').length + 1); }, cancelPasteMenuItem: function(event) { - event.preventDefault(); + event && event.preventDefault(); this.hidePasteZones(); var parentId = this._parentId; var target = new ContentObjectModel({ diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuView.js b/frontend/src/modules/editor/contentObject/views/editorMenuView.js index 37c5011d80..df87467e69 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuView.js @@ -21,15 +21,12 @@ define(function(require){ _.defer(this.setViewToReady); }, - // Renders a menu layer for each child of the contentObject, and each item within setupMenuViews: function() { - // If there's no currentContentObjectId + this.addMenuLayerView(this); if (!Origin.editor.currentContentObjectId) { - this.addMenuLayerView(this); - } else { - this.addMenuLayerView(this); - this.preserveCurrentMenuState(); + return; } + this.restoreCurrentMenuState(); }, /** @@ -37,13 +34,10 @@ define(function(require){ * @param {Model} A given contextObject model */ addMenuLayerView: function(view) { - // Render menu layer view var menuLayer = this.renderMenuLayerView(view, false); // Add children views of current model view.model.getChildren().each(function(contentObject) { - menuLayer.append(new EditorMenuItemView({ - model: contentObject - }).$el) + menuLayer.append(new EditorMenuItemView({ model: contentObject }).$el); }, this); _.defer(_.bind(function() { @@ -54,20 +48,6 @@ define(function(require){ }, this)); }, - /** - * Presever the current menu state by finding the current element - * then setting it's parent recursively to _isExpanded - */ - - preserveCurrentMenuState: function() { - // Find current menu item - var currentSelectedMenuItem = Origin.editor.data.contentObjects.findWhere({ - _id: Origin.editor.currentContentObjectId - }); - currentSelectedMenuItem.set({'_isSelected': true, '_isExpanded': true}); - this.setParentElementToSelected(currentSelectedMenuItem); - }, - /** * Appemds a menu item layer for a given ID to the editor * @param {String} parentId Unique identifier of the parent @@ -77,7 +57,7 @@ define(function(require){ // Get the current views _id to store as the _parentId var parentId = view.model.get('_id'); // Create MenuLayerView - var menuLayerView = new EditorMenuLayerView({_parentId: parentId}); + var menuLayerView = new EditorMenuLayerView({ _parentId: parentId }); // Set subview on layerView so this can be removed view.subView = menuLayerView; // Render and append the view @@ -86,29 +66,31 @@ define(function(require){ return menuLayerView.$('.editor-menu-layer-inner'); }, - updateSelectedItem: function(view) { - // This is triggered when an item is clicked - // Store this id and fake navigate to bookmark current users position - this.storeSelectedItem(view); - // If this item is a menu item let's render a MenuItemLayerView - if (view.model.get('_type') === 'menu') { - this.addMenuLayerView(view); - } else { - this.scrollToElement(); - } + /** + * Restores the current menu state by finding the current element + * then setting it's parent recursively to _isExpanded + */ + restoreCurrentMenuState: function() { + // Find current menu item + var currentSelectedMenuItem = Origin.editor.data.contentObjects.findWhere({ + _id: Origin.editor.currentContentObjectId + }); + currentSelectedMenuItem.set({ _isSelected: true, _isExpanded: true }); + this.setParentElementToSelected(currentSelectedMenuItem); }, /** - * Adds a specified contentObject ID to Origin.editor, synchronises the address bar, - * and sets up the menu UI for editing - * @param {Number} Unique _id for a given contentObject - */ - storeSelectedItem: function(view) { - var selectedItemId = view.model.get('_id'); - // Store the ID of the currently selected contentObject - Origin.editor.currentContentObjectId = selectedItemId; - // Reset the address bar to allow persistance of the 'Back' button - Origin.router.navigateTo('editor/' + Origin.editor.data.course.id + '/menu/' + selectedItemId); + * This is triggered when an item is clicked + */ + updateSelectedItem: function(view) { + // store the ID of the currently selected contentObject + Origin.editor.currentContentObjectId = view.model.get('_id'); + + if(view.model.get('_type') === 'menu') { + this.addMenuLayerView(view); + return; + } + this.scrollToElement(); }, /** @@ -117,12 +99,12 @@ define(function(require){ * @param {Model} selectedItem A given contextObject model */ setParentElementToSelected: function(selectedItem) { - if (selectedItem.get('_parentId') === Origin.editor.data.course.get('_id')) { + var parentId = selectedItem.get('_parentId'); + + if(parentId === Origin.editor.data.course.get('_id')) { return; } - var parentModel = Origin.editor.data.contentObjects.findWhere({ - _id: selectedItem.get('_parentId') - }); + var parentModel = Origin.editor.data.contentObjects.findWhere({ _id: parentId }); parentModel.set('_isExpanded', true); this.setParentElementToSelected(parentModel); @@ -132,24 +114,23 @@ define(function(require){ var $menuLayers = this.$('.editor-menu-layer'); var $menuView = this.$el; var $menuControls = this.$('.editor-menu-layer-controls'); - // Get item width var itemWidth = $menuLayers.first().outerWidth(true); - // Set menu holder to width by items length + $('.editor-menu-inner').width(itemWidth * $menuLayers.length); }, scrollToElement: function() { - if ($('.selected').length) { - this.$('.editor-menu-layer-inner').scrollTo('.expanded, .selected', {duration:300, offset: {top:-20, left:0}, axis: 'y'}); - this.$el.scrollTo($('.selected').closest('.editor-menu-layer'), {duration:300, axis: 'x'}); + if ($('.selected').length < 1) { + return; } + this.$('.editor-menu-layer-inner').scrollTo('.expanded, .selected', { duration: 300, offset: { top: -20, left: 0 }, axis: 'y' }); + this.$el.scrollTo($('.selected').closest('.editor-menu-layer'), { duration: 300, axis: 'x' }); }, /** - * Configures the JQuery UI sortable() plugin to enable drag and drop on the menu editor + * Configures the JQueryUI sortable() plugin to enable drag and drop */ setupDragDrop: function() { - var view = this; $(".editor-menu-layer-inner").sortable({ containment: '.editor-menu', appendTo: '.editor-menu', @@ -163,12 +144,9 @@ define(function(require){ var id = $('.editor-menu-item-inner', $draggedElement).attr('data-id'); var sortOrder = $draggedElement.index() + 1; var parentId = $draggedElement.closest('.editor-menu-layer').attr('data-parentId'); - // Find the model - var currentModel = Origin.editor.data.contentObjects.findWhere({_id: id}); - // Save just the new attributes and patch them + var currentModel = Origin.editor.data.contentObjects.findWhere({ _id: id }); currentModel.save({ _sortOrder: sortOrder, _parentId: parentId }, { patch: true }); currentModel.set('_isDragging', false); - }, over: function(event, ui) { $(event.target).closest('.editor-menu-layer').attr('data-over', true); @@ -177,10 +155,8 @@ define(function(require){ $(event.target).closest('.editor-menu-layer').attr('data-over', false); }, receive: function(event, ui) { - if (ui.item.hasClass('content-type-menu')) { - // Prevent moving a menu item between levels - ui.sender.sortable("cancel"); - } + // Prevent moving a menu item between levels + if (ui.item.hasClass('content-type-menu')) ui.sender.sortable("cancel"); } }); } From 08a8b338fe80763a0745fd1af3d8b9dd560c0156 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 15:09:43 +0100 Subject: [PATCH 140/296] Refactor editorPageView --- .../contentObject/views/editorPageView.js | 43 +++++++------------ 1 file changed, 16 insertions(+), 27 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index 498ed686e4..921a8a7c3d 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -26,10 +26,12 @@ define(function(require){ preRender: function() { this.setupChildCount(); - this.listenTo(Origin, 'editorView:removeSubViews', this.remove); + this.listenTo(Origin, { + 'editorView:removeSubViews': this.remove, + 'pageView:itemRendered': this.evaluateChildStatus + }); this.listenTo(Origin, 'editorView:moveArticle:' + this.model.get('_id'), this.render); this.listenTo(Origin, 'editorView:cutArticle:' + this.model.get('_id'), this.onCutArticle); - this.listenTo(Origin, 'pageView:itemRendered', this.evaluateChildStatus); }, resize: function() { @@ -79,30 +81,25 @@ define(function(require){ addArticleViews: function() { this.$('.page-articles').empty(); Origin.trigger('editorPageView:removePageSubViews'); - // Insert the 'pre' paste zone for articles var prePasteArticle = new ArticleModel(); - prePasteArticle.set('_parentId', this.model.get('_id')); - prePasteArticle.set('_type', 'article'); - prePasteArticle.set('_pasteZoneSortOrder', 1); - - this.$('.page-articles').append(new EditorPasteZoneView({model: prePasteArticle}).$el); - + prePasteArticle.set({ + _parentId: this.model.get('_id'), + _type: 'article', + _pasteZoneSortOrder: 1 + }); + this.$('.page-articles').append(new EditorPasteZoneView({ model: prePasteArticle }).$el); // Iterate over each article and add it to the page - this.model.getChildren().each(function(article) { - this.addArticleView(article); - }, this); + this.model.getChildren().each(this.addArticleView, this); }, addArticleView: function(articleModel, scrollIntoView, addNewBlock) { - var newArticleView = new EditorPageArticleView({model: articleModel}), - sortOrder = articleModel.get('_sortOrder'); - - // Add syncing class + var newArticleView = new EditorPageArticleView({ model: articleModel }); + var sortOrder = articleModel.get('_sortOrder'); + // Add syncing class if (articleModel.isNew()) { newArticleView.$el.addClass('syncing'); } - scrollIntoView = scrollIntoView || false; this.$('.page-articles').append(newArticleView.$el); @@ -110,10 +107,8 @@ define(function(require){ if (scrollIntoView) { $.scrollTo(newArticleView.$el, 200); } - // Increment the 'sortOrder' property articleModel.set('_pasteZoneSortOrder', sortOrder++); - // Post-article paste zone - sort order of placeholder will be one greater this.$('.page-articles').append(new EditorPasteZoneView({model: articleModel}).$el); // Return the article view so syncing can be shown @@ -160,20 +155,14 @@ define(function(require){ // TODO fragile HACK, refactor context menu code to allow what I want to do later... openContextMenu: function(event) { if(!event) return console.log('Error: needs a current target to attach the menu to...'); + event.preventDefault() && event.stopPropagation(); - event.preventDefault(); - event.stopPropagation(); - - var fakeView = new Backbone.View({ - model: new Backbone.Model({ _type: 'page-min' }) - }); - + var fakeView = new Backbone.View({ model: new Backbone.Model({ _type: 'page-min' }) }); this.listenTo(fakeView, { 'contextMenu:page-min:edit': this.loadPageEdit, 'contextMenu:page-min:copyID': this.onCopyID }); - Origin.trigger('contextMenu:open', fakeView, event); }, From cb5ae8c621aeeb78a2bb2d47bee3e9b7a2a8a554 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 12 Apr 2017 15:09:52 +0100 Subject: [PATCH 141/296] Amend comment --- .../modules/editor/contentObject/views/editorPageSidebarView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js b/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js index bc1db95010..264f4e9c7f 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageSidebarView.js @@ -4,7 +4,7 @@ define(function(require) { var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var EditorPageSidebarView = SidebarItemView.extend({ - // If adding 'events', extend from the base view + // if adding 'events', extend from the base view }, { template: 'editorPageSidebar' }); From 720738d49753f1d20a5951127ebd0cb386289352 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sat, 15 Apr 2017 12:32:02 +0100 Subject: [PATCH 142/296] Remove extraneous imports --- .../pluginManagement/views/pluginManagementUploadView.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index 112a7f425d..8011a99ad2 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -1,12 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ var _ = require('underscore'); - var Backbone = require('backbone'); var Helpers = require('core/helpers'); var OriginView = require('core/views/originView'); var Origin = require('core/origin'); - var AssetModel = require('modules/assetManagement/models/assetModel'); - var TagsInput = require('libraries/jquery.tagsinput.min'); var PluginManagementUploadView = OriginView.extend({ From 2832f92ab24308955ad4bdc45908e0b16ce94ecd Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sat, 15 Apr 2017 12:32:30 +0100 Subject: [PATCH 143/296] Change routing functions --- frontend/src/modules/userManagement/views/addUserSidebarView.js | 2 +- frontend/src/modules/userManagement/views/addUserView.js | 2 +- .../modules/userManagement/views/userManagementSidebarView.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/userManagement/views/addUserSidebarView.js b/frontend/src/modules/userManagement/views/addUserSidebarView.js index fbe188e5b2..acad55cc42 100644 --- a/frontend/src/modules/userManagement/views/addUserSidebarView.js +++ b/frontend/src/modules/userManagement/views/addUserSidebarView.js @@ -16,7 +16,7 @@ define(function(require) { goBack: function(event) { event && event.preventDefault(); - Origin.router.navigate('#/userManagement', { trigger: true }); + Origin.router.navigateTo('userManagement'); } }, { template: 'addUserSidebar' diff --git a/frontend/src/modules/userManagement/views/addUserView.js b/frontend/src/modules/userManagement/views/addUserView.js index ce4e8de80e..a4d422daec 100644 --- a/frontend/src/modules/userManagement/views/addUserView.js +++ b/frontend/src/modules/userManagement/views/addUserView.js @@ -48,7 +48,7 @@ define(function(require){ }, goBack: function() { - Origin.router.navigate('#/userManagement', { trigger:true }); + Origin.router.navigateTo('userManagement'); }, onFormSubmitSuccess: function(userData, userStatus, userXhr) { diff --git a/frontend/src/modules/userManagement/views/userManagementSidebarView.js b/frontend/src/modules/userManagement/views/userManagementSidebarView.js index 7f1ca7b38b..3a33c13e58 100644 --- a/frontend/src/modules/userManagement/views/userManagementSidebarView.js +++ b/frontend/src/modules/userManagement/views/userManagementSidebarView.js @@ -10,7 +10,7 @@ define(function(require) { addUser: function(event) { event && event.preventDefault(); - Origin.router.navigate('#/userManagement/addUser', { trigger: true }); + Origin.router.navigateTo('userManagement/addUser'); } }, { template: 'userManagementSidebar' From 1b1faa1e5aec7ea4b4724e75fcf103c3c2cb2a09 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sat, 15 Apr 2017 12:32:47 +0100 Subject: [PATCH 144/296] Change class --- frontend/src/modules/navigation/less/navigation.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/navigation/less/navigation.less b/frontend/src/modules/navigation/less/navigation.less index 5d4260aed3..9e3e936396 100644 --- a/frontend/src/modules/navigation/less/navigation.less +++ b/frontend/src/modules/navigation/less/navigation.less @@ -40,7 +40,7 @@ width:50%; float:left; .navigation-product-name { - .no-select; + .unselectable; } } From 61b0313fb021769f26307ae97219b5b78499dd27 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 13 Apr 2017 16:23:42 +0100 Subject: [PATCH 145/296] Refactor pluginManagement # Conflicts: # frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js --- .../views/editorExtensionsEditView.js | 30 ++++-- .../collections/componentTypeCollection.js | 6 +- .../collections/extensionTypeCollection.js | 5 - .../collections/menuTypeCollection.js | 5 - .../collections/themeTypeCollection.js | 5 - .../templates/pluginManagement.hbs | 54 +++++------ .../templates/pluginManagementSidebar.hbs | 9 +- .../templates/pluginManagementUpload.hbs | 20 ++-- .../pluginManagementUploadSidebar.hbs | 3 + .../pluginManagement/templates/pluginType.hbs | 14 +-- .../views/pluginManagementSidebarView.js | 13 ++- .../pluginManagementUploadSidebarView.js | 48 +++++----- .../views/pluginManagementUploadView.js | 83 +++++++---------- .../views/pluginManagementView.js | 14 +-- .../pluginManagement/views/pluginTypeView.js | 91 +++++++------------ 15 files changed, 171 insertions(+), 229 deletions(-) diff --git a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js index b9b1d113a5..1053d169c7 100644 --- a/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js +++ b/frontend/src/modules/editor/extensions/views/editorExtensionsEditView.js @@ -9,7 +9,7 @@ define(function(require) { var EditorExtensionsEditView = EditorOriginView.extend({ className: "extension-management", tagName: "div", - + // TODO do we need to turn this off? settings: { autoRender: false }, @@ -21,9 +21,14 @@ define(function(require) { preRender: function() { this.currentSelectedIds = []; - this.listenTo(Origin, 'editorExtensionsEdit:views:add', this.addExtension); - this.listenTo(Origin, 'editorExtensionsEdit:views:remove', this.removeExtension); + + this.listenTo(Origin, { + 'editorExtensionsEdit:views:add': this.addExtension, + 'editorExtensionsEdit:views:remove': this.removeExtension + }); + this.setupExtensions(); + this.render(); // TODO is defer a good idea? _.defer(_.bind(this.postRender, this)); @@ -31,20 +36,25 @@ define(function(require) { setupExtensions: function() { var availableExtensionsCollection = Origin.editor.data.extensiontypes; - var enabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); - var disabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); + // TODO why use collections? + // var enabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); + // var disabledExtensionsCollection = new Backbone.Collection(null, { comparator: 'displayName' }); + var enabledExtensionsCollection = []; + var disabledExtensionsCollection = []; var enabledExtensionNames = _.pluck(Origin.editor.data.config.get('_enabledExtensions'), 'name'); - // sort into appropriate collection + availableExtensionsCollection.each(function(extension) { if(_.indexOf(enabledExtensionNames, extension.get('name')) > -1) { - enabledExtensionsCollection.add(extension); + enabledExtensionsCollection.push(extension); } else if(extension.get('_isAvailableInEditor')) { - disabledExtensionsCollection.add(extension); + disabledExtensionsCollection.push(extension); } }); this.model.set({ - enabledExtensions: enabledExtensionsCollection.toJSON(), - availableExtensions: disabledExtensionsCollection.toJSON() + // enabledExtensions: enabledExtensionsCollection.toJSON(), + // availableExtensions: disabledExtensionsCollection.toJSON() + enabledExtensions: enabledExtensionsCollection, + availableExtensions: disabledExtensionsCollection }); }, diff --git a/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js b/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js index 32a7effbc1..5a030f6e54 100644 --- a/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/componentTypeCollection.js @@ -1,6 +1,5 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var ComponentTypeModel = require('../models/componentTypeModel'); @@ -9,19 +8,16 @@ define(function(require) { url: function (options) { var base = 'api/componenttype'; - if (options && options.base) { + if(options && options.base) { return base; } - return base + '?showall=true'; }, comparator: function(model) { return model.get('displayName'); } - }); return ComponentTypeCollection; - }); diff --git a/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js b/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js index 78ad666f72..6b1b08dcdc 100644 --- a/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/extensionTypeCollection.js @@ -1,11 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var ExtensionTypeModel = require('../models/extensionTypeModel'); var ExtensionTypeCollection = Backbone.Collection.extend({ - model: ExtensionTypeModel, url: function (options) { @@ -13,16 +11,13 @@ define(function(require) { if (options && options.base) { return base; } - return base + '?showall=1'; }, comparator: function(model) { return model.get('displayName'); } - }); return ExtensionTypeCollection; - }); diff --git a/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js b/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js index a4b5bd46cd..217aca03be 100644 --- a/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/menuTypeCollection.js @@ -1,11 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var MenuTypeModel = require('../models/menuTypeModel'); var MenuTypeCollection = Backbone.Collection.extend({ - model: MenuTypeModel, url: function (options) { @@ -13,16 +11,13 @@ define(function(require) { if (options && options.base) { return base; } - return base + '?showall=1'; }, comparator: function(model) { return model.get('displayName'); } - }); return MenuTypeCollection; - }); diff --git a/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js b/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js index 1a369807b0..3272107f9c 100644 --- a/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js +++ b/frontend/src/modules/pluginManagement/collections/themeTypeCollection.js @@ -1,11 +1,9 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Backbone = require('backbone'); var ThemeTypeModel = require('../models/themeTypeModel'); var ThemeTypeCollection = Backbone.Collection.extend({ - model: ThemeTypeModel, url: function (options) { @@ -13,16 +11,13 @@ define(function(require) { if (options && options.base) { return base; } - return base + '?showall=1'; }, comparator: function(model) { return model.get('displayName'); } - }); return ThemeTypeCollection; - }); diff --git a/frontend/src/modules/pluginManagement/templates/pluginManagement.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagement.hbs index d5fa8b994c..e09b8bc501 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginManagement.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginManagement.hbs @@ -1,37 +1,37 @@
-
- -
-

{{t 'app.name'}}

-
+
+ +
+

{{t 'app.name'}}

+
-
-

{{t 'app.description'}}

-
+
+

{{t 'app.description'}}

+
-
-

{{t 'app.version'}}

-
+
+

{{t 'app.version'}}

+
-
-

{{t 'app.enabled'}}

-
+
+

{{t 'app.enabled'}}

+
-
-

{{t 'app.action'}}

-
+
+

{{t 'app.action'}}

+
+
+
    + {{!-- Plugins get render in here --}} +
    + {{t 'app.loading'}}
    -
      - {{!-- Plugins get render in here --}} -
      - {{t 'app.loading'}} -
      -
    +
-
-
- -
+
+
+
+
diff --git a/frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs index 5aaaa0b538..343a5a0e94 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginManagementSidebar.hbs @@ -1,14 +1,7 @@
-{{!--
-

- {{t 'app.pluginmanagement'}} -

-
--}}
diff --git a/frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs index 54b3dac649..0dc84c202d 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginManagementUpload.hbs @@ -1,13 +1,11 @@
- - -
- - -
- - +
+
+ + +
+
diff --git a/frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs b/frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs index 95def8e624..8648ebb949 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginManagementUploadSidebar.hbs @@ -1,10 +1,13 @@
+
+ +
diff --git a/frontend/src/modules/pluginManagement/templates/pluginType.hbs b/frontend/src/modules/pluginManagement/templates/pluginType.hbs index 9a32830150..d66222205e 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginType.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginType.hbs @@ -4,11 +4,13 @@

{{{displayName}}}

-
{{{description}}}
+
+ {{{description}}} +
{{#if homepage}} - - {{t 'app.visitpluginhomepage'}} - + + {{t 'app.visitpluginhomepage'}} + {{/if}}
@@ -20,9 +22,9 @@
{{#if isLocalPackage}} - ({{t 'app.uploadedbyuser'}}) + ({{t 'app.uploadedbyuser'}}) {{else}} - + {{/if}}
diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js index acfb21e32f..21c505e4dd 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementSidebarView.js @@ -1,17 +1,16 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - var Origin = require('core/origin'); var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); var PluginManagementSidebarView = SidebarItemView.extend({ events: { - 'click .pluginManagement-sidebar-upload' : 'onAddNewPluginClicked', - 'click .pluginManagement-sidebar-extensions' : 'onManageExtensionsClicked', - 'click .pluginManagement-sidebar-themes' : 'onManageThemesClicked', - 'click .pluginManagement-sidebar-components' : 'onManageComponentsClicked', - 'click .pluginManagement-sidebar-menus' : 'onManageMenusClicked', - 'click .pluginManagement-sidebar-getPlugins' : 'onGetPluginsClicked' + 'click .pluginManagement-sidebar-upload': 'onAddNewPluginClicked', + 'click .pluginManagement-sidebar-extensions': 'onManageExtensionsClicked', + 'click .pluginManagement-sidebar-themes': 'onManageThemesClicked', + 'click .pluginManagement-sidebar-components': 'onManageComponentsClicked', + 'click .pluginManagement-sidebar-menus': 'onManageMenusClicked', + 'click .pluginManagement-sidebar-getPlugins': 'onGetPluginsClicked' }, onAddNewPluginClicked: function () { diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js index 17d84472f9..26b5f62bde 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadSidebarView.js @@ -1,29 +1,25 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/origin'); - var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); - - var PluginManagementUploadSidebarView = SidebarItemView.extend({ - - events: { - 'click .pluginManagement-upload-sidebar-save-button': 'onSaveButtonClicked', - 'click .pluginManagement-upload-sidebar-cancel-button': 'onCancelButtonClicked' - }, - - onSaveButtonClicked: function() { - this.updateButton('.pluginManagement-upload-sidebar-save-button', Origin.l10n.t('app.saving')); - Origin.trigger('pluginManagement:uploadPlugin'); - }, - - onCancelButtonClicked: function() { - Origin.router.navigateTo('pluginManagement'); - } - - }, { - template: 'pluginManagementUploadSidebar' - }); - - return PluginManagementUploadSidebarView; - + var Origin = require('core/origin'); + var SidebarItemView = require('modules/sidebar/views/sidebarItemView'); + + var PluginManagementUploadSidebarView = SidebarItemView.extend({ + events: { + 'click .pluginManagement-upload-sidebar-save-button': 'onSaveButtonClicked', + 'click .pluginManagement-upload-sidebar-cancel-button': 'onCancelButtonClicked' + }, + + onSaveButtonClicked: function() { + this.updateButton('.pluginManagement-upload-sidebar-save-button', Origin.l10n.t('app.saving')); + Origin.trigger('pluginManagement:uploadPlugin'); + }, + + onCancelButtonClicked: function() { + Origin.router.navigateTo('pluginManagement'); + } + }, { + template: 'pluginManagementUploadSidebar' + }); + + return PluginManagementUploadSidebarView; }); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index 8011a99ad2..7d7d339908 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -2,18 +2,14 @@ define(function(require){ var _ = require('underscore'); var Helpers = require('core/helpers'); - var OriginView = require('core/views/originView'); var Origin = require('core/origin'); + var OriginView = require('core/views/originView'); var PluginManagementUploadView = OriginView.extend({ - className: 'pluginManagement-upload-plugin', - events: { - }, - preRender: function() { - Origin.trigger('location:title:update', {title: Origin.l10n.t('app.uploadplugin')}); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.uploadplugin') }); this.listenTo(Origin, 'pluginManagement:uploadPlugin', this.uploadFile); }, @@ -22,69 +18,58 @@ define(function(require){ }, uploadFile: function() { - var self = this; - if(this.validate()) { $('.loading').show(); this.$('.plugin-form').ajaxSubmit({ - error: function(data, status, error) { - $('.loading').hide(); - - var message = ''; - if (data) { - if (data.responseText) { - message = data.responseText; - } else if(data.responseJSON && data.responseJSON.error) { - message = data.responseJSON.error; - } - } - Origin.Notify.alert({ - type: 'error', - title: Origin.l10n.t('app.uploadpluginerror'), - text: Helpers.decodeHTML(message) - }); - - // go back to the upload, maybe handle this in the sidebar? - Origin.router.navigateTo('pluginManagement/upload'); - }, - success: function(data, status, xhr) { - Origin.trigger('scaffold:updateSchemas', function() { - Origin.Notify.alert({ - type: 'success', - text: Origin.l10n.t('app.uploadpluginsuccess') - }); - - $('.loading').hide(); - var pluginType = data.pluginType ? data.pluginType : ''; - Origin.router.navigateTo('pluginManagement/' + pluginType); - }, this); - } + success: this.onUploadSuccess, + error: this.onUploadError }); } - // Return false to prevent the page submitting return false; }, validate: function() { - var file = this.$('form input').val(); - - if(_.isEmpty(file)) { + if(_.isEmpty(this.$('form input').val())) { this.$('.field-error').removeClass('display-none'); Origin.trigger('sidebar:resetButtons'); - return false; } - this.$('.field-error').addClass('display-none'); - return true; - } + }, + + onUploadSuccess: function() { + Origin.trigger('scaffold:updateSchemas', function() { + Origin.Notify.alert({ type: 'success', text: Origin.l10n.t('app.uploadpluginsuccess') }); + + $('.loading').hide(); + + Origin.router.navigateTo('pluginManagement/' + (data.pluginType || '')); + }, this); + }, + onUploadError: function(data) { + $('.loading').hide(); + + var message = ''; + var hasText = data && data.responseText; + var hasError = data && data.responseJSON && data.responseJSON.error; + + if(hasText) message = data.responseText; + else if(hasError) message = data.responseJSON.error; + + Origin.Notify.alert({ + type: 'error', + title: Origin.l10n.t('app.uploadpluginerror'), + text: Helpers.decodeHTML(message) + }); + + Origin.router.navigateTo('pluginManagement/upload'); + }, }, { template: 'pluginManagementUpload' }); return PluginManagementUploadView; - }); diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index ac4f331868..75def3729c 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -1,8 +1,5 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - var Backbone = require('backbone'); - var Handlebars = require('handlebars'); - var Helpers = require('core/helpers'); var Origin = require('core/origin'); var OriginView = require('core/views/originView'); @@ -14,6 +11,9 @@ define(function(require){ var MenuTypeCollection = require('../collections/menuTypeCollection'); var PluginManagementView = OriginView.extend({ + className: "pluginManagement", + tagName: "div", + pluginType: "plugin", pluginCollections: { 'extension' : ExtensionTypeCollection, @@ -21,14 +21,12 @@ define(function(require){ 'theme' : ThemeTypeCollection, 'menu': MenuTypeCollection }, - tagName: "div", - className: "pluginManagement", events: { 'click .refresh-all-plugins': 'refreshPluginList' }, - initialize: function (options) { + initialize: function(options) { this.pluginType = options.pluginType; return OriginView.prototype.initialize.apply(this, arguments); }, @@ -76,9 +74,7 @@ define(function(require){ var pluginType = this.pluginType; var $btn = this.$('.refresh-all-plugins'); - if ($btn.hasClass('disabled')) { - return false; - } + if ($btn.hasClass('disabled')) return false; $btn.addClass('disabled').html(Origin.l10n.t('app.updating')); diff --git a/frontend/src/modules/pluginManagement/views/pluginTypeView.js b/frontend/src/modules/pluginManagement/views/pluginTypeView.js index a8790abf4c..81c8c3df8e 100644 --- a/frontend/src/modules/pluginManagement/views/pluginTypeView.js +++ b/frontend/src/modules/pluginManagement/views/pluginTypeView.js @@ -1,20 +1,15 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require){ - - var Backbone = require('backbone'); - var Handlebars = require('handlebars'); var OriginView = require('core/views/originView'); var Origin = require('core/origin'); var PluginTypeView = OriginView.extend({ - - tagName: 'div', - className: 'pluginType-item tb-row', + tagName: 'div', events: { - 'change .pluginType-enabled': 'toggleEnabled', - 'click .plugin-update-check': 'checkForUpdates', + 'change .pluginType-enabled': 'toggleEnabled', + 'click .plugin-update-check': 'checkForUpdates', 'click .plugin-update-confirm': 'updatePlugin' }, @@ -24,71 +19,55 @@ define(function(require){ }, toggleEnabled: function () { - // api call to disable/enable item - // NB: disable this functionality until we come up with a plan for courses - // that added plugins that were subsequently disabled - this.model.save({_isAvailableInEditor: this.$('.pluginType-enabled').is(':checked')}, {patch: true}); + this.model.save({ + _isAvailableInEditor: this.$('.pluginType-enabled').is(':checked') + }, { patch: true }); }, checkForUpdates: function (event) { - event.preventDefault(); - var btn = this.$('.plugin-update-check'); - if (btn.hasClass('disabled')) { - return false; - } - - btn.html(Origin.l10n.t('app.checking')); - $.ajax({ - 'method': 'GET', - 'url': this.model.urlRoot + '/checkversion/' + this.model.get('_id') - }).done(function (data) { - if (data.isUpdateable) { - btn.removeClass('plugin-update-check').addClass('plugin-update-confirm').html(Origin.l10n.t('app.updateplugin')); - } else { - btn.addClass('disabled'); - btn.html(Origin.l10n.t('app.uptodate')); + event && event.preventDefault(); + + var $btn = this.$('.plugin-update-check'); + + if($btn.hasClass('disabled')) return false; + + $btn.html(Origin.l10n.t('app.checking')); + + $.get(this.model.urlRoot + '/checkversion/' + this.model.get('_id'), function(data) { + if(!data.isUpdateable) { + $btn.addClass('disabled').html(Origin.l10n.t('app.uptodate')); + return; } + $btn.removeClass('plugin-update-check').addClass('plugin-update-confirm').html(Origin.l10n.t('app.updateplugin')); }); return false; }, updatePlugin: function (event) { - event.preventDefault(); - var that = this; - var btn = this.$('.plugin-update-confirm'); - if (btn.hasClass('disabled')) { - return false; - } - - btn.html(Origin.l10n.t('app.updating')); - btn.addClass('disabled'); - - // hit the update endpoint - $.ajax({ - 'method': 'POST', - 'url': this.model.urlRoot + '/update', - 'data': { - 'targets': [this.model.get('_id')] - } - }).done(function (data) { - if (_.contains(data.targets), that.model.get('_id')) { - // Refresh the schemas - Origin.trigger('scaffold:updateSchemas', function() { - btn.html(Origin.l10n.t('app.uptodate')); - }, this); - } else { - btn.html(Origin.l10n.t('app.updatefailed')); + event && event.preventDefault(); + + var $btn = this.$('.plugin-update-confirm'); + + if($btn.hasClass('disabled')) return false; + + $btn.addClass('disabled').html(Origin.l10n.t('app.updating')); + + $.post(this.model.urlRoot + '/update', { 'targets': [this.model.get('_id')] }, _.bind(function (data) { + if(!_.contains(data.targets), this.model.get('_id')) { + $btn.html(Origin.l10n.t('app.updatefailed')); + return; } - }); + Origin.trigger('scaffold:updateSchemas', function() { + $btn.html(Origin.l10n.t('app.uptodate')); + }, this); + }, this)); return false; } - }, { template: 'pluginType' }); return PluginTypeView; - }); From 576630df74feec359947f052fb43389a4c6be101 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Sat, 15 Apr 2017 12:34:49 +0100 Subject: [PATCH 146/296] Define var --- .../modules/editor/contentObject/views/editorMenuItemView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index ed586e19a8..ce151f59ff 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -8,7 +8,7 @@ define(function(require){ tagName: "div", autoScrollTimer: false, - clickTimer, + clickTimer: undefined, clickTimerActive: false, events: { From 32bc5f69662237a2b71d06c9f5a58a2ac2747ee8 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 18 Apr 2017 13:10:25 +0100 Subject: [PATCH 147/296] Fix Gruntfile to include libraries folder --- Gruntfile.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 5b3aa50b58..68ae2eb75f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -22,21 +22,12 @@ module.exports = function(grunt) { src: [ 'frontend/src/core/**/assets/**', 'frontend/src/modules/**/assets/**', - 'frontend/src/plugins/**/assets/**' + 'frontend/src/plugins/**/assets/**', + 'frontend/src/libraries/**/assets/**' ], dest: 'frontend/build/css/assets/', filter: 'isFile' }, - { - expand: true, - cwd: 'frontend/src/core/libraries/tinymce/', - src: [ - 'plugins/**/*', - 'skins/**/*', - 'themes/**/*' - ], - dest: 'frontend/build/js/' - }, { expand: true, flatten: true, @@ -53,7 +44,8 @@ module.exports = function(grunt) { src: [ 'frontend/src/core/**/*.less', 'frontend/src/modules/**/*.less', - 'frontend/src/plugins/**/*.less' + 'frontend/src/plugins/**/*.less', + 'frontend/src/libraries/**/*.less' ], paths: 'frontend/src/core/less', generateSourceMaps: true, @@ -70,7 +62,8 @@ module.exports = function(grunt) { 'frontend/src/core/**/*.less', 'frontend/src/less/**/*.less', 'frontend/src/modules/**/*.less', - 'frontend/src/plugins/**/*.less' + 'frontend/src/plugins/**/*.less', + 'frontend/src/libraries/**/*.less' ], paths: 'frontend/src/core/less', generateSourceMaps: false, From 59fdef2c78e6c7c3101d28890cf2993df2369c17 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 18 Apr 2017 13:10:38 +0100 Subject: [PATCH 148/296] Remove redundant code --- frontend/src/modules/editor/component/index.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/frontend/src/modules/editor/component/index.js b/frontend/src/modules/editor/component/index.js index 14e16792fb..ae6bacceda 100644 --- a/frontend/src/modules/editor/component/index.js +++ b/frontend/src/modules/editor/component/index.js @@ -13,18 +13,10 @@ define(function(require) { (new ComponentModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - var displayName = getComponentDisplayName(model); Helpers.setPageTitle(model); - Origin.sidebar.addView(new EditorComponentEditSidebarView({ model: model, form:form }).$el); + Origin.sidebar.addView(new EditorComponentEditSidebarView({ model: model, form: form }).$el); Origin.contentPane.setView(EditorComponentEditView, { model: model, form: form }); } }); }); - - function getComponentDisplayName(model) { - var componentType = _.find(Origin.editor.data.componenttypes.models, function(m) { - return m.get('_id') === model.get('_componentType'); - }); - return (componentType) ? componentType.get('displayName').toLowerCase() : ''; - } }); From f9718f383ec983aeb78b3e5c0fd87ef7d7efe7a8 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 18 Apr 2017 13:10:54 +0100 Subject: [PATCH 149/296] Fix broken logic --- frontend/src/modules/editor/contentObject/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js index 96da11596c..6af641f6c1 100644 --- a/frontend/src/modules/editor/contentObject/index.js +++ b/frontend/src/modules/editor/contentObject/index.js @@ -21,7 +21,7 @@ define(function(require) { // component add is just a page overlay view, so handling it here Origin.on('editor:block', function(data) { - if(data.action === 'add') { + if(data.action !== 'add') { return; } var containingBlock = Origin.editor.data.blocks.findWhere({ _id: Origin.location.route3 }); @@ -29,7 +29,7 @@ define(function(require) { var componentsModel = new Backbone.Model({ title: Origin.l10n.t('app.addcomponent'), body: Origin.l10n.t('app.pleaseselectcomponent'), - _parentId: route3, + _parentId: Origin.location.route3, componentTypes: Origin.editor.data.componenttypes.toJSON(), layoutOptions: layoutOptions }); From 25ee06c0302cb7182b5c8a6dc7043da3799b98d6 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 18 Apr 2017 13:18:41 +0100 Subject: [PATCH 150/296] Refactor sidebar whitespace --- .../course/views/editorCourseEditView.js | 1 - frontend/src/modules/sidebar/index.js | 46 ++++++++----------- 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/frontend/src/modules/editor/course/views/editorCourseEditView.js b/frontend/src/modules/editor/course/views/editorCourseEditView.js index 142fff0df1..b6c4f2e016 100644 --- a/frontend/src/modules/editor/course/views/editorCourseEditView.js +++ b/frontend/src/modules/editor/course/views/editorCourseEditView.js @@ -22,7 +22,6 @@ define(function(require) { // Ensure that the latest config model is always up-to-date when entering this screen Origin.editor.data.config = new ConfigModel({_courseId: this.model.get('_id')}); } - // This next line is important for a proper PATCH request on saveProject() this.originalAttributes = _.clone(this.model.attributes); }, diff --git a/frontend/src/modules/sidebar/index.js b/frontend/src/modules/sidebar/index.js index 28f98ff5b7..6c8c32100a 100644 --- a/frontend/src/modules/sidebar/index.js +++ b/frontend/src/modules/sidebar/index.js @@ -1,31 +1,23 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { - - var Origin = require('core/origin'); - var SidebarContainerView = require('./views/sidebarView'); - - var Sidebar = {}; - - Sidebar.addView = function($el, options) { - // Trigger to remove current views - Origin.trigger('sidebar:views:remove'); - - // Check if element is a view element - if (_.isElement($el[0]) !== true) { - return console.log("Sidebar - Cannot add this object to the sidebar view. Please make sure it's the views $el"); - } - - // Trigger update of views - Origin.trigger('sidebar:sidebarContainer:update', $el, options); - + var Origin = require('core/origin'); + var SidebarContainerView = require('./views/sidebarView'); + + Origin.once('origin:dataReady', function() { + $('body').append(new SidebarContainerView().$el); + }); + + Origin.sidebar = { + addView: function($el, options) { + console.log('addView'); + // Trigger to remove current views + Origin.trigger('sidebar:views:remove'); + // Check if element is a view element + if (_.isElement($el[0]) !== true) { + return console.log("Sidebar - Cannot add this object to the sidebar view. Please make sure it's the views $el"); + } + // Trigger update of views + Origin.trigger('sidebar:sidebarContainer:update', $el, options); } - - // Append sidebar to body - Origin.once('origin:dataReady', function() { - $('body').append(new SidebarContainerView().$el); - }); - - // Push sidebar to Origin object - Origin.sidebar = Sidebar; - + }; }) From 0cc427e69dc40abe015c622855fc69b39134540d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 19 Apr 2017 14:58:54 +0100 Subject: [PATCH 151/296] Refactor sessionModel instantiation --- frontend/src/core/app.js | 6 +++- frontend/src/core/origin.js | 36 ++++++++++--------- .../userManagement/models/userModel.js | 1 + 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index efc6180c47..b82d42e7f2 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -54,7 +54,11 @@ loadLibraries(function() { loadCore(function() { loadAddOns(function() { - origin.initialize(); + // start session + // FIXME required here to avoid errors + require(['modules/user/models/sessionModel'], function(SessionModel) { + origin.startSession(new SessionModel()); + }); }); }); }); diff --git a/frontend/src/core/origin.js b/frontend/src/core/origin.js index 3433f91296..0bfa6b1a3d 100644 --- a/frontend/src/core/origin.js +++ b/frontend/src/core/origin.js @@ -1,9 +1,5 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE -define(function(require){ - var _ = require('underscore'); - var Backbone = require('backbone'); - var SessionModel = require('modules/user/models/sessionModel'); - +define(['require', 'underscore', 'backbone'], function(require, _, Backbone){ var initialized = false; var eventTaps = []; var $loading; @@ -14,21 +10,27 @@ define(function(require){ * Performs the necessary set-up steps */ initialize: _.once(function() { - (new SessionModel()).fetch({ - success: function(model) { - Origin.sessionModel = model; - // need the schemas before the app loads - Origin.trigger('schemas:loadData', function() { - Origin.trigger('origin:dataReady'); - initLoading(); - initialized = true; - Origin.trigger('origin:initialize'); - }); + listenToWindowEvents(); + Origin.trigger('schemas:loadData', function() { + Origin.trigger('origin:dataReady'); + initLoading(); + initialized = true; + Origin.trigger('origin:initialize'); + }); + }), + /** + * Saves session on the Origin object + */ + startSession: function(session) { + Origin.sessionModel = session; + session.fetch({ + success: function() { + Origin.trigger('origin:sessionStarted'); + Origin.initialize(); }, error: console.error }); - listenToWindowEvents(); - }), + }, /** * Whether the Origin object has loaded */ diff --git a/frontend/src/modules/userManagement/models/userModel.js b/frontend/src/modules/userManagement/models/userModel.js index 6d46ae3433..8df7ebad55 100644 --- a/frontend/src/modules/userManagement/models/userModel.js +++ b/frontend/src/modules/userManagement/models/userModel.js @@ -3,6 +3,7 @@ define(function(require) { var Backbone = require('backbone'); var UserModel = Backbone.Model.extend({ + url: 'api/user', idAttribute: '_id', initialize: function() { From b7b54c573fc6e1e00ddf886744a19b5a362dc925 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 20 Apr 2017 18:42:42 +0100 Subject: [PATCH 152/296] Tidy up libraries --- frontend/src/core/app.js | 1 + frontend/src/core/config.js | 14 +- .../src/libraries/backbone.localStorage.js | 184 ------------------ .../src/libraries/jquery.jsoneditor.min.js | 10 - frontend/src/libraries/jquery.scrollTo.min.js | 7 - frontend/src/libraries/json2.js | 8 - 6 files changed, 6 insertions(+), 218 deletions(-) delete mode 100644 frontend/src/libraries/backbone.localStorage.js delete mode 100644 frontend/src/libraries/jquery.jsoneditor.min.js delete mode 100644 frontend/src/libraries/jquery.scrollTo.min.js delete mode 100644 frontend/src/libraries/json2.js diff --git a/frontend/src/core/app.js b/frontend/src/core/app.js index b82d42e7f2..556a8a2abf 100644 --- a/frontend/src/core/app.js +++ b/frontend/src/core/app.js @@ -8,6 +8,7 @@ 'imageReady', 'inview', 'jqueryForm', + 'jqueryTagsInput', 'jqueryUI', 'mediaelement', 'scrollTo', diff --git a/frontend/src/core/config.js b/frontend/src/core/config.js index 1eb766f356..78a87371e4 100644 --- a/frontend/src/core/config.js +++ b/frontend/src/core/config.js @@ -11,8 +11,8 @@ require.config({ inview: 'libraries/inview', jquery: 'libraries/jquery', jqueryForm : 'libraries/jquery.form', + jqueryTagsInput: 'libraries/jquery.tagsinput.min', jqueryUI: 'libraries/jquery-ui.min', - jsoneditor: 'libraries/jquery.jsoneditor.min', mediaelement : 'libraries/mediaelement-and-player', modernizr: 'libraries/modernizr', moment: 'libraries/moment.min', @@ -53,17 +53,17 @@ require.config({ deps: ['jquery'], exports: 'inview' }, - 'jquery-form': { + jqueryForm: { deps: ['jquery'], exports: "$" }, - 'jquery-ui': { + jqueryTagsInput: { deps: ['jquery'], exports: "$" }, - jsoneditor: { + jqueryUI: { deps: ['jquery'], - exports: 'JsonEditor' + exports: "$" }, mediaelement: { deps: ['jquery'], @@ -83,10 +83,6 @@ require.config({ deps: ['jquery'], exports: 'sweetAlert' }, - tags: { - deps: ['jquery'], - exports: "$" - }, underscore: { exports: '_' }, diff --git a/frontend/src/libraries/backbone.localStorage.js b/frontend/src/libraries/backbone.localStorage.js deleted file mode 100644 index 121399d825..0000000000 --- a/frontend/src/libraries/backbone.localStorage.js +++ /dev/null @@ -1,184 +0,0 @@ -/** - * Backbone localStorage Adapter - * Version 1.1.0 - * - * https://github.com/jeromegn/Backbone.localStorage - */ -(function (root, factory) { - if (typeof define === "function" && define.amd) { - // AMD. Register as an anonymous module. - define(["underscore","backbone"], function(_, Backbone) { - // Use global variables if the locals are undefined. - return factory(_ || root._, Backbone || root.Backbone); - }); - } else { - // RequireJS isn't being used. Assume underscore and backbone are loaded in + + + {{/if}} + + +
+
+
+ +
+
+
+
+
+
+
+
+ + From dbd5aaf4555902be074f5d17fc2f32169c048fac Mon Sep 17 00:00:00 2001 From: Louise McMahon Date: Fri, 19 May 2017 14:11:03 +0100 Subject: [PATCH 192/296] window is now closed on build error when window was opened it took focus and you would sit waiting for it load without knowing their was a modal on the main tab informing you of an error --- frontend/src/core/editor/global/views/editorView.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 4f7b0e558e..141175a88f 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -222,6 +222,7 @@ define(function(require){ type: 'error', text: window.polyglot.t('app.errorgeneratingpreview') }); + previewWindow.close() } }, error: function (jqXHR, textStatus, errorThrown) { @@ -230,6 +231,7 @@ define(function(require){ type: 'error', text: window.polyglot.t('app.errorgeneric') }); + previewWindow.close() } }); } @@ -255,6 +257,7 @@ define(function(require){ clearInterval(pollId); self.resetPreviewProgress(); + previewWindow.close() Origin.Notify.alert({ type: 'error', text: errorThrown From 477db6e65264130e089e878253a3dbc621bd2ac6 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 24 May 2017 13:24:13 +0100 Subject: [PATCH 193/296] Fix mouse event area --- frontend/src/modules/options/less/options.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/modules/options/less/options.less b/frontend/src/modules/options/less/options.less index 3761852a25..9b68c82d83 100644 --- a/frontend/src/modules/options/less/options.less +++ b/frontend/src/modules/options/less/options.less @@ -4,6 +4,8 @@ position:absolute; top:63px; right:0px; + // FIXME fix this and .location-title so we don't a z-index + z-index: 5; &-inner { padding:13px; From 21bd60ad2ae51f9ee49c6e343ed03f892d7e7397 Mon Sep 17 00:00:00 2001 From: Louise McMahon Date: Thu, 25 May 2017 09:42:30 +0100 Subject: [PATCH 194/296] added route to permission check --- lib/permissions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/permissions.js b/lib/permissions.js index 5862112cca..6ad09826d8 100644 --- a/lib/permissions.js +++ b/lib/permissions.js @@ -31,6 +31,7 @@ var ignoreRoutes = [ /^\/api\/theme\/?$/, /^\/api\/menu\/?$/, /^\/preview\/?.*$/, + /^\/loading\/?.*$/, /^\/download\/?.*$/, /^\/poll\/?.*$/, /^\/api\/auth\/?.*$/ From 4ea2e5e745ab44cb9d88d09ef1b204f87bdf090e Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 25 May 2017 10:41:03 +0100 Subject: [PATCH 195/296] Apply selected state to dashboard filters --- frontend/src/modules/projects/views/projectsView.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/modules/projects/views/projectsView.js b/frontend/src/modules/projects/views/projectsView.js index 33b87193f1..e6ca357a4c 100644 --- a/frontend/src/modules/projects/views/projectsView.js +++ b/frontend/src/modules/projects/views/projectsView.js @@ -49,6 +49,10 @@ define(function(require){ this.collectionLength = 0; this.shouldStopFetches = false; + + // set relevant filters as selected + $("a[data-callback='dashboard:layout:grid']").addClass('selected'); + $("a[data-callback='dashboard:sort:asc']").addClass('selected'); }, resizeDashboard: function() { From 989670ae05ebfc5573b4db9d2f4e844e0f511b94 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 30 May 2017 17:51:10 +0100 Subject: [PATCH 196/296] Fix issue with component edit routing --- frontend/src/modules/scaffold/index.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/src/modules/scaffold/index.js b/frontend/src/modules/scaffold/index.js index ccbf175c68..1d6daa0108 100644 --- a/frontend/src/modules/scaffold/index.js +++ b/frontend/src/modules/scaffold/index.js @@ -288,10 +288,6 @@ define(function(require) { var initialType = type; switch (type) { - case 'component': - type = 'config'; - break; - case 'component': type = options.model.get('_component'); break; From 064f99fd0ade289a2baf0124a9b0e3f89ad42dae Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Tue, 30 May 2017 18:22:13 +0100 Subject: [PATCH 197/296] Fix issue with user view enable/disable styling --- .../views/userManagementView.js | 25 ++++++++++++------- .../modules/userManagement/views/userView.js | 7 +++--- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/frontend/src/modules/userManagement/views/userManagementView.js b/frontend/src/modules/userManagement/views/userManagementView.js index bde5cbcd77..7cf537e060 100644 --- a/frontend/src/modules/userManagement/views/userManagementView.js +++ b/frontend/src/modules/userManagement/views/userManagementView.js @@ -33,18 +33,25 @@ define(function(require){ }, render: function() { - var SELECTED_CLASS = 'selected'; - var $selected = this.$('.user-item.' + SELECTED_CLASS)[0]; + var selectedId; + // remove the old views + if(this.views.length) { + for(var i = 0, count = this.views.length; i < count; i++) { + var view = this.views[i]; + if(view.isSelected) selectedId = view.model.get('_id'); + view.remove(); + } + this.views = []; + } OriginView.prototype.render.apply(this, arguments); - this.$('.users').fadeOut(0); - - this.users.each(this.createUserView, this); - if($selected) { - var selector = $selected.className.replace(SELECTED_CLASS,''); - $(document.getElementsByClassName(selector)).addClass(SELECTED_CLASS).click(); - } + this.users.each(function(user) { + var view = this.createUserView(user); + if(user.get('_id') === selectedId) { + view.$el.addClass('selected').click(); + } + }, this); }, postRender: function() { diff --git a/frontend/src/modules/userManagement/views/userView.js b/frontend/src/modules/userManagement/views/userView.js index 2bea887907..b0296ea353 100644 --- a/frontend/src/modules/userManagement/views/userView.js +++ b/frontend/src/modules/userManagement/views/userView.js @@ -46,19 +46,19 @@ define(function(require){ applyStyles: function() { // disabled user styling - if (this.model.get('_isDeleted') === true) { + if(this.model.get('_isDeleted') === true) { this.$el.addClass('inactive'); } else { this.$el.removeClass('inactive'); } // locked user styling - if (this.model.get('_isLocked') === true) { + if(this.model.get('_isLocked') === true) { this.$el.addClass('locked'); } else { this.$el.removeClass('locked'); } // selected user styling - if (this.isSelected) { + if(this.isSelected) { this.$el.addClass('selected'); this.$('.edit-mode').removeClass('display-none'); this.$('.write').addClass('display-none'); @@ -172,7 +172,6 @@ define(function(require){ }, onResetPasswordClicked: function(e) { - var self = this; var $btn = $(e.currentTarget); $btn.addClass('submitted'); Helpers.ajax('/api/createtoken', { email: this.model.get('email') }, 'POST', function() { From 357655c5033c698c20d2cf6436392cc874f871d3 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 31 May 2017 10:32:13 +0100 Subject: [PATCH 198/296] Fix back button routing --- frontend/src/modules/editor/selectTheme/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/selectTheme/index.js b/frontend/src/modules/editor/selectTheme/index.js index a06f59ffe1..8760c95f5d 100644 --- a/frontend/src/modules/editor/selectTheme/index.js +++ b/frontend/src/modules/editor/selectTheme/index.js @@ -17,7 +17,7 @@ define(function(require) { var backButtonText = "Back to menu"; if (Origin.previousLocation.route2 === "page") { - backButtonRoute = "/#/editor/" + route1 + "/page/" + data.id; + backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3; backButtonText = "Back to page"; } From 3ed1a6fc6e5b2e79837545cfd906e2f1dba17a8f Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 31 May 2017 11:26:32 +0100 Subject: [PATCH 199/296] Fix page title names --- frontend/src/modules/editor/article/index.js | 2 +- frontend/src/modules/editor/block/index.js | 2 +- .../src/modules/editor/component/index.js | 2 +- frontend/src/modules/editor/config/index.js | 2 +- .../src/modules/editor/contentObject/index.js | 5 ++--- frontend/src/modules/editor/course/index.js | 5 ++--- frontend/src/modules/editor/global/helpers.js | 19 ++++++++++++++----- routes/lang/en-application.json | 13 +++++++++---- 8 files changed, 31 insertions(+), 19 deletions(-) diff --git a/frontend/src/modules/editor/article/index.js b/frontend/src/modules/editor/article/index.js index 436e079a46..b7de8deb75 100644 --- a/frontend/src/modules/editor/article/index.js +++ b/frontend/src/modules/editor/article/index.js @@ -14,7 +14,7 @@ define(function(require) { (new ArticleModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - Helpers.setPageTitle(model); + Helpers.setPageTitle(model, true); Origin.sidebar.addView(new EditorArticleEditSidebarView({ model: model, form: form }).$el); Origin.contentPane.setView(EditorArticleEditView, { model: model, form: form }); } diff --git a/frontend/src/modules/editor/block/index.js b/frontend/src/modules/editor/block/index.js index 0a81ff463c..e92e025cd2 100644 --- a/frontend/src/modules/editor/block/index.js +++ b/frontend/src/modules/editor/block/index.js @@ -16,7 +16,7 @@ define(function(require) { (new BlockModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - Helpers.setPageTitle(model); + Helpers.setPageTitle(model, true); Origin.sidebar.addView(new EditorBlockEditSidebarView({ model: model, form: form }).$el); Origin.contentPane.setView(EditorBlockEditView, { model: model, form: form }); } diff --git a/frontend/src/modules/editor/component/index.js b/frontend/src/modules/editor/component/index.js index ae6bacceda..893f9f20e0 100644 --- a/frontend/src/modules/editor/component/index.js +++ b/frontend/src/modules/editor/component/index.js @@ -13,7 +13,7 @@ define(function(require) { (new ComponentModel({ _id: data.id })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - Helpers.setPageTitle(model); + Helpers.setPageTitle(model, true); Origin.sidebar.addView(new EditorComponentEditSidebarView({ model: model, form: form }).$el); Origin.contentPane.setView(EditorComponentEditView, { model: model, form: form }); } diff --git a/frontend/src/modules/editor/config/index.js b/frontend/src/modules/editor/config/index.js index 87ba6dc322..5565b3f28b 100644 --- a/frontend/src/modules/editor/config/index.js +++ b/frontend/src/modules/editor/config/index.js @@ -10,7 +10,7 @@ define(function(require) { (new ConfigModel({ _courseId: Origin.location.route1 })).fetch({ success: function(model) { var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: 'Edit configuration' }); + Origin.trigger('location:title:update', { title: Origin.l10n.t('app.editorconfig') }); Origin.sidebar.addView(new EditorConfigEditSidebarView({ form: form }).$el); Origin.contentPane.setView(EditorConfigEditView, { model: model, form: form }); } diff --git a/frontend/src/modules/editor/contentObject/index.js b/frontend/src/modules/editor/contentObject/index.js index 6af641f6c1..3777705d02 100644 --- a/frontend/src/modules/editor/contentObject/index.js +++ b/frontend/src/modules/editor/contentObject/index.js @@ -12,6 +12,7 @@ define(function(require) { var EditorPageEditSidebarView = require('./views/editorPageEditSidebarView'); var EditorPageSidebarView = require('./views/editorPageSidebarView'); var EditorView = require('../global/views/editorView'); + var Helpers = require('../global/helpers'); Origin.on('editor:contentObject', function(data) { if(data.action === 'edit') renderContentObjectEdit(data); @@ -39,10 +40,8 @@ define(function(require) { function renderContentObjectEdit(data) { (new ContentObjectModel({ _id: data.id })).fetch({ success: function(model) { + Helpers.setPageTitle(model, true); var form = Origin.scaffold.buildForm({ model: model }); - // TODO this should be properly localised - var type = Origin.location.route2; - Origin.trigger('location:title:update', { title: 'Editing ' + type + ' - ' + model.get('title') }); Origin.sidebar.addView(new EditorPageEditSidebarView({ form: form }).$el); Origin.contentPane.setView(EditorPageEditView, { model: model, form: form }); } diff --git a/frontend/src/modules/editor/course/index.js b/frontend/src/modules/editor/course/index.js index c0624c508c..d256091721 100644 --- a/frontend/src/modules/editor/course/index.js +++ b/frontend/src/modules/editor/course/index.js @@ -15,8 +15,8 @@ define(function(require) { function renderCourseEdit() { (new CourseModel({ _id: Origin.location.route1 })).fetch({ success: function(model) { + Helpers.setPageTitle({ title: Origin.l10n.t('app.editorsettings') }); var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: Origin.l10n.t('app.editcourse') }); Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); } @@ -28,9 +28,8 @@ define(function(require) { title: Origin.l10n.t('app.placeholdernewcourse'), displayTitle: Origin.l10n.t('app.placeholdernewcourse') }); - Helpers.setPageTitle({ title: Origin.l10n.t('app.editornewcoursetitle') }); + Helpers.setPageTitle({ title: Origin.l10n.t('app.editornew') }); var form = Origin.scaffold.buildForm({ model: model }); - Origin.trigger('location:title:update', { title: Origin.l10n.t('app.addnewproject') }); Origin.contentPane.setView(EditorCourseEditView, { model: model, form: form }); Origin.sidebar.addView(new EditorCourseEditSidebarView({ form: form }).$el); } diff --git a/frontend/src/modules/editor/global/helpers.js b/frontend/src/modules/editor/global/helpers.js index 49048b8d24..115d5dfa87 100644 --- a/frontend/src/modules/editor/global/helpers.js +++ b/frontend/src/modules/editor/global/helpers.js @@ -22,14 +22,23 @@ define(function(require) { var langString = Origin.l10n.t('app.' + titleKey); var modelTitle = model && model.get && model.get('title') || model.title; - var crumbs = ['dashboard']; + var title = modelTitle || langString; + if(shouldAddEditingPrefix === true) title = addEditingPrefix(title, type); - if(type !== 'menu' && type !== 'new') { // new === new course - crumbs.push('course'); - } - return model; + Origin.trigger('location:title:update', { title: title }); } } + /** + * Private functons + */ + + function addEditingPrefix(string, type) { + return Origin.l10n.t('app.editing', { + text: string, + type: Origin.l10n.t('app.' + type) + }); + } + return helpers; }); diff --git a/routes/lang/en-application.json b/routes/lang/en-application.json index 76ff55e2fd..ce3cc8108d 100644 --- a/routes/lang/en-application.json +++ b/routes/lang/en-application.json @@ -290,9 +290,9 @@ "app.backtomenu": "Back to course structure", "app.editorpage": "Page structure", "app.editorpageedit": "Page settings", - "app.editorarticleedit": "Article settings", - "app.editorblockedit": "Block settings", - "app.editorcomponentedit": "Component settings", + "app.editorarticle": "Article settings", + "app.editorblock": "Block settings", + "app.editorcomponent": "Component settings", "app.editorsettings": "Project settings", "app.editorsettingstitle": "Adjust course attributes", "app.editorconfig": "Configuration settings", @@ -301,5 +301,10 @@ "app.editormenusettingstitle": "Select a menu for your course", "app.editorextensions": "Manage extensions", "app.editorextensionstitle": "Manage course extensions", - "app.editing": "Editing %{text}" + "app.editing": "Editing %{type}: %{text}", + "app.menu": "menu", + "app.page": "page", + "app.article": "article", + "app.block": "block", + "app.component": "component" } From b76bceaec73628074344fed92ee514c2b41d034d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 11:23:17 +0100 Subject: [PATCH 200/296] Amend plugin update styling --- .../pluginManagement/less/pluginType.less | 11 +++++++++++ .../pluginManagement/templates/pluginType.hbs | 2 +- .../views/pluginManagementView.js | 17 ++++++++--------- .../pluginManagement/views/pluginTypeView.js | 19 ++++++------------- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/frontend/src/modules/pluginManagement/less/pluginType.less b/frontend/src/modules/pluginManagement/less/pluginType.less index a2467722bb..382d295194 100644 --- a/frontend/src/modules/pluginManagement/less/pluginType.less +++ b/frontend/src/modules/pluginManagement/less/pluginType.less @@ -1,3 +1,14 @@ .pluginType-item.tb-row.row-disabled { color: #B5C2C6; } + +.pluginType-update { + button { + &.plugin-update-check { + .secondary; + } + &.plugin-update-confirm { + .primary; + } + } +} diff --git a/frontend/src/modules/pluginManagement/templates/pluginType.hbs b/frontend/src/modules/pluginManagement/templates/pluginType.hbs index d66222205e..c53e8488d8 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginType.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginType.hbs @@ -24,7 +24,7 @@ {{#if isLocalPackage}} ({{t 'app.uploadedbyuser'}}) {{else}} - + {{/if}}
diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index 720b35039c..28fa34fb5c 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -33,7 +33,7 @@ define(function(require){ initialiseCollection: function() { this.collection = new (this.pluginCollections[this.pluginType])(); - this.listenTo(this.collection, 'sync', this.renderPluginTypeViews); + this.listenToOnce(this.collection, 'sync', this.renderPluginTypeViews); this.collection.fetch(); }, @@ -66,21 +66,20 @@ define(function(require){ } }, - refreshPluginList: function (e) { + refreshPluginList: function(e) { e && e.preventDefault(); - var self = this; - var $btn = this.$('.refresh-all-plugins'); + var $btn = $(e.currentTarget); - if ($btn.hasClass('disabled')) return false; + if($btn.is(':disabled')) return false; - $btn.addClass('disabled'); + $btn.attr('disabled', true); this.collection.fetch({ - success: function() { + success: _.bind(function() { Origin.trigger('scaffold:updateSchemas', function() { - self.renderPluginTypeViews(self.collection); + this.renderPluginTypeViews(this.collection); }, this); - }, + }, this), error: console.log }); } diff --git a/frontend/src/modules/pluginManagement/views/pluginTypeView.js b/frontend/src/modules/pluginManagement/views/pluginTypeView.js index c7f12ab5b8..d88a5c6e87 100644 --- a/frontend/src/modules/pluginManagement/views/pluginTypeView.js +++ b/frontend/src/modules/pluginManagement/views/pluginTypeView.js @@ -16,6 +16,7 @@ define(function(require){ preRender: function () { this.listenTo(this, 'remove', this.remove); this.listenTo(this.model, 'destroy', this.remove); + this.listenTo(this.model, 'sync', this.render); }, toggleEnabled: function () { @@ -29,13 +30,13 @@ define(function(require){ var $btn = this.$('.plugin-update-check'); - if($btn.hasClass('disabled')) return false; + if($btn.is(':disabled')) return false; $btn.html(Origin.l10n.t('app.checking')); $.get(this.model.urlRoot + '/checkversion/' + this.model.get('_id'), function(data) { if(!data.isUpdateable) { - $btn.addClass('disabled').html(Origin.l10n.t('app.uptodate')); + $btn.attr('disabled', true).html(Origin.l10n.t('app.uptodate')); return; } $btn.removeClass('plugin-update-check').addClass('plugin-update-confirm').html(Origin.l10n.t('app.updateplugin')); @@ -46,14 +47,11 @@ define(function(require){ updatePlugin: function (event) { event && event.preventDefault(); - var $btn = this.$('.plugin-update-confirm'); - if($btn.hasClass('disabled')) return false; - - $btn.addClass('disabled').html(Origin.l10n.t('app.updating')); + if($btn.is(':disabled')) return false; - var self = this; + $btn.attr('disabled', true).html(Origin.l10n.t('app.updating')); $.post(this.model.urlRoot + '/update', { 'targets': [this.model.get('_id')] }, _.bind(function(data) { if(!_.contains(data.upgraded, this.model.get('_id'))) { @@ -62,12 +60,7 @@ define(function(require){ } Origin.trigger('scaffold:updateSchemas', function() { $btn.html(Origin.l10n.t('app.uptodate')); - self.model.collection.fetch({ - success: function() { - self.render(); - }, - error: console.log - }); + this.model.fetch(); }, this); }, this)); From ca90ecc6339b12339aea7d34b198e76115546f0c Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 12:21:23 +0100 Subject: [PATCH 201/296] Fix broken contextMenu listeners --- frontend/src/modules/contextMenu/views/contextMenuView.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/modules/contextMenu/views/contextMenuView.js b/frontend/src/modules/contextMenu/views/contextMenuView.js index 3432fc3bbf..ca4f7e40b7 100644 --- a/frontend/src/modules/contextMenu/views/contextMenuView.js +++ b/frontend/src/modules/contextMenu/views/contextMenuView.js @@ -34,14 +34,14 @@ define(function(require) { }, toggleMenu: function(view, e) { - var isSameModel = view && (view.model.get('_id')) === (this.contextView.model && this.contextView.model.get('_id')) - var isSameType = view && (view.model.get('_type')) === (this.contextView.model && this.contextView.model.get('_type')) + var isSameType = view && (view.model.get('_type')) === (this.contextView.model && this.contextView.model.get('_type')); + var isSameModel = view && (view.model.get('_id')) === (this.contextView.model && this.contextView.model.get('_id')); + var isSameView = view.cid === this.contextView.cid; // to make sure we don't break listeners // new view, update the menu items - if(!isSameModel || !isSameType) { + if(!isSameType || !isSameModel || !isSameView) { this.setMenu(view, $(e.currentTarget)); return this.showMenu(); } - (this._isVisible) ? this.hideMenu() : this.showMenu(); }, From 6fa38d283970f4d695c543ca508fc6c99d6cf945 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 12:29:24 +0100 Subject: [PATCH 202/296] Add copyID to course context menu --- frontend/src/modules/contextMenu/index.js | 2 +- frontend/src/modules/projects/views/projectView.js | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/contextMenu/index.js b/frontend/src/modules/contextMenu/index.js index 6c1f09ab3e..8afab1a729 100644 --- a/frontend/src/modules/contextMenu/index.js +++ b/frontend/src/modules/contextMenu/index.js @@ -53,7 +53,7 @@ define(function(require) { callbackEvent: 'preview' } ]); - var courseItems = getDefaultItems(['copyID']); + var courseItems = getDefaultItems(); var superPerms = ["*/*:create","*/*:read","*/*:update","*/*:delete"]; if (Origin.permissions.hasPermissions(superPerms)) { courseItems.push({ diff --git a/frontend/src/modules/projects/views/projectView.js b/frontend/src/modules/projects/views/projectView.js index 070aba4378..9ab4a47f30 100644 --- a/frontend/src/modules/projects/views/projectView.js +++ b/frontend/src/modules/projects/views/projectView.js @@ -5,6 +5,7 @@ define(function(require) { var Handlebars = require('handlebars'); var OriginView = require('core/views/originView'); var Origin = require('core/origin'); + var Helpers = require('core/helpers'); var ProjectView = OriginView.extend({ className: 'project-list-item', @@ -25,7 +26,8 @@ define(function(require) { 'contextMenu:course:editSettings': this.editProjectSettings, 'contextMenu:course:edit': this.editProject, 'contextMenu:course:delete': this.deleteProjectPrompt, - 'contextMenu:course:copy': this.duplicateProject + 'contextMenu:course:copy': this.duplicateProject, + 'contextMenu:course:copyID': this.copyIdToClipboard }); this.listenTo(Origin, { 'dashboard:dashboardView:removeSubViews': this.remove, @@ -121,6 +123,15 @@ define(function(require) { }); }, + copyIdToClipboard: function() { + var id = this.model.get('_id'); + if(Helpers.copyStringToClipboard(id)) { + Origin.Notify.alert({ type: 'success', text: Origin.l10n.t('app.copyidtoclipboardsuccess', { id: id }) }); + return; + } + Origin.Notify.alert({ type: 'warning', text: Origin.l10n.t('app.app.copyidtoclipboarderror', { id: id }) }); + }, + onProjectShowTagsButtonClicked: function(event) { if(event) { event.preventDefault(); From 096967008d05d2b56e7256e7bea472f5f35f726c Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 12:33:03 +0100 Subject: [PATCH 203/296] Close context menu on outside click --- frontend/src/modules/contextMenu/views/contextMenuView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/modules/contextMenu/views/contextMenuView.js b/frontend/src/modules/contextMenu/views/contextMenuView.js index ca4f7e40b7..2de7b71a72 100644 --- a/frontend/src/modules/contextMenu/views/contextMenuView.js +++ b/frontend/src/modules/contextMenu/views/contextMenuView.js @@ -14,6 +14,7 @@ define(function(require) { 'contextMenu:open': this.toggleMenu, 'contextMenu:closeContextMenu remove remove:views': this.hideMenu }); + $('html').click(_.bind(this.hideMenu, this)); this.render(); }, From 32721c107ba5e300cd9ab647bfb8ca855830cbae Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 13:06:33 +0100 Subject: [PATCH 204/296] Fix bugs with destructive Notify styling --- frontend/src/modules/notify/plugins/alert/index.js | 3 ++- frontend/src/modules/notify/plugins/alert/less/alert.less | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/modules/notify/plugins/alert/index.js b/frontend/src/modules/notify/plugins/alert/index.js index d2472d72f8..d6fb5b026b 100644 --- a/frontend/src/modules/notify/plugins/alert/index.js +++ b/frontend/src/modules/notify/plugins/alert/index.js @@ -85,6 +85,8 @@ define(function(require) { $('.sweet-alert > .sa-button-container button').blur(); + clearInterval(interval); + // forces the user to wait before the confirm button can be clicked if(data.destructive === true) { var setWaitText = function(n) { @@ -104,7 +106,6 @@ define(function(require) { setWaitText(count); - clearInterval(interval); interval = setInterval(function() { if(--count > 0) { $('.sweet-alert button.confirm').html('' + Origin.l10n.t('app.confirmwait') + ' ' + count); diff --git a/frontend/src/modules/notify/plugins/alert/less/alert.less b/frontend/src/modules/notify/plugins/alert/less/alert.less index c0dba5116a..f1633e4621 100644 --- a/frontend/src/modules/notify/plugins/alert/less/alert.less +++ b/frontend/src/modules/notify/plugins/alert/less/alert.less @@ -45,8 +45,8 @@ margin-right: 18px; } .la-ball-fall { - left: 36.5%; - top: 72%; + left: 37.5%; + top: 46%; margin: 0; > div { width: 3px; From 22af7567ed6e77bc28184c01453d0c273a9f0b48 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 1 Jun 2017 17:12:51 +0100 Subject: [PATCH 205/296] Fix .row-disabled style --- frontend/src/modules/pluginManagement/less/pluginType.less | 2 +- frontend/src/modules/pluginManagement/templates/pluginType.hbs | 2 +- .../src/modules/pluginManagement/views/pluginManagementView.js | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/frontend/src/modules/pluginManagement/less/pluginType.less b/frontend/src/modules/pluginManagement/less/pluginType.less index 382d295194..905a76817b 100644 --- a/frontend/src/modules/pluginManagement/less/pluginType.less +++ b/frontend/src/modules/pluginManagement/less/pluginType.less @@ -1,4 +1,4 @@ -.pluginType-item.tb-row.row-disabled { +.pluginType-item.tb-row .row-disabled { color: #B5C2C6; } diff --git a/frontend/src/modules/pluginManagement/templates/pluginType.hbs b/frontend/src/modules/pluginManagement/templates/pluginType.hbs index c53e8488d8..c69384ec76 100644 --- a/frontend/src/modules/pluginManagement/templates/pluginType.hbs +++ b/frontend/src/modules/pluginManagement/templates/pluginType.hbs @@ -1,4 +1,4 @@ -
+

{{{displayName}}}

diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementView.js b/frontend/src/modules/pluginManagement/views/pluginManagementView.js index 28fa34fb5c..c1323e2237 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementView.js @@ -53,9 +53,6 @@ define(function(require){ renderPluginTypeView: function(pluginType, index) { var cssClass = 'tb-row-' + Helpers.odd(index); - if (pluginType.get('_isAvailableInEditor') === false) { - cssClass += ' row-disabled'; - } var view = new PluginTypeView({ model: pluginType }); this.$('.pluginManagement-plugins').append(view.$el.addClass(cssClass)); }, From 2e268bcec5a896e5e289c58314e9ba299f7930ea Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 7 Jun 2017 09:40:14 +0100 Subject: [PATCH 206/296] Restrict project tile height to ensure neat grid --- frontend/src/modules/projects/less/projects.less | 3 ++- frontend/src/modules/projects/less/qproject.less | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/projects/less/projects.less b/frontend/src/modules/projects/less/projects.less index d336974225..75e4e53f2a 100644 --- a/frontend/src/modules/projects/less/projects.less +++ b/frontend/src/modules/projects/less/projects.less @@ -43,7 +43,8 @@ ul.projects-options { .shared-project-list-item { margin-left: 25px; min-width: 200px; - min-height: 341px; + height: 341px; + overflow: hidden; width: 22%; max-width:300px; display:inline-block; diff --git a/frontend/src/modules/projects/less/qproject.less b/frontend/src/modules/projects/less/qproject.less index 3ce8450b09..c70fed9566 100644 --- a/frontend/src/modules/projects/less/qproject.less +++ b/frontend/src/modules/projects/less/qproject.less @@ -189,7 +189,6 @@ h4 { height: 36px; overflow: hidden; - overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; From 3c119a9b90c083439eb9935c9c22248ed9cf228f Mon Sep 17 00:00:00 2001 From: Louise McMahon Date: Wed, 7 Jun 2017 09:49:44 +0100 Subject: [PATCH 207/296] Moved window open inside validity check --- frontend/src/core/editor/global/views/editorView.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/core/editor/global/views/editorView.js b/frontend/src/core/editor/global/views/editorView.js index 141175a88f..3fad5a3432 100644 --- a/frontend/src/core/editor/global/views/editorView.js +++ b/frontend/src/core/editor/global/views/editorView.js @@ -196,9 +196,8 @@ define(function(require){ event && event.preventDefault(); var self = this; - var previewWindow = window.open('/loading', 'preview'); - if (helpers.validateCourseContent(this.currentCourse) && !Origin.editor.isPreviewPending) { + var previewWindow = window.open('/loading', 'preview'); Origin.editor.isPreviewPending = true; $('.navigation-loading-indicator').removeClass('display-none'); $('.editor-common-sidebar-preview-inner').addClass('display-none'); From 840155f61bfa3dd64f1e98c4ef3a4259850a8352 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 7 Jun 2017 14:15:24 +0100 Subject: [PATCH 208/296] Expose maxLoginAttempts to config.json --- .../src/modules/userManagement/models/userModel.js | 8 +++++--- lib/configuration.js | 11 +++++++++-- plugins/auth/local/index.js | 4 +--- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/frontend/src/modules/userManagement/models/userModel.js b/frontend/src/modules/userManagement/models/userModel.js index 9733fe34f9..c4dc125e59 100644 --- a/frontend/src/modules/userManagement/models/userModel.js +++ b/frontend/src/modules/userManagement/models/userModel.js @@ -60,12 +60,14 @@ define(function(require) { }, setLockStatus: function(model, value, options) { - // HACK MAX_LOGIN_ATTEMPTS doesn't seem to be set anywhere other than plugins/auth/local:line-30 - var MAX_LOGIN_ATTEMPTS = 3; - var newLocked = this.get('failedLoginCount') >= MAX_LOGIN_ATTEMPTS; + var newLocked = this.get('failedLoginCount') >= Origin.constants.maxLoginAttempts; if(newLocked !== this.get('_isLocked')) { this.set('_isLocked', newLocked); } + }, + + applyURLToOptions: function(options) { + return _.extend(options, { url: this.url + '/' + this.get('_id') }); } }); diff --git a/lib/configuration.js b/lib/configuration.js index c8c23051cb..f534265d49 100644 --- a/lib/configuration.js +++ b/lib/configuration.js @@ -28,7 +28,10 @@ var ALLOWED_CLIENT_SIDE_KEYS = [ 'outputPlugin', 'masterTenantID', 'recaptchaSiteKey', - 'useSmtp' + 'useSmtp', + 'useffmpeg', + 'isProduction', + 'maxLoginAttempts' ]; /** @@ -69,7 +72,11 @@ function Configuration() { this.serverRoot = path.normalize(path.join(__dirname, '..')); this.tempDir = path.join(this.serverRoot, 'temp'); this.configFile = ''; - this.conf = {root:this.serverRoot}; + // default settings (overriden by the config json) + this.conf = { + root: this.serverRoot, + maxLoginAttempts: 3 + }; this.mconf = {}; return this; } diff --git a/plugins/auth/local/index.js b/plugins/auth/local/index.js index 04b742c284..0c1988fc5c 100644 --- a/plugins/auth/local/index.js +++ b/plugins/auth/local/index.js @@ -27,8 +27,6 @@ var ERROR_CODES = { ACCOUNT_INACTIVE: 5 }; -var MAX_LOGIN_ATTEMPTS = 3; - function LocalAuth() { this.strategy = new LocalStrategy({ usernameField: 'email' }, this.verifyUser); passport.use(this.strategy); @@ -54,7 +52,7 @@ LocalAuth.prototype.verifyUser = function (email, password, done) { }); } - if (user.failedLoginCount < MAX_LOGIN_ATTEMPTS) { + if (user.failedLoginCount < configuration.getConfig('maxLoginAttempts')) { // Validate the user's password auth.validatePassword(password, user.password, function (error, valid) { if (error) { From 3388ac5d485c5f9bd7c65ba93284406e59ca1e1b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 7 Jun 2017 14:16:53 +0100 Subject: [PATCH 209/296] Add userModel fetch override --- .../src/modules/userManagement/models/userModel.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/userManagement/models/userModel.js b/frontend/src/modules/userManagement/models/userModel.js index c4dc125e59..50b8174535 100644 --- a/frontend/src/modules/userManagement/models/userModel.js +++ b/frontend/src/modules/userManagement/models/userModel.js @@ -1,6 +1,7 @@ // LICENCE https://github.com/adaptlearning/adapt_authoring/blob/master/LICENSE define(function(require) { var Backbone = require('backbone'); + var Origin = require('core/origin'); var UserModel = Backbone.Model.extend({ url: 'api/user', @@ -16,12 +17,16 @@ define(function(require) { }, // HACK(s) because we can't define a rootUrl and url + fetch: function(options) { + this.applyURLToOptions(options); + Backbone.Model.prototype.fetch.apply(this, arguments); + }, save: function(attributes, options) { - _.extend(options, { url: this.url + '/' + this.get('_id') }); + this.applyURLToOptions(options); Backbone.Model.prototype.save.apply(this, arguments); }, destroy: function(options) { - _.extend(options, { url: this.url + '/' + this.get('_id') }); + this.applyURLToOptions(options); Backbone.Model.prototype.destroy.apply(this, arguments); }, @@ -32,6 +37,9 @@ define(function(require) { // pull the human-readable role names from the list of all roles setRoleNames: function(model, value, options) { + if(!model.get('globalData')) { + return; + } var roleNames; if(typeof value === 'object') { // array roleNames = value.map(function(role, index) { From 79724c5472fbecf020137113c4c636a88f3b37b7 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Wed, 7 Jun 2017 15:19:27 +0100 Subject: [PATCH 210/296] Fix var reference --- plugins/filestorage/localfs/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/filestorage/localfs/index.js b/plugins/filestorage/localfs/index.js index 88843c9974..aefcde47c3 100644 --- a/plugins/filestorage/localfs/index.js +++ b/plugins/filestorage/localfs/index.js @@ -401,7 +401,7 @@ LocalFileStorage.prototype.createThumbnail = function (filePath, fileType, optio }; function isThumbnailTypeSupported(type) { - switch(fileType) { + switch(type) { case 'video': case 'image': return true; From 9648b2b801f39e72898c270a6ee8572b2526cf8d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 8 Jun 2017 13:46:18 +0100 Subject: [PATCH 211/296] Fix userModel URL bug --- .../userManagement/models/userModel.js | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/frontend/src/modules/userManagement/models/userModel.js b/frontend/src/modules/userManagement/models/userModel.js index 50b8174535..e27a476e70 100644 --- a/frontend/src/modules/userManagement/models/userModel.js +++ b/frontend/src/modules/userManagement/models/userModel.js @@ -4,9 +4,13 @@ define(function(require) { var Origin = require('core/origin'); var UserModel = Backbone.Model.extend({ - url: 'api/user', idAttribute: '_id', + url: function() { + var root = 'api/user'; + return root + ((this.isNew()) ? '' : '/' + this.id); + }, + initialize: function() { this.on('change:globalData', this.onGlobalDataChanged); this.on('change:roles', this.setRoleNames); @@ -16,20 +20,6 @@ define(function(require) { this.setLockStatus(); }, - // HACK(s) because we can't define a rootUrl and url - fetch: function(options) { - this.applyURLToOptions(options); - Backbone.Model.prototype.fetch.apply(this, arguments); - }, - save: function(attributes, options) { - this.applyURLToOptions(options); - Backbone.Model.prototype.save.apply(this, arguments); - }, - destroy: function(options) { - this.applyURLToOptions(options); - Backbone.Model.prototype.destroy.apply(this, arguments); - }, - onGlobalDataChanged: function(model, value, options) { this.setRoleNames(model, model.get('roles'), options); this.setTenantName(model, model.get('_tenantId'), options); @@ -72,10 +62,6 @@ define(function(require) { if(newLocked !== this.get('_isLocked')) { this.set('_isLocked', newLocked); } - }, - - applyURLToOptions: function(options) { - return _.extend(options, { url: this.url + '/' + this.get('_id') }); } }); From fc348f7e3708faa4142713fa74601c8dd4767149 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 8 Jun 2017 14:08:06 +0100 Subject: [PATCH 212/296] Add sidebar button Reset --- .../pluginManagement/views/pluginManagementUploadView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js index 7d7d339908..3f88da4407 100644 --- a/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js +++ b/frontend/src/modules/pluginManagement/views/pluginManagementUploadView.js @@ -43,6 +43,7 @@ define(function(require){ Origin.trigger('scaffold:updateSchemas', function() { Origin.Notify.alert({ type: 'success', text: Origin.l10n.t('app.uploadpluginsuccess') }); + Origin.trigger('sidebar:resetButtons'); $('.loading').hide(); Origin.router.navigateTo('pluginManagement/' + (data.pluginType || '')); @@ -50,6 +51,7 @@ define(function(require){ }, onUploadError: function(data) { + Origin.trigger('sidebar:resetButtons'); $('.loading').hide(); var message = ''; From a58e1f1e23ad9d627311960890b47e86ecc06f23 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Thu, 8 Jun 2017 18:18:38 +0100 Subject: [PATCH 213/296] Fix editorView paste functionality --- frontend/src/modules/editor/global/views/editorView.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/global/views/editorView.js b/frontend/src/modules/editor/global/views/editorView.js index ef45628aa5..7477fafec0 100644 --- a/frontend/src/modules/editor/global/views/editorView.js +++ b/frontend/src/modules/editor/global/views/editorView.js @@ -314,7 +314,14 @@ define(function(require){ }, pasteFromClipboard: function(parentId, sortOrder, layout) { - $.post('/api/content/clipboard/paste', function(jqXHR) { + var data = { + id: Origin.editor.clipboardId, + parentId: parentId, + layout: layout, + sortOrder: sortOrder, + courseId: Origin.editor.data.course.get('_id') + }; + $.post('/api/content/clipboard/paste', data, function(jqXHR) { Origin.editor.clipboardId = null; Origin.editor.pasteParentModel = null; Origin.trigger('editor:refreshData', function() { From 978b4af69d16ce994c9cab8cd4a63cce7267b89b Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Fri, 9 Jun 2017 17:02:36 +0100 Subject: [PATCH 214/296] Fix CO drag and drop --- .../contentObject/views/editorPageView.js | 3 +- .../global/views/editorPasteZoneView.js | 47 +++++++------------ 2 files changed, 18 insertions(+), 32 deletions(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorPageView.js b/frontend/src/modules/editor/contentObject/views/editorPageView.js index 1768e7dc83..d247d76588 100644 --- a/frontend/src/modules/editor/contentObject/views/editorPageView.js +++ b/frontend/src/modules/editor/contentObject/views/editorPageView.js @@ -82,8 +82,7 @@ define(function(require){ this.$('.page-articles').empty(); Origin.trigger('editorPageView:removePageSubViews'); // Insert the 'pre' paste zone for articles - var prePasteArticle = new ArticleModel(); - prePasteArticle.set({ + var prePasteArticle = new ArticleModel({ _parentId: this.model.get('_id'), _type: 'article', _pasteZoneSortOrder: 1 diff --git a/frontend/src/modules/editor/global/views/editorPasteZoneView.js b/frontend/src/modules/editor/global/views/editorPasteZoneView.js index 863a77beca..f0a5c3a785 100644 --- a/frontend/src/modules/editor/global/views/editorPasteZoneView.js +++ b/frontend/src/modules/editor/global/views/editorPasteZoneView.js @@ -6,7 +6,7 @@ define(function(require){ var Helpers = require('core/helpers'); var EditorOriginView = require('./editorOriginView'); - var EditorPasteZone = EditorOriginView.extend({ + var EditorPasteZoneView = EditorOriginView.extend({ className: 'display-none paste-zone', events: { @@ -44,45 +44,32 @@ define(function(require){ onDrop: function(e, ui) { var type = this.model.get('_type'); - var parentId = this.model.get('_parentId'); var $component = $(ui.draggable); var contentId = $component.attr('data-' + type + '-id'); + var parentId = this.model.get('_parentId'); var droppedOnId = $component.attr('data-' + this.model.get('_parent') + '-id'); - var sortOrder = $(this).find('.paste-' + type).attr('data-sort-order'); - var newData = { - _sortOrder: sortOrder, - _parentId: parentId - }; $.ajax({ + url: '/api/content/' + type + '/' + contentId, type: 'PUT', - url:'/api/content/' + type + '/' + contentId, - data: newData, - success: this.onSaveSuccess, - error: this.onSaveError - }); - }, - - onSaveSuccess: function(jqXHR, textStatus, errorThrown) { - var contentCollection = Origin.editor.data[view.model._siblings]; - contentCollection.fetch().done(function() { - // Re-render the move-from content item - Origin.trigger('editorView:move' + Helpers.capitalise(type) + ':' + droppedOnId); - // Re-render the move-to content item if needed - if (droppedOnId !== parentId) { - Origin.trigger('editorView:move' + Helpers.capitalise(type) + ':' + parentId); + data: { + _parentId: parentId, + _sortOrder: $('.paste-' + type, this.$el).attr('data-sort-order') + }, + success: _.bind(function() { + // fetch collection for the pasted type, and send motification + Origin.editor.data[this.model._siblings].fetch().done(function() { + var itemId = (droppedOnId === parentId) ? droppedOnId : parentId; + Origin.trigger('editorView:move' + Helpers.capitalise(type) + ':' + itemId); + }); + }, this), + error: function(jqXHR) { + Origin.Notify.alert({ type: 'error', text: jqXHR.responseJSON.message }); } }); - }, - - onSaveError: function(jqXHR) { - Origin.Notify.alert({ - type: 'error', - text: jqXHR.responseJSON.message - }); } }, { template: 'editorPasteZone' }); - return EditorPasteZone; + return EditorPasteZoneView; }); From 2ecf008dc175fa75ff93fa4b5f8893904dc8a733 Mon Sep 17 00:00:00 2001 From: nicola Date: Fri, 23 Jun 2017 15:43:46 +0100 Subject: [PATCH 215/296] Revert #1586 - Add build includes to output manager --- lib/outputmanager.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/outputmanager.js b/lib/outputmanager.js index f9ca168cc7..75388e986e 100644 --- a/lib/outputmanager.js +++ b/lib/outputmanager.js @@ -246,6 +246,11 @@ OutputPlugin.prototype.sanitizeCourseJSON = function(json, next) { } } + // Append the 'build' property to config + configJson.build = { + includes: this.generateIncludesForConfig(configJson) + }; + // Store the sanitized JSON outputJson['course'] = courseJson; outputJson['contentobject'] = contentObjectJson; From fb344de5a058ec9b62d45bdf7fa736b83711759d Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 3 Jul 2017 15:50:14 +0100 Subject: [PATCH 216/296] Fix spacing --- .../modules/editor/contentObject/views/editorMenuItemView.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index b84345b751..3f2fda9639 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -194,7 +194,7 @@ define(function(require){ this.stopListening(Origin, 'editorView:cancelRemoveItem:'+ this.model.get('_id'), this.cancelDeleteItem); this.model.set({ _isExpanded: false, _isSelected: false }); // When deleting an item - the parent needs to be selected - this.model.getParent().set({ _isSelected:true, _isExpanded: true }); + this.model.getParent().set({ _isSelected: true, _isExpanded: true }); // We also need to navigate to the parent element - but if it's the courseId let's // navigate up to the menu From 084c3620d97a26a9c2323d8931253604af9955c5 Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 3 Jul 2017 15:50:45 +0100 Subject: [PATCH 217/296] Fix for sub-menu page deletion --- .../modules/editor/contentObject/views/editorMenuItemView.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js index 3f2fda9639..cb0ea25315 100644 --- a/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js +++ b/frontend/src/modules/editor/contentObject/views/editorMenuItemView.js @@ -198,7 +198,9 @@ define(function(require){ // We also need to navigate to the parent element - but if it's the courseId let's // navigate up to the menu - var parentId = (this.model.get('_parentId') === Origin.editor.data.course.id) ? '' : '/' + this.model.get('_parentId'); + var type = this.model.get('_type'); + var isTopLevel = (type === 'page' || type === 'menu'); + var parentId = isTopLevel ? '' : '/' + this.model.get('_parentId'); Origin.router.navigateTo('editor/' + Origin.editor.data.course.id + '/menu' + parentId); if(this.model.destroy()) this.remove(); From d97d24797f2d9d7be115796787f0171bc8ee0ccc Mon Sep 17 00:00:00 2001 From: Tom Taylor Date: Mon, 3 Jul 2017 16:07:32 +0100 Subject: [PATCH 218/296] Revert "Restrict project tile height to ensure neat grid" This reverts commit 2e268bcec5a896e5e289c58314e9ba299f7930ea. --- frontend/src/modules/projects/less/projects.less | 3 +-- frontend/src/modules/projects/less/qproject.less | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/modules/projects/less/projects.less b/frontend/src/modules/projects/less/projects.less index 75e4e53f2a..d336974225 100644 --- a/frontend/src/modules/projects/less/projects.less +++ b/frontend/src/modules/projects/less/projects.less @@ -43,8 +43,7 @@ ul.projects-options { .shared-project-list-item { margin-left: 25px; min-width: 200px; - height: 341px; - overflow: hidden; + min-height: 341px; width: 22%; max-width:300px; display:inline-block; diff --git a/frontend/src/modules/projects/less/qproject.less b/frontend/src/modules/projects/less/qproject.less index c70fed9566..3ce8450b09 100644 --- a/frontend/src/modules/projects/less/qproject.less +++ b/frontend/src/modules/projects/less/qproject.less @@ -189,6 +189,7 @@ h4 { height: 36px; overflow: hidden; + overflow: hidden; text-overflow: ellipsis; display: -webkit-box; -webkit-line-clamp: 2; From 07582fa849e74a81469ce09f15fadeadb89d47fb Mon Sep 17 00:00:00 2001 From: Tom Greenfield Date: Mon, 3 Jul 2017 16:16:28 +0100 Subject: [PATCH 219/296] Upgrade Backbone Forms; move overrides out --- frontend/src/core/config.js | 10 +- .../src/libraries/backbone-forms-lists.js | 128 ++++++++-------- frontend/src/libraries/backbone-forms.js | 144 +++++++++++------- ...Overrides.js => backboneFormsOverrides.js} | 65 +++++++- frontend/src/modules/scaffold/index.js | 6 +- .../scaffold/views/scaffoldAssetView.js | 2 +- .../scaffold/views/scaffoldBooleanView.js | 2 +- .../scaffold/views/scaffoldCodeEditorView.js | 2 +- .../scaffold/views/scaffoldColorPickerView.js | 2 +- .../views/scaffoldDisplayTitleView.js | 2 +- .../views/scaffoldQuestionButtonView.js | 2 +- .../scaffold/views/scaffoldTagsView.js | 2 +- .../scaffold/views/scaffoldTextAreaView.js | 2 +- 13 files changed, 228 insertions(+), 141 deletions(-) rename frontend/src/modules/scaffold/{scaffoldOverrides.js => backboneFormsOverrides.js} (79%) diff --git a/frontend/src/core/config.js b/frontend/src/core/config.js index 7defec0347..99cf67c103 100644 --- a/frontend/src/core/config.js +++ b/frontend/src/core/config.js @@ -3,8 +3,8 @@ require.config({ paths: { ace: 'libraries/ace', backbone: 'libraries/backbone', - backboneForms: 'libraries/backbone-forms', - backboneFormsLists: 'libraries/backbone-forms-lists', + 'backbone-forms': 'libraries/backbone-forms', + 'backbone-forms-lists': 'libraries/backbone-forms-lists', colorPicker: 'libraries/colorPicker/js/colorpicker', handlebars: 'libraries/handlebars', imageReady: 'libraries/imageReady', @@ -33,11 +33,11 @@ require.config({ deps: ['underscore','jquery'], exports: 'Backbone' }, - backboneForms: { + 'backbone-forms': { deps: ['backbone'] }, - backboneFormsLists: { - deps: ['backboneForms'] + 'backbone-forms-lists': { + deps: ['backbone-forms'] }, colorPicker: { deps: ['jquery'], diff --git a/frontend/src/libraries/backbone-forms-lists.js b/frontend/src/libraries/backbone-forms-lists.js index 1002ba1772..e52e4f7a91 100644 --- a/frontend/src/libraries/backbone-forms-lists.js +++ b/frontend/src/libraries/backbone-forms-lists.js @@ -1,10 +1,10 @@ -define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Backbone) { +define(['jquery', 'underscore', 'backbone', 'backbone-forms'], function($, _, Backbone) { ;(function(Form) { /** * List editor - * + * * An array editor. Creates a list of other editor items. * * Special options: @@ -16,7 +16,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac events: { 'click [data-action="add"]': function(event) { event.preventDefault(); - this.addItem(null, true); + this.addItem(undefined, true); } }, @@ -30,7 +30,11 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac var schema = this.schema; if (!schema) throw new Error("Missing required option 'schema'"); - this.template = options.template || this.constructor.template; + this.schema = _.extend({ + addLabel: 'Add' + }, schema); + + this.template = options.template || schema.listTemplate || this.constructor.template; //Determine the editor to use this.Editor = (function() { @@ -43,9 +47,11 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac if (editors.List[type]) return editors.List[type]; //Or whichever was passed - return editors[type]; + return (_.isString(type)) ? editors[type] : type; })(); + this.ListItem = schema.itemClass || editors.List.Item; + this.items = []; }, @@ -55,14 +61,13 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac $ = Backbone.$; //Create main element - var $el = $($.trim(this.template())); - var schemaDefault = this.schema.default; + var $el = $($.trim(this.template({ + addLabel: this.schema.addLabel + }))); //Store a reference to the list (item container) this.$list = $el.is('[data-items]') ? $el : $el.find('[data-items]'); - if (!value.length && schemaDefault instanceof Array) value = schemaDefault; - //Add existing items if (value.length) { _.each(value, function(itemValue) { @@ -78,9 +83,9 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac this.setElement($el); this.$el.attr('id', this.id); this.$el.attr('name', this.key); - + if (this.hasFocus) this.trigger('blur', this); - + return this; }, @@ -94,7 +99,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac editors = Form.editors; //Create the item - var item = new editors.List.Item({ + var item = new this.ListItem({ list: this, form: this.form, schema: this.schema, @@ -102,11 +107,11 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac Editor: this.Editor, key: this.key }).render(); - + var _addItem = function() { self.items.push(item); self.$list.append(item.el); - + item.editor.on('all', function(event) { if (event === 'change') return; @@ -140,11 +145,11 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac self.trigger('blur', self); }, 0); }, self); - + if (userInitiated || value) { item.addEventTriggered = true; } - + if (userInitiated) { self.trigger('add', self, item.editor); self.trigger('change', self); @@ -161,7 +166,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac _addItem(); item.editor.focus(); } - + return item; }, @@ -172,31 +177,19 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac removeItem: function(item) { //Confirm delete var confirmMsg = this.schema.confirmDelete; - var self = this; - var confirmCallback = function(confirmed) { - if (!confirmed) return; + if (confirmMsg && !confirm(confirmMsg)) return; - var index = _.indexOf(self.items, item); + var index = _.indexOf(this.items, item); - self.items[index].remove(); - self.items.splice(index, 1); + this.items[index].remove(); + this.items.splice(index, 1); - if (item.addEventTriggered) { - self.trigger('remove', self, item.editor); - self.trigger('change', self); - } - - if (!self.items.length && !self.Editor.isAsync) self.addItem(); - }; - - if (!confirmMsg) return confirmCallback(true); + if (item.addEventTriggered) { + this.trigger('remove', this, item.editor); + this.trigger('change', this); + } - window.confirm({ - title: Origin.l10n.t('app.confirmdelete'), - text: confirmMsg, - type: "warning", - callback: confirmCallback - }); + if (!this.items.length && !this.Editor.isAsync) this.addItem(); }, getValue: function() { @@ -212,18 +205,18 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac this.value = value; this.render(); }, - + focus: function() { if (this.hasFocus) return; if (this.items[0]) this.items[0].editor.focus(); }, - + blur: function() { if (!this.hasFocus) return; var focusedItem = _.find(this.items, function(item) { return item.editor.hasFocus; }); - + if (focusedItem) focusedItem.editor.blur(); }, @@ -235,14 +228,13 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac Form.editors.Base.prototype.remove.call(this); }, - + /** * Run validation - * + * * @return {Object|Null} */ validate: function() { - if (!this.validators) return null; //Collect errors var errors = _.map(this.items, function(item) { @@ -265,11 +257,10 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac }, { //STATICS - // TODO remove this horrible code and externalise template: _.template('\ -
\ +
\
\ - \ + \
\ ', null, Form.templateSettings) @@ -313,7 +304,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac render: function() { var $ = Backbone.$; - + //Create editor this.editor = new this.Editor({ key: this.key, @@ -331,7 +322,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac //Replace the entire element so there isn't a wrapper tag this.setElement($el); - + return this; }, @@ -342,11 +333,11 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac setValue: function(value) { this.editor.setValue(value); }, - + focus: function() { this.editor.focus(); }, - + blur: function() { this.editor.blur(); }, @@ -363,6 +354,10 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac validators = this.schema.validators, getValidator = this.getValidator; + if (this.editor.nestedForm && this.editor.nestedForm.validate) { + return this.editor.nestedForm.validate(); + } + if (!validators) return null; //Run through validators until an error is found @@ -402,11 +397,10 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac }, { //STATICS - // TODO remove this horrible code and externalise template: _.template('\ -
\ +
\ \ - \ + \
\ ', null, Form.templateSettings), @@ -416,7 +410,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac /** - * Base modal object editor for use with the List editor; used by Object + * Base modal object editor for use with the List editor; used by Object * and NestedModal list types */ Form.editors.List.Modal = Form.editors.Base.extend({ @@ -435,9 +429,9 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac */ initialize: function(options) { options = options || {}; - + Form.editors.Base.prototype.initialize.call(this, options); - + //Dependencies if (!Form.editors.List.Modal.ModalAdapter) throw new Error('A ModalAdapter is required'); @@ -486,7 +480,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac * Function which returns a generic string representation of an object * * @param {Object} value - * + * * @return {String} */ itemToString: function(value) { @@ -523,7 +517,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac //If there's a specified toString use that if (schema.itemToString) return schema.itemToString(value); - + //Otherwise use the generic method or custom overridden method return this.itemToString(value); }, @@ -548,7 +542,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac this.trigger('focus', this); modal.on('cancel', this.onModalClosed, this); - + modal.on('ok', _.bind(this.onModalSubmitted, this)); }, @@ -572,7 +566,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac this.renderSummary(); if (isNew) this.trigger('readyToAdd'); - + this.trigger('change', this); this.onModalClosed(); @@ -596,16 +590,16 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac setValue: function(value) { this.value = value; }, - + focus: function() { if (this.hasFocus) return; this.openEditor(); }, - + blur: function() { if (!this.hasFocus) return; - + if (this.modal) { this.modal.trigger('cancel'); } @@ -620,7 +614,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac //Defaults to BootstrapModal (http://github.com/powmedia/backbone.bootstrap-modal) //Can be replaced with another adapter that implements the same interface. ModalAdapter: Backbone.BootstrapModal, - + //Make the wait list for the 'ready' event before adding the item to the list isAsync: true }); @@ -663,7 +657,7 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac //If there's a specified toString use that if (schema.itemToString) return schema.itemToString(value); - + //Otherwise use the model return new (schema.model)(value).toString(); } @@ -672,4 +666,4 @@ define(['jquery', 'underscore', 'backbone', 'backboneForms'], function($, _, Bac })(Backbone.Form); -}); \ No newline at end of file +}); diff --git a/frontend/src/libraries/backbone-forms.js b/frontend/src/libraries/backbone-forms.js index 1c35d0cb0a..3c3e9ea0fc 100755 --- a/frontend/src/libraries/backbone-forms.js +++ b/frontend/src/libraries/backbone-forms.js @@ -26,7 +26,7 @@ var Form = Backbone.View.extend({ /** * Constructor - * + * * @param {Object} [options.schema] * @param {Backbone.Model} [options.model] * @param {Object} [options.data] @@ -130,7 +130,7 @@ var Form = Backbone.View.extend({ } else if (this.data) { options.value = this.data[key]; } else { - options.value = null; + options.value = undefined; } var field = new this.Field(options); @@ -249,10 +249,15 @@ var Form = Backbone.View.extend({ //Set the main element this.setElement($form); - + //Set class $form.addClass(this.className); + //Set attributes + if (this.attributes) { + $form.attr(this.attributes) + } + return this; }, @@ -342,7 +347,7 @@ var Form = Backbone.View.extend({ }, options); this.model.set(this.getValue(), setOptions); - + if (modelError) return modelError; }, @@ -465,28 +470,27 @@ var Form = Backbone.View.extend({ } }, { + editors: {} - //STATICS - template: _.template('\ +}); + +//Statics to add on after Form is declared +Form.templateSettings = { + evaluate: /<%([\s\S]+?)%>/g, + interpolate: /<%=([\s\S]+?)%>/g, + escape: /<%-([\s\S]+?)%>/g +}; + +Form.template = _.template('\
\
\ <% if (submitButton) { %>\ \ <% } %>\
\ - ', null, this.templateSettings), - - templateSettings: { - evaluate: /<%([\s\S]+?)%>/g, - interpolate: /<%=([\s\S]+?)%>/g, - escape: /<%-([\s\S]+?)%>/g - }, + ', null, Form.templateSettings); - editors: {} -}); - - //================================================================================================== //VALIDATORS //================================================================================================== @@ -499,46 +503,47 @@ Form.validators = (function() { required: 'Required', regexp: 'Invalid', number: 'Must be a number', + range: _.template('Must be a number between <%= min %> and <%= max %>', null, Form.templateSettings), email: 'Invalid email address', url: 'Invalid URL', match: _.template('Must match field "<%= field %>"', null, Form.templateSettings) }; - + validators.required = function(options) { options = _.extend({ type: 'required', message: this.errMessages.required }, options); - + return function required(value) { options.value = value; - + var err = { type: options.type, message: _.isFunction(options.message) ? options.message(options) : options.message }; - - if (value === null || value === undefined || value === false || value === '') return err; + + if (value === null || value === undefined || value === false || value === '' || $.trim(value) === '' ) return err; }; }; - + validators.regexp = function(options) { if (!options.regexp) throw new Error('Missing required "regexp" option for "regexp" validator'); - + options = _.extend({ type: 'regexp', match: true, message: this.errMessages.regexp }, options); - + return function regexp(value) { options.value = value; - + var err = { type: options.type, message: _.isFunction(options.message) ? options.message(options) : options.message }; - + //Don't check empty values (add a 'required' validator for this) if (value === null || value === undefined || value === '') return; @@ -553,51 +558,80 @@ Form.validators = (function() { options = _.extend({ type: 'number', message: this.errMessages.number, - regexp: /^-?[0-9]*\.?[0-9]*?$/ + regexp: /^[-+]?([0-9]*.[0-9]+|[0-9]+)$/ }, options); - + return validators.regexp(options); }; - + + validators.range = function(options) { + options = _.extend({ + type: 'range', + message: this.errMessages.range, + numberMessage: this.errMessages.number, + min: 0, + max: 100 + }, options); + + return function range(value) { + options.value = value; + var err = { + type: options.type, + message: _.isFunction(options.message) ? options.message(options) : options.message + }; + + //Don't check empty values (add a 'required' validator for this) + if (value === null || value === undefined || value === '') return; + + // check value is a number + var numberCheck = validators.number({message: options.numberMessage})(value); + if (numberCheck) return numberCheck; + + // check value is in range + var number = parseFloat(options.value); + if (number < options.min || number > options.max) return err; + } + } + validators.email = function(options) { options = _.extend({ type: 'email', message: this.errMessages.email, - regexp: /^[\w\-]{1,}([\w\-\+.]{1,1}[\w\-]{1,}){0,}[@][\w\-]{1,}([.]([\w\-]{1,})){1,3}$/ + regexp: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i }, options); - + return validators.regexp(options); }; - + validators.url = function(options) { options = _.extend({ type: 'url', message: this.errMessages.url, - regexp: /^(http|https):\/\/(([A-Z0-9][A-Z0-9_\-]*)(\.[A-Z0-9][A-Z0-9_\-]*)+)(:(\d+))?\/?/i + regexp: /^((http|https):\/\/)?(([A-Z0-9][A-Z0-9_\-]*)(\.[A-Z0-9][A-Z0-9_\-]*)+)(:(\d+))?\/?/i }, options); - + return validators.regexp(options); }; - + validators.match = function(options) { if (!options.field) throw new Error('Missing required "field" options for "match" validator'); - + options = _.extend({ type: 'match', message: this.errMessages.match }, options); - + return function match(value, attrs) { options.value = value; - + var err = { type: options.type, message: _.isFunction(options.message) ? options.message(options) : options.message }; - + //Don't check empty values (add a 'required' validator for this) if (value === null || value === undefined || value === '') return; - + if (value !== attrs[options.field]) return err; }; }; @@ -763,7 +797,7 @@ Form.Field = Backbone.View.extend({ //Override defaults this.template = options.template || schema.template || this.template || this.constructor.template; - this.errorClassName = options.errorClassName || this.errorClassName || this.constructor.errorClassName; + this.errorClassName = options.errorClassName || schema.errorClassName || this.errorClassName || this.constructor.errorClassName; //Create editor this.editor = this.createEditor(); @@ -965,7 +999,7 @@ Form.Field = Backbone.View.extend({ this.$el.addClass(this.errorClassName); //Set error message - this.$('[data-error]').html(msg); + this.$('[data-error]').last().html(msg); }, /** @@ -1316,8 +1350,6 @@ Form.editors.Text = Form.Editor.extend({ if (schema && schema.dataType) type = schema.dataType; this.$el.attr('type', type); - // HACK to disable auto-completion - this.$el.attr('autocomplete', 'off'); }, /** @@ -1353,6 +1385,7 @@ Form.editors.Text = Form.Editor.extend({ * @param {String} */ setValue: function(value) { + this.value = value; this.$el.val(value); }, @@ -1454,8 +1487,7 @@ Form.editors.Number = Form.editors.Text.extend({ newVal = newVal + String.fromCharCode(event.charCode); } - // Allow support for negative numbers. - var numeric = /^-?[0-9]*\.?[0-9]*?$/.test(newVal); + var numeric = /^[0-9]*\.?[0-9]*?$/.test(newVal); if (numeric) { delayedDetermineChange(); @@ -1481,7 +1513,7 @@ Form.editors.Number = Form.editors.Text.extend({ })(); if (_.isNaN(value)) value = null; - + this.value = value; Form.editors.Text.prototype.setValue.call(this, value); } @@ -1560,6 +1592,7 @@ Form.editors.Checkbox = Form.editors.Base.extend({ }else{ this.$el.prop('checked', false); } + this.value = !!value; }, focus: function() { @@ -1728,6 +1761,7 @@ Form.editors.Select = Form.editors.Base.extend({ }, setValue: function(value) { + this.value = value; this.$el.val(value); }, @@ -1859,6 +1893,7 @@ Form.editors.Radio = Form.editors.Select.extend({ }, setValue: function(value) { + this.value = value; this.$('input[type=radio]').val([value]); }, @@ -1963,14 +1998,16 @@ Form.editors.Checkboxes = Form.editors.Select.extend({ getValue: function() { var values = []; + var self = this; this.$('input[type=checkbox]:checked').each(function() { - values.push($(this).val()); + values.push(self.$(this).val()); }); return values; }, setValue: function(values) { if (!_.isArray(values)) values = [values]; + this.value = values; this.$('input[type=checkbox]').val(values); }, @@ -2010,16 +2047,16 @@ Form.editors.Checkboxes = Form.editors.Select.extend({ var val = (option.val || option.val === 0) ? option.val : ''; itemHtml.append( $('').val(val) ); if (option.labelHTML){ - itemHtml.append( $('