فهرست منبع

Add cross-page navigation to all job pages

- client-brief.php: Dashboard button in navbar, Job Actions bar with links
  to Manila Folder / Drafts / Payment / Progress for the current DRG,
  fix emailHtmlSource textarea (was commented out but referenced in JS)
- dashboard.php: logo links to dashboard.php, DRG links use relative URLs
- progress.php: Dashboard + Client Brief nav buttons, HubSpot token from env,
  page title uses DRG and correct name (Payment Plan Tracker)
- payment_request.php: Dashboard + Client Brief nav buttons, HubSpot token from env
- manilla_folder.php: navbar with Dashboard + Client Brief + Download PDF
- draft_page.php: navbar with Dashboard + Client Brief (hidden in PDF mode)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Benjamin Harris 2 هفته پیش
والد
کامیت
c05543ab4a
6فایلهای تغییر یافته به همراه62 افزوده شده و 18 حذف شده
  1. 19 5
      client-brief.php
  2. 2 2
      dashboard.php
  3. 15 0
      draft_page.php
  4. 13 6
      manilla_folder.php
  5. 6 2
      payment_request.php
  6. 7 3
      progress.php

+ 19 - 5
client-brief.php

@@ -854,10 +854,11 @@ if (!empty($_GET['drg'])) {
 
         <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
             <div class="container-fluid">
-                <a class="navbar-brand brown-light" href="#">
+                <a class="navbar-brand brown-light" href="dashboard.php">
                     <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
                     Modulos Design
                 </a>
+                <a href="dashboard.php" class="btn btn-sm btn-outline-light ms-auto"><i class="bi bi-grid-fill"></i> Dashboard</a>
             </div>
         </nav>
 
@@ -879,6 +880,22 @@ if (!empty($_GET['drg'])) {
             </div>
 
             <hr>
+
+<?php if (!empty($drg)): ?>
+            <div class="row d-print-none mb-2">
+                <div class="col">
+                    <div class="d-flex flex-wrap gap-2 align-items-center">
+                        <small class="text-muted me-1">Job <?= (int)$drg ?>:</small>
+                        <a href="manilla_folder.php?drg=<?= (int)$drg ?>" class="btn btn-sm bg-brown-three brown-five"><i class="bi bi-folder2-open"></i> Manila Folder</a>
+                        <a href="draft_page.php?drg=<?= (int)$drg ?>" class="btn btn-sm bg-brown-three brown-five"><i class="bi bi-pencil-fill"></i> Drafts</a>
+                        <a href="payment_request.php?drg=<?= (int)$drg ?>" class="btn btn-sm bg-brown-three brown-five"><i class="bi bi-credit-card-fill"></i> Payment</a>
+                        <a href="progress.php?drg=<?= (int)$drg ?>" class="btn btn-sm bg-brown-three brown-five"><i class="bi bi-list-check"></i> Progress</a>
+                    </div>
+                </div>
+            </div>
+            <hr>
+<?php endif; ?>
+
             <form id="client-brief" data-remote="true" method="post" accept-charset="UTF-8">
                 <input type="hidden" name="csrf" id="csrf" value="<?php echo $csrf; ?>">
                 <div class="row">
@@ -1463,10 +1480,7 @@ if (!empty($_GET['drg'])) {
 
                             <div class="tab-pane fade active show p-3" id="tabHtml" role="tabpanel">
                                 <div id="emailHtmlPreview" class="border rounded p-3" style="background:#ffffff; color:#000000; font-family:Arial,Helvetica,sans-serif; font-size:14px; line-height:1.5;"></div>
-                                <!--<textarea id="emailHtmlSource" class="form-control small mt-2" rows="8" readonly></textarea>
-<p class="text-muted small mt-2 mb-0">
-Preview above. Copy the HTML if you paste into an HTML-capable composer such as Gmail or Outlook.
-</p>-->
+                                    <textarea id="emailHtmlSource" class="d-none" readonly></textarea>
                             </div>
                         </div>
                     </div>

+ 2 - 2
dashboard.php

@@ -35,7 +35,7 @@ $not_required = "<i class='h2 bi bi-dash-circle-fill'></i>";
 
         <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
             <div class="container-fluid">
-                <a class="navbar-brand brown-light" href="#">
+                <a class="navbar-brand brown-light" href="dashboard.php">
                     <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
                     Modulos Design
                 </a>
@@ -103,7 +103,7 @@ $not_required = "<i class='h2 bi bi-dash-circle-fill'></i>";
                             	if ( $row['site_visit'] === '1') { $site_visit = "$check"; } else { $site_visit = "$cross"; }
 
                                 echo "<tr class='border-bottom border-dark'>";
-                                echo "<th scope='row' class='border-end text-center'><a class='brown-three text-decoration-none' href='https://modulosdesign.com.au/internal/client-brief.php?drg=$drg'>" . $drg . "</a></th>";
+                                echo "<th scope='row' class='border-end text-center'><a class='brown-three text-decoration-none' href='client-brief.php?drg=$drg'>" . $drg . "</a></th>";
                                 echo "<td><span class='fw-bold'>" . $row['firstname'] . " " . $row['lastname'] . '</span><br><span class="small">' . $row['site_address_street'] . ', ' . $row['site_address_town'] . "</span></td>";
                                 echo "<td>" . $row['build_type'] . "</td>";
                             	echo "<td class='text-center'>" . $site_visit . "</td>";

+ 15 - 0
draft_page.php

@@ -58,6 +58,21 @@ if ($asPdf) {
 
     <body style="background-color:#fff !important;">
 
+        <?php if (!$asPdf): ?>
+        <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
+            <div class="container-fluid">
+                <a class="navbar-brand brown-light" href="dashboard.php">
+                    <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
+                    Modulos Design
+                </a>
+                <div class="ms-auto d-flex gap-2">
+                    <a href="dashboard.php" class="btn btn-sm btn-outline-light"><i class="bi bi-grid-fill"></i> Dashboard</a>
+                    <?php if (!empty($drg)): ?><a href="client-brief.php?drg=<?= (int)$drg ?>" class="btn btn-sm btn-outline-light"><i class="bi bi-person-fill"></i> Client Brief</a><?php endif; ?>
+                </div>
+            </div>
+        </nav>
+        <?php endif; ?>
+
 		<div class="container border border-3 border-dark vh-100">
 			<div class="row mt-2">
 				<div class="col align-self-start">

+ 13 - 6
manilla_folder.php

@@ -73,13 +73,20 @@ if ($asPdf) {
     </head>
 
     <body style="background-color:#fff !important;">
-        <!-- Show a Download link in normal view -->
         <?php if (!$asPdf): ?>
-        <div class="toolbar">
-            <a class="btn btn-primary" href="?drg=<?= urlencode($drg) ?>&pdf=1">
-                <i class="bi bi-file-earmark-arrow-down"></i> Download PDF
-            </a>
-        </div>
+        <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
+            <div class="container-fluid">
+                <a class="navbar-brand brown-light" href="dashboard.php">
+                    <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
+                    Modulos Design
+                </a>
+                <div class="ms-auto d-flex gap-2">
+                    <a href="dashboard.php" class="btn btn-sm btn-outline-light"><i class="bi bi-grid-fill"></i> Dashboard</a>
+                    <?php if (!empty($drg)): ?><a href="client-brief.php?drg=<?= (int)$drg ?>" class="btn btn-sm btn-outline-light"><i class="bi bi-person-fill"></i> Client Brief</a><?php endif; ?>
+                    <a class="btn btn-sm btn-outline-light" href="?drg=<?= urlencode($drg) ?>&pdf=1"><i class="bi bi-file-earmark-arrow-down"></i> Download PDF</a>
+                </div>
+            </div>
+        </nav>
         <?php endif; ?>
 
         <div class="container-fluid">

+ 6 - 2
payment_request.php

@@ -9,7 +9,7 @@ ini_set('log_errors', '1');
 require_once 'connection.php';
 include_once "vendor/autoload.php";
 
-$accessToken = 'pat-na1-64db9489-15fe-461d-b64c-941c4d80ba8a';
+$accessToken = getenv('HUBSPOT_TOKEN') ?: '';
 
 $enquiry_date = date("l dS M \'y");
 $drg = isset($_GET['drg']) ? $_GET['drg'] : '';
@@ -47,10 +47,14 @@ if (!empty($_GET['drg'])) {
 
         <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
             <div class="container-fluid">
-                <a class="navbar-brand brown-light" href="#">
+                <a class="navbar-brand brown-light" href="dashboard.php">
                     <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
                     Modulos Design
                 </a>
+                <div class="ms-auto d-flex gap-2">
+                    <a href="dashboard.php" class="btn btn-sm btn-outline-light"><i class="bi bi-grid-fill"></i> Dashboard</a>
+                    <?php if (!empty($drg)): ?><a href="client-brief.php?drg=<?= (int)$drg ?>" class="btn btn-sm btn-outline-light"><i class="bi bi-person-fill"></i> Client Brief</a><?php endif; ?>
+                </div>
             </div>
         </nav>
 

+ 7 - 3
progress.php

@@ -9,7 +9,7 @@ ini_set('log_errors', '1');
 require_once 'connection.php';
 include_once "vendor/autoload.php";
 
-$accessToken = 'pat-na1-64db9489-15fe-461d-b64c-941c4d80ba8a';
+$accessToken = getenv('HUBSPOT_TOKEN') ?: '';
 
 $enquiry_date = date("l dS M \'y");
 $drg = isset($_GET['drg']) ? $_GET['drg'] : '';
@@ -23,7 +23,7 @@ if (!empty($_GET['drg'])) {
     <head>
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <title>Client Payment Plan</title>
+        <title><?php echo $drg ? "{$drg} - " : ''; ?>Payment Plan Tracker</title>
         <link rel="shortcut icon" href="images/blueprint.ico" type="image/x-icon">
         <link href="https://modulosdesign.com.au/internal/css/bootstrap.css" rel="stylesheet">
         <link href="https://modulosdesign.com.au/internal/css/blueprint.css" rel="stylesheet">
@@ -45,10 +45,14 @@ if (!empty($_GET['drg'])) {
 
         <nav class="navbar bg-brown-dark brown-light border-bottom border-body d-print-none" data-bs-theme="dark">
             <div class="container-fluid">
-                <a class="navbar-brand brown-light" href="#">
+                <a class="navbar-brand brown-light" href="dashboard.php">
                     <img src="images/blueprint-logo-light.png" alt="Logo" width="30" height="24" class="d-inline-block align-text-top">
                     Modulos Design
                 </a>
+                <div class="ms-auto d-flex gap-2">
+                    <a href="dashboard.php" class="btn btn-sm btn-outline-light"><i class="bi bi-grid-fill"></i> Dashboard</a>
+                    <?php if (!empty($drg)): ?><a href="client-brief.php?drg=<?= (int)$drg ?>" class="btn btn-sm btn-outline-light"><i class="bi bi-person-fill"></i> Client Brief</a><?php endif; ?>
+                </div>
             </div>
         </nav>