[galaxy-dev] [hg] galaxy 2652: Automated merge with ssh://scofield.bx.psu.edu...

29 Aug 2009

details:   http://www.bx.psu.edu/hg/galaxy/rev/fba947d16fa7
changeset: 2652:fba947d16fa7
user:      James Taylor <james@jamestaylor.org>
date:      Fri Aug 28 18:03:28 2009 -0400
description:
Automated merge with ssh://scofield.bx.psu.edu//depot/projects/universe/hg

3 file(s) affected in this change:

lib/galaxy/model/__init__.py
lib/galaxy/model/mapping.py
templates/dataset/edit_attributes.mako

diffs (2309 lines):

diff -r cc4944a62b66 -r fba947d16fa7 lib/galaxy/model/__init__.py

--- a/lib/galaxy/model/__init__.py	Fri Aug 28 16:52:58 2009 -0400
+++ b/lib/galaxy/model/__init__.py	Fri Aug 28 18:03:28 2009 -0400
@@ -1146,6 +1146,37 @@
         self.user = None
         self.title = None
         self.content = None
+        
+class Tag ( object ):
+    def __init__( self, id=None, type=None, parent_id=None, name=None ):
+        self.id = id
+        self.type = type
+        self.parent_id = parent_id
+        self.name = name
+        
+    def __str__ ( self ):
+        return "Tag(id=%s, type=%s, parent_id=%s, name=%s)" %  ( self.id, self.type, self.parent_id, self.name )
+    
+class ItemTagAssociation ( object ):
+    def __init__( self, item_id=None, tag_id=None, user_tname=None, value=None ):    
+        self.item_id = item_id
+        self.tag_id = tag_id
+        self.user_tname = user_tname
+        self.value = None
+        self.user_value = None
+        
+    def __str__ ( self ):
+        return "%s(item_id=%s, item_tag=%s, user_tname=%s, value=%s, user_value=%s)" % (self.__class__.__name__, self.item_id, self.tag_id, self.user_tname, self.value. self.user_value )  
+    
+    
+class HistoryTagAssociation ( ItemTagAssociation ):
+    pass
+
+class DatasetTagAssociation ( ItemTagAssociation ):
+    pass
+    
+class HistoryDatasetAssociationTagAssociation ( ItemTagAssociation ):
+    pass
 
 
 
diff -r cc4944a62b66 -r fba947d16fa7 lib/galaxy/model/mapping.py
--- a/lib/galaxy/model/mapping.py	Fri Aug 28 16:52:58 2009 -0400
+++ b/lib/galaxy/model/mapping.py	Fri Aug 28 18:03:28 2009 -0400
@@ -544,6 +544,34 @@
     Column( "content", TEXT )
     )
 
+Tag.table = Table( "tag", metadata,
+    Column( "id", Integer, primary_key=True ),
+    Column( "type", Integer ),
+    Column( "parent_id", Integer, ForeignKey( "tag.id" ) ),
+    Column( "name", TrimmedString(255) ), 
+    UniqueConstraint( "name" ) )
+
+HistoryTagAssociation.table = Table( "history_tag_association", metadata,
+    Column( "history_id", Integer, ForeignKey( "history.id" ), index=True ),
+    Column( "tag_id", Integer, ForeignKey( "tag.id" ), index=True ),
+    Column( "user_tname", TrimmedString(255), index=True),
+    Column( "value", TrimmedString(255), index=True),
+    Column( "user_value", TrimmedString(255), index=True) )
+    
+DatasetTagAssociation.table = Table( "dataset_tag_association", metadata,
+    Column( "dataset_id", Integer, ForeignKey( "dataset.id" ), index=True ),
+    Column( "tag_id", Integer, ForeignKey( "tag.id" ), index=True ),
+    Column( "user_tname", TrimmedString(255), index=True),
+    Column( "value", TrimmedString(255), index=True),
+    Column( "user_value", TrimmedString(255), index=True) )
+
+HistoryDatasetAssociationTagAssociation.table = Table( "history_dataset_association_tag_association", metadata,
+    Column( "history_dataset_association_id", Integer, ForeignKey( "history_dataset_association.id" ), index=True ),
+    Column( "tag_id", Integer, ForeignKey( "tag.id" ), index=True ),
+    Column( "user_tname", TrimmedString(255), index=True),
+    Column( "value", TrimmedString(255), index=True),
+    Column( "user_value", TrimmedString(255), index=True) )
+
 # With the tables defined we can define the mappers and setup the 
 # relationships between the model objects.
 
@@ -643,7 +671,8 @@
             backref=backref( "parent", primaryjoin=( HistoryDatasetAssociation.table.c.parent_id == HistoryDatasetAssociation.table.c.id ), remote_side=[HistoryDatasetAssociation.table.c.id], uselist=False ) ),
         visible_children=relation( 
             HistoryDatasetAssociation, 
-            primaryjoin=( ( HistoryDatasetAssociation.table.c.parent_id == HistoryDatasetAssociation.table.c.id ) & ( HistoryDatasetAssociation.table.c.visible == True ) ) )
+            primaryjoin=( ( HistoryDatasetAssociation.table.c.parent_id == HistoryDatasetAssociation.table.c.id ) & ( HistoryDatasetAssociation.table.c.visible == True ) ) ),
+        tags=relation(HistoryDatasetAssociationTagAssociation, backref='history_tag_associations')
             ) )
 
 assign_mapper( context, Dataset, Dataset.table,
@@ -659,7 +688,8 @@
             primaryjoin=( Dataset.table.c.id == LibraryDatasetDatasetAssociation.table.c.dataset_id ) ),
         active_library_associations=relation( 
             LibraryDatasetDatasetAssociation, 
-            primaryjoin=( ( Dataset.table.c.id == LibraryDatasetDatasetAssociation.table.c.dataset_id ) & ( LibraryDatasetDatasetAssociation.table.c.deleted == False ) ) )
+            primaryjoin=( ( Dataset.table.c.id == LibraryDatasetDatasetAssociation.table.c.dataset_id ) & ( LibraryDatasetDatasetAssociation.table.c.deleted == False ) ) ),
+        tags=relation(DatasetTagAssociation, backref='datasets')
             ) )
 
 assign_mapper( context, HistoryDatasetAssociationDisplayAtAuthorization, HistoryDatasetAssociationDisplayAtAuthorization.table,
@@ -678,7 +708,8 @@
 assign_mapper( context, History, History.table,
     properties=dict( galaxy_sessions=relation( GalaxySessionToHistoryAssociation ),
                      datasets=relation( HistoryDatasetAssociation, backref="history", order_by=asc(HistoryDatasetAssociation.table.c.hid) ),
-                     active_datasets=relation( HistoryDatasetAssociation, primaryjoin=( ( HistoryDatasetAssociation.table.c.history_id == History.table.c.id ) & ( not_( HistoryDatasetAssociation.table.c.deleted ) ) ), order_by=asc( HistoryDatasetAssociation.table.c.hid ), viewonly=True )
+                     active_datasets=relation( HistoryDatasetAssociation, primaryjoin=( ( HistoryDatasetAssociation.table.c.history_id == History.table.c.id ) & ( not_( HistoryDatasetAssociation.table.c.deleted ) ) ), order_by=asc( HistoryDatasetAssociation.table.c.hid ), viewonly=True ),
+                     tags=relation(HistoryTagAssociation, backref="histories") 
                       ) )
 
 assign_mapper( context, HistoryUserShareAssociation, HistoryUserShareAssociation.table,
@@ -938,6 +969,25 @@
                                                lazy=False )
                    ) )
 
