From d8e04ae9741d92895cf5d57673c5cf1763607fd4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 29 Aug 2014 11:40:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E6=B7=BB=E5=8A=A0=E3=80=81?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB=E5=A2=9E=E5=8A=A0js?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/news/_form.html.erb | 6 ++-
app/views/news/_project_news.html.erb | 57 +++++++++++++++++++++++++-
app/views/news/_project_show.html.erb | 59 +++++++++++++++++++++++++--
3 files changed, 116 insertions(+), 6 deletions(-)
diff --git a/app/views/news/_form.html.erb b/app/views/news/_form.html.erb
index f92559903..35d8da952 100644
--- a/app/views/news/_form.html.erb
+++ b/app/views/news/_form.html.erb
@@ -3,9 +3,11 @@
<%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
-
<%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %>
+
<%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onblur => "regexTitle();" %>
+
(60个字符以内)
-
<%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %>
+
<%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onblur => "regexDescription();" %>
+
<%= render :partial => 'attachments/form', :locals => {:container => @news} %>
diff --git a/app/views/news/_project_news.html.erb b/app/views/news/_project_news.html.erb
index cdef33e34..e9a912c5c 100644
--- a/app/views/news/_project_news.html.erb
+++ b/app/views/news/_project_news.html.erb
@@ -1,3 +1,56 @@
+
+
<%
if @project.project_type == Project::ProjectType_course
btn_tips = l(:label_news_notice)
@@ -22,7 +75,9 @@
<%= labelled_form_for @news, :url => project_news_index_path(@project),
:html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/form', :locals => {:f => f} %>
- <%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %> |
+ <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %>
+ <%= link_to l(:button_create), "#", :onclick => 'submitNews();', :class => 'whiteButton m3p10' %>
+ |
<%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
|
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index c8a8c5767..ecae672b6 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -1,3 +1,55 @@
+
<%= watcher_link(@news, User.current) %>
<%= link_to(l(:button_edit),
@@ -15,9 +67,10 @@
<%= labelled_form_for :news, @news, :url => news_path(@news),
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %>
- <%= submit_tag l(:button_save) %>
- <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => ''} %> |
- <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+ <%#= submit_tag l(:button_save) %>
+ <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
+ <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
+ <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
<% end %>