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

留言问题

This commit is contained in:
yanxd 2014-01-23 21:55:39 +08:00
parent 9520cf3f7a
commit eb7e2539b8
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/views/layouts/_base_header.html.erb
View File

@ -9,7 +9,6 @@
<div id="loggedas"> <div id="loggedas">
<ul style="padding:0 0; margin:0 0;display:inline;"> <ul style="padding:0 0; margin:0 0;display:inline;">
<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li"> <li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;" class="loggedas_li">
<%=link_to_user(User.current)%> <%=link_to_user(User.current)%>
<ul class="sub_menu"> <ul class="sub_menu">
<% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%> <% if User.current.user_extensions && [UserExtensions::TEACHER, UserExtensions::STUDENT].include?(User.current.user_extensions.identity) -%>
@ -18,7 +17,9 @@
<li><%=link_to l(:label_my_projects), user_projects_user_path(User.current), target:'my_path' %></li> <li><%=link_to l(:label_my_projects), user_projects_user_path(User.current), target:'my_path' %></li>
<li><%=link_to l(:label_user_edit), my_account_path, target:'my_path' %></li> <li><%=link_to l(:label_user_edit), my_account_path, target:'my_path' %></li>
</ul> </ul>
</li>
<li style="padding:0 0; margin:0 0;display:inline;border-bottom: 0;">
<%=link_to l(:label_my_message), { :controller => 'users', :action => 'user_newfeedback', id: User.current.id }, {:class => 'my-message'} if User.current.logged?%>
</li> </li>
</ul> </ul>
</div> </div>
@ -32,12 +33,12 @@
<script type="text/javascript"> <script type="text/javascript">
function setMessageCount () { function setMessageCount () {
var mes = $('#account .my-message') var mes = $('#loggedas .my-message')
mes.html(mes.html()+'('+<%=User.current.count_new_jour.to_s%>+")") mes.html(mes.html()+'('+<%=User.current.count_new_jour.to_s%>+")")
} }
function addSlipMenu () { function addSlipMenu () {
var loggedas = $('#loggedas') var loggedas = $('#loggedas ul li:first')
var sub_menu = $('.sub_menu') var sub_menu = $('.sub_menu')
loggedas.mouseenter(function(event) { loggedas.mouseenter(function(event) {
sub_menu.show(); sub_menu.show();

1
lib/redmine.rb
View File

@ -261,7 +261,6 @@ Redmine::MenuManager.map :account_menu do |menu|
menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? } menu.push :login, :signin_path, :if => Proc.new { !User.current.logged? }
menu.push :register, :register_path, :if => Proc.new { !User.current.logged? && Setting.self_registration? } menu.push :register, :register_path, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
# menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? } # menu.push :my_account, { :controller => 'my', :action => 'account' }, :if => Proc.new { User.current.logged? }
menu.push :my_message, { :controller => 'users', :action => 'user_newfeedback', id: User.current.id }, :if => Proc.new { User.current.logged? }
menu.push :logout, :signout_path, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? } menu.push :logout, :signout_path, :html => {:method => 'post'}, :if => Proc.new { User.current.logged? }
end end
########fq ########fq

8
public/themes/redpenny-master/stylesheets/application.css
View File

@ -2195,10 +2195,10 @@ ul.messages-for-user-reply li {
border-bottom: 1px solid #129DAD; border-bottom: 1px solid #129DAD;
color: white; color: white;
list-style: none ; list-style: none ;
width: 90%;
padding: 6px 0px; padding: 6px 0px;
margin-left: 5%; margin-left: 5%;
} }
#loggedas li span{ #loggedas li span{
cursor: pointer; cursor: pointer;
} }
@ -2209,6 +2209,7 @@ ul.messages-for-user-reply li {
} }
#loggedas .sub_menu { #loggedas .sub_menu {
box-shadow: 2px 2px 6px #b0b0b0 ; box-shadow: 2px 2px 6px #b0b0b0 ;
display: none; display: none;
background: #13AEBF 0 0 no-repeat; background: #13AEBF 0 0 no-repeat;
@ -2217,11 +2218,14 @@ ul.messages-for-user-reply li {
position: absolute; position: absolute;
top: 40px; top: 40px;
font-size: 1.1em; font-size: 1.1em;
margin: 0px; margin: 0px auto;
padding: 0px 0px; padding: 0px 0px;
text-align: center; text-align: center;
z-index: 1; z-index: 1;
} }
#loggedas .sub_menu a{ #loggedas .sub_menu a{
margin: 0px; margin: 0px;
}
.sub_menu li{
width: 90%;
} }