initial commit version 0.4

content/comment.twig

@@ -0,0 +1,13 @@
+        <li id="comment_$comment.id">
+            {% if comment.status == "denied" %}
+            <span class="waiting">${ "Your comment is awaiting moderation." | translate }</span>
+            {% endif %}
+            <blockquote>
+                $comment.body
+            </blockquote>
+            <cite>
+                ${ comment.delete_link("Delete" | translate, "") }
+                ${ comment.edit_link("Edit" | translate, "") }
+                ${ "<strong>%s</strong> on <a href=\"%s\" class=\"permalink\">%s</a>" | translate | format(comment.author_link, comment.post.url ~ "#comment_"~comment.id, comment.created_at | strftime("%B %e, %Y, at %I:%M %p" | translate)) }
+            </cite>
+        </li>

content/post.twig

@@ -0,0 +1,39 @@
+                    {% if post.first_of_day or route.action == "view" %}
+                    <h4 class="date">${ post.created_at | strftime("%b %e,  %G" | translate) }</h4>
+                    {% endif %}
+                    <div class="post $post.feather{% if post.pinned %} pinned{% endif %}" id="post_$post.id">
+                        {% block content %}{% endblock %}
+                        {% if route.action == "view" and post.paginated and post.paginated.pages > 1 %}
+                        <div class="clear"></div>
+                        $post.paginated.prev_link
+                        $post.paginated.next_link
+                        <span class="pages">${ "Page %d of %d" | translate | format(post.paginated.page, post.paginated.pages) }</span>
+                        {% endif %}
+                        <div class="clear"></div>
+                        <div class="info">
+                            {% if post.pinned %}
+	                            <a href="$post.url">posted ${ post.created_at | strftime("%B %e, %l:%M %P" | translate) }</a>
+                            {% else %}
+	                            <a href="$post.url">posted at ${ post.created_at | strftime("%l:%M %P" | translate) }</a>
+	                            {% if enabled_modules.categorize and post.category.id != 0 %}
+	                            &middot;
+	                            <a href="$post.category.url" rel="tag">$post.category.name</a>
+	                            {% endif %}
+	                            {% if enabled_modules.comments %}
+	                            &middot;
+	                            <a href="$post.url#comments">${ "%s Comment" | translate_plural("%s Comments", post.comment_count) | format(post.comment_count) }</a>
+	                            {% endif %}
+	                            {% if post.linked_tags | length > 0 %}
+	                            |
+	                            ${ "Tags" | translate }: ${ post.linked_tags | join(", ") }
+	                            {% endif %}
+                            {% endif %}
+	                        {% if post.editable or post.deletable %}
+	                        <span class="controls">
+	                            $post.edit_link
+	                            ${ post.delete_link("Delete" | translate, " &middot; ") }
+	                        </span>
+	                        {% endif %}
+                        </div>
+                        <div class="clear"></div>
+                    </div>

content/sidebar.twig

