editor minor fix.

Author: robbin

TODO

@@ -1,11 +1,8 @@
 - Today
   * upload attachment and delete immediately bug
-  * blog article digest layout
-  * right column recent comments layout
+  * resume
 
 - Next
-  * Editor Tab
-  * resume
   * admin panel:
   * IE compatiablity
 

app/controllers/blog.rb

@@ -48,7 +48,7 @@
 
   post :create_comment, :map => '/blog/:id/comments' do
     content_type :js
-    halt 403 unless account_login?
+    halt 401 unless account_login?
     blog = Blog.find params[:id]
     halt 403 unless blog.commentable?
     @comment = blog.comments.create(:account => current_account, :content => params[:blog_comment][:content])

app/views/admin/_attachment.erb

@@ -3,3 +3,18 @@
   <%= link_to image_tag('btn_delete.png', :title => '删除附件'), url(:admin, :attachment, :id => attachment.id), :method => :delete, :remote => true, :confirm => '是否删除附件' %>
   <a href="#" onclick="window.parent.$('#blog_content').insertAtCaret('\n![](<%= attachment.file.url %>)\n');return false;"><%= image_tag 'btn_sticky.png', :title => '将图片插入编辑器' %></a>
 </div>
+<script type="text/javascript" charset="utf-8">
+  $('a[data-remote=true]').on('click', function(e) {
+    var element = $(this); 
+    if (e.stopped) return;
+    e.preventDefault(); e.stopped = true;
+    JSAdapter.sendRequest(element, { 
+      verb: element.data('method') || 'get', 
+      url: element.attr('href')
+    });
+  });
+  $('a[data-confirm]').on('click', function(e) {
+    var message = $(this).data('confirm');
+    if (!confirm(message)) { e.preventDefault(); e.stopped = true; }
+  });
+</script>

app/views/admin/_form.erb

@@ -19,10 +19,8 @@
       <%= form.text_area :content %>
       <div id="blog_content_preview" class="con text"></div>
       <div>
-        <ul>
-          <li>编辑器支持Github风格的Markdown格式: [<a href="https://help.github.com/articles/github-flavored-markdown" target="_blank">Github flavored markdown</a>]</li>
-          <li>Markdown中文帮助: [<a href="http://wowubuntu.com/markdown/" target="_blank">Markdown帮助</a>]</li>
-        </ul>
+        [<a href="http://wowubuntu.com/markdown/" target="_blank">Markdown中文帮助</a>]
+        [<a href="https://help.github.com/articles/github-flavored-markdown" target="_blank">Github风格的Markdown格式</a>]
       </div>
     </td>
   </tr>
@@ -133,15 +131,18 @@
 
     // toggle blog content editor and preview
     $('a#show_blog_content_editor').click(function(){
+      $('a#show_blog_content_editor').addClass('current');
+      $('a#show_blog_content_preview').removeClass('current');
       $('div#blog_content_preview').hide();
       $('textarea#blog_content').show();
       return false;
     });
     $('a#show_blog_content_preview').click(function(){
       $.post('<%= url(:admin, :blog_preview) %>', {term: $('textarea#blog_content').val()}, function(data){
-        $('div#blog_content_preview').html(data);
+        $('a#show_blog_content_editor').removeClass('current');
+        $('a#show_blog_content_preview').addClass('current');
+        $('div#blog_content_preview').html(data).show();
         $('textarea#blog_content').hide();
-        $('div#blog_content_preview').show();
       });
       return false;
     });

app/views/blog/show.erb

@@ -1,6 +1,6 @@
 <% @nav = @blog.category %>
 <% @title = @blog.title %>
-<% @description = @blog.cached_tag_list + ' ' + @blog.content.truncate(200).gsub(/(\r|\n)/, ' ') %>
+<% @description = @blog.cached_tag_list.to_s + ' ' + @blog.content.truncate(200).gsub(/(\r|\n)/, ' ') %>
 
 <% content_for :stylesheets do %>
 <%= stylesheet_link_tag '/skins/default/github' %>