+assign_mapper( context, Tag, Tag.table,
+    properties=dict( children=relation(Tag, backref=backref( 'parent', remote_side=[Tag.table.c.id] ) )  
+                     ) )
+
+assign_mapper( context, HistoryTagAssociation, HistoryTagAssociation.table,
+    properties=dict( tag=relation(Tag, backref="tagged_histories") ),
+                     primary_key=[HistoryTagAssociation.table.c.history_id, HistoryTagAssociation.table.c.tag_id]
+                     )
+
+assign_mapper( context, DatasetTagAssociation, DatasetTagAssociation.table,
+    properties=dict( tag=relation(Tag, backref="tagged_datasets") ),
+                     primary_key=[DatasetTagAssociation.table.c.dataset_id, DatasetTagAssociation.table.c.tag_id]
+                     )
+
+assign_mapper( context, HistoryDatasetAssociationTagAssociation, HistoryDatasetAssociationTagAssociation.table,
+    properties=dict( tag=relation(Tag, backref="tagged_history_dataset_associations") ),
+                     primary_key=[HistoryDatasetAssociationTagAssociation.table.c.history_dataset_association_id, HistoryDatasetAssociationTagAssociation.table.c.tag_id]
+                     )
+
 def db_next_hid( self ):
     """
     Override __next_hid to generate from the database in a concurrency
diff -r cc4944a62b66 -r fba947d16fa7 lib/galaxy/tags/__init__.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/galaxy/tags/__init__.py	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,3 @@
+"""
+Galaxy tagging classes and methods.
+"""
diff -r cc4944a62b66 -r fba947d16fa7 lib/galaxy/tags/tag_handler.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/galaxy/tags/tag_handler.py	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,226 @@
+from galaxy.model import Tag, History, HistoryTagAssociation, Dataset, DatasetTagAssociation, HistoryDatasetAssociation, HistoryDatasetAssociationTagAssociation
+import re
+
+class TagHandler( object ):
+    
+    # Tag separator.
+    tag_separators = ',;'
+    
+    # Hierarchy separator.
+    hierarchy_separator = '.'
+    
+    # Key-value separator.
+    key_value_separators = "=:"
+    
+    def __init__(self):
+        self.tag_assoc_classes = dict()
+        
+    def add_tag_assoc_class(self, entity_class, tag_assoc_class):
+        self.tag_assoc_classes[entity_class] = tag_assoc_class
+        
+    def get_tag_assoc_class(self, entity_class):
+        return self.tag_assoc_classes[entity_class]
+        
+    # Remove a tag from an item.
+    def remove_item_tag(self, item, tag_name):
+        # Get item tag association.
+        item_tag_assoc = self._get_item_tag_assoc(item, tag_name)
+        
+        # Remove association.
+        if item_tag_assoc:
+            # Delete association.
+            item_tag_assoc.delete()
+            item.tags.remove(item_tag_assoc)
+            return True
+        
+        return False
+    
+    # Delete tags from an item.
+    def delete_item_tags(self, item):
+        # Delete item-tag associations.
+        for tag in item.tags:
+            tag.delete()
+            
+        # Delete tags from item.
+        del item.tags[:]
+        
+    # Returns true if item is has a given tag.
+    def item_has_tag(self, item, tag_name):
+        # Check for an item-tag association to see if item has a given tag.
+        item_tag_assoc = self._get_item_tag_assoc(item, tag_name)
+        if item_tag_assoc:
+            return True
+        return False
+            
+
+    # Apply tags to an item.
+    def apply_item_tags(self, db_session, item, tags_str):
+        # Parse tags.
+        parsed_tags = self._parse_tags(tags_str)
+        
+        # Apply each tag.
+        for name, value in parsed_tags.items():
+            # Get or create item-tag association.
+            item_tag_assoc = self._get_item_tag_assoc(item, name)
+            if not item_tag_assoc:
+                #
+                # Create item-tag association.
+                #
+                
+                # Create tag; if None, skip the tag (and log error).
+                tag = self._get_or_create_tag(db_session, name)
+                if not tag:
+                    # Log error?
+                    continue
+                
+                # Create tag association based on item class.
+                item_tag_assoc_class = self.tag_assoc_classes[item.__class__]
+                item_tag_assoc = item_tag_assoc_class()
+                
+                # Add tag to association.
+                item.tags.append(item_tag_assoc)
+                item_tag_assoc.tag = tag
+                    
+            # Apply attributes to item-tag association. Strip whitespace from user name and tag.
+            if value:
+                trimmed_value = value.strip()
+            else:
+                trimmed_value = value
+            item_tag_assoc.user_tname = name.strip()
+            item_tag_assoc.user_value = trimmed_value
+            item_tag_assoc.value = self._scrub_tag_value(value)
+                
+    # Build a string from an item's tags.
+    def get_tags_str(self, tags):
+        # Return empty string if there are no tags.
+        if not tags:
+            return ""
+        
+        # Create string of tags.
+        tags_str_list = list()
+        for tag in tags:
+            tag_str = tag.user_tname
+            if tag.value is not None:
+                tag_str += ":" + tag.user_value
+            tags_str_list.append(tag_str)
+        return ", ".join(tags_str_list)            
+    
+    # Get a Tag object from a tag string.
+    def _get_tag(self, db_session, tag_str):
+        return db_session.query(Tag).filter(Tag.name==tag_str).first()
+    
+    # Create a Tag object from a tag string.
+    def _create_tag(self, db_session, tag_str):
+        tag_hierarchy = tag_str.split(self.__class__.hierarchy_separator)
+        tag_prefix = ""
+        parent_tag = None
+        for sub_tag in tag_hierarchy:
+            # Get or create subtag.
+            tag_name = tag_prefix + self._scrub_tag_name(sub_tag)
+            tag = db_session.query(Tag).filter(Tag.name==tag_name).first()
+            if not tag:
+                tag = Tag(type="generic", name=tag_name)
+                
+            # Set tag parent.
+            tag.parent = parent_tag
+            
+            # Update parent and tag prefix.
+            parent_tag = tag
+            tag_prefix = tag.name + self.__class__.hierarchy_separator
+        return tag
+    
+    # Get or create a Tag object from a tag string.
+    def _get_or_create_tag(self, db_session, tag_str):
+        # Scrub tag; if tag is None after being scrubbed, return None.
+        scrubbed_tag_str = self._scrub_tag_name(tag_str)
+        if not scrubbed_tag_str:
+            return None
+        
+        # Get item tag.
+        tag = self._get_tag(db_session, scrubbed_tag_str)
+        
+        # Create tag if necessary.
+        if tag is None:
+            tag = self._create_tag(db_session, scrubbed_tag_str)
+            
+        return tag
+    
+    # Return ItemTagAssociation object for an item and a tag string; returns None if there is
+    # no such tag.
+    def _get_item_tag_assoc(self, item, tag_name):
+        scrubbed_tag_name = self._scrub_tag_name(tag_name)
+        for item_tag_assoc in item.tags:
+            if item_tag_assoc.tag.name == scrubbed_tag_name:
+                return item_tag_assoc 
+        return None
+    
+    # Returns a list of raw (tag-name, value) pairs derived from a string; method does not scrub tags. 
+    # Return value is a dictionary where tag-names are keys.
+    def _parse_tags(self, tag_str):
+        # Gracefully handle None.
+        if not tag_str:
+            return dict()
+        
+        # Split tags based on separators.
+        reg_exp = re.compile('[' + self.__class__.tag_separators + ']')
+        raw_tags = reg_exp.split(tag_str)
+        
+        # Extract name-value pairs.
+        name_value_pairs = dict()
+        for raw_tag in raw_tags:
+            nv_pair = self._get_name_value_pair(raw_tag)
+            name_value_pairs[nv_pair[0]] = nv_pair[1]
+        return name_value_pairs
+    
+    # Scrub a tag value.
+    def _scrub_tag_value(self, value):
+        # Gracefully handle None:
+        if not value:
+            return None
+        
+        # Remove whitespace from value.
+        reg_exp = re.compile('\s')
+        scrubbed_value = re.sub(reg_exp, "", value)
+        
+        # Lowercase and return.
+        return scrubbed_value.lower()
+    
+    # Scrub a tag name.
+    def _scrub_tag_name(self, name):
+        # Gracefully handle None:
+        if not name:
+            return None
+        
+        # Remove whitespace from name.
+        reg_exp = re.compile('\s')
+        scrubbed_name = re.sub(reg_exp, "", name)
+            
+        # Ignore starting ':' char.
+        if scrubbed_name.startswith(self.__class__.hierarchy_separator):
+            scrubbed_name = scrubbed_name[1:]
+            
+        # If name is too short or too long, return None.
+        if len(scrubbed_name) < 3 or len(scrubbed_name) > 255:
+            return None
+                
+        # Lowercase and return.
+        return scrubbed_name.lower()
+    
+    # Scrub a tag name list.
+    def _scrub_tag_name_list(self, tag_name_list):
+        scrubbed_tag_list = list()
+        for tag in tag_name_list:
+            scrubbed_tag_list.append(self._scrub_tag_name(tag))
+        return scrubbed_tag_list
+    
+    # Get name, value pair from a tag string.
+    def _get_name_value_pair(self, tag_str):
+        # Use regular expression to parse name, value.
+        reg_exp = re.compile("[" + self.__class__.key_value_separators + "]")
+        name_value_pair = reg_exp.split(tag_str)
+        
+        # Add empty slot if tag does not have value.
+        if len(name_value_pair) < 2:
+            name_value_pair.append(None)
+            
+        return name_value_pair
\ No newline at end of file
diff -r cc4944a62b66 -r fba947d16fa7 lib/galaxy/web/controllers/tag.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lib/galaxy/web/controllers/tag.py	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,147 @@
+"""
+Tags Controller: handles tagging/untagging of entities and provides autocomplete support.
+"""
+
+from galaxy.web.base.controller import *
+from galaxy.tags.tag_handler import *
+from sqlalchemy.sql.expression import func, and_
+from sqlalchemy.sql import select
+
+class TagsController ( BaseController ):
+
+    def __init__(self, app):
+        BaseController.__init__(self, app)
+        
+        # Set up dict for mapping from short-hand to full item class.
+        self.shorthand_to_item_class_dict = dict()
+        self.shorthand_to_item_class_dict["history"] = History
+        self.shorthand_to_item_class_dict["hda"] = HistoryDatasetAssociation
+        
+        # Set up tag handler to recognize the following items: History, HistoryDatasetAssociation, ...
+        self.tag_handler = TagHandler()
+        self.tag_handler.add_tag_assoc_class(History, HistoryTagAssociation)
+        self.tag_handler.add_tag_assoc_class(HistoryDatasetAssociation, HistoryDatasetAssociationTagAssociation) 
+    
+    @web.expose
+    def add_tag_async( self, trans, id=None, item_type=None, new_tag=None ):
+        """ Add tag to an item. """
+        item = self._get_item(trans, item_type, trans.security.decode_id(id))
+        
+        self._do_security_check(trans, item)
+        
+        self.tag_handler.apply_item_tags(trans.sa_session, item, new_tag)
+        trans.sa_session.flush()
+        
+    @web.expose
+    def remove_tag_async( self, trans, id=None, item_type=None, tag_name=None ):
+        """ Remove tag from an item. """
+        item = self._get_item(trans, item_type, trans.security.decode_id(id))
+        
+        self._do_security_check(trans, item)
+        
+        self.tag_handler.remove_item_tag(item, tag_name)
+        trans.sa_session.flush()
+        
+    # Retag an item. All previous tags are deleted and new tags are applied.
+    @web.expose
+    def retag_async( self, trans, id=None, item_type=None, new_tags=None ):
+        """ Apply a new set of tags to an item; previous tags are deleted. """  
+        item = self._get_item(trans, item_type, trans.security.decode_id(id))
+        
+        self._do_security_check(trans, item)
+        
+        tag_handler.delete_item_tags(item)
+        self.tag_handler.apply_item_tags(trans.sa_session, item, new_tag)
+        trans.sa_session.flush()
+        
+        tag_handler.delete_item_tags(history)
+        tag_handler.apply_item_tags(trans.sa_session, history, new_tags)
+        # Flush to complete changes.    
+        trans.sa_session.flush()
+        
+    @web.expose
+    @web.require_login( "get autocomplete data for an item's tags" )
+    def tag_autocomplete_data(self, trans, id=None, item_type=None, q=None, limit=None, timestamp=None):
+        """ Get autocomplete data for an item's tags. """
+        item = self._get_item(trans, item_type, trans.security.decode_id(id))
+        
+        self._do_security_check(trans, item)
+        
+        #    
+        # Get user's item tags and usage counts.
+        #
+        
+        # Get item-tag association class.
+        item_tag_assoc_class = self.tag_handler.get_tag_assoc_class(item.__class__)
+        
+        # Build select statement.
+        cols_to_select = [ item_tag_assoc_class.table.c.tag_id, item_tag_assoc_class.table.c.user_tname, item_tag_assoc_class.table.c.user_value, func.count('*') ] 
+        from_obj = item_tag_assoc_class.table.join(item.table).join(Tag)
+        where_clause = self._get_column_for_filtering_item_by_user_id(item)==trans.get_user().id  
+        order_by = [ func.count("*").desc() ]
+        ac_for_names = not q.endswith(":")
+        if ac_for_names:
+            # Autocomplete for tag names.
+            where_clause = and_(where_clause, Tag.table.c.name.like(q + "%"))
+            group_by = item_tag_assoc_class.table.c.tag_id
+        else:
+            # Autocomplete for tag values.
+            tag_name_and_value = q.split(":")
+            tag_name = tag_name_and_value[0]
+            tag_value = tag_name_and_value[1]
+            where_clause = and_(where_clause, Tag.table.c.name==tag_name)
+            where_clause = and_(where_clause, item_tag_assoc_class.table.c.value.like(tag_value + "%"))
+            group_by = item_tag_assoc_class.table.c.value
+        
+        # Do query and get result set.
+        query = select(columns=cols_to_select, from_obj=from_obj,
+                       whereclause=where_clause, group_by=group_by, order_by=order_by)
+        result_set = trans.sa_session.execute(query)
+        
+        # Create and return autocomplete data.
+        if ac_for_names:
+            # Autocomplete for tag names.
+            ac_data = "#Header|Your Tags\n"
+            for row in result_set:
+                # Exclude tags that are already applied to the history.    
+                if self.tag_handler.item_has_tag(item, row[1]):
+                    continue
+                # Add tag to autocomplete data.
+                ac_data += row[1] + "|" + row[1] + "\n"
+        else:
+            # Autocomplete for tag values.
+            ac_data = "#Header|Your Values for '%s'\n" % (tag_name)
+            for row in result_set:
+                ac_data += tag_name + ":" + row[2] + "|" + row[2] + "\n"
+                
+        return ac_data
+    
+    def _get_column_for_filtering_item_by_user_id(self, item): 
+        """ Returns the column to use when filtering by user id. """
+        if isinstance(item, History): 
+            return item.table.c.user_id
+        elif  isinstance(item, HistoryDatasetAssociation):
+            # Use the user_id associated with the HDA's history.
+            history = item.history 
+            return history.table.c.user_id
+    
+    def _get_item(self, trans, item_type, id):
+        """ Get an item based on type and id. """
+        item_class = self.shorthand_to_item_class_dict[item_type]
+        item = trans.sa_session.query(item_class).filter("id=" + str(id))[0]
+        return item;
+        
+    def _do_security_check(self, trans, item):
+        """ Do security check on an item. """
+        if isinstance(item, History):
+            history = item;
+            # Check that the history exists, and is either owned by the current
+            # user (if logged in) or the current history
+            assert history is not None
+            if history.user is None:
+                assert history == trans.get_history()
+            else:
+                assert history.user == trans.user
+        elif isinstance(item, HistoryDatasetAssociation):
+            # TODO.
+            pass
diff -r cc4944a62b66 -r fba947d16fa7 static/june_2007_style/autocomplete_tagging.css.tmpl
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/june_2007_style/autocomplete_tagging.css.tmpl	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,133 @@
+/****************************************************************************/
+/* JQuery autocomplete code                                                 */
+/****************************************************************************/
+
+.ac_results {
+	padding: 0px;
+	border: 1px solid black;
+	background-color: white;
+	overflow: hidden;
+	z-index: 99999;
+}
+
+.ac_results ul {
+	width: 100%;
+	list-style-position: outside;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.ac_results li {
+	padding: 2px 5px;
+	cursor: default;
+	display: block;
+	/* 
+	if width will be 100% horizontal scrollbar will apear 
+	when scroll mode will be used
+	*/
+	/*width: 100%;*/
+    /* font: menu; */
+	font-size: 12px;
+	/* 
+	it is very important, if line-height not setted or setted 
+	in relative units scroll will be broken in firefox
+	*/
+	line-height: 16px;
+	overflow: hidden;
+}
+
+.ac_loading {
+	background: white url('indicator.gif') right center no-repeat;
+}
+
+.ac_odd {
+	background-color: #fff; /* #eee */
+	margin-left: 0.3em;
+}
+
+.ac_even {
+    margin-left: 0.3em;
+}
+
+.ac_over {
+	background-color: #0A246A;
+	color: white;
+}
+
+.ac_header {
+    font-style: normal;
+    color: gray;
+    border-bottom: 0.1em solid gray;
+}
+
+/****************************************************************************/
+/* Custom code for supporting tags                                          */
+/****************************************************************************/
+.tag-area {
+    width: 100%;
+    cursor: pointer;
+    border: solid 1px #eee;
+}
+
+.active-tag-area {
+    background-color: white;
+}
+
+.toggle-link 
+{
+    font-weight: bold;  
+    padding: 0.3em;
+    margin-bottom: 1em;
+    width: 100%;
+    padding: 0.2em 0em 0.2em 0em;
+}
+
+.tag-button {
+    width: auto;
+    color: #444;
+    text-decoration: none;
+    display: inline-block;
+    cursor: pointer;
+    margin: 0.2em;
+    border: 0;
+    padding: 0.1em 0.5em 0.1em 0.5em;
+    -moz-border-radius: .5em;
+    -webkit-border-radius: .5em;
+    border-radius: .5em;
+    background:#bbb;
+}
+
+.tag-button img
+{
+    padding-left: 0.4em;
+}
+
+.tag-button .tag-name:hover
+{
+    color: white;
+}
+
+.add-tag-button
+{
+    margin-bottom: 0.3em;
+    vertical-align: middle;
+    padding: 0.3em;
+}
+
+.add-tag-button:hover
+{
+    cursor: pointer;
+}
+
+.tag-input {
+    vertical-align: bottom;
+    border: none;
+    outline: none;
+}
+
+.delete-tag-img
+{
+    
+    margin-left: 0.3em
+}
\ No newline at end of file
diff -r cc4944a62b66 -r fba947d16fa7 static/june_2007_style/blue/autocomplete_tagging.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/june_2007_style/blue/autocomplete_tagging.css	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,133 @@
+/****************************************************************************/
+/* JQuery autocomplete code                                                 */
+/****************************************************************************/
+
+.ac_results {
+	padding: 0px;
+	border: 1px solid black;
+	background-color: white;
+	overflow: hidden;
+	z-index: 99999;
+}
+
+.ac_results ul {
+	width: 100%;
+	list-style-position: outside;
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+.ac_results li {
+	padding: 2px 5px;
+	cursor: default;
+	display: block;
+	/* 
+	if width will be 100% horizontal scrollbar will apear 
+	when scroll mode will be used
+	*/
+	/*width: 100%;*/
+    /* font: menu; */
+	font-size: 12px;
+	/* 
+	it is very important, if line-height not setted or setted 
+	in relative units scroll will be broken in firefox
+	*/
+	line-height: 16px;
+	overflow: hidden;
+}
+
+.ac_loading {
+	background: white url('indicator.gif') right center no-repeat;
+}
+
+.ac_odd {
+	background-color: #fff; /* #eee */
+	margin-left: 0.3em;
+}
+
+.ac_even {
+    margin-left: 0.3em;
+}
+
+.ac_over {
+	background-color: #0A246A;
+	color: white;
+}
+
+.ac_header {
+    font-style: normal;
+    color: gray;
+    border-bottom: 0.1em solid gray;
+}
+
+/****************************************************************************/
+/* Custom code for supporting tags                                          */
+/****************************************************************************/
+.tag-area {
+    width: 100%;
+    cursor: pointer;
+    border: solid 1px #eee;
+}
+
+.active-tag-area {
+    background-color: white;
+}
+
+.toggle-link 
+{
+    font-weight: bold;  
+    padding: 0.3em;
+    margin-bottom: 1em;
+    width: 100%;
+    padding: 0.2em 0em 0.2em 0em;
+}
+
+.tag-button {
+    width: auto;
+    color: #444;
+    text-decoration: none;
+    display: inline-block;
+    cursor: pointer;
+    margin: 0.2em;
+    border: 0;
+    padding: 0.1em 0.5em 0.1em 0.5em;
+    -moz-border-radius: .5em;
+    -webkit-border-radius: .5em;
+    border-radius: .5em;
+    background:#bbb;
+}
+
+.tag-button img
+{
+    padding-left: 0.4em;
+}
+
+.tag-button .tag-name:hover
+{
+    color: white;
+}
+
+.add-tag-button
+{
+    margin-bottom: 0.3em;
+    vertical-align: middle;
+    padding: 0.3em;
+}
+
+.add-tag-button:hover
+{
+    cursor: pointer;
+}
+
+.tag-input {
+    vertical-align: bottom;
+    border: none;
+    outline: none;
+}
+
+.delete-tag-img
+{
+    
+    margin-left: 0.3em
+}
\ No newline at end of file
diff -r cc4944a62b66 -r fba947d16fa7 static/june_2007_style/make_style.py
--- a/static/june_2007_style/make_style.py	Fri Aug 28 16:52:58 2009 -0400
+++ b/static/june_2007_style/make_style.py	Fri Aug 28 18:03:28 2009 -0400
@@ -27,7 +27,8 @@
               ( "history.css.tmpl", "history.css" ),
               ( "tool_menu.css.tmpl", "tool_menu.css" ),
               ( "iphone.css.tmpl", "iphone.css" ),
-              ( "reset.css.tmpl", "reset.css" ) ]
+              ( "reset.css.tmpl", "reset.css" ),
+              ( "autocomplete_tagging.css.tmpl", "autocomplete_tagging.css") ]
               
 images = [ 
            ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ),
