换行....

ac5eea9f · 神楽坂玲奈 · 0fa1803b · ac5eea9f · ac5eea9f · ac5eea9f
Commit ac5eea9f authored Jun 08, 2012 by 神楽坂玲奈
25 changed files
--- a/.gitattributes
+++ b/.gitattributes
+# Auto detect text files and perform LF normalization
+* text=auto
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
--- a/.gitignore
+++ b/.gitignore
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 #
 # If you find yourself ignoring temporary files generated by your text editor
 # or operating system, you probably want to add a global ignore instead:
 #   git config --global core.excludesfile ~/.gitignore_global
 # Ignore bundler config
 /.bundle
 # Ignore the default SQLite database.
 /db/*.sqlite3
 /nbproject/
 /.idea
 # Ignore all logfiles and tempfiles.
 /log/*.log
 /tmp
 /config/database.yml
 /public/assets
--- a/Gemfile
+++ b/Gemfile
 source 'http://rubygems.org'
 gem 'rails'
 gem "paperclip"
 gem 'http_accept_language'
 gem 'bb-ruby'
 gem 'devise'
 gem 'devise-i18n'
 gem 'kaminari'
 gem 'rails_admin'
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 gem 'mysql2'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
  gem 'sass-rails'
  gem 'coffee-rails'
  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
  if RUBY_PLATFORM["mswin"] or RUBY_PLATFORM["ming"]
    gem 'therubyrhino'
  else
    gem 'therubyracer'
  end
  gem 'uglifier'
 end
 gem 'jquery-rails'
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'
 # To use Jbuilder templates for JSON
 # gem 'jbuilder'
 # Use unicorn as the app server
 # gem 'unicorn'
 # Deploy with Capistrano
 # gem 'capistrano'
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
\ No newline at end of file
--- a/Gemfile.lock
+++ b/Gemfile.lock
 GEM
  remote: http://rubygems.org/
  specs:
    actionmailer (3.2.3)
      actionpack (= 3.2.3)
      mail (~> 2.4.4)
    actionpack (3.2.3)
      activemodel (= 3.2.3)
      activesupport (= 3.2.3)
      builder (~> 3.0.0)
      erubis (~> 2.7.0)
      journey (~> 1.0.1)
      rack (~> 1.4.0)
      rack-cache (~> 1.2)
      rack-test (~> 0.6.1)
      sprockets (~> 2.1.2)
    activemodel (3.2.3)
      activesupport (= 3.2.3)
      builder (~> 3.0.0)
    activerecord (3.2.3)
      activemodel (= 3.2.3)
      activesupport (= 3.2.3)
      arel (~> 3.0.2)
      tzinfo (~> 0.3.29)
    activeresource (3.2.3)
      activemodel (= 3.2.3)
      activesupport (= 3.2.3)
    activesupport (3.2.3)
      i18n (~> 0.6)
      multi_json (~> 1.0)
    arel (3.0.2)
    bb-ruby (0.9.5)
    bbenezech-nested_form (0.0.6)
    bcrypt-ruby (3.0.1)
    bcrypt-ruby (3.0.1-x86-mingw32)
    bootstrap-sass (2.0.3.1)
    builder (3.0.0)
    cocaine (0.2.1)
    coffee-rails (3.2.2)
      coffee-script (>= 2.2.0)
      railties (~> 3.2.0)
    coffee-script (2.2.0)
      coffee-script-source
      execjs
    coffee-script-source (1.3.3)
    devise (2.1.0)
      bcrypt-ruby (~> 3.0)
      orm_adapter (~> 0.0.7)
      railties (~> 3.1)
      warden (~> 1.1.1)
    devise-i18n (0.4.4)
    erubis (2.7.0)
    execjs (1.4.0)
      multi_json (~> 1.0)
    haml (3.1.6)
    hike (1.2.1)
    hpricot (0.8.6)
    http_accept_language (1.0.2)
    i18n (0.6.0)
    journey (1.0.3)
    jquery-rails (2.0.2)
      railties (>= 3.2.0, < 5.0)
      thor (~> 0.14)
    jquery-ui-rails (0.2.2)
      jquery-rails
      railties (>= 3.1.0)
    json (1.7.3)
    kaminari (0.13.0)
      actionpack (>= 3.0.0)
      activesupport (>= 3.0.0)
      railties (>= 3.0.0)
    mail (2.4.4)
      i18n (>= 0.4.0)
      mime-types (~> 1.16)
      treetop (~> 1.4.8)
    mime-types (1.18)
    multi_json (1.3.5)
    mysql2 (0.3.11)
    mysql2 (0.3.11-x86-mingw32)
    orm_adapter (0.0.7)
    paperclip (3.0.4)
      activemodel (>= 3.0.0)
      activerecord (>= 3.0.0)
      activesupport (>= 3.0.0)
      cocaine (>= 0.0.2)
      mime-types
    polyglot (0.3.3)
    rack (1.4.1)
    rack-cache (1.2)
      rack (>= 0.4)
    rack-pjax (0.5.9)
      hpricot (~> 0.8.6)
      rack (~> 1.3)
    rack-ssl (1.3.2)
      rack
    rack-test (0.6.1)
      rack (>= 1.0)
    rails (3.2.3)
      actionmailer (= 3.2.3)
      actionpack (= 3.2.3)
      activerecord (= 3.2.3)
      activeresource (= 3.2.3)
      activesupport (= 3.2.3)
      bundler (~> 1.0)
      railties (= 3.2.3)
    rails_admin (0.0.3)
      bbenezech-nested_form (~> 0.0.6)
      bootstrap-sass (~> 2.0)
      builder (~> 3.0)
      coffee-rails (~> 3.1)
      haml (~> 3.1)
      jquery-rails (>= 1.0.17)
      jquery-ui-rails (~> 0.2.2)
      kaminari (~> 0.12)
      rack-pjax (~> 0.5)
      rails (~> 3.1)
      remotipart (~> 1.0)
      sass-rails (~> 3.1)
    railties (3.2.3)
      actionpack (= 3.2.3)
      activesupport (= 3.2.3)
      rack-ssl (~> 1.3.2)
      rake (>= 0.8.7)
      rdoc (~> 3.4)
      thor (~> 0.14.6)
    rake (0.9.2.2)
    rdoc (3.12)
      json (~> 1.4)
    remotipart (1.0.2)
    sass (3.1.18)
    sass-rails (3.2.5)
      railties (~> 3.2.0)
      sass (>= 3.1.10)
      tilt (~> 1.3)
    sprockets (2.1.3)
      hike (~> 1.2)
      rack (~> 1.0)
      tilt (~> 1.1, != 1.3.0)
    therubyrhino (1.73.4)
    thor (0.14.6)
    tilt (1.3.3)
    treetop (1.4.10)
      polyglot
      polyglot (>= 0.3.1)
    tzinfo (0.3.33)
    uglifier (1.2.4)
      execjs (>= 0.3.0)
      multi_json (>= 1.0.2)
    warden (1.1.1)
      rack (>= 1.0)
 PLATFORMS
  ruby
  x86-mingw32
 DEPENDENCIES
  bb-ruby
  coffee-rails
  devise
  devise-i18n
  http_accept_language
  jquery-rails
  kaminari
  mysql2
  paperclip
  rails
  rails_admin
  sass-rails
  therubyrhino
  uglifier
--- a/app/assets/images/captcha/iepngfix.htc
+++ b/app/assets/images/captcha/iepngfix.htc
 <public:component>
 <public:attach event="onpropertychange" onevent="iePNGFix(0)" />
 <script type="text/javascript">
 // IE5.5+ PNG Alpha Fix v1.0
 // (c) 2004-2008 Angus Turnbull http://www.twinhelix.com
 // This is licensed under the GNU LGPL, version 2.1 or later.
 // For details, see: http://creativecommons.org/licenses/LGPL/2.1/
 // This must be a path to a blank image, relative to the HTML document(s).
 // In production use I suggest '/images/blank.gif' or similar. That's all!
 if (typeof blankImg == 'undefined') var blankImg = 'captcha/imgs/blank.gif';
 function filt(s, b)
 {
 var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
 var sM = (currentStyle.backgroundRepeat == 'no-repeat') ? 'crop' : 'scale';
 s = (s || '').replace(/\(/g, '%28').replace(/\)/g, '%29');
 if (s && !(/IMG|INPUT/.test(nodeName) && !b) &&
  currentStyle.width == 'auto' && currentStyle.height == 'auto')
 {
  style.width = offsetWidth + 'px';
  style.height = clientHeight + 'px';
  if (currentStyle.display == 'inline') style.display = 'inline-block';
 }
 if (filters[f])
 {
  filters[f].enabled = s ? true : false;
  if (s) with (filters[f]) { src = s }
 }
 else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="' + sM + '")';
 }
 function iePNGFix(init)
 {
 if (!/MSIE (5\.5|6)/.test(navigator.userAgent) || typeof filters == 'unknown') return;
 var evt = init ? { propertyName: 'src,background' } : event;
 var isSrc = /src/.test(evt.propertyName);
 var isBg = /background/.test(evt.propertyName);
 var isClass = !init &&
  ((this.className != this._png_class) && (this.className || this._png_class));
 if (!(isSrc || isBg || isClass)) return;
 this._png_class = this.className;
 var blank = blankImg.match(/([^\/]+)$/)[1];
 // Required for Whatever:hover support - erase any set BG if className changes.
 if (isClass && ((style.backgroundImage.indexOf('url(') == -1) ||
     (style.backgroundImage.indexOf(blank) > -1)))
 {
  setTimeout(function() { this.style.backgroundImage = '' }, 0);
  return;
 }
 if (isSrc && this.src && /IMG|INPUT/.test(nodeName))
 {
  if ((/\.png/i).test(src))
  {
   filt(src, 1);
   src = blankImg;
  }
  else if (src.indexOf(blank) == -1) filt();
 }
 var bgSrc = currentStyle.backgroundImage || style.backgroundImage;
 if ((bgSrc + this.src).indexOf(blank) == -1)
 {
  var bgPNG = bgSrc.match(/^url[("']+(.*\.png[^\)"']*)[\)"']+[^\)]*$/i);
  if (bgPNG)
  {
   style.backgroundImage = 'url("' + blankImg + '")';
   filt(bgPNG[1], 0);
   // Unclickable elements inside PNG backgrounds.
   var tags = ['a', 'input', 'select', 'textarea', 'iframe', 'object'],
    t = tags.length, tFix = [];
   while (t--)
   {
    var elms = all.tags(tags[t]), e = elms.length;
    while (e--) tFix.push(elms[e]);
   }
   var t = tFix.length;
   if (t && (/relative|absolute/i).test(currentStyle.position))
    alert('IEPNGFix: Children of positioned element are unclickable:\n\n<' +
     nodeName + (id && ' id=' + id) + '>');
    while (t--)
     if (!(/relative|absolute/i).test(tFix[t].currentStyle.position))
      tFix[t].style.position = 'relative';
  }
  else filt();
 }
 }
 iePNGFix(1);
 </script>
 </public:component>
--- a/app/assets/stylesheets/captcha.css.scss
+++ b/app/assets/stylesheets/captcha.css.scss
 /*img { behavior: image-url("captcha/iepngfix.htc"); }*/
 /* FANCY CAPTCHA STARTS */
 .ajax-fc-container { width: 316px; background:#a8d7ea;  color:#fff;  margin:15px 0 0; }
 /* rounded corners */
 .ajax-fc-rtop, .ajax-fc-rbottom{ display:block; background: white; }
 .ajax-fc-rtop *, .ajax-fc-rbottom *{ display: block; height: 1px; overflow: hidden; background:#a8d7ea; }
 /* describes left and right boxes */
 div#ajax-fc-content { position: absolute; margin-top: -3px; margin-left: 9px; width: 298px; height: 105px; background: image-url("captcha/bg-content-div.png"); }
 div#ajax-fc-content div#ajax-fc-left { width: 200px; height: 100px; float: left; }
 div#ajax-fc-content div#ajax-fc-right { width: 98px; height: 100px; float: right; }
 /* block left: task and pictures */
 p#ajax-fc-task { line-height: 16px; margin: 0; padding: 11px 0 0 11px; font-size: 12px; font-family: Verdana, Tahoma, Arial; color: #18779d; }
 p#ajax-fc-task span { color: #66a70b; font-weight: bold; }
 ul#ajax-fc-task { width: 190px; height: 18px; list-style-type: none; background: image-url("captcha/bg-items.png") -4px 0px; background-repeat: no-repeat; margin: 6px 0 0 0; padding: 5px 0 0 2px; }
 /* block right: cycle and backlink */
 ul#ajax-fc-task li { float: left; margin-right: 1px; margin-top: 6px;}
 p#ajax-fc-circle { position: absolute; margin: 18px 0 0 15px; width: 79px; height: 79px; background: image-url("captcha/circle.png"); background-repeat: no-repeat; }
 img#ajax-fc-backlink { position: absolute; margin-top: 1px; margin-left: 6px; border: 0px; z-index: 101; }
 /* left and right png borders */
 div#ajax-fc-corner-spacer { height: 99px; }
 img.ajax-fc-border { position: absolute; margin-top: -3px; }
 img.ajax-fc-border#ajax-fc-left { margin-left: 2px; }
 img.ajax-fc-border#ajax-fc-right { margin-left: 307px; }
 /* items */
 .ajax-fc-highlighted { cursor: pointer; z-index: 102}
 /* rounded corners */
 .ajax-fc-r1{ margin: 0 5px } .ajax-fc-r2{ margin: 0 3px } .ajax-fc-r3{ margin: 0 2px } .ajax-fc-r4{ margin: 0 1px; height: 2px }
 /* FANCY CAPTCHA ENDS */
\ No newline at end of file
--- a/app/assets/stylesheets/common.css.scss
+++ b/app/assets/stylesheets/common.css.scss
--- a/app/assets/stylesheets/dropdown.css.scss
+++ b/app/assets/stylesheets/dropdown.css.scss
 /*ul.menu {list-style:none; margin:0; padding:0}
 ul.menu li {position:relative; float:left; margin-right:2px}
 ul.menu ul {position:absolute; top:46px; left:0; background:#d1d1d1; display:none; opacity:0; list-style:none}
 ul.menu ul li {position:relative; border:1px solid #aaa; border-top:none; width:148px; margin:0}
 ul.menu ul li a {display:block; padding:3px 7px 5px; background-color:#d1d1d1}
 ul.menu ul li a:hover {background-color:#c5c5c5}
 ul.menu ul ul {left:148px; top:-1px}
 ul.menu .sub {background:#d1d1d1 image-url("dropdown/arrow.gif") 136px 8px no-repeat}
 ul.menu .topline {border-top:1px solid #aaa}*/
 ul.menu{
 	list-style:none; margin:0; padding:0;
 	li{
 		position:relative; float:left;height:50px;border-right:1px solid rgba(255, 255, 255, 0.15);
 		&:hover{background:rgba(38,60,123,0.9);}
 		&:first-child{border-left:1px solid rgba(255, 255, 255, 0.15)}
 	}
 	ul{
 		position:absolute; top:50px; left:0; background-color:rgb(38, 60, 123); display:none; opacity:0; list-style:none;
 		li{
 			position:relative;  border-top:none; width:148px; margin:0;display:block; padding:3px 7px 5px; height:20px;
 			a{}
 		}
 		ul{left:148px; top:-1px;}
 	}
 	.sub{background:#d1d1d1 image-url("dropdown/arrow.gif") 136px 8px no-repeat;}
 	.topline {border-top:1px solid #aaa}
 }
\ No newline at end of file
--- a/app/assets/stylesheets/mycard.css.scss
+++ b/app/assets/stylesheets/mycard.css.scss
 /*
 *= require dropdown
 */
 @mixin background-gradient($from:#3966AE,$to:#263C7B){
 	background: $from;
 	background: -webkit-gradient(linear, 0 0, 0 bottom, from($from), to($to));
 	background: -webkit-linear-gradient($from, $to);
 	background: -moz-linear-gradient($from, $to);
 	background: -ms-linear-gradient($from, $to);
 	background: -o-linear-gradient($from, $to);
 	background: linear-gradient($from, $to);
 }
 *{
 margin:0;
 padding:0;
 }
 body{
 background:#244470 image-url("index/background.png");
 font-family:"\5FAE\8F6F\96C5\9ED1";
 }
 a{
 text-shadow:1px 1px 1px #0C2549;
 text-decoration:none;
 }
 #nav a{
 transition:all .3s ease-in-out;
 text-decoration:none;
 }
 #nav a:link{
 color:white;
 }
 #nav a:hover{
 color:white;
 }
 #nav a:visited{
 color:white;
 }
 #nav{
 width:900px;
 height:50px;
 background:#244470;
 border-width:0 1px 1px 0;
 border-style:solid;
 border-color:#5B82B7;
 border-radius:0 0 5px 5px;
 color:white;
 margin:0 auto;
 font:small-caps 12px "\5FAE\8F6F\96C5\9ED1";
 text-shadow:1px 1px 2px #0C2549;
 @include background-gradient();
 }
 .nav_logo{
 width:120px;
 height:30px;
 margin:0 0 0 5px;
 padding:10px 0 10px 5px;
 border-width:0 1px 0 0;
 border-style:solid;
 border-color:rgba(0, 0, 0, 0.2);
 display:block;
 font:25px bold 'Nunito',sans-serif;
 float:left;
 font-size:24px;
 }
 .nav_link{
 min-width:60px;
 height:30px;
 padding:10px;
 border-width:0 1px 0 0;
 border-style:solid;
 border-color:rgba(0, 0, 0, 0.2);
 display:block;
 font:15px/30px "\5FAE\8F6F\96C5\9ED1";
 float:left;
 text-align:center;
 }
 #main{
 width:99.99%;
 height:310px;
 margin:60px 0 0 0;
 background:rgba(243,243,243,0.6);
 border-width:1px 0 0 1px;
 border-style:solid;
 border-color:#e1e1e1;
 }
 #main_sub{
 width:900px;
 margin:0 auto;
 padding:30px 0 0 0;
 height:280px;
 }
 #information{
 width:390px;
 float:left;
 }
 .title{
 font-size:45px ;
 font-weight:bold;
 font-family:'Nunito',sans-serif;
 }
 .subtitle{
 font:30px "\5FAE\8F6F\96C5\9ED1";
 }
 .subinc{
 font-size:15px;
 color:#525252;
 text-shadow:1px 1px 1px #f1f1f1;
 margin:0 0 0 140px;
 }
 #download{
 width:200px;
 height:60px;
 background:#AA7B2D;
 border:rgba(255,255,255,0.3) solid 3px;
 border-radius:10px;
 margin:50px auto 0 auto;
 }
 .download_active{
 color:white;
 text-shadow:0px 0px 5px rgba(255,255,255,0.6);
 font-size:25px;
 text-align:center;
 margin:5px 0 0 0;
 display:block;
 }
 .download_information{
 color:#f1f1f1;
 text-shadow:0px 0px 2px rgba(255,255,255,0.4);
 font-size:10px;
 display:block;
 text-align:center;
 }
 #slider{
 clear:both;
 width:500px;
 padding:0;
 margin:0 auto;
 z-index:0;
 clear:both;
 display:block;
 float:right;
 top:-212px;
 *top:0;
 }
 .show1{
 width:500px;
 height:275px;
 background:image-url("index/01.png");
 border-radius:10px;
 }
 .show2{
 width:500px;
 height:275px;
 background:image-url("index/02.png");
 border-radius:10px;
 }
 .show3{
 width:500px;
 height:275px;
 background:image-url("index/03.png");
 border-radius:10px;
 }
 footer{
 width:900px;
 margin:0 auto;
 }
 footer h2{
 font:bold 15px/130% "\5FAE\8F6F\96C5\9ED1";
 color:#2e2e2e;
 text-shadow:1px 1px 1px #dedede;
 }
 #footer1{
 height:200px;
 width:300px;
 border-right:1px #bfbfbf dashed;
 margin-top:10px;
 float:left;
 }
 #footer1 a{
 font:12px/130% "\5FAE\8F6F\96C5\9ED1";
 color:#2a2a2a;
 text-shadow:1px 1px 1px #dedede;
 }
 #footer2{
 height:200px;
 width:300px;
 border-right:1px #bfbfbf dashed;
 margin-top:10px;
 float:left;
 }
 #footer3{
 width:280px;
 float:left;
 margin-top:10px;
 padding-left:10px;
 }
 #footer3 a{
 font:12px/130% "\5FAE\8F6F\96C5\9ED1";
 color:#2a2a2a;
 text-shadow:1px 1px 1px #dedede;
 }
