Skip to content

Fixed joining networks from networks list pages #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 26, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ h4 {
}
}

.networks-header {
width: auto;
}

.secondary-notice {
@include secondary-notice;
}
Expand Down
24 changes: 11 additions & 13 deletions app/views/networks/_alphabetized_list.html.haml
Original file line number Diff line number Diff line change
@@ -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}
4 changes: 2 additions & 2 deletions app/views/networks/_navigation.html.haml
Original file line number Diff line number Diff line change
@@ -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?
Expand All @@ -18,4 +18,4 @@
My networks
-#%li
-# %a{:href => featured_networks_path, :class => networks_nav_class(:featured)}
-# Featured
-# Featured