Renamed networks/navigation to networks/network_navigation to avoid name collision with the top-level navigation partial

just3ws · just3ws · commit 63a05242a6bf · 2014-08-10T11:33:54.000-05:00
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