diff -r cc4944a62b66 -r fba947d16fa7 static/scripts/autocomplete_tagging.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/autocomplete_tagging.js	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,453 @@
+/**
+ * JQuery extension for tagging with autocomplete.
+ * @author: Jeremy Goecks
+ * @require: jquery.autocomplete plugin
+ */
+var ac_tag_area_id_gen = 1;
+
+jQuery.fn.autocomplete_tagging = function(options) {
+
+  //
+  // Set up function defaults.
+  //
+  var defaults = 
+  {
+  get_toggle_link_text_fn: function(tags) 
+  { 
+    var text = "";
+    var num_tags = array_length(tags);
+    if (num_tags != 0)
+	text = num_tags + (num_tags != 0 ? " Tags" : " Tag");
+    else
+	// No tags.
+	text = "Add tags";
+    return text;
+  },
+  tag_click_fn : function (tag) { },
+  input_size: 20,
+  in_form: false,
+  tags : {},
+  use_toggle_link: true,
+  item_id: "",
+  add_tag_img: "",
+  add_tag_img_rollover: "",
+  delete_tag_img: "",
+  ajax_autocomplete_tag_url: "",
+  ajax_retag_url: "",
+  ajax_delete_tag_url: "",
+  ajax_add_tag_url: ""
+  };
+
+  //
+  // Extend object.
+  //
+  var settings = jQuery.extend(defaults, options);
+  
+  //
+  // Create core elements: tag area and TODO.
+  //
+  
+  // Tag area.
+  var area_id = "tag-area-" + (ac_tag_area_id_gen)++;
+  var tag_area = $("<div></div>").attr("id", area_id).addClass("tag-area");
+  this.append(tag_area);
+  
+  //
+  // Returns the number of keys (elements) in an array/dictionary.
+  //
+  var array_length = function(an_array)
+  {
+    if (an_array.length)
+      return an_array.length;
+
+    var count = 0;
+    for (element in an_array)
+      count++;
+    return count;
+  };
+  
+  //
+  // Function to build toggle link.
+  //
+  var build_toggle_link = function()
+  {
+    var link_text = settings.get_toggle_link_text_fn(settings.tags);
+    var toggle_link = $("<a href='/history/tags'>" + link_text + "</a>").addClass("toggle-link");
+    // Link toggles the display state of the tag area.
+    toggle_link.click( function() 
+    { 
+      // Take special actions depending on whether toggle is showing or hiding link.
+      var showing_tag_area = (tag_area.css("display") == "none");
+      var after_toggle_fn;
+      if (showing_tag_area)
+	{
+	  after_toggle_fn = function() 
+	    {
+	      // If there are no tags, go right to editing mode by generating a 
+	      // click on the area.
+	      var num_tags = array_length(settings.tags);
+	      if (num_tags == 0)
+		tag_area.click();
+	    };
+	}
+      else // Hiding area.
+	{
+	  after_toggle_fn = function() 
+	    {
+	      tag_area.blur();
+	    };
+	}
+      tag_area.slideToggle("fast", after_toggle_fn);
+      
+      return false;
+    });
+    
+    return toggle_link;
+  };
+  
+  // Add toggle link.
+  var toggle_link = build_toggle_link();
+  if (settings.use_toggle_link)
+    {
+      this.prepend(toggle_link);
+    }
+    
+  //
+  // Function to build other elements.
+  //
+
+  //
+  // Return a string that contains the contents of an associative array. This is
+  // a debugging method.
+  //
+  var assoc_array_to_str = function(an_array)
+  {
+    // Convert associative array to simple array and then join array elements.
+    var array_str_list = new Array();
+    for (key in an_array)
+      array_str_list[array_str_list.length] = key + "-->" + an_array[key];
+    
+    return "{" + array_str_list.join(",") + "}"
+  };
+
+  //  
+  // Collapse tag name + value into a single string.
+  //
+  var build_tag_str = function(tag_name, tag_value)
+  {
+    return tag_name + ( (tag_value != "" && tag_value) ? ":" + tag_value : "");
+  };
+  
+  //
+  // Get tag name and value from a string.
+  //
+  var get_tag_name_and_value = function(tag_str)
+  {
+    return tag_str.split(":");
+  };
+  
+  //
+  // Add "add tag" button.
+  //
+  var build_add_tag_button = function(tag_input_field)
+  {
+    var add_tag_button = $("<img src='" + settings.add_tag_img + "' rollover='" + settings.add_tag_img_rollover + "'/>").addClass("add-tag-button");
+   
+    add_tag_button.click( function()
+    {
+      // Hide button.
+      $(this).hide();
+      
+      // Clicking on button is the same as clicking on the tag area.
+      tag_area.click();
+      
+      return false;
+    });
+
+    return add_tag_button;
+  };
+
+  //
+  // Function that builds a tag button.
+  //
+  var build_tag_button = function(tag_str)
+  {
+    // Build "delete tag" image and handler.
+    var delete_img = $("<img src='" + settings.delete_tag_img + "'/>").addClass("delete-tag-img");
+    delete_img.mouseenter( function ()
+    {
+      $(this).attr("src", settings.delete_tag_img_rollover);
+    });
+    delete_img.mouseleave( function ()
+    {
+      $(this).attr("src", settings.delete_tag_img);
+    });
+    delete_img.click( function () 
+    {
+      // Tag button is image's parent.
+      var tag_button = $(this).parent();
+      
+      // Get tag name.
+      var tag_name_elt = tag_button.find(".tag-name").eq(0);
+      var tag_str = tag_name_elt.text();
+      var tag_name = get_tag_name_and_value(tag_str)[0];
+
+      // TODO: should remove succeed if tag is not already applied to
+      // history?
+      tag_button.remove();
+
+      // Remove tag from local list for consistency.
+      delete settings.tags[tag_name];
+      
+      // Update toggle link text.
+      var new_text = settings.get_toggle_link_text_fn(settings.tags);
+      toggle_link.text(new_text);
+
+      // Delete tag.
+      $.ajax({
+	url: settings.ajax_delete_tag_url,
+	    data: { tag_name: tag_name },
+	    error: function() 
+	    { 
+	      // Failed. 
+	      alert( "Remove tag failed" ); 
+	    },
+	    success: function() 
+	    {
+	    }
+      });
+
+      return true;
+    });
+
+    // Build tag button.
+    var tag_name_elt = $("<span>" + tag_str + "</span>").addClass("tag-name");
+    tag_name_elt.click( function()
+		       {
+			  settings.tag_click_fn(tag_str);
+			  return true;
+		       });
+
+    var tag_button = $("<span></span>").addClass("tag-button");
+    tag_button.append(tag_name_elt);
+    tag_button.append(delete_img);
+
+    return tag_button;
+  };
+
+  //
+  // Build input + autocompete for tag.
+  //
+  var build_tag_input = function(tag_text) 
+  {
+    // If element is in form, tag input is a textarea; otherwise element is a input type=text.
+    var t;
+    if (settings.in_form)
+      t = $( "<textarea id='history-tag-input' rows='1' cols='" +
+	    settings.input_size + "' value='" + tag_text + "'></textarea>" );
+    else // element not in form.
+      t = $( "<input id='history-tag-input' type='text' size='" +
+	    settings.input_size + "' value='" + tag_text + "'></input>" );
+    t.keyup( function( e ) 
+    {
+      if ( e.keyCode == 27 ) 
+	{
+	  // Escape key
+	  $(this).trigger( "blur" );
+	} else if (
+		   ( e.keyCode == 13 ) || // Return Key
+		   ( e.keyCode == 188 ) || // Comma
+		   ( e.keyCode == 32 ) // Space
+		   )
+	{
+	  //
+	  // Check input.
+	  //
+	    
+	  new_value = this.value;
+	    
+	  // Do nothing if return key was used to autocomplete.
+	  if (return_key_pressed_for_autocomplete == true)
+	    {
+	      return_key_pressed_for_autocomplete = false;
+	      return false;
+	    }
+	    
+	  // Suppress space after a ":"
+	  if ( new_value.indexOf(": ", new_value.length - 2) != -1)
+	    {
+	      this.value = new_value.substring(0, new_value.length-1);
+	      return false;
+	    }
+	    	    
+	  // Remove trigger keys from input.
+	  if ( (e.keyCode == 188) || (e.keyCode == 32) )
+	    new_value = new_value.substring( 0 , new_value.length - 1 );
+	  
+	  // Trim whitespace.
+	  new_value = new_value.replace(/^\s+|\s+$/g,"");
+	    
+	  // Too short?
+	  if (new_value.length < 3)
+	    return false;
+	    
+	  //
+	  // New tag OK - apply it.
+	  //
+	    
+	  this.value = "";
+	    
+	  // Add button for tag after all other tag buttons.
+	  var new_tag_button = build_tag_button(new_value);
+	  var tag_buttons = tag_area.children(".tag-button");
+	  if (tag_buttons.length != 0)
+	    {
+	      var last_tag_button = tag_buttons.slice(tag_buttons.length-1);
+	      last_tag_button.after(new_tag_button);
+	    }
+	  else
+	    tag_area.prepend(new_tag_button);
+
+	  // Add tag to internal list.
+	  var tag_name_and_value = new_value.split(":");
+	  settings.tags[tag_name_and_value[0]] = tag_name_and_value[1];
+	  
+	  // Update toggle link text.
+	  var new_text = settings.get_toggle_link_text_fn(settings.tags);
+	  toggle_link.text(new_text);
+
+	  // Commit tag to server.
+	  var $this = $(this);
+	  $.ajax({
+	    url: settings.ajax_add_tag_url,
+		data: { new_tag: new_value },
+		error: function() 
+		{
+		  // Remove tag and show alert.
+		  new_tag_button.remove();
+		  var new_text = settings.get_toggle_link_text_fn(settings.tags);
+		  toggle_link.text(new_text);
+		  alert( "Add tag failed" );
+		},
+		success: function() 
+		{
+		  // Flush autocomplete cache because it's not out of date.
+		  // TODO: in the future, we could remove the particular item
+		  // that was chosen from the cache rather than flush it.
+		  $this.flushCache();
+		}
+	  });
+	 
+	  return false;
+	}
+    });
+
+    // Add autocomplete to input.
+    var format_item_func = function(key, row_position, num_rows, value, search_term) {
+      tag_name_and_value = value.split(":");
+      return (tag_name_and_value.length == 1 ? tag_name_and_value[0] :tag_name_and_value[1]);
+      //var array = new Array(key, value, row_position, num_rows,
+      //search_term ); return "\"" + array.join("*") + "\"";
+    }
+    var autocomplete_options = 
+    { selectFirst: false, formatItem : format_item_func, autoFill: false, highlight: false };
+  
+    t.autocomplete(settings.ajax_autocomplete_tag_url, autocomplete_options);
+    
+    t.addClass("tag-input");
+    
+    return t;
+  };
+  
+  //
+  // Build tag area.
+  //
+
+  // Add tag buttons for each current tag to the tag area.
+  for (tag_name in settings.tags)
+    {
+      var tag_value = settings.tags[tag_name];
+      var tag_str = build_tag_str(tag_name, tag_value);
+      var tag_button = build_tag_button(tag_str, toggle_link, settings.tags);
+      tag_area.append(tag_button);
+    }
+    
+  // Add tag input field and "add tag" button.
+  var tag_input_field = build_tag_input("");
+  var add_tag_button = build_add_tag_button(tag_input_field);
+
+  // When the tag area blurs, go to "view tag" mode.
+  tag_area.blur( function(e) 
+  {
+    add_tag_button.show();
+    tag_input_field.hide();
+    tag_area.removeClass("active-tag-area");
+  });  
+  
+  tag_area.append(add_tag_button);
+  tag_area.append(tag_input_field);
+  tag_input_field.hide();
+  
+  // On click, enable user to add tags.
+  tag_area.click( function(e) 
+  {
+    var is_active = $(this).hasClass("active-tag-area");
+
+    // If a "delete image" object was pressed and area is inactive, do nothing.
+    if ($(e.target).hasClass("delete-tag-img") && !is_active)
+      return false;
+    
+    // If a "tag name" object was pressed and area is inactive, do nothing.
+    if ($(e.target).hasClass("tag-name") && !is_active)
+      return false;    
+
+    // Hide add tag button, show tag_input field. Change background to show 
+    // area is active.
+    $(this).addClass("active-tag-area");
+    add_tag_button.hide();
+    tag_input_field.show();
+    tag_input_field.focus();
+
+    // Add handler to document that will call blur when the tag area is blurred;
+    // a tag area is blurred when a user clicks on an element outside the area.
+    var handle_document_click = function(e) 
+      {
+	var tag_area_id = tag_area.attr("id");
+	// Blur the tag area if the element clicked on is not in the tag area.
+	if ( 
+	    ($(e.target).attr("id") != tag_area_id) &&
+	    ($(e.target).parents().filter(tag_area_id).length == 0) 
+	     )
+	  {
+	    tag_area.blur();
+	    $(document).unbind("click", handle_document_click);
+	  }    
+      };
+    // TODO: we should attach the click handler to all frames in order to capture
+    // clicks outside the frame that this element is in.
+    //window.parent.document.onclick = handle_document_click;
+    //var temp = $(window.parent.document.body).contents().find("iframe").html();
+    //alert(temp);
+    //$(document).parent().click(handle_document_click);
+    $(window).click(handle_document_click);
+    
+    return false;
+  });
+  
+  // If using toggle link, hide the tag area. Otherwise, if there are no tags,
+  // hide the "add tags" button and show the input field.
+  if (settings.use_toggle_link)
+    tag_area.hide();
+  else 
+    {
+      var num_tags = array_length(settings.tags);
+      if (num_tags == 0)
+	{
+	  add_tag_button.hide();
+	  tag_input_field.show();
+	}
+    }
+  
+   
+  return this.addClass("tag-element"); 
+}
diff -r cc4944a62b66 -r fba947d16fa7 static/scripts/jquery.autocomplete.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/jquery.autocomplete.js	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,824 @@
+/*
+ * Autocomplete - jQuery plugin 1.0.2
+ *
+ * Copyright (c) 2007 Dylan Verheul, Dan G. Switzer, Anjesh Tuladhar, Jörn Zaefferer
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * Revision: $Id: jquery.autocomplete.js 5747 2008-06-25 18:30:55Z joern.zaefferer $
+ *
+ */
+
+String.prototype.endsWith = function(str) {return (this.match(str+"$")==str)}
+
+
+var return_key_pressed_for_autocomplete = false;
+
+;(function($) {
+	
+$.fn.extend({
+	autocomplete: function(urlOrData, options) {
+		var isUrl = typeof urlOrData == "string";
+		options = $.extend({}, $.Autocompleter.defaults, {
+			url: isUrl ? urlOrData : null,
+			data: isUrl ? null : urlOrData,
+			delay: isUrl ? $.Autocompleter.defaults.delay : 10,
+			max: options && !options.scroll ? 10 : 150
+		}, options);
+		
+		// if highlight is set to false, replace it with a do-nothing function
+		options.highlight = options.highlight || function(value) { return value; };
+		
+		// if the formatMatch option is not specified, then use formatItem for backwards compatibility
+		options.formatMatch = options.formatMatch || options.formatItem;
+		
+		return this.each(function() {
+			new $.Autocompleter(this, options);
+		});
+	},
+	result: function(handler) {
+		return this.bind("result", handler);
+	},
+	search: function(handler) {
+		return this.trigger("search", [handler]);
+	},
+	flushCache: function() {
+      return this.trigger("flushCache");
+	},
+	setOptions: function(options){
+		return this.trigger("setOptions", [options]);
+	},
+	unautocomplete: function() {
+		return this.trigger("unautocomplete");
+	}
+});
+
+$.Autocompleter = function(input, options) {
+
+	var KEY = {
+		UP: 38,
+		DOWN: 40,
+		DEL: 46,
+		TAB: 9,
+		RETURN: 13,
+		ESC: 27,
+		COMMA: 188,
+		PAGEUP: 33,
+		PAGEDOWN: 34,
+		BACKSPACE: 8,
+		COLON: 16
+	};
+
+	// Create $ object for input element
+	var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass);
+
+	var timeout;
+	var previousValue = "";
+	var cache = $.Autocompleter.Cache(options);
+	var hasFocus = 0;
+	var lastKeyPressCode;
+	var config = {
+		mouseDownOnSelect: false
+	};
+	var select = $.Autocompleter.Select(options, input, selectCurrent, config);
+	
+	var blockSubmit;
+	
+	// prevent form submit in opera when selecting with return key
+	$.browser.opera && $(input.form).bind("submit.autocomplete", function() {
+		if (blockSubmit) {
+			blockSubmit = false;
+			return false;
+		}
+	});
+	
+	// only opera doesn't trigger keydown multiple times while pressed, others don't work with keypress at all
+	$input.bind(($.browser.opera ? "keypress" : "keydown") + ".autocomplete", function(event) {
+		// track last key pressed
+		lastKeyPressCode = event.keyCode;		
+		switch(event.keyCode) {
+		
+			case KEY.UP:
+				event.preventDefault();
+				if ( select.visible() ) {
+					select.prev();
+				} else {
+					onChange(0, true);
+				}
+				break;
+				
+			case KEY.DOWN:
+				event.preventDefault();
+				if ( select.visible() ) {
+					select.next();
+				} else {
+					onChange(0, true);
+				}
+				break;
+				
+			case KEY.PAGEUP:
+				event.preventDefault();
+				if ( select.visible() ) {
+					select.pageUp();
+				} else {
+					onChange(0, true);
+				}
+				break;
+				
+			case KEY.PAGEDOWN:
+				event.preventDefault();
+				if ( select.visible() ) {
+					select.pageDown();
+				} else {
+					onChange(0, true);
+				}
+				break;
+			
+			// matches also semicolon
+			case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA:
+			case KEY.TAB:
+			case KEY.RETURN:
+				if (event.keyCode == KEY.RETURN)
+					return_key_pressed_for_autocomplete = false;
+				if( selectCurrent() ) {
+					// stop default to prevent a form submit, Opera needs special handling
+					event.preventDefault();
+					blockSubmit = true;
+					
+					// JG: set flag to indicate that a selection just occurred using the return key. FYI:
+					// event.stopPropagation() does not work.
+					if (event.keyCode == KEY.RETURN)
+						return_key_pressed_for_autocomplete = true;
+					
+					return false;
+				}
+				
+			case KEY.ESC:
+				select.hide();
+				break;
+			case KEY.COLON:
+				break;
+				
+			default:
+				clearTimeout(timeout);
+				timeout = setTimeout(onChange, options.delay);
+				break;
+		}
+	}).focus(function(){
+		// track whether the field has focus, we shouldn't process any
+		// results if the field no longer has focus
+		hasFocus++;
+	}).blur(function() {
+		hasFocus = 0;
+		if (!config.mouseDownOnSelect) {
+			// JG: if blur and user is not selecting with mouse, hide
+			// object.
+		  select.hide();
+		}
+		return this;
+	}).click(function() {
+		// show select when clicking in a focused field
+		if ( hasFocus++ > 1 && !select.visible() ) {
+			onChange(0, true);
+		}
+		return this;
+	  }).bind("search", function() {
+		// TODO why not just specifying both arguments?
+		var fn = (arguments.length > 1) ? arguments[1] : null;
+		function findValueCallback(q, data) {
+			var result;
+			if( data && data.length ) {
+				for (var i=0; i < data.length; i++) {
+					if( data[i].result.toLowerCase() == q.toLowerCase() ) {
+						result = data[i];
+						break;
+					}
+				}
+			}
+			if( typeof fn == "function" ) fn(result);
+			else $input.trigger("result", result && [result.data, result.value]);
+		}
+		$.each(trimWords($input.val()), function(i, value) {
+			request(value, findValueCallback, findValueCallback);
+		});
+
+		return this;
+	}).bind("flushCache", function() {
+		cache.flush();
+	}).bind("setOptions", function() {
+		$.extend(options, arguments[1]);
+		// if we've updated the data, repopulate
+		if ( "data" in arguments[1] )
+			cache.populate();
+	}).bind("unautocomplete", function() {
+		select.unbind();
+		$input.unbind();
+		$(input.form).unbind(".autocomplete");
+	  });
+	
+	
+	function selectCurrent() {
+		var selected = select.selected();
+		if( !selected )
+			return false;
+		
+		var v = selected.result;
+		previousValue = v;
+		
+		if ( options.multiple ) {
+			var words = trimWords($input.val());
+			if ( words.length > 1 ) {
+				v = words.slice(0, words.length - 1).join( options.multipleSeparator ) + options.multipleSeparator + v;
+			}
+			v += options.multipleSeparator;
+		}
+		
+		$input.val(v);
+		hideResultsNow();
+		$input.trigger("result", [selected.data, selected.value]);
+		return true;
+	}
+	
+	function onChange(crap, skipPrevCheck) {
+		if( lastKeyPressCode == KEY.DEL ) {
+			select.hide();
+			return;
+		}
+
+		var currentValue = $input.val();
+		
+		if ( !skipPrevCheck && currentValue == previousValue )
+			return;
+		
+		previousValue = currentValue;
+		
+		currentValue = lastWord(currentValue);
+		if ( currentValue.length >= options.minChars) {
+			$input.addClass(options.loadingClass);
+			if (!options.matchCase)
+				currentValue = currentValue.toLowerCase();
+			request(currentValue, receiveData, hideResultsNow);
+		} else {
+			stopLoading();
+			select.hide();
+		}
+	};
+	
+	function trimWords(value) {
+		if ( !value ) {
+			return [""];
+		}
+		var words = value.split( options.multipleSeparator );
+		var result = [];
+		$.each(words, function(i, value) {
+			if ( $.trim(value) )
+				result[i] = $.trim(value);
+		});
+		return result;
+	}
+	
+	function lastWord(value) {
+		if ( !options.multiple )
+			return value;
+		var words = trimWords(value);
+		return words[words.length - 1];
+	}
+	
+	// fills in the input box w/the first match (assumed to be the best match)
+	// q: the term entered
+	// sValue: the first matching result
+	function autoFill(q, sValue){
+		// autofill in the complete box w/the first match as long as the user hasn't entered in more data
+		// if the last user key pressed was backspace, don't autofill
+		if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) {
+			// fill in the value (keep the case the user has typed)
+			$input.val($input.val() + sValue.substring(lastWord(previousValue).length));
+			// select the portion of the value not typed by the user (so the next character will erase)
+			$.Autocompleter.Selection(input, previousValue.length, previousValue.length + sValue.length);
+		}
+	};
+
+	function hideResults() {
+		clearTimeout(timeout);
+		timeout = setTimeout(hideResultsNow, 200);
+	};
+
+	function hideResultsNow() {
+		var wasVisible = select.visible();
+		select.hide();
+		clearTimeout(timeout);
+		stopLoading();
+		if (options.mustMatch) {
+			// call search and run callback
+			$input.search(
+				function (result){
+					// if no value found, clear the input box
+					if( !result ) {
+						if (options.multiple) {
+							var words = trimWords($input.val()).slice(0, -1);
+							$input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") );
+						}
+						else
+							$input.val( "" );
+					}
+				}
+			);
+		}
+		if (wasVisible)
+			// position cursor at end of input field
+			$.Autocompleter.Selection(input, input.value.length, input.value.length);
+	};
+
+	function receiveData(q, data) {
+		if ( data && data.length && hasFocus ) {
+			stopLoading();
+			select.display(data, q);
+			autoFill(q, data[0].value);
+			select.show();
+		} else {
+			hideResultsNow();
+		}
+	};
+
+	function request(term, success, failure) {
+		if (!options.matchCase)
+			term = term.toLowerCase();
+		var data = cache.load(term);
+
+		// JG: hack: if term ends with ':', kill data to force an ajax request.
+		if (term.endsWith(":"))
+		  data = null;
+
+		// recieve the cached data
+		if (data && data.length) {
+			success(term, data);
+		// if an AJAX url has been supplied, try loading the data now
+		} else if( (typeof options.url == "string") && (options.url.length > 0) ){
+			var extraParams = {
+				timestamp: +new Date()
+			};
+			$.each(options.extraParams, function(key, param) {
+				extraParams[key] = typeof param == "function" ? param() : param;
+			});
+			
+			$.ajax({
+				// try to leverage ajaxQueue plugin to abort previous requests
+				mode: "abort",
+				// limit abortion to this input
+				port: "autocomplete" + input.name,
+				dataType: options.dataType,
+				url: options.url,
+				data: $.extend({
+					q: lastWord(term),
+					limit: options.max
+				}, extraParams),
+				success: function(data) {
+					var parsed = options.parse && options.parse(data) || parse(data);
+					cache.add(term, parsed);
+					success(term, parsed);
+				}
+			});
+		} else {
+			// if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match
+			select.emptyList();
+			failure(term);
+		}
+	};
+	
+	function parse(data) {
+		var parsed = [];
+		var rows = data.split("\n");
+		for (var i=0; i < rows.length; i++) {
+			var row = $.trim(rows[i]);
+			if (row) {
+				row = row.split("|");
+				parsed[parsed.length] = {
+					data: row,
+					value: row[0],
+					result: options.formatResult && options.formatResult(row, row[0]) || row[0]
+				};
+			}
+		}
+		return parsed;
+	};
+
+	function stopLoading() {
+		$input.removeClass(options.loadingClass);
+	};
+
+};
+
+$.Autocompleter.defaults = {
+	inputClass: "ac_input",
+	resultsClass: "ac_results",
+	loadingClass: "ac_loading",
+	minChars: 1,
+	delay: 400,
+	matchCase: false,
+	matchSubset: true,
+	matchContains: false,
+	cacheLength: 10,
+	max: 100,
+	mustMatch: false,
+	extraParams: {},
+	selectFirst: true,
+	formatItem: function(row) { return row[0]; },
+	formatMatch: null,
+	autoFill: false,
+	width: 0,
+	multiple: false,
+	multipleSeparator: ", ",
+	highlight: function(value, term) {
+		return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
+	},
+    scroll: true,
+    scrollHeight: 180
+};
+
+$.Autocompleter.Cache = function(options) {
+
+	var data = {};
+	var length = 0;
+
+	function matchSubset(s, sub) {
+		if (!options.matchCase) 
+			s = s.toLowerCase();
+		var i = s.indexOf(sub);
+		if (i == -1) return false;
+		return i == 0 || options.matchContains;
+	};
+	
+	function add(q, value) {
+		if (length > options.cacheLength){
+			flush();
+		}
+		if (!data[q]){ 
+			length++;
+		}
+		data[q] = value;
+	}
+	
+	function populate(){
+		if( !options.data ) return false;
+		// track the matches
+		var stMatchSets = {},
+			nullData = 0;
+
+		// no url was specified, we need to adjust the cache length to make sure it fits the local data store
+		if( !options.url ) options.cacheLength = 1;
+		
+		// track all options for minChars = 0
+		stMatchSets[""] = [];
+		
+		// loop through the array and create a lookup structure
+		for ( var i = 0, ol = options.data.length; i < ol; i++ ) {
+			var rawValue = options.data[i];
+			// if rawValue is a string, make an array otherwise just reference the array
+			rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue;
+			
+			var value = options.formatMatch(rawValue, i+1, options.data.length);
+			if ( value === false )
+				continue;
+				
+			var firstChar = value.charAt(0).toLowerCase();
+			// if no lookup array for this character exists, look it up now
+			if( !stMatchSets[firstChar] ) 
+				stMatchSets[firstChar] = [];
+
+			// if the match is a string
+			var row = {
+				value: value,
+				data: rawValue,
+				result: options.formatResult && options.formatResult(rawValue) || value
+			};
+			
+			// push the current match into the set list
+			stMatchSets[firstChar].push(row);
+
+			// keep track of minChars zero items
+			if ( nullData++ < options.max ) {
+				stMatchSets[""].push(row);
+			}
+		};
+
+		// add the data items to the cache
+		$.each(stMatchSets, function(i, value) {
+			// increase the cache size
+			options.cacheLength++;
+			// add to the cache
+			add(i, value);
+		});
+	}
+	
+	// populate any existing data
+	setTimeout(populate, 25);
+	
+	function flush(){
+		data = {};
+		length = 0;
+	}
+	
+	return {
+		flush: flush,
+		add: add,
+		populate: populate,
+		load: function(q) {
+			if (!options.cacheLength || !length)
+				return null;
+
+			/* 
+			 * if dealing w/local data and matchContains than we must make sure
+			 * to loop through all the data collections looking for matches
+			 */
+			if( !options.url && options.matchContains ){
+				// track all matches
+				var csub = [];
+				// loop through all the data grids for matches
+				for( var k in data ){
+					// don't search through the stMatchSets[""] (minChars: 0) cache
+					// this prevents duplicates
+					if( k.length > 0 ){
+						var c = data[k];
+						$.each(c, function(i, x) {
+							// if we've got a match, add it to the array
+							if (matchSubset(x.value, q)) {
+								csub.push(x);
+							}
+						});
+					}
+				}				
+				return csub;
+			} else 
+			// if the exact item exists, use it
+			if (data[q]){
+				return data[q];
+			} else
+			if (options.matchSubset) {
+				for (var i = q.length - 1; i >= options.minChars; i--) {
+					var c = data[q.substr(0, i)];
+					if (c) {
+						var csub = [];
+						$.each(c, function(i, x) {
+						    if ( (x.data.indexOf("#Header") == 0) || 
+							 (matchSubset(x.value, q)) ) {
+								csub[csub.length] = x;
+							}
+						});
+						return csub;
+					}
+				}
+
+			}
+			return null;
+		}
+	};
+};
+
+$.Autocompleter.Select = function (options, input, select, config) {
+	var CLASSES = {
+		ACTIVE: "ac_over"
+	};
+	
+	var listItems,
+		active = -1,
+		data,
+		term = "",
+		needsInit = true,
+		element,
+		list;
+	
+	// Create results
+	function init() {
+	  if (!needsInit)
+	    return;
+	  element = $("<div/>")
+	    .hide()
+	    .addClass(options.resultsClass)
+	    .css("position", "absolute")
+	    .appendTo(document.body);
+	  
+	  list = $("<ul/>").appendTo(element).mouseover( function(event) {
+	      if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') {
+		active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event));
+		// JG: Only add active class if target is not a header.
+		if (!headerAtPosition(active))
+		  $(target(event)).addClass(CLASSES.ACTIVE);            
+	      }
+	    }).click(function(event) {
+		// JG: Ignore click on header.
+		active = $("li", list).index(target(event));
+		if (headerAtPosition(active))
+		  return;
+
+		// Handle click on autocomplete options.
+		$(target(event)).addClass(CLASSES.ACTIVE);
+		select();
+		// TODO provide option to avoid setting focus again after selection? useful for cleanup-on-focus
+		input.focus();
+		return false;
+	      }).mousedown(function() {
+		  config.mouseDownOnSelect = true;
+		}).mouseup(function() {
+		    config.mouseDownOnSelect = false;
+		  });
+	  
+		if( options.width > 0 )
+			element.css("width", options.width);
+			
+		needsInit = false;
+	} 
+	
+	function target(event) {
+		var element = event.target;
+		while(element && element.tagName != "LI")
+			element = element.parentNode;
+		// more fun with IE, sometimes event.target is empty, just ignore it then
+		if(!element)
+			return [];
+		return element;
+	}
+
+	// JG: Returns true iff there is a header element at the given position.
+	function headerAtPosition(position)
+	{
+	  dataAtPosition = data[position].data;
+	  return (dataAtPosition.indexOf("#Header") == 0);
+	}
+
+	function moveSelect(step) {
+	  listItems.slice(active, active + 1).removeClass(CLASSES.ACTIVE);
+	  // JG: while active item is a header, continue stepping.
+	  var isHeader = false;
+	  do 
+	    {
+	      movePosition(step);
+	      isHeader = headerAtPosition(active);
+	    } 
+	  while (isHeader);
+	  var activeItem = listItems.slice(active, active + 1).addClass(CLASSES.ACTIVE);
+
+
+        if(options.scroll) {
+            var offset = 0;
+            listItems.slice(0, active).each(function() {
+				offset += this.offsetHeight;
+			});
+            if((offset + activeItem[0].offsetHeight - list.scrollTop()) > list[0].clientHeight) {
+                list.scrollTop(offset + activeItem[0].offsetHeight - list.innerHeight());
+            } else if(offset < list.scrollTop()) {
+                list.scrollTop(offset);
+            }
+        }
+	};
+	
+	function movePosition(step) {
+		active += step;
+		if (active < 0) {
+			active = listItems.size() - 1;
+		} else if (active >= listItems.size()) {
+			active = 0;
+		}
+	}
+	
+	function limitNumberOfItems(available) {
+		return options.max && options.max < available
+			? options.max
+			: available;
+	}
+	
+	function fillList() {
+		list.empty();
+		var max = limitNumberOfItems(data.length);
+		for (var i=0; i < max; i++) {
+			if (!data[i])
+				continue;
+			var formatted = options.formatItem(data[i].data, i+1, max, data[i].value, term);
+			if ( formatted === false )
+				continue;
+
+			// JG: Build list item by formatting the item and choosing a CSS class.
+			if (headerAtPosition(i))
+			  {
+			    // Found header element; only add header if there are subsequent elements.
+			    if (i != max-1)
+				var li = $("<li/>").html(data[i].data[1]).addClass("ac_header").appendTo(list)[0];
+			  }
+			else 
+			  {
+			    // Found completion element.
+			    var li = $("<li/>").html(options.highlight(formatted, term)).addClass(i%2 == 0 ? "ac_even" : "ac_odd").appendTo(list)[0];
+			  }
+
+			$.data(li, "ac_data", data[i]);
+		}
+		listItems = list.find("li");
+		if ( options.selectFirst ) {
+			listItems.slice(0, 1).addClass(CLASSES.ACTIVE);
+			active = 0;
+		}
+		// apply bgiframe if available
+		if ( $.fn.bgiframe )
+			list.bgiframe();
+	}
+	
+	return {
+		display: function(d, q) {
+			init();
+			data = d;
+			term = q;
+			fillList();
+		},
+		next: function() {
+			moveSelect(1);
+		},
+		prev: function() {
+			moveSelect(-1);
+		},
+		pageUp: function() {
+			if (active != 0 && active - 8 < 0) {
+				moveSelect( -active );
+			} else {
+				moveSelect(-8);
+			}
+		},
+		pageDown: function() {
+			if (active != listItems.size() - 1 && active + 8 > listItems.size()) {
+				moveSelect( listItems.size() - 1 - active );
+			} else {
+				moveSelect(8);
+			}
+		},
+		hide: function() {
+			element && element.hide();
+			listItems && listItems.removeClass(CLASSES.ACTIVE);
+			active = -1;
+		},
+		visible : function() {
+			return element && element.is(":visible");
+		},
+		current: function() {
+			return this.visible() && (listItems.filter("." + CLASSES.ACTIVE)[0] || options.selectFirst && listItems[0]);
+		},
+		show: function() {
+			var offset = $(input).offset();
+			element.css({
+				width: typeof options.width == "string" || options.width > 0 ? options.width : $(input).width(),
+				top: offset.top + input.offsetHeight,
+				left: offset.left
+			}).show();
+            if(options.scroll) {
+                list.scrollTop(0);
+                list.css({
+					maxHeight: options.scrollHeight,
+					overflow: 'auto'
+				});
+				
+                if($.browser.msie && typeof document.body.style.maxHeight === "undefined") {
+					var listHeight = 0;
+					listItems.each(function() {
+						listHeight += this.offsetHeight;
+					});
+					var scrollbarsVisible = listHeight > options.scrollHeight;
+                    list.css('height', scrollbarsVisible ? options.scrollHeight : listHeight );
+					if (!scrollbarsVisible) {
+						// IE doesn't recalculate width when scrollbar disappears
+						listItems.width( list.width() - parseInt(listItems.css("padding-left")) - parseInt(listItems.css("padding-right")) );
+					}
+                }
+                
+            }
+		},
+		selected: function() {
+			var selected = listItems && listItems.filter("." + CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);
+			return selected && selected.length && $.data(selected[0], "ac_data");
+		},
+		emptyList: function (){
+			list && list.empty();
+		},
+		unbind: function() {
+			element && element.remove();
+		}
+	};
+};
+
+$.Autocompleter.Selection = function(field, start, end) {
+	if( field.createTextRange ){
+		var selRange = field.createTextRange();
+		selRange.collapse(true);
+		selRange.moveStart("character", start);
+		selRange.moveEnd("character", end);
+		selRange.select();
+	} else if( field.setSelectionRange ){
+		field.setSelectionRange(start, end);
+	} else {
+		if( field.selectionStart ){
+			field.selectionStart = start;
+			field.selectionEnd = end;
+		}
+	}
+	field.focus();
+};
+
+})(jQuery);
diff -r cc4944a62b66 -r fba947d16fa7 static/scripts/packed/autocomplete_tagging.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/packed/autocomplete_tagging.js	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,1 @@
+var ac_tag_area_id_gen=1;jQuery.fn.autocomplete_tagging=function(c){var e={get_toggle_link_text_fn:function(u){var w="";var v=o(u);if(v!=0){w=v+(v!=0?" Tags":" Tag")}else{w="Add tags"}return w},tag_click_fn:function(u){},input_size:20,in_form:false,tags:{},use_toggle_link:true,item_id:"",add_tag_img:"",add_tag_img_rollover:"",delete_tag_img:"",ajax_autocomplete_tag_url:"",ajax_retag_url:"",ajax_delete_tag_url:"",ajax_add_tag_url:""};var p=jQuery.extend(e,c);var k="tag-area-"+(ac_tag_area_id_gen)++;var m=$("<div></div>").attr("id",k).addClass("tag-area");this.append(m);var o=function(u){if(u.length){return u.length}var v=0;for(element in u){v++}return v};var b=function(){var u=p.get_toggle_link_text_fn(p.tags);var v=$("<a href='/history/tags'>"+u+"</a>").addClass("toggle-link");v.click(function(){var w=(m.css("display")=="none");var x;if(w){x=function(){var y=o(p.tags);if(y==0){m.click()}}}else{x=function(){m.blur()}}m.slideToggle("fast",x);return false});return v};var s=b();
 if(p.use_toggle_link){this.prepend(s)}var t=function(u){var v=new Array();for(key in u){v[v.length]=key+"-->"+u[key]}return"{"+v.join(",")+"}"};var a=function(v,u){return v+((u!=""&&u)?":"+u:"")};var h=function(u){return u.split(":")};var i=function(u){var v=$("<img src='"+p.add_tag_img+"' rollover='"+p.add_tag_img_rollover+"'/>").addClass("add-tag-button");v.click(function(){$(this).hide();m.click();return false});return v};var j=function(u){var v=$("<img src='"+p.delete_tag_img+"'/>").addClass("delete-tag-img");v.mouseenter(function(){$(this).attr("src",p.delete_tag_img_rollover)});v.mouseleave(function(){$(this).attr("src",p.delete_tag_img)});v.click(function(){var B=$(this).parent();var A=B.find(".tag-name").eq(0);var z=A.text();var C=h(z)[0];B.remove();delete p.tags[C];var y=p.get_toggle_link_text_fn(p.tags);s.text(y);$.ajax({url:p.ajax_delete_tag_url,data:{tag_name:C},error:function(){alert("Remove tag failed")},success:function(){}});return true});var w=$("<span>"+u+"
 </span>").addClass("tag-name");w.click(function(){p.tag_click_fn(u);return true});var x=$("<span></span>").addClass("tag-button");x.append(w);x.append(v);return x};var d=function(v){var u;if(p.in_form){u=$("<textarea id='history-tag-input' rows='1' cols='"+p.input_size+"' value='"+v+"'></textarea>")}else{u=$("<input id='history-tag-input' type='text' size='"+p.input_size+"' value='"+v+"'></input>")}u.keyup(function(D){if(D.keyCode==27){$(this).trigger("blur")}else{if((D.keyCode==13)||(D.keyCode==188)||(D.keyCode==32)){new_value=this.value;if(return_key_pressed_for_autocomplete==true){return_key_pressed_for_autocomplete=false;return false}if(new_value.indexOf(": ",new_value.length-2)!=-1){this.value=new_value.substring(0,new_value.length-1);return false}if((D.keyCode==188)||(D.keyCode==32)){new_value=new_value.substring(0,new_value.length-1)}new_value=new_value.replace(/^\s+|\s+$/g,"");if(new_value.length<3){return false}this.value="";var A=j(new_value);var z=m.children(".tag
 -button");if(z.length!=0){var E=z.slice(z.length-1);E.after(A)}else{m.prepend(A)}var y=new_value.split(":");p.tags[y[0]]=y[1];var B=p.get_toggle_link_text_fn(p.tags);s.text(B);var C=$(this);$.ajax({url:p.ajax_add_tag_url,data:{new_tag:new_value},error:function(){A.remove();var F=p.get_toggle_link_text_fn(p.tags);s.text(F);alert("Add tag failed")},success:function(){C.flushCache()}});return false}}});var w=function(A,z,y,C,B){tag_name_and_value=C.split(":");return(tag_name_and_value.length==1?tag_name_and_value[0]:tag_name_and_value[1])};var x={selectFirst:false,formatItem:w,autoFill:false,highlight:false};u.autocomplete(p.ajax_autocomplete_tag_url,x);u.addClass("tag-input");return u};for(tag_name in p.tags){var q=p.tags[tag_name];var l=a(tag_name,q);var g=j(l,s,p.tags);m.append(g)}var n=d("");var f=i(n);m.blur(function(u){f.show();n.hide();m.removeClass("active-tag-area")});m.append(f);m.append(n);n.hide();m.click(function(w){var v=$(this).hasClass("active-tag-area");if($(w.
 target).hasClass("delete-tag-img")&&!v){return false}if($(w.target).hasClass("tag-name")&&!v){return false}$(this).addClass("active-tag-area");f.hide();n.show();n.focus();var u=function(y){var x=m.attr("id");if(($(y.target).attr("id")!=x)&&($(y.target).parents().filter(x).length==0)){m.blur();$(document).unbind("click",u)}};$(window).click(u);return false});if(p.use_toggle_link){m.hide()}else{var r=o(p.tags);if(r==0){f.hide();n.show()}}return this.addClass("tag-element")};
