Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
0e6d9a804a
|
@ -1,6 +1,7 @@
|
||||||
class TestController < ApplicationController
|
class TestController < ApplicationController
|
||||||
|
|
||||||
helper :UserScore
|
helper :UserScore
|
||||||
|
layout 'bootstrap_base'
|
||||||
|
|
||||||
def zip
|
def zip
|
||||||
homeworks_attach_path = []
|
homeworks_attach_path = []
|
||||||
|
|
|
@ -1330,9 +1330,11 @@ module ApplicationHelper
|
||||||
def hubspot_head
|
def hubspot_head
|
||||||
tags = javascript_include_tag('hubspot/messenger.min', 'hubspot/messenger-theme-future')
|
tags = javascript_include_tag('hubspot/messenger.min', 'hubspot/messenger-theme-future')
|
||||||
tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future', 'hubspot/messenger-theme-flat')
|
tags << stylesheet_link_tag('hubspot/messenger', 'hubspot/messenger-theme-future', 'hubspot/messenger-theme-flat')
|
||||||
unless User.current.pref.warn_on_leaving_unsaved == '0'
|
end
|
||||||
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
|
|
||||||
end
|
def bootstrap_head
|
||||||
|
tags = stylesheet_link_tag('bootstrap/bootstrap.min', 'bootstrap/bootstrap-theme.min')
|
||||||
|
tags << javascript_include_tag('bootstrap/bootstrap.min', 'bootstrap/jquery.transition.min')
|
||||||
tags
|
tags
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -1602,6 +1604,13 @@ module ApplicationHelper
|
||||||
|
|
||||||
def render_dynamic_nav
|
def render_dynamic_nav
|
||||||
home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'}
|
home_link = link_to l(:field_homepage), {:controller => 'welcome', :action => 'index'}
|
||||||
|
home_link = "<li>" << home_link << "</li>"
|
||||||
|
bootstrap_render_dynamic_nav
|
||||||
|
content_tag :ul, (home_link.html_safe+bootstrap_render_dynamic_nav)
|
||||||
|
end
|
||||||
|
|
||||||
|
def bootstrap_render_dynamic_nav
|
||||||
|
|
||||||
main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain}
|
main_course_link = link_to l(:label_course_practice), {:controller => 'welcome', :action => 'index', :host => Setting.course_domain}
|
||||||
main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain}
|
main_project_link = link_to l(:label_project_deposit), {:controller => 'welcome', :action => 'index', :host => Setting.project_domain}
|
||||||
main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.contest_domain}
|
main_contest_link = link_to l(:label_contest_innovate), {:controller => 'welcome', :action => 'index', :host => Setting.contest_domain}
|
||||||
|
@ -1622,7 +1631,6 @@ module ApplicationHelper
|
||||||
|
|
||||||
#@nav_dispaly_project_label
|
#@nav_dispaly_project_label
|
||||||
nav_list = Array.new
|
nav_list = Array.new
|
||||||
nav_list.push(home_link) if !@nav_dispaly_home_path_label
|
|
||||||
nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label
|
nav_list.push(school_all_school_link) if @nav_dispaly_course_all_label
|
||||||
nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label
|
nav_list.push(course_all_course_link) if @nav_dispaly_course_all_label
|
||||||
nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label
|
nav_list.push(course_teacher_all_link) if @nav_dispaly_teacher_all_label
|
||||||
|
@ -1643,7 +1651,7 @@ module ApplicationHelper
|
||||||
nav_list.collect do |nav_item|
|
nav_list.collect do |nav_item|
|
||||||
content_li << content_tag(:li, nav_item)
|
content_li << content_tag(:li, nav_item)
|
||||||
end
|
end
|
||||||
content_tag :ul, content_li.html_safe
|
content_li.html_safe
|
||||||
end
|
end
|
||||||
|
|
||||||
def current_user
|
def current_user
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
|
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
|
||||||
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
|
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %>
|
||||||
<%= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
||||||
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -0,0 +1,84 @@
|
||||||
|
<%
|
||||||
|
request.headers['REQUEST_URI'] = "" if request.headers['REQUEST_URI'].nil?
|
||||||
|
realUrl = request.original_url
|
||||||
|
if (realUrl.match(/forge\.trustie\.net\/*/))
|
||||||
|
@nav_dispaly_project_label = 1
|
||||||
|
@nav_dispaly_forum_label = 1
|
||||||
|
elsif (realUrl.match(/course\.trustie\.net\/*/))
|
||||||
|
@nav_dispaly_course_all_label = 1
|
||||||
|
@nav_dispaly_forum_label = 1
|
||||||
|
@nav_dispaly_course_label = nil
|
||||||
|
@nav_dispaly_store_all_label = 1
|
||||||
|
elsif (realUrl.match(/user\.trustie\.net\/*/))
|
||||||
|
@nav_dispaly_home_path_label = 1
|
||||||
|
@nav_dispaly_main_course_label = 1
|
||||||
|
@nav_dispaly_main_project_label = 1
|
||||||
|
@nav_dispaly_main_contest_label = 1
|
||||||
|
elsif (realUrl.match(/contest\.trustie\.net\/*/))
|
||||||
|
@nav_dispaly_contest_label = 1
|
||||||
|
@nav_dispaly_store_all_label = 1
|
||||||
|
else
|
||||||
|
@nav_dispaly_project_all_label = 1
|
||||||
|
@nav_dispaly_course_all_label = 1
|
||||||
|
@nav_dispaly_forum_label = 1
|
||||||
|
@nav_dispaly_bid_label = 1
|
||||||
|
@nav_dispaly_contest_label = 1
|
||||||
|
@nav_dispaly_store_all_label = 1
|
||||||
|
@nav_dispaly_user_label = 1
|
||||||
|
end
|
||||||
|
%>
|
||||||
|
|
||||||
|
<nav class="navbar navbar-default" role="navigation">
|
||||||
|
<!-- Brand and toggle get grouped for better mobile display -->
|
||||||
|
<div class="navbar-header">
|
||||||
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
|
||||||
|
<span class="sr-only">Toggle navigation</span>
|
||||||
|
<span class="icon-bar">1</span>
|
||||||
|
<span class="icon-bar">2</span>
|
||||||
|
<span class="icon-bar">3</span>
|
||||||
|
</button>
|
||||||
|
<%=link_to image_tag("/images/logo5.png", class: 'navbar-brand', style:"width: 50px; height: 50px; padding:4px"), '/' %>
|
||||||
|
<a class="navbar-brand hidden" href="#">Trustie</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||||
|
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||||
|
<ul class="nav navbar-nav">
|
||||||
|
<%= bootstrap_render_dynamic_nav if User.current.logged? || !Setting.login_required? -%>
|
||||||
|
<li class="dropdown hidden">
|
||||||
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li><a href="#">Action</a></li>
|
||||||
|
<li><a href="#">Another action</a></li>
|
||||||
|
<li><a href="#">Something else here</a></li>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li><a href="#">Separated link</a></li>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li><a href="#">One more separated link</a></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<form class="navbar-form navbar-left hidden" role="search">
|
||||||
|
<div class="form-group">
|
||||||
|
<input type="text" class="form-control" placeholder="Search">
|
||||||
|
</div>
|
||||||
|
<button type="submit" class="btn btn-default">Submit</button>
|
||||||
|
</form>
|
||||||
|
<ul class="nav navbar-nav navbar-right <%= "hidden" unless User.current.logged? %>">
|
||||||
|
<%= bootstrap_render_menu :account_menu -%>
|
||||||
|
|
||||||
|
<li class="dropdown">
|
||||||
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%=User.current%> <b class="caret"></b></a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li>
|
||||||
|
<%=link_to l(:label_my_message)+'('+User.current.count_new_jour.to_s+')', { :controller => 'users', :action => 'user_newfeedback', id: User.current.id, host: Setting.user_domain }, {:class => 'my-message'} if User.current.logged? -%></li>
|
||||||
|
<li><%=link_to l(:label_my_course), {:controller => 'users', :action => 'user_courses', id: User.current.id, host: Setting.course_domain} %></li>
|
||||||
|
<li><%=link_to l(:label_my_projects),{:controller => 'users', :action => 'user_projects', id: User.current.id, host: Setting.project_domain} %></li>
|
||||||
|
<li class="divider"></li>
|
||||||
|
<li><%=link_to l(:label_user_edit), {:controller => 'my', :action=> 'account', host: Setting.user_domain}%></li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</nav>
|
||||||
|
|
|
@ -0,0 +1,47 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<html lang="<%= current_language %>">
|
||||||
|
<head>
|
||||||
|
<meta charset="utf-8"/>
|
||||||
|
<title><%= h html_title %></title>
|
||||||
|
<meta name="description" content="<%= Redmine::Info.app_name %>"/>
|
||||||
|
<meta name="keywords" content="issue,bug,tracker"/>
|
||||||
|
<%= csrf_meta_tag %>
|
||||||
|
<%= favicon %>
|
||||||
|
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %>
|
||||||
|
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
|
||||||
|
<%= javascript_heads %>
|
||||||
|
<%= javascript_include_tag "jquery.leanModal.min" %>
|
||||||
|
<%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable' %>
|
||||||
|
<%= heads_for_theme %>
|
||||||
|
<%= bootstrap_head %>
|
||||||
|
<%= call_hook :view_layouts_base_html_head %>
|
||||||
|
<!-- page specific tags -->
|
||||||
|
<%= yield :header_tags -%>
|
||||||
|
</head>
|
||||||
|
<body class="<%= h body_css_classes %>">
|
||||||
|
|
||||||
|
<div id="wrapper">
|
||||||
|
<div id="wrapper2">
|
||||||
|
<div id="wrapper3">
|
||||||
|
<%= render :partial => 'layouts/bootstrap_base_header' %>
|
||||||
|
<div id="main" class="nosidebar">
|
||||||
|
<div id="content_">
|
||||||
|
<%= render_flash_messages %>
|
||||||
|
<%= yield %>
|
||||||
|
<%= call_hook :view_layouts_base_content %>
|
||||||
|
<div style="clear:both;"></div>
|
||||||
|
<%= render :partial => 'layouts/base_footer' %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
|
||||||
|
<div id="ajax-modal" style="display:none;"></div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<%= call_hook :view_layouts_base_body_bottom %>
|
||||||
|
</body>
|
||||||
|
</html>
|
|
@ -1,100 +1,100 @@
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
// $(this).ready(function(){
|
// $(this).ready(function(){
|
||||||
// $('.tag_show').hover(function() {
|
// $('.tag_show').hover(function() {
|
||||||
// $(this).children("span").show();
|
// $(this).children("span").show();
|
||||||
// }, function() {
|
// }, function() {
|
||||||
// $(this).children("span").hide();
|
// $(this).children("span").hide();
|
||||||
// });
|
// });
|
||||||
// })
|
// })
|
||||||
</script>
|
</script>
|
||||||
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求-->
|
<!-- 1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求-->
|
||||||
<% @tags = obj.reload.tag_list %>
|
<% @tags = obj.reload.tag_list %>
|
||||||
|
|
||||||
<% if non_list_all and (@tags.size > 0) %>
|
<% if non_list_all and (@tags.size > 0) %>
|
||||||
<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替 -->
|
<!-- 这里是显示的非主页的tag 所以当tag数量较多时 不必全部显示 用“更多”代替 -->
|
||||||
<% if @tags.size > Setting.show_tags_length.to_i then %>
|
<% if @tags.size > Setting.show_tags_length.to_i then %>
|
||||||
<% i = 0 %>
|
<% i = 0 %>
|
||||||
|
|
||||||
<% until i>Setting.show_tags_length.to_i do %>
|
<% until i>Setting.show_tags_length.to_i do %>
|
||||||
<div id="tag">
|
<div id="tag">
|
||||||
<%= link_to @tags[i], :controller => "tags",:action => "index",:q => @tags[i],:object_flag => object_flag,:obj_id => obj.id %>
|
<%= link_to @tags[i], :controller => "tags", :action => "index", :q => @tags[i], :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
</div>
|
</div>
|
||||||
<% i += 1%>
|
<% i += 1 %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<%= link_to l(:label_more_tags),:action => "show",:id => obj.id %>
|
<%= link_to l(:label_more_tags), :action => "show", :id => obj.id %>
|
||||||
|
|
||||||
|
<% else %>
|
||||||
|
|
||||||
|
<% @tags.each do |tag| %>
|
||||||
|
<div id="tag">
|
||||||
|
<%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
|
||||||
<% else %>
|
<% else %>
|
||||||
|
<!-- 用来显示三大对象的主页中的tag 故是全部显示 -->
|
||||||
<% @tags.each do |tag| %>
|
<% if @tags.size > 0 %>
|
||||||
<div id="tag">
|
<% @tags.each do |tag| %>
|
||||||
<%= link_to tag,:controller => "tags",:action => "index",:q=>tag,:object_flag => object_flag,:obj_id => obj.id %>
|
<div id="tag">
|
||||||
</div>
|
<span class="tag_show"> <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %>
|
||||||
<% end %>
|
<!-- 对用户主页 是本人 ,对项目,需求,问题是管理员 -->
|
||||||
|
<% case object_flag %>
|
||||||
<% end %>
|
<% when '1' %>
|
||||||
|
|
||||||
<% else %>
|
|
||||||
<!-- 用来显示三大对象的主页中的tag 故是全部显示 -->
|
|
||||||
<% if @tags.size > 0 %>
|
|
||||||
<% @tags.each do |tag| %>
|
|
||||||
<div id="tag">
|
|
||||||
<span class="tag_show"> <%= link_to tag,:controller => "tags",:action => "index",:q=>tag ,:object_flag => object_flag,:obj_id => obj.id %>
|
|
||||||
<!-- 对用户主页 是本人 ,对项目,需求,问题是管理员 -->
|
|
||||||
<% case object_flag %>
|
|
||||||
<% when '1'%>
|
|
||||||
|
|
||||||
<% if User.current.eql?(obj) %>
|
<% if User.current.eql?(obj) %>
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% when '2' %>
|
<% when '2' %>
|
||||||
|
|
||||||
<% if (ProjectInfo.find_by_project_id(obj.id)).user_id == User.current.id %>
|
<% if (ProjectInfo.find_by_project_id(obj.id)).user_id == User.current.id %>
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% when '3' %>
|
<% when '3' %>
|
||||||
|
|
||||||
<% if (ProjectInfo.find_by_project_id(obj.project_id)).user_id == User.current.id %>
|
<% if (ProjectInfo.find_by_project_id(obj.project_id)).user_id == User.current.id %>
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% when '4'%>
|
<% when '4' %>
|
||||||
<% if obj.author_id == User.current.id %>
|
<% if obj.author_id == User.current.id %>
|
||||||
|
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '6'%>
|
<% when '6' %>
|
||||||
<% if ( User.current.logged? &&
|
<% if (User.current.logged? &&
|
||||||
User.current.admin?
|
User.current.admin?
|
||||||
# && (@project && User.current.member_of?(@project))
|
# && (@project && User.current.member_of?(@project))
|
||||||
)
|
)
|
||||||
%>
|
%>
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% when '7'%>
|
<% when '7' %>
|
||||||
<% if obj.author_id == User.current.id %>
|
<% if obj.author_id == User.current.id %>
|
||||||
|
|
||||||
<span class='del'> <%= link_to 'x',:controller => "tags",:action => "remove_tag",:remote => true,:tag_name => tag,
|
<span class='del'> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag,
|
||||||
:taggable_id => obj.id,:taggable_type => object_flag %> </span>
|
:taggable_id => obj.id, :taggable_type => object_flag %> </span>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<span style="color:#8c8a8a">
|
<span style="color:#8c8a8a">
|
||||||
<%= l(:label_tags_no) %>
|
<%= l(:label_tags_no) %>
|
||||||
</span>
|
</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
|
@ -1443,6 +1443,7 @@ en:
|
||||||
label_identity: Identity
|
label_identity: Identity
|
||||||
label_teacher: Teacher
|
label_teacher: Teacher
|
||||||
label_student: Student
|
label_student: Student
|
||||||
|
label_school_all: Schools
|
||||||
label_other: Other
|
label_other: Other
|
||||||
label_gender: Gender
|
label_gender: Gender
|
||||||
label_gender_male: male
|
label_gender_male: male
|
||||||
|
|
|
@ -94,6 +94,18 @@ module Redmine
|
||||||
links.empty? ? nil : content_tag('ul', links.join("\n").html_safe)
|
links.empty? ? nil : content_tag('ul', links.join("\n").html_safe)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def bootstrap_render_menu(menu, project=nil)
|
||||||
|
links = []
|
||||||
|
menu_items_for(menu, project) do |node|
|
||||||
|
links << render_menu_node(node, project)
|
||||||
|
end
|
||||||
|
s = ''
|
||||||
|
# s = "<ul class = 'nav navbar-nav navbar-right'> "
|
||||||
|
s << links.join("\n")
|
||||||
|
# s << "</ul>"
|
||||||
|
links.empty? ? nil : s.html_safe
|
||||||
|
end
|
||||||
|
|
||||||
def render_menu_node(node, project=nil)
|
def render_menu_node(node, project=nil)
|
||||||
if node.children.present? || !node.child_menus.nil?
|
if node.children.present? || !node.child_menus.nil?
|
||||||
return render_menu_node_with_children(node, project)
|
return render_menu_node_with_children(node, project)
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 5.1 KiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue