diff -U 3 -H -w -E -d -r -N -- chyrp/.gitignore News/.gitignore --- chyrp/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ News/.gitignore 2011-03-31 20:32:51.000000000 +0200 @@ -0,0 +1,8 @@ +.DS_Store +.htaccess +feathers/photo/lib/cache/* +uploads/* +includes/config.yaml.php +includes/database.yaml.php +themes/* +!themes/stardust diff -U 3 -H -w -E -d -r -N -- chyrp/.htaccess News/.htaccess --- chyrp/.htaccess 1970-01-01 01:00:00.000000000 +0100 +++ News/.htaccess 2013-03-17 00:59:57.000000000 +0100 @@ -0,0 +1,7 @@ + +RewriteEngine On +RewriteBase /News/ +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule ^.+$ index.php [L] + diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/comment.twig News/themes/stardust/content/comment.twig --- chyrp/themes/stardust/content/comment.twig 2011-03-31 11:32:50.000000000 +0200 +++ News/themes/stardust/content/comment.twig 2013-03-17 02:22:34.000000000 +0100 @@ -2,12 +2,12 @@ {% if comment.status == "denied" %} ${ "Your comment is awaiting moderation." | translate } {% endif %} + ${ "%s on %s" | translate | format(comment.author_link, comment.post.url ~ "#comment_"~comment.id, comment.created_at | strftime("%B %d, %Y, at %I:%M %p" | translate)) }
$comment.body
${ comment.delete_link("Delete" | translate, "") } ${ comment.edit_link("Edit" | translate, "") } - ${ "%s on %s" | translate | format(comment.author_link, comment.post.url ~ "#comment_"~comment.id, comment.created_at | strftime("%B %d, %Y, at %I:%M %p" | translate)) } diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/post.twig News/themes/stardust/content/post.twig --- chyrp/themes/stardust/content/post.twig 2011-03-31 11:32:50.000000000 +0200 +++ News/themes/stardust/content/post.twig 2013-05-09 13:17:54.000000000 +0200 @@ -1,8 +1,4 @@ - {% if post.first_of_day %} -
${ post.created_at | strftime("%B %d" | translate) }
- {% endif %} -
- {% if post.pinned %}${ "!" | translate }{% endif %} +
{% block content %}{% endblock %} {% if route.action == "view" and post.paginated and post.paginated.pages > 1 %}
@@ -11,30 +7,12 @@ ${ "Page %d of %d" | translate | format(post.paginated.page, post.paginated.pages) } {% endif %}
- - {% if post.pinned %} - ${ post.created_at | strftime("%B %d @ %I:%M %p" | translate) } - {% else %} - ${ post.created_at | strftime("%I:%M %p" | translate) } - {% endif %} - {% if enabled_modules.categorize and post.category.id != 0 %} - | - - {% endif %} +

{% if enabled_modules.comments %} - | - ${ "%s Comment" | translate_plural("%s Comments", post.comment_count) | format(post.comment_count) } - {% endif %} - {% if post.linked_tags | length > 0 %} - | - ${ "Tags" | translate }: ${ post.linked_tags | join(", ") } - {% endif %} - - {% if post.editable or post.deletable %} - - $post.edit_link - ${ post.delete_link("Delete" | translate, " | ") } - + ${ "See %s Comment" | translate_plural("See %s Comments", post.comment_count) | format(post.comment_count) } {% endif %} -

+

+ {% if route.action != "view" %} +
+ {% endif %} diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/content/sidebar.twig News/themes/stardust/content/sidebar.twig --- chyrp/themes/stardust/content/sidebar.twig 2011-03-31 11:32:50.000000000 +0200 +++ News/themes/stardust/content/sidebar.twig 2013-03-17 01:18:22.000000000 +0100 @@ -1,4 +1,3 @@ - diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/feathers/text.twig News/themes/stardust/feathers/text.twig --- chyrp/themes/stardust/feathers/text.twig 2011-03-31 11:32:50.000000000 +0200 +++ News/themes/stardust/feathers/text.twig 2013-03-17 01:51:31.000000000 +0100 @@ -2,9 +2,12 @@ {% block content %} {% if post['title'] %} -

+

+ > $post.title -

+
+ On ${ post.created_at | strftime("%Y-%m-%d") } by falkTX +

{% endif %} ${ post.body | read_more } {% endblock %} diff -U 3 -H -w -E -d -r -N -- chyrp/themes/stardust/layouts/default.twig News/themes/stardust/layouts/default.twig --- chyrp/themes/stardust/layouts/default.twig 2011-03-31 11:32:50.000000000 +0200 +++ News/themes/stardust/layouts/default.twig 2014-04-10 01:20:00.000000000 +0200 @@ -1,54 +1,150 @@ - - - - - {% block title %}$site.name{% if title %} » ${ title | escape }{% endif %}{% endblock %} - - - - - + + + + + + + KXStudio News + + + + + + + {% if site.clean_urls %}{% endif %} $theme.feeds $theme.stylesheets $theme.javascripts ${ trigger.call("head") } + - - {% if visitor.group.can("add_post", "add_draft", "add_page", "view_own_draft", "view_draft", "change_settings", "toggle_extensions") %} -