@@ -23,20 +23,96 @@
Route::current()->remove("tag/(name)/");
}
+ public function admin_head() {
+?>
+ <script type="text/javascript">
+ $(function(){
+ function scanTags(){
+ $(".tags_select a").each(function(){
+ regexp = new RegExp("(, ?|^)"+ $(this).text() +"(, ?|$)", "g")
+ if ($("#tags").val().match(regexp))
+ $(this).addClass("tag_added")
+ else
+ $(this).removeClass("tag_added")
+ })
+ }
+ scanTags()
+ $("#tags").livequery("keyup", scanTags)
+ })
+
+ function add_tag(name, link) {
+ if ($("#tags").val().match("(, |^)"+ name +"(, |$)")) {
+ regexp = new RegExp("(, |^)"+ name +"(, |$)", "g")
+ $("#tags").val($("#tags").val().replace(regexp, function(match, before, after){
+ if (before == ", " && after == ", ")
+ return ", "
+ else
+ return ""
+ }))
+
+ $(link).removeClass("tag_added")
+ } else {
+ if ($("#tags").val() == "")
+ $("#tags").val(name)
+ else
+ $("#tags").val($("#tags").val() + ", "+ name)
+
+ $(link).addClass("tag_added")
+ }
+ }
+ </script>
+ <style type="text/css" media="screen">
+ .tags_select {
+ display: inline-block;
+ margin-top: .5em;
+ }
+ .tags_select a {
+ padding: .1em .4em;
+ border: .1em solid #DDDDA8;
+ background: #FFFFCA;
+ text-decoration: none;
+ border-top-width: 0;
+ border-left-width: 0;
+ color: #555;
+ }
+ .tags_select a.tag_added {
+ background: #eee;
+ border-top-width: .1em;
+ border-bottom: 0;
+ border-left-width: .1em;
+ border-right: 0;
+ border-color: #ddd;
+ }
+ </style>
+<?php
+ }
+
public function new_post_options() {
+ $tags = self::list_tags();
?>
<p>
<label for="tags"><?php echo __("Tags", "tags"); ?> <span class="sub"><?php echo __("(comma separated)", "tags"); ?></span></label>
<input class="text" type="text" name="tags" value="" id="tags" />
+ <span class="tags_select">
+<?php foreach ($tags as $tag): ?>
+ <a href="javascript:add_tag('<?php echo addslashes($tag["name"]); ?>', '.tag_<?php echo addslashes($tag["url"]); ?>')" class="tag_<?php echo $tag["url"]; ?>"><?php echo $tag["name"]; ?></a>
+<?php endforeach; ?>
+ </span>
</p>
<?php
}
public function edit_post_options($post) {
+ $tags = self::list_tags();
?>
<p>
<label for="tags"><?php echo __("Tags", "tags"); ?> <span class="sub"><?php echo __("(comma separated)", "tags"); ?></span></label>
<input class="text" type="text" name="tags" value="<?php echo implode(", ", self::unlinked_tags($post->unclean_tags)) ?>" id="tags" />
+ <span class="tags_select">
+<?php foreach ($tags as $tag): ?>
+ <a href="javascript:add_tag('<?php echo addslashes($tag["name"]); ?>', '.tag_<?php echo addslashes($tag["url"]); ?>')" class="tag_<?php echo $tag["url"]; ?>"><?php echo $tag["name"]; ?></a>
+<?php endforeach; ?>
+ </span>
</p>
<?php
}
modules/tags/tags.php
@@ -514,6 +514,20 @@
Config::set("sql", Config::get("database"));
Config::remove("database");
}
+
+ function update_post_status_column() {
+ $sql = SQL::current();
+ $column = $sql->query("SHOW COLUMNS FROM __posts WHERE Field = 'status'");
+ if (!$column)
+ return;
+
+ $result = $column->fetchObject();
+ if ($result->Type == "varchar(32)")
+ return;
+
+ echo __("Updating `status` column on `posts` table...")
+ .test($sql->query("ALTER TABLE __posts CHANGE status status VARCHAR(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT 'public'"));
+ }
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -673,6 +687,8 @@
rename_database_config();
+ update_post_status_column();
+
foreach ((array) Config::get("enabled_modules") as $module)
if (file_exists(MAIN_DIR."/modules/".$module."/upgrades.php")) {
echo _f("Calling \"%s\" module's upgrader...", array($module))."\n";
upgrade.php
1203fa4e51119f191077cfe378f5dce80f78faae
Alex Suraci
i.am@toogeneric.com
http://github.com/vito/chyrp/commit/c33efaf5af8bd283233a863567edc8ceabd3bd05
c33efaf5af8bd283233a863567edc8ceabd3bd05
2008-08-17T15:15:30-07:00
2008-08-17T15:14:31-07:00
* Added JS-aided tag selection when writing/editing posts in the admin. [#109 state:resolved]
* Added an update_post_status_column upgrader function.
5b4665428eb8bddb53428ecae97676b8409fa806
Alex Suraci
i.am@toogeneric.com