Skip to content

Y
Ygopro Arena Web
Commit 7a046f11 authored by 神楽坂玲奈's avatar 神楽坂玲奈
Browse files
Options

临时提交

parent 47560d49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1192 additions and 220 deletions
app/assets/javascripts/html5shiv.js 0 → 100644
View file @ 7a046f11
This diff is collapsed.
app/assets/stylesheets/common.css.scss
View file @ 7a046f11
#footer{
margin:auto;
text-align:left;
width:900px;
}
* {
word-wrap:break-word;
}
......@@ -190,7 +196,7 @@ hr {
* html #wrap {
height:450px;
}
.wrap,#nav {
.wrap,#actions {
width:1024px;
}
#header {
......@@ -295,7 +301,7 @@ hr {
#umenu,#umenu a,#umenu .pipe {
color:#97F2FF;
}
#footer {
#bottom {
padding:1em 0;
}
#rightinfo {
......@@ -305,7 +311,7 @@ hr {
float:right;
text-align:right;
}
#footer,#footer a {
#bottom,#bottom a {
color:#8691A2;
}
.content {
......@@ -355,14 +361,14 @@ hr {
border-color:#00B2E8;
color:#333;
}
#nav {
#actions {
margin:-8px auto 0;
background:image-url("common/icon_nav.gif") no-repeat 0 50%;
text-align:left;
text-indent:25px;
line-height:3em;
}
#nav,#nav a {
#actions,#actions a {
color:#333;
}
.mainbox table {
......@@ -1016,16 +1022,16 @@ thead .nums {
.dropdownbtn:hover {
background-position:0 -20px;
}
#style_switch {
#themes {
position:absolute;
right:0px;
bottom:-25px;
}
#style_switch li {
#themes li {
float:left;
padding-left:5px;
}
#style_switch a {
#themes a {
float:left;
width:8px;
height:8px;
......@@ -1034,88 +1040,14 @@ thead .nums {
line-height:100px;
overflow:hidden;
}
#style_switch a:hover,#style_switch .current a {
#themes a:hover,#themes .current a {
border-color:#FFF;
}
#style_switch .current a {
#themes .current a {
margin-top:-1px;
border-width:2px;
}
#ad_headerbanner {
float:right;
margin:5px 0 10px;
}
.ad_text {
margin:0 auto 5px;
padding:10px 0;
width:1024px;
background:#FFF;
}
.ad_text table {
width:100%;
}
.ad_text td {
padding:3px 20px;
text-align:left;
}
.ad_textlink1,.ad_textlink2 {
margin:10px 0;
padding-left:20px;
background:image-url("common/icon_ad.gif") no-repeat 0 50%;
}
.ad_pip {
clear:right;
float:right;
padding:10px;
background:#FFF;
color:#999;
line-height:130%;
}
.ad_pip li {
margin-bottom:1em;
}
.ad_pip a {
color:#09C;
}
.ad_topicrelated {
clear:both;
float:right;
display:inline;
margin:0 10px 10px;
padding:10px 10px 10px 30px;
border:1px solid #78A73D;
background:#CAEEC0;
}
.ad_column {
text-align:center;
}
.ad_footerbanner {
text-align:center;
clear:both;
margin:5px;
}
.ad_float_left,.ad_float_right {
float:right;
position:fixed;
top:350px;
z-index:300;
}
* html .ad_float_left,* html .ad_float_right {
position:absolute;
top:expression(offsetParent.scrollTop+350);
}
.ad_float_left {
left:5px;
}
.ad_float_right {
right:5px;
}
.ad_couplebanner {
top:5px
}
* html .ad_couplebanner {
top:expression(offsetParent.scrollTop+5);
}
.headactions {
float:right;
line-height:1em;
......@@ -1946,18 +1878,13 @@ img.inline {
background:image-url("common/tbg.gif") repeat-x;
position:relative;
}
.topanel {
width:1024px;
height:34px;
margin:auto;
}
#memberp {
#user {
width:630px;
float:left;
height:32px;
line-height:33px;
}
#memberp a {
#user a {
color:#D0D0D0;
padding:0 4px;
}
......@@ -2007,11 +1934,12 @@ img.inline {
margin:auto;
}
#dmenu {
width:1024px;
height:58px;
margin:auto;
position:relative;
}
.bg-dmenuleft {
clear:both;
width:76px;
height:58px;
background:image-url("common/bg_cat.gif") no-repeat;
......@@ -2023,7 +1951,7 @@ img.inline {
background:#DCE1E8 image-url("common/bg_dmenu.gif") no-repeat;
float:left;
}
#nav {
#actions {
width:1024px;
height:53px;
margin:0 auto;
......@@ -2041,21 +1969,14 @@ img.inline {
.wrap {
width:95% !important;
}
#footer {
#bottom {
width:1024px;
height:200px;
font-size:11px;
color:#717275;
background:#ebebeb image-url("common/bg_bottom.gif") no-repeat;
clear:both;
margin:auto;
}
.footerc {
width:900px;
height:150px;
margin:auto;
text-align:left;
}
#ftop {
width:80px;
height:25px;
......
app/assets/stylesheets/ygo.css.scss
View file @ 7a046f11
......@@ -12,4 +12,5 @@ nav a{color:#ffcc66}
#footer {padding-top: 20px; padding-bottom: 10px; font-size: 12px; color: #0099FF; clear: both; text-align: center; margin-left: auto; margin-right: auto;}
#header{width:600px; margin-left: auto; margin-right: auto;}
#title {width: 600px; font-size: 30px; padding-bottom: 20px; color: #ffcc66; text-align: right; padding-top: 150px;}
#main {width:600px; margin-left: auto; margin-right: auto; display: none;}
\ No newline at end of file
#main {width:600px; margin-left: auto; margin-right: auto; display: none;}
#footer a {color: #0099FF}
\ No newline at end of file
app/controllers/boards_controller.rb
View file @ 7a046f11
......@@ -7,7 +7,7 @@ class BoardsController < ApplicationController
def index
@boards = Board.where(:superboard_id => 0)
@links = Link.all
@actions = []
@actions = [{'论坛'=>:boards}]
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @boards }
......@@ -19,6 +19,7 @@ class BoardsController < ApplicationController
def show
@board = Board.find(params[:id])
@actions = [{'论坛'=>:boards}, @board]
@actions = [@board]
order = params[:order].blank? ? 'displayorder DESC, updated_at DESC' : params[:order]
@topics = @board.topics.page(params[:page]).order(order)
......@@ -42,6 +43,7 @@ class BoardsController < ApplicationController
# GET /boards/1/edit
def edit
return
@board = Board.find(params[:id])
@actions = [@board, :edit]
end
......@@ -49,6 +51,7 @@ class BoardsController < ApplicationController
# POST /boards
# POST /boards.xml
def create
return
@board = Board.new(params[:board])
respond_to do |format|
......@@ -65,6 +68,7 @@ class BoardsController < ApplicationController
# PUT /boards/1
# PUT /boards/1.xml
def update
return
@board = Board.find(params[:id])
respond_to do |format|
......@@ -81,6 +85,7 @@ class BoardsController < ApplicationController
# DELETE /boards/1
# DELETE /boards/1.xml
def destroy
return
@board = Board.find(params[:id])
@board.destroy
......
app/controllers/duels_controller.rb
View file @ 7a046f11
......@@ -68,15 +68,31 @@ class DuelsController < ApplicationController
@duel.winner = params[:duel][:winner_pos] == "true" ? @duel.user1 : @duel.user2
if params[:duel][:credits] == "true"
if @duel.winner == @duel.user1
@duel.user1_credits = 10
@duel.user2_credits = -8
if @duel.user2.credits <= 0
@duel.user1_credits = 3
@duel.user2_credits = -1
elsif @duel.user2.credits <= 10
@duel.user1_credits = 5
@duel.user2_credits = -2
else
@duel.user1_credits = 10
@duel.user2_credits = -4
end
else
@duel.user1_credits = -8
@duel.user2_credits = 10
if @duel.user1.credits <= 0
@duel.user2_credits = 3
@duel.user1_credits = -1
elsif @duel.user1.credits <= 10
@duel.user2_credits = 5
@duel.user1_credits = -2
else
@duel.user2_credits = 10
@duel.user1_credits = -4
end
end
else
@duel.user1_credits = 1
@duel.user2_credits = 1
@duel.user1_credits = 0
@duel.user2_credits = 0
end
if @duel.user1
@duel.user1.credits += @duel.user1_credits
......
app/controllers/rooms_controller.rb
View file @ 7a046f11
#encoding: UTF-8
class RoomsController < ApplicationController
User_Filter = /\[(\d+),(.+?)(?:,(-1|0)|)\]/
Room_Filter = /\[(\d+),(.+?),(wait|start)(#{User_Filter}+?)\]/
require 'open-uri'
layout 'losses'
def index
......@@ -10,7 +8,7 @@ class RoomsController < ApplicationController
respond_to do |format|
format.html # index.html.erb
format.json do
open('http://140.113.242.66:7922/?operation=getroom') do |file|
open('http://140.113.242.66:7922/?operation=getroomjson') do |file|
file.set_encoding("GBK")
file.read.encode("UTF-8").scan(Room_Filter) do |id, name, status, users|
room = {id: id.to_i, name: name, status: status}
......
app/controllers/users_controller.rb
View file @ 7a046f11
......@@ -67,17 +67,17 @@ class UsersController < ApplicationController
if @user.save
reply = begin
open("http://140.113.242.66:7922/?pass=zh99998&operation=forceuserpass&username=#{CGI.escape @user.name}&password=#{CGI.escape @user.password}", 'r:GBK') do |file|
case reply = file.read.encode("UTF-8", :invalid=>:replace, :undef=>:replace )
case reply = file.read.encode("UTF-8", :invalid=>:replace, :undef=>:replace )
when "ok"
open("http://140.113.242.66:7922/?pass=zh99998&operation=saveuser"){} rescue nil
true
else
open("http://140.113.242.66:7922/?pass=zh99998&operation=saveuser"){} rescue nil
true
else
reply
end
end
rescue Exception => exception
([exception] + exception.backtrace).join("\n")
end
end
rescue Exception => exception
([exception] + exception.backtrace).join("\n")
end
if reply == true
session[:user_id] = @user.id
format.html { redirect_to(@user, :notice => '注册成功') }
......
app/views/entries/_onlineuser.html.erb
View file @ 7a046f11
<div id="onlineuser">
<%=t 'stat.onlineuser' %>: <%= Session.count(:conditions => ["updated_at > ?", 30.minutes.ago]) %>
<strong><%=t 'stat.onlineuser' %></strong>
- <%=t 'stat.total' %> <em>0</em>
- <%=t 'stat.max' %> <em>0</em> <%=t 'stat.at' %> <em><%=l Time.now, :format => :long %> </em>.
</div>
\ No newline at end of file
app/views/entries/_search.html.erb
View file @ 7a046f11
<%= form_tag :controller => :topics do %>
<%= text_field_tag "keyword" %>
<%= submit_tag t("search.search") %>
<%= text_field_tag "keyword" %>
<%= submit_tag t("search.search") %>
<%= link_to t("search.advanced") %>
<% end %>
<%= link_to t("search.advanced") %>
\ No newline at end of file
app/views/layouts/_footer.html.erb deleted 100644 → 0
View file @ 47560d49
<div id="footer">
<div class="footerc">
<div style="margin: 0 auto; width: 160px; padding-top: 5px; text-align: center;">
<a href="javascript:;" onclick="scrollTo(0,0);">TOP</a>
</div>
<div id="footlink">
<div style="width: 500px; height: 58px; float: left;">
<ul class="fmenu">
<li style="width: 100px;"><%= link_to 'Mycard Project', :root %></li>
</ul>
<div style="height: 16px; clear: both;">Powered by Reliz</div>
</div>
<div class="bhoge">Powered by:</div>
<div class="bw3c">Validated by:</div>
<div class="bexa">CSS Modify By:</div></div>
</div>
</div>
\ No newline at end of file
app/views/layouts/_header.html.erb deleted 100644 → 0
View file @ 47560d49
<%#= stylesheet_link_tag 'moderator' %>
\ No newline at end of file
app/views/layouts/_top.html.erb deleted 100644 → 0
View file @ 47560d49
<div id="append_parent"></div><div id="ajaxwaitid"></div>
<div id="topbar" name="TOP">
<div class="topanel">
<div id="memberp">
<%= render 'entries/user' %>
</div>
<%= render 'entries/search' %>
</div>
</div>
<div id="headerbg">
<div class="header">
<embed src="<%= image_path('common/banner.swf') %>" quality="high" wmode="transparent" style=" float:left; " pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" width="898" height="116"></embed>
<div id="ad_headerbanner"></div>
</div>
<div id="dmenu">
<div class="bg-dmenuleft"></div>
<div class="bg-dmenu" style="position: relative;">
<div id="menu">
<%= render "entries/navigation" %>
</div>
<div id="style_switch">
<%= render 'entries/theme' %>
</div>
</div>
</div>
<div id="myprompt_menu" style="display:none" class="promptmenu">
<div class="promptcontent">
<ul class="s_clear"><li style="display:none"><!--<a id="prompt_pm" href="pm.php?filter=newpm" target="_blank">private (0)</a> TODO--></li><li style="display:none"><a id="prompt_announcepm" href="pm.php?filter=announcepm" target="_blank">public (0)</a></li><li style="display:none"><a id="prompt_systempm" href="notice.php?filter=systempm" target="_blank">system (0)</a></li><li style="display:none"><a id="prompt_friend" href="notice.php?filter=friend" target="_blank">friend (0)</a></li><li style="display:none"><a id="prompt_threads" href="notice.php?filter=threads" target="_blank">post (0)</a></li></ul>
</div>
</div>
</div>
<div id="nav">
<%= render 'entries/action' %>
</div>
<div id="ad_text"></div>
\ No newline at end of file
app/views/layouts/application.html.erb
View file @ 7a046f11
......@@ -2,20 +2,45 @@
<html>
<head>
<title> <%= @site.name %><% if @actions && !@actions.empty? %> - <%= @actions.last.respond_to?(:name) ? @actions.last.name : @actions.last %> <% end %> </title>
<%#= stylesheet_link_tag 'application' %>
<%= stylesheet_link_tag 'common' %>
<!--[if lt IE 9]><%= javascript_include_tag 'html5shiv' %><![endif]-->
<%= stylesheet_link_tag 'common' %>
<%= stylesheet_link_tag params[:controller] %>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag 'common' %>
<%= javascript_include_tag params[:controller] %>
<%= csrf_meta_tags %>
<%= render 'layouts/header' %>
</head>
<body>
<%= render 'layouts/top' %>
<!--TODO:首部待规范化-->
<div id="topbar" class="topanel">
<%= render 'entries/user' %>
<%= render 'entries/search' %>
</div>
<header id="headerbg">
<div class="header">
<embed src="<%= image_path('common/banner.swf') %>" quality="high" wmode="transparent" style="float:left;" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" width="898" height="116"></embed>
<div class="bg-dmenuleft"></div>
</div>
<div id="dmenu" class="bg-dmenu">
<nav id="menu">
<%= render "entries/navigation" %>
</nav>
</div>
</header>
<nav id="actions">
<%= render 'entries/action' %>
</nav>
<div id="body">
<%= yield %>
</div>
<%= render 'layouts/footer' %>
<div id="bottom">
<a href="javascript:;" onclick="scrollTo(0,0);">回顶部</a>
</div>
<footer id="footer">
<p><%= link_to 'Mycard Project', :root %></p>
</footer>
</body>
</html>
app/views/layouts/ygo.html.erb
View file @ 7a046f11
......@@ -24,7 +24,8 @@
</div>
</div>
<footer id="footer">
YGO DULE BATTLENET 由<a href="http://fh-sky.5d6d.com/">凤凰(FH)战队</a>提供技术支持
YGO DULE BATTLENET yuyuhaso & Mycard Team
友情技术支持：<a href="http://fh-sky.5d6d.com/">凤凰(FH)战队</a>
</footer>
</body>
</html>
\ No newline at end of file
app/views/users/_form.html.erb
View file @ 7a046f11
......@@ -4,9 +4,9 @@
<h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
<ul>
<% @user.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
<% @user.errors.full_messages.each do |msg| %>
<li><%= msg %></li>
<% end %>
</ul>
</div>
<% end %>
......@@ -20,4 +20,4 @@
<p><%= f.label :email %>: <%= f.text_field :email %><%= f.submit %></p>
<p><%= f.label :created_at %>: <%=l @user.created_at, :format => :long %></p>
<p>决斗统计：胜<%= @user.wins.count %>:负<%= @user.losts.count %> 总场次：<%= @user.duels.count %></p>
<% end %>
\ No newline at end of file
<% end %>
config/initializers/session_store.rb
View file @ 7a046f11
# Be sure to restart your server when you modify this file.
# MycardServerHttp::Application.config.session_store :cookie_store, key: '_mycard-server-http_session'
MycardServerHttp::Application.config.session_store :cookie_store, key: '_mycard-server-http_session'
# Use the database for sessions instead of the cookie-based default,
# which shouldn't be used to store highly confidential information
# (create the session table with "rails generate session_migration")
MycardServerHttp::Application.config.session_store :active_record_store
# MycardServerHttp::Application.config.session_store :active_record_store
config/locales/zh-CN.yml
View file @ 7a046f11
......@@ -220,12 +220,6 @@ zh-CN:
models:
user: 用户
attributes:
user:
name: 用户名
nickname: 昵称
id: id
email: 邮箱
created_at: 注册时间
pm:
to_user: "收件人"
content: "正文"
......
db/schema.rb
View file @ 7a046f11
......@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20120409100915) do
ActiveRecord::Schema.define(:version => 20120402031416) do
create_table "boards", :force => true do |t|
t.string "name", :default => "", :null => false
......@@ -60,12 +60,15 @@ ActiveRecord::Schema.define(:version => 20120409100915) do
t.integer "user1_id"
t.integer "user2_id"
t.integer "winner_id"
t.integer "winreason"
t.string "replay"
t.integer "user1_credits"
t.integer "user2_credits"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "winreason", :default => 0, :null => false
t.string "replay", :default => "", :null => false
t.integer "user1_credits", :default => 0, :null => false
t.integer "user2_credits", :default => 0, :null => false
t.integer "version"
t.boolean "user1_public", :default => true, :null => false
t.boolean "user2_public", :default => true, :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
add_index "duels", ["user1_id"], :name => "index_duels_on_user1_id"
......@@ -153,16 +156,6 @@ ActiveRecord::Schema.define(:version => 20120409100915) do
t.boolean "topic_lock", :default => false, :null => false
end
create_table "sessions", :force => true do |t|
t.string "session_id", :null => false
t.text "data"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
end
add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
create_table "settings", :primary_key => "name", :force => true do |t|
t.text "value"
end
......@@ -189,7 +182,7 @@ ActiveRecord::Schema.define(:version => 20120409100915) do
create_table "users", :force => true do |t|
t.string "name", :null => false
t.string "password"
t.string "email"
t.string "email", :default => "", :null => false
t.string "nickname", :default => "", :null => false
t.text "signature"
t.integer "credits", :default => 0, :null => false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment