Merge pull request #9 from otiai10/feature/img_file_upload

選手を追加したり編集したり
otiai10 · Mar 2, 2013 · 3fe586e · 3fe586e
2 parents dd90840 + 17637a9
commit 3fe586e
Show file tree

Hide file tree

Showing 33 changed files with 234 additions and 1,233 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,6 @@
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
+
+# uploaded by user
+app/assets/images/prof
diff --git a/app/assets/images/logos/icon.png b/app/assets/images/logos/icon.png
diff --git a/app/assets/images/prof/_11 b/app/assets/images/prof/_11
diff --git a/app/assets/images/prof/gangsters_11 b/app/assets/images/prof/gangsters_11
diff --git a/app/assets/images/prof/gangsters_33 b/app/assets/images/prof/gangsters_33
diff --git a/app/assets/images/prof/gangsters_4 b/app/assets/images/prof/gangsters_4
diff --git a/app/assets/images/prof/gangsters_44 b/app/assets/images/prof/gangsters_44
diff --git a/app/assets/images/prof/gangsters_71 b/app/assets/images/prof/gangsters_71
diff --git a/app/assets/images/prof/gangstres_33 b/app/assets/images/prof/gangstres_33
diff --git a/app/assets/javascripts/spec/admin.js b/app/assets/javascripts/spec/admin.js
@@ -0,0 +1,9 @@
+$(function(){///////////
+  $("a.delete-player").on('click',function(e){
+    if(confirm('この選手を削除しますか？')){
+      // follow href bevavior
+    }else{
+      e.preventDefault();
+    }
+  });
+});/////////////////////
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -13,8 +13,12 @@
  */
 
 html, body {
+  width: 100%;
+  height: 100%;
   overflow-x : hidden;
   overflow-y : auto;
+  margin: 0;
+  padding: 0;
 }
 
 body {
@@ -45,7 +49,7 @@ div.login-info>p {
 }
 
 div.contents {
-  height: 100%;
+  min-height: 100%;
   background-color: rgba(255,255,255,0.8);
   padding: 7px;
   width: 100%;