usb_lib/upload/*.php, usb_lib/tasks/install.yml: Moving app from uplo…

…ad2usb/ to upload/; Fixing UK image on upload-file page; Minor formatting changes
avni · Jan 8, 2025 · 956257f · 956257f
1 parent 99ff433
commit 956257f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/roles/usb_lib/files/upload2usb/index.php → roles/usb_lib/files/upload/index.php b/roles/usb_lib/files/upload2usb/index.php → roles/usb_lib/files/upload/index.php
@@ -35,7 +35,7 @@
                     <img class="mb-4" src="uk-swing.png" alt="" width="75">
                     <h1 class="h3 mb-3 font-weight-normal">Internet in a Box Upload to USB</h1>
 
-                    <label for="upload2usb" style="font-weight:bold;padding-bottom:10px;">Upload your file here!</label>
+                    <label for="upload2usb" style="font-weight:bold;padding-bottom:10px;">Upload your file here!</label><br/>
                     <input type="file" name="uploaded_file" id="uploaded_file"><br/><br/>
                     <button class="btn btn-dark" name="submit" type="submit" style="width:150px;">Submit</button>
                   </form>

diff --git a/roles/usb_lib/files/upload2usb/uk-swing.png → roles/usb_lib/files/upload/uk-swing.png b/roles/usb_lib/files/upload2usb/uk-swing.png → roles/usb_lib/files/upload/uk-swing.png
diff --git a/.../usb_lib/files/upload2usb/upload-file.php → roles/usb_lib/files/upload/upload-file.php b/.../usb_lib/files/upload2usb/upload-file.php → roles/usb_lib/files/upload/upload-file.php
@@ -56,7 +56,7 @@
             <div class="row">
 		<div class="col-sm-6 offset-sm-3 text-center" style="padding:15px;">
 
-                    <img class="mb-4" src="unleash-kids-swing.png" alt="" width="75">
+                    <img class="mb-4" src="uk-swing.png" alt="" width="75">
                     <h1 class="h3 mb-3 font-weight-normal">Internet in a Box Upload to USB</h1>
                     <?php echo $upload_msg ?> <br/>
                     <?php echo $file_count ?> files have been submitted today!

diff --git a/...s/usb_lib/files/upload2usb/upload2usb.php → roles/usb_lib/files/upload/upload2usb.php b/...s/usb_lib/files/upload2usb/upload2usb.php → roles/usb_lib/files/upload/upload2usb.php
@@ -16,6 +16,7 @@ function getTargetUSBDriveLocation () {
          if (empty($removable_usb_path)) {
                 return "/library/www/html/local_content/";
          } else {
+// error_log ("REMOVABLE USB PATH: " . $removable_usb_path); 
                 return $removable_usb_path . "/";
          }
 }

diff --git a/roles/usb_lib/tasks/install.yml b/roles/usb_lib/tasks/install.yml
@@ -76,21 +76,21 @@
     - { src: 'iiab-usb_lib-show-all-off', dest: '/usr/bin/', mode: '0755' }
     - { src: 'iiab-clean-usb.sh', dest: '/usr/sbin/', mode: '0755' }
 
-- name: '2025-01-05: Add upload2usb directory to local_content'
+- name: '2025-01-05: Add upload2usb app directory to local_content'
   file:
     state: directory
-    path: "{{ doc_root }}/local_content/upload2usb"
+    path: "{{ doc_root }}/local_content/upload"
     owner: "{{ apache_user }}"
     group: "{{ apache_user }}"    
     mode: 0755
 
 
-- name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload2usb/ to local_content'
+- name: '2025-01-05: Copy upload2usb app (#3875) files from files/upload/ to local_content'
   copy:
     src: "{{ item }}"
-    dest: "{{ doc_root }}/local_content/upload2usb" # /library/www/html
+    dest: "{{ doc_root }}/local_content/upload" # /library/www/html
   with_fileglob:
-    - upload2usb/*
+    - upload/*
 
 
 # 2021-03-21: If usbmount is repackaged by apt as a result of Linux kernel 5.4+