\ No newline at end of file
diff -r cc4944a62b66 -r fba947d16fa7 static/scripts/packed/jquery.autocomplete.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/static/scripts/packed/jquery.autocomplete.js	Fri Aug 28 18:03:28 2009 -0400
@@ -0,0 +1,1 @@
+String.prototype.endsWith=function(a){return(this.match(a+"$")==a)};var return_key_pressed_for_autocomplete=false;(function(a){a.fn.extend({autocomplete:function(b,c){var d=typeof b=="string";c=a.extend({},a.Autocompleter.defaults,{url:d?b:null,data:d?null:b,delay:d?a.Autocompleter.defaults.delay:10,max:c&&!c.scroll?10:150},c);c.highlight=c.highlight||function(e){return e};c.formatMatch=c.formatMatch||c.formatItem;return this.each(function(){new a.Autocompleter(this,c)})},result:function(b){return this.bind("result",b)},search:function(b){return this.trigger("search",[b])},flushCache:function(){return this.trigger("flushCache")},setOptions:function(b){return this.trigger("setOptions",[b])},unautocomplete:function(){return this.trigger("unautocomplete")}});a.Autocompleter=function(l,g){var c={UP:38,DOWN:40,DEL:46,TAB:9,RETURN:13,ESC:27,COMMA:188,PAGEUP:33,PAGEDOWN:34,BACKSPACE:8,COLON:16};var b=a(l).attr("autocomplete","off").addClass(g.inputClass);var j;var p="";var m=a.Auto
 completer.Cache(g);var e=0;var u;var x={mouseDownOnSelect:false};var r=a.Autocompleter.Select(g,l,d,x);var w;a.browser.opera&&a(l.form).bind("submit.autocomplete",function(){if(w){w=false;return false}});b.bind((a.browser.opera?"keypress":"keydown")+".autocomplete",function(y){u=y.keyCode;switch(y.keyCode){case c.UP:y.preventDefault();if(r.visible()){r.prev()}else{t(0,true)}break;case c.DOWN:y.preventDefault();if(r.visible()){r.next()}else{t(0,true)}break;case c.PAGEUP:y.preventDefault();if(r.visible()){r.pageUp()}else{t(0,true)}break;case c.PAGEDOWN:y.preventDefault();if(r.visible()){r.pageDown()}else{t(0,true)}break;case g.multiple&&a.trim(g.multipleSeparator)==","&&c.COMMA:case c.TAB:case c.RETURN:if(y.keyCode==c.RETURN){return_key_pressed_for_autocomplete=false}if(d()){y.preventDefault();w=true;if(y.keyCode==c.RETURN){return_key_pressed_for_autocomplete=true}return false}case c.ESC:r.hide();break;case c.COLON:break;default:clearTimeout(j);j=setTimeout(t,g.delay);break}})
 .focus(function(){e++}).blur(function(){e=0;if(!x.mouseDownOnSelect){r.hide()}return this}).click(function(){if(e++>1&&!r.visible()){t(0,true)}return this}).bind("search",function(){var y=(arguments.length>1)?arguments[1]:null;function z(D,C){var A;if(C&&C.length){for(var B=0;B<C.length;B++){if(C[B].result.toLowerCase()==D.toLowerCase()){A=C[B];break}}}if(typeof y=="function"){y(A)}else{b.trigger("result",A&&[A.data,A.value])}}a.each(h(b.val()),function(A,B){f(B,z,z)});return this}).bind("flushCache",function(){m.flush()}).bind("setOptions",function(){a.extend(g,arguments[1]);if("data" in arguments[1]){m.populate()}}).bind("unautocomplete",function(){r.unbind();b.unbind();a(l.form).unbind(".autocomplete")});function d(){var z=r.selected();if(!z){return false}var y=z.result;p=y;if(g.multiple){var A=h(b.val());if(A.length>1){y=A.slice(0,A.length-1).join(g.multipleSeparator)+g.multipleSeparator+y}y+=g.multipleSeparator}b.val(y);v();b.trigger("result",[z.data,z.value]);return tr
 ue}function t(A,z){if(u==c.DEL){r.hide();return}var y=b.val();if(!z&&y==p){return}p=y;y=i(y);if(y.length>=g.minChars){b.addClass(g.loadingClass);if(!g.matchCase){y=y.toLowerCase()}f(y,k,v)}else{n();r.hide()}}function h(z){if(!z){return[""]}var A=z.split(g.multipleSeparator);var y=[];a.each(A,function(B,C){if(a.trim(C)){y[B]=a.trim(C)}});return y}function i(y){if(!g.multiple){return y}var z=h(y);return z[z.length-1]}function q(y,z){if(g.autoFill&&(i(b.val()).toLowerCase()==y.toLowerCase())&&u!=c.BACKSPACE){b.val(b.val()+z.substring(i(p).length));a.Autocompleter.Selection(l,p.length,p.length+z.length)}}function s(){clearTimeout(j);j=setTimeout(v,200)}function v(){var y=r.visible();r.hide();clearTimeout(j);n();if(g.mustMatch){b.search(function(z){if(!z){if(g.multiple){var A=h(b.val()).slice(0,-1);b.val(A.join(g.multipleSeparator)+(A.length?g.multipleSeparator:""))}else{b.val("")}}})}if(y){a.Autocompleter.Selection(l,l.value.length,l.value.length)}}function k(z,y){if(y&&y.length
 &&e){n();r.display(y,z);q(z,y[0].value);r.show()}else{v()}}function f(z,B,y){if(!g.matchCase){z=z.toLowerCase()}var A=m.load(z);if(z.endsWith(":")){A=null}if(A&&A.length){B(z,A)}else{if((typeof g.url=="string")&&(g.url.length>0)){var C={timestamp:+new Date()};a.each(g.extraParams,function(D,E){C[D]=typeof E=="function"?E():E});a.ajax({mode:"abort",port:"autocomplete"+l.name,dataType:g.dataType,url:g.url,data:a.extend({q:i(z),limit:g.max},C),success:function(E){var D=g.parse&&g.parse(E)||o(E);m.add(z,D);B(z,D)}})}else{r.emptyList();y(z)}}}function o(B){var y=[];var A=B.split("\n");for(var z=0;z<A.length;z++){var C=a.trim(A[z]);if(C){C=C.split("|");y[y.length]={data:C,value:C[0],result:g.formatResult&&g.formatResult(C,C[0])||C[0]}}}return y}function n(){b.removeClass(g.loadingClass)}};a.Autocompleter.defaults={inputClass:"ac_input",resultsClass:"ac_results",loadingClass:"ac_loading",minChars:1,delay:400,matchCase:false,matchSubset:true,matchContains:false,cacheLength:10,max:10
 0,mustMatch:false,extraParams:{},selectFirst:true,formatItem:function(b){return b[0]},formatMatch:null,autoFill:false,width:0,multiple:false,multipleSeparator:", ",highlight:function(c,b){return c.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)("+b.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")+")(?![^<>]*>)(?![^&;]+;)","gi"),"<strong>$1</strong>")},scroll:true,scrollHeight:180};a.Autocompleter.Cache=function(c){var f={};var d=0;function h(l,k){if(!c.matchCase){l=l.toLowerCase()}var j=l.indexOf(k);if(j==-1){return false}return j==0||c.matchContains}function g(j,i){if(d>c.cacheLength){b()}if(!f[j]){d++}f[j]=i}function e(){if(!c.data){return false}var k={},j=0;if(!c.url){c.cacheLength=1}k[""]=[];for(var m=0,l=c.data.length;m<l;m++){var p=c.data[m];p=(typeof p=="string")?[p]:p;var o=c.formatMatch(p,m+1,c.data.length);if(o===false){continue}var n=o.charAt(0).toLowerCase();if(!k[n]){k[n]=[]}var q={value:o,data:p,result:c.formatResult&&c.formatResult(p)||o};k[n].push(q);if(j++<c.
 max){k[""].push(q)}}a.each(k,function(r,s){c.cacheLength++;g(r,s)})}setTimeout(e,25);function b(){f={};d=0}return{flush:b,add:g,populate:e,load:function(n){if(!c.cacheLength||!d){return null}if(!c.url&&c.matchContains){var m=[];for(var j in f){if(j.length>0){var o=f[j];a.each(o,function(p,k){if(h(k.value,n)){m.push(k)}})}}return m}else{if(f[n]){return f[n]}else{if(c.matchSubset){for(var l=n.length-1;l>=c.minChars;l--){var o=f[n.substr(0,l)];if(o){var m=[];a.each(o,function(p,k){if((k.data.indexOf("#Header")==0)||(h(k.value,n))){m[m.length]=k}});return m}}}}}return null}}};a.Autocompleter.Select=function(e,j,l,q){var i={ACTIVE:"ac_over"};var k,f=-1,s,m="",t=true,c,p;function o(){if(!t){return}c=a("<div/>").hide().addClass(e.resultsClass).css("position","absolute").appendTo(document.body);p=a("<ul/>").appendTo(c).mouseover(function(u){if(r(u).nodeName&&r(u).nodeName.toUpperCase()=="LI"){f=a("li",p).removeClass(i.ACTIVE).index(r(u));if(!n(f)){a(r(u)).addClass(i.ACTIVE)}}}).clic
 k(function(u){f=a("li",p).index(r(u));if(n(f)){return}a(r(u)).addClass(i.ACTIVE);l();j.focus();return false}).mousedown(function(){q.mouseDownOnSelect=true}).mouseup(function(){q.mouseDownOnSelect=false});if(e.width>0){c.css("width",e.width)}t=false}function r(v){var u=v.target;while(u&&u.tagName!="LI"){u=u.parentNode}if(!u){return[]}return u}function n(u){dataAtPosition=s[u].data;return(dataAtPosition.indexOf("#Header")==0)}function h(u){k.slice(f,f+1).removeClass(i.ACTIVE);var v=false;do{g(u);v=n(f)}while(v);var x=k.slice(f,f+1).addClass(i.ACTIVE);if(e.scroll){var w=0;k.slice(0,f).each(function(){w+=this.offsetHeight});if((w+x[0].offsetHeight-p.scrollTop())>p[0].clientHeight){p.scrollTop(w+x[0].offsetHeight-p.innerHeight())}else{if(w<p.scrollTop()){p.scrollTop(w)}}}}function g(u){f+=u;if(f<0){f=k.size()-1}else{if(f>=k.size()){f=0}}}function b(u){return e.max&&e.max<u?e.max:u}function d(){p.empty();var v=b(s.length);for(var w=0;w<v;w++){if(!s[w]){continue}var x=e.formatItem
 (s[w].data,w+1,v,s[w].value,m);if(x===false){continue}if(n(w)){if(w!=v-1){var u=a("<li/>").html(s[w].data[1]).addClass("ac_header").appendTo(p)[0]}}else{var u=a("<li/>").html(e.highlight(x,m)).addClass(w%2==0?"ac_even":"ac_odd").appendTo(p)[0]}a.data(u,"ac_data",s[w])}k=p.find("li");if(e.selectFirst){k.slice(0,1).addClass(i.ACTIVE);f=0}if(a.fn.bgiframe){p.bgiframe()}}return{display:function(v,u){o();s=v;m=u;d()},next:function(){h(1)},prev:function(){h(-1)},pageUp:function(){if(f!=0&&f-8<0){h(-f)}else{h(-8)}},pageDown:function(){if(f!=k.size()-1&&f+8>k.size()){h(k.size()-1-f)}else{h(8)}},hide:function(){c&&c.hide();k&&k.removeClass(i.ACTIVE);f=-1},visible:function(){return c&&c.is(":visible")},current:function(){return this.visible()&&(k.filter("."+i.ACTIVE)[0]||e.selectFirst&&k[0])},show:function(){var w=a(j).offset();c.css({width:typeof e.width=="string"||e.width>0?e.width:a(j).width(),top:w.top+j.offsetHeight,left:w.left}).show();if(e.scroll){p.scrollTop(0);p.css({maxHeigh
 t:e.scrollHeight,overflow:"auto"});if(a.browser.msie&&typeof document.body.style.maxHeight==="undefined"){var u=0;k.each(function(){u+=this.offsetHeight});var v=u>e.scrollHeight;p.css("height",v?e.scrollHeight:u);if(!v){k.width(p.width()-parseInt(k.css("padding-left"))-parseInt(k.css("padding-right")))}}}},selected:function(){var u=k&&k.filter("."+i.ACTIVE).removeClass(i.ACTIVE);return u&&u.length&&a.data(u[0],"ac_data")},emptyList:function(){p&&p.empty()},unbind:function(){c&&c.remove()}}};a.Autocompleter.Selection=function(d,e,c){if(d.createTextRange){var b=d.createTextRange();b.collapse(true);b.moveStart("character",e);b.moveEnd("character",c);b.select()}else{if(d.setSelectionRange){d.setSelectionRange(e,c)}else{if(d.selectionStart){d.selectionStart=e;d.selectionEnd=c}}}d.focus()}})(jQuery);
