From 6ac5b738e38257ab80261ed10fe992cd633921b0 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 16:27:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BC=96=E8=BE=91=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_form_edit_mode.html.erb | 63 ++++++------------- app/views/forums/edit.html.erb | 74 ++++++++++++++++++++++- app/views/layouts/base_forums.html.erb | 4 +- public/stylesheets/new_user.css | 3 +- 4 files changed, 95 insertions(+), 49 deletions(-) diff --git a/app/views/forums/_form_edit_mode.html.erb b/app/views/forums/_form_edit_mode.html.erb index a9bb05f79..9c0ec27bd 100644 --- a/app/views/forums/_form_edit_mode.html.erb +++ b/app/views/forums/_form_edit_mode.html.erb @@ -1,49 +1,26 @@ - - -
- <%= labelled_form_for(@forum) do |f| %> - <% if @forum.errors.any? %> - - <% end %> -
-
- <%= f.text_field :name, :required => true, :style => 'width: 100%;', :class => 'create-share', :maxlength => 50%> -
-
- <% if User.current.logged? && User.current.admin? %> - <% if @forum.safe_attribute? 'sticky' %> - <%= f.check_box :sticky %> - <%= label_tag 'message_sticky', l(:label_board_sticky) %> - <% end %> - <% if @forum.safe_attribute? 'locked' %> - <%= f.check_box :locked %> - <%= label_tag 'message_locked', l(:label_board_locked) %> - <% end %> +
+ <%= labelled_form_for(@forum) do |f| %> + +
+ +
+
+ +
+
+ + +
+
<% end %>
-
-

- <%= f.kindeditor :description, :required => true,:owner_id => @forum.id,:owner_type => 2 %> -

- -

- (<%= l(:label_forums_max_length) %>) -

-
-
- <%= submit_tag l(:button_submit) %> - <%= link_to l(:button_back), forums_path ,:style => 'font-size: 14px; padding: 0px 3px;' %> -
- <% end %> -
+
\ No newline at end of file diff --git a/app/views/forums/edit.html.erb b/app/views/forums/edit.html.erb index 0a40120c7..24130e727 100644 --- a/app/views/forums/edit.html.erb +++ b/app/views/forums/edit.html.erb @@ -1,4 +1,72 @@ - -

编辑讨论区

-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> + +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'new_user' %> + <%= render 'form_edit_mode' %> + \ No newline at end of file diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 962331fad..7808af055 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -143,7 +143,7 @@
-
"><%= @forum.name%>
+
" style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%>
吧主:<%= @forum.creator.name%>
回答:<%= @forum.memo_count %> 帖子:<%=@forum.topic_count%>
@@ -171,7 +171,7 @@
- 编辑贴吧 + 编辑贴吧 删除贴吧 <% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4e1aad655..c97483c9b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -723,7 +723,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postRow {width:970px; border-bottom:1px solid #efefef; padding:15px 0;} .postPortrait {width:75px; height:75px; float:left; margin-right:15px;} .postWrap {width:690px; float:left; margin-right:95px;} -.postTitle {width:690px; max-width:690px; margin-bottom:5px;} +.postTitle {width:690px; max-width:690px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } .postDes {width:690px; max-width:690px; margin-bottom:6px; color:#484848;} .postCreater {color:#888888; font-size:12px; float:left; margin-right:40px;} .postDate {color:#888888; font-size:12px;} @@ -761,6 +761,7 @@ a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !im a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;} .postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;} .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;} +.pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}