Not logging correct IP yet

Reviewed-on: #7

AGENTS.md

@@ -214,12 +214,13 @@ labhelper/
 │   │       ├── add_things.html             # Form to add multiple things
 │   │       ├── box_detail.html             # Box contents view
 │   │       ├── box_management.html         # Box/BoxType CRUD management
-│   │       ├── index.html                  # Home page
-│   │       ├── search.html                 # Search page with AJAX
-│   │       ├── thing_detail.html           # Thing details view
-│   │       └── thing_type_detail.html      # Thing type hierarchy view
+│   │       ├── boxes_list.html            # Boxes list page with tabular view
+│   │       ├── edit_thing.html            # Edit thing page (name, description, picture, tags, files, links)
+│   │       ├── index.html                  # Home page with search and tags
+│   │       ├── resources_list.html         # List all links and files from things
+│   │       └── thing_detail.html           # Read-only thing details view
 │   ├── templatetags/
-│   │   └── dict_extras.py                  # Custom template filter: get_item
+│   │   └── dict_extras.py                  # Custom template filters: get_item, render_markdown, truncate_markdown
 │   ├── admin.py                            # Admin configuration
 │   ├── apps.py                             # App configuration
 │   ├── forms.py                            # All forms and formsets
@@ -259,19 +260,24 @@ labhelper/
 |-------|-------------|------------|
 | **BoxType** | Type of storage box with dimensions | `name`, `width`, `height`, `length` (in mm) |
 | **Box** | A storage box in the lab | `id` (CharField PK, max 10), `box_type` (FK) |
-| **ThingType** | Hierarchical category (MPTT) | `name`, `parent` (TreeForeignKey to self) |
-| **Thing** | An item stored in a box | `name`, `thing_type` (FK), `box` (FK), `description`, `picture` |
+| **Facet** | A category of tags (e.g., Priority, Category) | `name`, `slug`, `color`, `cardinality` (single/multiple) |
+| **Tag** | A tag value for a specific facet | `facet` (FK), `name` |
+| **Thing** | An item stored in a box | `name`, `box` (FK), `description` (Markdown), `picture`, `tags` (M2M) |
 | **ThingFile** | File attachment for a Thing | `thing` (FK), `file`, `title`, `uploaded_at` |
 | **ThingLink** | Hyperlink for a Thing | `thing` (FK), `url`, `title`, `uploaded_at` |
 
 **Model Relationships:**
 - BoxType -> Box (1:N via `boxes` related_name, PROTECT on delete)
 - Box -> Thing (1:N via `things` related_name, PROTECT on delete)
-- ThingType -> Thing (1:N via `things` related_name, PROTECT on delete)
-- ThingType -> ThingType (self-referential tree via MPTT)
+- Facet -> Tag (1:N via `tags` related_name, CASCADE on delete)
+- Thing <-> Tag (M2M via `tags` related_name on Thing, `things` related_name on Tag)
 - Thing -> ThingFile (1:N via `files` related_name, CASCADE on delete)
 - Thing -> ThingLink (1:N via `links` related_name, CASCADE on delete)
 
+**Facet Cardinality:**
+- `single`: A thing can have at most one tag from this facet (e.g., Priority: High/Medium/Low)
+- `multiple`: A thing can have multiple tags from this facet (e.g., Category: Electronics, Tools)
+
 ## Available Django Extensions
 
 The project includes these pre-installed packages:
@@ -324,7 +330,7 @@ The project uses a base template system at `labhelper/templates/base.html`. All
 - Cards: White with subtle shadows
 
 **Components:**
-- **Navigation**: Glassmorphism effect with blur backdrop
+- **Navigation**: Glassmorphism effect with blur backdrop. Desktop (≥769px) shows horizontal menu with dropdown for authenticated user (contains Box Management, Resources, Admin, Logout)
 - **Buttons**: Gradient backgrounds with hover lift effect
 - **Cards**: White with rounded corners and box shadows
 - **Tables**: Gradient headers with hover row effects
@@ -346,6 +352,7 @@ The project uses a base template system at `labhelper/templates/base.html`. All
 - Grid layouts with `repeat(auto-fill, minmax(250px, 1fr))`
 - Flexbox for component layouts
 - Breakpoints handled by grid and flex-wrap
+- **Navigation**: Responsive navbar with hamburger menu on mobile (≤768px) and horizontal menu with user dropdown on desktop (≥769px). Mobile keeps all items in the dropdown list
 
 ### CSS Guidelines
 
@@ -371,7 +378,8 @@ The project uses a base template system at `labhelper/templates/base.html`. All
 
 | View Function | URL Pattern | Name | Description |
 |---------------|-------------|------|-------------|
-| `index` | `/` | `index` | Home page with boxes grid and thing types tree |
+| `index` | `/` | `index` | Home page with search and tags overview |
+| `boxes_list` | `/search/` | `search`, `boxes_list` | Boxes list page with tabular view |
 | `box_management` | `/box-management/` | `box_management` | Manage boxes and box types |
 | `add_box_type` | `/box-type/add/` | `add_box_type` | Add new box type |
 | `edit_box_type` | `/box-type/<int:type_id>/edit/` | `edit_box_type` | Edit box type |
@@ -380,11 +388,11 @@ The project uses a base template system at `labhelper/templates/base.html`. All
 | `edit_box` | `/box/<str:box_id>/edit/` | `edit_box` | Edit box |
 | `delete_box` | `/box/<str:box_id>/delete/` | `delete_box` | Delete box |
 | `box_detail` | `/box/<str:box_id>/` | `box_detail` | View box contents |
-| `thing_detail` | `/thing/<int:thing_id>/` | `thing_detail` | View/edit thing (move, picture, files, links) |
-| `thing_type_detail` | `/thing-type/<int:type_id>/` | `thing_type_detail` | View thing type hierarchy |
+| `thing_detail` | `/thing/<int:thing_id>/` | `thing_detail` | Read-only view of thing details |
+| `edit_thing` | `/thing/<int:thing_id>/edit/` | `edit_thing` | Edit thing (name, description, picture, tags, files, links, move) |
 | `add_things` | `/box/<str:box_id>/add/` | `add_things` | Add multiple things to a box |
-| `search` | `/search/` | `search` | Search page |
 | `search_api` | `/search/api/` | `search_api` | AJAX search endpoint |
+| `resources_list` | `/resources/` | `resources_list` | List all links and files from things (sorted by thing name) |
 | `LoginView` | `/login/` | `login` | Django auth login |
 | `LogoutView` | `/logout/` | `logout` | Django auth logout |
 | `admin.site` | `/admin/` | - | Django admin |
@@ -394,47 +402,99 @@ The project uses a base template system at `labhelper/templates/base.html`. All
 ### Template Best Practices
 
 1. **Always extend base template**
-   ```django
-   {% extends "base.html" %}
-   ```
+    ```django
+    {% extends "base.html" %}
+    ```
 
 2. **Use block system for content injection**
-   - `title`: Page title tag
-   - `page_header`: Page header with breadcrumbs
-   - `content`: Main page content
-   - `extra_css`: Additional styles
-   - `extra_js`: Additional JavaScript
+    - `title`: Page title tag
+    - `page_header`: Page header with breadcrumbs
+    - `content`: Main page content
+    - `extra_css`: Additional styles
+    - `extra_js`: Additional JavaScript
 
 3. **Load required template tags**
-   ```django
-   {% load static %}
-   {% load mptt_tags %}
-   {% load thumbnail %}
-   ```
+    ```django
+    {% load static %}
+    {% load mptt_tags %}
+    {% load thumbnail %}
+    {% load dict_extras %}
+    ```
 
 4. **Use URL names for links**
-   ```django
-   <a href="{% url 'box_detail' box.id %}">
-   ```
+    ```django
+    <a href="{% url 'box_detail' box.id %}">
+    ```
 
 5. **Use icons with Font Awesome**
-   ```django
-   <i class="fas fa-box"></i>
-   ```
+    ```django
+    <i class="fas fa-box"></i>
+    ```
 
 6. **Add breadcrumbs for navigation**