@@ -17,7 +17,7 @@
         <%= link_to @blog.title, blog_url(@blog) %>
         <%= link_to '', blog_url(@blog, mime_type = :md), :class => 'markdown', :title => 'Markdown格式原文' %>
         <% if account_admin? %>
-        <%= link_to '', url(:admin, :blog, :id => @blog.id), :method => :delete, :confirm => 'Are you delete', :class => 'del', :title => '删除' %>
+        <%= link_to '', url(:admin, :blog, :id => @blog.id), :method => :delete, :confirm => '要删除文章吗？', :class => 'del', :title => '删除' %>
         <%= link_to '', url(:admin, :edit_blog, :id => @blog.id), :class => 'edit', :title => '编辑' %>
         <% end %>
       </div>
@@ -29,9 +29,9 @@
       <div class="text">
         <%= @blog.md_content.html_safe %>
       </div>
-			 <div class="info clearfix">
+      <div class="info clearfix">
         <div class="fr">
-					<span class="author"><%= @blog.account.name %></span>
+          <span class="author"><%= @blog.account.name %></span>
           <span class="time"><%= time_ago_in_words(@blog.created_at) %>发表</span>
           <span class="edit"><%= time_ago_in_words(@blog.content_updated_at) %>更新</span>
           <span class="views" title="浏览次数"><%= @blog.view_count %></span>
@@ -57,12 +57,12 @@
       <div class="relative">
         <div style="text-align:right;">[<a href="http://wowubuntu.com/markdown/" target="_blank">评论可以使用Markdown格式</a>]</div>
         <% form_for BlogComment.new, url(:blog, :create_comment, :id => @blog.id), :remote => true do |f| %>
-        <%= f.text_area :content, :class => 'comment' %>
-        <div id="comment-error-info"></div>
-        <%= f.submit '', :class => 'comment_btn' %>
+          <%= f.text_area :content, :class => 'comment' %>
+          <div id="comment-error-info"></div>
+          <%= f.submit '', :class => 'comment_btn' %>
         <% end %>
         <div class="box" style="<%= "display:none;" if account_login? %>">
-          <button class="close" onclick=""></button>
+          <button class="close"></button>
           <p>我想知道与谁交流思想，请用微博登录留言。</p>
           <button class="sina_btn"></button>
         </div><!-- box -->
@@ -95,7 +95,7 @@
     $('button.sina_btn').click(function(){
       var width=Math.round((window.screen.width-800)/2);
       var height=Math.round((window.screen.height-600)/2);
-      window.open('<%= url(:weibo_login) %>/?quick_login=1', 'weibo_third_part_authentication', 'height=300px, width=400px, top='+height+',left='+width+', scrollbars=no, resizable=no, status=no, resizable=no, menubar=no')
+      window.open('<%= url(:weibo_login) %>/?quick_login=1', 'weibo_third_part_authentication', 'height=300px, width=400px, top='+height+',left='+width+', scrollbars=no, resizable=no, status=no, resizable=no, menubar=no');
     });
 
     // validate empty comment

models/blog.rb

@@ -25,8 +25,7 @@ def user_tags
   def user_tags=(tags)
     unless tags.blank?
       # filter illegal characters
-      user_tags_list = tags.split(/\s*,\s*/).uniq.collect {|t| t.downcase}.select {|t| t =~ /^(?!_)(?!.*?_$)[\+#a-zA-Z0-9_\s\u4e00-\u9fa5]+$/}.join(",") 
-      self.tag_list = user_tags_list
+      self.tag_list = tags.split(/\s*,\s*/).uniq.collect {|t| t.downcase}.select {|t| t =~ /^(?!_)(?!.*?_$)[\+#a-zA-Z0-9_\s\u4e00-\u9fa5]+$/}.join(",") 
     end  
   end