\ No newline at end of file
diff -r cc4944a62b66 -r fba947d16fa7 templates/dataset/edit_attributes.mako
--- a/templates/dataset/edit_attributes.mako	Fri Aug 28 16:52:58 2009 -0400
+++ b/templates/dataset/edit_attributes.mako	Fri Aug 28 18:03:28 2009 -0400
@@ -3,6 +3,9 @@
 
 <%def name="title()">${_('Edit Dataset Attributes')}</%def>
 
+<%def name="stylesheets()">
+    ${h.css( "base", "history", "autocomplete_tagging" )}
+</%def>
 <%
     user = trans.user
     if user:
@@ -10,6 +13,47 @@
     else:
         user_roles = None
 %>
+
+<%def name="javascripts()">
+  ## <!--[if lt IE 7]>
+  ## <script type='text/javascript' src="/static/scripts/IE7.js"> </script>
+  ## <![endif]-->
+  ${h.js( "jquery", "galaxy.base", "jquery.autocomplete", "autocomplete_tagging" )}
+  <script type="text/javascript">
+      $( document ).ready( function() {
+        // Set up autocomplete tagger.
+<%
+	## Build string of tag name, values.
+	tag_names_and_values = list()
+  	for tag in data.tags:
+  		tag_name = tag.user_tname
+  		tag_value = ""
+  		if tag.value is not None:
+  			tag_value = tag.user_value
+  		tag_names_and_values.append("\"" + tag_name + "\" : \"" + tag_value + "\"") 
+%>
+        var options =
+        {
+           tags : {${", ".join(tag_names_and_values)}},
+	   tag_click_fn: function(tag) { /* Do nothing. */ },
+	   use_toggle_link: false,
+	   input_size: 30,
+	   in_form: true,
+	   <% encoded_data_id = trans.security.encode_id(data.id) %>
+           ajax_autocomplete_tag_url: "${h.url_for( controller='tag', action='tag_autocomplete_data', id=encoded_data_id, item_type="hda" )}",
+           ajax_add_tag_url: "${h.url_for( controller='tag', action='add_tag_async', id=encoded_data_id, item_type="hda" )}",
+           ajax_delete_tag_url: "${h.url_for( controller='tag', action='remove_tag_async', id=encoded_data_id, item_type="hda" )}",
+           delete_tag_img: "${h.url_for('/static/images/delete_tag_icon_gray.png')}",
+	   delete_tag_img_rollover: "${h.url_for('/static/images/delete_tag_icon_white.png')}",
+	   add_tag_img: "${h.url_for('/static/images/add_icon.png')}",
+	   add_tag_img_rollover: "${h.url_for('/static/images/add_icon_dark.png')}",
+        };
+% if trans.get_user() is not None:
+       $("#dataset-tag-area").autocomplete_tagging(options);
+       });
+% endif
+      </script>
+</%def>
 
 <%def name="datatype( dataset, datatypes )">
     <select name="datatype">
