focomy 0.1.116__py3-none-any.whl → 0.1.117__py3-none-any.whl

core/services/theme.py

@@ -388,25 +388,39 @@ class ThemeService:
         return css.strip()
 
     def get_css_variables(self, theme_name: str = None, minify: bool = True) -> str:
-        """Generate CSS variables from theme config."""
+        """Generate CSS variables from theme config with customizations applied."""
         theme = self.get_theme(theme_name)
         if not theme:
             return ""
 
+        # Get user customizations
+        customizations = self.get_customizations(theme_name)
+
         lines = [":root {"]
 
-        # Colors
-        for name, value in theme.colors.items():
+        # Colors (with customization override)
+        for name, default_value in theme.colors.items():
+            value = customizations.get(f"color_{name}", default_value)
             lines.append(f"  --color-{name}: {value};")
 
-        # Fonts
-        for name, value in theme.fonts.items():
+        # Fonts (with customization override)
+        for name, default_value in theme.fonts.items():
+            value = customizations.get(f"font_{name}", default_value)
             lines.append(f"  --font-{name}: {value};")
 
-        # Spacing
-        for name, value in theme.spacing.items():
+        # Spacing (with customization override)
+        for name, default_value in theme.spacing.items():
+            value = customizations.get(f"space_{name}", default_value)
             lines.append(f"  --space-{name}: {value};")
 
+        # Header/Background images
+        header_image = customizations.get("header_image", "")
+        background_image = customizations.get("background_image", "")
+        if header_image:
+            lines.append(f"  --header-image: url({header_image});")
+        if background_image:
+            lines.append(f"  --background-image: url({background_image});")
+
         lines.append("}")
 
         # Add base styles
@@ -416,7 +430,10 @@ class ThemeService:
 
 body {
     font-family: var(--font-sans);
-    background: var(--color-background);
+    background: var(--background-image, var(--color-background));
+    background-size: cover;
+    background-position: center;
+    background-attachment: fixed;
     color: var(--color-text);
     line-height: 1.6;
 }
@@ -428,7 +445,9 @@ body {
 }
 
 .site-header {
-    background: var(--color-surface);
+    background: var(--header-image, var(--color-surface));
+    background-size: cover;
+    background-position: center;
     border-bottom: 1px solid var(--color-border);
     padding: var(--space-md) 0;
 }
