OSDN Git Service

client is version 0.5.5, update around comic exproler.
authoritozyun <itozyun@gmail.com>
Sun, 5 Aug 2012 08:19:32 +0000 (17:19 +0900)
committeritozyun <itozyun@gmail.com>
Sun, 5 Aug 2012 08:19:32 +0000 (17:19 +0900)
33 files changed:
app/assets/javascripts/peta.apps.js
app/assets/javascripts/peta.common.js
app/assets/javascripts/system.js
app/assets/stylesheets/admins/sessions.css.scss [deleted file]
app/assets/stylesheets/artists.css.scss [deleted file]
app/assets/stylesheets/author_registrations.css.scss [deleted file]
app/assets/stylesheets/authors.css.scss [deleted file]
app/assets/stylesheets/authors/sessions.css.scss [deleted file]
app/assets/stylesheets/baloon_templates.css.scss [deleted file]
app/assets/stylesheets/baloon_types.css.scss [deleted file]
app/assets/stylesheets/baloons.css.scss [deleted file]
app/assets/stylesheets/comics.css.scss [deleted file]
app/assets/stylesheets/common_licenses.css.scss [deleted file]
app/assets/stylesheets/help.css.scss [deleted file]
app/assets/stylesheets/home.css.scss [deleted file]
app/assets/stylesheets/licenses.css.scss [deleted file]
app/assets/stylesheets/original_licenses.css.scss [deleted file]
app/assets/stylesheets/original_pictures.css.scss [deleted file]
app/assets/stylesheets/panels.css.scss [deleted file]
app/assets/stylesheets/peta.apps.css
app/assets/stylesheets/peta.common.css
app/assets/stylesheets/pictures.css.scss [deleted file]
app/assets/stylesheets/scaffolds.css.scss [deleted file]
app/assets/stylesheets/site.css
app/assets/stylesheets/source_pictures.css.scss [deleted file]
app/assets/stylesheets/speech_baloons.css.scss [deleted file]
app/assets/stylesheets/speech_templates.css.scss [deleted file]
app/assets/stylesheets/speechbaloons.css.scss [deleted file]
app/assets/stylesheets/speeches.css.scss [deleted file]
app/assets/stylesheets/system.css
app/assets/stylesheets/system.css.scss [deleted file]
app/assets/stylesheets/system_pictures.css.scss [deleted file]
config/environments/development.rb

index acf5646..304fbf6 100644 (file)
@@ -1,6 +1,6 @@
 /*
- * pettanR system.js
- *   version 0.4.37
+ * pettanR peta.apps.js
+ *   version 0.5.5
  *   
  * author:
  *   itozyun
@@ -87,7 +87,7 @@
                                                _rule,
                                                _Math_pow = Math.pow,
                                                _bits = 0;
-                                       if( typeof _license === 'object'){
+                                       if( typeof _license === 'object' ){
                                                for( i=0, l=BASIC_LICENSES.length; i<l; ++i ){
                                                        _rule = _license[ BASIC_LICENSES[ i]];
                                                        if( typeof _rule === 'number' && _rule === 1 ){
                                } else
                                // Comic + Panels
                                if( _parent.type === FILE_TYPE.COMIC || _parent === FILE_DATA_COMICS_ROOT ){
-                                       var _panels = _data.panels,
+                                       var _panels = _data.stories,
                                                _panel;
                                        if( _panels && Type.isArray( _panels ) === true ){
                                                
-                                               for( i=0, l=_panels.length; i<l; ++i){
+                                               for( i=0, l=_panels.length; i<l; ++i ){
                                                        _panel = buildFileData( _panels[ i ], FILE_DATA_PANELS_ROOT );
                                                        /*
                                                         * 間違い! t 順に格納
                                                         */
                                                        addChildData( _data, _panel );
                                                };
