saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

external links and link widget fixed for development

This commit is contained in:
Harry Bomrah 2013-09-24 11:30:39 +08:00 committed by saurabhbhatia
parent a067bcd304
commit 58fb2d1c73
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/front_controller.rb
View File

@ -73,7 +73,7 @@ class FrontController < ApplicationController
res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page)) res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
res << "'>" res << "'>"
root = "/" root = "/"
res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}'><span>#{page.title}</span></a>" res << "<a href='#{(page.class.to_s.eql?('Page') ? root + page.path : page.url)}' target=#{(page.class.to_s.eql?('Page') ? '_self' : '_blank')} ><span>#{page.title}</span></a>"
if page.visible_children.size > 0 && current < menu.levels if page.visible_children.size > 0 && current < menu.levels
res << "<span class='dot'></span>" res << "<span class='dot'></span>"
res << menu_level(page, current_page, current + 1, menu) res << menu_level(page, current_page, current + 1, menu)

12
vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb vendored
View File

@ -10,11 +10,13 @@
<ul> <ul>
<% wlcg["web_links"].each do |post| %> <% wlcg["web_links"].each do |post| %>
<li> <% if !web_link.title.empty? %>
<%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %> <li>
<% if !post["is_hot"].blank? %><span class="o-links-hot"><%= t('hot')%></span><% end %> <%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %>
<div class="o-links-description"><%= post["context"] %></div> <% if !post["is_hot"].blank? %><span class="o-links-hot"><%= t('hot')%></span><% end %>
</li> <div class="o-links-description"><%= post["context"] %></div>
</li>
<% end %>
<% end %> <% end %>
</ul> </ul>