-   ```django
-   <p class="breadcrumb">
-       <a href="/"><i class="fas fa-home"></i> Home</a> / 
-       <a href="/box/{{ box.id }}/"><i class="fas fa-box"></i> Box {{ box.id }}</a>
-   </p>
-   ```
+    ```django
+    <p class="breadcrumb">
+        <a href="/"><i class="fas fa-home"></i> Home</a> / 
+        <a href="/box/{{ box.id }}/"><i class="fas fa-box"></i> Box {{ box.id }}</a>
+    </p>
+    ```
+
+7. **Icon alignment in lists**: When using icons in list items, use fixed width containers to ensure proper alignment
+    ```django
+    <a href="{% url 'thing_detail' thing.id %}" style="display: inline-block; width: 20px; text-align: center;">
+        <i class="fas fa-link"></i>
+    </a>
+    ```
+
+### Markdown Support
+
+The `Thing.description` field supports Markdown formatting with HTML sanitization for security.
+
+**Available Template Filters:**
+
+- `render_markdown`: Converts Markdown text to sanitized HTML with automatic link handling
+  - Converts Markdown syntax (headers, lists, bold, italic, links, code, tables, etc.)
+  - Sanitizes HTML using `bleach` to prevent XSS attacks
+  - Automatically adds `target="_blank"` and `rel="noopener noreferrer"` to external links
+  - Use in `thing_detail.html` for full rendered Markdown
+
+- `truncate_markdown`: Converts Markdown to plain text and truncates
+  - Strips HTML tags after Markdown conversion
+  - Adds ellipsis (`...`) if text exceeds specified length (default: 100)
+  - Use in `box_detail.html` or search API previews where space is limited
+
+**Usage Examples:**
+```django
+<!-- Full Markdown rendering -->
+<div class="markdown-content">
+    {{ thing.description|render_markdown }}
+</div>
+
+<!-- Truncated plain text preview -->
+{{ thing.description|truncate_markdown:100 }}
+```
+
+**Supported Markdown Features:**
+- Bold: `**text**` or `__text__`
+- Italic: `*text*` or `_text_`
+- Headers: `# Header 1`, `## Header 2`, etc.
+- Lists: `- item` or `1. item`
+- Links: `[text](url)`
+- Code: `` `code` `` or ` ```code block``` 
+- Blockquotes: `> quote`
+- Tables: `| A | B |\n|---|---|`
+
+**Security:**
+- All Markdown is sanitized before rendering
+- Dangerous HTML tags (`<script>`, `<iframe>`, etc.) are stripped
+- Only safe HTML tags and attributes are allowed
+- External links automatically get `target="_blank"` and security attributes
 
 ## Forms
 
 | Form | Model | Purpose |
 |------|-------|---------|
-| `ThingForm` | Thing | Add/edit a thing (name, type, description, picture) |
+| `ThingForm` | Thing | Add/edit a thing (name, description, picture) - tags managed separately |
 | `ThingPictureForm` | Thing | Upload/change thing picture only |
 | `ThingFileForm` | ThingFile | Add file attachment |
 | `ThingLinkForm` | ThingLink | Add link |
@@ -499,6 +559,7 @@ Per `.gitignore`:
 5. **Templates in labhelper/templates/**: The base template and shared templates are in `labhelper/templates/`. App-specific templates remain in `app_name/templates/`.
 6. **Use get_object_or_404** instead of bare `.get()` calls
 7. **Never commit SECRET_KEY** - use environment variables in production
+8. **Be careful with process management**: Avoid blanket kills on ports (e.g., `lsof -ti:8000 | xargs kill -9`) as they can kill unintended processes like web browsers. Use specific process kills instead: `pkill -f "process_name"`
 
 ## Deployment Commands
 

Dockerfile

@@ -34,6 +34,7 @@ WORKDIR /app
 COPY --chown=appuser:appuser . .
 ENV PYTHONDONTWRITEBYTECODE=1
 ENV PYTHONUNBUFFERED=1
+ENV IMAGE_TAG=build
 USER appuser
 EXPOSE 8000
 RUN rm -rvf /app/Dockerfile* \
@@ -47,5 +48,5 @@ RUN rm -rvf /app/Dockerfile* \
            /app/*.json \
            /app/test_*.py && \
        python3 /app/manage.py collectstatic --noinput
-CMD ["sh", "-c", "python manage.py thumbnail clear && gunicorn --bind 0.0.0.0:8000 --workers 3 labhelper.wsgi:application"]
+CMD ["sh", "-c", "python manage.py thumbnail clear && gunicorn --bind 0.0.0.0:8000 --workers 3 $GUNICORN_OPTS labhelper.wsgi:application"]
 

argocd/configmap.yaml

@@ -0,0 +1,22 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: django-config
+  namespace: labhelper
+data:
+  DEBUG: "False"
+  ALLOWED_HOSTS: "labhelper.adebaumann.com,*"
+  ALLOWED_CIDR_NETS: "10.0.0.0/16"
+  LANGUAGE_CODE: "en-us"
+  TIME_ZONE: "UTC"
+  USE_I18N: "True"
+  USE_TZ: "True"
+  STATIC_URL: "/static/"
+  MEDIA_URL: "/media/"
+  CSRF_TRUSTED_ORIGINS: "https://labhelper.adebaumann.com"
+  LOGIN_URL: "login"
+  LOGIN_REDIRECT_URL: "index"
+  LOGOUT_REDIRECT_URL: "login"
+  TRUSTED_PROXIES: "192.168.17.44,192.168.17.53"
+  GUNICORN_OPTS: "--access-logfile -"
+  IMAGE_TAG: "0.071"

argocd/deployment.yaml

@@ -27,7 +27,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/labhelper:0.049
+          image: git.baumann.gr/adebaumann/labhelper:0.071
           imagePullPolicy: Always
           ports:
             - containerPort: 8000
@@ -37,6 +37,86 @@ spec:
                 secretKeyRef:
                   name: django-secret
                   key: secret-key
+            - name: DEBUG
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: DEBUG
+            - name: ALLOWED_HOSTS
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: ALLOWED_HOSTS
+            - name: ALLOWED_CIDR_NETS
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: ALLOWED_CIDR_NETS
+            - name: LANGUAGE_CODE
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: LANGUAGE_CODE
+            - name: TIME_ZONE
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: TIME_ZONE
+            - name: USE_I18N
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: USE_I18N
+            - name: USE_TZ
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: USE_TZ
+            - name: STATIC_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: STATIC_URL
+            - name: MEDIA_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: MEDIA_URL
+            - name: CSRF_TRUSTED_ORIGINS
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: CSRF_TRUSTED_ORIGINS
+            - name: LOGIN_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: LOGIN_URL
+            - name: LOGIN_REDIRECT_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: LOGIN_REDIRECT_URL
+            - name: LOGOUT_REDIRECT_URL
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: LOGOUT_REDIRECT_URL
+            - name: TRUSTED_PROXIES
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: TRUSTED_PROXIES
+            - name: GUNICORN_OPTS
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: GUNICORN_OPTS
+            - name: IMAGE_TAG
+              valueFrom:
+                configMapKeyRef:
+                  name: django-config
+                  key: IMAGE_TAG
           volumeMounts:
             - name: data
               mountPath: /app/data

argocd/nfs-pv.yaml

@@ -4,6 +4,9 @@ metadata:
   name: labhelper-data-pv
   namespace: labhelper
 spec:
+  claimRef:
+    name: labhelper-data-pvc
+    namespace: labhelper
   capacity:
     storage: 2Gi
   accessModes:
@@ -12,4 +15,4 @@ spec:
   storageClassName: nfs
   nfs:
     server: 192.168.17.199
-    path: /mnt/user/labhelper
+    path: /mnt/user/labhelper

argocd/nfs-storageclass.yaml

@@ -1,8 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: nfs
-provisioner: kubernetes.io/no-provisioner
-allowVolumeExpansion: true
-reclaimPolicy: Retain
-volumeBindingMode: Immediate

boxes/admin.py

@@ -1,10 +1,48 @@
+import json
+
 from django import forms
 from django.contrib import admin
+from django.contrib.admin import SimpleListFilter
+from django.http import JsonResponse
+from django.urls import path
 from django.utils.html import format_html
+from django.views.decorators.http import require_POST
 
 from .models import Box, BoxType, Facet, Tag, Thing, ThingFile, ThingLink
 
 
+class BoxFilter(SimpleListFilter):
+    """Custom filter for boxes using pk to avoid spaces in aliases."""
+
+    title = 'box'
+    parameter_name = 'box__pk'
+
+    def lookups(self, request, model_admin):
+        boxes = Box.objects.select_related('box_type').order_by('sort_order')
+        return [(box.pk, str(box)) for box in boxes]
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(box__pk=self.value())
+        return queryset
+
+
+class TagsFilter(SimpleListFilter):
+    """Custom filter for tags using pk to avoid spaces in aliases."""
+
+    title = 'tags'
+    parameter_name = 'tags__pk'
+
+    def lookups(self, request, model_admin):
+        tags = Tag.objects.select_related('facet').order_by('facet__name', 'name')
+        return [(tag.pk, str(tag)) for tag in tags]
+
+    def queryset(self, request, queryset):
+        if self.value():
+            return queryset.filter(tags__pk=self.value())
+        return queryset
+
+
 @admin.register(BoxType)
 class BoxTypeAdmin(admin.ModelAdmin):
     """Admin configuration for BoxType model."""
@@ -17,9 +55,34 @@ class BoxTypeAdmin(admin.ModelAdmin):
 class BoxAdmin(admin.ModelAdmin):
     """Admin configuration for Box model."""
 
-    list_display = ('id', 'box_type')
+    ordering = ['sort_order']
+    list_display = ('id', 'box_type', 'sort_order')
     list_filter = ('box_type',)
     search_fields = ('id',)
+    change_list_template = 'admin/boxes/box/change_list.html'
+
+    def get_urls(self):
+        urls = super().get_urls()
+        custom_urls = [
+            path('reorder/', self.admin_site.admin_view(self.reorder_view), name='boxes_box_reorder'),
+        ]
+        return custom_urls + urls
+
+    def reorder_view(self, request):
+        """Handle AJAX reorder requests."""
+        if request.method != 'POST':
+            return JsonResponse({'error': 'POST required'}, status=405)
+
+        try:
+            data = json.loads(request.body)
+            order = data.get('order', [])
+
+            for index, pk in enumerate(order):
+                Box.objects.filter(pk=pk).update(sort_order=index)
+
+            return JsonResponse({'status': 'ok'})
+        except (json.JSONDecodeError, KeyError) as e:
+            return JsonResponse({'error': str(e)}, status=400)
 
 
 class ThingFileInline(admin.TabularInline):
@@ -42,7 +105,7 @@ class ThingAdmin(admin.ModelAdmin):
     """Admin configuration for Thing model."""
 
     list_display = ('name', 'box')
-    list_filter = ('box', 'tags')
+    list_filter = (BoxFilter, TagsFilter)
     search_fields = ('name', 'description')
     filter_horizontal = ('tags',)
     inlines = [ThingFileInline, ThingLinkInline]

boxes/forms.py

@@ -4,15 +4,14 @@ from .models import Box, BoxType, Thing, ThingFile, ThingLink
 
 
 class ThingForm(forms.ModelForm):
-    """Form for adding a Thing."""
+    """Form for adding/editing a Thing."""
 
     class Meta:
         model = Thing
-        fields = ('name', 'description', 'picture', 'tags')
+        fields = ('name', 'description', 'picture')
         widgets = {
             'name': forms.TextInput(attrs={'class': 'form-control'}),
             'description': forms.Textarea(attrs={'class': 'form-control', 'rows': 4}),
-            'tags': forms.CheckboxSelectMultiple(attrs={'class': 'tags-checkboxes'}),
         }
 
 

boxes/management/commands/clean_orphaned_images.py

@@ -4,144 +4,196 @@ from django.conf import settings
 from django.core.management.base import BaseCommand
 from django.db.models import F
 from sorl.thumbnail.models import KVStore
-from boxes.models import Thing
+from boxes.models import Thing, ThingFile
 
 
 class Command(BaseCommand):
-    help = 'Clean up orphaned images and thumbnails from deleted things'
+    help = "Clean up orphaned images, files, and thumbnails from deleted things"
 
     def add_arguments(self, parser):
         parser.add_argument(
-            '--dry-run',
-            action='store_true',
-            dest='dry_run',
-            help='Show what would be deleted without actually deleting',
+            "--dry-run",
+            action="store_true",
+            dest="dry_run",
+            help="Show what would be deleted without actually deleting",
         )
 
     def handle(self, *args, **options):
-        dry_run = options.get('dry_run', False)
-        
+        dry_run = options.get("dry_run", False)
+
         if dry_run:
-            self.stdout.write(self.style.WARNING('DRY RUN - No files will be deleted'))
-        
-        self.stdout.write('Finding orphaned images and thumbnails...')
-        
+            self.stdout.write(self.style.WARNING("DRY RUN - No files will be deleted"))
+
+        self.stdout.write("Finding orphaned images and thumbnails...")
+
         media_root = settings.MEDIA_ROOT
-        cache_root = os.path.join(media_root, 'cache')
-        things_root = os.path.join(media_root, 'things')
-        
+        cache_root = os.path.join(media_root, "cache")
+        things_root = os.path.join(media_root, "things")
+
         if not os.path.exists(things_root):
-            self.stdout.write(self.style.WARNING('No things directory found'))
+            self.stdout.write(self.style.WARNING("No things directory found"))
             return
-        
+
         valid_paths = set()
-        for thing in Thing.objects.exclude(picture__exact='').exclude(picture__isnull=True):
+        for thing in Thing.objects.exclude(picture__exact="").exclude(
+            picture__isnull=True
+        ):
             if thing.picture:
                 valid_paths.add(os.path.basename(thing.picture.name))
-        
-        self.stdout.write(f'Found {len(valid_paths)} valid images in database')
-        
+
+        for thing_file in ThingFile.objects.all():
+            if thing_file.file:
+                if thing_file.file.name.startswith("things/"):
+                    relative_path = thing_file.file.name[7:]
+                    valid_paths.add(relative_path)
+
+        self.stdout.write(
+            f"Found {len(valid_paths)} valid images and files in database"
+        )
+
         orphaned_thumbnail_paths = set()
         db_cache_paths = set()
-        
-        for kvstore in KVStore.objects.filter(key__startswith='sorl-thumbnail||image||'):
+
+        for kvstore in KVStore.objects.filter(
+            key__startswith="sorl-thumbnail||image||"
+        ):
             try:
                 data = json.loads(kvstore.value)
-                name = data.get('name', '')
-                if name.startswith('things/'):
+                name = data.get("name", "")
+                if name.startswith("things/"):
                     filename = os.path.basename(name)
                     if filename not in valid_paths:
-                        image_hash = kvstore.key.split('||')[-1]
-                        thumbnail_kvstore = KVStore.objects.filter(key=f'sorl-thumbnail||thumbnails||{image_hash}').first()
+                        image_hash = kvstore.key.split("||")[-1]
+                        thumbnail_kvstore = KVStore.objects.filter(
+                            key=f"sorl-thumbnail||thumbnails||{image_hash}"
+                        ).first()
                         if thumbnail_kvstore:
                             thumbnail_list = json.loads(thumbnail_kvstore.value)
                             for thumbnail_hash in thumbnail_list:
-                                thumbnail_image_kvstore = KVStore.objects.filter(key=f'sorl-thumbnail||image||{thumbnail_hash}').first()
+                                thumbnail_image_kvstore = KVStore.objects.filter(
+                                    key=f"sorl-thumbnail||image||{thumbnail_hash}"
+                                ).first()
                                 if thumbnail_image_kvstore:
-                                    thumbnail_data = json.loads(thumbnail_image_kvstore.value)
-                                    thumbnail_path = thumbnail_data.get('name', '')
-                                    if thumbnail_path.startswith('cache/'):
+                                    thumbnail_data = json.loads(
+                                        thumbnail_image_kvstore.value
+                                    )
+                                    thumbnail_path = thumbnail_data.get("name", "")
+                                    if thumbnail_path.startswith("cache/"):
                                         orphaned_thumbnail_paths.add(thumbnail_path)
-                elif name.startswith('cache/'):
+                elif name.startswith("cache/"):
                     db_cache_paths.add(name)
             except (json.JSONDecodeError, KeyError, AttributeError):
                 pass
-        
+
         deleted_count = 0
         thumbnail_deleted_count = 0
         empty_dirs_removed = 0
-        
+
         for root, dirs, files in os.walk(things_root, topdown=False):
             for filename in files:
                 file_path = os.path.join(root, filename)
                 relative_path = os.path.relpath(file_path, things_root)
-                
+
                 if relative_path not in valid_paths:
                     deleted_count += 1
                     if dry_run:
-                        self.stdout.write(f'Would delete: {file_path}')
+                        self.stdout.write(f"Would delete: {file_path}")
                     else:
                         try:
                             os.remove(file_path)
-                            self.stdout.write(f'Deleted: {file_path}')
+                            self.stdout.write(f"Deleted: {file_path}")
                         except OSError as e:
-                            self.stdout.write(self.style.ERROR(f'Failed to delete {file_path}: {e}'))
-            
+                            self.stdout.write(
+                                self.style.ERROR(f"Failed to delete {file_path}: {e}")
+                            )
+
             for dirname in dirs:
                 dir_path = os.path.join(root, dirname)
                 if not os.listdir(dir_path):
                     if dry_run:
-                        self.stdout.write(f'Would remove empty directory: {dir_path}')
+                        self.stdout.write(f"Would remove empty directory: {dir_path}")
                     else:
                         try:
                             os.rmdir(dir_path)
-                            self.stdout.write(f'Removed empty directory: {dir_path}')
+                            self.stdout.write(f"Removed empty directory: {dir_path}")
                             empty_dirs_removed += 1
                         except OSError as e:
-                            self.stdout.write(self.style.ERROR(f'Failed to remove {dir_path}: {e}'))
-        
+                            self.stdout.write(
+                                self.style.ERROR(f"Failed to remove {dir_path}: {e}")
+                            )
+
         if os.path.exists(cache_root):
             for root, dirs, files in os.walk(cache_root, topdown=False):
                 for filename in files:
                     file_path = os.path.join(root, filename)
                     relative_path = os.path.relpath(file_path, media_root)
-                    
+
                     if relative_path in orphaned_thumbnail_paths:
                         thumbnail_deleted_count += 1
                         if dry_run:
-                            self.stdout.write(f'Would delete thumbnail (orphaned image): {file_path}')
+                            self.stdout.write(
+                                f"Would delete thumbnail (orphaned image): {file_path}"
+                            )
                         else:
                             try:
                                 os.remove(file_path)
-                                self.stdout.write(f'Deleted thumbnail (orphaned image): {file_path}')
+                                self.stdout.write(
+                                    f"Deleted thumbnail (orphaned image): {file_path}"
+                                )
                             except OSError as e:
-                                self.stdout.write(self.style.ERROR(f'Failed to delete {file_path}: {e}'))
+                                self.stdout.write(
+                                    self.style.ERROR(
+                                        f"Failed to delete {file_path}: {e}"
+                                    )
+                                )
                     elif relative_path not in db_cache_paths:
                         thumbnail_deleted_count += 1
                         if dry_run:
-                            self.stdout.write(f'Would delete thumbnail (no db entry): {file_path}')
+                            self.stdout.write(
+                                f"Would delete thumbnail (no db entry): {file_path}"
+                            )
                         else:
                             try:
                                 os.remove(file_path)
-                                self.stdout.write(f'Deleted thumbnail (no db entry): {file_path}')
+                                self.stdout.write(
+                                    f"Deleted thumbnail (no db entry): {file_path}"
+                                )
                             except OSError as e:
-                                self.stdout.write(self.style.ERROR(f'Failed to delete {file_path}: {e}'))
-                
+                                self.stdout.write(
+                                    self.style.ERROR(
+                                        f"Failed to delete {file_path}: {e}"
+                                    )
+                                )
+
                 for dirname in dirs:
                     dir_path = os.path.join(root, dirname)
                     if not os.listdir(dir_path):
                         if dry_run:
-                            self.stdout.write(f'Would remove empty cache directory: {dir_path}')
+                            self.stdout.write(
+                                f"Would remove empty cache directory: {dir_path}"
+                            )
                         else:
                             try:
                                 os.rmdir(dir_path)
                                 empty_dirs_removed += 1
                             except OSError as e:
-                                self.stdout.write(self.style.ERROR(f'Failed to remove {dir_path}: {e}'))
-        
+                                self.stdout.write(
+                                    self.style.ERROR(
+                                        f"Failed to remove {dir_path}: {e}"
+                                    )
+                                )
+
         if dry_run:
-            self.stdout.write(self.style.WARNING(f'\nDry run complete. Would delete {deleted_count} images and {thumbnail_deleted_count} thumbnails'))
-            self.stdout.write(f'Would remove {empty_dirs_removed} empty directories')
+            self.stdout.write(
+                self.style.WARNING(
+                    f"\nDry run complete. Would delete {deleted_count} files and {thumbnail_deleted_count} thumbnails"
+                )
+            )
+            self.stdout.write(f"Would remove {empty_dirs_removed} empty directories")
         else:
-            self.stdout.write(self.style.SUCCESS(f'\nCleanup complete! Deleted {deleted_count} images and {thumbnail_deleted_count} thumbnails'))
-            self.stdout.write(f'Removed {empty_dirs_removed} empty directories')
+            self.stdout.write(
+                self.style.SUCCESS(
+                    f"\nCleanup complete! Deleted {deleted_count} files and {thumbnail_deleted_count} thumbnails"
+                )
+            )
+            self.stdout.write(f"Removed {empty_dirs_removed} empty directories")

boxes/migrations/0011_alter_box_options_box_sort_order.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.2.9 on 2026-01-19 23:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boxes', '0010_remove_thingtype'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='box',
+            options={'ordering': ['sort_order'], 'verbose_name_plural': 'boxes'},
+        ),
+        migrations.AddField(
+            model_name='box',
+            name='sort_order',
+            field=models.PositiveIntegerField(db_index=True, default=0, help_text='Order in which boxes are displayed'),
+        ),
+    ]

boxes/models.py

@@ -41,9 +41,15 @@ class Box(models.Model):
         on_delete=models.PROTECT,
         related_name='boxes'
     )
+    sort_order = models.PositiveIntegerField(
+        default=0,
+        db_index=True,
+        help_text='Order in which boxes are displayed'
+    )
 
     class Meta:
         verbose_name_plural = 'boxes'
+        ordering = ['sort_order']
 
     def __str__(self):
         return self.id

boxes/templates/admin/boxes/box/change_list.html

@@ -0,0 +1,126 @@
+{% extends "admin/change_list.html" %}
+
+{% block extrahead %}
+{{ block.super }}
+<style>
+    #result_list tbody tr {
+        cursor: move;
+    }
+    #result_list tbody tr.dragging {
+        opacity: 0.5;
+        background: #ffffd0;
+    }
+    #result_list tbody tr.drag-over {
+        border-top: 2px solid #417690;
+    }
+</style>
+{% endblock %}
+
+{% block result_list %}
+{{ block.super }}
+<script>
+document.addEventListener('DOMContentLoaded', function() {
+    const tbody = document.querySelector('#result_list tbody');
+    if (!tbody) return;
+
+    let draggedRow = null;
+
+    tbody.querySelectorAll('tr').forEach(row => {
+        row.draggable = true;
+
+        row.addEventListener('dragstart', function(e) {
+            draggedRow = this;
+            this.classList.add('dragging');
+            e.dataTransfer.effectAllowed = 'move';
+        });
+
+        row.addEventListener('dragend', function() {
+            this.classList.remove('dragging');
+            tbody.querySelectorAll('tr').forEach(r => r.classList.remove('drag-over'));
+            draggedRow = null;
+        });
+
+        row.addEventListener('dragover', function(e) {
+            e.preventDefault();
+            e.dataTransfer.dropEffect = 'move';
+            if (this !== draggedRow) {
+                this.classList.add('drag-over');
+            }
+        });
+
+        row.addEventListener('dragleave', function() {
+            this.classList.remove('drag-over');
+        });
+
+        row.addEventListener('drop', function(e) {
+            e.preventDefault();
+            this.classList.remove('drag-over');
+
+            if (draggedRow && this !== draggedRow) {
+                const allRows = Array.from(tbody.querySelectorAll('tr'));
+                const draggedIndex = allRows.indexOf(draggedRow);
+                const targetIndex = allRows.indexOf(this);
+
+                if (draggedIndex < targetIndex) {
+                    this.parentNode.insertBefore(draggedRow, this.nextSibling);
+                } else {
+                    this.parentNode.insertBefore(draggedRow, this);
+                }
+
+                saveOrder();
+            }
+        });
+    });
+
+    function saveOrder() {
+        const rows = tbody.querySelectorAll('tr');
+        const order = [];
+
+        rows.forEach(row => {
+            // Use the action checkbox which contains the PK
+            const checkbox = row.querySelector('input[name="_selected_action"]');
+            if (checkbox) {
+                order.push(checkbox.value);
+            }
+        });
+
+        fetch('{% url "admin:boxes_box_reorder" %}', {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-CSRFToken': document.querySelector('[name=csrfmiddlewaretoken]')?.value || getCookie('csrftoken')
+            },
+            body: JSON.stringify({ order: order })
+        })
+        .then(response => response.json())
+        .then(data => {
+            if (data.status === 'ok') {
+                window.location.reload();
+            } else {
+                console.error('Reorder failed:', data.error);
+                alert('Failed to save order');
+            }
+        })
+        .catch(error => {
+            console.error('Reorder error:', error);
+            alert('Failed to save order');
+        });
+    }
+
+    function getCookie(name) {
+        let cookieValue = null;
+        if (document.cookie && document.cookie !== '') {
+            const cookies = document.cookie.split(';');
+            for (let i = 0; i < cookies.length; i++) {
+                const cookie = cookies[i].trim();
+                if (cookie.substring(0, name.length + 1) === (name + '=')) {
+                    cookieValue = decodeURIComponent(cookie.substring(name.length + 1));
+                    break;
+                }
+            }
+        }
+        return cookieValue;
+    }
+});
+</script>
+{% endblock %}

boxes/templates/boxes/box_detail.html

@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load thumbnail %}
+{% load dict_extras %}
 
 {% block title %}Box {{ box.id }} - LabHelper{% endblock %}
 
@@ -65,7 +66,7 @@
                         <span style="color: #999; font-style: italic; font-size: 13px;">-</span>
                         {% endif %}
                     </td>
-                    <td style="padding: 15px 20px; color: #777;">{{ thing.description|default:"-" }}</td>
+                    <td style="padding: 15px 20px; color: #777;">{{ thing.description|truncate_markdown:100|default:"-" }}</td>
                 </tr>
                 {% endfor %}
             </tbody>

boxes/templates/boxes/boxes_list.html

@@ -0,0 +1,74 @@
+{% extends "base.html" %}
+
+{% block title %}Boxes - LabHelper{% endblock %}
+
+{% block page_header %}
+<div class="page-header">
+    <h1><i class="fas fa-boxes"></i> Boxes</h1>
+    <p class="breadcrumb">
+        <a href="/"><i class="fas fa-home"></i> Home</a> / Boxes
+    </p>
+</div>
+{% endblock %}
+
+{% block content %}
+{% if boxes %}
+<div class="section" style="overflow-x: auto;">
+    <table style="width: 100%; border-collapse: collapse;">
+        <thead>
+            <tr style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white;">
+                <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Box ID</th>
+                <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Type</th>
+                <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Dimensions (mm)</th>
+                <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Contents</th>
+                <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Item Count</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for box in boxes %}
+            <tr style="border-bottom: 1px solid #e0e0e0; transition: background 0.2s;" class="box-row">
+                <td style="padding: 15px 20px; font-weight: 700; color: #667eea;">
+                    <a href="{% url 'box_detail' box.id %}" style="text-decoration: none; color: inherit;">Box {{ box.id }}</a>
+                </td>
+                <td style="padding: 15px 20px;">{{ box.box_type.name }}</td>
+                <td style="padding: 15px 20px;">{{ box.box_type.width }} x {{ box.box_type.height }} x {{ box.box_type.length }}</td>
+                <td style="padding: 15px 20px; color: #555;">
+                    {% if box.things.all %}
+                        <div style="display: flex; flex-wrap: wrap; gap: 5px;">
+                            {% for thing in box.things.all %}
+                                <a href="{% url 'thing_detail' thing.id %}" style="display: inline-block; padding: 4px 10px; background: #f0f0f0; border-radius: 12px; text-decoration: none; color: #333; font-size: 13px; font-weight: 500;">{{ thing.name }}</a>
+                            {% endfor %}
+                        </div>
+                    {% else %}
+                        <span style="color: #999; font-style: italic;">Empty</span>
+                    {% endif %}
+                </td>
+                <td style="padding: 15px 20px; font-weight: 600;">{{ box.things.count }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% else %}
+<div class="section" style="text-align: center; padding: 60px 30px;">
+    <i class="fas fa-box-open" style="font-size: 64px; color: #ddd; margin-bottom: 20px; display: block;"></i>
+    <h3 style="color: #888; font-size: 20px;">No boxes found</h3>
+    <p style="color: #999; margin-top: 10px;">Create your first box to get started.</p>
+</div>
+{% endif %}
+{% endblock %}
+
+{% block extra_js %}
+<script>
+$(document).ready(function() {
+    $('.box-row').hover(
+        function() {
+            $(this).css('background', '#f8f9fa');
+        },
+        function() {
+            $(this).css('background', 'white');
+        }
+    );
+});
+</script>
+{% endblock %}

boxes/templates/boxes/edit_thing.html

@@ -0,0 +1,324 @@
+{% extends "base.html" %}
+{% load thumbnail %}
+{% load dict_extras %}
+
+{% block title %}Edit {{ thing.name }} - LabHelper{% endblock %}
+
+{% block page_header %}
+<div class="page-header">
+    <h1><i class="fas fa-edit"></i> Edit {{ thing.name }}</h1>
+    <p class="breadcrumb">
+        <a href="/"><i class="fas fa-home"></i> Home</a> / 
+        <a href="/box/{{ thing.box.id }}/"><i class="fas fa-box"></i> Box {{ thing.box.id }}</a> / 
+        <a href="{% url 'thing_detail' thing.id %}">{{ thing.name }}</a> / 
+        Edit
+    </p>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="section">
+    <h2 style="color: #667eea; font-size: 20px; font-weight: 700; margin-top: 0; margin-bottom: 20px; display: flex; align-items: center; gap: 10px;">
+        <i class="fas fa-info-circle"></i> Basic Information
+    </h2>
+    <form method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        <input type="hidden" name="action" value="save_details">
+        <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px,1fr)); gap: 20px;">
+            <div>
+                <label for="id_name" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">
+                    <i class="fas fa-cube"></i> Name
+                </label>
+                {{ thing_form.name }}
+            </div>
+            <div>
+                <label for="id_description" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">
+                    <i class="fas fa-align-left"></i> Description (Markdown)
+                </label>
+                {{ thing_form.description }}
+            </div>
+        </div>
+        <div style="margin-top: 20px;">
+            <button type="submit" class="btn">
+                <i class="fas fa-save"></i> Save Changes
+            </button>
+            <a href="{% url 'thing_detail' thing.id %}" class="btn" style="background: linear-gradient(135deg, #95a5a6 0%, #7f8c8d 100%);">
+                <i class="fas fa-times"></i> Cancel
+            </a>
+        </div>
+    </form>
+</div>
+
+<div class="section">
+    <div style="display: flex; gap: 40px; flex-wrap: wrap;">
+        <div class="thing-image" style="flex-shrink: 0; width: 100%; max-width: 400px;">
+            {% if thing.picture %}
+            {% thumbnail thing.picture "400x400" crop="center" as thumb %}
+            <img src="{{ thumb.url }}" alt="{{ thing.name }}" style="width: 100%; height: auto; max-height: 400px; object-fit: cover; border-radius: 12px; box-shadow: 0 8px 24px rgba(0,0,0,0.15);">
+            {% endthumbnail %}
+            {% else %}
+            <div style="width: 100%; aspect-ratio: 1; max-width: 400px; max-height: 400px; background: linear-gradient(135deg, #e0e0e0 0%, #f0f0f0 100%); display: flex; align-items: center; justify-content: center; color: #999; border-radius: 12px; box-shadow: 0 8px 24px rgba(0,0,0,0.15);">
+                <div style="text-align: center;">
+                    <i class="fas fa-image" style="font-size: 64px; margin-bottom: 15px; display: block;"></i>
+                    No image
+                </div>
+            </div>
+            {% endif %}
+
+            <form method="post" enctype="multipart/form-data" style="margin-top: 20px;">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="upload_picture">
+                <div style="display: flex; gap: 10px; flex-wrap: wrap;">
+                    <label class="btn" style="cursor: pointer; display: inline-flex; align-items: center; gap: 8px;">
+                        <i class="fas fa-camera"></i>
+                        <span>{% if thing.picture %}Change picture{% else %}Add picture{% endif %}</span>
+                        <input type="file" id="picture_upload" name="picture" accept="image/*" style="display: none;" onchange="this.form.submit();">
+                    </label>
+                    {% if thing.picture %}
+                    <button type="submit" name="action" value="delete_picture" class="btn" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); border: none;" onclick="return confirm('Are you sure you want to delete this picture?');">
+                        <i class="fas fa-trash"></i>
+                        <span>Remove</span>
+                    </button>
+                    {% endif %}
+                </div>
+            </form>
+        </div>
+        
+        <div class="thing-details" style="flex-grow: 1; min-width: 300px;">
+            <div class="detail-row" style="margin-bottom: 25px;">
+                <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
+                    <i class="fas fa-tags"></i> Tags
+                </div>
+                <div style="display: flex; flex-direction: column; gap: 12px;">
+                    {% regroup thing.tags.all by facet as facet_list %}
+                    {% for facet in facet_list %}
+                    <div>
+                        <div style="font-size: 12px; color: {{ facet.grouper.color }}; font-weight: 700; margin-bottom: 4px; text-transform: uppercase; letter-spacing: 0.5px;">
+                            {{ facet.grouper.name }}
+                        </div>
+                        <div style="display: flex; flex-wrap: wrap; gap: 8px;">
+                            {% for tag in facet.list %}
+                            <form method="post" style="display: inline;" onsubmit="return confirm('Remove tag {{ tag.facet.name }}:{{ tag.name }}?');">
+                                {% csrf_token %}
+                                <input type="hidden" name="action" value="remove_tag">
+                                <input type="hidden" name="tag_id" value="{{ tag.id }}">
+                                <button type="submit" style="display: inline-flex; align-items: center; gap: 6px; padding: 6px 12px; background: {{ facet.grouper.color }}20; color: {{ facet.grouper.color }}; border: 2px solid {{ facet.grouper.color }}; border-radius: 20px; font-size: 14px; font-weight: 600; cursor: pointer; transition: all 0.3s;">
+                                    {{ tag.name }}
+                                    <i class="fas fa-times" style="font-size: 12px;"></i>
+                                </button>
+                            </form>
+                            {% endfor %}
+                        </div>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            
+            <div class="detail-row" style="margin-bottom: 25px;">
+                <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
+                    <i class="fas fa-map-marker-alt"></i> Location
+                </div>
+                <form method="post" style="display: inline;">
+                    {% csrf_token %}
+                    <input type="hidden" name="action" value="move">
+                    <div style="display: flex; align-items: center; gap: 15px; flex-wrap: wrap;">
+                        <select name="new_box" style="padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 15px; background: white; cursor: pointer; transition: all 0.3s;">
+                            {% for box in boxes %}
+                            <option value="{{ box.id }}" {% if box.id == thing.box.id %}selected{% endif %}>
+                                Box {{ box.id }} ({{ box.box_type.name }})
+                            </option>
+                            {% endfor %}
+                        </select>
+                        <button type="submit" class="btn" style="height: 42px;">
+                            <i class="fas fa-arrows-alt"></i> Move
+                        </button>
+                    </div>
+                </form>
+            </div>
+
+            {% if thing.files.all %}
+            <div class="detail-row" style="margin-bottom: 25px;">
+                <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
+                    <i class="fas fa-file-alt"></i> Files
+                </div>
+                <div style="display: flex; flex-direction: column; gap: 10px;">
+                    {% for file in thing.files.all %}
+                    <div style="display: flex; align-items: center; justify-content: space-between; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
+                        <div style="display: flex; align-items: center; gap: 10px;">
+                            <i class="fas fa-paperclip" style="color: #667eea; font-size: 16px;"></i>
+                            <a href="{{ file.file.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ file.title }}</a>
+                            <span style="color: #999; font-size: 12px;">({{ file.filename }})</span>
+                        </div>
+                        <form method="post" style="display: inline;" onsubmit="return confirm('Are you sure you want to delete this file?');">
+                            {% csrf_token %}
+                            <input type="hidden" name="action" value="delete_file">
+                            <input type="hidden" name="file_id" value="{{ file.id }}">
+                            <button type="submit" style="background: none; border: none; cursor: pointer; color: #e74c3c; padding: 5px; transition: all 0.3s;" onmouseover="this.style.color='#c0392b'" onmouseout="this.style.color='#e74c3c'">
+                                <i class="fas fa-times" style="font-size: 14px;"></i>
+                            </button>
+                        </form>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
+
+            {% if thing.links.all %}
+            <div class="detail-row" style="margin-bottom: 25px;">
+                <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
+                    <i class="fas fa-link"></i> Links
+                </div>
+                <div style="display: flex; flex-direction: column; gap: 10px;">
+                    {% for link in thing.links.all %}
+                    <div style="display: flex; align-items: center; justify-content: space-between; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
+                        <div style="display: flex; align-items: center; gap: 10px;">
+                            <i class="fas fa-external-link-alt" style="color: #667eea; font-size: 16px;"></i>
+                            <a href="{{ link.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ link.title }}</a>
+                        </div>
+                        <form method="post" style="display: inline;" onsubmit="return confirm('Are you sure you want to delete this link?');">
+                            {% csrf_token %}
+                            <input type="hidden" name="action" value="delete_link">
+                            <input type="hidden" name="link_id" value="{{ link.id }}">
+                            <button type="submit" style="background: none; border: none; cursor: pointer; color: #e74c3c; padding: 5px; transition: all 0.3s;" onmouseover="this.style.color='#c0392b'" onmouseout="this.style.color='#e74c3c'">
+                                <i class="fas fa-times" style="font-size: 14px;"></i>
+                            </button>
+                        </form>
+                    </div>
+                    {% endfor %}
+                </div>
+            </div>
+            {% endif %}
+            </div>
+        </div>
+    </div>
+</div>
+
+<div class="section">
+    <h2 style="color: #667eea; font-size: 20px; font-weight: 700; margin-top: 0; margin-bottom: 20px; display: flex; align-items: center; gap: 10px;">
+        <i class="fas fa-plus-circle"></i> Add Tags
+    </h2>
+    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px,1fr)); gap: 30px;">
+        <div>
+            <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
+                <i class="fas fa-tag"></i> Add Tag
+            </h3>
+            <form method="post">
+                {% csrf_token %}
+                <input type="hidden" name="action" value="add_tag">
+                <div style="display: flex; flex-direction: column; gap: 15px;">
+                    <div>
+                        <label for="tag_select" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Select Tag</label>
+                        <select name="tag_id" id="tag_select" style="width: 100%; padding: 12px 16px; border: 2px solid #e0e0e0; border-radius: 10px; font-size: 15px; background: white; cursor: pointer; transition: all 0.3s;">
+                            <option value="">-- Select a tag --</option>
+                            {% for facet in facets %}
+                            <optgroup label="{{ facet.name }} ({{ facet.get_cardinality_display }})">
+                                {% for tag in facet.tags.all %}
+                                {% if tag not in thing.tags.all %}
+                                <option value="{{ tag.id }}">
+                                    {{ tag.name }}
+                                </option>
+                                {% endif %}
+                                {% endfor %}
+                            </optgroup>
+                            {% endfor %}
+                        </select>
+                    </div>
+                    <button type="submit" class="btn">
+                        <i class="fas fa-plus"></i> Add Tag
+                    </button>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+
+<div class="section">
+    <h2 style="color: #667eea; font-size: 20px; font-weight: 700; margin-top: 0; margin-bottom: 20px; display: flex; align-items: center; gap: 10px;">
+        <i class="fas fa-plus-circle"></i> Add Attachments
+    </h2>
+    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px,1fr)); gap: 30px;">
+    <div>
+        <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
+            <i class="fas fa-file-upload"></i> Upload File
+        </h3>
+        <form method="post" enctype="multipart/form-data">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="add_file">
+            <div style="display: flex; flex-direction: column; gap: 15px;">
+                <div>
+                    <label for="file_title" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Title</label>
+                    <input type="text" id="file_title" name="title" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
+                </div>
+                <div>
+                    <label for="file_upload" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">File</label>
+                    <input type="file" id="file_upload" name="file" style="width: 100%; padding: 10px 15px; border: 2px dashed #e0e0e0; border-radius: 8px; font-size: 14px; background: #f8f9fa;">
+                </div>
+                <button type="submit" class="btn">
+                    <i class="fas fa-upload"></i> Upload File
+                </button>
+            </div>
+        </form>
+    </div>
+    <div>
+        <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
+            <i class="fas fa-link"></i> Add Link
+        </h3>
+        <form method="post">
+            {% csrf_token %}
+            <input type="hidden" name="action" value="add_link">
+            <div style="display: flex; flex-direction: column; gap: 15px;">
+                <div>
+                    <label for="link_title" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Title</label>
+                    <input type="text" id="link_title" name="title" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
+                </div>
+                <div>
+                    <label for="link_url" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">URL</label>
+                    <input type="url" id="link_url" name="url" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
+                </div>
+                <button type="submit" class="btn">
+                    <i class="fas fa-plus"></i> Add Link
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block extra_css %}
+<style>
+#id_name, #id_description {
+    width: 100%;
+    padding: 10px 15px;
+    border: 2px solid #e0e0e0;
+    border-radius: 8px;
+    font-size: 15px;
+    background: white;
+    transition: all 0.3s;
+}
+#id_name:focus, #id_description:focus {
+    border-color: #667eea;
+    box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.1);
+    outline: none;
+}
+#id_description {
+    min-height: 120px;
+    font-family: inherit;
+}
+.detail-row {
+    margin-bottom: 25px;
+}
+</style>
+{% endblock %}
+
+{% block extra_js %}
+<script>
+$('#tag_select').on('focus', function() {
+    $(this).css('border-color', '#667eea');
+    $(this).css('box-shadow', '0 0 0 3px rgba(102, 126, 234, 0.1)');
+}).on('blur', function() {
+    $(this).css('border-color', '#e0e0e0');
+    $(this).css('box-shadow', 'none');
+});
+</script>
+{% endblock %}

boxes/templates/boxes/fixme.html

@@ -0,0 +1,145 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}Fixme - LabHelper{% endblock %}
+
+{% block page_header %}
+<div class="page-header">
+    <h1><i class="fas fa-exclamation-triangle"></i> Fixme</h1>
+    <p class="breadcrumb">Find and fix things missing tags for specific facets</p>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="section">
+    <h2><i class="fas fa-tags"></i> Select a Facet</h2>
+    
+    {% if facets %}
+        <form method="get" action="{% url 'fixme' %}" class="facet-selector">
+            <select name="facet_id" id="facet-select" onchange="this.form.submit()" class="form-control">
+                <option value="">-- Choose a facet --</option>
+                {% for facet in facets %}
+                    <option value="{{ facet.id }}" {% if selected_facet and selected_facet.id == facet.id %}selected{% endif %}>
+                        {{ facet.name }}
+                    </option>
+                {% endfor %}
+            </select>
+            <noscript>
+                <button type="submit" class="btn btn-sm">
+                    <i class="fas fa-search"></i> Show Missing Things
+                </button>
+            </noscript>
+        </form>
+    {% else %}
+        <p style="color: #888;">No facets found. Please create some facets first.</p>
+    {% endif %}
+</div>
+
+{% if selected_facet %}
+<div class="section">
+    <h2><i class="fas fa-exclamation-circle"></i> Things Missing "{{ selected_facet.name }}" Tags</h2>
+    
+    {% if missing_things %}
+        <form method="post" action="{% url 'fixme' %}" id="fixme-form">
+            {% csrf_token %}
+            <input type="hidden" name="facet_id" value="{{ selected_facet.id }}">
+            
+            <div class="tags-selection" style="margin-bottom: 20px;">
+                <h3><i class="fas fa-plus-circle"></i> Add Tags:</h3>
+                {% if selected_facet.tags.all %}
+                    {% for tag in selected_facet.tags.all %}
+                        <label style="display: inline-block; margin-right: 15px; margin-bottom: 10px;">
+                            <input type="checkbox" name="tag_ids" value="{{ tag.id }}" 
+                                   {% if selected_facet.cardinality == 'single' %}onclick="uncheckOtherTags(this)"{% endif %}>
+                            <span style="background: {{ tag.facet.color }}; color: white; padding: 2px 8px; border-radius: 4px; font-size: 12px;">
+                                {{ tag.name }}
+                            </span>
+                        </label>
+                    {% endfor %}
+                    {% if selected_facet.cardinality == 'single' %}
+                        <p style="color: #888; font-size: 12px; margin-top: 10px;">
+                            <i class="fas fa-info-circle"></i> This facet allows only one tag per thing.
+                        </p>
+                    {% endif %}
+                {% else %}
+                    <p style="color: #888;">No tags available for this facet. Please create some tags first.</p>
+                {% endif %}
+            </div>
+            
+            <div class="things-list" style="margin-bottom: 20px;">
+                <h3><i class="fas fa-box"></i> Things to Update:</h3>
+                {% for thing in missing_things %}
+                    <div style="background: #f8f9fa; padding: 10px; margin: 5px 0; border-radius: 5px; border-left: 4px solid #667eea;">
+                        <label style="display: block; cursor: pointer; width: 100%;">
+                            <input type="checkbox" name="thing_ids" value="{{ thing.id }}" style="margin-right: 10px;">
+                            <strong>{{ thing.name }}</strong>
+                            <span style="color: #888; margin-left: 10px;">(Box: {{ thing.box.id }})</span>
+                        </label>
+                    </div>
+                {% endfor %}
+            </div>
+            
+            <div class="actions">
+                <button type="submit" class="btn">
+                    <i class="fas fa-save"></i> Add Selected Tags to Selected Things
+                </button>
+                <a href="{% url 'fixme' %}" class="btn btn-secondary">
+                    <i class="fas fa-times"></i> Clear Selection
+                </a>
+            </div>
+        </form>
+    {% else %}
+        <p style="color: #28a745;">
+            <i class="fas fa-check-circle"></i> All things have tags for "{{ selected_facet.name }}" facet!
+        </p>
+        <a href="{% url 'fixme' %}" class="btn btn-secondary">
+            <i class="fas fa-arrow-left"></i> Back to Facet Selection
+        </a>
+    {% endif %}
+</div>
+{% endif %}
+
+{% block extra_js %}
+<script>
+function uncheckOtherTags(checkbox) {
+    // For single cardinality facets, uncheck all other checkboxes
+    var checkboxes = document.querySelectorAll('input[name="tag_ids"]');
+    checkboxes.forEach(function(cb) {
+        if (cb !== checkbox) {
+            cb.checked = false;
+        }
+    });
+}
+
+// Add select all/none functionality for things
+document.addEventListener('DOMContentLoaded', function() {
+    var fixmeForm = document.getElementById('fixme-form');
+    if (fixmeForm) {
+        var thingsList = fixmeForm.querySelector('.things-list');
+        if (thingsList) {
+            var header = document.createElement('div');
+            header.style.marginBottom = '10px';
+            header.innerHTML = `
+                <small>
+                    <a href="#" onclick="selectAllThings(); return false;">Select All</a> | 
+                    <a href="#" onclick="deselectAllThings(); return false;">Deselect All</a>
+                </small>
+            `;
+            thingsList.insertBefore(header, thingsList.firstChild.nextSibling);
+        }
+    }
+});
+
+function selectAllThings() {
+    var checkboxes = document.querySelectorAll('input[name="thing_ids"]');
+    checkboxes.forEach(function(cb) { cb.checked = true; });
+}
+
+function deselectAllThings() {
+    var checkboxes = document.querySelectorAll('input[name="thing_ids"]');
+    checkboxes.forEach(function(cb) { cb.checked = false; });
+}
+</script>
+{% endblock %}
+{% endblock %}

boxes/templates/boxes/index.html

@@ -11,34 +11,37 @@
 
 {% block content %}
 <div class="section">
-    <h2><i class="fas fa-box"></i> Boxes</h2>
-    {% if boxes %}
-    <div class="box-grid" style="display: grid; grid-template-columns: repeat(auto-fill, minmax(250px, 1fr)); gap: 20px;">
-        {% for box in boxes %}
-        <div class="box-card" style="background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); padding: 20px; border-radius: 12px; border: 1px solid #e0e0e0; transition: all 0.3s ease; cursor: pointer;">
-            <a href="{% url 'box_detail' box.id %}" style="text-decoration: none; color: #333; display: block;">
-                <div class="box-id" style="font-size: 20px; font-weight: 700; color: #667eea; margin-bottom: 8px;">
-                    <i class="fas fa-cube"></i> Box {{ box.id }}
-                </div>
-                <div class="box-type" style="font-size: 15px; color: #555; margin-bottom: 5px;">
-                    {{ box.box_type.name }}
-                </div>
-                <div class="box-type" style="font-size: 13px; color: #777; margin-bottom: 5px;">
-                    <i class="fas fa-ruler-combined"></i> {{ box.box_type.width }} x {{ box.box_type.height }} x {{ box.box_type.length }} mm
-                </div>
-                <div class="box-type" style="font-size: 13px; color: #777;">
-                    <i class="fas fa-layer-group"></i> {{ box.things.count }} item{{ box.things.count|pluralize }}
-                </div>
-            </a>
-        </div>
-        {% endfor %}
-    </div>
-    {% else %}
-    <p style="text-align: center; color: #888; font-size: 16px; padding: 40px;">
-        <i class="fas fa-box-open" style="font-size: 48px; margin-bottom: 15px; display: block;"></i>
-        No boxes found.
+    <input type="text"
+           id="search-input"
+           placeholder="Search for things..."
+           style="width: 100%; padding: 16px 20px; font-size: 18px; border: 2px solid #e0e0e0; border-radius: 12px; box-sizing: border-box; transition: all 0.3s;"
+           {% if request.GET.q %}value="{{ request.GET.q }}"{% endif %}>
+    <p style="color: #888; font-size: 14px; margin-top: 10px;">
+        <i class="fas fa-info-circle"></i> Type at least 2 characters to search
     </p>
-    {% endif %}
+</div>
+
+<div id="results-container" style="display: none;">
+    <div class="section" style="overflow-x: auto; padding: 0;">
+        <table style="width: 100%; border-collapse: collapse;">
+            <thead>
+                <tr style="background: linear-gradient(135deg, #667eea 0%, #764ba2 100%); color: white;">
+                    <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Name</th>
+                    <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Tags</th>
+                    <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Box</th>
+                    <th style="padding: 15px 20px; text-align: left; font-weight: 600;">Description</th>
+                </tr>
+            </thead>
+            <tbody id="results-body">
+            </tbody>
+        </table>
+    </div>
+</div>
+
+<div id="no-results" class="section" style="text-align: center; padding: 60px 30px; display: none;">
+    <i class="fas fa-search-minus" style="font-size: 64px; color: #ddd; margin-bottom: 20px; display: block;"></i>
+    <h3 style="color: #888; font-size: 20px;">No results found</h3>
+    <p style="color: #999; margin-top: 10px;">Try different keywords or browse the full inventory.</p>
 </div>
 
 <div class="section">
@@ -57,7 +60,7 @@
             <div class="facet-tags" style="padding: 15px 20px; display: none;">
                 <div style="display: flex; flex-wrap: wrap; gap: 8px;">
                     {% for tag, count in tags_with_counts %}
-		    <a href="/search/?q={{ facet.name }}:{{ tag.name }}" style="display: inline-block; padding: 6px 12px; background: {{ facet.color }}20; color: {{ facet.color }}; border: 1px solid {{ facet.color }}; border-radius: 15px; text-decoration: none; font-size: 14px; font-weight: 600; transition: all 0.2s;">
+		    <a href="/?q={{ facet.name }}:{{ tag.name }}" style="display: inline-block; padding: 6px 12px; background: {{ facet.color }}20; color: {{ facet.color }}; border: 1px solid {{ facet.color }}; border-radius: 15px; text-decoration: none; font-size: 14px; font-weight: 600; transition: all 0.2s;">
                         {{ tag.name }}
                         <span style="background: {{ facet.color }}; color: white; padding: 1px 8px; border-radius: 10px; margin-left: 6px; font-size: 12px;">{{ count }}</span>
                     </a>
@@ -79,6 +82,97 @@
 {% block extra_js %}
 <script>
 $(document).ready(function() {
+    const searchInput = document.getElementById('search-input');
+    const resultsContainer = document.getElementById('results-container');
+    const resultsBody = document.getElementById('results-body');
+    const noResults = document.getElementById('no-results');
+
+    let searchTimeout = null;
+
+    function performSearch(query) {
+        if (query.length < 2) {
+            resultsContainer.style.display = 'none';
+            noResults.style.display = 'none';
+            return;
+        }
+
+        searchInput.style.borderColor = '#667eea';
+        searchInput.style.boxShadow = '0 0 0 3px rgba(102, 126, 234, 0.1)';
+
+        searchTimeout = setTimeout(function() {
+            fetch('/search/api/?q=' + encodeURIComponent(query))
+                .then(response => response.json())
+                .then(data => {
+                    resultsBody.innerHTML = '';
+
+                    if (data.results.length === 0) {
+                        resultsContainer.style.display = 'none';
+                        noResults.style.display = 'block';
+                        return;
+                    }
+
+                    noResults.style.display = 'none';
+                    resultsContainer.style.display = 'block';
+
+                    data.results.forEach(function(thing) {
+                        const row = document.createElement('tr');
+                        row.style.borderBottom = '1px solid #e0e0e0';
+                        row.style.transition = 'background 0.2s';
+
+                        let tagsHtml = thing.tags.length > 0
+                            ? thing.tags.map(tag => 
+                                '<span style="display: inline-block; padding: 3px 8px; margin: 2px; border-radius: 12px; font-size: 11px; background: ' + escapeHtml(tag.color) + '20; color: ' + escapeHtml(tag.color) + '; border: 1px solid ' + escapeHtml(tag.color) + '40;">' + escapeHtml(tag.name) + '</span>'
+                            ).join('')
+                            : '<span style="color: #999; font-style: italic; font-size: 13px;">-</span>';
+
+                        row.innerHTML =
+                            '<td style="padding: 15px 20px;"><a href="/thing/' + thing.id + '/">' + escapeHtml(thing.name) + '</a></td>' +
+                            '<td style="padding: 15px 20px;">' + tagsHtml + '</td>' +
+                            '<td style="padding: 15px 20px;"><a href="/box/' + escapeHtml(thing.box) + '/">' + escapeHtml(thing.box) + '</a></td>' +
+                            '<td style="padding: 15px 20px; color: #777;" class="description">' + escapeHtml(thing.description) + '</td>';
+
+                        row.addEventListener('mouseenter', function() {
+                            this.style.background = '#f8f9fa';
+                        });
+                        row.addEventListener('mouseleave', function() {
+                            this.style.background = 'white';
+                        });
+
+                        resultsBody.appendChild(row);
+                    });
+                });
+        }, 200);
+    }
+
+    searchInput.addEventListener('input', function() {
+        const query = this.value.trim();
+
+        if (searchTimeout) {
+            clearTimeout(searchTimeout);
+        }
+
+        performSearch(query);
+    });
+
+    searchInput.addEventListener('blur', function() {
+        searchInput.style.borderColor = '#e0e0e0';
+        searchInput.style.boxShadow = 'none';
+    });
+
+    function escapeHtml(text) {
+        const div = document.createElement('div');
+        div.textContent = text;
+        return div.innerHTML;
+    }
+
+    const urlParams = new URLSearchParams(window.location.search);
+    const initialQuery = urlParams.get('q');
+
+    if (initialQuery) {
+        searchInput.value = initialQuery;
+        performSearch(initialQuery.trim());
+    }
+
     $('.facet-header').click(function() {
         const $content = $(this).next('.facet-tags');
         const $icon = $(this).find('.facet-toggle');
@@ -99,17 +193,6 @@ $(document).ready(function() {
             $(this).css('transform', 'scale(1)');
         }
     );
-
-    $('.box-card').hover(
-        function() {
-            $(this).css('transform', 'translateY(-5px)');
-            $(this).css('box-shadow', '0 12px 24px rgba(102, 126, 234, 0.2)');
-        },
-        function() {
-            $(this).css('transform', 'translateY(0)');
-            $(this).css('box-shadow', 'none');
-        }
-    );
 });
 </script>
 {% endblock %}

boxes/templates/boxes/resources_list.html

@@ -0,0 +1,41 @@
+{% extends "base.html" %}
+
+{% load static %}
+
+{% block title %}Resources - LabHelper{% endblock %}
+
+{% block page_header %}
+<div class="page-header">
+    <h1><i class="fas fa-folder-open"></i> Resources</h1>
+    <p class="breadcrumb">All links and files from things</p>
+</div>
+{% endblock %}
+
+{% block content %}
+<div class="section">
+    <h2><i class="fas fa-list"></i> All Resources</h2>
+    {% if resources %}
+        <ul style="list-style: none; padding: 0;">
+            {% for resource in resources %}
+                <li style="padding: 8px 0; border-bottom: 1px solid #eee;">
+                    <a href="{% url 'thing_detail' resource.thing_id %}" style="display: inline-block; width: 20px; text-align: center; color: #667eea; text-decoration: none;">
+                        {% if resource.type == 'link' %}
+                            <i class="fas fa-link"></i>
+                        {% else %}
+                            <i class="fas fa-file"></i>
+                        {% endif %}
+                    </a>
+                    <strong>{{ resource.thing_name }}</strong>:
+                    {% if resource.type == 'link' %}
+                        <a href="{{ resource.url }}" target="_blank" rel="noopener noreferrer">{{ resource.title }}</a>
+                    {% else %}
+                        <a href="{{ resource.url }}">{{ resource.title }}</a>
+                    {% endif %}
+                </li>
+            {% endfor %}
+        </ul>
+    {% else %}
+        <p style="color: #888;">No resources found.</p>
+    {% endif %}
+</div>
+{% endblock %}

boxes/templates/boxes/thing_detail.html

@@ -1,16 +1,22 @@
 {% extends "base.html" %}
 {% load thumbnail %}
+{% load dict_extras %}
 
 {% block title %}{{ thing.name }} - LabHelper{% endblock %}
 
 {% block page_header %}
-<div class="page-header">
-    <h1><i class="fas fa-cube"></i> {{ thing.name }}</h1>
-    <p class="breadcrumb">
-        <a href="/"><i class="fas fa-home"></i> Home</a> / 
-        <a href="/box/{{ thing.box.id }}/"><i class="fas fa-box"></i> Box {{ thing.box.id }}</a> / 
-        {{ thing.name }}
-    </p>
+<div class="page-header" style="display: flex; justify-content: space-between; align-items: start;">
+    <div>
+        <h1><i class="fas fa-cube"></i> {{ thing.name }}</h1>
+        <p class="breadcrumb">
+            <a href="/"><i class="fas fa-home"></i> Home</a> / 
+            <a href="/box/{{ thing.box.id }}/"><i class="fas fa-box"></i> Box {{ thing.box.id }}</a> / 
+            {{ thing.name }}
+        </p>
+    </div>
+    <a href="{% url 'edit_thing' thing.id %}" class="btn" style="margin-top: 10px;">
+        <i class="fas fa-edit"></i> Edit
+    </a>
 </div>
 {% endblock %}
 
@@ -20,7 +26,7 @@
         <div class="thing-image" style="flex-shrink: 0; width: 100%; max-width: 400px;">
             {% if thing.picture %}
             {% thumbnail thing.picture "400x400" crop="center" as thumb %}
-            <img src="{{ thumb.url }}" alt="{{ thing.name }}" style="width: 100%; height: auto; max-height: 400px; object-fit: cover; border-radius: 12px; box-shadow: 0 8px 24px rgba(0,0,0,0.15);">
+            <img class="lightbox-trigger" data-url="{{ thing.picture.url }}" src="{{ thumb.url }}" alt="{{ thing.name }}" style="width: 100%; height: auto; max-height: 400px; object-fit: cover; border-radius: 12px; box-shadow: 0 8px 24px rgba(0,0,0,0.15); cursor: pointer; transition: transform 0.2s;" onmouseover="this.style.transform='scale(1.02)'" onmouseout="this.style.transform='scale(1)'">
             {% endthumbnail %}
             {% else %}
             <div style="width: 100%; aspect-ratio: 1; max-width: 400px; max-height: 400px; background: linear-gradient(135deg, #e0e0e0 0%, #f0f0f0 100%); display: flex; align-items: center; justify-content: center; color: #999; border-radius: 12px; box-shadow: 0 8px 24px rgba(0,0,0,0.15);">
@@ -30,27 +36,10 @@
                 </div>
             </div>
             {% endif %}
-
-            <form method="post" enctype="multipart/form-data" style="margin-top: 20px;">
-                {% csrf_token %}
-                <input type="hidden" name="action" value="upload_picture">
-                <div style="display: flex; gap: 10px; flex-wrap: wrap;">
-                    <label class="btn" style="cursor: pointer; display: inline-flex; align-items: center; gap: 8px;">
-                        <i class="fas fa-camera"></i>
-                        <span>{% if thing.picture %}Change picture{% else %}Add picture{% endif %}</span>
-                        <input type="file" id="picture_upload" name="picture" accept="image/*" style="display: none;" onchange="this.form.submit();">
-                    </label>
-                    {% if thing.picture %}
-                    <button type="submit" name="action" value="delete_picture" class="btn" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); border: none;" onclick="return confirm('Are you sure you want to delete this picture?');">
-                        <i class="fas fa-trash"></i>
-                        <span>Remove</span>
-                    </button>
-                    {% endif %}
-                </div>
-            </form>
         </div>
         
         <div class="thing-details" style="flex-grow: 1; min-width: 300px;">
+            {% if thing.tags.all %}
             <div class="detail-row" style="margin-bottom: 25px;">
                 <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
                     <i class="fas fa-tags"></i> Tags
@@ -64,21 +53,16 @@
                         </div>
                         <div style="display: flex; flex-wrap: wrap; gap: 8px;">
                             {% for tag in facet.list %}
-                            <form method="post" style="display: inline;" onsubmit="return confirm('Remove tag {{ tag.facet.name }}:{{ tag.name }}?');">
-                                {% csrf_token %}
-                                <input type="hidden" name="action" value="remove_tag">
-                                <input type="hidden" name="tag_id" value="{{ tag.id }}">
-                                <button type="submit" style="display: inline-flex; align-items: center; gap: 6px; padding: 6px 12px; background: {{ facet.grouper.color }}20; color: {{ facet.grouper.color }}; border: 2px solid {{ facet.grouper.color }}; border-radius: 20px; font-size: 14px; font-weight: 600; cursor: pointer; transition: all 0.3s;">
-                                    {{ tag.name }}
-                                    <i class="fas fa-times" style="font-size: 12px;"></i>
-                                </button>
-                            </form>
+                            <span style="display: inline-flex; align-items: center; gap: 6px; padding: 6px 12px; background: {{ facet.grouper.color }}20; color: {{ facet.grouper.color }}; border: 2px solid {{ facet.grouper.color }}; border-radius: 20px; font-size: 14px; font-weight: 600;">
+                                {{ tag.name }}
+                            </span>
                             {% endfor %}
                         </div>
                     </div>
                     {% endfor %}
                 </div>
             </div>
+            {% endif %}
             
             <div class="detail-row" style="margin-bottom: 25px;">
                 <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
@@ -95,8 +79,8 @@
                 <div style="font-size: 14px; color: #888; font-weight: 600; margin-bottom: 8px;">
                     <i class="fas fa-align-left"></i> Description
                 </div>
-                <div style="font-size: 16px; color: #555; line-height: 1.6; white-space: pre-wrap;">
-{% spaceless %}{{ thing.description }}{% endspaceless %}
+                <div class="markdown-content" style="font-size: 16px; color: #555; line-height: 1.6;">
+                    {{ thing.description|render_markdown }}
                 </div>
             </div>
             {% endif %}
@@ -108,21 +92,24 @@
                 </div>
                 <div style="display: flex; flex-direction: column; gap: 10px;">
                     {% for file in thing.files.all %}
-                    <div style="display: flex; align-items: center; justify-content: space-between; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
-                        <div style="display: flex; align-items: center; gap: 10px;">
-                            <i class="fas fa-paperclip" style="color: #667eea; font-size: 16px;"></i>
+                    {% if file.filename|lower|slice:"-4:" == '.jpg' or file.filename|lower|slice:"-5:" == '.jpeg' or file.filename|lower|slice:"-4:" == '.png' or file.filename|lower|slice:"-5:" == '.webp' or file.filename|lower|slice:"-4:" == '.gif' or file.filename|lower|slice:"-4:" == '.svg' or file.filename|lower|slice:"-4:" == '.bmp' or file.filename|lower|slice:"-5:" == '.tiff' or file.filename|lower|slice:"-4:" == '.ico' %}
+                    {% thumbnail file.file "200x200" crop="center" as thumb %}
+                    <div style="display: flex; align-items: center; gap: 10px; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border:1px solid #e9ecef;">
+                        <img class="lightbox-trigger" data-url="{{ file.file.url }}" src="{{ thumb.url }}" alt="{{ file.title }}" style="width: 60px; height: 60px; object-fit: cover; border-radius: 6px; cursor: pointer; box-shadow: 0 2px 8px rgba(0,0,0,0.1); transition: transform 0.2s;" onmouseover="this.style.transform='scale(1.05)'" onmouseout="this.style.transform='scale(1)'">
+                        <div style="flex-grow: 1;">
                             <a href="{{ file.file.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ file.title }}</a>
                             <span style="color: #999; font-size: 12px;">({{ file.filename }})</span>
                         </div>
-                        <form method="post" style="display: inline;" onsubmit="return confirm('Are you sure you want to delete this file?');">
-                            {% csrf_token %}
-                            <input type="hidden" name="action" value="delete_file">
-                            <input type="hidden" name="file_id" value="{{ file.id }}">
-                            <button type="submit" style="background: none; border: none; cursor: pointer; color: #e74c3c; padding: 5px; transition: all 0.3s;" onmouseover="this.style.color='#c0392b'" onmouseout="this.style.color='#e74c3c'">
-                                <i class="fas fa-times" style="font-size: 14px;"></i>
-                            </button>
-                        </form>
+                        <i class="fas fa-expand lightbox-trigger" data-url="{{ file.file.url }}" style="color: #999; font-size: 14px; cursor: pointer;"></i>
                     </div>
+                    {% endthumbnail %}
+                    {% else %}
+                    <div style="display: flex; align-items: center; gap: 10px; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
+                        <i class="fas fa-paperclip" style="color: #667eea; font-size: 16px;"></i>
+                        <a href="{{ file.file.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ file.title }}</a>
+                        <span style="color: #999; font-size: 12px;">({{ file.filename }})</span>
+                    </div>
+                    {% endif %}
                     {% endfor %}
                 </div>
             </div>
@@ -135,152 +122,168 @@
                 </div>
                 <div style="display: flex; flex-direction: column; gap: 10px;">
                     {% for link in thing.links.all %}
-                    <div style="display: flex; align-items: center; justify-content: space-between; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
-                        <div style="display: flex; align-items: center; gap: 10px;">
-                            <i class="fas fa-external-link-alt" style="color: #667eea; font-size: 16px;"></i>
-                            <a href="{{ link.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ link.title }}</a>
-                        </div>
-                        <form method="post" style="display: inline;" onsubmit="return confirm('Are you sure you want to delete this link?');">
-                            {% csrf_token %}
-                            <input type="hidden" name="action" value="delete_link">
-                            <input type="hidden" name="link_id" value="{{ link.id }}">
-                            <button type="submit" style="background: none; border: none; cursor: pointer; color: #e74c3c; padding: 5px; transition: all 0.3s;" onmouseover="this.style.color='#c0392b'" onmouseout="this.style.color='#e74c3c'">
-                                <i class="fas fa-times" style="font-size: 14px;"></i>
-                            </button>
-                        </form>
+                    <div style="display: flex; align-items: center; gap: 10px; padding: 12px 15px; background: #f8f9fa; border-radius: 8px; border: 1px solid #e9ecef;">
+                        <i class="fas fa-external-link-alt" style="color: #667eea; font-size: 16px;"></i>
+                        <a href="{{ link.url }}" target="_blank" style="color: #667eea; text-decoration: none; font-weight: 500; font-size: 15px;">{{ link.title }}</a>
                     </div>
                     {% endfor %}
                 </div>
             </div>
             {% endif %}
-            </div>
         </div>
     </div>
 </div>
 
-<div class="section">
-    <h2 style="color: #667eea; font-size: 20px; font-weight: 700; margin-top: 0; margin-bottom: 20px; display: flex; align-items: center; gap: 10px;">
-        <i class="fas fa-plus-circle"></i> Add Tags
-    </h2>
-    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px,1fr)); gap: 30px;">
-        <div>
-            <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
-                <i class="fas fa-tag"></i> Add Tag
-            </h3>
-            <form method="post">
-                {% csrf_token %}
-                <input type="hidden" name="action" value="add_tag">
-                <div style="display: flex; flex-direction: column; gap: 15px;">
-                    <div>
-                        <label for="tag_select" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Select Tag</label>
-                        <select name="tag_id" id="tag_select" style="width: 100%; padding: 12px 16px; border: 2px solid #e0e0e0; border-radius: 10px; font-size: 15px; background: white; cursor: pointer; transition: all 0.3s;">
-                            <option value="">-- Select a tag --</option>
-                            {% for facet in facets %}
-                            <optgroup label="{{ facet.name }} ({{ facet.get_cardinality_display }})">
-                                {% for tag in facet.tags.all %}
-                                {% if tag not in thing.tags.all %}
-                                <option value="{{ tag.id }}">
-                                    {{ tag.name }}
-                                </option>
-                                {% endif %}
-                                {% endfor %}
-                            </optgroup>
-                            {% endfor %}
-                        </select>
-                    </div>
-                    <button type="submit" class="btn">
-                        <i class="fas fa-plus"></i> Add Tag
-                    </button>
-                </div>
-            </form>
-        </div>
-    </div>
+<div class="lightbox" id="lightbox">
+    <span class="lightbox-close">&times;</span>
+    <img id="lightbox-image" src="" alt="">
 </div>
-
-<div class="section">
-    <h2 style="color: #667eea; font-size: 20px; font-weight: 700; margin-top: 0; margin-bottom: 20px; display: flex; align-items: center; gap: 10px;">
-        <i class="fas fa-plus-circle"></i> Add Attachments
-    </h2>
-    <div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px,1fr)); gap: 30px;">
-    <div>
-        <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
-            <i class="fas fa-file-upload"></i> Upload File
-        </h3>
-        <form method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            <input type="hidden" name="action" value="add_file">
-            <div style="display: flex; flex-direction: column; gap: 15px;">
-                <div>
-                    <label for="file_title" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Title</label>
-                    <input type="text" id="file_title" name="title" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
-                </div>
-                <div>
-                    <label for="file_upload" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">File</label>
-                    <input type="file" id="file_upload" name="file" style="width: 100%; padding: 10px 15px; border: 2px dashed #e0e0e0; border-radius: 8px; font-size: 14px; background: #f8f9fa;">
-                </div>
-                <button type="submit" class="btn">
-                    <i class="fas fa-upload"></i> Upload File
-                </button>
-            </div>
-        </form>
-    </div>
-    <div>
-        <h3 style="margin: 0 0 15px 0; color: #667eea; font-size: 16px; font-weight: 600;">
-            <i class="fas fa-link"></i> Add Link
-        </h3>
-        <form method="post">
-            {% csrf_token %}
-            <input type="hidden" name="action" value="add_link">
-            <div style="display: flex; flex-direction: column; gap: 15px;">
-                <div>
-                    <label for="link_title" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">Title</label>
-                    <input type="text" id="link_title" name="title" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
-                </div>
-                <div>
-                    <label for="link_url" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">URL</label>
-                    <input type="url" id="link_url" name="url" style="width: 100%; padding: 10px 15px; border: 2px solid #e0e0e0; border-radius: 8px; font-size: 14px;">
-                </div>
-                <button type="submit" class="btn">
-                    <i class="fas fa-plus"></i> Add Link
-                </button>
-            </div>
-        </form>
-    </div>
-</div>
-
-<form method="post" class="section">
-    {% csrf_token %}
-    <input type="hidden" name="action" value="move">
-    <div style="display: flex; align-items: center; gap: 15px; flex-wrap: wrap;">
-        <div style="flex-grow: 1;">
-            <label for="new_box" style="font-weight: 600; color: #666; font-size: 14px; margin-bottom: 8px; display: block;">
-                <i class="fas fa-exchange-alt"></i> Move to:
-            </label>
-            <select name="new_box" id="new_box" style="width: 100%; max-width: 400px; padding: 12px 16px; border: 2px solid #e0e0e0; border-radius: 10px; font-size: 15px; background: white; cursor: pointer; transition: all 0.3s;">
-                <option value="">Select a box...</option>
-                {% for box in boxes %}
-                <option value="{{ box.id }}" {% if box.id == thing.box.id %}selected{% endif %}>
-                    Box {{ box.id }} ({{ box.box_type.name }})
-                </option>
-                {% endfor %}
-            </select>
-        </div>
-        <button type="submit" class="btn" style="height: 48px; min-width: 120px; margin-top: 24px;">
-            <i class="fas fa-arrows-alt"></i> Move
-        </button>
-    </div>
-</form>
-
 {% endblock %}
 
 {% block extra_js %}
 <script>
-$('#new_box').on('focus', function() {
-    $(this).css('border-color', '#667eea');
-    $(this).css('box-shadow', '0 0 0 3px rgba(102, 126, 234, 0.1)');
-}).on('blur', function() {
-    $(this).css('border-color', '#e0e0e0');
-    $(this).css('box-shadow', 'none');
+$(document).ready(function() {
+    $('.lightbox-trigger').on('click', function(e) {
+        e.preventDefault();
+        const imageUrl = $(this).data('url');
+        $('#lightbox-image').attr('src', imageUrl);
+        $('#lightbox').addClass('active');
+        $('body').css('overflow', 'hidden');
+    });
+
+    $('#lightbox').on('click', function(e) {
+        if (e.target === this || e.target.classList.contains('lightbox-close')) {
+            $('#lightbox').removeClass('active');
+            $('body').css('overflow', 'auto');
+        }
+    });
+
+    $(document).on('keydown', function(e) {
+        if (e.key === 'Escape') {
+            $('#lightbox').removeClass('active');
+            $('body').css('overflow', 'auto');
+        }
+    });
 });
 </script>
-{% endblock %}
+{% endblock %}
+
+{% block extra_css %}
+<style>
+.markdown-content p {
+    margin: 0 0 1em 0;
+}
+.markdown-content p:last-child {
+    margin-bottom: 0;
+}
+.markdown-content h1, .markdown-content h2, .markdown-content h3,
+.markdown-content h4, .markdown-content h5, .markdown-content h6 {
+    margin: 1.5em 0 0.5em 0;
+    color: #333;
+    font-weight: 600;
+}
+.markdown-content h1:first-child, .markdown-content h2:first-child,
+.markdown-content h3:first-child {
+    margin-top: 0;
+}
+.markdown-content ul, .markdown-content ol {
+    margin: 0.5em 0;
+    padding-left: 2em;
+}
+.markdown-content li {
+    margin: 0.25em 0;
+}
+.markdown-content code {
+    background: #f4f4f4;
+    padding: 2px 6px;
+    border-radius: 4px;
+    font-family: 'Consolas', 'Monaco', monospace;
+    font-size: 0.9em;
+}
+.markdown-content pre {
+    background: #f4f4f4;
+    padding: 15px;
+    border-radius: 8px;
+    overflow-x: auto;
+    margin: 1em 0;
+}
+.markdown-content pre code {
+    background: none;
+    padding: 0;
+}
+.markdown-content blockquote {
+    border-left: 4px solid #667eea;
+    margin: 1em 0;
+    padding: 0.5em 1em;
+    background: #f8f9fa;
+    color: #666;
+}
+.markdown-content a {
+    color: #667eea;
+    text-decoration: none;
+}
+.markdown-content a:hover {
+    text-decoration: underline;
+}
+.markdown-content table {
+    border-collapse: collapse;
+    width: 100%;
+    margin: 1em 0;
+}
+.markdown-content th, .markdown-content td {
+    border: 1px solid #e0e0e0;
+    padding: 8px 12px;
+    text-align: left;
+}
+.markdown-content th {
+    background: #f8f9fa;
+    font-weight: 600;
+}
+.markdown-content hr {
+    border: none;
+    border-top: 2px solid #e0e0e0;
+    margin: 1.5em 0;
+}
+
+.lightbox {
+    display: none;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.9);
+    z-index: 9999;
+    justify-content: center;
+    align-items: center;
+    cursor: zoom-out;
+}
+
+.lightbox.active {
+    display: flex;
+}
+
+.lightbox img {
+    max-width: 90%;
+    max-height: 90%;
+    object-fit: contain;
+    border-radius: 8px;
+    box-shadow: 0 0 30px rgba(0, 0, 0, 0.5);
+}
+
+.lightbox-close {
+    position: absolute;
+    top: 20px;
+    right: 30px;
+    color: white;
+    font-size: 40px;
+    cursor: pointer;
+    z-index: 10000;
+    transition: opacity 0.2s;
+}
+
+.lightbox-close:hover {
+    opacity: 0.7;
+}
+</style>
+{% endblock %}

boxes/templatetags/dict_extras.py

@@ -1,7 +1,95 @@
+import bleach
+import markdown
 from django import template
+from django.utils.safestring import mark_safe
 
 register = template.Library()
 
+
 @register.filter
 def get_item(dictionary, key):
-    return dictionary.get(key)
+    return dictionary.get(key)
+
+
+@register.filter
+def render_markdown(text):
+    """
+    Convert Markdown text to sanitized HTML.
+    
+    Uses bleach to sanitize HTML output and prevent XSS attacks.
+    Allows common formatting tags: bold, italic, links, lists, code, etc.
+    """
+    if not text:
+        return ''
+    
+    # Convert Markdown to HTML
+    html = markdown.markdown(
+        text,
+        extensions=[
+            'markdown.extensions.fenced_code',
+            'markdown.extensions.tables',
+            'markdown.extensions.nl2br',
+        ]
+    )
+    
+    # Allowed HTML tags and attributes for sanitization
+    allowed_tags = [
+        'p', 'br', 'strong', 'em', 'b', 'i', 'u',
+        'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
+        'ul', 'ol', 'li',
+        'a', 'code', 'pre',
+        'blockquote', 'hr',
+        'table', 'thead', 'tbody', 'tr', 'th', 'td',
+    ]
+    allowed_attrs = {
+        'a': ['href', 'title', 'target'],
+        'th': ['align'],
+        'td': ['align'],
+    }
+    
+    # Sanitize HTML
+    clean_html = bleach.clean(
+        html,
+        tags=allowed_tags,
+        attributes=allowed_attrs,
+        strip=True
+    )
+    
+    # Add target="_blank" and rel="noopener" to external links
+    clean_html = bleach.linkify(
+        clean_html,
+        callbacks=[_add_target_blank],
+        skip_tags=['pre', 'code']
+    )
+    
+    return mark_safe(clean_html)
+
+
+def _add_target_blank(attrs, new=False):
+    """Add target="_blank" and rel="noopener noreferrer" to links."""
+    attrs[(None, 'target')] = '_blank'
+    attrs[(None, 'rel')] = 'noopener noreferrer'
+    return attrs
+
+
+@register.filter
+def truncate_markdown(text, length=100):
+    """
+    Convert Markdown to plain text and truncate.
+    
+    Useful for showing a preview of Markdown content in listings.
+    """
+    if not text:
+        return ''
+    
+    # Convert Markdown to HTML, then strip tags
+    html = markdown.markdown(text)
+    plain_text = bleach.clean(html, tags=[], strip=True)
+    
+    # Normalize whitespace
+    plain_text = ' '.join(plain_text.split())
+    
+    # Truncate
+    if len(plain_text) > length:
+        return plain_text[:length].rsplit(' ', 1)[0] + '...'
+    return plain_text

boxes/views.py

@@ -1,5 +1,8 @@
+import bleach
+import markdown
+
 from django.contrib.auth.decorators import login_required
-from django.db.models import Q
+from django.db.models import Q, Prefetch
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404, redirect, render
 
@@ -7,6 +10,7 @@ from .forms import (
     BoxForm,
     BoxTypeForm,
     ThingFileForm,
+    ThingForm,
     ThingFormSet,
     ThingLinkForm,
     ThingPictureForm,
@@ -14,10 +18,21 @@ from .forms import (
 from .models import Box, BoxType, Facet, Tag, Thing, ThingFile, ThingLink
 
 
+def _strip_markdown(text, max_length=100):
+    """Convert Markdown to plain text and truncate."""
+    if not text:
+        return ''
+    html = markdown.markdown(text)
+    plain_text = bleach.clean(html, tags=[], strip=True)
+    plain_text = ' '.join(plain_text.split())
+    if len(plain_text) > max_length:
+        return plain_text[:max_length].rsplit(' ', 1)[0] + '...'
+    return plain_text
+
+
 @login_required
 def index(request):
-    """Home page with boxes and tags."""
-    boxes = Box.objects.select_related('box_type').all().order_by('id')
+    """Home page with search and tags."""
     facets = Facet.objects.all().prefetch_related('tags')
 
     facet_tag_counts = {}
@@ -30,7 +45,6 @@ def index(request):
                 facet_tag_counts[facet].append((tag, count))
 
     return render(request, 'boxes/index.html', {
-        'boxes': boxes,
         'facets': facets,
         'facet_tag_counts': facet_tag_counts,
     })
@@ -49,13 +63,23 @@ def box_detail(request, box_id):
 
 @login_required
 def thing_detail(request, thing_id):
-    """Display details of a thing."""
+    """Display details of a thing (read-only)."""
+    thing = get_object_or_404(
+        Thing.objects.select_related('box', 'box__box_type').prefetch_related('files', 'links', 'tags'),
+        pk=thing_id
+    )
+    return render(request, 'boxes/thing_detail.html', {'thing': thing})
+
+
+@login_required
+def edit_thing(request, thing_id):
+    """Edit a thing's details."""
     thing = get_object_or_404(
         Thing.objects.select_related('box', 'box__box_type').prefetch_related('files', 'links', 'tags'),
         pk=thing_id
     )
 
-    boxes = Box.objects.select_related('box_type').all().order_by('id')
+    boxes = Box.objects.select_related('box_type').all()
     facets = Facet.objects.all().prefetch_related('tags')
     picture_form = ThingPictureForm(instance=thing)
     file_form = ThingFileForm()
@@ -64,26 +88,32 @@ def thing_detail(request, thing_id):
     if request.method == 'POST':
         action = request.POST.get('action')
 
-        if action == 'move':
+        if action == 'save_details':
+            form = ThingForm(request.POST, request.FILES, instance=thing)
+            if form.is_valid():
+                form.save()
+                return redirect('thing_detail', thing_id=thing.id)
+
+        elif action == 'move':
             new_box_id = request.POST.get('new_box')
             if new_box_id:
                 new_box = get_object_or_404(Box, pk=new_box_id)
                 thing.box = new_box
                 thing.save()
-                return redirect('thing_detail', thing_id=thing.id)
+                return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'upload_picture':
             picture_form = ThingPictureForm(request.POST, request.FILES, instance=thing)
             if picture_form.is_valid():
                 picture_form.save()
-                return redirect('thing_detail', thing_id=thing.id)
+                return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'delete_picture':
             if thing.picture:
                 thing.picture.delete()
                 thing.picture = None
                 thing.save()
-            return redirect('thing_detail', thing_id=thing.id)
+            return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'add_file':
             file_form = ThingFileForm(request.POST, request.FILES)
@@ -91,7 +121,7 @@ def thing_detail(request, thing_id):
                 thing_file = file_form.save(commit=False)
                 thing_file.thing = thing
                 thing_file.save()
-                return redirect('thing_detail', thing_id=thing.id)
+                return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'add_link':
             link_form = ThingLinkForm(request.POST)
@@ -99,7 +129,7 @@ def thing_detail(request, thing_id):
                 thing_link = link_form.save(commit=False)
                 thing_link.thing = thing
                 thing_link.save()
-                return redirect('thing_detail', thing_id=thing.id)
+                return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'delete_file':
             file_id = request.POST.get('file_id')
@@ -110,7 +140,7 @@ def thing_detail(request, thing_id):
                     thing_file.delete()
                 except ThingFile.DoesNotExist:
                     pass
-            return redirect('thing_detail', thing_id=thing.id)
+            return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'delete_link':
             link_id = request.POST.get('link_id')
@@ -120,7 +150,7 @@ def thing_detail(request, thing_id):
                     thing_link.delete()
                 except ThingLink.DoesNotExist:
                     pass
-            return redirect('thing_detail', thing_id=thing.id)
+            return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'add_tag':
             tag_id = request.POST.get('tag_id')
@@ -134,7 +164,7 @@ def thing_detail(request, thing_id):
                     thing.tags.add(tag)
                 except Tag.DoesNotExist:
                     pass
-            return redirect('thing_detail', thing_id=thing.id)
+            return redirect('edit_thing', thing_id=thing.id)
 
         elif action == 'remove_tag':
             tag_id = request.POST.get('tag_id')
@@ -144,22 +174,28 @@ def thing_detail(request, thing_id):
                     thing.tags.remove(tag)
                 except Tag.DoesNotExist:
                     pass
-            return redirect('thing_detail', thing_id=thing.id)
+            return redirect('edit_thing', thing_id=thing.id)
 
-    return render(request, 'boxes/thing_detail.html', {
+    thing_form = ThingForm(instance=thing)
+
+    return render(request, 'boxes/edit_thing.html', {
         'thing': thing,
         'boxes': boxes,
         'facets': facets,
         'picture_form': picture_form,
         'file_form': file_form,
         'link_form': link_form,
+        'thing_form': thing_form,
     })
 
 
 @login_required
-def search(request):
-    """Search page for things."""
-    return render(request, 'boxes/search.html')
+def boxes_list(request):
+    """Boxes list page showing all boxes with contents."""
+    boxes = Box.objects.select_related('box_type').prefetch_related('things').all()
+    return render(request, 'boxes/boxes_list.html', {
+        'boxes': boxes,
+    })
 
 
 @login_required
@@ -198,7 +234,7 @@ def search_api(request):
             'id': thing.id,
             'name': thing.name,
             'box': thing.box.id,
-            'description': thing.description[:100] if thing.description else '',
+            'description': _strip_markdown(thing.description),
             'tags': [
                 {
                     'name': tag.name,
@@ -240,7 +276,7 @@ def add_things(request, box_id):
             things = formset.save(commit=False)
             created_count = 0
             for thing in things:
-                if thing.name or thing.thing_type or thing.description or thing.picture:
+                if thing.name or thing.description or thing.picture:
                     thing.box = box
                     thing.save()
                     created_count += 1
@@ -335,3 +371,81 @@ def delete_box(request, box_id):
             return redirect('box_management')
         box.delete()
     return redirect('box_management')
+
+
+@login_required
+def resources_list(request):
+    """List all links and files from things that have them."""
+    things_with_files = Thing.objects.filter(files__isnull=False).prefetch_related('files').distinct()
+    things_with_links = Thing.objects.filter(links__isnull=False).prefetch_related('links').distinct()
+    
+    all_things = (things_with_files | things_with_links).distinct().order_by('name')
+    
+    resources = []
+    for thing in all_things.prefetch_related('files', 'links'):
+        for file in thing.files.all():
+            resources.append({
+                'type': 'file',
+                'thing_name': thing.name,
+                'thing_id': thing.id,
+                'title': file.title,
+                'url': file.file.url,
+            })
+        for link in thing.links.all():
+            resources.append({
+                'type': 'link',
+                'thing_name': thing.name,
+                'thing_id': thing.id,
+                'title': link.title,
+                'url': link.url,
+            })
+    
+    return render(request, 'boxes/resources_list.html', {
+        'resources': resources,
+    })
+
+
+@login_required
+def fixme(request):
+    """Page to find and fix things missing tags for specific facets."""
+    facets = Facet.objects.all().prefetch_related('tags')
+    
+    selected_facet = None
+    missing_things = []
+    
+    if request.method == 'GET' and 'facet_id' in request.GET:
+        try:
+            selected_facet = Facet.objects.get(pk=request.GET['facet_id'])
+            # Find things that don't have any tag from this facet
+            missing_things = Thing.objects.exclude(
+                tags__facet=selected_facet
+            ).select_related('box', 'box__box_type').prefetch_related('tags')
+        except Facet.DoesNotExist:
+            selected_facet = None
+    
+    elif request.method == 'POST':
+        facet_id = request.POST.get('facet_id')
+        tag_ids = request.POST.getlist('tag_ids')
+        thing_ids = request.POST.getlist('thing_ids')
+        
+        if facet_id and tag_ids and thing_ids:
+            facet = get_object_or_404(Facet, pk=facet_id)
+            tags = Tag.objects.filter(id__in=tag_ids, facet=facet)
+            things = Thing.objects.filter(id__in=thing_ids)
+            
+            for thing in things:
+                if facet.cardinality == Facet.Cardinality.SINGLE:
+                    # Remove existing tags from this facet
+                    thing.tags.remove(*thing.tags.filter(facet=facet))
+                # Add new tags
+                for tag in tags:
+                    if tag.facet == facet:
+                        thing.tags.add(tag)
+        
+        return redirect('fixme')
+    
+    return render(request, 'boxes/fixme.html', {
+        'facets': facets,
+        'selected_facet': selected_facet,
+        'missing_things': missing_things,
+    })

gunicorn.conf.py

@@ -0,0 +1,45 @@
+import logging
+import os
+
+from gunicorn.glogging import Logger
+
+TRUSTED_PROXIES = {
+    ip.strip()
+    for ip in os.environ.get("TRUSTED_PROXIES", "").split(",")
+    if ip.strip()
+}
+
+
+class HealthCheckFilter(logging.Filter):
+    def filter(self, record):
+        message = record.getMessage()
+        return "kube-probe" not in message
+
+
+class CustomLogger(Logger):
+    def setup(self, cfg):
+        super().setup(cfg)
+        self.access_log.addFilter(HealthCheckFilter())
+
+    def atoms(self, resp, req, environ, request_time):
+        atoms = super().atoms(resp, req, environ, request_time)
+        atoms["{client-ip}e"] = self._get_client_ip(environ)
+        return atoms
+
+    @staticmethod
+    def _get_client_ip(environ):
+        remote_addr = environ.get("REMOTE_ADDR", "-")
+        xff = environ.get("HTTP_X_FORWARDED_FOR", "")
+        if not xff:
+            return remote_addr
+        # Walk the chain from right to left, skipping trusted proxies
+        ips = [ip.strip() for ip in xff.split(",")]
+        for ip in reversed(ips):
+            if ip not in TRUSTED_PROXIES:
+                return ip
+        # All IPs in the chain are trusted; fall back to the leftmost
+        return ips[0]
+
+
+logger_class = CustomLogger
+access_log_format = '%({client-ip}e)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'

labhelper/context_processors.py

@@ -0,0 +1,8 @@
+import os
+
+
+def image_tag(request):
+    """Add the image tag to all template contexts."""
+    return {
+        'image_tag': os.environ.get('IMAGE_TAG', 'dev')
+    }

labhelper/settings.py

@@ -24,10 +24,10 @@ BASE_DIR = Path(__file__).resolve().parent.parent
 SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'f0arjg8q3ut4iuqrguqfjaruf0eripIZZN3t1kymy8ugqnj$li2knhha0@gc5v8f3bge=$+gbybj2$jt28uqm')
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = os.environ.get('DEBUG', 'True').lower() == 'true'
 
-ALLOWED_HOSTS = ["*","labhelper.adebaumann.com"]
-ALLOWED_CIDR_NETS = ['10.0.0.0/16']
+ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', '*').split(',')
+ALLOWED_CIDR_NETS = os.environ.get('ALLOWED_CIDR_NETS', '10.0.0.0/16').split(',')
 
 
 # Application definition
@@ -47,6 +47,7 @@ INSTALLED_APPS = [
 
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
+    'whitenoise.middleware.WhiteNoiseMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
@@ -67,6 +68,7 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'labhelper.context_processors.image_tag',
             ],
         },
     },
@@ -108,23 +110,26 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/5.2/topics/i18n/
 
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = os.environ.get('LANGUAGE_CODE', 'en-us')
 
-TIME_ZONE = 'UTC'
+TIME_ZONE = os.environ.get('TIME_ZONE', 'UTC')
 
-USE_I18N = True
+USE_I18N = os.environ.get('USE_I18N', 'True').lower() == 'true'
 
-USE_TZ = True
+USE_TZ = os.environ.get('USE_TZ', 'True').lower() == 'true'
 
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/5.2/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = os.environ.get('STATIC_URL', '/static/')
 STATIC_ROOT = BASE_DIR / 'staticfiles'
 
+# WhiteNoise static file serving configuration
+STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+
 # Media files (user uploads)
-MEDIA_URL = '/media/'
+MEDIA_URL = os.environ.get('MEDIA_URL', '/media/')
 MEDIA_ROOT = BASE_DIR / 'data' / 'media'
 
 # Default primary key field type
@@ -132,8 +137,8 @@ MEDIA_ROOT = BASE_DIR / 'data' / 'media'
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-CSRF_TRUSTED_ORIGINS=["https://labhelper.adebaumann.com"]
+CSRF_TRUSTED_ORIGINS=os.environ.get('CSRF_TRUSTED_ORIGINS', 'https://labhelper.adebaumann.com').split(',')
 
-LOGIN_URL = 'login'
-LOGIN_REDIRECT_URL = 'index'
-LOGOUT_REDIRECT_URL = 'login'
+LOGIN_URL = os.environ.get('LOGIN_URL', 'login')
+LOGIN_REDIRECT_URL = os.environ.get('LOGIN_REDIRECT_URL', 'index')
+LOGOUT_REDIRECT_URL = os.environ.get('LOGOUT_REDIRECT_URL', 'login')

labhelper/templates/base.html

@@ -50,13 +50,31 @@
             font-size: 24px;
         }
         
+        .navbar-toggle {
+            display: none;
+            background: none;
+            border: none;
+            color: #555;
+            font-size: 24px;
+            cursor: pointer;
+            padding: 10px;
+            border-radius: 8px;
+            transition: all 0.3s ease;
+        }
+        
+        .navbar-toggle:hover {
+            background: #667eea;
+            color: white;
+        }
+        
         .navbar-nav {
             display: flex;
             gap: 20px;
             align-items: center;
         }
         
-        .navbar-nav a {
+        .navbar-nav a,
+        .navbar-nav form {
             color: #555;
             text-decoration: none;
             font-weight: 500;
@@ -81,6 +99,68 @@
             font-size: 14px;
         }
         
+        .navbar-nav button {
+            background: none;
+            border: none;
+            color: #555;
+            font: inherit;
+            cursor: pointer;
+            padding: 8px 16px;
+            border-radius: 8px;
+            transition: all 0.3s ease;
+            display: inline-flex;
+            align-items: center;
+            gap: 8px;
+        }
+        
+        @media (max-width: 768px) {
+            .navbar {
+                padding: 15px 20px;
+            }
+            
+            .navbar-brand {
+                font-size: 24px;
+            }
+            
+            .navbar-toggle {
+                display: block;
+            }
+            
+            .navbar-nav {
+                display: none;
+                width: 100%;
+                flex-direction: column;
+                gap: 0;
+                padding-top: 10px;
+            }
+            
+            .navbar-nav.active {
+                display: flex;
+            }
+            
+            .navbar-nav a,
+            .navbar-nav form {
+                width: 100%;
+                padding: 12px 16px;
+                border-radius: 0;
+            }
+            
+            .navbar-nav a:first-child,
+            .navbar-nav form:first-child {
+                border-radius: 8px 8px 0 0;
+            }
+            
+            .navbar-nav a:last-child,
+            .navbar-nav form:last-child {
+                border-radius: 0 0 8px 8px;
+            }
+            
+            .navbar-nav button {
+                width: 100%;
+                justify-content: flex-start;
+            }
+        }
+        
         .container {
             max-width: 1200px;
             margin: 20px auto;
@@ -216,6 +296,97 @@
             text-decoration: underline;
         }
         
+        .dropdown {
+            position: relative;
+            display: inline-block;
+        }
+        
+        .dropdown-content {
+            display: none;
+            position: absolute;
+            right: 0;
+            background: white;
+            min-width: 200px;
+            box-shadow: 0 8px 32px rgba(0, 0, 0, 0.2);
+            border-radius: 10px;
+            padding: 10px 0;
+            z-index: 1000;
+            top: 100%;
+            margin-top: 10px;
+        }
+        
+        .dropdown-content a {
+            display: block;
+            padding: 12px 20px;
+            color: #555;
+            text-decoration: none;
+            transition: all 0.2s ease;
+        }
+        
+        .dropdown-content a:hover {
+            background: #667eea;
+            color: white;
+        }
+        
+        .dropdown-content a:first-child {
+            border-radius: 10px 10px 0 0;
+        }
+        
+        .dropdown-content a:last-child {
+            border-radius: 0 0 10px 10px;
+        }
+        
+        .dropdown-content button:hover {
+            background: #667eea;
+            color: white;
+        }
+        
+        .dropdown:hover .dropdown-content,
+        .dropdown:focus-within .dropdown-content {
+            display: block;
+        }
+        
+        .dropdown-btn {
+            background: none;
+            border: none;
+            color: #667eea;
+            font-weight: 600;
+            font-size: 15px;
+            cursor: pointer;
+            padding: 8px 16px;
+            border-radius: 8px;
+            transition: all 0.3s ease;
+            display: inline-flex;
+            align-items: center;
+            gap: 8px;
+        }
+        
+        .dropdown-btn:hover {
+            background: #667eea;
+            color: white;
+        }
+        
+        @media (max-width: 768px) {
+            .dropdown-content {
+                position: static;
+                box-shadow: none;
+                border-radius: 0;
+                margin-top: 0;
+                padding: 0;
+            }
+            
+            .dropdown-content a {
+                width: 100%;
+                padding: 12px 16px;
+                border-radius: 0;
+            }
+            
+            .dropdown-btn {
+                width: 100%;
+                justify-content: flex-start;
+            }
+        }
+        
         {% block extra_css %}{% endblock %}
     </style>
     {% block extra_head %}{% endblock %}
@@ -226,18 +397,30 @@
             <i class="fas fa-flask"></i>
             LabHelper
         </a>
-        <div class="navbar-nav">
+        <button class="navbar-toggle" id="navbar-toggle">
+            <i class="fas fa-bars"></i>
+        </button>
+        <div class="navbar-nav" id="navbar-nav">
             <a href="/"><i class="fas fa-home"></i> Home</a>
-            <a href="/box-management/"><i class="fas fa-boxes"></i> Box Management</a>
-            <a href="/search/"><i class="fas fa-search"></i> Search</a>
-            <a href="/admin/"><i class="fas fa-cog"></i> Admin</a>
+            <a href="{% url 'inventory' %}"><i class="fas fa-boxes-stacked"></i> Inventory</a>
             {% if user.is_authenticated %}
-            <form method="post" action="{% url 'logout' %}" style="display: inline;">
-                {% csrf_token %}
-                <button type="submit" style="background: none; border: none; color: #555; font: inherit; cursor: pointer; padding: 8px 16px; border-radius: 8px; transition: all 0.3s ease; display: inline-flex; align-items: center; gap: 8px;">
-                    <i class="fas fa-sign-out-alt"></i> Logout ({{ user.username }})
+            <div class="dropdown">
+                <button class="dropdown-btn">
+                    <i class="fas fa-user"></i> {{ user.username }} <i class="fas fa-chevron-down"></i>
                 </button>
-            </form>
+                <div class="dropdown-content">
+                    <a href="/box-management/"><i class="fas fa-boxes"></i> Box Management</a>
+                    <a href="/resources/"><i class="fas fa-folder-open"></i> Resources</a>
+                    <a href="/fixme/"><i class="fas fa-exclamation-triangle"></i> Fixme</a>
+                    <a href="/admin/"><i class="fas fa-cog"></i> Admin</a>
+                    <form method="post" action="{% url 'logout' %}" style="padding: 0; margin: 0; background: none; border: none;">
+                        {% csrf_token %}
+                        <button type="submit" style="width: 100%; text-align: left; padding: 12px 20px; background: none; border: none; color: #555; font: inherit; cursor: pointer; display: block; transition: all 0.2s ease;">
+                            <i class="fas fa-sign-out-alt"></i> Logout
+                        </button>
+                    </form>
+                </div>
+            </div>
             {% else %}
             <a href="{% url 'login' %}"><i class="fas fa-sign-in-alt"></i> Login</a>
             {% endif %}
@@ -252,8 +435,22 @@
     
     <footer class="footer">
         <p>&copy; 2025 LabHelper. Built with <i class="fas fa-heart"></i> for science.</p>
+        <p style="font-size: 12px; opacity: 0.7; margin-top: 10px;">Image: {{ image_tag }}</p>
     </footer>
     
     {% block extra_js %}{% endblock %}
+    <script>
+        $(document).ready(function() {
+            $('#navbar-toggle').on('click', function() {
+                $('#navbar-nav').toggleClass('active');
+                const icon = $(this).find('i');
+                if ($('#navbar-nav').hasClass('active')) {
+                    icon.removeClass('fa-bars').addClass('fa-times');
+                } else {
+                    icon.removeClass('fa-times').addClass('fa-bars');
+                }
+            });
+        });
+    </script>
 </body>
 </html>

labhelper/urls.py

@@ -26,12 +26,15 @@ from boxes.views import (
     add_things,
     box_detail,
     box_management,
+    boxes_list,
     delete_box,
     delete_box_type,
     edit_box,
     edit_box_type,
+    edit_thing,
+    fixme,
     index,
-    search,
+    resources_list,
     search_api,
     thing_detail,
 )
@@ -49,11 +52,27 @@ urlpatterns = [
     path('box/<str:box_id>/delete/', delete_box, name='delete_box'),
     path('box/<str:box_id>/', box_detail, name='box_detail'),
     path('thing/<int:thing_id>/', thing_detail, name='thing_detail'),
+    path('thing/<int:thing_id>/edit/', edit_thing, name='edit_thing'),
     path('box/<str:box_id>/add/', add_things, name='add_things'),
-    path('search/', search, name='search'),
+    path('boxes/', boxes_list, name='boxes_list'),
+    path('inventory/', boxes_list, name='inventory'),
     path('search/api/', search_api, name='search_api'),
+    path('resources/', resources_list, name='resources_list'),
+    path('fixme/', fixme, name='fixme'),
     path('admin/', admin.site.urls),
 ]
 
-urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
+# Static files are served by WhiteNoise middleware in production
+# Media files need to be served in all environments
+from django.views.static import serve
+from django.urls import re_path
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+
+# Add explicit media serving for production
+if not settings.DEBUG:
+    urlpatterns += [
+        re_path(r'^media/(?P<path>.*)$', serve, {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+    ]

requirements.txt

@@ -36,3 +36,4 @@ Pillow==11.1.0
 sorl-thumbnail==12.11.0
 bleach==6.1.0
 coverage==7.6.1
+whitenoise==6.8.2

scripts/deploy_secret.sh

@@ -3,7 +3,7 @@
 
 NAMESPACE="labhelper"
 SECRET_NAME="django-secret"
-SECRET_FILE="argocd/secret.yaml"
+SECRET_FILE="k8s-templates/secret.yaml"
 
 # Check if secret file exists
 if [ ! -f "$SECRET_FILE" ]; then

scripts/full_deploy.sh

@@ -36,10 +36,14 @@ NEW_MAIN_VERSION=$(echo "$MAIN_VERSION + 0.001" | bc | sed 's/^\./0./')
 sed -i "s|image: git.baumann.gr/adebaumann/labhelper-data-loader:$LOADER_VERSION|image: git.baumann.gr/adebaumann/labhelper-data-loader:$NEW_LOADER_VERSION|" "$DEPLOYMENT_FILE"
 sed -i "s|image: git.baumann.gr/adebaumann/labhelper:$MAIN_VERSION|image: git.baumann.gr/adebaumann/labhelper:$NEW_MAIN_VERSION|" "$DEPLOYMENT_FILE"
 
+# Update ConfigMap with new main container version
+sed -i "s|  IMAGE_TAG: \"$MAIN_VERSION\"|  IMAGE_TAG: \"$NEW_MAIN_VERSION\"|" "argocd/configmap.yaml"
+
 # Copy database
 cp "$DB_SOURCE" "$DB_DEST"
 
 echo "Full deployment prepared:"
 echo "  Data loader: $LOADER_VERSION -> $NEW_LOADER_VERSION"
 echo "  Main container: $MAIN_VERSION -> $NEW_MAIN_VERSION"
+echo "  ConfigMap IMAGE_TAG: $MAIN_VERSION -> $NEW_MAIN_VERSION"
 echo "  Database copied to $DB_DEST"

scripts/partial_deploy.sh

@@ -23,5 +23,9 @@ NEW_VERSION=$(echo "$CURRENT_VERSION + 0.001" | bc | sed 's/^\./0./')
 # Update the deployment file (only the main container, not the data-loader)
 sed -i "s|image: git.baumann.gr/adebaumann/labhelper:$CURRENT_VERSION|image: git.baumann.gr/adebaumann/labhelper:$NEW_VERSION|" "$DEPLOYMENT_FILE"
 
+# Update ConfigMap with new main container version
+sed -i "s|  IMAGE_TAG: \"$CURRENT_VERSION\"|  IMAGE_TAG: \"$NEW_VERSION\"|" "argocd/configmap.yaml"
+
 echo "Partial deployment prepared:"
 echo "  Main container: $CURRENT_VERSION -> $NEW_VERSION"
+echo "  ConfigMap IMAGE_TAG: $CURRENT_VERSION -> $NEW_VERSION"