From b5719aca8ec83f6b5baf3d326e85bb9b0f88028c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 14 May 2015 14:38:22 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=88=91=E8=A6=81=E6=8F=90=E9=97=AE=E5=90=8E=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_topic_form.html.erb | 12 +++++------ app/views/memos/new.html.erb | 32 ++++++++++++++-------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb index 3ce8cdf9a..6ce63bef6 100644 --- a/app/views/memos/_topic_form.html.erb +++ b/app/views/memos/_topic_form.html.erb @@ -2,15 +2,15 @@
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> -

<%= f.text_field :subject, :required => true, :size => 95 %>

+

<%= f.text_field :subject, :required => true, :size => 95, :style => 'width:98%' %>

<%= f.kindeditor :content,:width=>'99%', :required => true %>

-
+
-

- <%= l(:label_attachment_plural) %>
- <%= render :partial => 'attachments/form', :locals => {:container => @memo} %> -

+ +
+ <%= render :partial => 'attachments/form', :locals => {:container => @memo} %> +
<%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
<% end %> \ No newline at end of file diff --git a/app/views/memos/new.html.erb b/app/views/memos/new.html.erb index b884df909..8a1863047 100644 --- a/app/views/memos/new.html.erb +++ b/app/views/memos/new.html.erb @@ -5,22 +5,22 @@ <% @nav_dispaly_forum_label = 1%> <%= javascript_include_tag "/assets/kindeditor/kindeditor" %> -
- - - - - - - - - - -
<%= l(:label_projects_community)%><%= l(:label_user_location) %> : -
-
-
<%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to l(:label_forum), :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name %>

-
+
+ + + + + + + + + + +
<%= l(:label_projects_community)%><%= l(:label_user_location) %> : +
+
+
<%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to l(:label_forum), :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name %>

+

<%=l(:label_memo_new)%>

From 963a21283f094f338ed66a744b5271a304d50e21 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 14 May 2015 15:09:15 +0800 Subject: [PATCH 2/8] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E6=89=93=E5=88=86=E6=8F=92=E4=BB=B6=E6=98=9F=E6=98=9F?= =?UTF-8?q?=E7=A7=BB=E4=BD=8D=202=E3=80=81=E4=BF=AE=E6=94=B9=E8=BF=94?= =?UTF-8?q?=E8=BF=98=E6=89=B9=E6=94=B9=E7=BB=93=E6=9E=9C=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_homework_jour_link.html.erb | 2 +- app/views/homework_attach/_addjour.html.erb | 2 +- public/stylesheets/css.css | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/attachments/_homework_jour_link.html.erb b/app/views/attachments/_homework_jour_link.html.erb index e0efa211c..8721d41ac 100644 --- a/app/views/attachments/_homework_jour_link.html.erb +++ b/app/views/attachments/_homework_jour_link.html.erb @@ -13,6 +13,6 @@ :target => "_blank"%>
<% end %> -
+
<% end %>
diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb index c6a08209c..7dbaa0017 100644 --- a/app/views/homework_attach/_addjour.html.erb +++ b/app/views/homework_attach/_addjour.html.erb @@ -59,7 +59,7 @@ 文件： -
+
<%= render :partial => 'attachments/form' %>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css index ea42f7887..ebb290597 100644 --- a/public/stylesheets/css.css +++ b/public/stylesheets/css.css @@ -86,7 +86,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .ping_con h2{ font-size:14px; color:#444443; margin-bottom:10px; } .ping_con p{ color:#777777; font-size:12px; border-bottom:1px dashed #CCC; padding-bottom:5px;} .ping_con p span a{ color:#777777;} -.ping_star{ width:185px; color:#333; font-weight:bold; margin-bottom:5px;} +.ping_star{ width:195px; color:#333; font-weight:bold; margin-bottom:5px;} .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png);background-repeat: no-repeat; margin-right:3px;} .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;} a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px; background:#15bccf; color:#fff; text-align:center;} From 8d44ed2189456f5aa79030a309398c60d56a134b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 14 May 2015 15:17:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E8=AF=BE=E7=A8=8B--=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=9A=E5=8F=96=E6=B6=88=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E8=80=8C=E9=9D=9E=E4=B8=80=E4=B8=AA=E7=A9=BA=E7=99=BD=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/news/_course_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb index a76d84701..32c8e368e 100644 --- a/app/views/news/_course_form.html.erb +++ b/app/views/news/_course_form.html.erb @@ -29,7 +29,7 @@ <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %> <% else %> <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white' %> - <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => '$("#edit-news").hide(); return false;',:class => 'blue_btn grey_btn fl c_white' %> + <%= link_to l(:button_cancel), news_path(@news), :class => 'blue_btn grey_btn fl c_white' %> <% end %>
From 33365f7ea6829b536821ba1397aba1531ea1822b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 14 May 2015 16:04:07 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=97=B6=E9=99=84=E4=BB=B6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=A7=BB=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 3 +++ app/views/homework_attach/edit.html.erb | 30 +++++++++++++++++++------ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 2e8800617..845e2b6a0 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -17,6 +17,7 @@ <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> +
<% end %> <% container.saved_attachments.each_with_index do |attachment, i| %> @@ -34,10 +35,12 @@ <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> +
<% end %> <% end %> <% project = project %> +
<%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> diff --git a/app/views/homework_attach/edit.html.erb b/app/views/homework_attach/edit.html.erb index e31c5008f..16b9d2c7e 100644 --- a/app/views/homework_attach/edit.html.erb +++ b/app/views/homework_attach/edit.html.erb @@ -75,16 +75,32 @@ <%= f.text_area :description, :rows => 8, :name => "homework_description", :class => "w620", :maxlength => 3000, :placeholder => "最多3000个汉字" %>

-

-

+ -
- <%= render :partial => 'attachments/form', :locals => {:container => @homework}%> + + + + +
+ <%= render :partial => 'attachments/form', :locals => {:container => @homework} %>
-

-

+ +

- <% end %> -