Benjamin Harris преди 2 месеца
родител
ревизия
0d7942a80e

+ 1 - 1
components/clientDetailsForm.php

@@ -43,7 +43,7 @@ try {
                 <?= htmlspecialchars($client['id'] . " - " . $client['client'] . " - " . $client['company'], ENT_QUOTES, 'UTF-8') ?>
             </option>
         <?php endforeach; ?>
-        <option value="new" class="text-primary font-weight-bold">➕ Add New Client...</option>
+        <option value="new" class="text-primary fw-bold">➕ Add New Client...</option>
     </select>
     <div class="form-text">Choose an existing client to auto-fill the form below.</div>
 </div>

+ 1 - 1
dashboard/crop-analysis/soil-test-data/soil-analysis-pdf.php

@@ -61,7 +61,7 @@ $reportUrl   = '/dashboard/crop-analysis/soil-test-data/soil-report.php?' . $par
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>Soil Analysis PDF | Crop Monitor</title>
 
-    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css" rel="stylesheet" crossorigin="anonymous">
     <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.css" rel="stylesheet">
     <link href="/client-assets/css/dashboard.css" rel="stylesheet">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.3/html2pdf.bundle.min.js"

+ 1 - 1
dashboard/crop-analysis/soil-test-data/soil-analysis.php

@@ -159,7 +159,7 @@ include __DIR__.'/../../layouts/navbar.php';
             <!-- GRAPH BANNER -->
 
             <div class="row">
-                <div class="col-md-12 text-center font-weight-bold h4">Soil Analysis Summary</div>
+                <div class="col-md-12 text-center fw-bold h4">Soil Analysis Summary</div>
             </div>
 
 

+ 4 - 41
dashboard/crop-analysis/soil-test-data/soil-report.php

@@ -59,47 +59,10 @@ include __DIR__.'/../../layouts/navbar.php';
     </div>
     <div id="layoutSidenav_content">
         <main>
-            <div class="container"> 
- <script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-
-<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous" rel="stylesheet" type="text/css" />
-<link href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css" rel="stylesheet" type="text/css" />
-
-<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.9.0/css/all.css" integrity="sha256-PF6MatZtiJ8/c9O9HQ8uSUXr++R9KBYu4gbNG5511WE=" crossorigin="anonymous" rel="stylesheet" type="text/css"  />
-
-<link type="text/css" href="/client-assets/weather-icons/css/weather-icons.min.css?version=1.16" rel="stylesheet" type="text/css" />
-<link href="https://cdnjs.cloudflare.com/ajax/libs/magnific-popup.js/1.1.0/magnific-popup.css" rel="stylesheet" type="text/css" />
-
-<script type="text/javascript" src="https://use.fontawesome.com/1e2844bb90.js"></script>
-		
-		<link href="/client-assets/css/dashboard.css" rel="stylesheet" type="text/css" />
-		<script src="https://unpkg.com/gijgo@1.9.11/js/gijgo.min.js" type="text/javascript"></script>
-		<link href="https://unpkg.com/gijgo@1.9.11/css/gijgo.min.css" rel="stylesheet" type="text/css" />
-		<script src="client-assets/js/skycons.js" type="text/javascript"></script>
-    
-        <link href="client-assets/home/css/graphing.css" rel="stylesheet" type="text/css" media="screen" />
-        <link href="client-assets/home/css/alux.min.css" rel="stylesheet" type="text/css" media="screen" />
-        
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.3/html2pdf.bundle.min.js" integrity="sha512-YcsIPGdhPK4P/uRW6/sruonlYj+Q7UHWeKfTAkBW+g83NKM+jMJFJ4iAPfSnVp7BKD4dKMHmVSvICUbE/V1sSw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-
+            <div class="container">
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.9.3/html2pdf.bundle.min.js" crossorigin="anonymous"></script>
         <style>
-            @media print {
-                @page {
-                    size: A4 portrait;
-                }
-                @page :left {
-                    margin-left: 0.5cm;
-                }
-                @page :right {
-                    margin-right: 0.5cm;
-                }
-                @page :top {
-                    margin-top: 0cm;
-                }
-                @page :bottom {
-                    margin-bottom: 0cm;
-                }
-            }
+            @media print { @page { size: A4 portrait; margin: 0.5cm; } }
         </style>
 
     </head>
@@ -142,7 +105,7 @@ include __DIR__.'/../../layouts/navbar.php';
     </div>
     <!-- GRAPH BANNER -->
     <div class="row">
-        <div class="col-md-12 text-center font-weight-bold h4">Soil Analysis Summary</div>
+        <div class="col-md-12 text-center fw-bold h4">Soil Analysis Summary</div>
     </div>
 
     

+ 2 - 7
dashboard/crop-analysis/soil-test-data/soil-test-data.php

@@ -54,13 +54,8 @@ include __DIR__ . '/../../../layouts/navbar.php';
                                 <h5 class="card-title">Excel/CSV Upload</h5>
                                 <p class="card-text">Download a CSV of this form for easy filling or upload a filled form to pre-populate.</p>
                                 <div class="input-group mt-3">
-                                    <div class="custom-file">
-                                        <input type="file" class="custom-file-input" id="upload" accept=".csv" />
-                                        <label class="custom-file-label border-success" for="upload">Choose file</label>
-                                    </div>
-                                    <div class="input-group-append">
-                                        <button class="btn btn-success" type="button" id="download">Download</button>
-                                    </div>
+                                    <input type="file" class="form-control border-success" id="upload" accept=".csv">
+                                    <button class="btn btn-success" type="button" id="download">Download</button>
                                 </div>
                             </div>
                         </div>

+ 4 - 4
dashboard/dashboard.php

@@ -35,7 +35,7 @@ include __DIR__ . '/../layouts/navbar.php';
                         <div class="card text-white bg-primary o-hidden h-100">
                             <div class="card-body">
                                 <div class="card-body-icon"><i class="fas fa-fw fa-comments"></i></div>
-                                <div class="mr-5">26 New Messages!</div>
+                                <div class="me-5">26 New Messages!</div>
                             </div>
                             <a class="card-footer text-white clearfix small z-1" href="/dashboard/inbox.php">
                                 <span class="float-start">View Details</span>
@@ -48,7 +48,7 @@ include __DIR__ . '/../layouts/navbar.php';
                         <div class="card text-white bg-warning o-hidden h-100">
                             <div class="card-body">
                                 <div class="card-body-icon"><i class="fas fa-fw fa-list"></i></div>
-                                <div class="mr-5">11 New Tasks!</div>
+                                <div class="me-5">11 New Tasks!</div>
                             </div>
                             <a class="card-footer text-white clearfix small z-1" href="#">
                                 <span class="float-start">View Details</span>
@@ -61,7 +61,7 @@ include __DIR__ . '/../layouts/navbar.php';
                         <div class="card text-white bg-success o-hidden h-100">
                             <div class="card-body">
                                 <div class="card-body-icon"><i class="fas fa-fw fa-seedling"></i></div>
-                                <div class="mr-5">New Soil Tests</div>
+                                <div class="me-5">New Soil Tests</div>
                             </div>
                             <a class="card-footer text-white clearfix small z-1"
                                href="/dashboard/crop-analysis/soil-test-data/soil-test-data.php">
@@ -75,7 +75,7 @@ include __DIR__ . '/../layouts/navbar.php';
                         <div class="card text-white bg-danger o-hidden h-100">
                             <div class="card-body">
                                 <div class="card-body-icon"><i class="fas fa-fw fa-life-ring"></i></div>
-                                <div class="mr-5">13 New Tickets!</div>
+                                <div class="me-5">13 New Tickets!</div>
                             </div>
                             <a class="card-footer text-white clearfix small z-1" href="#">
                                 <span class="float-start">View Details</span>

+ 2 - 6
dashboard/planning-calendar.php

@@ -81,9 +81,7 @@ include __DIR__ . '/../layouts/navbar.php';
     <div class="modal-content">
       <div id="modalHeader" class="modal-header">
 		<h4 class="modal-title">Add Event to Schedule</h4>
-		<button type="button" class="close" data–dismiss="createEventModal" aria-label="Close">
-			<span aria-hidden="true">&times;</span>
-		</button>
+		<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
 	  </div>
       <div class="modal-body">
         <div class="control-group">
@@ -150,9 +148,7 @@ include __DIR__ . '/../layouts/navbar.php';
         <div class="modal-content">
             <div id="modalHeader" class="modal-header">
             <h4 class="modal-title">Event Details</h4>
-		    <button type="button" class="close" data–dismiss="calendarModal" aria-label="Close">
-			    <span aria-hidden="true">&times;</span>
-		    </button>
+		    <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
       
         <div id="modalBody" class="modal-body">

+ 1 - 1
login/forgot-password.php

@@ -70,7 +70,7 @@ include __DIR__ . '/_head.php';
                                                    placeholder="Email Address" required autofocus
                                                    value="<?= htmlspecialchars($_POST['email'] ?? '', ENT_QUOTES, 'UTF-8') ?>">
                                         </div>
-                                        <button type="submit" class="btn btn-success btn-user btn-block w-100 mb-3">
+                                        <button type="submit" class="btn btn-success btn-user w-100 mb-3">
                                             Send Reset Link
                                         </button>
                                     </form>

+ 1 - 1
login/login.php

@@ -85,7 +85,7 @@ include __DIR__ . '/_head.php';
                                         <input type="password" name="password" class="form-control form-control-user"
                                                placeholder="Password" required>
                                     </div>
-                                    <button type="submit" class="btn btn-success btn-user btn-block w-100 mb-3">
+                                    <button type="submit" class="btn btn-success btn-user w-100 mb-3">
                                         Log In
                                     </button>
                                 </form>

+ 1 - 1
login/register.php

@@ -224,7 +224,7 @@ $sel = fn(string $key, string $val) => (($old[$key] ?? '') === $val) ? 'selected
                                 </div>
                             </div>
 
-                            <button type="submit" class="btn btn-success btn-user btn-block w-100 mb-3">
+                            <button type="submit" class="btn btn-success btn-user w-100 mb-3">
                                 Register Account
                             </button>
                         </form>

+ 1 - 1
login/reset-password.php

@@ -89,7 +89,7 @@ include __DIR__ . '/_head.php';
                                             <input type="password" name="password_confirm" class="form-control form-control-user"
                                                    placeholder="Confirm New Password" required>
                                         </div>
-                                        <button type="submit" class="btn btn-success btn-user btn-block w-100 mb-3">
+                                        <button type="submit" class="btn btn-success btn-user w-100 mb-3">
                                             Set New Password
                                         </button>
                                     </form>