v1.5.01

GibbonEdu · Mar 23, 2022 · 9678cf5 · 9678cf5
1 parent 6b66b09
commit 9678cf5
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 32 deletions.
diff --git a/Higher Education/CHANGEDB.php b/Higher Education/CHANGEDB.php
@@ -177,3 +177,8 @@
 ++$count;
 $sql[$count][0] = '1.5.00';
 $sql[$count][1] = "";
+
+//v1.5.01
+++$count;
+$sql[$count][0] = '1.5.01';
+$sql[$count][1] = "";
diff --git a/Higher Education/CHANGELOG.txt b/Higher Education/CHANGELOG.txt
@@ -1,5 +1,9 @@
 CHANGELOG
 =========
+v1.5.01
+-------
+Refactoring of linkTop divs 
+
 v1.5.00
 -------
 Implemented new v23 year selector

diff --git a/Higher Education/applications_track.php b/Higher Education/applications_track.php
@@ -130,9 +130,9 @@
                 echo '</div>';
             }
 
-            echo "<div class='linkTop'>";
-            echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/applications_track_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-            echo '</div>';
+            echo "<p class='text-right mb-2 text-xs'>";
+            echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/applications_track_add.php'>".__("Add")."<img style='margin-left: 5px' title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+            echo '</p>';
 
             if ($resultApps->rowCount() < 1) {
                 echo "<div class='warning'>";

diff --git a/Higher Education/applications_view.php b/Higher Education/applications_view.php
@@ -53,7 +53,7 @@
         if ($result->rowCount() < 1) {
             $page->addError(__('There are no students to display.'));
         } else {
-            echo "<div class='linkTop'>";
+            echo "<p class='text-right mb-2 text-xs'>";
             echo 'Filter Form Group: ';
 
             ?>
@@ -102,7 +102,7 @@
                     ?>
                 </select>
                 <?php
-                echo '</div>';
+                echo '</p>';
 
                 echo "<table cellspacing='0' style='width: 100%'>";
                 echo "<tr class='head'>";

diff --git a/Higher Education/institutions_manage.php b/Higher Education/institutions_manage.php
@@ -49,9 +49,9 @@
             $page->addError(__('Error: {error}. Students cannot be displayed.', ['error' => $e->getMessage()]));
         }
 
-        echo "<div class='linkTop'>";
-        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/institutions_manage_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-        echo '</div>';
+        echo "<p class='text-right mb-2 text-xs'>";
+        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/institutions_manage_add.php'>".__("Add")."<img style='margin-left: 5px' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+        echo '</p>';
 
         if ($result->rowCount() < 1) {
             $page->addError(__('There are no students to display.'));

diff --git a/Higher Education/majors_manage.php b/Higher Education/majors_manage.php
@@ -49,9 +49,9 @@
             $page->addError(__('Error: {error}. Students cannot be displayed.', ['error' => $e->getMessage()]));;
         }
 
-        echo "<div class='linkTop'>";
-        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/majors_manage_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-        echo '</div>';
+        echo "<p class='text-right mb-2 text-xs'>";
+        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/majors_manage_add.php'>".__("Add")."<img style='margin-left: 5px' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+        echo '</p>';
 
         if ($result->rowCount() < 1) {
             $page->addError(__('There are no students to display.'));

diff --git a/Higher Education/manifest.php b/Higher Education/manifest.php
@@ -25,7 +25,7 @@
 $entryURL = 'index.php';
 $type = 'Additional';
 $category = 'Other';
-$version = '1.5.00';
+$version = '1.5.01';
 $author = 'Ross Parker';
 $url = 'http://rossparker.org';
 

diff --git a/Higher Education/references_manage.php b/Higher Education/references_manage.php
@@ -120,9 +120,9 @@
                 } catch (PDOException $e) {
                 }
 
-                echo "<div class='linkTop'>";
-                echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/references_manage_addMulti.php&gibbonSchoolYearID=$gibbonSchoolYearID&search=$search'>".__('Add Multiple Records')."<img title='".__('Add Multiple Records')."' src='./themes/".$session->get('gibbonThemeName')."/img/page_new_multi.png'/></a>";
-                echo '</div>';
+                echo "<p class='text-right mb-2 text-xs'>";
+                echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/references_manage_addMulti.php&gibbonSchoolYearID=$gibbonSchoolYearID&search=$search'>".__('Add Multiple Records')."<img style='margin-left: 5px' title='".__('Add Multiple Records')."' src='./themes/".$session->get('gibbonThemeName')."/img/page_new_multi.png'/></a>";
+                echo '</p>';
 
                 if ($result->rowCount() < 1) {
                     echo "<div class='warning'>";

diff --git a/Higher Education/references_manage_edit.php b/Higher Education/references_manage_edit.php
@@ -64,9 +64,9 @@
                 //Let's go!
                 $values = $result->fetch();
 
-                echo "<div class='linkTop'>";
-                echo "<a target='_blank' href='".$session->get('absoluteURL').'/report.php?q=/modules/'.$session->get('module')."/references_manage_edit_print.php&higherEducationReferenceID=$higherEducationReferenceID'><img title='Print' src='./themes/".$session->get('gibbonThemeName')."/img/print.png'/></a>";
-                echo '</div>';
+                echo "<p class='text-right mb-2 text-xs'>";
+                echo "<a target='_blank' href='".$session->get('absoluteURL').'/report.php?q=/modules/'.$session->get('module')."/references_manage_edit_print.php&higherEducationReferenceID=$higherEducationReferenceID'>".__("Print")."<img style='margin-left: 5px' title='Print' src='./themes/".$session->get('gibbonThemeName')."/img/print.png'/></a>";
+                echo '</p>';
 
                 $form = Form::create('referencesManage', $session->get('absoluteURL').'/modules/'.$session->get('module')."/references_manage_editProcess.php?higherEducationReferenceID=$higherEducationReferenceID&gibbonSchoolYearID=$gibbonSchoolYearID");
 

diff --git a/Higher Education/references_manage_edit_print.php b/Higher Education/references_manage_edit_print.php
@@ -57,9 +57,9 @@
                 //Let's go!
                 $row = $result->fetch();
 
-                echo "<div class='linkTop'>";
-                echo "<a href='javascript:window.print()'><img title='Print' src='./themes/".$session->get('gibbonThemeName')."/img/print.png'/></a>";
-                echo '</div>'; ?>
+                echo "<p class='text-right mb-2 text-xs'>";
+                echo "<a href='javascript:window.print()'>".__("Print")."<img style='margin-left: 5px' title='Print' src='./themes/".$session->get('gibbonThemeName')."/img/print.png'/></a>";
+                echo '</p>'; ?>
                 <table class='smallIntBorder' cellspacing='0' style="width: 100%">
                     <tr>
                         <td>

diff --git a/Higher Education/references_request.php b/Higher Education/references_request.php
@@ -29,7 +29,7 @@
 
     //Proceed!
     $page->breadcrumbs->add(__('Request References'));
-    
+
     if (studentEnrolment($session->get('gibbonPersonID'), $connection2) == false) {
         $page->addError(__('You have not been enrolled for higher education applications.'));
     } else {
@@ -48,9 +48,9 @@
             echo '</div>';
         }
 
-        echo "<div class='linkTop'>";
-        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/references_request_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-        echo '</div>';
+        echo "<p class='text-right mb-2 text-xs'>";
+        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/references_request_add.php'>".__("Add")."<img style='margin-left: 5px' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+        echo '</p>';
 
         if ($result->rowCount() < 1) {
             echo "<div class='warning'>";

diff --git a/Higher Education/staff_manage.php b/Higher Education/staff_manage.php
@@ -48,9 +48,9 @@
         $page->addError($e->getMessage());
     }
 
-    echo "<div class='linkTop'>";
-    echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/staff_manage_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-    echo '</div>';
+    echo "<p class='text-right mb-2 text-xs'>";
+    echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/staff_manage_add.php'>".__("Add")." <img style='margin-left: 5px' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+    echo '</p>';
 
     if ($result->rowCount() < 1) {
         echo "<div class='warning'>";

diff --git a/Higher Education/student_manage.php b/Higher Education/student_manage.php
@@ -51,9 +51,9 @@
             $page->addError(__('Error: {error}. Students cannot be displayed.', ['error' => $e->getMessage()]));
         }
 
-        echo "<div class='linkTop'>";
-        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/student_manage_add.php'><img title='New' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
-        echo '</div>';
+        echo "<p class='text-right mb-2 text-xs'>";
+        echo "<a href='".$session->get('absoluteURL').'/index.php?q=/modules/'.$session->get('module')."/student_manage_add.php'>".__("Add")."<img style='margin-left: 5px' src='./themes/".$session->get('gibbonThemeName')."/img/page_new.png'/></a>";
+        echo '</p>';
 
         if ($result->rowCount() < 1) {
             echo "<div class='warning'>";

diff --git a/Higher Education/version.php b/Higher Education/version.php
@@ -20,5 +20,5 @@
 /**
  * Sets version information.
  */
-$moduleVersion = '1.5.00';
+$moduleVersion = '1.5.01';
 $coreVersion = '23.0.00';