diff --git a/controller/Lists.php b/controller/Lists.php index f199f937..f5e35ee2 100755 --- a/controller/Lists.php +++ b/controller/Lists.php @@ -24,6 +24,7 @@ namespace oat\taoBackOffice\controller; use Exception; +use oat\tao\helpers\Template; use \tao_helpers_Scriptloader; use \tao_models_classes_ListService; use \tao_actions_form_List; @@ -51,7 +52,7 @@ public function __construct(){ parent::__construct(); //add List stylesheet - tao_helpers_Scriptloader::addCssFile(TAOBASE_WWW . 'css/lists.css'); + tao_helpers_Scriptloader::addCssFile(Template::css('lists.css', 'tao')); $this->service = tao_models_classes_ListService::singleton(); $this->defaultData(); diff --git a/manifest.php b/manifest.php index dd6a9ae0..410fe889 100755 --- a/manifest.php +++ b/manifest.php @@ -1,33 +1,33 @@ 'taoBackOffice', 'label' => 'Back Office', 'description' => 'Base for back-office extensions', 'license' => 'GPL-2.0', - 'version' => '0.12.0', + 'version' => '1.0.1', 'author' => 'Open Assessment Technologies SA', 'requires' => array( - 'tao' => '>=2.8.0' + 'tao' => '>=9.0.0' ), 'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoBackOfficeManager', 'acl' => array( @@ -47,18 +47,15 @@ 'routes' => array( '/taoBackOffice' => 'oat\\taoBackOffice\\controller' ), - 'update' => 'oat\taoBackOffice\model\update\Updater', + 'update' => 'oat\taoBackOffice\scripts\update\Updater', 'constants' => array( # views directory "DIR_VIEWS" => dirname(__FILE__).DIRECTORY_SEPARATOR."views".DIRECTORY_SEPARATOR, - + #BASE URL (usually the domain root) 'BASE_URL' => ROOT_URL.'taoBackOffice/', - - #BASE WWW required by JS - 'BASE_WWW' => ROOT_URL.'taoBackOffice/views/' ), 'extra' => array( 'structures' => dirname(__FILE__).DIRECTORY_SEPARATOR.'controller'.DIRECTORY_SEPARATOR.'structures.xml', ) -); \ No newline at end of file +); diff --git a/model/update/Updater.php b/scripts/update/Updater.php similarity index 93% rename from model/update/Updater.php rename to scripts/update/Updater.php index 20311a9e..7058ca5f 100755 --- a/model/update/Updater.php +++ b/scripts/update/Updater.php @@ -18,7 +18,7 @@ * * */ -namespace oat\taoBackOffice\model\update; +namespace oat\taoBackOffice\scripts\update; use oat\tao\scripts\update\OntologyUpdater; use oat\taoBackOffice\model\entryPoint\BackOfficeEntryPoint; @@ -30,9 +30,9 @@ class Updater extends \common_ext_ExtensionUpdater { public function update($initialVersion) { - + $currentVersion = $initialVersion; - + // ontology if ($currentVersion == '0.8') { OntologyUpdater::syncModels(); @@ -43,7 +43,7 @@ public function update($initialVersion) { } if ($currentVersion == '0.10') { $entryPointService = $this->getServiceManager()->get(EntryPointService::SERVICE_ID); - + // replace old backoffice $newEntryPoint = new BackOfficeEntryPoint(); foreach ($entryPointService->getEntryPoints() as $entryPoint) { @@ -51,13 +51,13 @@ public function update($initialVersion) { $entryPointService->overrideEntryPoint($entryPoint->getId(), $newEntryPoint); } } - + $this->getServiceManager()->register(EntryPointService::SERVICE_ID, $entryPointService); - + $currentVersion = '0.11'; } - + $this->setVersion($currentVersion); - $this->skip($currentVersion, '0.12.0'); + $this->skip($currentVersion, '1.0.1'); } -} \ No newline at end of file +} diff --git a/views/build/grunt/bundle.js b/views/build/grunt/bundle.js index 706beaa7..ec4b039f 100644 --- a/views/build/grunt/bundle.js +++ b/views/build/grunt/bundle.js @@ -29,7 +29,7 @@ module.exports = function(grunt) { modules : [{ name: 'taoBackOffice/controller/routes', include : ext.getExtensionsControllers(['taoBackOffice']), - exclude : ['mathJax', 'taoBackOffice/lib/vis/vis.min'].concat(libs) + exclude : ['mathJax', 'taoBackOffice/lib/vis/vis'].concat(libs) }] } }; diff --git a/views/js/controllers.min.js b/views/js/controllers.min.js index ade95de0..cefce90a 100644 --- a/views/js/controllers.min.js +++ b/views/js/controllers.min.js @@ -1,10 +1,10 @@ -define("taoBackOffice/controller/routes",[],function(){"use strict";return{Lists:{actions:{index:"controller/list/index"}},Trees:{actions:{viewTree:"controller/tree/view"}}}}),define("css!taoBackOfficeCss/list",[],function(){}),define("taoBackOffice/controller/list/index",["jquery","i18n","helpers","ui/feedback","layout/section","css!taoBackOfficeCss/list"],function($,__,helpers,feedback,section){"use strict";function _addSquareBtn(title,icon,$listToolBar){var $btn=$("