Merge pull request #2323 from adaptlearning/release/theme-editing

Release/theme editing

Author: tomgreenfield

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to the Adapt authoring tool are documented in this file.
 **IMPORTANT**: For information on how to **correctly and safely** update your installation, please consult **INSTALL.md**.<br/>
 _Note that we adhere to the [semantic versioning](http://semver.org/) scheme for release numbering._
 
+## [0.8.0] - 2019-05-03
+
+Adds a UI to allow the editing of a supported theme.
+
+### Fixed
+- Custom LESS doesn't work in authoring tools which are running framework version 4 ([#2240](https://github.com/adaptlearning/adapt_authoring/issues/2240))
+
+### Added
+- Add UI for theme editing ([#2187](https://github.com/adaptlearning/adapt_authoring/issues/2187))
+
 ## [0.7.1] - 2019-04-09
 
 Bugfix release.
@@ -575,6 +585,7 @@ Initial release.
 - Loading screen of death
 - Session cookie security issues
 
+[0.8.0]: https://github.com/adaptlearning/adapt_authoring/compare/v0.7.1...v0.8.0
 [0.7.1]: https://github.com/adaptlearning/adapt_authoring/compare/v0.7.0...v0.7.1
 [0.7.0]: https://github.com/adaptlearning/adapt_authoring/compare/v0.6.5...v0.7.0
 [0.6.5]: https://github.com/adaptlearning/adapt_authoring/compare/v0.6.4...v0.6.5

frontend/src/core/helpers.js

@@ -116,6 +116,12 @@ define(function(require){
       return new Handlebars.SafeString(html);
     },
 
+    escapeText: function(text) {
+      var div = document.createElement('div');
+      div.appendChild(document.createTextNode(text));
+      return div.innerHTML;
+    },
+
     bytesToSize: function(bytes) {
       if (bytes === 0) return '0 B';
 

frontend/src/modules/editor/index.js

@@ -11,7 +11,7 @@ define([
   './course/index',
   './extensions/index',
   './menuSettings/index',
-  './selectTheme/index'
+  './themeEditor/index'
 ], function(require, Origin, EditorData) {
   // loads editor data
   Origin.on('origin:dataReady login:changed', EditorData.loadGlobalData);

frontend/src/modules/editor/selectTheme/assets/theme_bg.png

@@ -1,31 +0,0 @@
-// 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 EditorThemeCollectionView = require('./views/editorThemeCollectionView');
-  var EditorThemeCollectionSidebarView = require('./views/editorThemeCollectionSidebarView');
-  var Helpers = require('../global/helpers');
-
-  Origin.on('editor:selecttheme', function(data) {
-    var route1 = Origin.location.route1;
-    (new ConfigModel({ _courseId: route1 })).fetch({
-      success: function(model) {
-        Helpers.setPageTitle(model);
-
-        var backButtonRoute = "/#/editor/" + route1 + "/menu";
-        var backButtonText = Origin.l10n.t('app.backtomenu');
-        if (Origin.previousLocation.route2 === "page") {
-          backButtonRoute = "/#/editor/" + route1 + "/page/" + Origin.previousLocation.route3;
-          backButtonText = Origin.l10n.t('app.backtopage');
-        }
-        Origin.sidebar.addView(new EditorThemeCollectionSidebarView().$el, {
-          "backButtonText": backButtonText,
-          "backButtonRoute": backButtonRoute
-        });
-        Origin.contentPane.setView(EditorThemeCollectionView, { model: model });
-      }
-    });
-  });
-});