diff --git a/.gitignore b/.gitignore index eb3489a..9c90508 100644 --- 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 new file mode 100644 index 0000000..deb17dd Binary files /dev/null and b/app/assets/images/logos/icon.png differ diff --git a/app/assets/images/prof/_11 b/app/assets/images/prof/_11 new file mode 100644 index 0000000..5aa9d1d Binary files /dev/null and b/app/assets/images/prof/_11 differ diff --git a/app/assets/images/prof/gangsters_11 b/app/assets/images/prof/gangsters_11 new file mode 100644 index 0000000..fa98497 Binary files /dev/null and b/app/assets/images/prof/gangsters_11 differ diff --git a/app/assets/images/prof/gangsters_33 b/app/assets/images/prof/gangsters_33 new file mode 100644 index 0000000..f29b504 Binary files /dev/null and b/app/assets/images/prof/gangsters_33 differ diff --git a/app/assets/images/prof/gangsters_4 b/app/assets/images/prof/gangsters_4 new file mode 100644 index 0000000..fa98497 Binary files /dev/null and b/app/assets/images/prof/gangsters_4 differ diff --git a/app/assets/images/prof/gangsters_44 b/app/assets/images/prof/gangsters_44 new file mode 100644 index 0000000..56f27db Binary files /dev/null and b/app/assets/images/prof/gangsters_44 differ diff --git a/app/assets/images/prof/gangsters_71 b/app/assets/images/prof/gangsters_71 new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/images/prof/gangstres_33 b/app/assets/images/prof/gangstres_33 new file mode 100644 index 0000000..e69de29 diff --git a/app/assets/javascripts/spec/admin.js b/app/assets/javascripts/spec/admin.js new file mode 100644 index 0000000..c0cfe9f --- /dev/null +++ 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 index 0285cf6..7d5a7dd 100644 --- 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%; diff --git a/app/assets/stylesheets/bootstrap-responsive.css b/app/assets/stylesheets/bootstrap-responsive.css deleted file mode 100644 index 5215a5d..0000000 --- a/app/assets/stylesheets/bootstrap-responsive.css +++ /dev/null @@ -1,1109 +0,0 @@ -/*! - * Bootstrap Responsive v2.3.0 - * - * Copyright 2012 Twitter, Inc - * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Designed and built with all the love in the world @twitter by @mdo and @fat. - */ - -.clearfix { - *zoom: 1; -} - -.clearfix:before, -.clearfix:after { - display: table; - line-height: 0; - content: ""; -} - -.clearfix:after { - clear: both; -} - -.hide-text { - font: 0/0 a; - color: transparent; - text-shadow: none; - background-color: transparent; - border: 0; -} - -.input-block-level { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -@-ms-viewport { - width: device-width; -} - -.hidden { - display: none; - visibility: hidden; -} - -.visible-phone { - display: none !important; -} - -.visible-tablet { - display: none !important; -} - -.hidden-desktop { - display: none !important; -} - -.visible-desktop { - display: inherit !important; -} - -@media (min-width: 768px) and (max-width: 979px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important ; - } - .visible-tablet { - display: inherit !important; - } - .hidden-tablet { - display: none !important; - } -} - -@media (max-width: 767px) { - .hidden-desktop { - display: inherit !important; - } - .visible-desktop { - display: none !important; - } - .visible-phone { - display: inherit !important; - } - .hidden-phone { - display: none !important; - } -} - -.visible-print { - display: none !important; -} - -@media print { - .visible-print { - display: inherit !important; - } - .hidden-print { - display: none !important; - } -} - -@media (min-width: 1200px) { - .row { - margin-left: -30px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 30px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 1170px; - } - .span12 { - width: 1170px; - } - .span11 { - width: 1070px; - } - .span10 { - width: 970px; - } - .span9 { - width: 870px; - } - .span8 { - width: 770px; - } - .span7 { - width: 670px; - } - .span6 { - width: 570px; - } - .span5 { - width: 470px; - } - .span4 { - width: 370px; - } - .span3 { - width: 270px; - } - .span2 { - width: 170px; - } - .span1 { - width: 70px; - } - .offset12 { - margin-left: 1230px; - } - .offset11 { - margin-left: 1130px; - } - .offset10 { - margin-left: 1030px; - } - .offset9 { - margin-left: 930px; - } - .offset8 { - margin-left: 830px; - } - .offset7 { - margin-left: 730px; - } - .offset6 { - margin-left: 630px; - } - .offset5 { - margin-left: 530px; - } - .offset4 { - margin-left: 430px; - } - .offset3 { - margin-left: 330px; - } - .offset2 { - margin-left: 230px; - } - .offset1 { - margin-left: 130px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.564102564102564%; - *margin-left: 2.5109110747408616%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.564102564102564%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.45299145299145%; - *width: 91.39979996362975%; - } - .row-fluid .span10 { - width: 82.90598290598291%; - *width: 82.8527914166212%; - } - .row-fluid .span9 { - width: 74.35897435897436%; - *width: 74.30578286961266%; - } - .row-fluid .span8 { - width: 65.81196581196582%; - *width: 65.75877432260411%; - } - .row-fluid .span7 { - width: 57.26495726495726%; - *width: 57.21176577559556%; - } - .row-fluid .span6 { - width: 48.717948717948715%; - *width: 48.664757228587014%; - } - .row-fluid .span5 { - width: 40.17094017094017%; - *width: 40.11774868157847%; - } - .row-fluid .span4 { - width: 31.623931623931625%; - *width: 31.570740134569924%; - } - .row-fluid .span3 { - width: 23.076923076923077%; - *width: 23.023731587561375%; - } - .row-fluid .span2 { - width: 14.52991452991453%; - *width: 14.476723040552828%; - } - .row-fluid .span1 { - width: 5.982905982905983%; - *width: 5.929714493544281%; - } - .row-fluid .offset12 { - margin-left: 105.12820512820512%; - *margin-left: 105.02182214948171%; - } - .row-fluid .offset12:first-child { - margin-left: 102.56410256410257%; - *margin-left: 102.45771958537915%; - } - .row-fluid .offset11 { - margin-left: 96.58119658119658%; - *margin-left: 96.47481360247316%; - } - .row-fluid .offset11:first-child { - margin-left: 94.01709401709402%; - *margin-left: 93.91071103837061%; - } - .row-fluid .offset10 { - margin-left: 88.03418803418803%; - *margin-left: 87.92780505546462%; - } - .row-fluid .offset10:first-child { - margin-left: 85.47008547008548%; - *margin-left: 85.36370249136206%; - } - .row-fluid .offset9 { - margin-left: 79.48717948717949%; - *margin-left: 79.38079650845607%; - } - .row-fluid .offset9:first-child { - margin-left: 76.92307692307693%; - *margin-left: 76.81669394435352%; - } - .row-fluid .offset8 { - margin-left: 70.94017094017094%; - *margin-left: 70.83378796144753%; - } - .row-fluid .offset8:first-child { - margin-left: 68.37606837606839%; - *margin-left: 68.26968539734497%; - } - .row-fluid .offset7 { - margin-left: 62.393162393162385%; - *margin-left: 62.28677941443899%; - } - .row-fluid .offset7:first-child { - margin-left: 59.82905982905982%; - *margin-left: 59.72267685033642%; - } - .row-fluid .offset6 { - margin-left: 53.84615384615384%; - *margin-left: 53.739770867430444%; - } - .row-fluid .offset6:first-child { - margin-left: 51.28205128205128%; - *margin-left: 51.175668303327875%; - } - .row-fluid .offset5 { - margin-left: 45.299145299145295%; - *margin-left: 45.1927623204219%; - } - .row-fluid .offset5:first-child { - margin-left: 42.73504273504273%; - *margin-left: 42.62865975631933%; - } - .row-fluid .offset4 { - margin-left: 36.75213675213675%; - *margin-left: 36.645753773413354%; - } - .row-fluid .offset4:first-child { - margin-left: 34.18803418803419%; - *margin-left: 34.081651209310785%; - } - .row-fluid .offset3 { - margin-left: 28.205128205128204%; - *margin-left: 28.0987452264048%; - } - .row-fluid .offset3:first-child { - margin-left: 25.641025641025642%; - *margin-left: 25.53464266230224%; - } - .row-fluid .offset2 { - margin-left: 19.65811965811966%; - *margin-left: 19.551736679396257%; - } - .row-fluid .offset2:first-child { - margin-left: 17.094017094017094%; - *margin-left: 16.98763411529369%; - } - .row-fluid .offset1 { - margin-left: 11.11111111111111%; - *margin-left: 11.004728132387708%; - } - .row-fluid .offset1:first-child { - margin-left: 8.547008547008547%; - *margin-left: 8.440625568285142%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 30px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 1156px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 1056px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 956px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 856px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 756px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 656px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 556px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 456px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 356px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 256px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 156px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 56px; - } - .thumbnails { - margin-left: -30px; - } - .thumbnails > li { - margin-left: 30px; - } - .row-fluid .thumbnails { - margin-left: 0; - } -} - -@media (min-width: 768px) and (max-width: 979px) { - .row { - margin-left: -20px; - *zoom: 1; - } - .row:before, - .row:after { - display: table; - line-height: 0; - content: ""; - } - .row:after { - clear: both; - } - [class*="span"] { - float: left; - min-height: 1px; - margin-left: 20px; - } - .container, - .navbar-static-top .container, - .navbar-fixed-top .container, - .navbar-fixed-bottom .container { - width: 724px; - } - .span12 { - width: 724px; - } - .span11 { - width: 662px; - } - .span10 { - width: 600px; - } - .span9 { - width: 538px; - } - .span8 { - width: 476px; - } - .span7 { - width: 414px; - } - .span6 { - width: 352px; - } - .span5 { - width: 290px; - } - .span4 { - width: 228px; - } - .span3 { - width: 166px; - } - .span2 { - width: 104px; - } - .span1 { - width: 42px; - } - .offset12 { - margin-left: 764px; - } - .offset11 { - margin-left: 702px; - } - .offset10 { - margin-left: 640px; - } - .offset9 { - margin-left: 578px; - } - .offset8 { - margin-left: 516px; - } - .offset7 { - margin-left: 454px; - } - .offset6 { - margin-left: 392px; - } - .offset5 { - margin-left: 330px; - } - .offset4 { - margin-left: 268px; - } - .offset3 { - margin-left: 206px; - } - .offset2 { - margin-left: 144px; - } - .offset1 { - margin-left: 82px; - } - .row-fluid { - width: 100%; - *zoom: 1; - } - .row-fluid:before, - .row-fluid:after { - display: table; - line-height: 0; - content: ""; - } - .row-fluid:after { - clear: both; - } - .row-fluid [class*="span"] { - display: block; - float: left; - width: 100%; - min-height: 30px; - margin-left: 2.7624309392265194%; - *margin-left: 2.709239449864817%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="span"]:first-child { - margin-left: 0; - } - .row-fluid .controls-row [class*="span"] + [class*="span"] { - margin-left: 2.7624309392265194%; - } - .row-fluid .span12 { - width: 100%; - *width: 99.94680851063829%; - } - .row-fluid .span11 { - width: 91.43646408839778%; - *width: 91.38327259903608%; - } - .row-fluid .span10 { - width: 82.87292817679558%; - *width: 82.81973668743387%; - } - .row-fluid .span9 { - width: 74.30939226519337%; - *width: 74.25620077583166%; - } - .row-fluid .span8 { - width: 65.74585635359117%; - *width: 65.69266486422946%; - } - .row-fluid .span7 { - width: 57.18232044198895%; - *width: 57.12912895262725%; - } - .row-fluid .span6 { - width: 48.61878453038674%; - *width: 48.56559304102504%; - } - .row-fluid .span5 { - width: 40.05524861878453%; - *width: 40.00205712942283%; - } - .row-fluid .span4 { - width: 31.491712707182323%; - *width: 31.43852121782062%; - } - .row-fluid .span3 { - width: 22.92817679558011%; - *width: 22.87498530621841%; - } - .row-fluid .span2 { - width: 14.3646408839779%; - *width: 14.311449394616199%; - } - .row-fluid .span1 { - width: 5.801104972375691%; - *width: 5.747913483013988%; - } - .row-fluid .offset12 { - margin-left: 105.52486187845304%; - *margin-left: 105.41847889972962%; - } - .row-fluid .offset12:first-child { - margin-left: 102.76243093922652%; - *margin-left: 102.6560479605031%; - } - .row-fluid .offset11 { - margin-left: 96.96132596685082%; - *margin-left: 96.8549429881274%; - } - .row-fluid .offset11:first-child { - margin-left: 94.1988950276243%; - *margin-left: 94.09251204890089%; - } - .row-fluid .offset10 { - margin-left: 88.39779005524862%; - *margin-left: 88.2914070765252%; - } - .row-fluid .offset10:first-child { - margin-left: 85.6353591160221%; - *margin-left: 85.52897613729868%; - } - .row-fluid .offset9 { - margin-left: 79.8342541436464%; - *margin-left: 79.72787116492299%; - } - .row-fluid .offset9:first-child { - margin-left: 77.07182320441989%; - *margin-left: 76.96544022569647%; - } - .row-fluid .offset8 { - margin-left: 71.2707182320442%; - *margin-left: 71.16433525332079%; - } - .row-fluid .offset8:first-child { - margin-left: 68.50828729281768%; - *margin-left: 68.40190431409427%; - } - .row-fluid .offset7 { - margin-left: 62.70718232044199%; - *margin-left: 62.600799341718584%; - } - .row-fluid .offset7:first-child { - margin-left: 59.94475138121547%; - *margin-left: 59.838368402492065%; - } - .row-fluid .offset6 { - margin-left: 54.14364640883978%; - *margin-left: 54.037263430116376%; - } - .row-fluid .offset6:first-child { - margin-left: 51.38121546961326%; - *margin-left: 51.27483249088986%; - } - .row-fluid .offset5 { - margin-left: 45.58011049723757%; - *margin-left: 45.47372751851417%; - } - .row-fluid .offset5:first-child { - margin-left: 42.81767955801105%; - *margin-left: 42.71129657928765%; - } - .row-fluid .offset4 { - margin-left: 37.01657458563536%; - *margin-left: 36.91019160691196%; - } - .row-fluid .offset4:first-child { - margin-left: 34.25414364640884%; - *margin-left: 34.14776066768544%; - } - .row-fluid .offset3 { - margin-left: 28.45303867403315%; - *margin-left: 28.346655695309746%; - } - .row-fluid .offset3:first-child { - margin-left: 25.69060773480663%; - *margin-left: 25.584224756083227%; - } - .row-fluid .offset2 { - margin-left: 19.88950276243094%; - *margin-left: 19.783119783707537%; - } - .row-fluid .offset2:first-child { - margin-left: 17.12707182320442%; - *margin-left: 17.02068884448102%; - } - .row-fluid .offset1 { - margin-left: 11.32596685082873%; - *margin-left: 11.219583872105325%; - } - .row-fluid .offset1:first-child { - margin-left: 8.56353591160221%; - *margin-left: 8.457152932878806%; - } - input, - textarea, - .uneditable-input { - margin-left: 0; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 20px; - } - input.span12, - textarea.span12, - .uneditable-input.span12 { - width: 710px; - } - input.span11, - textarea.span11, - .uneditable-input.span11 { - width: 648px; - } - input.span10, - textarea.span10, - .uneditable-input.span10 { - width: 586px; - } - input.span9, - textarea.span9, - .uneditable-input.span9 { - width: 524px; - } - input.span8, - textarea.span8, - .uneditable-input.span8 { - width: 462px; - } - input.span7, - textarea.span7, - .uneditable-input.span7 { - width: 400px; - } - input.span6, - textarea.span6, - .uneditable-input.span6 { - width: 338px; - } - input.span5, - textarea.span5, - .uneditable-input.span5 { - width: 276px; - } - input.span4, - textarea.span4, - .uneditable-input.span4 { - width: 214px; - } - input.span3, - textarea.span3, - .uneditable-input.span3 { - width: 152px; - } - input.span2, - textarea.span2, - .uneditable-input.span2 { - width: 90px; - } - input.span1, - textarea.span1, - .uneditable-input.span1 { - width: 28px; - } -} - -@media (max-width: 767px) { - body { - padding-right: 20px; - padding-left: 20px; - } - .navbar-fixed-top, - .navbar-fixed-bottom, - .navbar-static-top { - margin-right: -20px; - margin-left: -20px; - } - .container-fluid { - padding: 0; - } - .dl-horizontal dt { - float: none; - width: auto; - clear: none; - text-align: left; - } - .dl-horizontal dd { - margin-left: 0; - } - .container { - width: auto; - } - .row-fluid { - width: 100%; - } - .row, - .thumbnails { - margin-left: 0; - } - .thumbnails > li { - float: none; - margin-left: 0; - } - [class*="span"], - .uneditable-input[class*="span"], - .row-fluid [class*="span"] { - display: block; - float: none; - width: 100%; - margin-left: 0; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .span12, - .row-fluid .span12 { - width: 100%; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .row-fluid [class*="offset"]:first-child { - margin-left: 0; - } - .input-large, - .input-xlarge, - .input-xxlarge, - input[class*="span"], - select[class*="span"], - textarea[class*="span"], - .uneditable-input { - display: block; - width: 100%; - min-height: 30px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - } - .input-prepend input, - .input-append input, - .input-prepend input[class*="span"], - .input-append input[class*="span"] { - display: inline-block; - width: auto; - } - .controls-row [class*="span"] + [class*="span"] { - margin-left: 0; - } - .modal { - position: fixed; - top: 20px; - right: 20px; - left: 20px; - width: auto; - margin: 0; - } - .modal.fade { - top: -100px; - } - .modal.fade.in { - top: 20px; - } -} - -@media (max-width: 480px) { - .nav-collapse { - -webkit-transform: translate3d(0, 0, 0); - } - .page-header h1 small { - display: block; - line-height: 20px; - } - input[type="checkbox"], - input[type="radio"] { - border: 1px solid #ccc; - } - .form-horizontal .control-label { - float: none; - width: auto; - padding-top: 0; - text-align: left; - } - .form-horizontal .controls { - margin-left: 0; - } - .form-horizontal .control-list { - padding-top: 0; - } - .form-horizontal .form-actions { - padding-right: 10px; - padding-left: 10px; - } - .media .pull-left, - .media .pull-right { - display: block; - float: none; - margin-bottom: 10px; - } - .media-object { - margin-right: 0; - margin-left: 0; - } - .modal { - top: 10px; - right: 10px; - left: 10px; - } - .modal-header .close { - padding: 10px; - margin: -10px; - } - .carousel-caption { - position: static; - } -} - -@media (max-width: 979px) { - body { - padding-top: 0; - } - .navbar-fixed-top, - .navbar-fixed-bottom { - position: static; - } - .navbar-fixed-top { - margin-bottom: 20px; - } - .navbar-fixed-bottom { - margin-top: 20px; - } - .navbar-fixed-top .navbar-inner, - .navbar-fixed-bottom .navbar-inner { - padding: 5px; - } - .navbar .container { - width: auto; - padding: 0; - } - .navbar .brand { - padding-right: 10px; - padding-left: 10px; - margin: 0 0 0 -5px; - } - .nav-collapse { - clear: both; - } - .nav-collapse .nav { - float: none; - margin: 0 0 10px; - } - .nav-collapse .nav > li { - float: none; - } - .nav-collapse .nav > li > a { - margin-bottom: 2px; - } - .nav-collapse .nav > .divider-vertical { - display: none; - } - .nav-collapse .nav .nav-header { - color: #777777; - text-shadow: none; - } - .nav-collapse .nav > li > a, - .nav-collapse .dropdown-menu a { - padding: 9px 15px; - font-weight: bold; - color: #777777; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - border-radius: 3px; - } - .nav-collapse .btn { - padding: 4px 10px 4px; - font-weight: normal; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; - } - .nav-collapse .dropdown-menu li + li a { - margin-bottom: 2px; - } - .nav-collapse .nav > li > a:hover, - .nav-collapse .nav > li > a:focus, - .nav-collapse .dropdown-menu a:hover, - .nav-collapse .dropdown-menu a:focus { - background-color: #f2f2f2; - } - .navbar-inverse .nav-collapse .nav > li > a, - .navbar-inverse .nav-collapse .dropdown-menu a { - color: #999999; - } - .navbar-inverse .nav-collapse .nav > li > a:hover, - .navbar-inverse .nav-collapse .nav > li > a:focus, - .navbar-inverse .nav-collapse .dropdown-menu a:hover, - .navbar-inverse .nav-collapse .dropdown-menu a:focus { - background-color: #111111; - } - .nav-collapse.in .btn-group { - padding: 0; - margin-top: 5px; - } - .nav-collapse .dropdown-menu { - position: static; - top: auto; - left: auto; - display: none; - float: none; - max-width: none; - padding: 0; - margin: 0 15px; - background-color: transparent; - border: none; - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - } - .nav-collapse .open > .dropdown-menu { - display: block; - } - .nav-collapse .dropdown-menu:before, - .nav-collapse .dropdown-menu:after { - display: none; - } - .nav-collapse .dropdown-menu .divider { - display: none; - } - .nav-collapse .nav > li > .dropdown-menu:before, - .nav-collapse .nav > li > .dropdown-menu:after { - display: none; - } - .nav-collapse .navbar-form, - .nav-collapse .navbar-search { - float: none; - padding: 10px 15px; - margin: 10px 0; - border-top: 1px solid #f2f2f2; - border-bottom: 1px solid #f2f2f2; - -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); - } - .navbar-inverse .nav-collapse .navbar-form, - .navbar-inverse .nav-collapse .navbar-search { - border-top-color: #111111; - border-bottom-color: #111111; - } - .navbar .nav-collapse .nav.pull-right { - float: none; - margin-left: 0; - } - .nav-collapse, - .nav-collapse.collapse { - height: 0; - overflow: hidden; - } - .navbar .btn-navbar { - display: block; - } - .navbar-static .navbar-inner { - padding-right: 10px; - padding-left: 10px; - } -} - -@media (min-width: 980px) { - .nav-collapse.collapse { - height: auto !important; - overflow: visible !important; - } -} diff --git a/app/assets/stylesheets/bootstrap.css b/app/assets/stylesheets/bootstrap.css index e3c0a3a..9e3d9cd 100644 --- a/app/assets/stylesheets/bootstrap.css +++ b/app/assets/stylesheets/bootstrap.css @@ -882,7 +882,7 @@ dd { .dl-horizontal dt { float: left; /* width: 160px; myTune */ - width: 90px; + width: 50px; overflow: hidden; clear: left; text-align: right; @@ -892,7 +892,7 @@ dd { .dl-horizontal dd { /* margin-left: 180px; myTune */ - margin-left: 100px; + margin-left: 60px; } hr { @@ -2004,7 +2004,7 @@ table { } .table { - width: 100%; + /* width: 100%; myTune */ margin-bottom: 20px; } diff --git a/app/assets/stylesheets/players.css.scss b/app/assets/stylesheets/players.css.scss index e03700a..7983a66 100644 --- a/app/assets/stylesheets/players.css.scss +++ b/app/assets/stylesheets/players.css.scss @@ -12,6 +12,9 @@ div.contents { table { tbody { tr { + td { + padding-top: 8px; + } td.prof { width: 30%; img.prof-img { @@ -26,6 +29,7 @@ div.contents { } span.backnumber { font-size: 3em; + line-height: 0.8em; @include sharp; } span.player-name { diff --git a/app/assets/stylesheets/spec/admin.css b/app/assets/stylesheets/spec/admin.css index 19872e6..410e5be 100644 --- a/app/assets/stylesheets/spec/admin.css +++ b/app/assets/stylesheets/spec/admin.css @@ -9,6 +9,10 @@ body { text-shadow: 0 1px 0 #fff; } +h1.xlg { + margin-top: 80px; +} + .navbar-inner { padding-left: 0; padding-right: 0; @@ -37,9 +41,19 @@ img.prof-img { width: 120px; } -.cell3>dl>dt { - width: 60px; -} .cell3>dl>dd { margin-left: 62px; } + +span.xsml { + font-size: 0.3em; +} + +td>dl>dt { + font-size: 0.5em; +} + +dt.newplayer { + width: 80px; + margin-right: 20px; +} diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index dd90d1a..47fd8be 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -25,12 +25,30 @@ def players end end + def newplayer + if authenticate() + @player = Player.new + respond_to do |format| + format.html { render :layout => false } + end + end + end + + def csv + if authenticate() + respond_to do |format| + format.html { render :layout => false } + end + end + end + def authenticate() if session[:login_name].nil? - redirect_to :controller => 'adminmenue', :action => 'index' + redirect_to :controller => 'admin', :action => 'login' return false else return true end end + end diff --git a/app/controllers/players_controller.rb b/app/controllers/players_controller.rb index 07d877f..f7b2cd8 100644 --- a/app/controllers/players_controller.rb +++ b/app/controllers/players_controller.rb @@ -1,4 +1,12 @@ class PlayersController < ApplicationController + + def init + if Player.update_all("points=0") + cookies[:mess] = '得票を初期化しました' + end + redirect_to :controller => 'admin', :action => 'players' + end + # GET /players # GET /players.json def index @@ -56,7 +64,8 @@ def create respond_to do |format| if @player.save - format.html { redirect_to @player, :notice => 'Player was successfully created.' } + #format.html { redirect_to @player, :notice => 'Player was successfully created.' } + format.html { redirect_to :controller => 'admin', :action => 'players' } format.json { render :json => @player, :status => :created, :location => @player } else format.html { render :action => "new" } @@ -70,9 +79,24 @@ def create def update @player = Player.find(params[:id]) + # create new file path + f_name = params[:player][:team] + '_' + params[:player][:number] + # pick up param + file = params[:file] + unless file.nil? + # save file binary + File.open(RAILS_ROOT + '/app/assets/images/prof/' + f_name, 'w') do |opened| + opened.write(file.read) + end + end + + # set imgurl + #@player[:imgrul] = 'prof/' + f_name # この書き方だと、update_attributesで上書きされるくさい + params[:player][:imgurl] = 'prof/' + f_name + respond_to do |format| if @player.update_attributes(params[:player]) - format.html { redirect_to @player, :notice => 'Player was successfully updated.' } + format.html { redirect_to :controller => 'admin', :action => 'players' } format.json { head :no_content } else format.html { render :action => "edit" } @@ -81,14 +105,13 @@ def update end end - # DELETE /players/1 - # DELETE /players/1.json - def destroy + # DELETE /players/delete/1 + def delete @player = Player.find(params[:id]) - @player.destroy + res = @player.delete respond_to do |format| - format.html { redirect_to players_url } + format.html { redirect_to :controller => 'admin', :action => 'players' } format.json { head :no_content } end end diff --git a/app/models/player.rb b/app/models/player.rb index 4d38b51..8ca02ea 100644 --- a/app/models/player.rb +++ b/app/models/player.rb @@ -1,3 +1,3 @@ class Player < ActiveRecord::Base - attr_accessible :from, :grade, :imgurl, :info, :introduction, :kana, :name, :number, :position, :points + attr_accessible :from, :grade, :imgurl, :info, :introduction, :kana, :name, :number, :position, :points, :team end diff --git a/app/views/players/_form.html.erb b/app/views/admin/_form.html.erb similarity index 100% rename from app/views/players/_form.html.erb rename to app/views/admin/_form.html.erb diff --git a/app/views/admin/_head.html.erb b/app/views/admin/_head.html.erb index 2c27224..f545794 100644 --- a/app/views/admin/_head.html.erb +++ b/app/views/admin/_head.html.erb @@ -1,8 +1,13 @@ - - + + + <%= csrf_meta_tags %> - Admin + + + + + admin diff --git a/app/views/admin/_navbar.html.erb b/app/views/admin/_navbar.html.erb new file mode 100644 index 0000000..0441117 --- /dev/null +++ b/app/views/admin/_navbar.html.erb @@ -0,0 +1,19 @@ +
+
+
+ <%= link_to('theMAN-Admin', {:controller => 'admin', :action => :game}, {:class => 'brand'}) %> + <% unless session[:login_name].nil? %> + + <% end %> +
+
+
diff --git a/app/views/admin/_sidebar.html.erb b/app/views/admin/_sidebar.html.erb new file mode 100644 index 0000000..840376d --- /dev/null +++ b/app/views/admin/_sidebar.html.erb @@ -0,0 +1,14 @@ + diff --git a/app/views/admin/csv.html.erb b/app/views/admin/csv.html.erb new file mode 100644 index 0000000..1bd3a6b --- /dev/null +++ b/app/views/admin/csv.html.erb @@ -0,0 +1,24 @@ + +<%= render(:partial => "head") %> + +<%= render(:partial => "navbar") %> + +
+
+
+ <%= render(:partial => "sidebar") %> +
+
+
選手一括登録
+
+

+ 開発中です。
+ CSVファイルによって、画像以外の選手情報を一括でアップロードできるようになります。 +

+
+
+
+
+ + + diff --git a/app/views/admin/game.html.erb b/app/views/admin/game.html.erb index 3b2eea0..08aa4f3 100644 --- a/app/views/admin/game.html.erb +++ b/app/views/admin/game.html.erb @@ -1,39 +1,7 @@ + <%= render(:partial => "head") %> -
-
-
- <%= link_to('theMAN-Admin', {:controller => 'admin', :action => 'game'}, {:class => 'brand'}) %> - <% unless session[:login_name].nil? %> - - <% end %> -
-
-
+<%= render(:partial => "navbar") %>
diff --git a/app/views/admin/login.html.erb b/app/views/admin/login.html.erb index c0e27dc..d720232 100644 --- a/app/views/admin/login.html.erb +++ b/app/views/admin/login.html.erb @@ -1,24 +1,8 @@ + <%= render(:partial => "head") %> -
-
-
- <%= link_to('theMAN-Admin', {:controller => 'adminmenue'}, {:class => 'brand'}) %> - <% unless session[:login_name].nil? %> - - <% end %> -
-
-
+<%= render(:partial => "navbar") %> +

Login as an administrator

<%= @mess %>

diff --git a/app/views/admin/newplayer.html.erb b/app/views/admin/newplayer.html.erb new file mode 100644 index 0000000..ea85fe2 --- /dev/null +++ b/app/views/admin/newplayer.html.erb @@ -0,0 +1,34 @@ + +<%= render(:partial => "head") %> + +<%= render(:partial => "navbar") %> + +
+
+
+ <%= render(:partial => "sidebar") %> +
+
+
新しい選手を登録
+
+ <%= form_for @player do |f| %> +
+
氏名
<%= f.text_field :name %>
+
かな
<%= f.text_field :kana %>
+
所属チーム
<%= f.text_field :team %>
+
背番号
<%= f.select :number, (1..99).to_a %>
+
ポジション
<%= f.select :position, POSITIONS_FORM %>
+
学年
<%= f.select :grade, GRADES_FORM %>
+
出身地
<%= f.select :from, REGION_FORM %>
+
画像
+
紹介文
<%= f.text_area :introduction, :cols => 30, :rows => 3 %>
+
　
<%= f.submit('新しく追加する', :class => 'btn btn-info btn-small') %>
+
+ <% end %> +
+
+
+
+ + + diff --git a/app/views/admin/players.html.erb b/app/views/admin/players.html.erb index e785a83..0a5f089 100644 --- a/app/views/admin/players.html.erb +++ b/app/views/admin/players.html.erb @@ -1,48 +1,21 @@ + <%= render(:partial => "head") %> -
-
-
- <%= link_to('theMAN-Admin', {:controller => 'admin', :action => 'game'}, {:class => 'brand'}) %> - <% unless session[:login_name].nil? %> -
    -
  • - <%= link_to('Sign out', {:controller => 'account', :action => 'adminsignout'}) %> -
    • -
- <% end %> -
-
-
+<%= render(:partial => "navbar") %> +
-
    -
  • class="active"<% end %>> - <%= link_to('試合登録', {:controller => 'admin', :action => 'game'}) %> -
    • -
  • class="active"<% end %>> - <%= link_to('選手リスト', {:controller => 'admin', :action => 'players'}) %> -
    • -
  • class="active"<% end %>> - <%= link_to('一括更新', {:controller => 'admin', :action => 'csv'}) %> -
    • -
+ <%= render(:partial => "sidebar") %>
登録選手リスト
- - - - +
+ <%= link_to 'すべての得票をリセットする', {:controller => 'players', :action => 'init'}, :class => 'btn btn-small btn-warning' %> + <%= link_to '新しい選手の追加', {:controller => 'admin', :action => 'newplayer'}, :class => 'btn btn-small' %> +
+
- すべての得票をリセットする↓ -
- - - - - <% @players.each_with_index do |player, _i| %> @@ -50,11 +23,12 @@ <%= _i %> - <%= form_for(player) do |f| %> + <%= form_for(player, :html => {:multipart => true}) do |f| %> <% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index aa10a2b..0572efc 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -7,10 +7,13 @@ <%= csrf_meta_tags %> + + + -
+
<%= link_to('theMAN', {:controller => 'top'}, {:class => 'brand'}) %>
    @@ -32,9 +35,8 @@
-
+<% if(controller_name != 'top') %>
<% end %> <%= yield %> -
diff --git a/app/views/players/new.html.erb b/app/views/players/new.html.erb deleted file mode 100644 index 77b4199..0000000 --- a/app/views/players/new.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -

New player

- -<%= render 'form' %> - -<%= link_to 'Back', players_path %> diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 2d122f1..6a17d63 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,5 +1,8 @@ # 定数定義 +RAILS_ROOT = '/home/hiromu/rails/projects/gangvote/' + + POSITIONS = { 0 => '未使用', 1 => 'OL', @@ -8,7 +11,6 @@ 4 => 'RB' } POSITIONS_FORM = { - '未使用' => 0, 'OL' => 1, 'TE' => 2, 'QB' => 3, @@ -24,7 +26,6 @@ } GRADES_FORM = { - '未使用' => 0, '1年' => 1, '2年' => 2, '3年' => 3, @@ -47,7 +48,6 @@ } REGION_FORM = { - '未使用' => 0, '北海道' => 1, '青森' => 2, '岩手' => 3, diff --git a/config/routes.rb b/config/routes.rb index e00ebc7..ae41129 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,10 @@ Gangvote::Application.routes.draw do + match 'players/init' => 'players#init' + match 'players/:id/vote' => 'players#vote' + resources :players - match 'players/:id/vote' => 'players#vote' # The priority is based upon order of creation: # first created -> highest priority. diff --git a/db/migrate/20130224022542_add_team_to_players.rb b/db/migrate/20130224022542_add_team_to_players.rb new file mode 100644 index 0000000..8ce09be --- /dev/null +++ b/db/migrate/20130224022542_add_team_to_players.rb @@ -0,0 +1,5 @@ +class AddTeamToPlayers < ActiveRecord::Migration + def change + add_column :players, :team, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 0f14113..c882e8a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20130219114733) do +ActiveRecord::Schema.define(:version => 20130224022542) do create_table "adminusers", :force => true do |t| t.string "team", :null => false @@ -34,6 +34,7 @@ t.datetime "created_at", :null => false t.datetime "updated_at", :null => false t.integer "points" + t.string "team" end end
情報画像得票
氏名
<%= f.text_field :name %>
かな
<%= f.text_field :kana %>
+
所属チーム
<%= f.text_field :team %>
背番号
<%= f.select :number, (1..99).to_a %>
ポジション
<%= f.select :position, POSITIONS_FORM %>
学年
<%= f.select :grade, GRADES_FORM %>
@@ -65,9 +39,17 @@
-
画像
<%= image_tag(player.imgurl, :class => 'prof-img') %> +
画像
+
<%= image_tag(player.imgurl, :class => 'prof-img') %>
+ ↓新しい画像を設定する場合
+ +
紹介文
<%= f.text_area :introduction, :cols => 30, :rows => 3 %>
- <%= f.submit('情報を更新する', :class => 'btn') %> +
+
+ <%= f.submit('情報を更新する', :class => 'btn btn-info btn-small') %> + <%= link_to '削除', {:controller => 'players', :action => 'delete', :id => player.id }, :data => { :confirm => 'この選手を削除しますか?' }, :class => 'btn btn-small btn-danger delete-player' %> +