Fix static file serving: update .gitignore and Apache config

- Fix .gitignore to allow source static files while ignoring collected static files
- Update Apache config to use modern Apache 2.4 syntax (Require all granted)
- Add missing variant_uris_admin.css and other static files

Author: hburgund

.gitignore

@@ -5,7 +5,10 @@ build
 roundware/settings/local_settings.py
 
 build
-static
+# Ignore collected static files (production static directory)
+/var/www/roundware/static/
+# But allow source static files to be tracked
+!roundware/*/static/
 local_settings.py
 .coverage
 .idea/*

files/etc-apache2-sites-available-roundware

@@ -6,15 +6,13 @@
   <Directory /var/www/roundware/static>
     Options -Indexes
     AllowOverride None
-    Order allow,deny
-    allow from all
+    Require all granted
   </Directory>
 
   <Directory /var/www/roundware/rwmedia>
     Options -Indexes
     AllowOverride None
-    Order allow,deny
-    allow from all
+    Require all granted
   </Directory>
 
   Alias /static /var/www/roundware/static

roundware/rw/static/rw/css/speaker_admin.css

@@ -0,0 +1,4 @@
+#id_shape_map {
+    height: 600px;
+    width: 1000px;
+}

roundware/rw/static/rw/css/variant_uris_admin.css

@@ -0,0 +1,71 @@
+/* CSS for VariantURIsWidget in Django admin */
+
+.variant-uris-container {
+    margin: 10px 0;
+}
+
+/* Simple fix: just make all text in audio file field dark */
+.form-row .field-audio_file label {
+    color: #000 !important;
+    font-weight: bold !important;
+}
+
+.form-row .field-audio_file .help,
+.form-row .field-audio_file .helptext {
+    color: #333 !important;
+    font-style: italic !important;
+}
+
+/* Make sure the file input and any text is dark */
+.form-row .field-audio_file input[type="file"] {
+    color: #000 !important;
+}
+
+/* Target any text that might be light */
+.form-row .field-audio_file {
+    color: #000 !important;
+}
+
+.variant-uris-container textarea {
+    width: 100%;
+    max-width: 600px;
+    font-family: monospace;
+    font-size: 12px;
+    line-height: 1.4;
+    border: 1px solid #ddd;
+    border-radius: 4px;
+    padding: 8px;
+    background-color: #fff;
+    color: #333 !important;
+}
+
+.variant-uris-container textarea:focus {
+    border-color: #79aec8;
+    box-shadow: 0 0 0 2px rgba(121, 174, 200, 0.2);
+    outline: none;
+}
+
+.variant-uris-help {
+    margin-top: 10px;
+    padding: 10px;
+    background-color: #f0f8ff;
+    border: 1px solid #b3d9ff;
+    border-radius: 4px;
+    font-size: 12px;
+}
+
+.variant-uris-help p {
+    margin: 0 0 5px 0;
+    font-weight: bold;
+    color: #2c5aa0;
+}
+
+.variant-uris-help ul {
+    margin: 5px 0 0 0;
+    padding-left: 20px;
+}
+
+.variant-uris-help li {
+    margin: 2px 0;
+    color: #555;
+}

roundware/rw/static/rw/js/speaker_upload_admin.js

@@ -0,0 +1,129 @@
+// Speaker Audio Upload Admin JavaScript
+(function($) {
+    'use strict';
+    
+    $(document).ready(function() {
+        console.log('Speaker upload admin script loaded');
+        
+        // Find the audio file input
+        var audioFileInput = $('#audio-file-input');
+        var variantUrisTextarea = $('textarea[name="varianturis"]');
+        
+        console.log('Audio file input found:', audioFileInput.length);
+        console.log('Variant URIs textarea found:', variantUrisTextarea.length);
+        
+        if (audioFileInput.length === 0) {
+            console.error('Audio file input not found!');
+            return;
+        }
+        
+        // Create upload button
+        var uploadButton = $('<button type="button" class="default" style="margin-top: 10px; margin-left: 10px;">Upload Audio File</button>');
+        
+        // Add button after the file input
+        audioFileInput.after(uploadButton);
+        console.log('Upload button added');
+        
+        // Handle file upload
+        uploadButton.on('click', function() {
+            var file = audioFileInput[0].files[0];
+            if (!file) {
+                alert('Please select an audio file first.');
+                return;
+            }
+            
+            // Show loading state
+            uploadButton.prop('disabled', true).text('Uploading...');
+            
+            // Create FormData
+            var formData = new FormData();
+            formData.append('audio_file', file);
+            
+            // Get the current speaker ID from the URL
+            var urlParts = window.location.pathname.split('/');
+            var speakerId = null;
+            
+            // Look for the speaker ID in the URL pattern /admin/rw/speaker/{id}/change/
+            for (var i = 0; i < urlParts.length; i++) {
+                if (urlParts[i] === 'speaker' && i + 1 < urlParts.length) {
+                    speakerId = urlParts[i + 1];
+                    break;
+                }
+            }
+            
+            console.log('URL parts:', urlParts);
+            console.log('Uploading to speaker ID:', speakerId);
+            
+            if (!speakerId) {
+                alert('Could not determine speaker ID from URL');
+                return;
+            }
+            
+            // Make AJAX request
+            $.ajax({
+                url: '/admin/rw/speaker/' + speakerId + '/upload-audio/',
+                type: 'POST',
+                data: formData,
+                processData: false,
+                contentType: false,
+                headers: {
+                    'X-CSRFToken': $('[name=csrfmiddlewaretoken]').val()
+                },
+                success: function(data) {
+                    console.log('Upload response:', data);
+                    if (data.success) {
+                        // Update the varianturis textarea
+                        var currentUris = variantUrisTextarea.val().split('\n').filter(function(uri) {
+                            return uri.trim();
+                        });
+                        currentUris.push(data.uri);
+                        variantUrisTextarea.val(currentUris.join('\n'));
+                        
+                        // Clear the file input
+                        audioFileInput.val('');
+                        
+                        // Show success message
+                        alert('Audio file uploaded successfully! URI added to varianturis.');
+                    } else {
+                        alert('Upload failed: ' + data.error);
+                    }
+                },
+                error: function(xhr, status, error) {
+                    console.error('Upload error:', xhr.responseText);
+                    var errorMsg = 'Upload failed: ' + error;
+                    try {
+                        var response = JSON.parse(xhr.responseText);
+                        if (response.error) {
+                            errorMsg = 'Upload failed: ' + response.error;
+                        }
+                    } catch (e) {
+                        // Use default error message
+                    }
+                    alert(errorMsg);
+                },
+                complete: function() {
+                    // Reset button state
+                    uploadButton.prop('disabled', false).text('Upload Audio File');
+                }
+            });
+        });
+        
+        // Simple fix: just make text dark
+        var audioFileField = audioFileInput.closest('.form-row');
+        if (audioFileField.length) {
+            // Force text colors to be visible
+            audioFileField.find('label').css({
+                'color': '#000 !important',
+                'font-weight': 'bold !important'
+            });
+            
+            audioFileField.find('.help, .helptext').css({
+                'color': '#333 !important',
+                'font-style': 'italic !important'
+            });
+            
+            // Make sure all text in the field is dark
+            audioFileField.css('color', '#000 !important');
+        }
+    });
+})(django.jQuery);