From 5866dfb7ffb561ae2258f59c4bde2b222e9147cd Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 31 Mar 2016 20:12:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=20=E6=B2=A1=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9more=20logo=E4=B8=8D=E5=8A=A0=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org_newstyle.html.erb  | 23 ++++++++++++++++++-
 .../organizations/_subfield_list.html.erb     |  4 ++--
 public/stylesheets/org.css                    |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_org_newstyle.html.erb b/app/views/layouts/base_org_newstyle.html.erb
index 489f014b3..2a86f62b9 100644
--- a/app/views/layouts/base_org_newstyle.html.erb
+++ b/app/views/layouts/base_org_newstyle.html.erb
@@ -65,7 +65,7 @@
 <div class="container">
   <div class="header">
     <div class="header-con">
-      <a href="#" class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></a>
+      <span  class="fl logo"><img src="/images/org_new_style/logo.jpg" alt=""/></span>
       <%# 登录 %>
       <%= render :partial => 'organizations/org_logined_header' %>
     </div>
@@ -115,6 +115,9 @@
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
                       <% if @course_acts.nil? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="course-list">
                             <ul class="clearfix">
@@ -133,6 +136,9 @@
                       <div class="box-top"  id="course_<%= field.id %>"><h2 class="box-title">课程动态</h2></div>
                       <% if @course_acts.nil? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="row">
                             <%= render :partial => 'organizations/org_new_course_act_list', :locals =>{:activities => @course_acts, :field => field, :organization => @organization} %>
@@ -154,6 +160,9 @@
                   <div class="box-top"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="course-list">
                         <ul class="clearfix">
@@ -173,6 +182,9 @@
                   <div class="box-top" style="display:<%= field.hide == 0?'block':'none' %>;"  id="project_<%= field.id %>"><h2 class="box-title">项目动态</h2><p class="box-title-p"></p></div>
                   <% if @project_acts.nil? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :list =>1), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="row">
                         <%= render :partial => 'organizations/org_new_project_act_list', :locals =>{:activities => @project_acts, :field => field, :organization => @organization} %>
@@ -197,6 +209,9 @@
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="course-list">
                             <ul class="clearfix">
@@ -217,6 +232,9 @@
                       <div class="box-top" id="message_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                       <% if message_ats.blank? %>
                           <p class="nocontent">暂无内容，敬请期待！</p>
+                          <div class="cl"></div>
+                          <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                          <div class="cl"></div>
                       <% else %>
                           <div class="row">
                             <% message_ats.each do |act| %>
@@ -240,6 +258,9 @@
                   <div class="box-top" id="resource_<%= field.id %>"><h2 class="box-title"><%= field.name %></h2></div>
                   <% if org_attachs.blank? %>
                       <p class="nocontent">暂无内容，敬请期待！</p>
+                      <div class="cl"></div>
+                      <%= link_to "More", organization_path(@organization, :org_subfield_id => field.id), :class => "more-btn-center mt30" , :target => "_blank" %>
+                      <div class="cl"></div>
                   <% else %>
                       <div class="row">
                         <%= render :partial => 'organizations/org_new_resource', :locals => {:org_attachs => org_attachs} %>
diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb
index 410edac51..4fbeb971f 100644
--- a/app/views/organizations/_subfield_list.html.erb
+++ b/app/views/organizations/_subfield_list.html.erb
@@ -29,7 +29,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :include_blank => false,:selected => field.status},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:58px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
             <% end %>
           </li>
           <li class="orgListStatus">默认</li>
@@ -63,7 +63,7 @@
                 </div>
                 <%= select( :name,:group_id, subfield_status_option,
                             { :include_blank => false,:selected => field.status},
-                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:58px;"}) %>
+                            {:onchange=>"update_status('#update_status_form_#{field.id}');", :id =>"field_status_id", :name => "status",:class=>"undis class-edit fl", :style => "width:56px;"}) %>
             <% end %>
 
            <% end %>
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 9dad153a3..3a203c10d 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -76,7 +76,7 @@ a.linkGrey8:hover {color:#585858;}
 .org_login_list a {color:#269ac9;}
 
 .orgListStatus {width:40px; float:left;}
-.orgListStatusList {width:55px; float:left;}
+.orgListStatusList {width:58px; float:left;}
 .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
 .reCon{ margin:5px; width:710px;}
 .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}