Merge pull request 'first commit for highlighting active tab' (#3) from stacy_branch into main

Reviewed-on: #3
This commit is contained in:
erwin 2024-02-14 10:13:12 +08:00
commit d1cb60d908
5 changed files with 68 additions and 36 deletions

View File

@ -127,13 +127,16 @@ if (is_array($vendorOrderss)) {
<img class="v-img" src=<?php echo $vendorData['vendor_image'] ?> alt="vendor image">
<h5 class="name"><?php echo $vendorData['user_login'] ?></h5>
</div>
<div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a onclick="addProduct();" href="">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
<!-- <div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a onclick="addProduct();" href="">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div> -->
<?php include 'vendor-profile-tabs.php' ?>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
</div>
</div>
</div>

20
vendor-profile-tabs.php Normal file
View File

@ -0,0 +1,20 @@
<!-- 2024-02-12 Stacy created this file -->
<div class="ec-vendor-block-items">
<ul>
<li <?php if ($_SERVER['REQUEST_URI'] == '/login.php') echo 'class="active"'; ?>><a href="login.php" id="login-link">Dashboards</a></li>
<li <?php if ($_SERVER['REQUEST_URI'] == '/vendor-profile.php') echo 'class="active"'; ?>><a href="vendor-profile.php" id="vendor-profile-link">Public Profile</a></li>
<li <?php if ($_SERVER['REQUEST_URI'] == '/vendors-uploads.php') echo 'class="active"'; ?>><a href="vendors-uploads.php" id="vendors-uploads-link">Uploads</a></li>
<li <?php if ($_SERVER['REQUEST_URI'] == '/track-order.html') echo 'class="active"'; ?>><a href="track-order.html" id="track-order-link">Track Shipping</a></li>
<li <?php if ($_SERVER['REQUEST_URI'] == '/vendor-settings.php') echo 'class="active"'; ?>><a href="vendor-settings.php" id="vendor-settings-link">Settings (edit)</a></li>
</ul>
</div>
<style>.ec-vendor-block-items ul li.active a {
color: white !important; /* Change the text color */
background-color: #3474d4; /* Change the background color */
padding: 10px;
border-radius: 10px;
}
</style>
<!-- 2024-02-12 Stacy created this file -->

View File

@ -165,15 +165,18 @@
<!-- Sidebar Category Block -->
<div class="ec-sidebar-block">
<div class="ec-vendor-block">
<div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-profile.html">Public Profile</a></li>
<li><a href="vendor-uploads.html">Uploads</a></li>
<li><a href="track-order.html">Track Shipping</a></li>
<li><a href="vendor-settings.html">Settings (Edit)</a></li>
</ul>
</div>
<!-- 2024-02-12 Stacy deleted the div with class "ec-vendor-block-items", and then added the vendor-profile-tabs.php -->
<!-- <div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-profile.html">Public Profile</a></li>
<li><a href="vendor-uploads.html">Uploads</a></li>
<li><a href="track-order.html">Track Shipping</a></li>
<li><a href="vendor-settings.html">Settings (Edit)</a></li>
</ul>
</div> -->
<?php include 'vendor-profile-tabs.php' ?>
<!-- 2024-02-12 Stacy deleted the div with class "ec-vendor-block-items", and then added the vendor-profile-tabs.php -->
</div>
</div>
</div>

View File

@ -115,19 +115,22 @@ if ($_SESSION["userId"] <> "") {
<!-- Sidebar Category Block -->
<div class="ec-sidebar-block">
<div class="ec-vendor-block">
<div class="ec-vendor-block-items">
<ul>
<!-- <li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-profile.html">Public Profile</a></li>
<li><a href="vendor-uploads.html">Uploads</a></li>
<li><a href="vendor-uploads.php">Uploads</a></li>
<li><a href="#">Track Shipping</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li> -->
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
<!-- <div class="ec-vendor-block-items">
<ul>
<!-- <li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-profile.html">Public Profile</a></li>
<li><a href="vendor-uploads.html">Uploads</a></li>
<li><a href="vendor-uploads.php">Uploads</a></li>
<li><a href="#">Track Shipping</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li> -->
<!-- <li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div> -->
<?php include 'vendor-profile-tabs.php' ?>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
</div>
</div>
</div>

View File

@ -111,13 +111,16 @@ $array = json_decode($result, true);
<!-- Sidebar Category Block -->
<div class="ec-sidebar-block">
<div class="ec-vendor-block">
<div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
<!-- <div class="ec-vendor-block-items">
<ul>
<li><a href="vendor-dashboard.php">Dashboard</a></li>
<li><a href="vendor-uploads-add-product-action.php">Upload Product</a></li>
<li><a href="vendor-settings.php">Settings (Edit)</a></li>
</ul>
</div> -->
<?php include 'vendor-profile-tabs.php' ?>
<!-- 2024-02-12 Stacy deleted div with class "ec-vendor-block-items", and inserted vendor-profile-tabs.php -->
</div>
</div>
</div>