Merge branch 'master' into v03_test

diff --combined app/views/layouts/application.html.erb
index 42f99bf,e41174e..61d9b8f
--- 1/app/views/layouts/application.html.erb
--- 2/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@@ -305,22 -305,22 +305,22 @@@
                        </div>\r
  \r
                <!-- 画像のアップロード-->\r
-                       <div id="upload-console-wrapper" style="display: none;">\r
-                               <div id="upload-console-header">Upload Picture</div>\r
-                               <div id="upload-console">\r
+                       <div id="upload-console-wrapper" class="console-wrapper">\r
+                               <div id="upload-console-header" class="console-header">Upload Picture</div>\r
+                               <div id="upload-console" class="console-inner">\r
                                        <div id="uploader"></div>\r
-                                       <div id="upload-console-button-container">\r
-                                               <div id="upload-console-post-button" class="button">upload</div>\r
-                                               <div id="upload-console-cancel-button" class="button">cancel</div>\r
+                                       <div class="console-button-container">\r
+                                               <div id="upload-console-post-button" class="button console-submit-button">upload</div>\r
+                                               <div id="upload-console-cancel-button" class="button console-cancel-button">cancel</div>\r
                                        </div>\r
-                                       <div id="upload-console-progress"></div>                                        \r
+                                       <div id="upload-console-progress" class="console-progress">&nbsp;</div>                                 \r
                                </div>\r
                        </div>\r
  \r
                <!-- コミックの新規作成・編集・削除 -->\r
-                       <div id="comic-console-wrapper" style="display: none;">\r
-                               <div id="comic-console-header">Create New Comic</div>\r
-                               <div id="comic-console">\r
+                       <div id="comic-console-wrapper" class="console-wrapper">\r
+                               <div id="comic-console-header" class="console-header">Create New Comic</div>\r
+                               <div id="comic-console" class="console-inner">\r
                                        <div id="comic-console-title" class="comic-console-line">\r
                                                <span class="comic-console-label">Title:</span>\r
                                                <span id="comic-console-title-value" class="comic-console-value editable-value">No Title</span>\r
@@@ -341,11 -341,11 +341,11 @@@
                                                <span class="comic-console-label">Editable:</span>\r
                                                <span id="comic-console-editable-value" class="comic-console-value editable-value">1</span>\r
                                        </div>\r
-                                       <div id="comic-console-button-container">\r
-                                               <div id="comic-console-post-button" class="button">post(update)</div>\r
-                                               <div id="comic-console-cancel-button" class="button">cancel</div>\r
+                                       <div class="console-button-container">\r
+                                               <div id="comic-console-post-button" class="button console-submit-button">post(update)</div>\r
+                                               <div id="comic-console-cancel-button" class="button console-cancel-button">cancel</div>\r
                                        </div>\r
-                                       <div id="comic-console-progress"></div>\r
+                                       <div id="comic-console-progress" class="console-progress">&nbsp;</div>\r
                                </div>\r
                        </div>\r
                        \r
@@@ -385,18 -385,16 +385,18 @@@
                        \r
                <%= javascript_include_tag "common" %>\r
                <%= javascript_include_tag "jquery-1.6.2.min" %>\r
 -              <%if current_user %>\r
 +              <% if current_user %>\r
                  <script>\r
                    current_author = {\r
                      id: <%= @author ? @author.id : 0 %>,\r
                      name: "<%= @author ? h(@author.name) : '' %>"\r
                    }\r
 -                  current_artist = {\r
 -                    id: <%= @artist ? @artist.id : 0 %>,\r
 -                    name: "<%= @artist ? h(@artist.name) : '' %>"\r
 -                  }\r
 +                  <% if @artist and @artist.id %>\r
 +                    current_artist = {\r
 +                      id: <%= @artist.id %>,\r
 +                      name: "<%= h(@artist.name) %>"\r
 +                    }\r
 +                  <% end %>\r
                  </script>\r
                <% end %>\r
                <%= javascript_include_tag "work" %>\r