From 3469d928d865874376f837a85b658a340ea27d37 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 6 May 2016 20:17:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8F=98=E7=9A=84=E5=BE=88?=
 =?UTF-8?q?=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_sub_domain.html.erb | 16 +++++++++++-----
 public/stylesheets/org2.css                |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_sub_domain.html.erb b/app/views/layouts/base_sub_domain.html.erb
index 49f30796b..b4f3e5832 100644
--- a/app/views/layouts/base_sub_domain.html.erb
+++ b/app/views/layouts/base_sub_domain.html.erb
@@ -85,10 +85,9 @@
               <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt="">
           <% end %>
           <% if User.current.admin_of_org?(@organization) %>
-                <a href="#" class="logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
+                <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>
           <% end %>
-          <!--<a href="javascript:void(0);" class="sn-search-button sn-mt28"></a>-->
-          <!--<input type="text" class="sn-search-input sn-mt28" placeholder="搜索" />-->
+
         </div>
       </div>
       <!--导航-->
@@ -138,8 +137,15 @@
         </ul>
       </div>
       <div class="sn-row">
-        <div class="sn-banner"><img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />
-          <a href="#" class="sn-banner-add" title="点击替换图片" ></a>
+        <div class="sn-banner">
+          <% if @org_banner_attchment.blank? %>
+              <img width="1200" height="210" src="/images/sn_banner.jpg" alt=""/>
+          <% else %>
+              <img src="/attachments/<%= @org_banner_attchment.id %>/<%= @org_banner_attchment.filename %>" width="1200" height="210" alt="banner image" />
+          <% end %>
+          <a href="#" class="sn-banner-add" title="点击替换图片" onclick="org_new_files_banner_upload();"></a>
+          <!--<img src="/images/sn_banner.jpg" width="1200" height="210" alt="banner image" />-->
+          <!--<a href="#" class="sn-banner-add" title="点击替换图片" ></a>-->
         </div>
       </div>
     </div>
diff --git a/public/stylesheets/org2.css b/public/stylesheets/org2.css
index eafa167c9..c2f4df3ed 100644
--- a/public/stylesheets/org2.css
+++ b/public/stylesheets/org2.css
@@ -77,7 +77,7 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
 .sn-subnav-slice {margin:12px 5px;}
 .sn-banner {width:1200px; height:210px; margin:0 auto;}
 .sn-logo-add{ display:block;  top:5px; left:0px; position:absolute;  width:20px; height:20px;background:url(../images/default_blank/icons-add.png) 0px -3px no-repeat;}
-.sn-banner-add{ display:block; position:absolute; top:10px; left:10px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;}
+.sn-banner-add{ display:block; position:absolute; top:210px; left:360px;width:27px; height:27px; background:url(../images/default_blank/icons-add.png) -32px -0px no-repeat;}
 .sn-content-position {width:1200px; height:50px; line-height:50px; vertical-align:middle; font-size:14px; color:#888; margin:0 auto;}
 /*footer样式*/
 .sn-footer {width:1200px; height:220px; margin:0 auto; text-align:center; font-size:14px; color:#fff; line-height:normal;}
@@ -174,7 +174,7 @@ a:hover.sn-newslist-reply,a:hover.sn-newslist-zan{ color:#379be9;}
 /* 内页新闻展示 */
 .sn-inner-newscon{ width:1200px; padding:5px 0 50px; border-bottom:1px solid #e8e8e8; margin-bottom:30px; color:#999; font-size:14px; }
 .sn-inner-pcon{text-indent:2em; overflow:hidden;}
-.sn-inner-newscon img{ display:block; width:830px; margin:25px auto 5px;}
+.sn-inner-newscon img{ display:block; max-width:830px; margin:25px auto 5px;}
 .sn-inner-psmall{ color:#999; font-size:12px; margin-bottom:15px;}
 .sn-inner-imgp{ color:#000;   text-align:center; margin-bottom:30px;}
 a.sn-newslist-zan{ display:block; background:url(../images/zan.gif) 0 15px no-repeat; width:54px; height:28px; padding-left:12px; color:#999; }