@@ -0,0 +1,72 @@
+            <div id="sidebar">
+                <form action="$site.url" method="get" accept-charset="utf-8">
+                    <fieldset>
+                        <input type="hidden" name="action" value="search" id="action" />
+                        <input type="text" id="search" name="query" value="${ GET.query | escape }" />
+                    </fieldset>
+                </form>
+
+                {% if theme.pages_list %}
+                <h1>${ "Pages" | translate }</h1>
+                <ul>
+                    {% for item in theme.pages_list %}
+                    <li>
+                        <a href="$item.page.url">$item.page.title</a>
+
+                        {% if item.has_children %}<ul>{% endif %}
+                    {% if not item.has_children %}</li>{% endif %}
+                    {% for ul, li in item.end_tags %}
+                        $ul
+                    $li
+                    {% endfor %}
+                    {% endfor %}
+                </ul>
+                {% endif %}
+
+                <h1>${ "Welcome, %s!" | translate | format(visitor.login | fallback("Guest" | translate)) }</h1>
+                <ul>
+                    {% if visitor.logged_in %}
+                    <li><a href="{% url "controls" %}">${ "User Controls" | translate }</a></li>
+                    {% if visitor.group.can("add_post", "add_page", "view_own_draft", "view_draft", "change_settings") %}
+                    <li><a class="toggle_admin" href="{% url "toggle_admin" %}">${ "Toggle Admin Bar" | translate }</a></li>
+                    {% endif %}
+                    <li><a href="{% url "logout" %}">${ "Log Out" | translate }</a></li>
+                    {% else %}
+                    <li><a href="{% url "login" %}">${ "Log In" | translate }</a></li>
+                    {% if site.can_register %}
+                    <li><a href="{% url "register" %}">${ "Register" | translate }</a></li>
+                    {% endif %}
+                    <li><a href="{% url "lost_password" %}">${ "Lost Password?" | translate }</a></li>
+                    {% endif %}
+                </ul>
+
+${ trigger.call("sidebar") }
+                {% if tags %}
+                <h1>${ "Tags" | translate }</h1>
+                <ul id="tags_list">
+                    {% for tag in tags %}
+                    <li>
+                        <a href="{% url "tag/" ~ tag.url %}" title="${ "%d post tagged &quot;%s&quot;" | translate_plural("%d posts tagged &quot;%s&quot;", tag.popularity) | format(tag.popularity, (tag.name | escape)) }">$tag.name</a>
+                        <span class="sub">($tag.popularity)</span>
+                        {% if route.action == "tag" and not (GET.name | contains(tag.clean)) %}
+                        <span class="sub">&nbsp;<a href="{% url "tag/"~ tag.url ~"+"~ (GET.name | urlencode) %}">(+)</a></span>
+                        {% endif %}
+                    </li>
+                    {% endfor %}
+                    <li><a href="{% url "tags" %}">${ "All &rarr;" | translate }</a></li>
+                </ul>
+                {% endif %}
+
+                {% if theme.archives_list %}
+                <h1>${ "Archives" | translate }</h1>
+                <ul>
+                    {% for archive in theme.archives_list %}
+                    <li>
+                        <a href="$archive.url">${ archive.when | strftime("%B %Y" | translate) }</a>
+                        <span class="sub">($archive.count)</span>
+                    </li>
+                    {% endfor %}
+                    <li><a href="{% url "archive" %}">${ "All &rarr;" | translate }</a></li>
+                </ul>
+                {% endif %}
+            </div>

feathers/audio.twig

@@ -0,0 +1,6 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+                        $post.audio_player
+                        ${ post.description | read_more }
+{% endblock %}

feathers/chat.twig

@@ -0,0 +1,10 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+{% if post['title'] %}
+                        <h2 class="title">
+                            <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>
+                        </h2>
+{% endif %}
+                        $post.dialogue
+{% endblock %}

feathers/link.twig

@@ -0,0 +1,6 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+                        <h4 class="title"><a href="$post.source" class="link">$post.name</a></h4>
+                        ${ post.description | read_more }
+{% endblock %}

feathers/photo.twig

@@ -0,0 +1,11 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+                        {% if post.pinned %}
+                        ${ feathers['photo'].image_link(post, 660) }
+                        {% else %}
+                        ${ feathers['photo'].image_link(post, 520) }
+                        {% endif %}
+                        <div class="clear"></div>
+                        ${ post.caption | read_more }
+{% endblock %}

feathers/quote.twig

@@ -0,0 +1,8 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+                        <blockquote>
+                            ${ post.quote | read_more }
+                        </blockquote>
+                        <div class="source">${ ("&mdash; " ~ post.source_unfiltered) | markup_post_text(post) | markup_text(post) | read_more }</div>
+{% endblock %}

feathers/text.twig

@@ -0,0 +1,10 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+{% if post['title'] %}
+                        <h2 class="title">
+                            <a href="$post.url" rel="bookmark" title="${ "Permanent Link to" | translate } &quot;$post.title&quot;">$post.title</a>
+                        </h2>
+{% endif %}
+                        ${ post.body | read_more }
+{% endblock %}

feathers/video.twig

@@ -0,0 +1,11 @@
+{% extends "content/post.twig" %}
+
+{% block content %}
+                        {% if post.pinned %}
+                        ${ feathers['video'].embed_tag_for(post, 660) }
+                        {% else %}
+                        ${ feathers['video'].embed_tag_for(post, 520) }
+                        {% endif %}
+                        <br />
+                        ${ post.caption | read_more }
+{% endblock %}

