Merge branch 'new_widget_setting_interface' of github.com:Rulingcom/orbit into new_widget_setting_interface

app/helpers/attribute_fields_helper.rb

@@ -149,7 +149,7 @@ protected
             link_entry_ary = [".#{get_pairing_tab_class({})}",".#{key}"]
             link_entry_ary << ".add_more_item_#{add_more_counter}" if can_add_more
             link_entry = link_entry_ary.join
-            content_tag(:li,link_to(I18n.t("langs."+key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ?  "active" : nil),:for=>key)
+            content_tag(:li,link_to(I18nVariable.from_locale(key),link_entry,:data=>{:toggle=>"tab"}),:class=>(key == I18n.locale.to_s ?  "active" : nil),:for=>key)
           end.join.html_safe  # of VALID_LOCALES.collect for tabs
         end # of content ul
     end

app/helpers/desktop/co_author_relations_helper.rb

@@ -1,2 +0,0 @@
-module Desktop::CoAuthorRelationsHelper
-end

app/helpers/desktop/journal_lists_helper.rb

@@ -1,2 +0,0 @@
-module Desktop::JournalListsHelper
-end

app/helpers/front_helper.rb

@@ -2,8 +2,8 @@ module FrontHelper
 
   def ad_image_link(ad_image)
     link = ad_image.out_link
-    link =front_show_inner_ad_image_path(:id=> ad_image.id) if link.blank? && !ad_image.context.blank?
-
+    link = front_show_inner_ad_image_path(:id=> ad_image.id) if link.blank? && !ad_image.context.blank?
+    link
   end  
 
 end