From 533be61cf7b9246e252066b9594cc806db180f37 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 25 Dec 2015 16:13:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=95=E9=83=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_org.html.erb | 215 ++++++++++++++--------------
 public/stylesheets/new_user.css     |   3 +-
 public/stylesheets/org.css          |   7 +-
 public/stylesheets/public.css       |   2 +-
 4 files changed, 113 insertions(+), 114 deletions(-)

diff --git a/app/views/layouts/base_org.html.erb b/app/views/layouts/base_org.html.erb
index d481651e6..a0e84f1e5 100644
--- a/app/views/layouts/base_org.html.erb
+++ b/app/views/layouts/base_org.html.erb
@@ -43,16 +43,16 @@
         <%#= link_to '首页', organization_path(@organization, :show_homepage => 1),:class=>"linkGrey8 f14" %>
       </li>
       <% if User.current.logged? %>
-        <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
+          <li class="navOrgMenu fr" id="orgSwitch" style="cursor:pointer;">
           <span class="orgMenuArrow" id="orgArrow">
             <ul class="org_login_list" style="display:none;">
-              <li> <%= link_to "个人主页",user_path(User.current), :class => "linkGrey8", :target => "_blank" %></li>
-              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>
+              <li> <%= link_to "个人主页",user_path(User.current), :class => "menuGrey", :target => "_blank" %></li>
+              <li><%= link_to "退出",logout_organization_path(@organization), :class =>"menuGrey", :method => 'post', :rel => "nofollow" %></li>
               <!--<li><%#= link_to "退出",signout_path, :class =>"linkGrey8", :method => 'post', :rel => "nofollow" %></li>-->
-          </ul>
+            </ul>
           </span>
-        </li>
-        <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="linkGrey8 f14" id="orgUserName"><%= User.current %></a></li>
+          </li>
+          <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;"><a href="javascript:void(0);" class="fontGrey2 f14" id="orgUserName"><%= User.current %></a></li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
           <li class="navOrgMenu fr"><a href="<%= signin_path(:login=>true) %>" class="linkGrey8 f14">登录</a></li>
@@ -75,126 +75,121 @@
   </div>
 </div>
 <div class="cl"></div>
-  <div class="homepageContentContainer">
-    <div class="homepageContent">
-      <div class="homepageLeft">
-        <div class="homepagePortraitContainer">
-          <!--<div class="pr_info_logo fl mr10 mb5">-->
-            <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
-          <!--</div>-->
-          <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
-            <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
-            <% if User.current.logged?%>
-                <% if User.current.id == @organization.creator_id%>
-                    <div id="edit_org_file_btn" class="none">
-                      <div class="homepageEditProfile">
-                        <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
-                      </div>
+<div class="homepageContentContainer">
+  <div class="homepageContent">
+    <div class="homepageLeft">
+      <div class="homepagePortraitContainer">
+        <!--<div class="pr_info_logo fl mr10 mb5">-->
+        <!--<%#= image_tag(url_to_avatar(@organization), :width=>"60",  :height=>"60", :alt=>"组织logo") %>-->
+        <!--</div>-->
+        <div class="pr_info_logo fl fl mr10 mb5" id="homepage_portrait_image">
+          <%= image_tag(url_to_avatar(@organization),width:"60", height: "60", :id=>'nh_user_tx') %>
+          <% if User.current.logged?%>
+              <% if User.current.id == @organization.creator_id%>
+                  <div id="edit_org_file_btn" class="none">
+                    <div class="homepageEditProfile">
+                      <a href="<%= clear_org_avatar_temp_organization_path(@organization) %>" data-remote="true" class="homepageEditProfileIcon"></a>
                     </div>
-                <% end %>
-            <% end%>
-          </div>
-          <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
-          <div class="orgName fl mb5 f14">
-            <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
-            <% if User.current.logged? %>
-                <% if @organization.is_public? %>
-                    <span class="img_private"><%= l(:label_public)%></span>
-                <% else %>
-                    <span class="img_private"><%= l(:label_private)%></span>
-                <% end %>
-            <% end %>
-          </div>
-
-          <% if User.current.admin_of_org?(@organization) %>
-            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+                  </div>
+              <% end %>
+          <% end%>
+        </div>
+        <!--<div class="orgName fl mb5 f14">组织id：<%#= @organization.id %></div>-->
+        <div class="orgName fl mb5 f14">
+          <%= link_to @organization.name, organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+          <% if User.current.logged? %>
+              <% if @organization.is_public? %>
+                  <span class="img_private"><%= l(:label_public)%></span>
+              <% else %>
+                  <span class="img_private"><%= l(:label_private)%></span>
+              <% end %>
           <% end %>
+        </div>
 
-          <!--<div style="clear:both;">-->
-            <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
-            <!--<%# if @organization.is_public? %>-->
-                <!--<span class="img_private"><%#= l(:label_public)%></span>-->
-            <!--<%# else %>-->
-                <!--<span class="img_private"><%#= l(:label_private)%></span>-->
-            <!--<%# end %>-->
-          <!--</div>-->
+        <% if User.current.admin_of_org?(@organization) %>
+            <a href="<%= setting_organization_path(@organization) %>" class="pr_join_a c_white"><span class="pr_setting"></span>配置</a>
+        <% end %>
 
-          <div class="cl"></div>
-          <div class="f12 fontGrey3">
-            <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-            <% if User.current.logged? %>
-                (
-                <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                )
-            <% end %>
-            &nbsp;|&nbsp;
-            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-            <% if User.current.logged? %>
+        <!--<div style="clear:both;">-->
+        <!--<%#= link_to l(:label_org_name)+"#{@organization.name}", organization_path(@organization.id), :class=>"pr_info_name fl c_dark fb break_word" %>-->
+        <!--<%# if @organization.is_public? %>-->
+        <!--<span class="img_private"><%#= l(:label_public)%></span>-->
+        <!--<%# else %>-->
+        <!--<span class="img_private"><%#= l(:label_private)%></span>-->
+        <!--<%# end %>-->
+        <!--</div>-->
+
+        <div class="cl"></div>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <% if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <% end %>
+          &nbsp;|&nbsp;
+          <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+          <% if User.current.logged? %>
               （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-            <% end %>
-          </div>
-        </div>
-        <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
-            <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
+          <% end %>
         </div>
       </div>
-      <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
-        <%= render_flash_messages %>
-        <%= yield %>
-        <%= call_hook :view_layouts_base_content %>
-        <div style="clear:both;"></div>
+      <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
+        <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>
       </div>
     </div>
+    <div class="homepageRight" style="margin-top:<%= params[:show_homepage].nil? ? '10px':'0px' %>;">
+      <%= render_flash_messages %>
+      <%= yield %>
+      <%= call_hook :view_layouts_base_content %>
+      <div style="clear:both;"></div>
+    </div>
   </div>
+</div>
 
-    <!--页面底部-->
-    <div class="cl"></div>
-    <%= render :partial => 'layouts/new_footer' %>
-    <div class="cl"></div>
-    <div id="ajax-modal" style="display:none;"></div>
+<!--页面底部-->
+<div class="cl"></div>
+<%= render :partial => 'layouts/new_footer' %>
+<div class="cl"></div>
+<div id="ajax-modal" style="display:none;"></div>
 
-    <div id="ajax-indicator" style="display:none;">
-      <span><%= l(:label_loading) %></span>
-    </div>
+<div id="ajax-indicator" style="display:none;">
+  <span><%= l(:label_loading) %></span>
+</div>
 
