Changeset 1434

Timestamp:

03/20/2015 12:10:03 AM (11 years ago)

Author:

obenland

Message:

WP.org Themes: Consolidate JS handler.

Removes the dependency on the theme-install JS, as well as 4 unnecessary
requests each pageload.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes

Files:

• functions.php (modified) (1 diff)
• js/theme.js (modified) (24 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php

@@ -41 +41 @@
 
     if ( ! is_singular( 'page' ) ) {
-        wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array( 'jquery' ), null );
+        wp_enqueue_script( 'google-jsapi', '//www.google.com/jsapi', array( 'jquery' ), null, true );
+        wp_enqueue_script( 'wporg-theme', get_template_directory_uri() . '/js/theme.js', array( 'wp-backbone' ), filemtime( __DIR__ . '/js/theme.js' ), true );
 
-        wp_enqueue_script( 'theme', self_admin_url( 'js/theme.js' ), array( 'wp-backbone' ), false, true );
-        wp_enqueue_script( 'wporg-theme', get_template_directory_uri() . '/js/theme.js', array( 'theme' ), filemtime( __DIR__ . '/js/theme.js' ), true );
-
-        wp_localize_script( 'theme', '_wpThemeSettings', array(
+        wp_localize_script( 'wporg-theme', '_wpThemeSettings', array(
             'themes'   => false,
             'query'    => wporg_themes_prepare_themes_for_js(),
             'settings' => array(
-                'title'      => __( 'WordPress › %s « Free WordPress Themes', 'wporg-themes' ),
-                'isMobile'   => wp_is_mobile(),
-                'isInstall'  => true,
-                'canInstall' => false,
-                'installURI' => null,
-                'adminUrl'   => trailingslashit( parse_url( home_url(), PHP_URL_PATH ) ),
+                'title'        => __( 'WordPress › %s « Free WordPress Themes', 'wporg-themes' ),
+                'isMobile'     => wp_is_mobile(),
+                'postsPerPage' => get_option( 'posts_per_page', 15 ),
+                'path'         => trailingslashit( parse_url( home_url(), PHP_URL_PATH ) ),
             ),
             'l10n' => array(
-                'addNew'            => __( 'Add New Theme' ),
-                'search'            => __( 'Search Themes' ),
-                'searchPlaceholder' => __( 'Search themes...' ), // placeholder (no ellipsis)
-                'upload'            => __( 'Upload Theme' ),
-                'back'              => __( 'Back' ),
+                'search'            => __( 'Search Themes', 'wporg-themes' ),
+                'searchPlaceholder' => __( 'Search themes...', 'wporg-themes' ), // placeholder (no ellipsis)
                 'error'             => __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ),
 
                 // Downloads Graph
-                'date'      => __( 'Date' ),
-                'downloads' => __( 'Downloads' ),
+                'date'      => __( 'Date', 'wporg-themes' ),
+                'downloads' => __( 'Downloads', 'wporg-themes' ),
             ),
-            'installedThemes' => array(),
         ) );
     }
+
+    // No emoji support needed.
+    remove_action( 'wp_print_styles','print_emoji_styles' );
+    wp_dequeue_script( 'emoji' );
+
+    // No Jetpack styles needed.
+    add_filter( 'jetpack_implode_frontend_css', '__return_false' );
 }
 add_action( 'wp_enqueue_scripts', 'wporg_themes_scripts' );

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/js/theme.js

