diff --git a/htdocs/admin/site/licenses.php b/htdocs/admin/site/licenses.php index b3b5d182ca4bb11976e2f836aaa7c7ae57b75ab0..57ca4b5b67e0a341791c2056762101ac1d229f5c 100644 --- a/htdocs/admin/site/licenses.php +++ b/htdocs/admin/site/licenses.php @@ -40,7 +40,7 @@ $extralicenses = get_column_sql(" "); $smarty = smarty(); -setpageicon($smarty, 'icon-legal'); +setpageicon($smarty, 'icon-gavel'); $smarty->assign('licenses', $licenses); $smarty->assign('extralicenses', $extralicenses); diff --git a/htdocs/artefact/file/js/filebrowser.js b/htdocs/artefact/file/js/filebrowser.js index 222c6e8311c7dee90673e320d5b360241c2100ab..afad4e52ece7b47cf908494c79892010685ee474 100644 --- a/htdocs/artefact/file/js/filebrowser.js +++ b/htdocs/artefact/file/js/filebrowser.js @@ -626,7 +626,7 @@ var FileBrowser = (function($) { e.preventDefault(); } }); - ul.append($('
You can choose to display a row with the buttons
-
+
and
diff --git a/htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html b/htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html
index 75c9621dced2270bd9641528e739a26a90d59145..4b12d0e19d40eae597eee61bb3757791d15c7285 100644
--- a/htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html
+++ b/htdocs/lang/en.utf8/help/forms/adduser.addremovecolumns.html
@@ -3,7 +3,7 @@
You can choose to display a row with the buttons
-
+
and
diff --git a/htdocs/lang/en.utf8/help/forms/uploadcsv.addremovecolumns.html b/htdocs/lang/en.utf8/help/forms/uploadcsv.addremovecolumns.html
index 7b4490a0c47a36be98752595663e028ffd3dd13f..c8ccadc35867c007a8b491576c0fd3adc49b60d4 100644
--- a/htdocs/lang/en.utf8/help/forms/uploadcsv.addremovecolumns.html
+++ b/htdocs/lang/en.utf8/help/forms/uploadcsv.addremovecolumns.html
@@ -3,7 +3,7 @@
The users can choose to display a row with the buttons
-
+
and
diff --git a/htdocs/lib/pieforms/pieform/elements/calendar.php b/htdocs/lib/pieforms/pieform/elements/calendar.php
index 7f5dc75066266999a0ff1f56e7a330303b637efe..79e84dd60b3a1d85ef7eebd07e65ab5a3b61229c 100644
--- a/htdocs/lib/pieforms/pieform/elements/calendar.php
+++ b/htdocs/lib/pieforms/pieform/elements/calendar.php
@@ -93,7 +93,7 @@ function pieform_element_calendar(Pieform $form, $element) {
tooltips: ' . $tooltips . ',
icons: {
time: "icon icon-regular icon-clock",
- date: "icon icon-calendar",
+ date: "icon icon-regular icon-calendar-alt",
up: "icon icon-arrow-up",
down: "icon icon-arrow-down",
previous: "icon icon-chevron-left",
diff --git a/htdocs/module/framework/lib.php b/htdocs/module/framework/lib.php
index cfc8df2cac5ac2715bdfc14b4e8565400f20cb1c..c8ee611dd0739f6aa3e4305ca019a1047406a5f8 100644
--- a/htdocs/module/framework/lib.php
+++ b/htdocs/module/framework/lib.php
@@ -575,7 +575,7 @@ class Framework {
$states = array(
'begun' => array(
'state' => (int) $state === self::EVIDENCE_BEGUN ? 1 : 0,
- 'classes' => 'icon icon-circle-o begun',
+ 'classes' => 'icon icon-regular icon-circle begun',
),
'incomplete' => array(
'state' => (int) $state === self::EVIDENCE_INCOMPLETE ? 1 : 0,
diff --git a/htdocs/module/framework/matrixpoint.json.php b/htdocs/module/framework/matrixpoint.json.php
index b76e2ce9dee3f7deaab1ac5f7a96f982123da4b8..44482009071c000936ee12d15457c274e2d6b47f 100644
--- a/htdocs/module/framework/matrixpoint.json.php
+++ b/htdocs/module/framework/matrixpoint.json.php
@@ -76,7 +76,7 @@ if ($action == 'update') {
$message = get_string('matrixpointinserted', 'module.framework');
}
- $class = 'icon icon-circle-o begun';
+ $class = 'icon icon-regular icon-circle begun';
$choices = Framework::get_evidence_statuses($framework);
$data = (object) array('id' => $id,
'class' => $class,
diff --git a/htdocs/theme/primaryschool/templates/homeinfo.tpl b/htdocs/theme/primaryschool/templates/homeinfo.tpl
index 118e2c9881a696ac96a024354cb304fed5bc5a0a..a10439b64966ebc35f7544e724aaee9f424078ce 100755
--- a/htdocs/theme/primaryschool/templates/homeinfo.tpl
+++ b/htdocs/theme/primaryschool/templates/homeinfo.tpl
@@ -87,7 +87,7 @@
{if $USER->is_logged_in()}
diff --git a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
index dd5ac29a7fe5931b4324c13c1602435fee1918b9..7a99d89f6c1fdf1060045fb7842fd521f1bfbd9c 100644
--- a/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
+++ b/htdocs/theme/raw/plugintype/artefact/blog/blocktype/taggedposts/templates/taggedposts.tpl
@@ -45,7 +45,7 @@
Show controls to add and remove columns when editing a page
Show controls to add and remove columns when editing a page