feat: Querformat für Druck- und PDF-Ansicht ergänzen

fix: Farben freier Excel-Zellen beim Glätten bewahren
2026-07-23 16:15:01 +02:00 · 2026-07-23 16:13:38 +02:00
5 changed files with 33 additions and 6 deletions
@@ -5,7 +5,7 @@ class DocumentationConfig(PluginConfig):
    name = "netbox_documentation"
    verbose_name = "NetBox Dokumentation"
    description = "Wiki und Office-Dokumentation direkt in NetBox"
-    version = "0.7.9"
+    version = "0.7.11"
    author = "LKE"
    base_url = "documentation"
    min_version = "4.0.0"
@@ -382,9 +382,14 @@ def _render_flattened_worksheet(sheet, workbook, max_rows=None):
                    tables_starting_here.append(bounds)
                    rendered_tables.add(bounds)
                continue
-            value = sheet.cell(row=row_number, column=column_number).value
+            cell = sheet.cell(row=row_number, column=column_number)
+            value = cell.value
            if value not in (None, ""):
-                ordinary_values.append(escape(str(value)).replace("\n", "<br>"))
+                rendered_value = escape(str(value)).replace("\n", "<br>")
+                style = _excel_cell_style(cell, workbook) if cell.has_style else ""
+                if style:
+                    rendered_value = f'<span style="{style}">{rendered_value}</span>'
+                ordinary_values.append(rendered_value)
        if ordinary_values:
            blocks.append("<p>" + "<br>".join(ordinary_values) + "</p>")
        for min_col, min_row, max_col, max_row in tables_starting_here:
@@ -11,7 +11,9 @@
    .toolbar { position: sticky; top: 0; z-index: 2; display: flex; justify-content: center; gap: .75rem; padding: .8rem; background: #fff; border-bottom: 1px solid #ccd2d8; }
    .toolbar button, .toolbar a { border: 1px solid #6c757d; border-radius: .3rem; padding: .55rem .9rem; background: #fff; color: #212529; text-decoration: none; cursor: pointer; font: inherit; }
    .toolbar button { color: #fff; background: #4263eb; border-color: #4263eb; }
+    .toolbar a.active { color: #fff; background: #495057; border-color: #495057; }
    article { width: min(210mm, calc(100% - 2rem)); min-height: 297mm; margin: 1.5rem auto; padding: 18mm 17mm; background: #fff; box-shadow: 0 .2rem 1rem rgba(0,0,0,.12); }
+    article.landscape { width: min(297mm, calc(100% - 2rem)); min-height: 210mm; }
    h1 { margin: 0 0 .25rem; font-size: 24pt; line-height: 1.2; }
    .summary { color: #4b5563; font-size: 13pt; margin: 0 0 1rem; }
    .meta { display: flex; flex-wrap: wrap; gap: .4rem 1.25rem; padding: .65rem 0; margin-bottom: 1.4rem; color: #6b7280; border-top: 1px solid #ddd; border-bottom: 1px solid #ddd; font-size: 9pt; }
@@ -32,7 +34,7 @@
    .content .doc-cell-middle { vertical-align: middle; }
    .content pre, .content code { white-space: pre-wrap; overflow-wrap: anywhere; font-family: Consolas, monospace; }
    .content a { color: #174ea6; overflow-wrap: anywhere; }
-    @page { size: A4; margin: 15mm; }
+    @page { size: A4 {% if request.GET.orientation == 'landscape' %}landscape{% else %}portrait{% endif %}; margin: 15mm; }
    @media print {
      body { background: #fff; }
      .toolbar { display: none !important; }
@@ -46,9 +48,11 @@
 <body>
  <div class="toolbar">
    <button type="button" onclick="window.print()">Drucken / Als PDF speichern</button>
+    <a href="?orientation=portrait"{% if request.GET.orientation != 'landscape' %} class="active"{% endif %}>Hochformat</a>
+    <a href="?orientation=landscape"{% if request.GET.orientation == 'landscape' %} class="active"{% endif %}>Querformat</a>
    <a href="{{ object.get_absolute_url }}">Zurück zur Dokumentation</a>
  </div>
-  <article>
+  <article{% if request.GET.orientation == 'landscape' %} class="landscape"{% endif %}>
    <header>
      <h1>{{ object.title }}</h1>
      {% if object.summary %}<p class="summary">{{ object.summary }}</p>{% endif %}
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name = "netbox-documentation"
-version = "0.7.9"
+version = "0.7.11"
 description = "Integrated Markdown wiki and office document importer for NetBox"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -231,3 +231,21 @@ def test_excel_flatten_preserves_colors_of_explicit_excel_tables():
    assert results[0].body_format == "html"
    assert results[0].markdown.count("background-color: #a5bf60") == 2
    assert results[0].markdown.count("color: #ffffff") == 2
+
+
+def test_excel_flatten_preserves_colored_cells_outside_tables():
+    workbook = Workbook()
+    sheet = workbook.active
+    sheet["A1"] = "Wichtiger Hinweis"
+    sheet["A1"].fill = PatternFill(fill_type="solid", fgColor="FFF3BF")
+    sheet["A1"].font = Font(color="9C2A2A", bold=True)
+    sheet["A3"] = "Normaler Text"
+    stream = BytesIO()
+    workbook.save(stream)
+
+    results = import_excel_sheets(Upload(stream.getvalue(), "hinweis.xlsx"), flatten=True)
+
+    assert results[0].body_format == "html"
+    assert '<span style="background-color: #fff3bf; color: #9c2a2a; font-weight: bold' in results[0].markdown
+    assert "Wichtiger Hinweis</span>" in results[0].markdown
+    assert "<table" not in results[0].markdown
Author	SHA1	Message	Date
MrBlake	83cac4447a	feat: Querformat für Druck- und PDF-Ansicht ergänzen	2026-07-23 16:15:01 +02:00
MrBlake	dbf3e7a62a	fix: Farben freier Excel-Zellen beim Glätten bewahren	2026-07-23 16:13:38 +02:00