@@ -1 @@
-( function ( $, wp ) {
-    google.load("visualization", "1", {packages:["corechart"]});
-
-    wp.themes.utils = {
+/* global _wpThemeSettings, confirm */
+window.wp = window.wp || {};
+
+( function($) {
+
+    // Set up our namespace...
+    var themes = wp.themes = wp.themes || {},
+        l10n;
+
+    // Store the theme data and settings for organized and quick access
+    // themes.data.settings, themes.data.themes, themes.data.l10n
+    themes.data = _wpThemeSettings;
+    l10n = themes.data.l10n;
+
+    // Setup app structure
+    _.extend( themes, { model: {}, view: {}, routes: {}, router: {}, template: wp.template });
+
+    themes.utils = {
         title: function ( item ) {
             var title = $( 'title' );
 
-            title.html( wp.themes.data.settings.title.replace( '%s', item ) );
+            title.html( themes.data.settings.title.replace( '%s', item ) );
         }
     };
 
-    _.extend( wp.themes.view.Appearance.prototype, {
-        el: '#themes .theme-browser',
-        searchContainer: ''
-    });
-
-    _.extend( wp.themes.view.Themes.prototype, {
-
-        // The theme count element
-        count: $( '.wp-filter .theme-count' ),
-
-        // Renders the overlay with the ThemeDetails view.
-        // Uses the current model data.
-        expand: function( id ) {
-            var self = this;
-
-            // Set the current theme model
-            this.model = self.collection.get( id );
-
-            // Trigger a route update for the current model
-            wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.themePath + this.model.id ) );
-            wp.themes.utils.title( this.model.attributes.name );
-
-            // Sets this.view to 'detail'
-            this.setView( 'detail' );
-            $( 'body' ).addClass( 'modal-open' );
-
-            // Set up the theme details view
-            this.overlay = new wp.themes.view.Details({
-                model: self.model
-            });
-
-            this.overlay.render();
-            this.$overlay.html( this.overlay.el );
-
-            // Bind to theme:next and theme:previous
-            // triggered by the arrow keys
-            //
-            // Keep track of the current model so we
-            // can infer an index position
-            this.listenTo( this.overlay, 'theme:next', function() {
-                // Renders the next theme on the overlay
-                self.next( [ self.model.cid ] );
-                $( '.theme-header' ).find( '.right' ).focus();
-
-            })
-            .listenTo( this.overlay, 'theme:previous', function() {
-                // Renders the previous theme on the overlay
-                self.previous( [ self.model.cid ] );
-                $( '.theme-header' ).find( '.left' ).focus();
-            });
+    themes.Model = Backbone.Model.extend({
+        // Adds attributes to the default data coming through the .org themes api
+        // Map `id` to `slug` for shared code
+        initialize: function() {
+            var description;
+
+            // Set the attributes
+            this.set({
+                // slug is for installation, id is for existing.
+                id: this.get( 'slug' ) || this.get( 'id' )
+            });
+
+            // Map `section.description` to `description`
+            // as the API sometimes returns it differently
+            if ( this.has( 'sections' ) ) {
+                description = this.get( 'sections' ).description;
+                this.set({ description: description });
+            }
         }
     });
 
-    _.extend( wp.themes.view.Installer.prototype, {
-        el: '#themes',
-
-        sort: function( sort ) {
-            var sorter = $( '.filter-links [data-sort="' + sort + '"]'),
+    // Main view controller for themes.php
+    // Unifies and renders all available views
+    themes.view.Appearance = wp.Backbone.View.extend({
+        el: '#themes .theme-browser',
+
+        window: $( window ),
+
+        // Pagination instance
+        page: 0,
+
+        // Sets up a throttler for binding to 'scroll'
+        initialize: function( options ) {
+            // Scroller checks how far the scroll position is
+            _.bindAll( this, 'scroller' );
+
+            this.SearchView = options.SearchView ? options.SearchView : themes.view.Search;
+            // Bind to the scroll event and throttle
+            // the results from this.scroller
+            this.window.bind( 'scroll', _.throttle( this.scroller, 300 ) );
+        },
+
+        // Main render control
+        render: function() {
+            // Setup the main theme view
+            // with the current theme collection
+            this.view = new themes.view.Themes({
+                collection: this.collection,
+                parent: this
+            });
+
+            // Render search form.
+            this.search();
+
+            // Render and append
+            this.view.render();
+            this.$el.find( '.themes' ).remove();
+            this.$el.append( this.view.el ).addClass( 'rendered' );
+        },
+
+        // Defines search element container
+        searchContainer: '',
+
+        // Search input and view
+        // for current theme collection
+        search: function() {
+            var view,
                 self = this;
-            self.clearSearch();
-
-            // Clear filters.
-            _.each( $( '.filter-group' ).find( ':checkbox' ).filter( ':checked' ), function( item ) {
-                $( item ).prop( 'checked', false );
-                return self.filtersChecked();
-            });
-
-            $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
-            sorter.addClass( this.activeClass );
-            wp.themes.utils.title( sorter.text() );
-
-            this.browse( sort );
-        },
-
-        // Applying filters triggers a tag request.
-        applyFilters: function( event ) {
-            var names = [],
-                name,
-                tags = this.filtersChecked(),
-                request = { tag: tags },
-                filteringBy = $( '.filtered-by .tags' );
-
-            if ( event ) {
-                event.preventDefault();
-            }
-
-            $( 'body' ).addClass( 'filters-applied' );
-            $( '.filter-links li > a.current' ).removeClass( 'current' );
-            filteringBy.empty();
-
-            _.each( tags, function( tag ) {
-                name = $( 'label[for="filter-id-' + tag + '"]' ).text();
-                names.push( name );
-                filteringBy.append( '<span class="tag">' + name + '</span>' );
-            });
-
-            wp.themes.router.navigate( wp.themes.router.baseUrl( 'tags/' + tags.join( '+' ) ) );
-            wp.themes.utils.title( names.join( ', ' ) );
-
-            // Get the themes by sending Ajax POST request to api.wordpress.org/themes
-            // or searching the local cache
-            this.collection.query( request );
-        },
-
-        // Toggle the full filters navigation.
-        moreFilters: function( event ) {
-            event.preventDefault();
-
-            if ( $( 'body' ).hasClass( 'filters-applied' ) ) {
-                return this.backToFilters();
-            }
-
-            // If the filters section is opened and filters are checked
-            // run the relevant query collapsing to filtered-by state
-            if ( $( 'body' ).hasClass( 'show-filters' ) && this.filtersChecked() ) {
-                return this.addFilter();
-            }
-
-            this.clearSearch();
-
-            $( 'body' ).toggleClass( 'show-filters' );
-        },
-
-        // Get the checked filters.
-        // @return {array} of tags or false.
-        filtersChecked: function() {
-            var items  = $( '.filter-group' ).find( ':checkbox' ).filter( ':checked' ),
-                drawer = $( '.filter-drawer' ),
-                tags   = [];
-
-            _.each( items, function( item ) {
-                tags.push( $( item ).prop( 'value' ) );
-            });
-
-            // When no filters are checked, restore initial state and return.
-            if ( 0 === tags.length ) {
-                drawer.find( '.apply-filters' ).prop( 'disabled', true ).find( 'span' ).text( '' );
-                drawer.find( '.clear-filters' ).hide();
-                $( 'body' ).removeClass( 'filters-applied' );
-                return false;
-            }
-
-            drawer.find( '.apply-filters' ).prop( 'disabled', false ).find( 'span' ).text( tags.length );
-            drawer.find( '.clear-filters' ).css( 'display', 'inline-block' );
-
-            return tags;
-        },
-
+
+            view = new this.SearchView({
+                collection: self.collection,
+                parent: this
+            });
+
+            // Render and append after screen title
+            view.render();
+            this.searchContainer
+                .append( $.parseHTML( '<label class="screen-reader-text" for="wp-filter-search-input">' + l10n.search + '</label>' ) )
+                .append( view.el );
+        },
+
+        // Checks when the user gets close to the bottom
+        // of the mage and triggers a theme:scroll event
+        scroller: function() {
+            var self = this,
+                bottom, threshold;
+
+            bottom = this.window.scrollTop() + self.window.height();
+            threshold = self.$el.offset().top + self.$el.outerHeight( false ) - self.window.height();
+            threshold = Math.round( threshold * 0.9 );
+
+            if ( bottom > threshold ) {
+                this.trigger( 'theme:scroll' );
+            }
+        }
     });
 
-    _.extend( wp.themes.view.Theme.prototype, {
+    // Set up the Collection for our theme data
+    // @has 'id' 'name' 'screenshot' 'author' 'authorURI' 'version' 'active' ...
+    themes.Collection = Backbone.Collection.extend({
+        model: themes.Model,
+
+        // Search terms
+        terms: '',
+
+        // Local cache array for API queries
+        queries: [],
+
+        // Keep track of current query so we can handle pagination
+        currentQuery: {
+            page: 1,
+            request: {}
+        },
+
+        count: false,
+
+        // Static status controller for when we are loading themes.
+        loadingThemes: false,
+
+        // Controls searching on the current theme collection
+        // and triggers an update event
+        doSearch: function( value ) {
+
+            // Don't do anything if we've already done this search
+            // Useful because the Search handler fires multiple times per keystroke
+            if ( this.terms === value ) {
+                return;
+            }
+
+            // Updates terms with the value passed
+            this.terms = value;
+
+            // If we have terms, run a search...
+            if ( this.terms.length > 0 ) {
+                this.search( this.terms );
+            }
+
+            // If search is blank, show all themes
+            // Useful for resetting the views when you clean the input
+            if ( this.terms === '' ) {
+                this.reset( themes.data.themes );
+            }
+
+            // Trigger an 'update' event
+            this.trigger( 'update' );
+        },
+
+        // Performs a search within the collection
+        // @uses RegExp
+        search: function( term ) {
+            var match, results, haystack, name, description, author;
+
+            // Start with a full collection
+            this.reset( themes.data.themes, { silent: true } );
+
+            // Escape the term string for RegExp meta characters
+            term = term.replace( /[-\/\\^$*+?.()|[\]{}]/g, '\\$&' );
+
+            // Consider spaces as word delimiters and match the whole string
+            // so matching terms can be combined
+            term = term.replace( / /g, ')(?=.*' );
+            match = new RegExp( '^(?=.*' + term + ').+', 'i' );
+
+            // Find results
+            // _.filter and .test
+            results = this.filter( function( data ) {
+                name        = data.get( 'name' ).replace( /(<([^>]+)>)/ig, '' );
+                description = data.get( 'description' ).replace( /(<([^>]+)>)/ig, '' );
+                author      = data.get( 'author' ).replace( /(<([^>]+)>)/ig, '' );
+
+                haystack = _.union( name, data.get( 'id' ), description, author, data.get( 'tags' ) );
+
+                if ( match.test( data.get( 'author' ) ) && term.length > 2 ) {
+                    data.set( 'displayAuthor', true );
+                }
+
+                return match.test( haystack );
+            });
+
+            if ( results.length === 0 ) {
+                this.trigger( 'query:empty' );
+            } else {
+                $( 'body' ).removeClass( 'no-results' );
+            }
+
+            this.reset( results );
+        },
+
+        // Paginates the collection with a helper method
+        // that slices the collection
+        paginate: function( instance ) {
+            var collection = this;
+            instance = instance || 0;
+
+            // Themes per instance are set at 15
+            collection = _( collection.rest( themes.data.settings.postsPerPage * instance ) );
+            collection = _( collection.first( themes.data.settings.postsPerPage ) );
+
+            return collection;
+        },
+
+        // Handles requests for more themes
+        // and caches results
+        //
+        // When we are missing a cache object we fire an apiCall()
+        // which triggers events of `query:success` or `query:fail`
+        query: function( request ) {
+            /**
+             * @static
+             * @type Array
+             */
+            var queries = this.queries,
+                self = this,
+                query, isPaginated, count;
+
+            // Store current query request args
+            // for later use with the event `theme:end`
+            this.currentQuery.request = request;
+
+            // Search the query cache for matches.
+            query = _.find( queries, function( query ) {
+                return _.isEqual( query.request, request );
+            });
+
+            // If the request matches the stored currentQuery.request
+            // it means we have a paginated request.
+            isPaginated = _.has( request, 'page' );
+
+            // Reset the internal api page counter for non paginated queries.
+            if ( ! isPaginated ) {
+                this.currentQuery.page = 1;
+            }
+
+            // Otherwise, send a new API call and add it to the cache.
+            if ( ! query && ! isPaginated ) {
+                query = this.apiCall( request ).done( function( data ) {
+
+                    // Update the collection with the queried data.
+                    if ( data.themes ) {
+                        self.reset( data.themes );
+                        count = data.info.results;
+                        // Store the results and the query request
+                        queries.push( { themes: data.themes, request: request, total: count } );
+                    }
+
+                    // Trigger a collection refresh event
+                    // and a `query:success` event with a `count` argument.
+                    self.trigger( 'update' );
+                    self.trigger( 'query:success', count );
+
+                    if ( data.themes && data.themes.length === 0 ) {
+                        self.trigger( 'query:empty' );
+                    }
+
+                }).fail( function() {
+                    self.trigger( 'query:fail' );
+                });
+            } else {
+                // If it's a paginated request we need to fetch more themes...
+                if ( isPaginated ) {
+                    return this.apiCall( request, isPaginated ).done( function( data ) {
+                        // Add the new themes to the current collection
+                        // @todo update counter
+                        self.add( data.themes );
+                        self.trigger( 'query:success', data.info.results );
+
+                        // We are done loading themes for now.
+                        self.loadingThemes = false;
+
+                    }).fail( function() {
+                        self.trigger( 'query:fail' );
+                    });
+                }
+
+                if ( query.themes.length === 0 ) {
+                    self.trigger( 'query:empty' );
+                } else {
+                    $( 'body' ).removeClass( 'no-results' );
+                }
+
+                // Only trigger an update event since we already have the themes
+                // on our cached object
+                if ( _.isNumber( query.total ) ) {
+                    this.count = query.total;
+                }
+
+                this.reset( query.themes );
+                if ( ! query.total ) {
+                    this.count = this.length;
+                }
+
+                this.trigger( 'update' );
+                this.trigger( 'query:success', this.count );
+            }
+        },
+
+        // Send request to api.wordpress.org/themes
+        apiCall: function( request, paginated ) {
+            return wp.ajax.send( 'query-themes', {
+                data: {
+                    // Request data
+                    request: _.extend({
+                        per_page: themes.data.settings.postsPerPage,
+                        fields: {
+                            description: true,
+                            tested: true,
+                            requires: true,
+                            rating: true,
+                            downloaded: true,
+                            downloadLink: true,
+                            last_updated: true,
+                            homepage: true,
+                            num_ratings: true
+                        }
+                    }, request)
+                },
+
+                beforeSend: function() {
+                    if ( ! paginated ) {
+                        // Spin it
+                        $( 'body' ).addClass( 'loading-content' ).removeClass( 'no-results' );
+                    }
+                }
+            });
+        }
+    });
+
+    // This is the view that controls each theme item
+    // that will be displayed on the screen
+    themes.view.Theme = wp.Backbone.View.extend({
+
+        // Wrap theme data on a div.theme element
+        className: 'theme',
+
+        // Reflects which theme view we have
+        // 'grid' (default) or 'detail'
+        state: 'grid',
+
+        // The HTML template for each element to be rendered
+        html: wp.themes.template( 'theme' ),
+
         events: {
             'click': 'expand',
@@ -169 +373 @@
         },
 
+        touchDrag: false,
+
         render: function() {
             var data = this.model.toJSON();
 
-            data.permalink = wp.themes.data.settings.adminUrl + wp.themes.router.baseUrl( data.slug );
+            data.permalink = themes.data.settings.path + themes.router.baseUrl( data.slug );
 
             // Render themes using the html template
@@ -181 +387 @@
         },
 
+        // Adds a class to the currently active theme
+        // and to the overlay in detailed view mode
+        activeTheme: function() {
+            if ( this.model.get( 'active' ) ) {
+                this.$el.addClass( 'active' );
+            }
+        },
+
+        // Add class of focus to the theme we are focused on.
+        addFocus: function() {
+            var $themeToFocus = ( $( ':focus' ).hasClass( 'theme' ) ) ? $( ':focus' ) : $(':focus').parents('.theme');
+
+            $('.theme.focus').removeClass('focus');
+            $themeToFocus.addClass('focus');
+        },
+
         // Single theme overlay screen
         // It's shown when clicking a theme
@@ -210 +432 @@
 
             // Set focused theme to current element
-            wp.themes.focusedTheme = this.$el;
+            themes.focusedTheme = this.$el;
 
             this.trigger( 'theme:expand', self.model.cid );
             event.preventDefault();
+        },
+
+        preventExpand: function() {
+            this.touchDrag = true;
+        },
+
+        preview: function( event ) {
+            var self = this,
+                current, preview;
+
+            // Bail if the user scrolled on a touch device
+            if ( this.touchDrag === true ) {
+                return this.touchDrag = false;
+            }
+
+            // Allow direct link path to installing a theme.
+            if ( $( event.target ).hasClass( 'button-primary' ) ) {
+                return;
+            }
+
+            // 'enter' and 'space' keys expand the details view when a theme is :focused
+            if ( event.type === 'keydown' && ( event.which !== 13 && event.which !== 32 ) ) {
+                return;
+            }
+
+            // pressing enter while focused on the buttons shouldn't open the preview
+            if ( event.type === 'keydown' && event.which !== 13 && $( ':focus' ).hasClass( 'button' ) ) {
+                return;
+            }
+
+            event.preventDefault();
+
+            event = event || window.event;
+
+            // Set focus to current theme.
+            themes.focusedTheme = this.$el;
+
+            // Construct a new Preview view.
+            preview = new themes.view.Preview({
+                model: this.model
+            });
+
+            // Render the view and append it.
+            preview.render();
+            this.setNavButtonsState();
+
+            // Hide previous/next navigation if there is only one theme
+            if ( this.model.collection.length === 1 ) {
+                preview.$el.addClass( 'no-navigation' );
+            } else {
+                preview.$el.removeClass( 'no-navigation' );
+            }
+
+            // Append preview
+            $( 'div.wrap' ).append( preview.el );
+
+            // Listen to our preview object
+            // for `theme:next` and `theme:previous` events.
+            this.listenTo( preview, 'theme:next', function() {
+
+                // Keep local track of current theme model.
+                current = self.model;
+
+                // If we have ventured away from current model update the current model position.
+                if ( ! _.isUndefined( self.current ) ) {
+                    current = self.current;
+                }
+
+                // Get next theme model.
+                self.current = self.model.collection.at( self.model.collection.indexOf( current ) + 1 );
+
+                // If we have no more themes, bail.
+                if ( _.isUndefined( self.current ) ) {
+                    self.options.parent.parent.trigger( 'theme:end' );
+                    return self.current = current;
+                }
+
+                preview.model = self.current;
+
+                // Render and append.
+                preview.render();
+                this.setNavButtonsState();
+                $( '.next-theme' ).focus();
+            })
+                .listenTo( preview, 'theme:previous', function() {
+
+                    // Keep track of current theme model.
+                    current = self.model;
+
+                    // Bail early if we are at the beginning of the collection
+                    if ( self.model.collection.indexOf( self.current ) === 0 ) {
+                        return;
+                    }
+
+                    // If we have ventured away from current model update the current model position.
+                    if ( ! _.isUndefined( self.current ) ) {
+                        current = self.current;
+                    }
+
+                    // Get previous theme model.
+                    self.current = self.model.collection.at( self.model.collection.indexOf( current ) - 1 );
+
+                    // If we have no more themes, bail.
+                    if ( _.isUndefined( self.current ) ) {
+                        return;
+                    }
+
+                    preview.model = self.current;
+
+                    // Render and append.
+                    preview.render();
+                    this.setNavButtonsState();
+                    $( '.previous-theme' ).focus();
+                });
+
+            this.listenTo( preview, 'preview:close', function() {
+                self.current = self.model;
+            });
+        },
+
+        // Handles .disabled classes for previous/next buttons in theme installer preview
+        setNavButtonsState: function() {
+            var $themeInstaller = $( '.theme-install-overlay' ),
+                current = _.isUndefined( this.current ) ? this.model : this.current;
+
+            // Disable previous at the zero position
+            if ( 0 === this.model.collection.indexOf( current ) ) {
+                $themeInstaller.find( '.previous-theme' ).addClass( 'disabled' );
+            }
+
+            // Disable next if the next model is undefined
+            if ( _.isUndefined( this.model.collection.at( this.model.collection.indexOf( current ) + 1 ) ) ) {
+                $themeInstaller.find( '.next-theme' ).addClass( 'disabled' );
+            }
         }
     });
 
-//  wp.themes.view.Preview.prototype = wp.themes.view.Details.prototype;
-
-    _.extend( wp.themes.view.Details.prototype, {
+// Theme Details view
+// Set ups a modal overlay with the expanded theme data
+    themes.view.Details = wp.Backbone.View.extend({
+        // Wrap theme data on a div.theme element
+        className: 'theme-overlay',
+
         events: {
             'click': 'collapse',
@@ -230 +589 @@
         },
 
+        // The HTML template for the theme overlay
+        html: themes.template( 'theme-single' ),
+
         render: function() {
             var data = this.model.toJSON(),
@@ -239 +601 @@
             // Make tags click-able and separated by a comma.
             data.tags = _.map( data.tags, function( tag ) {
-                return '<a href="' + wp.themes.data.settings.adminUrl + wp.themes.router.baseUrl( 'tags/' + tag.toLowerCase().replace( ' ', '-' ) ) + '">' + tag + '</a>';
+                return '<a href="' + themes.data.settings.path + themes.router.baseUrl( 'tags/' + tag.toLowerCase().replace( ' ', '-' ) ) + '">' + tag + '</a>';
             }).join( ', ' );
 
@@ -278 +640 @@
             }
 
+            event = event || window.event;
             event.preventDefault();
 
-            event = event || window.event;
-
             // Set focus to current theme.
-            wp.themes.focusedTheme = this.$el;
+            themes.focusedTheme = this.$el;
 
             // Construct a new Preview view.
-            preview = new wp.themes.view.Preview({
+            preview = new themes.view.Preview({
                 model: this.model
             });
@@ -301 +662 @@
             }
 
-            if ( wp.themes.data.settings.isMobile ) {
+            if ( themes.data.settings.isMobile ) {
                 preview.$el.addClass( 'wp-full-overlay collapsed' );
             } else {
@@ -337 +698 @@
                 $( '.next-theme' ).focus();
             })
-                .listenTo( preview, 'theme:previous', function() {
-                    // Keep track of current theme model.
-                    current = self.model;
-
-                    // Bail early if we are at the beginning of the collection
-                    if ( self.model.collection.indexOf( self.current ) === 0 ) {
-                        return;
-                    }
-
-                    // If we have ventured away from current model update the current model position.
-                    if ( ! _.isUndefined( self.current ) ) {
-                        current = self.current;
-                    }
-
-                    // Get previous theme model.
-                    self.current = self.model.collection.at( self.model.collection.indexOf( current ) - 1 );
-
-                    // If we have no more themes, bail.
-                    if ( _.isUndefined( self.current ) ) {
-                        return;
-                    }
-
-                    preview.model = self.current;
-
-                    // Render and append.
-                    preview.render();
-                    this.setNavButtonsState();
-                    $( '.previous-theme' ).focus();
-                });
+            .listenTo( preview, 'theme:previous', function() {
+                // Keep track of current theme model.
+                current = self.model;
+
+                // Bail early if we are at the beginning of the collection
+                if ( self.model.collection.indexOf( self.current ) === 0 ) {
+                    return;
+                }
+
+                // If we have ventured away from current model update the current model position.
+                if ( ! _.isUndefined( self.current ) ) {
+                    current = self.current;
+                }
+
+                // Get previous theme model.
+                self.current = self.model.collection.at( self.model.collection.indexOf( current ) - 1 );
+
+                // If we have no more themes, bail.
+                if ( _.isUndefined( self.current ) ) {
+                    return;
+                }
+
+                preview.model = self.current;
+
+                // Render and append.
+                preview.render();
+                this.setNavButtonsState();
+                $( '.previous-theme' ).focus();
+            });
 
             this.listenTo( preview, 'preview:close', function() {
@@ -388 +749 @@
         },
 
-        screenshotCheck: function( el ) {
-            var image = new Image();
-            image.src = el.find( '.screenshot img' ).attr( 'src' );
+        // Adds a class to the currently active theme
+        // and to the overlay in detailed view mode
+        activeTheme: function() {
+            // Check the model has the active property
+            this.$el.toggleClass( 'active', this.model.get( 'active' ) );
+        },
+
+        // Keeps :focus within the theme details elements.
+        containFocus: function( $el ) {
+            var ev = window.event,
+                $target;
+
+            // On first load of the modal, move focus to the primary action.
+            if ( typeof ev === 'undefined' || 1 === $( ev.target ).closest( '.theme' ).length ) {
+                _.delay( function() {
+                    $( '.theme-wrap a.button-primary:visible' ).focus();
+                }, 500 );
+            }
+
+            $el.on( 'keydown.wp-themes', function( event ) {
+
+                // Tab key
+                if ( event.which === 9 ) {
+                    $target = $( event.target );
+
+                    // Keep focus within the overlay by making the last link on theme actions
+                    // switch focus to button.left on tabbing and vice versa
+                    if ( $target.is( 'button.close' ) && event.shiftKey ) {
+                        $el.find( '.theme-tags a:last-child' ).focus();
+                        event.preventDefault();
+                    } else if ( $target.is( '.theme-tags a:last-child' ) ) {
+                        $el.find( 'button.close' ).focus();
+                        event.preventDefault();
+                    }
+                }
+            });
+        },
+
+        // Single theme overlay screen
+        // It's shown when clicking a theme
+        collapse: function( event ) {
+            var self = this,
+                scroll;
+
+            event = event || window.event;
+
+            // Prevent collapsing detailed view when there is only one theme available
+            if ( themes.data.themes.length === 1 ) {
+                return;
+            }
+
+            // Detect if the click is inside the overlay
+            // and don't close it unless the target was
+            // the div.back button
+            if ( $( event.target ).is( '.close' ) || event.keyCode === 27 ) {
+
+                // Add a temporary closing class while overlay fades out
+                $( 'body' ).addClass( 'closing-overlay' );
+
+                // With a quick fade out animation
+                this.$el.fadeOut( 1, function() {
+                    // Clicking outside the modal box closes the overlay
+                    $( 'body' ).removeClass( 'closing-overlay' );
+                    // Handle event cleanup
+                    self.closeOverlay();
+
+                    // Get scroll position to avoid jumping to the top
+                    scroll = document.body.scrollTop;
+
+                    // Restore scroll position
+                    document.body.scrollTop = scroll;
+
+                    // Return focus to the theme div
+                    if ( themes.focusedTheme ) {
+                        themes.focusedTheme.focus();
+                    }
+                });
+            }
         },
 
@@ -439 +875 @@
         },
 
-        // Keeps :focus within the theme details elements.
-        containFocus: function( $el ) {
-            var ev = window.event,
-                $target;
-
-            // On first load of the modal, move focus to the primary action.
-            if ( typeof ev === 'undefined' || 1 === $( ev.target ).closest( '.theme' ).length ) {
-                _.delay( function() {
-                    $( '.theme-wrap a.button-primary:visible' ).focus();
-                }, 500 );
-            }
-
-            $el.on( 'keydown.wp-themes', function( event ) {
-
-                // Tab key
-                if ( event.which === 9 ) {
-                    $target = $( event.target );
-
-                    // Keep focus within the overlay by making the last link on theme actions
-                    // switch focus to button.left on tabbing and vice versa
-                    if ( $target.is( 'button.close' ) && event.shiftKey ) {
-                        $el.find( '.theme-tags a:last-child' ).focus();
-                        event.preventDefault();
-                    } else if ( $target.is( '.theme-tags a:last-child' ) ) {
-                        $el.find( 'button.close' ).focus();
-                        event.preventDefault();
-                    }
-                }
-            });
-        },
-
-        // Single theme overlay screen
-        // It's shown when clicking a theme
-        collapse: function( event ) {
-            var self = this,
-                scroll;
-
-            event = event || window.event;
-
-            // Prevent collapsing detailed view when there is only one theme available
-            if ( wp.themes.data.themes.length === 1 ) {
-                return;
-            }
-
-            // Detect if the click is inside the overlay
-            // and don't close it unless the target was
-            // the div.back button
-            if ( $( event.target ).is( '.close' ) || event.keyCode === 27 ) {
-
-                // Add a temporary closing class while overlay fades out
-                $( 'body' ).addClass( 'closing-overlay' );
-
-                // With a quick fade out animation
-                this.$el.fadeOut( 1, function() {
-                    // Clicking outside the modal box closes the overlay
-                    $( 'body' ).removeClass( 'closing-overlay' );
-                    // Handle event cleanup
-                    self.closeOverlay();
-
-                    // Get scroll position to avoid jumping to the top
-                    scroll = document.body.scrollTop;
-
-                    // Restore scroll position
-                    document.body.scrollTop = scroll;
-
-                    // Return focus to the theme div
-                    if ( wp.themes.focusedTheme ) {
-                        wp.themes.focusedTheme.focus();
-                    }
-                });
+        // Handles .disabled classes for next/previous buttons
+        navigation: function() {
+
+            // Disable Left/Right when at the start or end of the collection
+            if ( this.model.cid === this.model.collection.at(0).cid ) {
+                this.$el.find( '.left' ).addClass( 'disabled' );
+            }
+            if ( this.model.cid === this.model.collection.at( this.model.collection.length - 1 ).cid ) {
+                this.$el.find( '.right' ).addClass( 'disabled' );
             }
         },
@@ -524 +899 @@
 
             // Clean the url structure
-            if ( author = wp.themes.Collection.prototype.currentQuery.request.author ) {
-                wp.themes.router.navigate( wp.themes.router.baseUrl( 'author/' + author ) );
-                wp.themes.utils.title( author );
-            }
-            else if ( search = wp.themes.Collection.prototype.currentQuery.request.search ) {
-                wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.searchPath + search ) );
-                wp.themes.utils.title( search );
-            }
-            else if ( tags = wp.themes.view.Installer.prototype.filtersChecked() ) {
-                wp.themes.router.navigate( wp.themes.router.baseUrl( 'tags/' + tags.join( '+' ) ) );
-                wp.themes.utils.title( _.each( tags, function( tag, i ) {
+            if ( author = themes.Collection.prototype.currentQuery.request.author ) {
+                themes.router.navigate( themes.router.baseUrl( 'author/' + author ) );
+                themes.utils.title( author );
+            }
+            else if ( search = themes.Collection.prototype.currentQuery.request.search ) {
+                themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + search ) );
+                themes.utils.title( search );
+            }
+            else if ( tags = themes.view.Installer.prototype.filtersChecked() ) {
+                themes.router.navigate( themes.router.baseUrl( 'tags/' + tags.join( '+' ) ) );
+                themes.utils.title( _.each( tags, function( tag, i ) {
                     tags[ i ] = $( 'label[for="filter-id-' + tag + '"]' ).text();
                 }).join( ', ' ) );
@@ -543 +918 @@
                     args   = { trigger: true };
                 }
-                wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.browsePath + sorter.data( 'sort' ) ), args );
-                wp.themes.utils.title( sorter.text() );
-            }
+                themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + sorter.data( 'sort' ) ), args );
+                themes.utils.title( sorter.text() );
+            }
+        },
+
+        // Confirmation dialog for deleting a theme
+        deleteTheme: function() {
+            return confirm( themes.data.settings.confirmDelete );
+        },
+
+        nextTheme: function() {
+            var self = this;
+            self.trigger( 'theme:next', self.model.cid );
+            return false;
+        },
+
+        previousTheme: function() {
+            var self = this;
+            self.trigger( 'theme:previous', self.model.cid );
+            return false;
+        },
+
+        screenshotCheck: function( el ) {
+            var image = new Image();
+            image.src = el.find( '.screenshot img' ).attr( 'src' );
         }
     });
 
-    _.extend( wp.themes.view.Preview.prototype, {
+    // Theme Preview view
+    // Set ups a modal overlay with the expanded theme data
+    themes.view.Preview = themes.view.Details.extend({
+
+        className: 'wp-full-overlay expanded',
+        el: '.theme-install-overlay',
+
+        events: {
+            'click .close-full-overlay': 'close',
+            'click .collapse-sidebar': 'collapse',
+            'click .previous-theme': 'previousTheme',
+            'click .next-theme': 'nextTheme',
+            'keyup': 'keyEvent'
+        },
+
+        // The HTML template for the theme preview
+        html: themes.template( 'theme-preview' ),
+
 
         render: function() {
@@ -556 +970 @@
             this.$el.html( this.html( data ) );
 
-            wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.themePath + this.model.get( 'id' ) + '/preview' ) );
+            themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) + '/preview' ) );
 
             this.$el.fadeIn( 200, function() {
@@ -569 +983 @@
 
                 // Return focus to the theme div
-                if ( wp.themes.focusedTheme ) {
-                    wp.themes.focusedTheme.focus();
+                if ( themes.focusedTheme ) {
+                    themes.focusedTheme.focus();
                 }
             });
@@ -577 +991 @@
             this.undelegateEvents();
             this.unbind();
-            wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.themePath + this.model.get( 'id' ) ) );
+            themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ) );
+            return false;
+        },
+
+        collapse: function() {
+
+            this.$el.toggleClass( 'collapsed' ).toggleClass( 'expanded' );
             return false;
         },
@@ -602 +1022 @@
     });
 
-    _.extend( wp.themes.view.InstallerSearch.prototype, {
+    // Controls the rendering of div.themes,
+    // a wrapper that will hold all the theme elements
+    themes.view.Themes = wp.Backbone.View.extend({
+
+        className: 'themes',
+        $overlay: $( 'div.theme-overlay' ),
+
+        // Number to keep track of scroll position
+        // while in theme-overlay mode
+        index: 0,
+
+        // The theme count element
+        count: $( '.wp-filter .theme-count' ),
+
+        initialize: function( options ) {
+            var self = this;
+
+            // Set up parent
+            this.parent = options.parent;
+
+            // Set current view to [grid]
+            this.setView( 'grid' );
+
+            // Move the active theme to the beginning of the collection
+            self.currentTheme();
+
+            // When the collection is updated by user input...
+            this.listenTo( self.collection, 'update', function() {
+                self.parent.page = 0;
+                self.currentTheme();
+                self.render( this );
+            });
+
+            // Update theme count to full result set when available.
+            this.listenTo( self.collection, 'query:success', function( count ) {
+                if ( _.isNumber( count ) ) {
+                    self.count.text( count );
+                } else {
+                    self.count.text( self.collection.length );
+                }
+            });
+
+            this.listenTo( self.collection, 'query:empty', function() {
+                $( 'body' ).addClass( 'no-results' );
+            });
+
+            this.listenTo( this.parent, 'theme:scroll', function() {
+                self.renderThemes( self.parent.page );
+            });
+
+            this.listenTo( this.parent, 'theme:close', function() {
+                if ( self.overlay ) {
+                    self.overlay.closeOverlay();
+                }
+            } );
+
+            // Bind keyboard events.
+            $( 'body' ).on( 'keyup', function( event ) {
+                if ( ! self.overlay ) {
+                    return;
+                }
+
+                // Pressing the right arrow key fires a theme:next event
+                if ( event.keyCode === 39 ) {
+                    self.overlay.nextTheme();
+                }
+
+                // Pressing the left arrow key fires a theme:previous event
+                if ( event.keyCode === 37 ) {
+                    self.overlay.previousTheme();
+                }
+
+                // Pressing the escape key fires a theme:collapse event
+                if ( event.keyCode === 27 ) {
+                    self.overlay.collapse( event );
+                }
+            });
+        },
+
+        // Manages rendering of theme pages
+        // and keeping theme count in sync
+        render: function() {
+            // Clear the DOM, please
+            this.$el.empty();
+
+            // If the user doesn't have switch capabilities
+            // or there is only one theme in the collection
+            // render the detailed view of the active theme
+            if ( themes.data.themes.length === 1 ) {
+
+                // Constructs the view
+                this.singleTheme = new themes.view.Details({
+                    model: this.collection.models[0]
+                });
+
+                // Render and apply a 'single-theme' class to our container
+                this.singleTheme.render();
+                this.$el.addClass( 'single-theme' );
+                this.$el.append( this.singleTheme.el );
+            }
+
+            // Generate the themes
+            // Using page instance
+            // While checking the collection has items
+            if ( this.options.collection.size() > 0 ) {
+                this.renderThemes( this.parent.page );
+            }
+
+            // Display a live theme count for the collection
+            this.count.text( this.collection.count ? this.collection.count : this.collection.length );
+        },
+
+        // Iterates through each instance of the collection
+        // and renders each theme module
+        renderThemes: function( page ) {
+            var self = this;
+
+            self.instance = self.collection.paginate( page );
+
+            // If we have no more themes bail
+            if ( self.instance.size() === 0 ) {
+                // Fire a no-more-themes event.
+                this.parent.trigger( 'theme:end' );
+                return;
+            }
+
+            // Make sure the add-new stays at the end
+            if ( page >= 1 ) {
+                $( '.add-new-theme' ).remove();
+            }
+
+            // Loop through the themes and setup each theme view
+            self.instance.each( function( theme ) {
+                self.theme = new themes.view.Theme({
+                    model: theme,
+                    parent: self
+                });
+
+                // Render the views...
+                self.theme.render();
+                // and append them to div.themes
+                self.$el.append( self.theme.el );
+
+                // Binds to theme:expand to show the modal box
+                // with the theme details
+                self.listenTo( self.theme, 'theme:expand', self.expand, self );
+            });
+
+            this.parent.page++;
+        },
+
+        // Grabs current theme and puts it at the beginning of the collection
+        currentTheme: function() {
+            var self = this,
+                current;
+
+            current = self.collection.findWhere({ active: true });
+
+            // Move the active theme to the beginning of the collection
+            if ( current ) {
+                self.collection.remove( current );
+                self.collection.add( current, { at:0 } );
+            }
+        },
+
+        // Sets current view
+        setView: function( view ) {
+            return view;
+        },
+
+        // Renders the overlay with the ThemeDetails view.
+        // Uses the current model data.
+        expand: function( id ) {
+            var self = this;
+
+            // Set the current theme model
+            this.model = self.collection.get( id );
+
+            // Trigger a route update for the current model
+            themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.id ) );
+            themes.utils.title( this.model.attributes.name );
+
+            // Sets this.view to 'detail'
+            this.setView( 'detail' );
+            $( 'body' ).addClass( 'modal-open' );
+
+            // Set up the theme details view
+            this.overlay = new themes.view.Details({
+                model: self.model
+            });
+
+            this.overlay.render();
+            this.$overlay.html( this.overlay.el );
+
+            // Bind to theme:next and theme:previous
+            // triggered by the arrow keys
+            //
+            // Keep track of the current model so we
+            // can infer an index position
+            this.listenTo( this.overlay, 'theme:next', function() {
+                // Renders the next theme on the overlay
+                self.next( [ self.model.cid ] );
+                $( '.theme-header' ).find( '.right' ).focus();
+
+            })
+            .listenTo( this.overlay, 'theme:previous', function() {
+                // Renders the previous theme on the overlay
+                self.previous( [ self.model.cid ] );
+                $( '.theme-header' ).find( '.left' ).focus();
+            });
+        },
+
+        // This method renders the next theme on the overlay modal
+        // based on the current position in the collection
+        // @params [model cid]
+        next: function( args ) {
+            var self = this,
+                model, nextModel;
+
+            // Get the current theme
+            model = self.collection.get( args[0] );
+            // Find the next model within the collection
+            nextModel = self.collection.at( self.collection.indexOf( model ) + 1 );
+
+            // Sanity check which also serves as a boundary test
+            if ( nextModel !== undefined ) {
+
+                // We have a new theme...
+                // Close the overlay
+                this.overlay.closeOverlay();
+
+                // Trigger a route update for the current model
+                self.theme.trigger( 'theme:expand', nextModel.cid );
+
+            }
+        },
+
+        // This method renders the previous theme on the overlay modal
+        // based on the current position in the collection
+        // @params [model cid]
+        previous: function( args ) {
+            var self = this,
+                model, previousModel;
+
+            // Get the current theme
+            model = self.collection.get( args[0] );
+            // Find the previous model within the collection
+            previousModel = self.collection.at( self.collection.indexOf( model ) - 1 );
+
+            if ( previousModel !== undefined ) {
+
+                // We have a new theme...
+                // Close the overlay
+                this.overlay.closeOverlay();
+
+                // Trigger a route update for the current model
+                self.theme.trigger( 'theme:expand', previousModel.cid );
+
+            }
+        }
+    });
+
+    // Search input view controller.
+    themes.view.Search = wp.Backbone.View.extend({
+
+        tagName: 'input',
+        className: 'wp-filter-search',
+        id: 'wp-filter-search-input',
+        searching: false,
+
+        attributes: {
+            placeholder: l10n.searchPlaceholder,
+            type: 'search'
+        },
+
+        events: {
+            'input':  'search',
+            'keyup':  'search',
+            'change': 'search',
+            'search': 'search',
+            'blur':   'pushState'
+        },
+
+        initialize: function( options ) {
+
+            this.parent = options.parent;
+
+            this.listenTo( this.parent, 'theme:close', function() {
+                this.searching = false;
+            } );
+
+        },
+
+        // Runs a search on the theme collection.
+        search: function( event ) {
+            var options = {};
+
+            // Clear on escape.
+            if ( event.type === 'keyup' && event.which === 27 ) {
+                event.target.value = '';
+            }
+
+            // Lose input focus when pressing enter
+            if ( event.which === 13 ) {
+                this.$el.trigger( 'blur' );
+            }
+
+            this.collection.doSearch( event.target.value );
+
+            // if search is initiated and key is not return
+            if ( this.searching && event.which !== 13 ) {
+                options.replace = true;
+            } else {
+                this.searching = true;
+            }
+
+            // Update the URL hash
+            if ( event.target.value ) {
+                themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + event.target.value ), options );
+            } else {
+                themes.router.navigate( themes.router.baseUrl( '' ) );
+            }
+        },
+
+        pushState: function( event ) {
+            var url = themes.router.baseUrl( '' );
+
+            if ( event.target.value ) {
+                url = themes.router.baseUrl( themes.router.searchPath + event.target.value );
+            }
+
+            this.searching = false;
+            themes.router.navigate( url );
+
+        }
+    });
+
+    // Sets up the routes events for relevant url queries
+    // Listens to [theme] and [search] params
+    themes.Router = Backbone.Router.extend({
+
+        routes: {
+            'themes.php?theme=:slug': 'theme',
+            'themes.php?search=:query': 'search',
+            'themes.php?s=:query': 'search',
+            'themes.php': 'themes',
+            '': 'themes'
+        },
+
+        baseUrl: function( url ) {
+            return 'themes.php' + url;
+        },
+
+        themePath: '?theme=',
+        searchPath: '?search=',
+
+        search: function( query ) {
+            $( '.wp-filter-search' ).val( query );
+        },
+
+        themes: function() {
+            $( '.wp-filter-search' ).val( '' );
+        },
+
+        navigate: function() {
+            if ( Backbone.history._hasPushState ) {
+                Backbone.Router.prototype.navigate.apply( this, arguments );
+            }
+        }
+
+    });
+
+    // Extend the main Search view
+    themes.view.InstallerSearch =  themes.view.Search.extend({
+
         events: {
             'keyup':  'search',
-            'search': 'search',
+            'search': 'search'
+        },
+
+        // Handles Ajax request for searching through themes in public repo
+        search: function( event ) {
+
+            // Tabbing or reverse tabbing into the search input shouldn't trigger a search
+            if ( event.type === 'keyup' && ( event.which === 9 || event.which === 16 ) ) {
+                return;
+            }
+
+            this.collection = this.options.parent.view.collection;
+
+            // Clear on escape.
+            if ( event.type === 'keyup' && event.which === 27 ) {
+                event.target.value = '';
+            }
+
+            _.debounce( _.bind( this.doSearch, this ), 300 )( event.target.value );
         },
 
@@ -611 +1423 @@
             var request = {};
 
-            wp.themes.view.Installer.prototype.clearFilters( new Event( 'click' ) );
+            themes.view.Installer.prototype.clearFilters( new Event( 'click' ) );
 
             request.search = value;
@@ -638 +1450 @@
             // Set route
             if ( value ) {
-                wp.themes.utils.title( value );
-                wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.searchPath + value ), { replace: true } );
+                themes.utils.title( value );
+                themes.router.navigate( themes.router.baseUrl( themes.router.searchPath + value ), { replace: true } );
             } else {
                 delete request.search;
                 request.browse = 'featured';
 
-                wp.themes.utils.title( $( '.filter-links [data-sort="featured"]' ).text() );
-                wp.themes.router.navigate( wp.themes.router.baseUrl( wp.themes.router.browsePath + 'featured' ), { replace: true } );
+                themes.utils.title( $( '.filter-links [data-sort="featured"]' ).text() );
+                themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + 'featured' ), { replace: true } );
             }
 
