From eed530db2b091b6d98208656a5f811346ba4be74 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 15:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=9A=84=20=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_file_form.html.erb | 6 +++--- app/views/layouts/base_forums.html.erb | 7 +++++++ public/stylesheets/images/post_image_list.png | Bin 3091 -> 4952 bytes public/stylesheets/new_user.css | 11 ++++++----- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb index 28bb3fa83..030c8ff0e 100644 --- a/app/views/forums/_file_form.html.erb +++ b/app/views/forums/_file_form.html.erb @@ -43,11 +43,11 @@ <% project = project %>
- + <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %> - + 上传附件 <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => 'file_selector', @@ -71,7 +71,7 @@ <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %> - + <% content_for :header_tags do %> <%= javascript_include_tag 'attachments' %> diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 79341d458..962331fad 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -167,7 +167,14 @@ + <%if @forum.creator.id == User.current.id%>
+ + + 编辑贴吧 + 删除贴吧 + + <% end %>
<%= link_to image_tag(url_to_avatar(User.current),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path( User.current) %>
diff --git a/public/stylesheets/images/post_image_list.png b/public/stylesheets/images/post_image_list.png index 86aab4c79da00af1cc7655a2d53013c233b13ae4..07636288d621c75c88dc27fa7291b30675c3f012 100644 GIT binary patch literal 4952 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 IS$aqQ2l)VA5&!@I diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 1b0dd5533..4e1aad655 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -759,7 +759,8 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;} a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} 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;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} @@ -943,8 +944,8 @@ a:hover.BlueCirBtn{ background:#269ac9; color:#fff;} .w720{width:721px;} .w709{width: 709px;} .w701{width: 701px;} -a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;} +/*a.AnnexBtn{ background: url(../images/homepage_icon2.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/ +/*a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-repeat; color:#269ac9;}*/ a.FilesBtn{ background: url(../images/homepage_icon2.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.FilesBtn{background: url(../images/homepage_icon2.png) -89px -372px no-repeat; color:#269ac9;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #269ac9; color:#269ac9; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} @@ -961,8 +962,8 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;} .W440{ width:440px;} .W120{ width:110px;} .W700{ width:700px;} -a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} -a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;} +/*a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/ +/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/ a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;} a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}