Merge branch 'master' of github.com:corbindavenport/image-share

corbindavenport · Sep 5, 2022 · f7ec7ff · f7ec7ff
2 parents c4e40e1 + 93a08d2
commit f7ec7ff
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/web/index.php b/web/index.php
@@ -170,24 +170,23 @@
   <div class="panel upload-panel">
         <div class="panel-title">Upload Image</div>
         <div class="body">
-            <form action="index.php" id="upload-form" enctype="multipart/form-data" method="POST">
-                <p><input name="img" id="img-btn" type="file" /></p>
-                <p><input name="submit" type="submit" value="Upload" /></p>
-                <p>ImageShare is a lightweight web app for uploading and sharing images using QR codes. See <a href="https://github.com/corbindavenport/imageshare" target="_blank">github.com/corbindavenport/imageshare</a> for more information.</p>
-                <p>If you find ImageShare useful, please consider donating to support continued development!</p>
-                <p style="text-align: center;"><b><a href="https://cash.app/$corbdav" target="_blank">cash.app/$corbdav</a> | <a href="https://paypal.me/corbindav" target="_blank">paypal.me/corbindav</a></b></p>
-            </form>
+          <?php
+          // Redirect from Heroku: https://github.com/corbindavenport/imageshare/issues/11
+          if (str_contains($_SERVER['HTTP_HOST'], 'herokuapp.com')) {
+            echo '<p><b>ImageShare is moving to <a href="http://theimageshare.com/">theimageshare.com</a>. This site will not be accessible by November 2022. Please update your bookmarks now.</b></p>'.PHP_EOL;
+          }
+          ?>
+          <form action="index.php" id="upload-form" enctype="multipart/form-data" method="POST">
+            <p><input name="img" id="img-btn" type="file" /></p>
+            <p><input name="submit" type="submit" value="Upload" /></p>
+            <p>ImageShare is a lightweight web app for uploading and sharing images using QR codes. See <a href="https://github.com/corbindavenport/imageshare" target="_blank">github.com/corbindavenport/imageshare</a> for more information.</p>
+            <p>If you find ImageShare useful, please consider donating to support continued development!</p>
+            <p style="text-align: center;"><b><a href="https://cash.app/$corbdav" target="_blank">cash.app/$corbdav</a> | <a href="https://paypal.me/corbindav" target="_blank">paypal.me/corbindav</a></b></p>
+          </form>
         </div>
     </div>
 
   </div>
 
-  <?php
-  // Redirect from Heroku: https://github.com/corbindavenport/imageshare/issues/11
-  if (str_contains($_SERVER['HTTP_HOST'], 'herokuapp.com')) {
-    echo '<script>alert("ImageShare is moving to theimageshare.com. The old site (theimageshare.com) will not be accessible by November 2022. Please update your bookmarks.\n\nYou will now be redirected to the new site.");window.location.href="http://theimageshare.com";</script>';
-  }
-  ?>
-
 </body>
 </html>
diff --git a/web/styles.css b/web/styles.css
@@ -100,6 +100,10 @@ input {
 	max-height: 60vh;
 }
 
+.qr-panel a {
+	outline: none;
+}
+
 /* Large screens */
 @media screen and (min-width: 800px) {