@@ -8,11 +8,11 @@
<fieldset>
<p>
<label for="posts_per_page">${ "Posts Per Page" | translate }</label>
- <input class="text nowidth" type="text" name="posts_per_page" value="${ site.posts_per_page | escape }" size="2" id="posts_per_page" />
+ <input class="text" type="text" name="posts_per_page" value="${ site.posts_per_page | escape }" size="2" id="posts_per_page" />
</p>
<p>
<label for="feed_items">${ "Feed Posts Limit" | translate }</label>
- <input class="text nowidth" type="text" name="feed_items" value="${ site.feed_items | escape }" size="2" id="feed_items" />
+ <input class="text" type="text" name="feed_items" value="${ site.feed_items | escape }" size="2" id="feed_items" />
</p>
<p>
<label for="feed_url">${ "Feed URL" | translate }</label>
admin/layout/pages/content_settings.twig
@@ -470,6 +470,17 @@ form.split button {
form .buttons {
margin-top: 2em;
}
+form.inline,
+form.inline fieldset {
+ display: inline;
+}
+h1 form.inline,
+h2 form.inline,
+h3 form.inline,
+h4 form.inline {
+ font-size: .625em;
+ margin-left: 1em;
+}
label {
display: block;
font-size: 1.1em;
admin/style.css
@@ -66,7 +66,7 @@
$filename = $_POST['filename'];
return Post::add(array("filename" => $filename,
- "caption" => $_POST['caption']),
+ "caption" => $_POST['caption']),
$_POST['slug'],
Post::check_url($_POST['slug']));
}
feathers/photo/photo.php
@@ -7,7 +7,7 @@
<form id="aggregation_settings" class="split" action="{% admin "aggregation_settings" %}" method="post">
<fieldset>
<p>
- <label for="aggregate_every">${ "Check Feeds Every %s Minutes" | translate("aggregator") | format("<input class=\"text nowidth\" type=\"text\" name=\"aggregate_every\" value=\"" ~ site.aggregate_every | escape ~ "\" size=\"2\" id=\"aggregate_every\" class=\"center\" />") }</label>
+ <label for="aggregate_every">${ "Check Feeds Every %s Minutes" | translate("aggregator") | format("<input class=\"text\" type=\"text\" name=\"aggregate_every\" value=\"" ~ site.aggregate_every | escape ~ "\" size=\"2\" id=\"aggregate_every\" class=\"center\" />") }</label>
<input type="checkbox" class="checkbox" name="disable_aggregation"${ site.disable_aggregation | checked } /> ${ "disable" | translate("aggregator") }
</p>
modules/aggregator/pages/admin/aggregation_settings.twig
@@ -26,10 +26,10 @@
</p>
<p>
<label for="comments_per_page">${ "Comments Per Page" | translate("comments") }</label>
- <input class="text nowidth" type="text" name="comments_per_page" value="${ site.comments_per_page | escape }" size="2" id="comments_per_page" />
+ <input class="text" type="text" name="comments_per_page" value="${ site.comments_per_page | escape }" size="2" id="comments_per_page" />
</p>
<p>
- <label for="auto_reload_comments">${ "Reload Comments Every %s Seconds" | translate("comments") | format("<input class=\"text nowidth\" type=\"text\" name=\"auto_reload_comments\" value=\"" ~ site.auto_reload_comments | escape ~ "\" size=\"2\" id=\"auto_reload_comments\" />") }</label>
+ <label for="auto_reload_comments">${ "Reload Comments Every %s Seconds" | translate("comments") | format("<input class=\"text\" type=\"text\" name=\"auto_reload_comments\" value=\"" ~ site.auto_reload_comments | escape ~ "\" size=\"2\" id=\"auto_reload_comments\" />") }</label>
<input type="checkbox" class="checkbox" name="enable_reload_comments"${ site.enable_reload_comments | checked } /> ${ "enabled" | translate("comments") }
</p>
modules/comments/pages/admin/comment_settings.twig
@@ -82,4 +82,7 @@
}
.post_tags li a.edit_tag:hover {
background: #f5f5f5;
+}
+.post_tags li a.tag:hover {
+ background: #f0f0f0;
}
\ No newline at end of file
modules/tags/admin.css
@@ -23,29 +23,19 @@
<br />
<h2>${ "Post Tags" | translate("tags") }</h2>
<br />
- <div class="left pad margin-right">
- <form class="detail" action="index.php" method="get" accept-charset="utf-8">
+ <h2>
+ {% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Posts" | translate }{% endif %}
+ <form class="detail inline" action="index.php" method="get" accept-charset="utf-8">
<fieldset>
<input type="hidden" name="action" value="manage_tags" />
- <h3>
- ${ "Search…" | translate }
- <a href="{% admin "help&id=filtering_results" %}" class="help emblem"><img src="images/icons/help.png" alt="help" /></a>
- </h3>
- <input class="text" type="text" name="query" value="${ GET.query | escape }" id="query" /> <button type="submit" class="inline">${ "Search →" | translate }</button>
+ <input class="text" type="text" name="query" value="${ GET.query | escape }" id="query" size="15" />
+ <button type="submit" class="inline">${ "Search →" | translate }</button>
+ <a href="{% admin "help&id=filtering_results" %}" class="help emblem"><img src="images/icons/help.png" alt="help" /></a>
</fieldset>
</form>
- </div>
+ </h2>
<form class="detail" action="{% admin "bulk_tag" %}" method="post" accept-charset="utf-8">
<fieldset>
- <div class="left pad">
- <h3>${ "Tag Selected:" | translate("tags") }</h3>
- <input type="text" name="name" value="" id="name" />
- <button type="submit" class="inline">${ "Tag →" | translate("tags") }</button>
- <input type="hidden" name="hash" value="$site.secure_hashkey" id="hash" />
- </div>
- <div class="clear"></div>
- <br />
- <h2>{% if GET.query %}${ "Search Results" | translate }{% else %}${ "Last 25 Posts" | translate }{% endif %}</h2>
<ul class="post_tags">
<li class="odd js_enabled toggler">
<h3 class="inline sub">${ "Toggle All" | translate }</h3>
@@ -65,9 +55,15 @@
</li>
{% endfor %}
</ul>
+ <div class="left pad">
+ <h3>${ "Tag Selected:" | translate("tags") }</h3>
+ <input type="text" name="name" value="" id="name" />
+ <button type="submit" class="inline">${ "Tag →" | translate("tags") }</button>
+ <input type="hidden" name="hash" value="$site.secure_hashkey" id="hash" />
+ </div>
</fieldset>
</form>
- <br />
+ <div class="clear"></div>
$posts.next_link
$posts.prev_link
{% endblock %}
\ No newline at end of file
modules/tags/pages/admin/manage_tags.twig
@@ -299,9 +299,7 @@
foreach($sql->select("tags",
"*",
- "clean LIKE :tag",
- null,
- array(":tag" => "%{{".$_GET['name']."}}%"))->fetchAll() as $tag) {
+ array("clean like" => "%{{".urldecode($_GET['clean'])."}}%"))->fetchAll() as $tag) {
$names = array();
foreach (explode("}},{{", substr(substr($tag["tags"], 0, -2), 2)) as $name)
if ($name != $_GET['name'])
modules/tags/tags.php
a7f35ec512c10340723dacfb6f141c0f42a42749
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/a78f76381f44057814538388890bed5f3127c379
a78f76381f44057814538388890bed5f3127c379
2008-09-01T09:29:23-07:00
2008-09-01T09:29:23-07:00
* Fixed tag deleting
* Fixed Manage Comments UI
92529f9ea74b3d6a319a0876fca890e697c07b1e
Alex Suraci
i.am@toogeneric.com