From: itozyun Date: Sun, 1 Apr 2012 10:14:50 +0000 (+0900) Subject: client is version0.4.12, added register Artist console (don't register...) X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=commitdiff_plain;h=01d23ad4151e2cc1b3c5883dba4550293ff058a9 client is version0.4.12, added register Artist console (don't register...) --- diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 16ac966b..c0778fb0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,11 +27,11 @@
<%= yield %> -

クイックアクセス

-

新しいコマを描く

+

新しいコマを描く(いまだけ)

新しいコミックをつくる

画像のアップロード

コマの追加（開発用）

+

アーティスト登録（すでに登録している場合も操作可能）

座長からのお知らせ

メンテナンスについて

@@ -305,13 +305,26 @@
cancel
+ +
+
Register Artist
+
+
+
+
register
+
cancel
+
+
 
+
+
+
Create New Panel (dev)
-
upload
+
post
cancel
 
diff --git a/public/assets/common.js b/public/assets/common.js index aa711ac2..13120a32 100644 --- a/public/assets/common.js +++ b/public/assets/common.js @@ -1,6 +1,6 @@ /* * pettanR common.js - * version 0.4.11 + * version 0.4.12 * * author: itozyun */ @@ -771,6 +771,7 @@ pettanr.CONST = ( function(){ CREATE_COMIC_JS: isLocal === true ? 'js\/create_new_comic.js' : PETTANR_ROOT_PATH + 'comics\/new.js', CREATE_PANEL_JS: isLocal === true ? 'js\/create_new_panel.js' : PETTANR_ROOT_PATH + 'panels\/new.js', UPLOAD_PICTURE_JS: isLocal === true ? 'js\/upload_picture.js' : PETTANR_ROOT_PATH + 'original_pictures\/new.js', + RESISTER_ARTIST_JS: isLocal === true ? 'js\/register_artist.js' : PETTANR_ROOT_PATH + 'artists\/new.js', JQUERY_URL: isLocal === true ? 'javascripts\/jquery-1.6.2.min.js' : PETTANR_ROOT_PATH + 'assets\/jquery-162_min.js' } })(); diff --git a/public/assets/system.js b/public/assets/system.js index 42fa929c..bb459442 100644 --- a/public/assets/system.js +++ b/public/assets/system.js @@ -1308,6 +1308,7 @@ pettanr.fn( pettanr.editor); pettanr.fn( pettanr.comicConsole); pettanr.fn( pettanr.uploadConsole); pettanr.fn( pettanr.panelConsole); +pettanr.fn( pettanr.artistConsole); pettanr.fn( pettanr.file); pettanr.fn( pettanr.finder); diff --git a/public/assets/work.js b/public/assets/work.js index fe4a577c..25d3256b 100644 --- a/public/assets/work.js +++ b/public/assets/work.js @@ -1,6 +1,6 @@ /* * pettanR work.js - * version 0.4.11 + * version 0.4.12 * * author: * itozyun @@ -4074,4 +4074,175 @@ pettanr.panelConsole = ( function(){ PANEL_CONSOLE.show( w, h); } } +})(); + +pettanr.artistConsole = ( function(){ + var ARTIST_CONSOLE = ( function(){ + var jqWrap, + ID = 'artistConsole', + TARGET_FRAME_NAME = 'targetFrameResisterArtist', + elmContainer = document.getElementById( 'register'), + elmProgress = document.getElementById( 'artist-console-progress'), + timer = null, + elmScript = null, + elmForm = null, + elmIframe = null, + isUploading = false; + /* + * upload ボタンが押されたらまず iframe をつくる． + */ + function clickOK(){ + if( !elmForm || !elmIframe || isUploading === true ) return false; + elmProgress.innerHTML = 'uploading.'; + isUploading = true; + submit(); + return false; + } + /* + * form の target に iframe を指定したのち submit(); + */ + function submit(){ + try { + elmForm.submit(); + } catch( e){ + elmProgress.innerHTML = 'submit() err..'; + isUploading = false; + setTimeout( clickCancel , 3000); + return; + } + + if( pettanr.ua.isIE){ + elmIframe.onreadystatechange = detectIframe; + } else { + elmIframe.onload = onLoad; + } + elmProgress.innerHTML = 'uploading..'; + } + /* + * ie の 場合、readyState をチェック． + */ + function detectIframe(){ + if ( elmIframe.readyState === 'complete') { + elmIframe.onreadystatechange = new Function(); + elmIframe.onreadystatechange = null; + onLoad(); + } + } + function onLoad(){ + elmIframe.onload = null; + ( elmIframe.contentWindow || elmIframe.contentDocument.parentWindow ).close(); + elmProgress.innerHTML = 'success!'; + setTimeout( clickCancel , 1000); + isUploading = false; + } + + function detectForm(){ + elmForm = elmContainer.getElementsByTagName( 'form' )[ 0 ]; + if( elmForm){ + var _inputList = elmForm.getElementsByTagName( 'input' ), + _input; + for( var i=0, l= _inputList.length; i