Changeset 1739

Timestamp:

05/17/08 05:18:16 (8 months ago)

Author:

michaeltwofish

Message:

Tags are now displayed correctly when renamed. Make admin/tags use the tag_collection template to display tags. Return that template with the rename tags AJAX call. This makes the admin/tag much nicer (less complex JavaScript), and removes duplication from ajax_tags.

Location:

trunk/htdocs/system

Files:

• admin/tag_collection.php (added)
• admin/tags.php (modified) (2 diffs)
• classes/adminhandler.php (modified) (4 diffs)

trunk/htdocs/system/admin/tags.php

@@ -8 +8 @@
     <span class="newer pct10"><a href="#">Newer &raquo;</a></span>
 </div>
-<?php
-    $tags= $available_tags;
-    //what's the max count?
-    //ugly! and probably needs to be a Tags method or something
-    $max=0;
-    foreach ($tags as $tag){if ($max < $tag->count) $max=$tag->count;}
-?>
-<div class="container tags">
-<?php foreach ($tags as $tag) { ?>
-    <a href="#" id="<?php echo 'tag_' . $tag->id ?>" class="tag wt<?php echo round(($tag->count * 10)/$max); ?>"><span><?php echo $tag->tag; ?></span><sup><?php echo $tag->count; ?></sup></a>
-<?php } ?>
-        <ul class="dropbutton">
-            <li><a href="#">Select Visible</a></li>
-            <li><a href="#">Select All</a></li>
-            <li><a href="#">Deselect All</a></li>
-        </ul>
+<div id="tag_collection" class="container tags">
+  <?php $theme->display( 'tag_collection' ); ?>
 </div>
 
@@ -116 +102 @@
             //TODO When there's a loupe, update it
             //timelineHandle.updateLoupeInfo();
-            master_found= false;
-            // Update the master tag count
-            $('.tags .tag:contains(' + master + ')').each(function() {
-                if ($(this).find('span').text() == master) {
-                    $(this).find('sup').text(data['count']);
-                    // TODO should change the wt%d class
-                    master_found= true;
-                }
-            })
-            // master wasn't an existing tag, add it to the list
-            // It's going to be last, not in order
-            if (!master_found) {
-                $('.tags .tag:last').after('<a href="#" id="tag_' + data['id'] + '" class="tag wt' + data['wt'] + '"><span>' + master + '</span><sup>' + data['count'] + '</sup></a>');
-                $('.tags .tag:last').click(function() {
+            $('#tag_collection').html(data['tags']);
+            $('.tags .tag').click(function() {
                     $(this).toggleClass('selected');
                     tagManage.changeTag();
-                });
-            }
-            selected.remove();
+                }
+            );
+            tagManage.changeTag();
             humanMsg.displayMsg(data['msg']);
         },

trunk/htdocs/system/classes/adminhandler.php

@@ -471 +471 @@
                 $this->theme->assign( 'settings', $settings );
             }
-            $this->theme->display('users');
+            $this->theme->display( 'users' );
         }
     }
@@ -1360 +1360 @@
     {
         $this->theme->wsse= Utils::WSSE();
-        $this->theme->available_tags= Tags::get();
         $this->display( 'tags' );
     }
@@ -1393 +1392 @@
             case 'rename':
                 if ( isset($this->handler_vars['master']) ) {
+                    $theme_dir= Plugins::filter( 'admin_theme_dir', Site::get_dir( 'admin_theme', TRUE ) );
+                    $this->theme= Themes::create( 'admin', 'RawPHPEngine', $theme_dir );
                     $master= $this->handler_vars['master'];
                     $tag_names= array();
@@ -1405 +1406 @@
                     Tags::rename($master, $tag_names);
                     $msg_status= sprintf( _t('Tags %s have been renamed to %s.'), implode($tag_names, ', '), $master );
-                    $master= Tags::get_one( $master );
-                    $wt= round(($master->count * 10)/$master->count);
-                    echo json_encode( array( 'msg' => $msg_status, 'count' => $master->count, 'id' => $master->id, 'wt' => $wt ) );
+                    echo json_encode( array( 'msg' => $msg_status, 'tags' => $this->theme->fetch( 'tag_collection' ) ) );
                 }
                 break;