-    <script type="text/javascript">
-        $("#courseMenu").mouseenter(function(){
-            $("#topnav_course_menu").show();
-        });
-        $("#courseMenu").mouseleave(function(){
-            $("#topnav_course_menu").hide();
-        });
-        $("#projectMenu").mouseenter(function(){
-            $("#topnav_project_menu").show();
-        });
-        $("#projectMenu").mouseleave(function(){
-            $("#topnav_project_menu").hide();
-        });
+<script type="text/javascript">
+    $("#courseMenu").mouseenter(function(){
+        $("#topnav_course_menu").show();
+    });
+    $("#courseMenu").mouseleave(function(){
+        $("#topnav_course_menu").hide();
+    });
+    $("#projectMenu").mouseenter(function(){
+        $("#topnav_project_menu").show();
+    });
+    $("#projectMenu").mouseleave(function(){
+        $("#topnav_project_menu").hide();
+    });
 
-  function show_homepage(id, has_homepage){
-      if (has_homepage == 1)
-      {
-          window.location.href = "/organizations/" + id + "?show_homepage=1";
-      }
-      else
-      {
-          alert("您还未设置首页！");
-      }
-  }
+    function show_homepage(id, has_homepage){
+        if (has_homepage == 1)
+        {
+            window.location.href = "/organizations/" + id + "?show_homepage=1";
+        }
+        else
+        {
+            alert("您还未设置首页！");
+        }
+    }
     $(document).ready(function(){
-        $("#orgUser,#orgSwitch").click(function(){
-            $(".org_login_list").toggle();
-            if($("#orgArrow").attr("class") == "orgMenuArrow"){
-                $("#orgArrow").attr("class","orgMenuArrow2");
-            }
-            else {
-                $("#orgArrow").attr("class","orgMenuArrow") ;
-            }
+        $("#orgUser,#orgSwitch,.org_login_list").mouseover(function () {
+            $(".org_login_list").css("display", "block");
+            $("#orgArrow").attr("class", "orgMenuArrow2");
+        });
+        $("#orgUser,#orgSwitch,.org_login_list").mouseout(function () {
+            $(".org_login_list").css("display", "none");
+            $("#orgArrow").attr("class", "orgMenuArrow");
         });
-        if($(".org_login_list").children().click){
-            $(".org_login_list").css("display","none");
-            $("#orgArrow").attr("class","orgMenuArrow");
-        };
     });
 </script>
 </body>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index e7ac454e7..fe3c805f7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -861,7 +861,8 @@ a.postRouteLink:hover {text-decoration:underline;}
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
 .footerAbout{ width:365px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
-.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
+.departments{ width:855px; margin:5px auto;height:40px;line-height:40px;}
+.departments li {height:40px; line-height:40px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
 a.f_grey {color:#666666;}
 a.f_grey:hover {color:#000000;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index 44dcc70e3..5f620ab4e 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -67,7 +67,8 @@ a.linkGrey8:hover {color:#585858;}
 .orgListRow {border-bottom:1px solid #e4e4e4; padding-bottom:5px; color:#555555;}
 .orgMenuArrow {background:url(../images/nav_icon.png) -10px -165px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
 .orgMenuArrow2 {background:url(../images/nav_icon.png) -10px -132px no-repeat; position:relative; display:inline-block; width:20px; height:30px;}
-.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
+.org_login_list{ border:1px solid #eaeaea; background:#fff; padding-left:10px; padding-bottom:10px; padding-top:8px; width:60px; left:-53px;
+                   position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); margin-top: 30px;}
 #orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
 
 .orgListStatus {width:55px; float:left;}
@@ -85,4 +86,6 @@ a.linkGrey8:hover {color:#585858;}
 .re_con_top span{ color:#999999; font-weight:bold;}
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 
-.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
\ No newline at end of file
+.popbox_polls{width:300px;height:100px;position:fixed !important;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;
+                background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.org_login_list a {color:#269ac9;}
\ No newline at end of file
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 7047316c6..fb36aebe7 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -581,7 +581,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
-.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .postAttSize {color:#888888; font-size:12px; margin-left: 5px;}