forms/comment/new.twig

@@ -0,0 +1,36 @@
+<form id="add_comment" action="{% url "add_comment" %}" method="post" accept-charset="utf-8">
+    {% if visitor.logged_in %}
+    <p>
+        <span class="who">
+            <a class="logout" href="{% url "logout" %}">${ "Log Out &rarr;" | translate }</a>
+            ${ "Logged in as %s" | translate | format(visitor.full_name | fallback(visitor.login)) }
+        </span>
+    </p>
+    {% else %}
+    <p>
+        <label for="author">${ "Your Name" | translate }</label>
+        <input type="text" name="author" value="" id="author" />
+    </p>
+    <p>
+        <label for="email">${ "Your E-Mail" | translate }</label>
+        <input type="text" name="email" value="" id="email" />
+    </p>
+    <p>
+        <label for="url">${ "Your Website" | translate }</label>
+        <input type="text" name="url" value="" id="url" />
+    </p>
+    {% endif %}
+    <p>
+        <textarea name="body" rows="8" cols="40" class="wide"></textarea>
+    </p>
+
+    <p>
+        {% if visitor.logged_in %}
+        <input type="hidden" name="author" value="${ visitor.full_name | fallback(visitor.login) }" id="author" />
+        <input type="hidden" name="email" value="$visitor.email" id="email" />
+        <input type="hidden" name="url" value="$visitor.website" id="url" />
+        {% endif %}
+        <input type="hidden" name="post_id" value="$post.id" id="post_id" />
+        <button type="submit">${ "Speak" | translate }</button>
+    </p>
+</form>

forms/post/edit.twig

