Merge pull request #83 from oat-sa/develop

Develop
oat-sa · Jun 20, 2016 · df9ac50 · df9ac50
2 parents 437e06b + 772f79a
commit df9ac50
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/manifest.php b/manifest.php
@@ -21,15 +21,18 @@
 
 return array(
     'name' => 'taoClientDiagnostic',
-	'label' => 'Browser and OS diagnostic tool',
-	'description' => 'Check compatibility of the os and browser of a client',
+    'label' => 'Browser and OS diagnostic tool',
+    'description' => 'Check compatibility of the os and browser of a client',
     'license' => 'GPL-2.0',
-    'version' => '1.7.3',
-	'author' => 'Open Assessment Technologies SA',
-	'requires' => array('tao' => '>=2.7.8', 'taoQtiItem' => '>=2.9'),
-	// for compatibility
-	'dependencies' => array('tao'),
-	'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoClientDiagnosticManager',
+    'version' => '1.8.0',
+    'author' => 'Open Assessment Technologies SA',
+    'requires' => array(
+        'tao' => '>=4.0.0',
+        'taoQtiItem' => '>=2.9'
+    ),
+    // for compatibility
+    'dependencies' => array('tao'),
+    'managementRole' => 'http://www.tao.lu/Ontologies/generis.rdf#taoClientDiagnosticManager',
     'acl' => array(
         array('grant', 'http://www.tao.lu/Ontologies/generis.rdf#taoClientDiagnosticManager', array('ext'=>'taoClientDiagnostic')),
         array('grant', 'http://www.tao.lu/Ontologies/generis.rdf#AnonymousRole', array('ext'=>'taoClientDiagnostic','mod' => 'CompatibilityChecker')),

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -282,6 +282,6 @@ public function update($initialVersion)
             $this->setVersion('1.7.1');
         }
 
-        $this->skip('1.7.1', '1.7.3');
+        $this->skip('1.7.1', '1.8.0');
     }
 }
diff --git a/views/templates/index.tpl b/views/templates/index.tpl
@@ -7,12 +7,11 @@ use oat\tao\model\theme\Theme;
 <!doctype html>
 <html class="no-js no-version-warning">
 <head>
-    <script src="<?= Template::js('lib/modernizr-2.8/modernizr.js', 'tao') ?>"></script>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title><?= Layout::getTitle() ?></title>
-    <link rel="shortcut icon" href="<?= Template::img('img/favicon.ico') ?>"/>
+    <link rel="shortcut icon" href="<?= Template::img('img/favicon.ico', 'tao') ?>"/>
 
     <script id="amd-loader"
         <?php if (\tao_helpers_Mode::is('production')): ?>
@@ -35,13 +34,11 @@ use oat\tao\model\theme\Theme;
 </head>
 
 <body>
-<div id="requirement-check" class="feedback-error js-hide">
-    <span class="icon-error"></span>
-    <span id="requirement-msg-area"><?=
-        __('You must activate JavaScript in your browser to run this application.') ?></span>
+
+<div id="js-check" class="feedback-error check-msg">
+    <span class="icon-error"></span><?=__('You must activate JavaScript in your browser to run this application.')?>
 </div>
 <script src="<?= Template::js('layout/requirement-check.js', 'tao')?>"></script>
-
 <div class="content-wrap">
 
     <?php Template::inc('blocks/header.tpl', 'tao'); ?>