From 0f57bbb668a1d5c42097e7c0a534595be9e6863b Mon Sep 17 00:00:00 2001
From: Myriam Delaruelle <myriam.delaruelle@univ-lorraine.fr>
Date: Mon, 9 Dec 2024 14:24:20 +0100
Subject: [PATCH] various fixes
---
amd/build/header.js | 12 ++++++------
db/install.xml | 2 +-
db/upgrade.php | 2 +-
styles.css | 4 ++++
version.php | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/amd/build/header.js b/amd/build/header.js
index 4d2fc88..9b2cf7a 100644
--- a/amd/build/header.js
+++ b/amd/build/header.js
@@ -67,19 +67,19 @@ define(['jquery', 'core/ajax', 'core/str'],
for(var i=0; i<split.length-1; i++){
fullurl+=split[i]+"/";
}
- console.log(menu);
+
urlParams = new URLSearchParams(window.location.search);
course=urlParams.get('id');
fullurl+='format/iena/suivi_unit.php?courseid='+course+'§ionid=0&groupid=0';
- $("#drawermenu .nav.navbar li:last-child button").css('margin-left', "0!important");
- $("#drawermenu .nav.navbar li:last-child button").css("margin-right","0.3rem!important");
+
$("<li class='nav-item' id='iena-global-progress'><a class='nav-link' href='"+fullurl+"'><i class='icon fa fa-tasks fa-fw' title='Suivi global'></i></a></li>").insertBefore(menu);
//menu.insertBefore("<li class='nav-item'><a class='nav-link' href='"+fullurl+"'><i class='icon fa fa-tasks fa-fw' title='Suivi global'></i></a></li>");
- $("#drawermenu .nav.navbar .nav-item .nav-link").css('padding', "0.5rem 0.45rem");
+ $("#drawermenu nav.navbar").css("padding", "0.5rem 0.5rem");
+ $("#drawermenu .nav.navbar .nav-item .nav-link").css('padding', "0.5rem 0.2rem");
$("#iena-global-progress .nav-link").css('padding-right', '0');
-
-
+ $("#drawermenu .nav.navbar li:last-child .btn").addClass("iena-custom-button");
+
}
diff --git a/db/install.xml b/db/install.xml
index 0374342..dba5414 100644
--- a/db/install.xml
+++ b/db/install.xml
@@ -7,7 +7,7 @@
<TABLE NAME="format_iena_options" COMMENT="Manage activity tracking table options">
<FIELDS>
<FIELD NAME="id" TYPE="int" LENGTH="10" NOTNULL="true" SEQUENCE="true"/>
- <FIELD NAME="optionname" TYPE="char" LENGTH="100" NOTNULL="true" SEQUENCE="false"/>
+ <FIELD NAME="optionname" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="optionvalue" TYPE="int" LENGTH="1" NOTNULL="false" SEQUENCE="false"/>
<FIELD NAME="courseid" TYPE="int" LENGTH="8" NOTNULL="true" SEQUENCE="false"/>
<FIELD NAME="userid" TYPE="int" LENGTH="8" NOTNULL="true" SEQUENCE="false"/>
diff --git a/db/upgrade.php b/db/upgrade.php
index d55c89c..7f1aebc 100644
--- a/db/upgrade.php
+++ b/db/upgrade.php
@@ -98,7 +98,7 @@ function xmldb_format_iena_upgrade($oldversion) {
// Define field id to be added to format_iena.
$table = new xmldb_table('format_iena_options');
$table->add_field('id', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null);
- $table->add_field('optionname', XMLDB_TYPE_CHAR, '10', null, XMLDB_NOTNULL, null, null, 'id');
+ $table->add_field('optionname', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, 'id');
$table->add_field('optionvalue', XMLDB_TYPE_INTEGER, '1', null, null, null, null, 'optionname');
$table->add_field('courseid', XMLDB_TYPE_INTEGER, '8', null, XMLDB_NOTNULL, null, null, 'optionvalue');
$table->add_field('userid', XMLDB_TYPE_INTEGER, '8', null, XMLDB_NOTNULL, null, null, 'courseid');
diff --git a/styles.css b/styles.css
index 1374398..3e0aaf3 100644
--- a/styles.css
+++ b/styles.css
@@ -1246,4 +1246,8 @@ border-bottom: 1px solid #dee2e6;
#details-modal .modal-dialog{
margin-top: 13vw;
width: 80vw;
+}
+
+#drawermenu .iena-custom-button{
+ margin:0!important;
}
\ No newline at end of file
diff --git a/version.php b/version.php
index 09ca18f..4469c20 100644
--- a/version.php
+++ b/version.php
@@ -27,7 +27,7 @@
defined('MOODLE_INTERNAL') || die();
-$plugin->version = 2024101500;
+$plugin->version = 2024101505;
$plugin->requires = 2014111000;
$plugin->component = 'format_iena';
$plugin->release = "1.0";
--
GitLab