@@ -0,0 +1,108 @@
+            <form id="post_edit_form_$post.id" class="inline_edit post_edit" action="{% admin "update_post" %}" method="post" accept-charset="utf-8" enctype="multipart/form-data">
+                <fieldset>
+                    ${ trigger.call("before_ajax_edit_post_fields", feather) }
+                    {% for field in feather.fields %}
+                    <p>
+                        <label for="$field.attr">
+                            $field.label
+                            {% if field.optional %}
+                            <span class="sub">${ "(optional)" | translate }</span>
+                            {% endif %}
+                        </label>
+                        {% if field.type == "text" or field.type == "file" %}
+                        <input class="$field.type{% if field.classes %} ${ field.classes | join(" ") }{% endif %}" type="$field.type" name="$field.attr" value="{% if not field.no_value %}${ field.value | fallback(post[field.attr] | escape(true, false)) }{% endif %}" id="$field.attr" />
+                        {% elseif field.type == "text_block" %}
+                        <textarea class="wide{% if field.classes %} ${ field.classes | join(" ") }{% endif %}" rows="${ field.rows | fallback(12) }" name="$field.attr" id="$field.attr" cols="50">{% if not field.no_value %}${ field.value | fallback(post[field.attr] | escape(false, false)) }{% endif %}</textarea>
+                        {% elseif field.type == "checkbox" %}
+                        <input class="$field.type{% if field.classes %} ${ field.classes | join(" ") }{% endif %}" type="$field.type" name="$field.attr"{% if field.checked %}checked="checked"{% endif %} id="$field.attr">
+                        {% elseif field.type == "select" %}
+                        <select name="$field.attr" id="$field.attr"{% if field.classes %} class="${ field.classes | join(" ") }"{% endif %}>
+                            {% for value, name in field.options | items %}
+                            <option value="${ value | escape }"{% if not field.no_value %}${ value | option_selected(post[field.attr]) }{% endif %}>${ name | escape }</option>
+                            {% endfor %}
+                        </select>
+                        {% endif %}
+                    </p>
+                    {% endfor %}
+
+                    <a id="more_options_link_$post.id" href="javascript:void(0)" class="more_options_link">${ "More Options &#187;" | translate("chyrp") }</a>
+                    <div id="more_options_$post.id" class="more_options" style="display: none">
+                        {% if visitor.group.can("add_post") %}
+                        <p>
+                            <label for="status">${ "Status" | translate }</label>
+                            <select name="status" id="status">
+                                <option value="draft"{% if post.status == "draft" %} selected="selected"{% endif %}>${ "Draft" | translate }</option>
+                                <option value="public"{% if post.status == "public" %} selected="selected"{% endif %}>${ "Public" | translate }</option>
+                                <option value="private"{% if post.status == "private" %} selected="selected"{% endif %}>${ "Private" | translate }</option>
+                                <option value="registered_only"{% if post.status == "registered_only" %} selected="selected"{% endif %}>${ "Registered Only" | translate }</option>
+                                {% if groups %}
+                                <optgroup label="${ "Group" | translate }">
+                                    {% for group in groups %}
+                                    <option value="{$group.id}"${ post.status | option_selected("{"~ group.id ~"}") }>${ group.name | escape }</option>
+                                    {% endfor %}
+                                </optgroup>
+                                {% endif %}
+                            </select>
+                        </p>
+                        {% endif %}
+                        <p>
+                            <label for="pinned">${ "Pinned?" | translate }</label>
+                            <input type="checkbox" name="pinned" id="pinned"{% if post.pinned %} checked="checked"{% endif %}/>&nbsp;
+                            <small>${ "(shows this post above all others)" | translate }</small>
+                        </p>
+                        <p>
+                            <label for="slug">${ "Slug" | translate }</label>
+                            <input class="text" type="text" name="slug" value="${ post.slug | escape }" id="slug" />
+                        </p>
+                        <p>
+                            <label for="created_at">${ "Timestamp" | translate }</label>
+                            <input class="text" type="text" name="created_at" value="${ post.created_at | fallback(now | date("r")) | strftime }" id="created_at" />
+                            <input type="hidden" name="original_time" value="${ post.created_at | fallback(now | date("r")) | strftime }" />
+                        </p>
+                        <p>
+                            <label for="trackbacks">${ "Trackbacks" | translate }</label>
+
+                            <input class="text" type="text" name="trackbacks" value="" id="trackbacks" />
+                        </p>
+                        {% for field in options %}
+                        <p>
+                            <label for="${ field.attr | replace("[", "_") | replace("]", "") }">
+                                $field.label
+                                {% if field.help %}
+                                <span class="sub">
+                                    <a href="{% admin "help&id="~field.help %}" class="help emblem"><img src="images/icons/help.png" alt="help" /></a>
+                                </span>
+                                {% endif %}
+                                {% if field.note %}
+                                <span class="sub">$field.note</span>
+                                {% endif %}
+                            </label>
+                            {% if field.type == "text" or field.type == "file" %}
+                            <input class="$field.type{% if field.classes %} ${ field.classes | join(" ") }{% endif %}" type="$field.type" name="$field.attr" value="{% if not field.no_value %}${ field.value | fallback(post[field.attr] | escape(true, false)) }{% endif %}" id="$field.attr" />
+                            {% elseif field.type == "text_block" %}
+                            <textarea class="wide{% if field.classes %} ${ field.classes | join(" ") }{% endif %}" rows="${ field.rows | fallback(12) }" name="$field.attr" id="$field.attr" cols="50">{% if not field.no_value %}${ field.value | fallback(post[field.attr] | escape(false, false)) }{% endif %}</textarea>
+                            {% elseif field.type == "select" %}
+                            <select name="$field.attr" id="$field.attr"{% if field.classes %} class="${ field.classes | join(" ") }"{% endif %}>
+                                {% for option in field.options %}
+                                <option value="${ option.value | escape }"${ option.selected | option_selected(true) }>${ option.name | escape }</option>
+                                {% endfor %}
+                            </select>
+                            {% endif %}
+                            $field.extra
+                        </p>
+                        {% endfor %}
+                        <div class="clear"></div>
+                    </div>
+                    <br />
+
+                    <div class="buttons">
+                        <input type="submit" value="${ "Save" | translate }" accesskey="s" /> ${ "or" | translate }
+                        <a href="javascript:void(0)" id="post_cancel_edit_$post.id" class="cancel">${ "Cancel" | translate }</a>
+                    </div>
+
+                    <input type="hidden" name="id" value="$post.id" id="id" />
+                    <input type="hidden" name="feather" value="${ post.feather | escape }" id="feather" />
+                    <input type="hidden" name="hash" value="$site.secure_hashkey" id="hash" />
+                    <input type="hidden" name="ajax" value="true" id="ajax" />
+                </fieldset>
+            </form>