Merge pull request #24 from Mileshosky/join-networks-39

just3ws · just3ws · commit 8458d57de07b · 2014-06-26T15:13:24.000-05:00
Fixed joining networks from networks list pages
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -211,6 +211,10 @@ h4 {
   }
 }
 
+.networks-header {
+  width: auto;
+}
+
 .secondary-notice {
   @include secondary-notice;
 }
diff --git a/app/views/networks/_alphabetized_list.html.haml b/app/views/networks/_alphabetized_list.html.haml
@@ -1,13 +1,11 @@
-
--cache ['v4', 'network_list', networks_list.count, params[:sort] || "unsorted", is_admin?, user.try(:id)], :expires_in => 1.day do
-  - networks = networks_list.sort_by(&:name)
-  - unless networks.blank?
-    - current_char = networks.first.name[0]
-    - alpha_networks = []
-    - networks.each do |network|
-      - if current_char != network.name[0]
-        = render :partial => "alpha_network", :locals => {:alphabet => current_char, :networks => alpha_networks}
-        - alpha_networks = []
-      - alpha_networks << network
-      - current_char = network.name[0]
-    = render :partial => "alpha_network", :locals => {:alphabet => current_char, :networks => alpha_networks}
+- networks = networks_list.sort_by(&:name)
+- unless networks.blank?
+  - current_char = networks.first.name[0]
+  - alpha_networks = []
+  - networks.each do |network|
+    - if current_char != network.name[0]
+      = render :partial => "alpha_network", :locals => {:alphabet => current_char, :networks => alpha_networks}
+      - alpha_networks = []
+    - alpha_networks << network
+    - current_char = network.name[0]
+  = render :partial => "alpha_network", :locals => {:alphabet => current_char, :networks => alpha_networks}
diff --git a/app/views/networks/_navigation.html.haml b/app/views/networks/_navigation.html.haml
@@ -1,4 +1,4 @@
-%header.cf.second-level-header
+%header.cf.second-level-header.networks-header
   -#%input.network-search(type='text' value='search networks')
   / %h1
   - unless network.nil?
@@ -18,4 +18,4 @@
           My networks
     -#%li
     -#  %a{:href => featured_networks_path, :class => networks_nav_class(:featured)}
-    -#    Featured
+    -#    Featured

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,10 @@ h4 {`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`
	`214`	`+.networks-header {`
	`215`	`+ width: auto;`
	`216`	`+}`
	`217`	`+`
`214`	`218`	`.secondary-notice {`
`215`	`219`	`@include secondary-notice;`
`216`	`220`	`}`