From 58fb2d1c73e5097cb2e6edbd5a30587a991a757e Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Tue, 24 Sep 2013 11:30:39 +0800
Subject: [PATCH] external links and link widget fixed for development

---
 app/controllers/front_controller.rb                  |  2 +-
 .../web_resource/widget/web_links/_index.html.erb    | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb
index 02098f8a5..da6082976 100644
--- a/app/controllers/front_controller.rb
+++ b/app/controllers/front_controller.rb
@@ -73,7 +73,7 @@ class FrontController < ApplicationController
     res << " active" if (current_page.id.eql?(page.id) || current_page.descendant_of?(page))
     res << "'>"
     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
       res << "<span class='dot'></span>"
       res << menu_level(page, current_page, current + 1, menu)
diff --git a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
index 89608fc07..013718b56 100644
--- a/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
+++ b/vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/_index.html.erb
@@ -10,11 +10,13 @@
           <ul>
 
             <% wlcg["web_links"].each do |post| %>
-            <li>
-              <%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %>
-              <% if !post["is_hot"].blank? %><span class="o-links-hot"><%= t('hot')%></span><% end %>
-              <div class="o-links-description"><%= post["context"] %></div>
-            </li>
+            <% if !web_link.title.empty? %>
+              <li>
+                <%= link_to post["title"], post["url"], {:target => '_blank', :title => post["title"], :class=>"o-links-title"} %>
+                <% if !post["is_hot"].blank? %><span class="o-links-hot"><%= t('hot')%></span><% end %>
+                <div class="o-links-description"><%= post["context"] %></div>
+              </li>
+            <% end %>
             <% end %>
 
           </ul>