aiding the merge of data_library branch

.hgignore

@@ -114,8 +114,4 @@ doc/build
 *.orig
 .DS_Store
 *.rej
-*~
-
-
-syntax: regexp
-^static/AAA_scratch$
+*~

lib/galaxy/webapps/galaxy/api/folder_contents.py

@@ -100,8 +100,6 @@ class FolderContentsController( BaseAPIController, UsesLibraryMixin, UsesLibrary
             encoded_id = trans.security.encode_id( content_item.id )
             time_updated = content_item.update_time.strftime( "%Y-%m-%d %I:%M %p" )
             time_created = content_item.create_time.strftime( "%Y-%m-%d %I:%M %p" )
-#             log.debug('XXXXXXXXXXXXXXXXXXX api type: ' + str(content_item.api_type))
-#             log.debug('XXXXXXXX ALL: ' + str(content_item.__dict__))
             
             # For folder return also hierarchy values
             if content_item.api_type == 'folder':
@@ -110,7 +108,6 @@ class FolderContentsController( BaseAPIController, UsesLibraryMixin, UsesLibrary
                 return_item.update ( dict ( item_count = content_item.item_count ) )
 
             if content_item.api_type == 'file':
-#                 log.debug('XXXXX content item class: ' + str(content_item.__class__))
                 library_dataset_dict = content_item.to_dict()
                 library_dataset_dict['data_type']
                 library_dataset_dict['file_size']

static/scripts/galaxy.library.router.js

@@ -1,21 +0,0 @@
-define( [], function() {
-
-/**
- * -- Routers --
- */
-
-/**
- * Router for library browser.
- */
-var LibraryRouter = Backbone.Router.extend({    
-    routes: {
-        "" :                 "libraries",
-        "folders/:id" :      "folder_content"
-    }
-});
-
-return {
-    LibraryRouter: LibraryRouter,
-};
-
-})

static/scripts/galaxy.menu.js

@@ -57,7 +57,6 @@ var GalaxyMenu = Backbone.Model.extend(
 
         tab_shared.add({
             title   : "Data Libraries",
-            content : "library/index",
             content : "library/index"
         });
 

static/style/Gruntfile.js

@@ -6,7 +6,7 @@ module.exports = function(grunt) {
   var theme = grunt.option( 'theme', 'blue' );
 
   var out = 'blue'
-  var lessFiles = [ 'base', 'autocomplete_tagging', 'embed_item', 'iphone', 'masthead', 'library', 'new_library', 'trackster' ];
+  var lessFiles = [ 'base', 'autocomplete_tagging', 'embed_item', 'iphone', 'masthead', 'library', 'trackster' ];
 
   var _ = grunt.util._; 
   var fmt = _.sprintf;