@@ -45,7 +89,18 @@
                     <input type="text" name="info" value="${data.info}" size="40"/>
                 </div>
                 <div style="clear: both"></div>
-            </div> 
+            </div>
+            %if trans.get_user() is not None:
+            <div class="form-row">
+                <label>
+                    Tags:
+                </label>
+                <div id="dataset-tag-area" 
+		     style="float: left; margin-left: 1px; width: 295px; margin-right: 10px; border-style: inset; border-color: #ddd; border-width: 1px">
+                </div>
+                <div style="clear: both"></div>
+            </div>
+            %endif
             %for name, spec in data.metadata.spec.items():
                 %if spec.visible:
                     <div class="form-row">
diff -r cc4944a62b66 -r fba947d16fa7 templates/root/history.mako
--- a/templates/root/history.mako	Fri Aug 28 16:52:58 2009 -0400
+++ b/templates/root/history.mako	Fri Aug 28 18:03:28 2009 -0400
@@ -14,8 +14,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Pragma" content="no-cache">
 
-${h.css( "base", "history" )}
-${h.js( "jquery", "json2", "jquery.jstore-all" )}
+${h.css( "base", "history", "autocomplete_tagging" )}
+${h.js( "jquery", "json2", "jquery.jstore-all", "jquery.autocomplete", "autocomplete_tagging" )}
 
 <script type="text/javascript">
 $(function() {
@@ -83,6 +83,93 @@
         %endif
         %endfor
     });