--- a/app/assets/stylesheets/ygo.css.scss
+++ b/app/assets/stylesheets/ygo.css.scss
 body {
    background: image-url("ygologo.jpg") no-repeat top center #000000;
    margin: 0px;
    font-size:14px;
    color: white
 }
 a:link { text-decoration: none; color: #ffcc66;}
 a:visited{ color: #ffcc66;}
 a:hover { text-decoration:underline }
 nav {width: 750px; font-size: 14px; padding-bottom: 10px; line-height: 40px; color: #ffcc66; text-align: left; margin-left: auto; margin-right: auto;}
 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;}
 #footer a {color: #0099FF}
\ No newline at end of file
--- a/app/models/board.rb
+++ b/app/models/board.rb
 class Board < ActiveRecord::Base
  belongs_to :superboard, :class_name => "Board"
  has_many :subboards, :foreign_key => :superboard_id, :class_name => "Board"
  has_many :topics, :foreign_key => :category_id
  has_many :posts, :through =>:topics
  has_and_belongs_to_many :moderators, :class_name => "User", :join_table => :moderators
  default_scope order(:displayorder)
  def to_s
    "<a href=\"/boards/#{id}\">#{name}</a>".html_safe
  end
  def logo_url
  	  read_attribute(:logo)
  end
  def logo
  	  "<a href=\"/boards/#{id}\"><img src=\"#{logo_url}\"/></a>".html_safe
  end
  def self.root
    Board.find_by_superboard_id 0
  end
 end
--- a/app/themes/lotus/boards/index.html.erb
+++ b/app/themes/lotus/boards/index.html.erb
 <div  class=" box ui-widget-content ui-corner-all ui-helper-clearfix">
  <div id="fuzhu"></div>
  <%= render @boards %>
 </div>
 <div class="box ui-widget-content ui-corner-all ui-helper-clearfix">
  <div id="fuzhu"></div>
  <div class="ui-dialog-titlebar ui-widget-header ui-corner-all" >
    <table width="100%"  height="27px" border="0" cellspacing="0" cellpadding="0" >
      <tr>
        <td  width="590px"style="padding-left:5px"><%=t 'forum.link'%> </td>
        <td width="590px" style="padding-right:5px" align="right">-</td>
      </tr>
    </table></div>
  <div id=footer2>
    <div id=ft_1>
      <table id="ft_1_t" width="100%" border="0" cellspacing="0" cellpadding="0">
        <tr>
          <td width="590px">
            <%= render @links %> 
          </td>
          <td width="590px"></td>
        </tr>
      </table>
    </div>
    <div id=ft_2>
    </div>
    <div id=ft_3></div>
  </div>
  <div></div>
 </div>
 <div class="ui-dialog-titlebar ui-widget-header ui-corner-all">
  <table width="100%"  height="27px"border="0" cellspacing="0" cellpadding="0" >
    <tr>
      <td  width="590px"style="padding-left:5px"><%= render 'entries/onlineuser' %> </td>
      <td width="590px" style="padding-right:5px" align="right">-</td>
    </tr>
  </table></div>
 </div>
\ No newline at end of file
--- a/app/themes/lotus/layouts/_header.html.erb
+++ b/app/themes/lotus/layouts/_header.html.erb
--- a/app/views/attachments/_attachment.html.erb
+++ b/app/views/attachments/_attachment.html.erb
 <li>
  <%= link_to attachment.data.original_filename, attachment.data.url %>
  <% case %>
  <% when attachment.data.content_type[0, 5] == "image" %>
      <div><%= image_tag attachment.data.url %></div>
  <% else %>
      <% case File.extname attachment.data.original_filename %>
      <% when ".yrp" %>
          <span><%= link_to "播放", 'mycard://' + request.env['HTTP_HOST'] + URI.escape(URI.escape(attachment.data.url nil, timestamp: false )) %></span>
      <% when ".ydk" %>
          <span><%= link_to "编辑", 'mycard://' + request.env['HTTP_HOST'] + URI.escape(URI.escape(attachment.data.url nil, timestamp: false )) %></span>
      <% when ".deck" %>
          <span><%= link_to "编辑", 'mycard://' + request.env['HTTP_HOST'] + URI.escape(URI.escape(attachment.data.url nil, timestamp: false )) %></span>
      <% end %>
  <% end %>
 </li>
\ No newline at end of file
--- a/app/views/boards/edit.html.erb
+++ b/app/views/boards/edit.html.erb
 <%= form_for(@board) do |f| %>
  <% if @board.errors.any? %>
    <div id="error_explanation">
      <h2><%= pluralize(@board.errors.count, "error") %> prohibited this board from being saved:</h2>
      <ul>
      <% @board.errors.full_messages.each do |msg| %>
        <li><%= msg %></li>
      <% end %>
      </ul>
    </div>
  <% end %>
  <div class="field">
    <%= f.label t 'board.name' %><br />
    <%= f.text_field :name %>
  </div>
  <div class="field">
    <%= f.label t 'board.introduction' %><br />
    <%= f.text_area :introduction %>
  </div>
  <div class="field">
    <%= f.label t 'board.notice' %><br />
    <%= f.text_area :notice %>
  </div>
  <div class="field">
    <%= f.label t 'board.logo' %><br />
    <%= f.text_field :logo %>
  </div>
  <div class="field">
    <%= f.label t 'board.banner' %><br />
    <%= f.text_field :banner %>
  </div>
  <div class="field">
    <%= f.label t 'board.readperm' %><br />
    <%= f.text_field :readperm %>
  </div>
  <div class="field">
    <%= f.label t 'board.topicperm' %><br />
    <%= f.text_field :topicperm %>
  </div>
  <div class="field">
    <%= f.label t 'board.postperm' %><br />
    <%= f.text_field :postperm %>
  </div>
  <div class="actions">
    <%= f.submit t 'board.submit' %>
  </div>
 <% end %>
--- a/app/views/comments/index.html.erb
+++ b/app/views/comments/index.html.erb
 <h1>Listing comments</h1>
 <table>
  <tr>
    <th>Post</th>
    <th>User</th>
    <th>Content</th>
    <th></th>
    <th></th>
    <th></th>
  </tr>
 <% @comments.each do |comment| %>   
  <tr>
    <td><%= comment.post %></td>
    <td><%= comment.user %></td>
    <td><%= comment.content %></td>
    <td><%= link_to 'Show', comment %></td>
    <td><%= link_to 'Edit', edit_comment_path(comment) %></td>
    <td><%= link_to 'Destroy', comment, :confirm => 'Are you sure?', :method => :delete %></td>
  </tr>
 <% end %>
 </table>
 <br />
 <%= link_to 'New Comment', new_comment_path %>
--- a/app/views/entries/_action.html.erb
+++ b/app/views/entries/_action.html.erb
 <%= @site %>
 <% @actions.each do |action| %>
  &raquo; 
  <span class="action">
    <%= action.is_a?(Hash) ? link_to(action.keys[0], action.values[0]) : action %>
  </span>
 <% end %>
\ No newline at end of file
--- a/app/views/entries/_navigation.html.erb
+++ b/app/views/entries/_navigation.html.erb
 <div id="navigations">
  <ul>
    <% @navigations.each do |navigation| %>
      <li class="navigation"><%=link_to navigation.name, navigation.url %></li>
    <% end %>
  </ul>
 </div>
\ No newline at end of file
--- a/app/views/entries/_search.html.erb
+++ b/app/views/entries/_search.html.erb
 <div id="search">
 <%= form_tag topics_path do %>
  <%= text_field_tag "keyword" %>
  <%= submit_tag t("search.search"), id: "search_submit" %>
  <%= link_to t("search.advanced") %>
 <% end %>
 </div>
\ No newline at end of file
--- a/app/views/entries/_user.html.erb
+++ b/app/views/entries/_user.html.erb
 <div id="user">
  <% if logged? %>
    <%= link_to @current_user.name, @current_user %>
    <%#= link_to Pm.model_name.human, pms_path %>
    <%= link_to User.human_attribute_name('logout'), logout_path %>
  <% else %>
    <%= link_to User.human_attribute_name('login'), login_path %>
    <%= link_to User.human_attribute_name('register'), register_path %>
  <% end %>
 </div>
\ No newline at end of file
--- a/app/views/posts/edit.html.erb
+++ b/app/views/posts/edit.html.erb
 <h1>Editing post</h1>
 <%= render 'form' %>
 <%= link_to 'Show', @post %> |
 <%= link_to 'Back', posts_path %>
--- a/app/views/topics/new.html.erb
+++ b/app/views/topics/new.html.erb
 <h1>New topic</h1>
 <%= render 'form' %>
 <%= link_to 'Back', topics_path %>
--- a/config/initializers/rails_admin.rb
+++ b/config/initializers/rails_admin.rb
 #encoding: UTF-8
 RailsAdmin.config do |config|
  config.main_app_name = Proc.new { |controller| [ "Mycard", "管理中心 - #{controller.params[:action].try(:titleize)}" ] }
  class FakeUser
    def self.username
      'admin'
    end
    def self.email
      'zh99998@gmail.com'
    end
  end
  RailsAdmin.config do |config|
    config.current_user_method do
      authenticate_or_request_with_http_basic do |username, password|
        p username, password, username == "admin" && password == "mycard.web"
        username == "admin" && password == "mycard.web"
      end
      FakeUser
    end
    config.authenticate_with{}
  end
 end
\ No newline at end of file
--- a/db/migrate/20111036031160_create_settings.rb
+++ b/db/migrate/20111036031160_create_settings.rb
 class CreateSettings < ActiveRecord::Migration
  def self.up
    create_table :settings, :primary_key => :name do |t|
      t.text :value
    end
    change_column(:settings, :name, :string)
  end
  def self.down
    drop_table :settings
  end
 end
--- a/db/schema.rb
+++ b/db/schema.rb