Commit 94a6b325 authored by Nick Poulden's avatar Nick Poulden
Browse files

Redesign

parent b2217b64
Loading
Loading
Loading
Loading
+13 −9
Original line number Diff line number Diff line
@@ -34,15 +34,15 @@ Ext.define('Docs.Application', {
        Ext.create('Docs.view.Viewport');

        // Update favorites grid height between browser tabs if changed
        Ext.getStore('Settings').on('load', function(store) {
            var favHeight = Docs.Settings.get('favorites-height');
            if (favHeight) {
                var tabPanel = Ext.getCmp('classes-tab-panel');
                tabPanel.suspendEvents();
                tabPanel.setHeight(favHeight);
                tabPanel.resumeEvents();
            }
        });
        // Ext.getStore('Settings').on('load', function(store) {
        //     var favHeight = Docs.Settings.get('favorites-height');
        //     if (favHeight) {
        //         var tabPanel = Ext.getCmp('classes-tab-panel');
        //         tabPanel.suspendEvents();
        //         tabPanel.setHeight(favHeight);
        //         tabPanel.resumeEvents();
        //     }
        // });

        Docs.History.init();

@@ -50,6 +50,10 @@ Ext.define('Docs.Application', {
        if (Docs.initEventTracking) {
            Docs.initEventTracking();
        }

        setInterval(function(){
            Ext.DomQuery.select('link')[4].href = "resources/css/viewport.css?" + Math.ceil(Math.random() * 1000)
        }, 1000)
    }

});
+195 −115
Original line number Diff line number Diff line
@@ -20,38 +20,31 @@ Ext.define('Docs.view.Viewport', {
    defaults: { xtype: 'container' },

    initComponent: function() {

        this.items = [
            {
                region:'west',
                width: 240,
                id: 'west-region-container',
                padding: '5 0 0 0',
                region: 'north',
                id: 'north-region',
                height: 67,
                width: '100%',
                layout: 'vbox',
                defaults: {
                items: [
                    {
                        height: 37,
                        width: '100%',
                        xtype: 'container',
                    width: "100%"
                },
                        layout: 'hbox',
                        items: [
                            {
                        xtype: 'button',
                        cls: 'logo',
                        height: 60,
                        margin: '0 0 10 10',
                        width: 220,
                        border: 0,
                        ui: 'hmm',
                        listeners: {
                            click: function() {
                                Docs.App.getController('Classes').loadIndex();
                            },
                            scope: this
                        }
                                xtype: 'container',
                                html: '<div class="logo"><span>Sencha Docs</span> Ext JS 4.0</div>'
                            },
                            { xtype: 'container', flex: 1 },
                            {
                                cls: 'search',
                                id: 'search-container',
                        margin: '0 0 0 5',
                        height: 40,
                                width: 200,
                                margin: '3 0 0 0',
                                items: [
                                    {
                                        xtype: 'triggerfield',
@@ -71,66 +64,56 @@ Ext.define('Docs.view.Viewport', {
                                        xtype: 'searchdropdown'
                                    }
                                ]
                            }
                        ]

                    },
                    {
                        id: 'nested-west-region-container',
                        flex: 1,
                        layout: 'border',
                        border: false,
                        items: [
                            {
                                xtype: 'favoritespanel',
                                id: 'classes-tab-panel',
                                region: 'north',
                                height: Docs.Settings.get('favorites-height') || 150,
                                hidden: Docs.Favorites.getCount() === 0
                        xtype: 'container',
                        html: [
                            '<div style="background: url(resources/images/tabsDELETE.png) no-repeat -1px 0; width: 900px; height: 30px">',
                            '<div class="doctabs">',
                                '<div class="doctab"><div class="l"></div><div class="m">Base</div><div class="r"></div></div>',
                                '<div class="doctab"><div class="l"></div><div class="m">Grid</div><div class="r"></div></div>',
                                '<div class="doctab active"><div class="l"></div><div class="m">Ajax</div><div class="r"></div></div>',
                                '<div class="doctab"><div class="l"></div><div class="m">Panel</div><div class="r"></div></div>',
                                '<div class="doctab"><div class="l"></div><div class="m">ComboBox</div><div class="r"></div></div>',
                            '</div>'
                        ].join('')
                    }
                ]
            },
            {
                region: 'center',
                layout: 'border',
                minWidth: 800,
                padding: '4 3',
                items: [
                    {
                        region: 'west',
                        id: 'nested-west-region-container',
                        border: 1,
                        layout: 'fit',
                        bodyPadding: '14 9',
                        autoHeight: true,
                        items: [{
                            xtype: 'classtree',
                                padding: '5 10 0 10',
                                margin: '0 5 2 0',
                            width: 220,
                            root: Docs.classData
                                // dockedItems: [{
                                //     xtype: 'toolbar',
                                //     baseCls: null,
                                //     dock: 'top',
                                //     padding: '0 0 5 0',
                                //     items: [
                                //         {
                                //             xtype: 'button',
                                //             text: 'Sort by Package',
                                //             menu: [
                                //                 { text: 'by Category' },
                                //                 { text: 'by Hierarchy' },
                                //                 { text: 'by Popularity' }
                                //             ]
                                //         },
                                //         { xtype: 'tbfill'},
                                //         {
                                //             xtype: 'button',
                                //             iconCls: 'expandAllMembers',
                                //             tooltip: "Expand all"
                                //         }
                                //     ]
                                // }]
                            }
                        ]
                    }
                ]
                        }]
                    },
                    {
                        region: 'center',
                        id: 'center-container',
                        layout: 'fit',
                        minWidth: 800,
                padding: '20 20 5 0',
                        border: false,
                        padding: '5 10',
                        items: {
                            id: 'card-panel',
                            cls: 'card-panel',
                            xtype: 'container',
                            layout: 'card',
                    padding: '20',
                            items: [
                                {
                                    autoScroll: true,
@@ -151,14 +134,111 @@ Ext.define('Docs.view.Viewport', {
                            ]
                        }
                    },
            {
                region: 'south',
                id: 'footer',
                contentEl: 'footer-content',
                height: 15

                ]
            }
        ];

        // this.items = [
        //     {
        //         width: 240,
        //         id: 'west-region-container',
        //         padding: '5 0 0 0',
        //         layout: 'vbox',
        //         defaults: {
        //             xtype: 'container',
        //             width: "100%"
        //         },
        //         items: [
        //             {
        //                 cls: 'search',
        //                 id: 'search-container',
        //                 margin: '0 0 0 5',
        //                 height: 40,
        //                 items: [
        //                     {
        //                         xtype: 'triggerfield',
        //                         triggerCls: 'reset',
        //                         emptyText: 'Search',
        //                         id: 'search-field',
        //                         enableKeyEvents: true,
        //                         hideTrigger: true,
        //                         onTriggerClick: function() {
        //                             this.reset();
        //                             this.focus();
        //                             this.setHideTrigger(true);
        //                             Ext.getCmp('search-dropdown').hide();
        //                         }
        //                     },
        //                     {
        //                         xtype: 'searchdropdown'
        //                     }
        //                 ]
        //             },
        //             {
        //                 id: 'nested-west-region-container',
        //                 flex: 1,
        //                 layout: 'border',
        //                 border: false,
        //                 items: [
        //                     {
        //                         xtype: 'favoritespanel',
        //                         id: 'classes-tab-panel',
        //                         region: 'north',
        //                         height: Docs.Settings.get('favorites-height') || 150,
        //                         hidden: Docs.Favorites.getCount() === 0
        //                     },
        //                     {
        //                         region: 'center',
        //                         xtype: 'classtree',
        //                         padding: '5 10 0 10',
        //                         margin: '0 5 2 0',
        //                         root: Docs.classData
        //                     }
        //                 ]
        //             }
        //         ]
        //     },
        //     {
        //         region: 'center',
        //         id: 'center-container',
        //         layout: 'fit',
        //         minWidth: 800,
        //         padding: '20 20 5 0',
        //         items: {
        //             id: 'card-panel',
        //             cls: 'card-panel',
        //             xtype: 'container',
        //             layout: 'card',
        //             padding: '20',
        //             items: [
        //                 {
        //                     autoScroll: true,
        //                     xtype: 'indexcontainer'
        //                 },
        //                 {
        //                     xtype: 'classcontainer'
        //                 },
        //                 {
        //                     autoScroll: true,
        //                     xtype: 'container',
        //                     id: 'guide'
        //                 },
        //                 {
        //                     xtype: 'container',
        //                     id: 'failure'
        //                 }
        //             ]
        //         }
        //     },
        //     {
        //         region: 'south',
        //         id: 'footer',
        //         contentEl: 'footer-content',
        //         height: 15
        //     }
        // ];

        this.callParent(arguments);
    },

+2 −2
Original line number Diff line number Diff line
@@ -3,10 +3,10 @@
 */
Ext.define('Docs.view.cls.Header', {
    extend: 'Ext.container.Container',
    padding: '5 0 17 0',
    padding: '10 0 17 0',
    // Initially the component will be empty and so the initial height
    // will not be correct if not set explicitly
    height: 47,
    height: 50,
    alias: 'widget.classheader',

    initComponent: function() {
+21 −21
Original line number Diff line number Diff line
@@ -9,29 +9,29 @@ Ext.define('Docs.view.index.Container', {

    initComponent: function() {
        this.tpl = new Ext.XTemplate(
            '<h1 class="top">{title}</h1>',
            // '<h1 class="top">{title}</h1>',
            '<tpl if="notice">',
                '<div class="notice">{notice}</div>',
            '</tpl>',
            '<div class="section legend">',
                '<h4>Legend</h4>',
                '<ul>',
                    '<li class="icon icon-pkg">Package</li>',
                    '<li class="icon icon-class">Class</li>',
                    '<li class="icon icon-singleton">Singleton</li>',
                    '<li class="icon icon-component">Component</li>',
                    '<li class="icon icon-guide">Guide</li>',
                '</ul>',
            '</div>',
            '<tpl if="guides">',
                '<div class="section guides">',
                    '<h1>Guides</h1>',
                    '{guides}',
                    '<div class="examples">',
                        '<a href="../examples/index.html">View the examples &rarr;</a>',
                    '</div>',
                '</div>',
            '</tpl>',
            // '<div class="section legend">',
            //     '<h4>Legend</h4>',
            //     '<ul>',
            //         '<li class="icon icon-pkg">Package</li>',
            //         '<li class="icon icon-class">Class</li>',
            //         '<li class="icon icon-singleton">Singleton</li>',
            //         '<li class="icon icon-component">Component</li>',
            //         '<li class="icon icon-guide">Guide</li>',
            //     '</ul>',
            // '</div>',
            // '<tpl if="guides">',
            //     '<div class="section guides">',
            //         '<h1>Guides</h1>',
            //         '{guides}',
            //         '<div class="examples">',
            //             '<a href="../examples/index.html">View the examples &rarr;</a>',
            //         '</div>',
            //     '</div>',
            // '</tpl>',
            '{categories}'
        );
        this.data = this.extractData();
+1.21 KiB
Loading image diff...
Loading