Merge pull request #32 from oat-sa/release-1.0.1

Release 1.0.1

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();

manifest.php

@@ -1,33 +1,33 @@
 <?php
-/**  
+/**
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; under version 2
  * of the License (non-upgradable).
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- * 
+ *
  * Copyright (c) 2015 (original work) Open Assessment Technologies SA;
- *               
- * 
- */               
+ *
+ *
+ */
 
 return array(
     'name' => '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',
     )
-);
+);

model/update/Updater.php → 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,21 +43,21 @@ 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) {
                 if ($entryPoint instanceof OldEntryPoint) {
                     $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');
     }
-}
+}

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)
             }]
         }
     };

views/js/treeRender.js

@@ -1,8 +1,8 @@
 define([
     'jquery',
     'lodash',
-    'taoBackOffice/lib/vis/vis.min',
-    'css!taoBackOffice/lib/vis/vis.min'
+    'taoBackOffice/lib/vis/vis',
+    'css!taoBackOffice/lib/vis/vis'
 ], function ($, _, vis) {
     'use strict';
 
@@ -121,4 +121,4 @@ define([
     };
 
     return treeRender;
-});
+});