+    
+    //
+    // Set up autocomplete tagger.
+    //
+<%
+	## Build string of tag name, values.
+	tag_names_and_values = list()
+  	for tag in history.tags:
+  		tag_name = tag.user_tname
+  		tag_value = ""
+  		if tag.value is not None:
+  			tag_value = tag.user_value
+  		tag_names_and_values.append("\"" + tag_name + "\" : \"" + tag_value + "\"") 
+%>
+  //
+  // Returns the number of keys (elements) in an array/dictionary.
+  //
+  var array_length = function(an_array)
+  {
+    if (an_array.length)
+      return an_array.length;
+
+    var count = 0;
+    for (element in an_array)
+      count++;
+    return count;
+  };
+
+  //
+  // Function get text to display on the toggle link.
+  //
+  var get_toggle_link_text = function(tags) 
+  {
+    var text = "";
+    var num_tags = array_length(tags);
+    if (num_tags != 0)
+      {
+	text = num_tags + (num_tags != 1 ? " Tags" : " Tag");
+	/*
+	// Show first N tags; hide the rest.
+	var max_to_show = 1;
+
+	// Build tag string.
+	var tag_strs = new Array();
+	var count = 0;
+	for (tag_name in tags)
+	  {
+	    tag_value = tags[tag_name];
+	    tag_strs[tag_strs.length] = build_tag_str(tag_name, tag_value);
+	    if (++count == max_to_show)
+	      break;
+	  }
+	tag_str = tag_strs.join(", ");
+	
+	// Finalize text.
+	var num_tags_hiding = num_tags - max_to_show;
+	text = "Tags: " + tag_str + 
+	  (num_tags_hiding != 0 ? " and " + num_tags_hiding + " more" : "");
+	*/
+      }
+    else
+      {
+	// No tags.
+	text = "Add tags to this history";
+      }
+    return text;
+  };
+        
+  var options =
+  {
+    tags : {${", ".join(tag_names_and_values)}},
+    get_toggle_link_text_fn: get_toggle_link_text,
+    input_size: 15,
+    tag_click_fn: function(tag) { /* Do nothing. */ },
+    <% encoded_history_id = trans.security.encode_id(history.id) %>
+    ajax_autocomplete_tag_url: "${h.url_for( controller='tag', action='tag_autocomplete_data', id=encoded_history_id, item_type="history" )}",
+    ajax_add_tag_url: "${h.url_for( controller='tag', action='add_tag_async', id=encoded_history_id, item_type="history" )}",
+    ajax_delete_tag_url: "${h.url_for( controller='tag', action='remove_tag_async', id=encoded_history_id, item_type="history" )}",
+    delete_tag_img: "${h.url_for('/static/images/delete_tag_icon_gray.png')}",
+    delete_tag_img_rollover: "${h.url_for('/static/images/delete_tag_icon_white.png')}",
+    add_tag_img: "${h.url_for('/static/images/add_icon.png')}",
+    add_tag_img_rollover: "${h.url_for('/static/images/add_icon_dark.png')}",
+   };
+% if trans.get_user() is not None:
+   $("#history-tag-area").autocomplete_tagging(options);
+% endif
+
 });
 // Functionized so AJAX'd datasets can call them
 // Get shown/hidden state from cookie
@@ -290,6 +377,9 @@
     <p></p>
 %endif
 
+<div id="history-tag-area" style="margin-bottom: 1em">
+</div>
+
 <%namespace file="history_common.mako" import="render_dataset" />
 
 %if not datasets:

    

[galaxy-dev] [hg] galaxy 2652: Automated merge with ssh://scofield.bx.psu.edu...

Greg Von Kuster