add nginx conf and remove unused files.

Author: robbin

Gemfile

@@ -40,4 +40,4 @@ group :test do
   gem 'rack-test', :require => "rack/test"
   gem 'factory_girl'
   gem 'database_cleaner'
-end
+end

TODO

@@ -20,4 +20,5 @@
   * default website favicon
 
 - Bug
+  * upload attachment and delete immediately
   * IE compatiablity

app/controllers/admin.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
+
 RobbinSite.controllers :admin do
+  
   before do
     halt 403 unless account_admin?
   end
@@ -35,7 +37,7 @@
 
   get :edit_blog, :map => '/admin/blog/:id/edit' do
     @blog = Blog.find params[:id].to_i
-    @attachments = current_account.attachments.where(:blog_id => [nil, @blog.id])
+    @attachments = current_account.attachments.where(:blog_id => [nil, @blog.id]).order('id ASC')
     render 'admin/edit_blog'
   end
 
@@ -54,7 +56,7 @@
     @blog = Blog.find params[:id].to_i
     @blog.destroy
     flash[:notice] = '文章已经删除'
-    redirect url(:blog, :index)
+    redirect url(:index)
   end
 
   delete :comment, :map => '/admin/comment/:id' do
@@ -112,8 +114,8 @@
   end
 
   get :accounts, :map => '/admin/accounts' do
-    @admin_accounts = Account.where(:role => 'admin').order('id ASC');
-    @commenters = Account.where(:role => 'commenter').order('id DESC');
+    @admin_accounts = Account.where(:role => 'admin').order('id ASC')
+    @commenters = Account.where(:role => 'commenter').order('id DESC')
     render 'admin/accounts'
   end
 

app/controllers/test.rb

@@ -55,7 +55,6 @@
       <% end %>
       <div id="attachment_iframes">
         <iframe src="<%= url(:admin, :new_attachment) %>" style="border:0px;height:30px;width:100%;" frameborder="0" border="0" cellspacing="0" allowTransparency="true" scrolling="no" resizable="no"></iframe>
-        <input type="hidden" value="0" class="max-value-0" id="attachments_counter"/>
       </div>
       <ul>
         提示信息：

app/views/admin/_form.erb

@@ -14,9 +14,7 @@
 
     <script type="text/javascript">
       function upload(fileName) {
-        var counter = parseInt(window.parent.$('#attachments_counter').val()) + 1;
-        window.parent.$('#attachments_counter').val(counter);
-        $('#upload-tip').html(counter + " 个文件正在上传中，请等待完成后再提交").show();
+        $('#upload-tip').html("文件正在上传中，请等待完成后再提交").show();
         $('#spinner').show();
         var iframes = window.parent.$("#attachment_iframes")[0];
         iframes.appendChild(iframes.getElementsByTagName('iframe')[0].cloneNode(false));

app/views/admin/new_attachment.erb

@@ -23,7 +23,7 @@
           <%= current_account.name -%>
           <% if account_admin? -%>
           <%= link_to '写文章', url(:admin, :new_blog) -%>
-          <%= link_to '设置', url(:admin, :index) -%>
+          <%= link_to '管理', url(:admin, :index) -%>
           <% end -%>
           <%= button_to '退出', url(:logout), :method => :delete %>
         <% end %>

app/views/layouts/application.erb

@@ -0,0 +1,54 @@
+http {
+  include                             mime.types;
+  default_type                        application/octet-stream;
+  access_log                          off;
+  server_tokens                       off;
+  charset                             utf-8;
+  client_max_body_size                5M;
+  keepalive_timeout                   60 20;
+  send_timeout                        10;
+  sendfile                            on;
+  tcp_nopush                          on;
+  tcp_nodelay                         off;
+    
+  gzip                                on;
+  gzip_min_length                     1k;
+  gzip_disable                        "MSIE [1-6]\.";
+  gzip_http_version                   1.1;
+  gzip_types                          text/plain text/css application/x-javascript application/xml application/json application/atom+xml application/rss+xml;
+  gzip_vary                           on;
+
+  server {
+    listen          80;
+    server_name     www.robbinfan.com;
+    root            /webroot/robbin_site/public;
+    rewrite         ^/(.*)$  http://robbinfan.com/$1  permanent;
+  }
+  server {
+    listen          80;
+    server_name     robbinfan.com;
+    root            /webroot/robbin_site/public;
+    rewrite         /leanstartup/lean_startup_note.html  /blog/27/lean-startup permanent;
+    location / {
+      add_header    X-UA-Compatible IE=Edge,chrome=1;
+      try_files $uri @rainbows;
+    }
+    location ~ ^/(images|javascripts|skins|stylesheets|uploads)/ {
+      access_log    off;
+      error_log     /dev/null crit;
+      # expires       max;
+      expires       1w;
+      add_header    Cache-Control public;
+      add_header    ETag "";
+      break;
+    }
+    location @rainbows {
+      proxy_set_header  X-Real-IP        $remote_addr;
+      proxy_set_header  X-Forwarded-For  $proxy_add_x_forwarded_for;
+      proxy_set_header  Host             $http_host;
+      proxy_pass        http://127.0.0.1:8080;
+    }
+    error_page   404 406          /404.html;
+    error_page   500 502 503 504  /500.html;
+  }
+}