@@ -645,9 +664,12 @@ body {
 """
         )
 
-        # Add custom CSS
-        if theme.custom_css:
-            lines.append(theme.custom_css)
+        # Add custom CSS (from customizations or theme default)
+        custom_css = customizations.get("custom_css", theme.custom_css or "")
+        if custom_css:
+            lines.append("")
+            lines.append("/* Custom CSS */")
+            lines.append(custom_css)
 
         css = "\n".join(lines)
         return self._minify_css(css) if minify else css
@@ -1240,6 +1262,46 @@ body {
         customizations = self.get_customizations(theme_name)
         settings = []
 
+        # Site Identity (logo, favicon)
+        settings.append({
+            "id": "site_logo",
+            "type": "image",
+            "label": "サイトロゴ",
+            "category": "site_identity",
+            "default": "",
+            "value": customizations.get("site_logo", ""),
+            "description": "ヘッダーに表示されるロゴ画像（推奨: 高さ60px以下）",
+        })
+        settings.append({
+            "id": "site_icon",
+            "type": "image",
+            "label": "サイトアイコン",
+            "category": "site_identity",
+            "default": "",
+            "value": customizations.get("site_icon", ""),
+            "description": "ファビコン・アプリアイコン（推奨: 512x512px）",
+        })
+
+        # Header Images
+        settings.append({
+            "id": "header_image",
+            "type": "image",
+            "label": "ヘッダー画像",
+            "category": "header",
+            "default": "",
+            "value": customizations.get("header_image", ""),
+            "description": "ヘッダー背景画像（推奨: 1920x400px）",
+        })
+        settings.append({
+            "id": "background_image",
+            "type": "image",
+            "label": "背景画像",
+            "category": "header",
+            "default": "",
+            "value": customizations.get("background_image", ""),
+            "description": "サイト全体の背景画像",
+        })
+
         # Colors
         for name, default_value in theme.colors.items():
             settings.append({
@@ -1273,6 +1335,17 @@ body {
                 "value": customizations.get(f"space_{name}", default_value),
             })
 
+        # Custom CSS
+        settings.append({
+            "id": "custom_css",
+            "type": "code",
+            "label": "カスタムCSS",
+            "category": "custom_css",
+            "default": theme.custom_css or "",
+            "value": customizations.get("custom_css", theme.custom_css or ""),
+            "description": "独自のCSSを追加できます",
+        })
+
         return settings
 
     def generate_preview_css(self, preview_values: dict, theme_name: str = None) -> str:
@@ -1311,8 +1384,23 @@ body {
             value = values.get(f"space_{name}", default_value)
             lines.append(f"  --space-{name}: {value};")
 
+        # Header/Background images
+        header_image = values.get("header_image", "")
+        background_image = values.get("background_image", "")
+        if header_image:
+            lines.append(f"  --header-image: url({header_image});")
+        if background_image:
+            lines.append(f"  --background-image: url({background_image});")
+
         lines.append("}")
 
+        # Custom CSS
+        custom_css = values.get("custom_css", "")
+        if custom_css:
+            lines.append("")
+            lines.append("/* Custom CSS */")
+            lines.append(custom_css)
+
         return "\n".join(lines)
 
 

core/templates/admin/customize.html

@@ -22,6 +22,74 @@
 
 <div class="customize-layout">
     <div class="customize-sidebar">
+        <!-- Site Identity -->
+        {% if grouped_settings.site_identity %}
+        <div class="customize-section">
+            <h3>サイトID</h3>
+            {% for setting in grouped_settings.site_identity %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <div class="image-input-wrapper">
+                    <div class="image-preview" id="{{ setting.id }}_preview">
+                        {% if setting.value %}
+                        <img src="{{ setting.value }}" alt="{{ setting.label }}">
+                        {% else %}
+                        <span class="no-image">画像未設定</span>
+                        {% endif %}
+                    </div>
+                    <input type="url"
+                           id="{{ setting.id }}"
+                           name="{{ setting.id }}"
+                           value="{{ setting.value }}"
+                           data-default="{{ setting.default }}"
+                           class="customize-input image-url-input"
+                           placeholder="https://example.com/image.png">
+                    <div class="image-actions">
+                        <button type="button" class="btn btn-sm btn-outline" onclick="clearImageInput('{{ setting.id }}')">クリア</button>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
+
+        <!-- Header Images -->
+        {% if grouped_settings.header %}
+        <div class="customize-section">
+            <h3>ヘッダー・背景</h3>
+            {% for setting in grouped_settings.header %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <div class="image-input-wrapper">
+                    <div class="image-preview" id="{{ setting.id }}_preview">
+                        {% if setting.value %}
+                        <img src="{{ setting.value }}" alt="{{ setting.label }}">
+                        {% else %}
+                        <span class="no-image">画像未設定</span>
+                        {% endif %}
+                    </div>
+                    <input type="url"
+                           id="{{ setting.id }}"
+                           name="{{ setting.id }}"
+                           value="{{ setting.value }}"
+                           data-default="{{ setting.default }}"
+                           class="customize-input image-url-input"
+                           placeholder="https://example.com/image.png">
+                    <div class="image-actions">
+                        <button type="button" class="btn btn-sm btn-outline" onclick="clearImageInput('{{ setting.id }}')">クリア</button>
+                    </div>
+                </div>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
+
         <!-- Colors -->
         {% if grouped_settings.colors %}
         <div class="customize-section">
@@ -82,6 +150,27 @@
             {% endfor %}
         </div>
         {% endif %}
+
+        <!-- Custom CSS -->
+        {% if grouped_settings.custom_css %}
+        <div class="customize-section">
+            <h3>カスタムCSS</h3>
+            {% for setting in grouped_settings.custom_css %}
+            <div class="customize-field">
+                <label for="{{ setting.id }}">{{ setting.label }}</label>
+                {% if setting.description %}
+                <p class="field-description">{{ setting.description }}</p>
+                {% endif %}
+                <textarea id="{{ setting.id }}"
+                          name="{{ setting.id }}"
+                          data-default="{{ setting.default }}"
+                          class="customize-input code-input"
+                          rows="10"
+                          placeholder="/* CSSを入力 */&#10;.my-class {&#10;  color: red;&#10;}">{{ setting.value }}</textarea>
+            </div>
+            {% endfor %}
+        </div>
+        {% endif %}
     </div>
 
     <div class="customize-preview">
@@ -191,6 +280,66 @@
     font-family: monospace;
 }
 
+.field-description {
+    font-size: 0.75rem;
+    color: var(--text-muted);
+    margin-bottom: 0.5rem;
+}
+
+.code-input {
+    font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+    font-size: 0.8125rem;
+    line-height: 1.5;
+    resize: vertical;
+    min-height: 150px;
+    background: #1e1e1e;
+    color: #d4d4d4;
+    padding: 0.75rem;
+}
+
+.image-input-wrapper {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+}
+
+.image-preview {
+    width: 100%;
+    height: 80px;
+    border: 2px dashed var(--border);
+    border-radius: 0.375rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: var(--bg);
+    overflow: hidden;
+}
+
+.image-preview img {
+    max-width: 100%;
+    max-height: 100%;
+    object-fit: contain;
+}
+
+.image-preview .no-image {
+    color: var(--text-muted);
+    font-size: 0.75rem;
+}
+
+.image-url-input {
+    font-size: 0.8125rem;
+}
+
+.image-actions {
+    display: flex;
+    gap: 0.5rem;
+}
+
+.btn-sm {
+    padding: 0.25rem 0.5rem;
+    font-size: 0.75rem;
+}
+
 .customize-preview {
     background: var(--card);
     border: 1px solid var(--border);
@@ -360,8 +509,36 @@
         if (!input.classList.contains('color-input')) {
             input.addEventListener('input', debouncedUpdate);
         }
+        // Add image preview update for image-url-input
+        if (input.classList.contains('image-url-input')) {
+            input.addEventListener('input', () => {
+                updateImagePreview(input.id, input.value);
+            });
+        }
     });
 
+    // Update image preview
+    function updateImagePreview(inputId, url) {
+        const previewEl = document.getElementById(inputId + '_preview');
+        if (!previewEl) return;
+
+        if (url && url.trim()) {
+            previewEl.innerHTML = `<img src="${url}" alt="Preview" onerror="this.parentElement.innerHTML='<span class=\\'no-image\\'>読み込みエラー</span>'">`;
+        } else {
+            previewEl.innerHTML = '<span class="no-image">画像未設定</span>';
+        }
+    }
+
+    // Clear image input (global function for onclick)
+    window.clearImageInput = function(inputId) {
+        const input = document.getElementById(inputId);
+        if (input) {
+            input.value = '';
+            updateImagePreview(inputId, '');
+            debouncedUpdate();
+        }
+    };
+
     // Save button
     saveBtn.addEventListener('click', async () => {
         const values = getValues();
@@ -402,15 +579,18 @@
         if (!confirm('カスタマイズをデフォルトに戻しますか？')) return;
 
         inputs.forEach(input => {
-            const defaultValue = input.dataset.default;
-            if (defaultValue) {
-                input.value = defaultValue;
-
-                // Sync color text input
-                if (input.classList.contains('color-input')) {
-                    const textInput = document.getElementById(input.id + '_text');
-                    if (textInput) textInput.value = defaultValue;
-                }
+            const defaultValue = input.dataset.default || '';
+            input.value = defaultValue;
+
+            // Sync color text input
+            if (input.classList.contains('color-input')) {
+                const textInput = document.getElementById(input.id + '_text');
+                if (textInput) textInput.value = defaultValue;
+            }
+
+            // Update image preview
+            if (input.classList.contains('image-url-input')) {
+                updateImagePreview(input.id, defaultValue);
             }
         });
 

{focomy-0.1.116.dist-info → focomy-0.1.117.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: focomy
-Version: 0.1.116
+Version: 0.1.117
 Summary: The Most Beautiful CMS - A metadata-driven, zero-duplicate-code content management system
 Project-URL: Homepage, https://github.com/focomy/focomy
 Project-URL: Documentation, https://focomy.dev/docs

{focomy-0.1.116.dist-info → focomy-0.1.117.dist-info}/RECORD

@@ -124,7 +124,7 @@ core/services/seo.py,sha256=qFKKnAzZ2CspWzlHHxvfKx4JBVgNhPWxCSn-adX-2z4,15658
 core/services/settings.py,sha256=oZJx1HgFNeSicagtURXHbqq0_O3yPwvcwosuqDmZ13c,8822
 core/services/spam_filter.py,sha256=2O8YWDlZoCr7MhGzsEsx6AKm2SgBP3-kxsXaETVd-0A,11314
 core/services/storage.py,sha256=gaaVf594Ck-zkZMtdt--YcIMvWgPBs7ZGPY0FRIVIzQ,8807
-core/services/theme.py,sha256=-sXcWC0qggV9pmDimKjpmaK0Il9MNCb5urWLgYcWpYk,49304
+core/services/theme.py,sha256=uMfbkik7NjtsXjyKef9txYGMMUqBEFdlAEPjuP5dJ1o,52910
 core/services/theme_inheritance.py,sha256=v4AT_VmVLQ0o3O0bO1S9qGZpnGX5d41JPrID1lmAxZI,9418
 core/services/thumbnail.py,sha256=ey1Gxl5sXr-u9GoiLe6cr9Mu6ez2kjkDrWWcQWD-Rnw,6726
 core/services/update.py,sha256=8me-Gy2Esi5HeTX1PdFI0U4vVMqKkeBHzc_SpaGuJ5g,9281
@@ -152,7 +152,7 @@ core/services/wordpress_import/wxr_parser.py,sha256=GrfiMoSj75hp3beHx9aLe-lxXtoW
 core/templates/admin/backup.html,sha256=Di93BRvmyxdvF-eOAMKTYFB7qubH1Fms7ppYbJ3YHiA,3165
 core/templates/admin/base.html,sha256=yWQNumbtcLIE0iffIoDB2xTF-9W5bt2mdsMYqA5QOa0,23926
 core/templates/admin/comments.html,sha256=AEzCMYu1-EdFC1yUa9oIObtRS-U9RlMTe_5P3O5alb8,10012
-core/templates/admin/customize.html,sha256=EwncOC0AgDCSZRum5PZzF-KDYNjrhPish57KMuff4sE,12260
+core/templates/admin/customize.html,sha256=UohKyxBDmKhtbOiipyRkFJlrD_5u0JIc8b7--U5EuUk,18631
 core/templates/admin/dashboard.html,sha256=WzURfANu1k9AIjdP82fwJE1o3sRhNVr77iUCRfUoBm8,3439
 core/templates/admin/entity_form.html,sha256=lX2l7iS6psm29wh1tHcK-4tArhG65gJxmCDInUSqV0c,61161
 core/templates/admin/entity_list.html,sha256=DxaM2c_1UGdPpQHTIe7LrFxjC11f8hXDy-9C-T8LO6o,7966
@@ -183,6 +183,7 @@ themes/corporate/theme.yaml,sha256=jPVAkwmKr6KniZ0uBw6PJNkZLdbOF7mq6j_drf3IGPI,2
 themes/corporate/templates/base.html,sha256=qN1bwJjc3Q7j7rCs_Y-Tg76KVPllENCWYC91o6t6hUQ,13976
 themes/corporate/templates/home.html,sha256=PrbLkEup19Eg-lYS9QpcSJyOTycmv0mhaoKRJqy_eFY,3216
 themes/corporate/templates/page.html,sha256=p7ESVUvpRU8XoUfa7EpWPj6vNEdN2VVFWW2xZdCvfIQ,1868
+themes/default/customizations.json,sha256=m2AoocQ9D0_3DBWFXoJQj7st-KQrHAb8UbisndeEqFI,713
 themes/default/theme.yaml,sha256=tgcUP1YFptyXVNL2a8DBiPrP7zTjWNH62Cy9D_w6Chk,1872
 themes/default/templates/404.html,sha256=6pYUz7zg5hx3nikgxiZWSkwYnv2nENCSV3KjdIF0_lE,1105
 themes/default/templates/500.html,sha256=CtU3gEsHsxAh-vbcnx5McH8V8ruKtdP8usj8hPuu8zY,1174
@@ -202,8 +203,8 @@ themes/minimal/templates/base.html,sha256=LFkx-XLDMGH7oFHHa0e6KPB0DJITOBvr6GtPkD
 themes/minimal/templates/home.html,sha256=ygYQgYj1OGCiKwmfsxwkPselVKT8vDH3jLLbfphpqKI,1577
 themes/minimal/templates/page.html,sha256=7Xcoq-ryaxlp913H2S1ishrAro2wsqqGmvsm1osXxd4,389
 themes/minimal/templates/post.html,sha256=FkTRHci8HNIIi3DU6Mb3oL0aDisGyDcsT_IUDwHmrvo,1387
-focomy-0.1.116.dist-info/METADATA,sha256=V_aSIaMDxBQFDEfNqMY9QVREcNFBp1686Z8lAIRp6sc,7042
-focomy-0.1.116.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-focomy-0.1.116.dist-info/entry_points.txt,sha256=_rF-wxGI1axY7gox3DBsTLHq-JrFKkMCjA65a6b_oqE,41
-focomy-0.1.116.dist-info/licenses/LICENSE,sha256=z9Z7gN7NNV7zYCaY-Knh3bv8RBCu89VueYtAlN_-lro,1063
-focomy-0.1.116.dist-info/RECORD,,
+focomy-0.1.117.dist-info/METADATA,sha256=3zOi-f0VwCbVG8wwNQKX0t3_YY2v797WC2unUXNuJQ0,7042
+focomy-0.1.117.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+focomy-0.1.117.dist-info/entry_points.txt,sha256=_rF-wxGI1axY7gox3DBsTLHq-JrFKkMCjA65a6b_oqE,41
+focomy-0.1.117.dist-info/licenses/LICENSE,sha256=z9Z7gN7NNV7zYCaY-Knh3bv8RBCu89VueYtAlN_-lro,1063
+focomy-0.1.117.dist-info/RECORD,,

themes/default/customizations.json

@@ -0,0 +1,22 @@
+{
+  "color_primary": "#2563eb",
+  "color_primary-hover": "#1d4ed8",
+  "color_background": "#ffffff",
+  "color_surface": "#f8fafc",
+  "color_text": "#1e293b",
+  "color_text-muted": "#64748b",
+  "color_border": "#e2e8f0",
+  "color_success": "#22c55e",
+  "color_error": "#ef4444",
+  "color_warning": "#f59e0b",
+  "font_sans": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif",
+  "font_serif": "Georgia, 'Times New Roman', serif",
+  "font_mono": "ui-monospace, SFMono-Regular, Menlo, monospace",
+  "space_xs": "0.25rem",
+  "space_sm": "0.5rem",
+  "space_md": "1rem",
+  "space_lg": "1.5rem",
+  "space_xl": "2rem",
+  "space_2xl": "3rem",
+  "custom_css": "/* Test CSS */\n.test-class { color: red; }"
+}