@@ -654 +1466 @@
     });
 
-    _.extend( wp.themes.InstallerRouter.prototype, {
+    themes.view.Installer = themes.view.Appearance.extend({
+        el: '#themes',
+
+        // Register events for sorting and filters in theme-navigation
+        events: {
+            'click .filter-links li > a': 'onSort',
+            'click .theme-filter': 'onFilter',
+            'click .drawer-toggle': 'moreFilters',
+            'click .filter-drawer .apply-filters': 'applyFilters',
+            'click .filter-group [type="checkbox"]': 'addFilter',
+            'click .filter-drawer .clear-filters': 'clearFilters',
+            'click .filtered-by': 'backToFilters'
+        },
+
+        activeClass: 'current',
+
+        // Overwrite search container class to append search
+        // in new location
+        searchContainer: $( '.wp-filter .search-form' ),
+
+        // Initial render method
+        render: function() {
+            var self = this;
+
+            this.search();
+
+            this.collection = new themes.Collection();
+
+            // Bump `collection.currentQuery.page` and request more themes if we hit the end of the page.
+            this.listenTo( this, 'theme:end', function() {
+
+                // Make sure we are not already loading
+                if ( self.collection.loadingThemes ) {
+                    return;
+                }
+
+                // Set loadingThemes to true and bump page instance of currentQuery.
+                self.collection.loadingThemes = true;
+                self.collection.currentQuery.page++;
+
+                // Use currentQuery.page to build the themes request.
+                _.extend( self.collection.currentQuery.request, { page: self.collection.currentQuery.page } );
+                self.collection.query( self.collection.currentQuery.request );
+            });
+
+            this.listenTo( this.collection, 'query:success', function() {
+                $( 'body' ).removeClass( 'loading-content' );
+                $( '.theme-browser' ).find( 'div.error' ).remove();
+            });
+
+            this.listenTo( this.collection, 'query:fail', function() {
+                $( 'body' ).removeClass( 'loading-content' );
+                $( '.theme-browser' ).find( 'div.error' ).remove();
+                $( '.theme-browser' ).find( 'div.themes' ).before( '<div class="error"><p>' + l10n.error + '</p></div>' );
+            });
+
+            if ( this.view ) {
+                this.view.remove();
+            }
+
+            // Set ups the view and passes the section argument
+            this.view = new themes.view.Themes({
+                collection: this.collection,
+                parent: this
+            });
+
+            // Reset pagination every time the install view handler is run
+            this.page = 0;
+
+            // Render and append
+            this.$el.find( '.themes' ).remove();
+            this.view.render();
+            this.$el.find( '.theme-browser' ).append( this.view.el ).addClass( 'rendered' );
+        },
+
+        // Handles all the rendering of the public theme directory
+        browse: function( section ) {
+            // Create a new collection with the proper theme data
+            // for each section
+            this.collection.query( { browse: section } );
+        },
+
+        // Sorting navigation
+        onSort: function( event ) {
+            var $el = $( event.target ),
+                sort = $el.data( 'sort' );
+
+            event.preventDefault();
+
+            $( 'body' ).removeClass( 'filters-applied show-filters' );
+
+            // Bail if this is already active
+            if ( $el.hasClass( this.activeClass ) ) {
+                return;
+            }
+
+            this.sort( sort );
+
+            // Trigger a router.naviagte update
+            themes.router.navigate( themes.router.baseUrl( themes.router.browsePath + sort ) );
+        },
+
+        sort: function( sort ) {
+            var sorter = $( '.filter-links [data-sort="' + sort + '"]'),
+                self = this;
+            self.clearSearch();
+
+            // Clear filters.
+            _.each( $( '.filter-group' ).find( ':checkbox' ).filter( ':checked' ), function( item ) {
+                $( item ).prop( 'checked', false );
+                return self.filtersChecked();
+            });
+
+            $( '.filter-links li > a, .theme-filter' ).removeClass( this.activeClass );
+            sorter.addClass( this.activeClass );
+            themes.utils.title( sorter.text() );
+
+            this.browse( sort );
+        },
+
+        // Filters and Tags
+        onFilter: function( event ) {
+            var request,
+                $el = $( event.target ),
+                filter = $el.data( 'filter' );
+
+            // Bail if this is already active
+            if ( $el.hasClass( this.activeClass ) ) {
+                return;
+            }
+
+            $( '.filter-links li > a, .theme-section' ).removeClass( this.activeClass );
+            $el.addClass( this.activeClass );
+
+            if ( ! filter ) {
+                return;
+            }
+
+            // Construct the filter request
+            // using the default values
+            filter = _.union( filter, this.filtersChecked() );
+            request = { tag: [ filter ] };
+
+            // Get the themes by sending Ajax POST request to api.wordpress.org/themes
+            // or searching the local cache
+            this.collection.query( request );
+        },
+
+        // Clicking on a checkbox to add another filter to the request
+        addFilter: function() {
+            this.filtersChecked();
+        },
+
+        // Applying filters triggers a tag request.
+        applyFilters: function( event ) {
+            var names = [],
+                name,
+                tags = this.filtersChecked(),
+                request = { tag: tags },
+                filteringBy = $( '.filtered-by .tags' );
+
+            if ( event ) {
+                event.preventDefault();
+            }
+
+            $( 'body' ).addClass( 'filters-applied' );
+            $( '.filter-links li > a.current' ).removeClass( 'current' );
+            filteringBy.empty();
+
+            _.each( tags, function( tag ) {
+                name = $( 'label[for="filter-id-' + tag + '"]' ).text();
+                names.push( name );
+                filteringBy.append( '<span class="tag">' + name + '</span>' );
+            });
+
+            themes.router.navigate( themes.router.baseUrl( 'tags/' + tags.join( '+' ) ) );
+            themes.utils.title( names.join( ', ' ) );
+
+            // Get the themes by sending Ajax POST request to api.wordpress.org/themes
+            // or searching the local cache
+            this.collection.query( request );
+        },
+
+        // Get the checked filters.
+        // @return {array} of tags or false.
+        filtersChecked: function() {
+            var items  = $( '.filter-group' ).find( ':checkbox' ).filter( ':checked' ),
+                drawer = $( '.filter-drawer' ),
+                tags   = [];
+
+            _.each( items, function( item ) {
+                tags.push( $( item ).prop( 'value' ) );
+            });
+
+            // When no filters are checked, restore initial state and return.
+            if ( 0 === tags.length ) {
+                drawer.find( '.apply-filters' ).prop( 'disabled', true ).find( 'span' ).text( '' );
+                drawer.find( '.clear-filters' ).hide();
+                $( 'body' ).removeClass( 'filters-applied' );
+                return false;
+            }
+
+            drawer.find( '.apply-filters' ).prop( 'disabled', false ).find( 'span' ).text( tags.length );
+            drawer.find( '.clear-filters' ).css( 'display', 'inline-block' );
+
+            return tags;
+        },
+
+        // Toggle the full filters navigation.
+        moreFilters: function( event ) {
+            event.preventDefault();
+
+            if ( $( 'body' ).hasClass( 'filters-applied' ) ) {
+                return this.backToFilters();
+            }
+
+            // If the filters section is opened and filters are checked
+            // run the relevant query collapsing to filtered-by state
+            if ( $( 'body' ).hasClass( 'show-filters' ) && this.filtersChecked() ) {
+                return this.addFilter();
+            }
+
+            this.clearSearch();
+
+            $( 'body' ).toggleClass( 'show-filters' );
+        },
+
+        // Clears all the checked filters
+        // @uses filtersChecked()
+        clearFilters: function( event ) {
+            var items = $( '.filter-group' ).find( ':checkbox' ),
+                self = this;
+
+            event.preventDefault();
+
+            _.each( items.filter( ':checked' ), function( item ) {
+                $( item ).prop( 'checked', false );
+                return self.filtersChecked();
+            });
+        },
+
+        backToFilters: function( event ) {
+            if ( event ) {
+                event.preventDefault();
+            }
+
+            $( 'body' ).removeClass( 'filters-applied' );
+        },
+
+        clearSearch: function() {
+            $( '#wp-filter-search-input').val( '' );
+        }
+    });
+
+    themes.InstallerRouter = Backbone.Router.extend({
         routes: {
             'browse/:sort/'  : 'sort',
@@ -674 +1740 @@
         themePath: '',
         browsePath: 'browse/',
-        searchPath: 'search/'
+        searchPath: 'search/',
+
+        search: function( query ) {
+            $( '.wp-filter-search' ).val( query );
+        },
+
+        navigate: function() {
+            if ( Backbone.history._hasPushState ) {
+                Backbone.Router.prototype.navigate.apply( this, arguments );
+            }
+        }
     });
 
-    _.extend( wp.themes.RunInstaller, {
+    themes.RunInstaller = {
+        init: function() {
+            // Set up the view
+            // Passes the default 'section' as an option
+            this.view = new themes.view.Installer({
+                section: 'featured',
+                SearchView: themes.view.InstallerSearch
+            });
+
+            // Render results
+            this.render();
+        },
+
+        render: function() {
+
+            // Render results
+            this.view.render();
+            this.routes();
+
+            Backbone.history.start({
+                root: themes.data.settings.path,
+                pushState: true,
+                hashChange: false
+            });
+        },
+
         routes: function() {
             var self = this,
                 request = {};
 
-            // Bind to our global `wp.themes` object
+            // Bind to our global `themes` object
             // so that the router is available to sub-views
-            wp.themes.router = new wp.themes.InstallerRouter();
+            themes.router = new themes.InstallerRouter();
 
             // Handles `theme` route event
             // Queries the API for the passed theme slug
-            wp.themes.router.on( 'route:preview', function( slug ) {
-                self.view.collection.queries.push( wp.themes.data.query );
+            themes.router.on( 'route:preview', function( slug ) {
+                self.view.collection.queries.push( themes.data.query );
 
                 request.theme = slug;
@@ -701 +1802 @@
             // Also handles the root URL triggering a sort request
             // for `featured`, the default view
-            wp.themes.router.on( 'route:sort', function( sort ) {
-                self.view.collection.queries.push( wp.themes.data.query );
+            themes.router.on( 'route:sort', function( sort ) {
+                self.view.collection.queries.push( themes.data.query );
 
                 if ( ! sort ) {
@@ -712 +1813 @@
 
             // The `search` route event. The router populates the input field.
-            wp.themes.router.on( 'route:search', function() {
-                self.view.collection.queries.push( wp.themes.data.query );
+            themes.router.on( 'route:search', function() {
+                self.view.collection.queries.push( themes.data.query );
 
                 $( '.wp-filter-search' ).focus().trigger( 'keyup' );
             });
 
-            wp.themes.router.on( 'route:tag', function( tag ) {
-                self.view.collection.queries.push( wp.themes.data.query );
+            themes.router.on( 'route:tag', function( tag ) {
+                self.view.collection.queries.push( themes.data.query );
 
                 _.each( tag.split( '+' ), function( tag ) {
@@ -728 +1829 @@
             });
 
-            wp.themes.router.on( 'route:author', function( author ) {
-                self.view.collection.queries.push( wp.themes.data.query );
+            themes.router.on( 'route:author', function( author ) {
+                self.view.collection.queries.push( themes.data.query );
 
                 request.author = author;
                 self.view.collection.query( request );
-                wp.themes.utils.title( author );
-            });
-
-            this.extraRoutes();
+                themes.utils.title( author );
+            });
         }
+    };
+
+    // Ready...
+    $( function() {
+        themes.RunInstaller.init();
     });
 
-}( jQuery, wp ) );
+})( jQuery );
+
+( function( google ) {
+    google.load("visualization", "1", {packages:["corechart"]});
+})( google );