';
+ $output .= Format::tooltip(icon('solid', 'chat-bubble-text', 'size-4'), htmlPrep($log['comment']));
}
return $output;
});
diff --git a/modules/Attendance/attendance_take_byPerson.php b/modules/Attendance/attendance_take_byPerson.php
index 96b05b8a72..7a2f397f92 100644
--- a/modules/Attendance/attendance_take_byPerson.php
+++ b/modules/Attendance/attendance_take_byPerson.php
@@ -134,12 +134,12 @@
});
$table->addColumn('direction', __('Attendance'))
- ->format(function ($log) use ($session) {
+ ->format(function ($log) {
if (empty($log['direction'])) return Format::small(__('Not Taken'));
$output = ''.__($log['direction']).' ('.__($log['type']). (!empty($log['reason'])? ', '.__($log['reason']) : '') .')';
if (!empty($log['comment'])) {
- $output .= ' .'/img/messageWall.png "'.$log['comment'].'"){kind=small}
';
+ $output .= Format::tooltip(icon('solid', 'chat-bubble-text', 'size-4'), htmlPrep($log['comment']));
}
return $output;
diff --git a/modules/Data Updater/data_family_manage_edit.php b/modules/Data Updater/data_family_manage_edit.php
index 6a22e56859..eebf9ef9b3 100644
--- a/modules/Data Updater/data_family_manage_edit.php
+++ b/modules/Data Updater/data_family_manage_edit.php
@@ -85,7 +85,7 @@
$form->addHiddenValue('address', $session->get('address'));
$form->addHiddenValue('gibbonFamilyID', $oldValues['gibbonFamilyID']);
- $row = $form->addRow()->setClass('head heading');
+ $row = $form->addRow()->setClass('head bg-gray-200');
$row->addContent(__('Field'));
$row->addContent(__('Current Value'));
$row->addContent(__('New Value'));
diff --git a/modules/Data Updater/data_finance_manage_edit.php b/modules/Data Updater/data_finance_manage_edit.php
index 036db94ef1..8889ce0a96 100644
--- a/modules/Data Updater/data_finance_manage_edit.php
+++ b/modules/Data Updater/data_finance_manage_edit.php
@@ -92,7 +92,7 @@
$form->addHiddenValue('address', $session->get('address'));
$form->addHiddenValue('gibbonFinanceInvoiceeID', $oldValues['gibbonFinanceInvoiceeID']);
- $row = $form->addRow()->setClass('head heading');
+ $row = $form->addRow()->setClass('head bg-gray-200');
$row->addContent(__('Field'));
$row->addContent(__('Current Value'));
$row->addContent(__('New Value'));
diff --git a/modules/Data Updater/data_medical_manage_edit.php b/modules/Data Updater/data_medical_manage_edit.php
index 02eb6747ab..53b883a87a 100644
--- a/modules/Data Updater/data_medical_manage_edit.php
+++ b/modules/Data Updater/data_medical_manage_edit.php
@@ -111,7 +111,7 @@
$form->addHiddenValue('gibbonPersonID', $newValues['gibbonPersonID']);
$form->addHiddenValue('formExists', !empty($oldValues['gibbonPersonMedicalID']));
- $row = $form->addRow()->setClass('head heading');
+ $row = $form->addRow()->setClass('head bg-gray-200');
$row->addContent(__('Field'));
$row->addContent(__('Current Value'));
$row->addContent(__('New Value'));
diff --git a/modules/Data Updater/data_personal_manage_edit.php b/modules/Data Updater/data_personal_manage_edit.php
index 7169ec24f0..4d97f9eecd 100644
--- a/modules/Data Updater/data_personal_manage_edit.php
+++ b/modules/Data Updater/data_personal_manage_edit.php
@@ -165,7 +165,7 @@
$form->addHiddenValue('address', $session->get('address'));
$form->addHiddenValue('gibbonPersonID', $oldValues['gibbonPersonID']);
- $row = $form->addRow()->setClass('head heading');
+ $row = $form->addRow()->setClass('head bg-gray-200');
$row->addContent(__('Field'));
$row->addContent(__('Current Value'));
$row->addContent(__('New Value'));
diff --git a/modules/Data Updater/data_staff_manage_edit.php b/modules/Data Updater/data_staff_manage_edit.php
index f5cd2ccca4..0fe5c1d22c 100644
--- a/modules/Data Updater/data_staff_manage_edit.php
+++ b/modules/Data Updater/data_staff_manage_edit.php
@@ -103,7 +103,7 @@
->displayLabel();
}
- $row = $form->addRow()->setClass('head heading');
+ $row = $form->addRow()->setClass('head bg-gray-200');
$row->addContent(__('Field'));
$row->addContent(__('Current Value'));
$row->addContent(__('New Value'));
diff --git a/modules/Markbook/css/module.css b/modules/Markbook/css/module.css
index b3a60044c5..fa60c41212 100644
--- a/modules/Markbook/css/module.css
+++ b/modules/Markbook/css/module.css
@@ -245,7 +245,7 @@ select[id$="effortValue"] {
.doublescroll-container tr.head th.firstColumn {
position:absolute;
width:174px;
- height: 170px;
+ height: 130px;
left:1px;
top:0;
padding: 5px 12px 5px !important;
diff --git a/modules/Messenger/groups_manage_edit.php b/modules/Messenger/groups_manage_edit.php
index ee79d6450d..6d99111e88 100644
--- a/modules/Messenger/groups_manage_edit.php
+++ b/modules/Messenger/groups_manage_edit.php
@@ -84,7 +84,7 @@
echo '';
$criteria = $groupGateway->newQueryCriteria(true)
- ->sortBy(['surname', 'preferredName'])
+ ->sortBy(['roleCategory', 'surname', 'preferredName'])
->fromPOST();
$members = $groupGateway->queryGroupMembers($criteria, $gibbonGroupID);
@@ -95,6 +95,8 @@
->sortable(['surname', 'preferredName'])
->format(Format::using('name', ['', 'preferredName', 'surname', 'Student', true]));
+ $table->addColumn('roleCategory', __('Role'))->sortable();
+
$table->addColumn('email', __('Email'))->sortable();
$table->addActionColumn()
diff --git a/modules/Planner/planner_add.php b/modules/Planner/planner_add.php
index a3518c36b1..d942390ef7 100644
--- a/modules/Planner/planner_add.php
+++ b/modules/Planner/planner_add.php
@@ -338,11 +338,11 @@
// OUTCOMES
if ($viewBy == 'date') {
- $form->addRow()->addHeading('Outcomes', __('Outcomes'))->addClass('advanced');
- $form->addRow()->addAlert(__('Outcomes cannot be set when viewing the Planner by date. Use the "Choose A Class" dropdown in the sidebar to switch to a class. Make sure to save your changes first.'), 'warning')->addClass('advanced');
+ $form->addRow()->addClass('advanced')->addHeading('Outcomes', __('Outcomes'));
+ $form->addRow()->addClass('advanced')->addAlert(__('Outcomes cannot be set when viewing the Planner by date. Use the "Choose A Class" dropdown in the sidebar to switch to a class. Make sure to save your changes first.'), 'warning');
} else {
- $form->addRow()->addHeading('Outcomes', __('Outcomes'))->addClass('advanced');
- $form->addRow()->addContent(__('Link this lesson to outcomes (defined in the Manage Outcomes section of the Planner), and track which outcomes are being met in which lessons.'))->addClass('advanced');
+ $form->addRow()->addClass('advanced')->addHeading('Outcomes', __('Outcomes'));
+ $form->addRow()->addClass('advanced')->addContent(__('Link this lesson to outcomes (defined in the Manage Outcomes section of the Planner), and track which outcomes are being met in which lessons.'));
$allowOutcomeEditing = $settingGateway->getSettingByScope('Planner', 'allowOutcomeEditing');
@@ -351,7 +351,7 @@
}
//Access
- $form->addRow()->addHeading('Access', __('Access'))->addClass('advanced');
+ $form->addRow()->addClass('advanced')->addHeading('Access', __('Access'));
$sharingDefaultStudents = $settingGateway->getSettingByScope('Planner', 'sharingDefaultStudents');
$row = $form->addRow()->addClass('advanced');
@@ -364,7 +364,7 @@
$row->addYesNo('viewableParents')->required()->selected($sharingDefaultParents);
//Guests
- $form->addRow()->addHeading('Guests', __('Guests'))->addClass('advanced');
+ $form->addRow()->addClass('advanced')->addHeading('Guests', __('Guests'));
$row = $form->addRow()->addClass('advanced');
$row->addLabel('guests', __('Guest List'));
diff --git a/modules/System Admin/formBuilder_edit.php b/modules/System Admin/formBuilder_edit.php
index 95b77fbf3d..804d4cb765 100644
--- a/modules/System Admin/formBuilder_edit.php
+++ b/modules/System Admin/formBuilder_edit.php
@@ -213,10 +213,10 @@
});
if (!$form->hasHeading($view->getHeading())) {
- $form->addRow()->addHeading($view->getHeading(), __($view->getHeading()))->addClass('bg-gray-400');
+ $form->addRow()->addClass('bg-gray-150')->addHeading($view->getHeading(), __($view->getHeading()));
}
- $row = $form->addRow()->addClass('bg-gray-300');
+ $row = $form->addRow()->addClass('bg-gray-150');
$row->addLabel($processName, $view->getName())->description($view->getDescription());
$col = $row->addColumn()->addClass('justify-start w-full sm:max-w-lg');
$col->addContent(__('Required fields: '))->addClass('w-48');
diff --git a/modules/System Admin/js/module.js b/modules/System Admin/js/module.js
index eb4835fa42..b5a62c2e38 100644
--- a/modules/System Admin/js/module.js
+++ b/modules/System Admin/js/module.js
@@ -49,7 +49,7 @@ $(function(){
$("select.columnOrder").on('change', function(){
var currentSelection = $(this).val();
- var textBox = $(this).parent().parent().parent().find('input.columnText');
+ var textBox = $(this).parent().parent().find('input.columnText');
textBox.prop("readonly", currentSelection != columnDataCustom );
textBox.prop("disabled", currentSelection != columnDataCustom );
diff --git a/modules/Timetable/spaceChange_manage_add.php b/modules/Timetable/spaceChange_manage_add.php
index e3581d8b5c..dd782deff2 100644
--- a/modules/Timetable/spaceChange_manage_add.php
+++ b/modules/Timetable/spaceChange_manage_add.php
@@ -164,8 +164,8 @@
$row = $form->addRow();
$row->addLabel('gibbonSpaceID', __('Facility'));
$col = $row->addColumn()->addClass('flex-col');
- $col->addSelectSpace('gibbonSpaceID')->addClass('flex-1');
- $col->addContent('${tooltipText}
+${tooltipText}
${a}
\n${a}
\n|
{{ element.getOutput|raw }}
diff --git a/resources/templates/navigation.twig.html b/resources/templates/navigation.twig.html
index 08ec1249f6..2aadb33832 100644
--- a/resources/templates/navigation.twig.html
+++ b/resources/templates/navigation.twig.html
@@ -14,7 +14,7 @@
{% set sidebarClass = 'shadow bg-white rounded px-6 mb-6' %}
-{% if sidebar or menuModule %}
+{% if sidebar or menuModule is not empty %}
{% if menuModule %}
diff --git a/resources/templates/ui/tabs.twig.html b/resources/templates/ui/tabs.twig.html
index 8359cd2d8b..cd13be4e30 100644
--- a/resources/templates/ui/tabs.twig.html
+++ b/resources/templates/ui/tabs.twig.html
@@ -26,7 +26,7 @@
{% for tabID, tab in tabs %}
- |