-                                               delete _data.panels;
+                                               delete _data.stories;
                                        } else {
                                                if( _data.json !== null ){
                                                        _data.json = true;
                                        if( pettanr.CONST.SERVER_SUPPORT === false ){
                                                _json = [ 'json\/comics_', _data.id, '.json' ].join( '' );
                                        } else {
-                                               _json = [ pettanr.CONST.PETTANR_ROOT_PATH, 'comics\/', _data.id, '.json\/play\/' ].join( '' );
-                                       }
-                               }
+                                               _json = [ pettanr.CONST.PETTANR_ROOT_PATH, 'comics\/', _data.id, '.json' ].join( '' );
+                                       };
+                               };
                                if( typeof _json === 'string' ){
                                        FileAPI.getJson( _file, _json, onLoadJson, onErrorJson );
                                        _data.state = Const.FILE.STATE.LOADING;
                                        _data.json  = null;
                                        return;
-                               }
+                               };
                        };
                        this.getName = function( _file ){
                                var _data = FileAPI.getFileData( _file ),
                                        for( var key in _data ){
                                                ret[ key ] = _data[ key ]
                                        }
-                                       ret.panels = _data.children;
+                                       ret.stories = _data.children;
                                        return ret;
                                }
                                if( _type === FILE_TYPE.PANEL ){
 var Cabinet = gOS.registerApplication( function(){
        var self         = this,
                finder       = null,
-               tree         = null;
+               tree         = null,
+               headerH      = 0;
 
        this.bgColor     = '#FFFFFF';
        this.MIN_WIDTH   = 500;
        this.MIN_HEIGHT  = 300;
        this.onInit = function(){
                self.rootElement.id = 'cabinet-root';
-               self.rootElement.innerHTML = '<div id="cabinet-container" class="finder-container"></div>';
+               self.rootElement.innerHTML = [
+                       '<div id="cabinet-header">Cabinet<div id="cabinet-close-button">x</div></div>',
+                       '<div id="cabinet-container" class="finder-container"></div>'
+               ].join( '' );
                
                self.fetchCSS( '/assets/peta.apps.css' );
                
@@ -484,6 +488,10 @@ var Cabinet = gOS.registerApplication( function(){
                delete self.onInit;
        };
        this.onOpen = function( _w, _h ){
+               headerH = Util.getElementSize( document.getElementById( 'cabinet-header' ) ).height;
+               
+               self.addMouseEventListener( document.getElementById( 'cabinet-close-button' ), 'click', Cabinet.shutdown );
+               
                finder = self.createFinder( self.rootElement, tree );
                self.onPaneResize( _w, _h );
        };
@@ -493,21 +501,25 @@ var Cabinet = gOS.registerApplication( function(){
                finder = tree = null;
        };
        this.onPaneResize = function( _w, _h ){
-               finder.resize( _w, _h );
+               finder.resize( _w, _h - headerH );
        };
 }, false, true, 'Cabinet', 'cabinet', null, '#1C1C1C' );
 
 var Gallery = gOS.registerApplication( function(){
        var self         = this,
                finder       = null,
-               tree         = null;
+               tree         = null,
+               headerH      = 0;
 
        this.bgColor     = '#FFFFFF';
        this.MIN_WIDTH   = 500;
        this.MIN_HEIGHT  = 300;
        this.onInit = function(){
                self.rootElement.id        = 'gallery-root';
-               self.rootElement.innerHTML = '<div id="gallery-container" class="finder-container"></div>';
+               self.rootElement.innerHTML = [
+                       '<div id="gallery-header">Cabinet<div id="gallery-close-button">x</div></div>',
+                       '<div id="gallery-container" class="finder-container"></div>'
+               ].join( '' );
                
                self.fetchCSS( '/assets/peta.apps.css' );
                
@@ -521,6 +533,10 @@ var Gallery = gOS.registerApplication( function(){
                _pic.destroy();
        };
        this.onOpen = function( _w, _h ){
+               headerH = Util.getElementSize( document.getElementById( 'gallery-header' ) ).height;
+               
+               self.addMouseEventListener( document.getElementById( 'gallery-close-button' ), 'click', Gallery.shutdown );
+               
                finder = self.createFinder( self.rootElement, tree );
                self.onPaneResize( _w, _h );
        };
@@ -530,7 +546,7 @@ var Gallery = gOS.registerApplication( function(){
                finder = tree = null;
        };
        this.onPaneResize = function( _w, _h ){
-               finder.resize( _w, _h );
+               finder.resize( _w, _h - headerH );
        };
 }, false, true, 'Gallery', 'gallery', null, '#01A31C' );
 
@@ -1018,7 +1034,6 @@ var Reader = gOS.registerApplication( function(){
                } else {
                        
                };
-
                if( comicData !== null ){
                        elmTitle.data  = title;
                        elmAuthor.data = author;
@@ -1596,17 +1611,17 @@ var Editor = gOS.registerApplication( function(){
                                y = _y;
                                w = _w;
                                h = _h;
-                       }
+                       };
                        function bodyBackOrForward( isBack ){
-                               if( !self) return;
-                               if( bodyIsTachable === !isBack) return;
+                               if( !self ) return;
+                               if( bodyIsTachable === !isBack ) return;
                                elmBodyStyle.position = isBack === true ? 'relative' : 'absolute';
                                elmBodyStyle.left =             isBack === true ? 0  : x +'px';
-                               elmBodyStyle.top =              isBack === true ? 0  : y +headerH +'px';
-                               elmBodyStyle.width =    isBack === true ? '' : ( w -WINDOW_BODY_BODER_SIZE *2) +'px';
+                               elmBodyStyle.top =              isBack === true ? 0  : y + headerH + 'px';
+                               elmBodyStyle.width =    isBack === true ? '' : ( w - WINDOW_BODY_BODER_SIZE * 2 ) + 'px';
                                bodyIsTachable === isBack && isBack === true ? elmHeader.parentNode.insertBefore( elmBody, elmHeader.nextSibling ) : app.rootElement.appendChild( elmBody );
                                bodyIsTachable = !isBack;
-                       }
+                       };
 
                        this.init = function(){
                                self.elm      = elmWindowOrigin.cloneNode( true );
@@ -1683,7 +1698,7 @@ var Editor = gOS.registerApplication( function(){
                        };
                        this.onFadeOut = function(){
                                self.elm.parentNode.removeChild( self.elm );
-                               self.onClose && setTimeout( self.onClose, 0 );
+                               self.onClose &&  app.addAsyncCall( self.onClose );
                        };
                        this.close = function(){
                                if( visible === false) return;
@@ -1876,21 +1891,21 @@ var Editor = gOS.registerApplication( function(){
                function addImage(){
                        IMAGE_EXPLORER_WINDOW.open();// setTimeout( IMAGE_EXPLORER_WINDOW.open, 0);
                        TOOL_BOX_WINDOW.bodyBackOrForward( true );
-               }
+               };
                function addText(){
-                       setTimeout( PANEL_ELEMENT_CONTROL.createTextElement, 0 );
-               }
+                       app.addAsyncCall( PANEL_ELEMENT_CONTROL.createTextElement );
+               };
                function switchGrid(){
-                       setTimeout( GRID_CONTROL.update, 0 );
-               }
+                       app.addAsyncCall( GRID_CONTROL.update );
+               };
                function popupHelp(){
                        TOOL_BOX_WINDOW.bodyBackOrForward( true );
-                       setTimeout( HELP_DOCUMENTS_WINDOW.open, 0 );
-               }
+                       app.addAsyncCall( HELP_DOCUMENTS_WINDOW.open );
+               };
                function editBG( e ){
                        TOOL_BOX_WINDOW.bodyBackOrForward( true );
-                       setTimeout( INFOMATION_WINDOW.open, 0 );
-               }
+                       app.addAsyncCall( INFOMATION_WINDOW.open );
+               };
                
                return WINDOWS_CONTROL.createWindow(
                        {
@@ -2149,17 +2164,17 @@ var Editor = gOS.registerApplication( function(){
                        jqAjaxContents.removeClass( 'loading' ).append( elmNavi, elmPages );
                        
                        jqNaviItems = jqAjaxContents.find( 'a.' + elmItemOrigin.className ).click( onNaviClick );
-                       jqPages = jqAjaxContents.find( '.page-content' );
+                       jqPages     = jqAjaxContents.find( '.page-content' );
                        jqPages.find( 'a' ).click( onInnerLinkClick );
                        
-                       setTimeout( jumpPage, 0 );
+                       app.addAsyncCall( jumpPage );
                }
                function onSelectionClick( _pageIndex ){
                        HELP_DOCUMENTS_WINDOW.open();
                        jumpPage( _pageIndex );
                }
                function jumpPage( _index ){
-                       if( typeof _index === 'number' && 0 <= _index && _index < numPage && currentPageIndex !== _index ){
+                       if( Type.isNumber( _index ) === true && 0 <= _index && _index < numPage && currentPageIndex !== _index ){
                                currentPageIndex = _index;
                        }
                        jqNaviItems.removeClass( 'current' ).eq( currentPageIndex).addClass( 'current' );
@@ -2182,7 +2197,7 @@ var Editor = gOS.registerApplication( function(){
                                onInit: function(){
                                        help           = MENU_BAR_CONTROL.HELP;
                                        onLoadFunction = help.createAjaxSelection( onAjaxStart );
-                                       jqAjaxContents = $( HELP_DOCUMENTS_WINDOW.elm ).find( '.window-body' ).addClass( 'loading' );
+                                       jqAjaxContents = $( HELP_DOCUMENTS_WINDOW.elm ).find( '.window-body' ).addClass( 'loading' ).css( { overflow: 'auto' } );
                                        delete HELP_DOCUMENTS_WINDOW.onInit;
                                },
                                onFirstOpen: function( _w, _h ){
@@ -4099,7 +4114,7 @@ var ComicConsole = gOS.registerApplication( function(){
        var elmHeader, elmProgress,
                winW, winH,
                inputTitle, inputW, inputH,
-               comboboxVisible, comboboxEditable,
+               comboboxVisible, // comboboxEditable,
                buttonSubmit, buttonCancel,
                elmUploader = null,
                elmScript   = null,
@@ -4143,7 +4158,7 @@ var ComicConsole = gOS.registerApplication( function(){
                                        _select.selectedIndex = comboboxVisible.selectIndex();
                                } else
                                if( _name === 'comic[editable]'){
-                                       _select.selectedIndex = comboboxEditable.selectIndex();
+                                       // _select.selectedIndex = comboboxEditable.selectIndex();
                                };
                        };
                        try {
@@ -4173,6 +4188,12 @@ var ComicConsole = gOS.registerApplication( function(){
                        };
                                function onIframeUpdate(){
                                        elmIframe.onload = null;
+                                       try {
+                                               console.log( ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).document.body.innerHTML );
+                                       } catch(e){
+                                               
+                                       }
+                                       
                                        ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).close();
                                        elmIframe = null;
                                        elmProgress.innerHTML = 'success!';
@@ -4200,7 +4221,7 @@ var ComicConsole = gOS.registerApplication( function(){
                                                comboboxVisible.createOption( option.innerHTML, option.value, option.selected );
                                        } else
                                        if( select.name === 'comic[editable]' ){
-                                               comboboxEditable.createOption( option.innerHTML, option.value, option.selected );
+                                               // comboboxEditable.createOption( option.innerHTML, option.value, option.selected );
                                        };
                                };
                        };
@@ -4245,10 +4266,10 @@ var ComicConsole = gOS.registerApplication( function(){
                                        '<span class="field-label">Visible:</span>',
                                        '<span id="comic-console-visible-value" class="comic-console-value combobox"></span>',
                                '</div>',
-                               '<div id="comic-console-editable" class="field">',
-                                       '<span class="field-label">Editable:</span>',
-                                       '<span id="comic-console-editable-value" class="comic-console-value combobox"></span>',
-                               '</div>',
+                               //'<div id="comic-console-editable" class="field">',
+                               //      '<span class="field-label">Editable:</span>',
+                               //      '<span id="comic-console-editable-value" class="comic-console-value combobox"></span>',
+                               //'</div>',
                                '<div class="console-button-container">',
                                        '<div id="comic-console-post-button" class="button console-submit-button">create</div>',
                                        '<div id="comic-console-cancel-button" class="button console-cancel-button">cancel</div>',
@@ -4268,7 +4289,7 @@ var ComicConsole = gOS.registerApplication( function(){
                inputW           = ui.createInputText( document.getElementById( 'comic-console-width') );
                inputH           = ui.createInputText( document.getElementById( 'comic-console-height') );
                comboboxVisible  = ui.createCombobox( document.getElementById( 'comic-console-visible') );
-               comboboxEditable = ui.createCombobox( document.getElementById( 'comic-console-editable') );
+               // comboboxEditable = ui.createCombobox( document.getElementById( 'comic-console-editable') );
                buttonSubmit     = ui.createButton( document.getElementById( 'comic-console-post-button'), clickOK );
                buttonCancel     = ui.createButton( document.getElementById( 'comic-console-cancel-button'), clickCancel );
                
@@ -4503,6 +4524,11 @@ var PanelConsole = gOS.registerApplication( function(){
                    };
                        };
                                function onLoad(){
+                                       try {
+                                               console.log( ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).document.body.innerHTML );
+                                       } catch(e){
+                                               
+                                       }
                                        elmIframe.onload = null;
                                        ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).close();
                                        elmProgress.innerHTML = 'success!';
@@ -5024,10 +5050,10 @@ var OutputConsole = gOS.registerApplication( function(){
                elmOutputArea = document.getElementById( 'output-area' );
                
                var ui = instance.createUIGroup();
-               comboboxFormat = ui.createCombobox( document.getElementById( 'output-console-format' ) );
+               comboboxFormat = ui.createCombobox( document.getElementById( 'output-console-format' ), clickGenerate );
                
                for( var i=0; FORMAT_LIST[ 0 ]; ++i ){
-                       comboboxFormat.createOption( FORMAT_LIST.pop(), null, i === 0 );
+                       comboboxFormat.createOption( FORMAT_LIST.shift(), null, i === 0 );
                };
                inputOption    = ui.createInputText( document.getElementById( 'output-console-option' ), null );
                buttonGenerate = ui.createButton( document.getElementById( 'output-console-generate-button' ), clickGenerate );
index 9bc5f04..dc9217b 100644 (file)
@@ -1,8 +1,11 @@
 /*\r
- * pettanR common.js\r
- *   version 0.4.37\r
+ * pettanR peta.common.js\r
+ *   version 0.5.4\r
  * \r
- * author: itozyun\r
+ *   author:\r
+ *     itozyun\r
+ *   licence:\r
+ *     3-clause BSD\r
  */\r
 \r
 var pettanr = ( function(){\r
@@ -37,7 +40,7 @@ var pettanr = ( function(){
                })(),\r
                IS_DEBUG = Type.isBoolean( URL_PARAMS.debug ) ? URL_PARAMS.debug : IS_LOCAL === true;\r
        return {\r
-               version: '0.5.0',\r
+               version: '0.5.5',\r
                URL_PARAMS: URL_PARAMS,\r
                LOCAL: IS_LOCAL,\r
                DEBUG: IS_DEBUG,\r
@@ -686,6 +689,8 @@ pettanr.bind = ( function(){
                                _comicElements = json.panel_elements || [],\r
                                _comicElement, _elmImg, _rImg, _rPic,\r
                                _balloon, _elmBalloonWrap, _elmText, _text, _speechesAttributes, _key;\r
+                       elmTarget.appendChild( _elmPanel );\r
+                       \r
                        if( noClassnameMode === true ){\r
                                \r
                        } else {\r
@@ -694,8 +699,7 @@ pettanr.bind = ( function(){
                        for( var _key in _style ){\r
                                _cssText.push( _key + ':' + _style[ _key ] );\r
                        }\r
-                       _elmPanel.style.cssText = _cssText.join( ';');\r
-                       elmTarget.appendChild( _elmPanel );\r
+                       _elmPanel.style.cssText = _cssText.join( ';' );\r
                        \r
                        for( var i=0, l=_comicElements.length; i<l; ++i ){\r
                                _comicElement = _comicElements[ i ];\r
@@ -770,19 +774,19 @@ pettanr.bind = ( function(){
                        clean();\r
                        \r
                        // json is Comic ? Panel ?\r
-                       var panels = json.panels;\r
+                       var panels = json.stories;\r
                        if( Type.isArray( panels ) === true ){\r
                                // comic\r
                                for( var i=0, l=panels.length; i<l; ++i ){\r
                                        buildPanelElement( panels[ i ], zoom );\r
-                               }\r
+                               };\r
                        } else\r
                        if( json.panel_elements ){\r
                                // panel\r
                                buildPanelElement( json, zoom );\r
                        } else {\r
                                // invalid json\r
-                       }\r
+                       };\r
                }\r
                this.zoom = function(){\r
                        \r
index 6be3255..9799331 100644 (file)
@@ -1,4 +1,23 @@
 /*\r
+ * pettanR system.js\r
+ *   version 0.5.5\r
+ * \r
+ * \r
+ * Type\r
+ * \r
+ * Util\r
+ * \r
+ * UA\r
+ * \r
+ * gadgetOS\r
+ *   author:\r
+ *     itozyun\r
+ *   licence:\r
+ *     3-clause BSD\r
+ */\r
+\r
+\r
+/*\r
  * http://pettanr.sourceforge.jp/test/type.html\r
  */\r
        var Type = {\r
@@ -1641,7 +1660,8 @@ var AbstractApplication = function( displayName, appClass, isOverlay ){
        var self          = null, // init で設定\r
                uiList        = [],\r
                finderList    = [],\r
-               fetchResource = false,\r
+               fetchResource = 0,\r
+               bootParams    = null,\r
                phase         = 0;\r
        this.rootElement = document.createElement( 'div' );\r
        this.bgColor     = '#C1CACF';\r
@@ -1656,19 +1676,37 @@ var AbstractApplication = function( displayName, appClass, isOverlay ){
        };\r
        this.open = function( _w, _h /*, _option */ ){\r
                phase = 3;\r
-               if( self.MIN_WIDTH > _w || self.MIN_HEIGHT > _h ){\r
-                       if( Type.isHTMLElement( self.rootElement ) === true ){\r
-                               // 小さすぎる!、と表示\r
-                       }\r
-               }\r
-               if( arguments.length > 2 ){\r
-                       self.onOpen.apply( self, arguments );\r
+               bootParams = Util.copyArray( arguments );\r
+               \r
+               if( this.rootElement.innerHTML && this.rootElement.innerHTML.length > 0 ){\r
+                       SystemTimer.add( self, detect, 16 );\r
                } else {\r
-                       self.onOpen( _w, _h );\r
+                       onOpen();\r
                }\r
-               phase = 4;\r
+               \r
+               function detect(){\r
+                       if( self.rootElement.firstChild && fetchResource === 0 ){\r
+                               SystemTimer.remove( self, detect );\r
+                               onOpen();\r
+                       };\r
+               };\r
+               \r
+               function onOpen(){\r
+                       if( self.MIN_WIDTH > _w || self.MIN_HEIGHT > _h ){\r
+                               if( Type.isHTMLElement( self.rootElement ) === true ){\r
+                                       // 小さすぎる!、と表示\r
+                               }\r
+                       }\r
+                       if( bootParams.length > 2 ){\r
+                               self.onOpen.apply( self, bootParams );\r
+                       } else {\r
+                               self.onOpen( _w, _h );\r
+                       }\r
+                       phase = 4;                      \r
+               };\r
        };\r
        this.resize = function( _w, _h ){\r
+               if( phase !== 4 ) return;\r
                if( self.MIN_WIDTH > _w || self.MIN_HEIGHT > _h ){\r
                        if( Type.isHTMLElement( self.rootElement ) === true ){\r
                                // 小さすぎる!、と表示\r
@@ -1721,12 +1759,13 @@ var AbstractApplication = function( displayName, appClass, isOverlay ){
        };\r
        this.fetchCSS = function( _url, opt_onload, opt_onerror ){\r
                if( phase === 1 ){\r
-                       Css.load( self, _url, fetchResourceComplete );\r
+                       ++fetchResource;\r
+                       Css.load( self, _url, fetchResourceComplete, fetchResourceComplete );\r
                };\r
        };\r
        \r
        function fetchResourceComplete(){\r
-               alert( phase );\r
+               --fetchResource;\r
        };\r
 };\r
 \r
@@ -2124,7 +2163,7 @@ var Application = ( function(){
                                        delete this.handler;\r
                                        delete this.destroy;\r
                                };\r
-                       }\r
+                       };\r
                } else {\r
                        wrappedEventClass = function( e, element ){\r
                                this._event        = e;\r
@@ -2147,13 +2186,13 @@ var Application = ( function(){
                                this.wheelDelta    = e.wheelDelta;\r
                                \r
                                e = element = null;\r
-                       }\r
+                       };\r
                        wrappedEventClass.prototype.stopPropagation = function(){\r
                                this._event.cancelBubble = true;\r
-                       }\r
+                       };\r
                        wrappedEventClass.prototype.preventDefault  = function(){\r
                                this._event.returnValue = false;\r
-                       }\r
+                       };\r
 \r
                        if( doc.attachEvent ){\r
                                wrappedHandlerClass = function( element, handler ){\r
@@ -2191,6 +2230,9 @@ var Application = ( function(){
                                        this.element[ 'on' + this.eventType ] = function( e ){\r
                                                return self.fire( self, e );\r
                                        };\r
+                                       this.clean = function(){\r
+                                               self = null;\r
+                                       };\r
                                        _ticket = null;\r
                                };\r
                                tmp.ticketClass.prototype = {\r
@@ -2222,11 +2264,13 @@ var Application = ( function(){
                                                return true;\r
                                        },\r
                                        destroy: function(){\r
+                                               this.clean();\r
                                                this.element[ 'on' + this.eventType ] = '';\r
                                                tmp.list.splice( Util.getIndex( tmp.list, this ), 1 );\r
                                                delete this.element;\r
                                                delete this.eventType;\r
                                                delete this.handlers;\r
+                                               delete this.clean;\r
                                        }\r
                                };\r
                        };\r
@@ -2860,18 +2904,26 @@ var KeyEvent = ( function(){
        }\r
 })();\r
 \r
+/**\r
+ * \r
+ * http://thudjs.tumblr.com/post/637855087/stylesheet-onload-or-lack-thereof
+ */\r
+\r
 var Css = ( function(){\r
        var head = doc.getElementsByTagName( 'head' )[ 0 ];\r
        \r
        var TICKET_LIST = [];\r
        var STATE_LIST  = 'loaded,complete,uninitialized'.split( ',' );\r
        \r
+       var cssRules, sheet;\r
+       \r
        var FetchCssTicketClass = function( _apiuser, _url, _elm, _onload, _onerror ){\r
                this.apiusers = [ _apiuser ];\r
                this.url      = _url;\r
                this.elm      = _elm;\r
                this.onload   = [ _onload ];\r
                this.onerror  = [ _onerror ];\r
+               this.time     = 0;\r
        };\r
        FetchCssTicketClass.prototype = {\r
                match: function( _apiuser, _url ){\r
@@ -2899,9 +2951,32 @@ var Css = ( function(){
                        delete this.elm;\r
                        delete this.onload;\r
                        delete this.onerror;\r
+                       delete this.time;\r
                        \r
                        return true;\r
                },\r
+               loaded: function(){\r
+               for( var i = this.onload.length, f; i; ){\r
+                       f = this.onload[ --i ];\r
+                       Type.isFunction( f ) === true && AsyncCall.add( this.apiusers[ i ], f, this.url );\r
+                       this.onload[ i ] = this.onerror[ i ] = null;\r
+               };\r
+               },\r
+               error: function(){\r
+               for( var i = this.onerror.length, c; i; ){\r
+                       c = this.onerror[ --i ];\r
+                       Type.isFunction( c ) === true && AsyncCall.add( t.apiusers[ i ], c, t.url );\r
+                       this.onload[ i ] = this.onerror[ i ] = null;\r
+               };\r
+               },\r
+               check: function(){\r
+                       var el = this.elm;\r
+                       try {\r
+                               return el[ sheet ] && el[ sheet ][ cssRules ].length > 0;\r
+                       } catch( e ){\r
+                               return false;\r
+                       };\r
+               },\r
                done: false\r
        };\r
        \r
@@ -2914,17 +2989,33 @@ var Css = ( function(){
        \r
        function detect(){\r
                var t = getTicket( this ), rs = this.readyState, c;\r
-               if( t && t.done === false && ( !rs ||  Util.getIndex( STATE_LIST, rs ) !== -1 ) ){\r
+               if( t && t.done === false && ( !rs || Util.getIndex( STATE_LIST, rs ) !== -1 ) ){\r
                        t.done = true;\r
-               for( var i = t.onload.length; i; ){\r
-                       c = t.onload[ --i ];\r
-                       Type.isFunction( c ) === true && AsyncCall.add( t.apiusers[ i ], c, t.url );\r
-               };\r
+               t.loaded();\r
                this.onreadystatechange = new Function();\r
                this.onload = null;\r
                };\r
        };\r
        \r
+       function checkTimer(){\r
+               var l = TICKET_LIST.length,\r
+                       n = 0;\r
+               for( var i = 0; i < l; ++i ){\r
+                       t = TICKET_LIST[ i ];\r
+                       ++t.time;\r
+                       if( t.check() === true ){\r
+                               t.loaded();\r
+                               ++n;\r
+                       } else\r
+                       if( t.time > 99 ){\r
+                               t.error();\r
+                       } else {\r
+                               \r
+                       };\r
+               };\r
+               l === n && SystemTimer.remove( SUPER_USER_KEY, checkTimer );\r
+       };\r
+       \r
        return {\r
                load: function( _apiuser, _url, opt_onload, opt_onerror ){\r
                        _url = Util.getAbsolutePath( _url );\r
@@ -2937,6 +3028,7 @@ var Css = ( function(){
                                                t.onload.push( opt_onload );\r
                                                t.onerror.push( opt_onerror );\r
                                        };\r
+                                       SystemTimer.add( SUPER_USER_KEY, checkTimer, 333 );\r
                                        return;\r
                                };\r
                        };\r
@@ -2947,7 +3039,18 @@ var Css = ( function(){
                        elm.onreadystatechange = elm.onload = detect;\r
                        elm.href = _url;\r
                        \r
+                       if( !sheet ){ // only assign these once\r
+                               cssRules = 'cssRules';\r
+                               sheet    = 'sheet';\r
+                               if ( !( sheet in elm ) ) { // MSIE uses non-standard property names\r
+                                       cssRules = 'rules';\r
+                                       sheet    = 'styleSheet';\r
+                               };\r
+                       };\r
+                       \r
                        TICKET_LIST.push( new FetchCssTicketClass( _apiuser, _url, elm, opt_onload, opt_onerror ) );\r
+                       \r
+                       SystemTimer.add( SUPER_USER_KEY, checkTimer, 333 );\r
                },\r
                unload: function( _apiuser, _url ){\r
                        _url = _url ? Util.getAbsolutePath( _url ) : null;\r
@@ -2959,6 +3062,9 @@ var Css = ( function(){
                                        ++i;\r
                                }\r
                        };\r
+                       if( TICKET_LIST.length === 0 ){\r
+                               SystemTimer.remove( SUPER_USER_KEY, checkTimer );\r
+                       }\r
                }\r
        }\r
 })();\r
@@ -3317,7 +3423,8 @@ var UI = ( function(){
                                                elmValue.data = _option.displayValue;\r
                                                if( focus === true ){\r
                                                        OptionControl.update( instance, _value );\r
-                                               }\r
+                                               };\r
+                                               Type.isFunction( onUpdate ) === true && onUpdate( _value );\r
                                                break;\r
                                        }\r
                                }\r
@@ -3466,9 +3573,9 @@ var UI = ( function(){
                                currentCombobox = _combobox;\r
                                elm             = _combobox.elm;\r
                                \r
-                               for( var i = _optionList.length; i; ){\r
-                                       OPTION_LIST.unshift( new OptionClass( _apiuser, _optionList[ --i ] ) );\r
-                               }\r
+                               for( var i = 0, l = _optionList.length; i<l; ++i ){\r
+                                       OPTION_LIST.unshift( new OptionClass( _apiuser, _optionList[ i ] ) );\r
+                               };\r
                                MouseEvent.add( SUPER_USER_KEY, doc, 'mouseup', bodyMouseupHandler );\r
                                KeyEvent.add( SUPER_USER_KEY, Const.KEY.EVENT.KEY_DOWN, change, 38 );\r
                                KeyEvent.add( SUPER_USER_KEY, Const.KEY.EVENT.KEY_DOWN, change, 40 );\r
@@ -3852,7 +3959,7 @@ var Finder = ( function(){
                        elmContainer.removeChild( ELM_WRAPPER );\r
                        file && file.destroy();\r
                        file = elmContainer = onDownCallback = onEditorCallback = onViewerCallback = onActionCallback = viewerList = editorList = null;\r
-                       FINDER_ICON_POOL.push( instansce);\r
+                       FINDER_ICON_POOL.push( instansce );\r
                };\r
        }\r
        function updateIconPosition( _style, _w, _index, _elm ){\r
@@ -3928,7 +4035,7 @@ var Finder = ( function(){
                        iconH            = size.height,\r
                        style            = 0,\r
                        w, h, bodyH,\r
-                       instance = this;\r
+                       instance         = this;\r
                        \r
                tree.addTreeEventListener( Const.TREE.EVENT.UPDATE, draw );\r
                elmRoot.appendChild( elmContainer );\r
@@ -3975,8 +4082,8 @@ var Finder = ( function(){
                        };\r
                };\r
                \r
-               function onHeadClick( i){\r
-                       var l = BREAD_ARRAY.length -1;\r
+               function onHeadClick( i ){\r
+                       var l = BREAD_ARRAY.length - 1;\r
                        if( i < l){\r
                                var _file = tree.getParentFileAt( i);\r
                                if( _file !== null){\r
@@ -3992,7 +4099,7 @@ var Finder = ( function(){
                                        tree.down( i );\r
                                        draw( w, h );\r
                                } else {\r
-                                       Type.isFunction( onSelect ) === true && onSelect( _file  );\r
+                                       Type.isFunction( onSelect ) === true && onSelect( _file );\r
                                };\r
                                _file.destroy();\r
                        };\r
@@ -4021,33 +4128,35 @@ var Finder = ( function(){
                        h = _h;\r
                        elmBody.style.height = ( _h - headH ) + 'px';\r
                        \r
-                       for( var i=0, l=ICON_ARRAY.length; i<l; ++i ){\r
-                               ICON_ARRAY[ i].onResize( _w );\r
-                       }\r
+                       for( var i = ICON_ARRAY.length; i; ){\r
+                               ICON_ARRAY[ --i ].onResize( _w );\r
+                       };\r
                };\r
                this.destroy = function(){\r
                        tree.removeTreeEventListener( Const.TREE.EVENT.UPDATE, draw );\r
                        \r
                        while( BREAD_ARRAY.length > 0 ){\r
                                BREAD_ARRAY.shift().destroy();\r
-                       }\r
+                       };\r
                        while( ICON_ARRAY.length > 0 ){\r
                                ICON_ARRAY.shift().destroy();\r
-                       }\r
+                       };\r
+                       \r
+                       FINDER_ARRAY.splice( Util.getIndex( FINDER_ARRAY, instance ), 1 );\r
                };\r
        };\r
        FinderClass.prototype = new AbstractBasicPane();\r
        \r
-       function getFinderIcon( _file, _elmContainer, w, index, style, onDown, onEditor, onViwer, onAction){\r
+       function getFinderIcon( _file, _elmContainer, w, index, style, onDown, onEditor, onViwer, onAction ){\r
                var _icon;\r
                if( FINDER_ICON_POOL.length > 0){\r
                        _icon = FINDER_ICON_POOL.shift();\r
                } else {\r
                        _icon = new FinderIconClass();\r
-               }\r
+               };\r
                _icon.init( _file, _elmContainer, w, index, style, onDown, onEditor, onViwer, onAction );\r
                return _icon;\r
-       }\r
+       };\r
        \r
        function getBreadcrumb( _file, _elmContainer, index, callback ){\r
                var _bread;\r
@@ -4055,10 +4164,10 @@ var Finder = ( function(){
                        _bread = BREAD_OBJECT_POOL.shift();\r
                } else {\r
                        _bread = new BreadcrumbClass();\r
-               }\r
+               };\r
                _bread.init( _file, _elmContainer, index, callback );\r
                return _bread;\r
-       }\r
+       };\r
 \r
        return {\r
                init: function(){\r
@@ -4086,7 +4195,7 @@ var Finder = ( function(){
                },\r
                isFinderHeadInstance: function(){\r
                }\r
-       }\r
+       };\r
 })();\r
 \r
 \r
diff --git a/app/assets/stylesheets/admins/sessions.css.scss b/app/assets/stylesheets/admins/sessions.css.scss
deleted file mode 100644 (file)
index c6bbc18..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the admins/sessions controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/artists.css.scss b/app/assets/stylesheets/artists.css.scss
deleted file mode 100644 (file)
index cf63878..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the artists controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/author_registrations.css.scss b/app/assets/stylesheets/author_registrations.css.scss
deleted file mode 100644 (file)
index a97efb9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the author_registrations controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/authors.css.scss b/app/assets/stylesheets/authors.css.scss
deleted file mode 100644 (file)
index fb565e9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the authors controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/authors/sessions.css.scss b/app/assets/stylesheets/authors/sessions.css.scss
deleted file mode 100644 (file)
index 244137d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the authors/sessions controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/baloon_templates.css.scss b/app/assets/stylesheets/baloon_templates.css.scss
deleted file mode 100644 (file)
index 06e9b14..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the baloon_templates controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/baloon_types.css.scss b/app/assets/stylesheets/baloon_types.css.scss
deleted file mode 100644 (file)
index ca4b2f3..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the baloon_types controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/baloons.css.scss b/app/assets/stylesheets/baloons.css.scss
deleted file mode 100644 (file)
index 67e17d0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the baloons controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/comics.css.scss b/app/assets/stylesheets/comics.css.scss
deleted file mode 100644 (file)
index 6ef66b0..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the comics controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/common_licenses.css.scss b/app/assets/stylesheets/common_licenses.css.scss
deleted file mode 100644 (file)
index 3d954b1..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the common_lisences controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/help.css.scss b/app/assets/stylesheets/help.css.scss
deleted file mode 100644 (file)
index a2342cb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the help controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/home.css.scss b/app/assets/stylesheets/home.css.scss
deleted file mode 100644 (file)
index f0ddc68..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the home controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/licenses.css.scss b/app/assets/stylesheets/licenses.css.scss
deleted file mode 100644 (file)
index ea7f80b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the lisences controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/original_licenses.css.scss b/app/assets/stylesheets/original_licenses.css.scss
deleted file mode 100644 (file)
index f9474df..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the original_lisences controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/original_pictures.css.scss b/app/assets/stylesheets/original_pictures.css.scss
deleted file mode 100644 (file)
index 48be6db..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the original_pictures controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/panels.css.scss b/app/assets/stylesheets/panels.css.scss
deleted file mode 100644 (file)
index 9d1f3f6..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the panels controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
index fc4de97..31c9fbc 100644 (file)
@@ -1,13 +1,12 @@
 @charset "UTF-8";\r
 \r
-/*\r
- * pettanR\r
+/* pettanR peta.apps.css\r
+ *   version 0.5.5\r
  * \r
- *   work.css\r
- * \r
- *   version 0.4.35\r
- *\r
+ *   author:\r
+ *     itozyun\r
  */\r
+\r
        html, body {\r
                overflow:                               hidden;\r
        }\r
                .console-page {\r
 \r
                }\r
+               \r
+               \r
        #editor {\r
                font-size: 9pt;\r
        }\r
 \r
 /*--------------------------------------------------------------------------------------\r
  * \r
+ *  Cabinet, Gallery\r
+ *  \r
+ -------------------------------------------------------------------------------------*/\r
+       #cabinet-header, #gallery-header {\r
+               position:                       relative;\r
+               background-color:       #111;\r
+               color:                          #fff;\r
+               font-size:                      12pt;\r
+               line-height:            1;\r
+               padding:                        6pt 0 6pt 5pt;\r
+       }\r
+       #cabinet-close-button, #gallery-close-button {\r
+               position:                       absolute;\r
+               right:                          0;\r
+               top:                            0;\r
+               border-left:            1px solid #666;\r
+               height:                         24pt;\r
+               padding:                        6pt 9pt 6pt 9pt;\r
+               text-align:                     center;\r
+               cursor:                         pointer;\r
+       }\r
+\r
+/*--------------------------------------------------------------------------------------\r
+ * \r
  *  overlay\r
  *  \r
  -------------------------------------------------------------------------------------*/\r
                                #upload-console {\r
                                }\r
 \r
-/*--------------------------------------------------------------------------------------\r
- * \r
- *  home\r
- *  \r
- -------------------------------------------------------------------------------------*/\r
-       #home {\r
-\r
-       }\r
 \r
 \r
 /*--------------------------------------------------------------------------------------\r
                        background-repeat:              repeat;\r
                        /* background-image:            url('grid.gif'); grid用イメージはgrid使用時にjsで埋め込み */\r
                }\r
-\r
-/*--------------------------------------------------------------------------------------\r
- * \r
- *  Finder\r
- *  \r
- -------------------------------------------------------------------------------------*/\r
-       .finder-body {\r
-               position:                               relative;\r
-               overflow:                               auto;\r
-       }\r
-               .finder-container .loading {\r
-                        background-position: 50% bottom;\r
-               }\r
-       .finder-header {\r
-               height:                                 40px;\r
-               position:                               relative;\r
-               background-color:               #333;\r
-       }\r
-               .finder-header ul {\r
-                       list-style:                             none;\r
-                       position:                               absolute;\r
-                       top:                                    0;\r
-                       left:                                   48px;\r
-                       height:                                 40px;\r
-                       line-height:                    40px;\r
-                       padding:                                0;\r
-                       margin:                                 0;\r
-               }\r
-                       .finder-header li {\r
-                               position:                               absolute;\r
-                               top:                                    0;\r
-                               left:                                   0;\r
-                               height:                                 40px;\r
-                               width:                                  90px;\r
-                               padding:                                0;\r
-                               margin:                                 0;\r
-                       }\r
-                       .finder-header li a,\r
-                       .finder-header li a:link,\r
-                       .finder-header li a:visited {\r
-                               display:                                block;\r
-                               height:                                 14px;\r
-                               font-size:                              14px;\r
-                               line-height:                    14px;\r
-                               padding:                                16px 0 10px 20px;\r
-                               margin:                                 0;\r
-                               color:                                  #eee;\r
-                               overflow:                               hidden;\r
-                       }\r
-                       .finder-header li a:hover {\r
-                               text-decoration:                none;\r
-                               background-color:               #66f;\r
-                               color:                                  #eee;\r
-                       }\r
-                       \r
-                       \r
-               .finder-header .button {\r
-                       position:                               absolute;\r
-                       top:                                    8px;\r
-                       width:                                  30px;\r
-                       height:                                 24px;\r
-                       line-height:                    24px;\r
-               }\r
-               .finder-sidebar-switch {\r
-                       left:                                   8px;\r
-               }\r
-               .finder-style-switch {\r
-                       right:                                  48px;\r
-               }\r
-               .finder-action-switch {\r
-                       right:                                  8px;\r
-               }\r
                \r
-       /*  Finder Icon\r
-       --------------------------------------------------------------------------------------*/\r
-       .finder-icon {\r
-               position:                                       relative;\r
-               height:                                         74px;\r
-               border-bottom:                          1px solid #ccc;\r
-               clear:                                          both;\r
-               overflow:                                       hidden; /* for webkit */\r
-       }\r
-       .finder-icon:hover {\r
-               background-color:                       #eee;\r
-               cursor:                                         pointer;\r
-       }\r
-               .fnder-icon-modern .finder-icon-handle,\r
-               .fnder-icon-modern .finder-icon-thumbnail,\r
-               .fnder-icon-modern .finder-icon-filename,\r
-               .fnder-icon-modern .finder-icon-summary {\r
-                       display:                                        table-cell;\r
-               vertical-align:                         middle;\r
-               line-height:                            1.3em;\r
-           }\r
-               \r
-               .finder-icon-handle {\r
-                       width:                                          20px;\r
-                       height:                                         74px;\r
-               }\r
-               \r
-               .finder-icon-thumbnail {\r
-                       width:                                          64px;\r
-                       height:                                         74px;\r
-                       cursor:                                         pointer;\r
-                       background-repeat:                      no-repeat;\r
-                       background-position:            50% 50%;\r
-                       background-image:                       url('/assets/sprite.gif');\r
-               }\r
                \r
-               .finder-icon .file-type-folder {\r
-                       background-position:            0 -75px;\r
-               }\r
-               .finder-icon .file-type-album {\r
-               }\r
-               .finder-icon .file-type-author {\r
-                       background-position:            -70px -75px;\r
-               }               \r
-               .finder-icon .file-type-comic {\r
-                       background-position:            0 -145px;\r
-               }\r
-               .finder-icon .file-type-cabinet {\r
-                       background-position:            -70px -145px;\r
-               }\r
-               .finder-icon .file-type-panel {\r
-                       background-position:            0 -215px;\r
-               }\r
-               .finder-icon .file-type-artist {\r
-                       background-position:            -70px -215px;\r
-               }\r
-               .finder-icon .file-type-balloon {\r
-                       background-position:            0 -285px;\r
-               }\r
-               .finder-icon .file-type-charactor {\r
-                       background-position:            -70px -285px;\r
-               }               \r
-               .has-thumbnail {\r
-               }\r
-               .fnder-icon-modern .finder-icon-filename {\r
-                       width:                                          200px;\r
-                       padding:                                        5px 10px;\r
-                       height:                                         64px;\r
-                       font-weight:                            bold;\r
-                       color:                                          #333;\r
-               }\r
-               .fnder-icon-modern .finder-icon-summary {\r
-                       width:                                          300px;\r
-                       padding:                                        5px 10px;\r
-                       height:                                         64px;\r
-                       color:                                          #666;\r
-               }\r
-\r
-       /*  Finder Icon ie7-\r
-       --------------------------------------------------------------------------------------*/\r
-       .finder-icon a,\r
-       .finder-icon a:link,\r
-       .finder-icon a:visited,\r
-       .finder-icon a:active {\r
-               display:                                block;\r
-               height:                                 74px;\r
-               text-decoration:                none;\r
-               zoom:                                   1;\r
-               cursor:                                 pointer;\r
-       }\r
-       .finder-icon a:hover {\r
-               _background-color:              #eee;\r
-               color:                                  #333;\r
-       }\r
-               .fnder-icon-ie7 .finder-icon-handle,\r
-               .fnder-icon-ie7 .finder-icon-thumbnail {\r
-               zoom:                                   1;\r
-               line-height:                    1.3em;\r
-           }\r
-               .finder-icon-cell {\r
-                       display:                                inline;\r
-                       zoom:                                   1;\r
-               }\r
-                       .finder-icon-vertical-middle-outer {\r
-                               display:                                block;\r
-                               height:                                 74px;\r
-                               position:                               relative;\r
-                       }\r
-                       .finder-icon-ie-filename .finder-icon-vertical-middle-outer {\r
-                               width:                                          200px;\r
-                               font-weight:                            bold;\r
-                               color:                                          #333;\r
-                       }\r
-                       .finder-icon-ie-summary .finder-icon-vertical-middle-outer {\r
-                               width:                                          300px;\r
-                               color:                                          #666;\r
-                       }\r
-                               .finder-icon-vertical-middle-inner {\r
-                                       display:                                        block;\r
-                                       position:                                       absolute;\r
-                                       top:                                            50%;\r
-                                       margin:                                         0 5px;\r
-                               }\r
-                                       .fnder-icon-ie7 .finder-icon-filename,\r
-                                       .fnder-icon-ie7 .finder-icon-summary {\r
-                                                       position:               relative;\r
-                                                       top:                    -50%;\r
-                                       }\r
-                                       \r
-       /*  Finder Icon Console\r
-       --------------------------------------------------------------------------------------*/                \r
-               .finder-icon-console {\r
-                       position:                                       absolute;\r
-                       top:                                            0;\r
-                       right:                                          0;\r
-               }\r
-                       .finder-icon-console a {\r
-                               display:                                        block;\r
-                               width:                                          74px;\r
-                               height:                                         74px;\r
-                               border-left:                            1px solid #ccc;\r
-                               float:                                          right;\r
-                               background-image:                       url('/assets/sprite.gif') !important;\r
-                               background-repeat:                      no-repeat;\r
-                       }\r
-                       .finder-icon-console a:hover {\r
-                               background-color:                       #ccc !important;\r
-                       }\r
-                       .finder-icon-console-action {\r
-                               background-position:            0px -355px;\r
-                       }\r
-                       .finder-icon-console-editor-apps {\r
-                               background-position:            -70px -355px;\r
-                       }\r
-                       .finder-icon-console-viewer-apps {\r
-                               background-position:            0px -425px;\r
-                       }\r
-\r
-\r
-\r
+               \r
                                        
\ No newline at end of file
index 3265738..ac5c337 100644 (file)
@@ -1,14 +1,19 @@
 @charset "UTF-8";\r
 \r
-/*\r
- * pettanR\r
+/* pettanR peta.ccommon.css\r
+ *   version 0.5.4\r
  * \r
- *   common.css\r
- * \r
- *   version 0.4.23\r
- *\r
+ *   author:\r
+ *     itozyun\r
  */\r
 \r
+/*  VML ( v\:* don't work for ie8(ie8mode))\r
+--------------------------------------------------------------------------------------*/\r
+       v\:shape,\r
+       v\:image {\r
+               behavior:       url(#default#VML);\r
+               display:        block;\r
+       }\r
 \r
 /*  dl table\r
 --------------------------------------------------------------------------------------*/\r
diff --git a/app/assets/stylesheets/pictures.css.scss b/app/assets/stylesheets/pictures.css.scss
deleted file mode 100644 (file)
index 8355327..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the pictures controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
deleted file mode 100644 (file)
index 05188f0..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-body {
-  background-color: #fff;
-  color: #333;
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px; }
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px; }
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px; }
-
-a {
-  color: #000;
-  &:visited {
-    color: #666; }
-  &:hover {
-    color: #fff;
-    background-color: #000; } }
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px; } }
-
-#notice {
-  color: green; }
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table; }
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff; }
-  ul li {
-    font-size: 12px;
-    list-style: square; } }
index e365e02..d257675 100644 (file)
@@ -1,12 +1,12 @@
 @charset "UTF-8";\r
 \r
-/*  VML ( v\:* don't work for ie8(ie8mode))\r
---------------------------------------------------------------------------------------*/\r
-       v\:shape,\r
-       v\:image {\r
-               behavior:       url(#default#VML);\r
-               display:        block;\r
-       }\r
+/* pettanR site.css\r
+ *   version 0.5.4\r
+ * \r
+ *   author:\r
+ *     itozyun\r
+ */\r
+\r
 \r
 /*  Reset\r
 --------------------------------------------------------------------------------------*/\r
@@ -83,82 +83,6 @@ version: 2.7.0
                font-family: "MS Pゴシック", Osaka, "ヒラギノ角ゴ Pro W3",sans-serif;\r
        }\r
 \r
-/*  ClearFix\r
---------------------------------------------------------------------------------------*/\r
-.clearfix:after {\r
-  content: ".";  /* 新しい要素を作る */\r
-  display: block;  /* ブロックレベル要素に */\r
-  clear: both;\r
-  height: 0;\r
-  visibility: hidden;\r
-}\r
-\r
-.clearfix {\r
-  min-height: 1px;\r
-}\r
-\r
-* html .clearfix {\r
-  height: 1px;\r
-  /*\*//*/\r
-  height: auto;\r
-  overflow: hidden;\r
-  /**/\r
-}\r
-\r
-/*  Button\r
---------------------------------------------------------------------------------------*/\r
-       .button {\r
-               border:                                 1px solid;\r
-               background:                             #E3E3E3;\r
-               background:                             -moz-linear-gradient(center top , #F9F9F9, #E3E3E3);\r
-               background:                             -webkit-gradient(linear, left top, left bottom, from(#F9F9F9), to(#E3E3E3));\r
-               border-color:                   #ccc #bbb #aaa;\r
-               color:                                  #666;\r
-               font-weight:                    bold;\r
-               text-align:                             center;\r
-               cursor:                                 pointer;\r
-               overflow:                               hidden;\r
-               height:                                 30px;\r
-               line-height:                    30px;\r
-               border-radius:                  3px;\r
-               -o-border-radius:               3px;\r
-               -ms-border-radius:              3px;\r
-               -moz-border-radius:             3px;\r
-               -webkit-border-radius:  3px;\r
-       }\r
-       .button-has-focus {\r
-               border-color:                   #4D90FE;\r
-       }\r
-\r
-/*  Loading\r
---------------------------------------------------------------------------------------*/\r
-       .loading {\r
-               background-image:               url( /assets/loading.gif);\r
-               background-position:    50% 50%;\r
-               background-repeat:              no-repeat;\r
-       }\r
-       .error {\r
-               background-image:               url( /assets/error.png);\r
-               background-position:    50% 50%;\r
-               background-repeat:              no-repeat;\r
-       }\r
-\r
-\r
-\r
-\r
-/*  Noscript Alert\r
---------------------------------------------------------------------------------------*/\r
-       #noscript-alert {\r
-               border-left:            1px solid #666;\r
-               display:                        block;\r
-               text-align:                     center;\r
-               color:                          red;\r
-               font-weight:            bold;\r
-               font-size:                      12px;\r
-               line-height:            12px;\r
-               padding:                        11px 0 7px;\r
-       }\r
-\r
 /*  Typography\r
 --------------------------------------------------------------------------------------*/\r
        a:link { color:#008;}\r
diff --git a/app/assets/stylesheets/source_pictures.css.scss b/app/assets/stylesheets/source_pictures.css.scss
deleted file mode 100644 (file)
index d9973ed..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the source_pictures controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/speech_baloons.css.scss b/app/assets/stylesheets/speech_baloons.css.scss
deleted file mode 100644 (file)
index 085a9a2..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the speach_baloons controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/speech_templates.css.scss b/app/assets/stylesheets/speech_templates.css.scss
deleted file mode 100644 (file)
index 7fe46be..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the speach_templates controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/speechbaloons.css.scss b/app/assets/stylesheets/speechbaloons.css.scss
deleted file mode 100644 (file)
index af35a9e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the speachbaloons controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/speeches.css.scss b/app/assets/stylesheets/speeches.css.scss
deleted file mode 100644 (file)
index 2b19f3b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the speaches controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
index ba6607f..4944f22 100644 (file)
@@ -1,17 +1,14 @@
 @charset "UTF-8";\r
 \r
-/*  VML ( v\:* don't work for ie8(ie8mode))\r
---------------------------------------------------------------------------------------*/\r
-       v\:shape,\r
-       v\:image {\r
-               behavior:       url(#default#VML);\r
-               display:        block;\r
-       }\r
+/* pettanR system.css\r
+ *   version 0.5.5\r
+ * \r
+ *   author:\r
+ *     itozyun\r
+ */\r
 \r
 /*  Reset\r
 --------------------------------------------------------------------------------------*/\r
-\r
-\r
        html, body {\r
                margin:                 0;\r
                padding:                0;\r
                        -ms-border-radius:              5px;\r
                        -moz-border-radius:             5px;\r
                        -webkit-border-radius:  5px;\r
-               }
\ No newline at end of file
+               }\r
+               \r
+\r
+/*--------------------------------------------------------------------------------------\r
+ * \r
+ *  Finder\r
+ *  \r
+ -------------------------------------------------------------------------------------*/\r
+       .finder-body {\r
+               position:                               relative;\r
+               overflow:                               auto;\r
+       }\r
+               .finder-container .loading {\r
+                        background-position: 50% bottom;\r
+               }\r
+       .finder-header {\r
+               height:                                 40px;\r
+               position:                               relative;\r
+               background-color:               #333;\r
+       }\r
+               .finder-header ul {\r
+                       list-style:                             none;\r
+                       position:                               absolute;\r
+                       top:                                    0;\r
+                       left:                                   48px;\r
+                       height:                                 40px;\r
+                       line-height:                    40px;\r
+                       padding:                                0;\r
+                       margin:                                 0;\r
+               }\r
+                       .finder-header li {\r
+                               position:                               absolute;\r
+                               top:                                    0;\r
+                               left:                                   0;\r
+                               height:                                 40px;\r
+                               width:                                  90px;\r
+                               padding:                                0;\r
+                               margin:                                 0;\r
+                       }\r
+                       .finder-header li a,\r
+                       .finder-header li a:link,\r
+                       .finder-header li a:visited {\r
+                               display:                                block;\r
+                               height:                                 14px;\r
+                               font-size:                              14px;\r
+                               line-height:                    14px;\r
+                               padding:                                16px 0 10px 20px;\r
+                               margin:                                 0;\r
+                               color:                                  #eee;\r
+                               overflow:                               hidden;\r
+                       }\r
+                       .finder-header li a:hover {\r
+                               text-decoration:                none;\r
+                               background-color:               #66f;\r
+                               color:                                  #eee;\r
+                       }\r
+                       \r
+                       \r
+               .finder-header .button {\r
+                       position:                               absolute;\r
+                       top:                                    8px;\r
+                       width:                                  30px;\r
+                       height:                                 24px;\r
+                       line-height:                    24px;\r
+               }\r
+               .finder-sidebar-switch {\r
+                       left:                                   8px;\r
+               }\r
+               .finder-style-switch {\r
+                       right:                                  48px;\r
+               }\r
+               .finder-action-switch {\r
+                       right:                                  8px;\r
+               }\r
+               \r
+       /*  Finder Icon\r
+       --------------------------------------------------------------------------------------*/\r
+       .finder-icon {\r
+               position:                                       relative;\r
+               height:                                         74px;\r
+               border-bottom:                          1px solid #ccc;\r
+               clear:                                          both;\r
+               overflow:                                       hidden; /* for webkit */\r
+       }\r
+       .finder-icon:hover {\r
+               background-color:                       #eee;\r
+               cursor:                                         pointer;\r
+       }\r
+               .fnder-icon-modern .finder-icon-handle,\r
+               .fnder-icon-modern .finder-icon-thumbnail,\r
+               .fnder-icon-modern .finder-icon-filename,\r
+               .fnder-icon-modern .finder-icon-summary {\r
+                       display:                                        table-cell;\r
+               vertical-align:                         middle;\r
+               line-height:                            1.3em;\r
+           }\r
+               \r
+               .finder-icon-handle {\r
+                       width:                                          20px;\r
+                       height:                                         74px;\r
+               }\r
+               \r
+               .finder-icon-thumbnail {\r
+                       width:                                          64px;\r
+                       height:                                         74px;\r
+                       cursor:                                         pointer;\r
+                       background-repeat:                      no-repeat;\r
+                       background-position:            50% 50%;\r
+                       background-image:                       url('/assets/sprite.gif');\r
+               }\r
+               \r
+               .finder-icon .file-type-folder {\r
+                       background-position:            0 -75px;\r
+               }\r
+               .finder-icon .file-type-album {\r
+               }\r
+               .finder-icon .file-type-author {\r
+                       background-position:            -70px -75px;\r
+               }               \r
+               .finder-icon .file-type-comic {\r
+                       background-position:            0 -145px;\r
+               }\r
+               .finder-icon .file-type-cabinet {\r
+                       background-position:            -70px -145px;\r
+               }\r
+               .finder-icon .file-type-panel {\r
+                       background-position:            0 -215px;\r
+               }\r
+               .finder-icon .file-type-artist {\r
+                       background-position:            -70px -215px;\r
+               }\r
+               .finder-icon .file-type-balloon {\r
+                       background-position:            0 -285px;\r
+               }\r
+               .finder-icon .file-type-charactor {\r
+                       background-position:            -70px -285px;\r
+               }               \r
+               .has-thumbnail {\r
+               }\r
+               .fnder-icon-modern .finder-icon-filename {\r
+                       width:                                          200px;\r
+                       padding:                                        5px 10px;\r
+                       height:                                         64px;\r
+                       font-weight:                            bold;\r
+                       color:                                          #333;\r
+               }\r
+               .fnder-icon-modern .finder-icon-summary {\r
+                       width:                                          300px;\r
+                       padding:                                        5px 10px;\r
+                       height:                                         64px;\r
+                       color:                                          #666;\r
+               }\r
+\r
+       /*  Finder Icon ie7-\r
+       --------------------------------------------------------------------------------------*/\r
+       .finder-icon a,\r
+       .finder-icon a:link,\r
+       .finder-icon a:visited,\r
+       .finder-icon a:active {\r
+               display:                                block;\r
+               height:                                 74px;\r
+               text-decoration:                none;\r
+               zoom:                                   1;\r
+               cursor:                                 pointer;\r
+       }\r
+       .finder-icon a:hover {\r
+               _background-color:              #eee;\r
+               color:                                  #333;\r
+       }\r
+               .fnder-icon-ie7 .finder-icon-handle,\r
+               .fnder-icon-ie7 .finder-icon-thumbnail {\r
+               zoom:                                   1;\r
+               line-height:                    1.3em;\r
+           }\r
+               .finder-icon-cell {\r
+                       display:                                inline;\r
+                       zoom:                                   1;\r
+               }\r
+                       .finder-icon-vertical-middle-outer {\r
+                               display:                                block;\r
+                               height:                                 74px;\r
+                               position:                               relative;\r
+                       }\r
+                       .finder-icon-ie-filename .finder-icon-vertical-middle-outer {\r
+                               width:                                          200px;\r
+                               font-weight:                            bold;\r
+                               color:                                          #333;\r
+                       }\r
+                       .finder-icon-ie-summary .finder-icon-vertical-middle-outer {\r
+                               width:                                          300px;\r
+                               color:                                          #666;\r
+                       }\r
+                               .finder-icon-vertical-middle-inner {\r
+                                       display:                                        block;\r
+                                       position:                                       absolute;\r
+                                       top:                                            50%;\r
+                                       margin:                                         0 5px;\r
+                               }\r
+                                       .fnder-icon-ie7 .finder-icon-filename,\r
+                                       .fnder-icon-ie7 .finder-icon-summary {\r
+                                                       position:               relative;\r
+                                                       top:                    -50%;\r
+                                       }\r
+                                       \r
+       /*  Finder Icon Console\r
+       --------------------------------------------------------------------------------------*/                \r
+               .finder-icon-console {\r
+                       position:                                       absolute;\r
+                       top:                                            0;\r
+                       right:                                          0;\r
+               }\r
+                       .finder-icon-console a {\r
+                               display:                                        block;\r
+                               width:                                          74px;\r
+                               height:                                         74px;\r
+                               border-left:                            1px solid #ccc;\r
+                               float:                                          right;\r
+                               background-image:                       url('/assets/sprite.gif') !important;\r
+                               background-repeat:                      no-repeat;\r
+                       }\r
+                       .finder-icon-console a:hover {\r
+                               background-color:                       #ccc !important;\r
+                       }\r
+                       .finder-icon-console-action {\r
+                               background-position:            0px -355px;\r
+                       }\r
+                       .finder-icon-console-editor-apps {\r
+                               background-position:            -70px -355px;\r
+                       }\r
+                       .finder-icon-console-viewer-apps {\r
+                               background-position:            0px -425px;\r
+                       }
\ No newline at end of file
diff --git a/app/assets/stylesheets/system.css.scss b/app/assets/stylesheets/system.css.scss
deleted file mode 100644 (file)
index 9c5e904..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the system controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/assets/stylesheets/system_pictures.css.scss b/app/assets/stylesheets/system_pictures.css.scss
deleted file mode 100644 (file)
index 0d3199b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-// Place all the styles related to the system_pictures controller here.
-// They will automatically be included in application.css.
-// You can use Sass (SCSS) here: http://sass-lang.com/
index 90b4815..51f09cd 100644 (file)
@@ -27,6 +27,9 @@ Pettanr::Application.configure do
 
   # Expands the lines which load the assets
   config.assets.debug = true
+  
+  # config.assets.digest = true
+  # config.static_cache_control = "public, max-age=1"
 end
 
 module Pettanr