Openvpn template layout, relative img paths. Closes #716

RaspAP · Dec 7, 2020 · da0e714 · da0e714
1 parent 3b1c9b2
commit da0e714
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 26 deletions.
diff --git a/app/img/180x150.png b/app/img/180x150.png
diff --git a/templates/hostapd/security.php b/templates/hostapd/security.php
@@ -20,7 +20,7 @@
     </div>
     <div class="col-md-6">
       <figure class="figure">
-        <img src="/app/img/wifi-qr-code.php" class="figure-img img-fluid" alt="RaspAP Wifi QR code" style="width:100%;">
+        <img src="app/img/wifi-qr-code.php" class="figure-img img-fluid" alt="RaspAP Wifi QR code" style="width:100%;">
         <figcaption class="figure-caption"><?php echo _("Scan this QR code with your phone to connect to this RaspAP."); ?></figcaption>
       </figure>
     </div>

diff --git a/templates/openvpn.php b/templates/openvpn.php
@@ -27,32 +27,39 @@
             <div class="tab-content">
               <div class="tab-pane active" id="openvpnclient">
                 <h4 class="mt-3"><?php echo _("Client settings"); ?></h4>
-                  <div class="row">
-                    <div class="col-md-6 mt-2 mb-2">
-                      <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
-                      <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+                <div class="row">
+                  <div class="col">
+                    <div class="row">
+                      <div class="col-lg-12 mt-2 mb-2">
+                        <div class="info-item"><?php echo _("IPv4 Address"); ?></div>
+                        <div class="info-item"><?php echo htmlspecialchars($public_ip, ENT_QUOTES); ?><a class="text-gray-500" href="https://ipapi.co/<?php echo($public_ip); ?>" target="_blank" rel="noopener noreferrer"><i class="fas fa-external-link-alt ml-2"></i></a></div>
+                      </div>
                     </div>
-                  </div>
-                  <div class="row">
-                   <div class="form-group col-md-6">
-                    <label for="code"><?php echo _("Username"); ?></label>
-                      <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
+                    <div class="row">
+                     <div class="form-group col-lg-12">
+                      <label for="code"><?php echo _("Username"); ?></label>
+                        <input type="text" class="form-control" name="authUser" value="<?php echo htmlspecialchars($authUser, ENT_QUOTES); ?>" />
+                      </div>
                     </div>
-                  </div>
-                  <div class="row">
-                    <div class="form-group col-md-6">
-                      <label for="code"><?php echo _("Password"); ?></label>
-                      <input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
+                    <div class="row">
+                      <div class="form-group col-lg-12">
+                        <label for="code"><?php echo _("Password"); ?></label>
+                        <input type="password" class="form-control" name="authPassword" value="<?php echo htmlspecialchars($authPassword, ENT_QUOTES); ?>" />
+                      </div>
                     </div>
-                  </div>
-                  <div class="row">
-                    <div class="form-group col-md-6">
-                      <div class="custom-file">
-                        <input type="file" class="custom-file-input" name="customFile" id="customFile">
-                        <label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
+                    <div class="row">
+                      <div class="form-group col-lg-12">
+                        <div class="custom-file">
+                          <input type="file" class="custom-file-input" name="customFile" id="customFile">
+                          <label class="custom-file-label" for="customFile"><?php echo _("Select OpenVPN configuration file (.ovpn)"); ?></label>
+                        </div>
                       </div>
                     </div>
-                </div>
+                  </div><!-- col-->
+                  <div class="col-sm">
+                      <a href="https://go.nordvpn.net/aff_c?offer_id=15&aff_id=36402&url_id=902"><img src="app/img/180x150.png" class="rounded float-left mb-3 mt-3"></a>
+                  </div>
+                </div><!-- main row -->
               </div>
               <div class="tab-pane fade" id="openvpnlogoutput">
                 <h4 class="mt-3"><?php echo _("Client log"); ?></h4>
@@ -67,10 +74,10 @@
               <?php if (!RASPI_MONITOR_ENABLED) : ?>
                   <input type="submit" class="btn btn-outline btn-primary" name="SaveOpenVPNSettings" value="Save settings" />
                   <?php if ($openvpnstatus[0] == 0) {
-					  echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
-				  } else {
-                    echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
-                  }
+                      echo '<input type="submit" class="btn btn-success" name="StartOpenVPN" value="Start OpenVPN" />' , PHP_EOL;
+                    } else {
+                      echo '<input type="submit" class="btn btn-warning" name="StopOpenVPN" value="Stop OpenVPN" />' , PHP_EOL;
+                    }
                   ?>
               <?php endif ?>
               </form>