Merge pull request #163 from just3ws/master

just3ws · just3ws · commit 633bb9383482 · 2014-08-10T11:58:39.000-05:00
Fix to avoid collision between network navigation and top-level navigation
diff --git a/app/views/networks/_network_navigation.html.haml b/app/views/networks/_network_navigation.html.haml
diff --git a/app/views/networks/index.html.haml b/app/views/networks/index.html.haml
@@ -21,7 +21,7 @@
   %li=link_to 'Protips', by_tags_protips_path
 
 .inside-main-content.cf
-  = render partial: 'navigation', locals: {network: nil}
+  = render partial: 'network_navigation', locals: {network: nil}
   %ul.networks-filter.cf
     %li
       %a{href: networks_path, class: networks_sub_nav_class('') + networks_sub_nav_class('a_z')}
diff --git a/app/views/networks/show.html.haml b/app/views/networks/show.html.haml
@@ -15,7 +15,7 @@
     Hyphenator.run()
 
 .inside-main-content.cf
-  = render :partial => 'navigation', :locals => {:network => @network}
+  = render :partial => 'network_navigation', :locals => {:network => @network}
   %aside.protips-sidebar
     %ul.protip-actions
       %li
diff --git a/db/seeds.rb b/db/seeds.rb
@@ -5,8 +5,17 @@ def self.create_protip_for(user)
     yield protip = user.protips.build
     protip.save!
   end
+
+  def self.create_network_for(name)
+    Network.find_or_create_by_name(name) do |n|
+      n.create_slug!
+    end
+  end
 end
 
+S.create_network_for('Ruby')
+S.create_network_for('JavaScript')
+
 Plan.find_or_create_by_id(1) do |s|
   s.amount    = 0
   s.interval  = 'month'
@@ -152,7 +161,7 @@ def self.create_protip_for(user)
   #Network.rebuild_index
   Opportunity.rebuild_index
   Protip.rebuild_index
-  
+
   #Team.rebuild_index #TODO: Disabled until switched from mongo
   Team.all.each { |team| team.tire.update_index }
 end
