ticket #66 attempt 1

devplacepy/static/css/gists.css

@@ -328,3 +328,44 @@
         padding: 0.75rem;
     }
 }
+
+/* ---- Markdown source/preview toggle ---- */
+.gist-markdown-toggle .gist-md-tabbar {
+    display: flex;
+    gap: 0;
+    border-bottom: 1px solid var(--border);
+    margin-bottom: 0;
+}
+
+.gist-markdown-toggle .gist-md-tab {
+    padding: 0.5em 1em;
+    cursor: pointer;
+    color: var(--text-muted);
+    border: 1px solid transparent;
+    border-bottom: none;
+    border-radius: var(--radius) var(--radius) 0 0;
+    background: transparent;
+    font-size: 0.875rem;
+}
+
+.gist-markdown-toggle .gist-md-tab.active {
+    color: var(--text-primary);
+    background: var(--bg-card);
+    border-color: var(--border) var(--border) transparent;
+}
+
+.gist-markdown-toggle .tab-pane {
+    display: none;
+}
+
+.gist-markdown-toggle .tab-pane.active {
+    display: block;
+}
+
+.gist-markdown-toggle .gist-markdown-preview {
+    padding: 1em;
+    border: 1px solid var(--border);
+    border-radius: 0 0 var(--radius) var(--radius);
+    min-height: 4em;
+    background: var(--bg-card);
+}

devplacepy/templates/_comment.html

@@ -1,4 +1,4 @@
-{% macro comment_cell(item, depth, parent_author=None, parent_url=None) %}
+{% macro comment_cell(item, depth, parent_author=None) %}
 <div class="comment" style="--comment-depth: {{ depth }};" data-depth="{{ depth }}">
     <div class="comment-votes" role="group" aria-label="Comment votes">
         <form method="POST" action="/votes/comment/{{ item.comment['uid'] }}">
@@ -26,7 +26,6 @@
         {% endif %}
         <div class="comment-actions">
             <button type="button" class="comment-action-btn" data-action="reply"{{ guest_disabled(user) }}><span class="icon">💬</span><span class="label"> Reply</span></button>
-            <button type="button" class="comment-action-btn" data-share="{{ parent_url }}#comment-{{ item.comment['uid'] }}"><span class="icon">&#x1F517;</span><span class="label"> Share</span></button>
             {% if owns(item.comment, user) %}
             <button type="button" class="comment-action-btn" data-action="edit" data-edit-url="/comments/edit/{{ item.comment['uid'] }}"><span class="icon">✏️</span><span class="label"> Edit</span></button>
             <form method="POST" action="/comments/delete/{{ item.comment['uid'] }}" class="inline-form comment-delete-form" data-comment-uid="{{ item.comment['uid'] }}">
@@ -40,21 +39,21 @@
 </div>
 {% endmacro %}
 
-{% macro render_comment(item, depth=0, parent_url=None) %}
+{% macro render_comment(item, depth=0) %}
 {% set max_depth = 2 %}
 {% set visual_depth = depth if depth < max_depth else max_depth %}
-{% call comment_cell(item, visual_depth, parent_url=parent_url) %}
+{% call comment_cell(item, visual_depth) %}
     {% if item.children %}
     {% if depth < max_depth %}
     <div class="comment-replies">
         {% for child in item.children %}
-        {{ render_comment(child, depth + 1, parent_url) }}
+        {{ render_comment(child, depth + 1) }}
         {% endfor %}
     </div>
     {% else %}
     <div class="comment-replies comment-replies-flat">
         {% for child in item.children %}
-        {{ render_comment_flat(child, max_depth, item.author, parent_url) }}
+        {{ render_comment_flat(child, max_depth, item.author) }}
         {% endfor %}
     </div>
     {% endif %}
@@ -62,9 +61,9 @@
 {% endcall %}
 {% endmacro %}
 
-{% macro render_comment_flat(item, depth, parent_author, parent_url=None) %}
-{% call comment_cell(item, depth, parent_author, parent_url=parent_url) %}{% endcall %}
+{% macro render_comment_flat(item, depth, parent_author) %}
+{% call comment_cell(item, depth, parent_author) %}{% endcall %}
 {% for child in item.children %}
-{{ render_comment_flat(child, depth, item.author, parent_url) }}
+{{ render_comment_flat(child, depth, item.author) }}
 {% endfor %}
 {% endmacro %}

devplacepy/templates/_comment_section.html

@@ -3,10 +3,8 @@
 
     {% from "_comment.html" import render_comment with context %}
 
-    {% set parent_url = resolve_object_url(target_type, target_uid) %}
-
     {% for item in comments %}
-    {{ render_comment(item, 0, parent_url) }}
+    {{ render_comment(item, 0) }}
     {% else %}
     <p class="no-comments-msg">No comments yet. Start the discussion.</p>
     {% endfor %}

devplacepy/templates/gist_detail.html

@@ -35,6 +35,23 @@
 
         {% if gist['language'] == 'markdown_rendered' %}
         <div class="gist-rendered-content rendered-content">{{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}</div>
+        {% elif gist['language'] == 'markdown' %}
+        <div class="gist-code-block gist-markdown-toggle" data-tabs>
+            <nav class="gist-md-tabbar" role="tablist">
+                <button type="button" class="gist-md-tab" data-tab="source" role="tab">Source</button>
+                <button type="button" class="gist-md-tab" data-tab="preview" role="tab">Preview</button>
+            </nav>
+            <div data-tab-pane="source" class="tab-pane active" role="tabpanel">
+                <div class="gist-code-header">
+                    <span class="gist-language-name">{{ language_name(gist['language']) }}</span>
+                    <button type="button" class="gist-copy-btn" data-copy="gist-code-content">Copy</button>
+                </div>
+                <pre><code id="gist-code-content" class="language-markdown">{{ gist['source_code'] }}</code></pre>
+            </div>
+            <div data-tab-pane="preview" class="tab-pane gist-markdown-preview rendered-content" role="tabpanel">
+                {{ render_content(gist['source_code'], author_is_admin=is_admin(author)) }}
+            </div>
+        </div>
         {% else %}
         <div class="gist-code-block">
             <div class="gist-code-header">

devplacepy/templating.py

@@ -9,7 +9,6 @@ from devplacepy.cache import TTLCache
 from devplacepy.config import STATIC_VERSION, TEMPLATES_DIR, TEMPLATE_AUTO_RELOAD, PRESENCE_TIMEOUT_SECONDS
 from devplacepy.constants import TOPICS, REACTION_EMOJI
 from devplacepy.database import get_int_setting, get_setting, get_table
-from devplacepy.database.content import resolve_object_url
 from devplacepy.avatar import avatar_url, avatar_seed
 from devplacepy.utils import format_date as _format_date
 from devplacepy.utils import time_ago as _time_ago
@@ -50,7 +49,6 @@ templates.env.globals["is_self"] = is_self
 templates.env.globals["guest_disabled"] = guest_disabled
 templates.env.globals["is_online"] = presence.is_online
 templates.env.globals["presence_timeout"] = PRESENCE_TIMEOUT_SECONDS
-templates.env.globals["resolve_object_url"] = resolve_object_url
 
 from devplacepy.docs_devrant import devrant_endpoints