jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq 

Conflicts:
	app/controllers/org_document_comments_controller.rb
	app/views/org_document_comments/_attachment.html.erb
This commit is contained in:
ouyangxuhua 2015-12-24 11:13:20 +08:00
parent 59f42bb54f b0b4527ea1
commit c81f2f738a
28 changed files with 4098 additions and 4102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/views/layouts/base_org.html.erb
View File

@ -46,13 +46,13 @@
<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>
</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 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>
@ -197,19 +197,14 @@
}
}
$(document).ready(function(){
$("#orgUser,#orgSwitch").click(function(){
$(".org_login_list").toggle();
if($("#orgArrow").attr("class") == "orgMenuArrow"){
$("#orgUser,#orgSwitch,.org_login_list").mouseover(function () {
$(".org_login_list").css("display", "block");
$("#orgArrow").attr("class", "orgMenuArrow2");
}
else {
$("#orgArrow").attr("class","orgMenuArrow") ;
}
});
if($(".org_login_list").children().click){
$("#orgUser,#orgSwitch,.org_login_list").mouseout(function () {
$(".org_login_list").css("display", "none");
$("#orgArrow").attr("class", "orgMenuArrow");
};
});
});
</script>
</body>

2
app/views/org_document_comments/_attachment.html.erb
View File

@ -63,7 +63,7 @@
:are_you_sure => l(:text_are_you_sure),
:file_count => l(:label_file_count),
:lebel_file_uploding => l(:lebel_file_uploding),
:containerid => "#{container.id}"
:delete_all_files => l(:text_are_you_sure_all)
} %>
<span id="upload_file_count">
<%= l(:label_no_file_uploaded) %>

1
public/stylesheets/org.css
View File

@ -69,6 +69,7 @@ a.linkGrey8:hover {color:#585858;}
.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;}
#orgUserName {max-width:50px; overflow:hidden; white-space: nowrap; text-overflow: ellipsis; display:inline-block;}
.org_login_list a {color:#269ac9;}
.orgListStatus {width:55px; float:left;}
.reCon{ margin:5px; width:710px;}