@@ -23,7 +23,7 @@
<select name="month">
<option value="">----------</option>
{% for archive in theme.archives_list %}
- <option value="${ archive.when | date("Y-m") }"${ GET.month | option_selected(archive.when | date("Y-m")) }>${ archive.when | date("F Y") } ($archive.count)</option>
+ <option value="${ archive.when | strftime("%Y-%m") }"${ GET.month | option_selected(archive.when | strftime("%Y-%m")) }>${ archive.when | strftime("%B %Y") } ($archive.count)</option>
{% endfor %}
</select>
<button type="submit" class="inline">${ "Show →" | translate }</button>
admin/layout/pages/manage_posts.twig
@@ -34,7 +34,7 @@
$status = (empty($status)) ? "public" : str_replace(array_keys($status_translate), array_values($status_translate), $status[1]) ;
$clean = (empty($basename)) ? sanitize($title) : str_replace("_", "-", $basename[1]) ;
$url = Post::check_url($clean);
- $timestamp = (empty($date)) ? datetime() : date("Y-m-d H:i:s", strtotime($date[1])) ;
+ $timestamp = (empty($date)) ? datetime() : datetime($date[1]) ;
# Damn it feels good to be a gangsta...
$_POST['status'] = $status;
importers/movabletype.php
@@ -18,25 +18,25 @@ $(function(){
alert(response.replace(/(HEY_JAVASCRIPT_THIS_IS_AN_ERROR_JUST_SO_YOU_KNOW|<([^>]+)>\n?)/gm, ""))
})
-<?php if (match(array("/edit_(post|page)/", "/write_(post|page)/"), $action)): ?>
- // Fancify the "More Options" links.
- $(document.createElement("a")).attr({
- id: "more_options_link",
- href: "javascript:void(0)"
- }).addClass("more_options_link").html("<?php echo $more_options_string; ?>").insertBefore(".buttons")
- $("#more_options").clone().insertAfter("#more_options_link").removeClass("js_disabled")<?php if (empty($_COOKIE['show_more_options'])): ?>.css("display", "none")<?php endif; ?>
-
- $("#more_options_link").click(function(){
- if ($("#more_options").css("display") == "none") {
- $(this).html("<?php echo __("« Fewer Options"); ?>")
- Cookie.set("show_more_options", "true", 30)
- } else {
- $(this).html("<?php echo __("More Options »"); ?>")
- Cookie.destroy("show_more_options")
- }
- $("#more_options").slideToggle()
- })
-<?php endif; ?>
+ if ($("#more_options").size()) {
+ // Fancify the "More Options" links.
+ $(document.createElement("a")).attr({
+ id: "more_options_link",
+ href: "javascript:void(0)"
+ }).addClass("more_options_link").html("<?php echo $more_options_string; ?>").insertBefore(".buttons")
+ $("#more_options").clone().insertAfter("#more_options_link").removeClass("js_disabled")<?php if (empty($_COOKIE['show_more_options'])): ?>.css("display", "none")<?php endif; ?>
+
+ $("#more_options_link").click(function(){
+ if ($("#more_options").css("display") == "none") {
+ $(this).html("<?php echo __("« Fewer Options"); ?>")
+ Cookie.set("show_more_options", "true", 30)
+ } else {
+ $(this).html("<?php echo __("More Options »"); ?>")
+ Cookie.destroy("show_more_options")
+ }
+ $("#more_options").slideToggle()
+ })
+ }
// Remove things that only exist for JS-disabled users.
$(".js_disabled").remove()
includes/admin.js.php
@@ -86,6 +86,7 @@
$archives[$timestamp] = array("posts" => array(),
"year" => $time->year,
"month" => strftime("%B", $timestamp),
+ "timestamp" => $timestamp,
"url" => $route->url("archive/".when("Y/m/", $time->created_at)));
$archives[$timestamp]["posts"] = Post::find(array("where" => "`__posts`.`created_at` like :created_at",
@@ -98,12 +99,13 @@
error(__("Error"), __("Please enter a valid year and month."));
$timestamp = mktime(0, 0, 0, $_GET['month'], fallback($_GET['day'], "1", true), $_GET['year']);
- $theme->title = _f("Archive of %s", array(date("F Y", $timestamp)));
+ $theme->title = _f("Archive of %s", array(strftime("%B %Y", $timestamp)));
$theme->load("content/archive", array("posts" => $posts,
"archive" => array("year" => $_GET['year'],
"month" => strftime("%B", $timestamp),
- "day" => date("jS", $timestamp),
+ "day" => strftime("%d", $timestamp),
+ "timestamp" => $timestamp,
"depth" => isset($_GET['day']) ? "day" : (isset($_GET['month']) ? "month" : (isset($_GET['year']) ? "year" : ""))
)
));
index.php
@@ -215,9 +215,9 @@
public function author_link() {
if ($this->author_url != "") # If a URL is set
- echo '<a href="'.$this->author_url.'">'.$this->author.'</a>';
- else # If not, just show their name
- echo $this->author;
+ return '<a href="'.$this->author_url.'">'.$this->author.'</a>';
+ else # If not, just return their name
+ return $this->author;
}
public function update($author, $author_email, $author_url, $body, $status, $timestamp) {
modules/comments/model.Comment.php
@@ -7,32 +7,6 @@
<form id="edit_form" action="{% admin "update_comment" %}" method="post" accept-charset="utf-8" enctype="multipart/form-data">
<fieldset>
<p>
- <label for="author">${ "Author" | translate }</label>
- <input class="text" type="text" name="author" value="${ comment.author | escape }" id="author" />
- </p>
- <p>
- <label for="author_email">${ "Author E-Mail" | translate }</label>
- <input class="text" type="text" name="author_email" value="${ comment.author_email | escape }" id="author_email" />
- </p>
- <p>
- <label for="author_url">${ "Author Website" | translate }</label>
- <input class="text" type="text" name="author_url" value="${ comment.author_url | escape }" id="author_url" />
- </p>
- <p>
- <label for="status">${ "Status" | translate }</label>
- <select name="status" id="status">
- <option value="approved"${ comment.status | option_selected("approved") }>${ "Approved" | translate }</option>
- <option value="denied"${ comment.status | option_selected("denied") }>${ "Denied" | translate }</option>
- <option value="spam"${ comment.status | option_selected("spam") }>${ "Spam" | translate }</option>
- <option value="pingback"${ comment.status | option_selected("pingback") }>${ "Pingback" | translate }</option>
- <option value="trackback"${ comment.status | option_selected("trackback") }>${ "Trackback" | translate }</option>
- </select>
- </p>
- <p>
- <label for="created_at">${ "Timestamp" | translate }</label>
- <input class="text" type="text" name="created_at" value="${ comment.created_at | date }" id="created_at" />
- </p>
- <p>
<label for="body">${ "Body" | translate }</label>
<textarea class="wide preview_me" rows="12" name="body" id="body" cols="50">${ comment.body | escape }</textarea>
</p>
@@ -43,6 +17,39 @@
</button>
</div>
+ <div class="clear"></div>
+ <noscript><br /></noscript>
+ <div id="more_options" class="more_options js_disabled">
+ <p>
+ <label for="author">${ "Author" | translate }</label>
+ <input class="text" type="text" name="author" value="${ comment.author | escape }" id="author" />
+ </p>
+ <p>
+ <label for="author_email">${ "Author E-Mail" | translate }</label>
+ <input class="text" type="text" name="author_email" value="${ comment.author_email | escape }" id="author_email" />
+ </p>
+ <p>
+ <label for="author_url">${ "Author Website" | translate }</label>
+ <input class="text" type="text" name="author_url" value="${ comment.author_url | escape }" id="author_url" />
+ </p>
+ <p>
+ <label for="status">${ "Status" | translate }</label>
+ <select name="status" id="status">
+ <option value="approved"${ comment.status | option_selected("approved") }>${ "Approved" | translate }</option>
+ <option value="denied"${ comment.status | option_selected("denied") }>${ "Denied" | translate }</option>
+ <option value="spam"${ comment.status | option_selected("spam") }>${ "Spam" | translate }</option>
+ <option value="pingback"${ comment.status | option_selected("pingback") }>${ "Pingback" | translate }</option>
+ <option value="trackback"${ comment.status | option_selected("trackback") }>${ "Trackback" | translate }</option>
+ </select>
+ </p>
+ <p>
+ <label for="created_at">${ "Timestamp" | translate }</label>
+ <input class="text" type="text" name="created_at" value="${ comment.created_at | strftime }" id="created_at" />
+ </p>
+ ${ trigger.call("edit_comment_options", comment) }
+ <div class="clear"></div>
+ </div>
+
<input type="hidden" name="hash" value="$site.secure_hashkey" id="hash" />
<input type="hidden" name="id" value="$comment.id" id="id" />
</fieldset>
modules/comments/pages/admin/edit_comment.twig
@@ -2,10 +2,10 @@
{% block content %}
{% if archives %} {# List? (For all/yearly archives) #}
{% for archive in archives %}
- <h2><a href="$archive.url">$archive.month $archive.year</a></h2>
+ <h2><a href="$archive.url">${ archive.timestamp | strftime("%B %Y") }</a></h2>
<ul>
{% for post in archive.posts %}
- <li>${ post.created_at | date("d") }: <a href="$post.url">${ post.title | normalize | truncate(70) }</a></li>
+ <li>${ post.created_at | strftime("%d") }: <a href="$post.url">${ post.title | normalize | truncate(70) }</a></li>
{% endfor %}
</ul>
<br />
@@ -14,10 +14,10 @@
{% if posts.paginated %} {# Posts? (For daily/monthly archives) #}
{% if archive.depth == "day" %}
- <h2>${ "Archive of" | translate } $archive.month $archive.day, $archive.year</h2>
+ <h2>${ "Archive of %s" | translate | format(archive.timestamp | strftime("%B %d, %Y")) }</h2>
{% endif %}
{% if archive.depth == "month" %}
- <h2>${ "Archive of" | translate } $archive.month $archive.year</h2>
+ <h2>${ "Archive of %s" | translate | format(archive.timestamp | strftime("%B %Y")) }</h2>
{% endif %}
{% for post in posts.paginated %}
{% include "content/post.twig" %}
themes/default/content/archive.twig
@@ -6,14 +6,8 @@
<p>$comment.body</p>
</blockquote>
<cite>
- <strong>$comment.author_link</strong> ${ "on" | translate }
- ${ comment.created_at | date("F jS, 2008, \\a\\\t g:i A") }
- {% if comment.editable %}
- <em>|</em> $comment.edit_link
- {% endif %}
-
- {% if comment.deletable %}
- <em>|</em> $comment.delete_link
- {% endif %}
+ ${ "<strong>%s</strong> on %s" | translate | format(comment.author_link, comment.created_at | strftime("%B %d, %Y, at %I:%M %r")) }
+ ${ comment.edit_link("Edit" | translate, "<em>|</em> ") }
+ ${ comment.delete_link("Delete" | translate, "<em>|</em> ") }
</cite>
</li>
themes/default/content/comment.twig
@@ -13,7 +13,7 @@
{% endif %}
<div class="clear"></div>
<span class="info">
- <strong><a href="$post.url">${ post.created_at | date("F jS @ g:i A") }</a></strong>
+ <strong><a href="$post.url">${ post.created_at | strftime("%B %d @ %I:%M %p") }</a></strong>
{% if enabled_modules.categorize and post.category.id != 0 %}
<em>|</em> <a href="$post.category.url" rel="tag">$post.category.name</a>
{% endif %}
themes/default/content/post.twig
@@ -35,7 +35,7 @@ ${ trigger.call("sidebar") }
<h1>${ "Archives" | translate }</h1>
<ul>
{% for archive in theme.archives_list %}
- <li><a href="$archive.url">${ archive.when | date("F Y") }</a> <span class="sub">($archive.count)</span></li>
+ <li><a href="$archive.url">${ archive.when | strftime("%B %Y") }</a> <span class="sub">($archive.count)</span></li>
{% endfor %}
</ul>
{% endif %}
themes/default/sidebar.twig
acc28e6d525aad5d39e38f173b44229352b5a848
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/5cffbb5ea3452a720f132995f5a98bb2da5a20a9
5cffbb5ea3452a720f132995f5a98bb2da5a20a9
2008-06-24T14:59:32-07:00
2008-06-24T14:59:32-07:00
* Moved all date representations that I can find over to strftime. [#120 state:resolved]
* Improved Edit Comment form appearance.
* "More Options" JS magic has more liberal checking to determine whether or not it should do its stuff.
353450dbff62584f49d5a2c2e444c1bffcfe7abf
Alex Suraci
i.am@toogeneric.com