WIP including all themes

Author: StephDriver

migrations/0003_a11y_structure_updates.py

@@ -4,16 +4,16 @@
 
 def forward_migration(apps, schema_editor):
     changes_to_make = [
-        ('#content aside', '#content .side-info'),
-        ('#content .side-info h3', '#content .side-info h2'),
+        ('olh', '#content aside', '#content .side-info'),
+        ('olh', '#content .side-info h3', '#content .side-info h2'),
     ]
     find_and_handle_custom_stylesheets(apps, schema_editor, changes_to_make, reverse=False)
 
 
 def reverse_migration(apps, schema_editor):
     changes_to_make = [
-        ('#content aside', '#content .side-info'),
-        ('#content aside h3', '#content aside h2'),
+        ('olh', '#content aside', '#content .side-info'),
+        ('olh', '#content aside h3', '#content aside h2'),
     ]
     find_and_handle_custom_stylesheets(apps, schema_editor, changes_to_make, reverse=True)
 

utils.py

@@ -12,11 +12,7 @@
 def change_css_selectors(file_paths, changes_to_make, reverse=False):
     """
     Modifies custom stylesheets to update specific CSS selectors.
-    
-    Args:
-        file_paths: List of file paths to process
-        changes_to_make: List of tuples with (old_selector, new_selector)
-        reverse: If True, reverses the changes (new_selector -> old_selector)
+    Reverse allows this to be used for undo a migration as well.5rf
     """
     for file_path in file_paths:
         try:
@@ -86,21 +82,21 @@ def get_custom_stylesheet_paths(apps, schema_editor):
             )
         except SettingValue.DoesNotExist:
             continue
-        if theme.value == 'material':
-            stylesheet_paths.extend([
-                os.path.join(
-                    settings.BASE_DIR,
-                    'static',
-                    'material',
-                    'css',
-                    f'journal{journal_id}_override.css',
-                ),
-                os.path.join(
-                    plugin_settings.BASE_CSS_PATH,
-                    str(journal_id),
-                    'custom.css',
-                )
-            ])
+
+        stylesheet_paths.extend([
+            os.path.join(
+                settings.BASE_DIR,
+                'static',
+                theme.value,
+                'css',
+                f'journal{journal_id}_override.css',
+            ),
+            os.path.join(
+                plugin_settings.BASE_CSS_PATH,
+                str(journal_id),
+                'custom.css',
+            )
+        ])
 
             for sheet in CrossJournalStylesheet.objects.filter(journals=journal):
                 stylesheet_paths.append(
@@ -110,7 +106,8 @@ def get_custom_stylesheet_paths(apps, schema_editor):
                         sheet.stylesheet_name,
                     )
                 )
-
+        elif theme.value == 'clean':
+            pass
     # Get press stylesheets
     press = Press.objects.first()
     if press and press.theme == 'material':
@@ -139,7 +136,7 @@ def find_and_handle_custom_stylesheets(apps, schema_editor, changes_to_make, rev
     Args:
         apps: Django apps registry
         schema_editor: Django schema editor
-        changes_to_make: List of tuples with (old_selector, new_selector)
+        changes_to_make: List of tuples with (theme, old_selector, new_selector)
         reverse: If True, reverses the changes
     """
     stylesheet_paths = get_custom_stylesheet_paths(apps, schema_editor)