Skip to content

Commit

Permalink
Improve layout performance and fix broken style.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jforberg
jforberg committed Mar 24, 2015
1 parent 2f1240e commit cd92aa6
Show file tree
Hide file tree
Showing 12 changed files with 291 additions and 291 deletions.
1 change: 0 additions & 1 deletion app/controllers/application_controller.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ class ApplicationController < ActionController::Base
before_filter :configure_permitted_devise_parameters, if: :devise_controller?
before_filter :set_locale


def access_denied
flash[:error] = t('the_role.access_denied')
redirect_to(:back)
Expand Down
4 changes: 4 additions & 0 deletions app/models/council.rb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# encoding: UTF-8
class Council < ActiveRecord::Base
has_one :page, dependent: :destroy
has_one :president, :foreign_key => :president
has_one :vice_president, :foreign_key => :president
has_many :posts
has_many :profiles, through: :posts

validates :title,:url,:presence => true
validates :url, uniqueness: true

def to_s
self.title
end
Expand Down
6 changes: 3 additions & 3 deletions app/views/contacts/_kontakt.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%@kontakt = Contact.find_by(name: name)%>
<%if @kontakt%>
<%= link_to fa_icon('envelope')+ " "+ @kontakt.name,contact_path(@kontakt) %>
<% if @kontakt %>
<%= link_to fa_icon('envelope')+ " "+ @kontakt.name,contact_path(@kontakt) %>
<% else %>
<%=name%>
<%=name%>
<% end %>
20 changes: 10 additions & 10 deletions app/views/layouts/_bottombar.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div class="col-md-6">
<p class="copyright-space">
2014 &copy; F-teknologsektionen inom TLTH.
</p>
</div>
<div class="col-md-6">
<p class="copyright-space pull-right">
Kontrollerar detta nät: <%= render partial: "contacts/kontakt", locals: {name: 'Spindelmän'}%>
</p>
</div>
<div class="col-md-6">
<p class="copyright-space">
2014 &copy; F-teknologsektionen inom TLTH.
</p>
</div>
<div class="col-md-6">
<p class="copyright-space pull-right">
Kontrollerar detta nät: <%= render 'contacts/kontakt', name: 'Spindelmän' %>
</p>
</div>
88 changes: 46 additions & 42 deletions app/views/layouts/_footer.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,45 +1,49 @@
<div class="col-md-5">
<div class="headline"><h2>Kort om sektionen</h2></div>
<p class="margin-bottom-25 md-margin-bottom-40">
F-sektionen är en ideell förening för studenter som läser vid något av programmen
<ul class="list">
<li>Teknisk Fysik</li>
<li>Teknisk Matematik</li>
<li>Teknisk Nanovetenskap</li>
</ul>
<br>
och har till ändamål att främja kamratskap bland medlemmarna och tillvarata medlemmarnas gemensamma intressen.
</p>
</div> <!-- Kort om sektionen-->
<div class="col-md-5">
<div class="headline"><h2>Kort om sektionen</h2></div>
<p class="margin-bottom-25 md-margin-bottom-40">
F-sektionen är en ideell förening för studenter som läser vid något av programmen
<ul class="list">
<li>Teknisk Fysik</li>
<li>Teknisk Matematik</li>
<li>Teknisk Nanovetenskap</li>
</ul>
<br>
och har till ändamål att främja kamratskap bland medlemmarna och tillvarata medlemmarnas gemensamma intressen.
</p>
</div> <!-- Kort om sektionen-->

<div class="col-md-4"> <!-- Vecktorn -->
<div class="headline"><h2>Vecktorn</h2></div>
<p>Prenumerera på F-sektionens veckobrev som kommer ut varje läsvecka!</p>
<%= link_to "Prenumerera", :vecktorn_signup, class: "btn btn-u"%>
<p>Vill du skicka med en notis i vecktorn? Skicka i så fall in den till <%=render partial: "contacts/kontakt", locals: {name: 'Sanningsministeriet'}%> senast måndag kl 17.</p>
<hr>
<div class="headline"><h3>Håll dig uppdaterad</h3></div>
<ul class="social-icons">
<li><a href="https://www.facebook.com/Fsektionen" data-original-title="Facebook" class="social_facebook"></a></li>
<li><a href="https://twitter.com/Fsektionen" data-original-title="Twitter" class="social_twitter"></a></li>
<li><a href="https://www.youtube.com/user/fsektionen" data-original-title="Youtube" class="social_youtube"></a></li>
</ul>
<div class="headline"><h2>Vecktorn</h2></div>
<p>Prenumerera på F-sektionens veckobrev som kommer ut varje läsvecka!</p>
<%= link_to "Prenumerera", :vecktorn_signup, class: 'btn btn-u'%>
<p>
Vill du skicka med en notis i vecktorn? Skicka i så fall in den till
<%=render 'contacts/kontakt', name: 'Sanningsministeriet' %>
senast måndag kl 17.
</p>
<hr>
<div class="headline"><h3>Håll dig uppdaterad</h3></div>
<ul class="social-icons">
<li><a href="https://www.facebook.com/Fsektionen" data-original-title="Facebook" class="social_facebook"></a></li>
<li><a href="https://twitter.com/Fsektionen" data-original-title="Twitter" class="social_twitter"></a></li>
<li><a href="https://www.youtube.com/user/fsektionen" data-original-title="Youtube" class="social_youtube"></a></li>
</ul>
</div> <!-- Vecktorn-->
<div class="col-md-3">
<div class ="headline"><h2>Kontakta oss</h2></div>
<p>
<%= fa_icon('phone') %> 046 - 14 47 22
<br>
<%= render partial: "contacts/kontakt", locals: {name: 'Ordförande'}%>
<br>
<div class="row-fluid">
<div class="headline"><h3>Besöksadress</h3></div>
<adress class="md-margin-bottom-40">
C/o Hilbert Älg <br>
Matematikhuset <br>
Sölvegatan 18, <br>
22362 Lund <br><br><br>
</adress>
</div>
</p>
</div>
<div class ="headline"><h2>Kontakta oss</h2></div>
<p>
<%= fa_icon 'phone' %> 046 - 14 47 22
<br>
<%= render 'contacts/kontakt', name: 'Ordförande' %>
<br>
<div class="row-fluid">
<div class="headline"><h3>Besöksadress</h3></div>
<address class="md-margin-bottom-40">
C/o Hilbert Älg <br>
Matematikhuset <br>
Sölvegatan 18, <br>
22362 Lund <br><br><br>
</address>
</div>
</p>
</div>
140 changes: 70 additions & 70 deletions app/views/layouts/_menu.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
<div class="collapse navbar-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown active">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
Sektionen <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<%@menues = Menu.index%>
<%if @menues.where(location: "Sektionen").first%>
<%for @menu in @menues.where(location: "Sektionen")%>
<%= render 'menus/menu'%>
<%end%>
<%else%>
<li><%= link_to 'Om oss', :om %></li>
<li><%= link_to 'Utskott', :councils %></li>
<li><%= link_to 'Dokument', documents_path%></li>
<% menus_by_location = Menu.index.group_by &:location %>

<%end%>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
För medlemmar <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<%if @menues.where(location: "För medlemmar").first%>
<%for @menu in @menues.where(location: "För medlemmar")%>
<%= render 'menus/menu'%>
<%end%>
<%else%>
<li><%= link_to 'Val', :elections,'data-no-turbolink'=>true %></li>
<li><%= link_to 'Bildgalleri', :albums ,'data-no-turbolink'=> true%></li>
<li><%= link_to 'Kalender', :kalender, 'data-no-turbolink'=> true%></li>
<li><%= link_to 'Jobbportal', :work_posts %></li>
<%end%>
<div class="collapse navbar-collapse navbar-responsive-collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown active">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
Sektionen <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<% if (sekt_menus = menus_by_location['Sektionen']).present? %>
<% sekt_menus.each do |m| %>
<%= render 'menus/menu', :menu => m %>
<% end %>
<% else %>
<li><%= link_to 'Om oss', :om %></li>
<li><%= link_to 'Utskott', :councils %></li>
<li><%= link_to 'Dokument', documents_path%></li>
<% end %>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
För medlemmar <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<% if (medlem_menus = menus_by_location['För medlemmar']).present? %>
<% medlem_menus.each do |m| %>
<%= render 'menus/menu', :menu => m %>
<% end %>
<% else %>
<li><%= link_to 'Val', :elections,'data-no-turbolink'=>true %></li>
<li><%= link_to 'Bildgalleri', :albums ,'data-no-turbolink'=> true%></li>
<li><%= link_to 'Kalender', :kalender, 'data-no-turbolink'=> true%></li>
<li><%= link_to 'Jobbportal', :work_posts %></li>
<% end %>

<% # This link could be made automatically too, the important part is that it as the right id. %>
<% if current_user %>
<li><a id="gallery_link" href="#">Gamla bildgalleriet</a></li>
<% end %>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
För företag <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<%if @menues.where(location: "För företag").first%>
<%for @menu in @menues.where(location: "För företag")%>
<%= render 'menus/menu'%>
<%end%>
<%else%>
<li><%= link_to 'Arbetsmarknadsdagar', 'http://www.farad.nu' %></li>
<%end%>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
Kontakt <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<%if @menues.where(location: "Kontakt").first%>
<%for @menu in @menues.where(location: "Kontakt")%>
<%= render 'menus/menu'%>
<%end%>
<%else%>
<li><%= link_to 'Kontaktsida', contacts_path %></li>
<%end%>
</ul>
</li>
</ul>
<% # This link could be made automatically too, the important part is that it as the right id. %>
<% if current_user %>
<li><a id="gallery_link" href="#">Gamla bildgalleriet</a></li>
<% end %>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
För företag <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<% if (company_menus = menus_by_location['För företag']).present? %>
<% company_menus.each do |m| %>
<%= render 'menus/menu', :menu => m %>
<% end %>
<% else %>
<li><%= link_to 'Arbetsmarknadsdagar', 'http://www.farad.nu' %></li>
<% end %>
</ul>
</li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-delay="0" data-close-others="false">
Kontakt <%= fa_icon('angle-down') %>
</a>
<ul class="dropdown-menu">
<% if (contact_menus = menus_by_location['Kontakt']).present? %>
<% contact_menus.each do |m| %>
<%= render 'menus/menu', :menu => m %>
<% end %>
<% else %>
<li><%= link_to 'Kontaktsida', contacts_path %></li>
<%end %>
</ul>
</li>

</ul>
</div>
39 changes: 19 additions & 20 deletions app/views/layouts/_shared_sidebar.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@

<!-- Quick Links -->
<div class="magazine-sb-categories">
<div class="headline headline-md"><h2>Snabblänkar</h2></div>
<div class="row">
<ul class="list-unstyled col-xs-6">
<li><a href="https://docs.google.com/spreadsheet/ccc?key=0AlFJsQziMBrLdFA4RFlqcmlqbHczLWNud3JnS2FxUWc&usp=drive_web#gid=11">Bilbokning</a></li>
<li><a href="http://tinyurl.com/hilbertcafelp4">Jobba i caféet</a></li>
</ul>
</div>
</div>
<!-- End Quick Links -->
<!-- Quick Links -->
<div class="magazine-sb-categories">
<div class="headline headline-md"><h2>Snabblänkar</h2></div>
<div class="row">
<ul class="list-unstyled col-xs-6">
<li><a href="https://docs.google.com/spreadsheet/ccc?key=0AlFJsQziMBrLdFA4RFlqcmlqbHczLWNud3JnS2FxUWc&usp=drive_web#gid=11">Bilbokning</a></li>
<li><a href="http://tinyurl.com/hilbertcafelp4">Jobba i caféet</a></li>
</ul>
</div>
</div>
<!-- End Quick Links -->

<!-- Photo Stream -->
<% if user_signed_in? %>
<div class="headline headline-md"><h2>Sett i bildarkivet</h2></div>
<ul class="list-unstyled blog-photos margin-bottom-30">
<li><a href="#"><%= image_tag "unify/sliders/elastislide/6.jpg", class: "hover-effect" %></a></li>
</ul>
<% end %>
<!-- End Photo Stream -->
<!-- Photo Stream -->
<% if user_signed_in? %>
<div class="headline headline-md"><h2>Sett i bildarkivet</h2></div>
<ul class="list-unstyled blog-photos margin-bottom-30">
<li><a href='#'><%= image_tag 'unify/sliders/elastislide/6.jpg', class: 'hover-effect' %></a></li>
</ul>
<% end %>
<!-- End Photo Stream -->
10 changes: 5 additions & 5 deletions app/views/layouts/_topbar.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
<li class="dropdown-submenu">
<a href="">Utskott</a>
<ul class="dropdown-menu pull-left">
<%for @utskott in Council.all%>
<% if current_user.moderator?(@utskott.url)%>
<li><%= link_to @utskott.title,edit_council_path(@utskott) %></li>
<%end%>
<%end%>
<% Council.all.each do |c| %>
<% if current_user.moderator?(c.url)%>
<li><%= link_to c.title,edit_council_path(c) %></li>
<% end %>
<% end %>
</ul>
</li>
<% end %>
Expand Down
16 changes: 8 additions & 8 deletions app/views/layouts/_utskottmenu.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<%@utskott = Council.all%>
<%utskott = Council.all%>
<ul class="list-inline list-unstyled black-link" style="margin-top: 10px; text-align: left">
<% @utskott.each do |u|%>
<li><%= link_to u.title,council_path(u) %></li>
<%end%>
<%if (current_user) && (current_user.moderator?(:utskott))%>
<li><%= link_to (content_tag(:i, nil, class: "fa fa-edit") + " Lägg till utskott"), new_council_path, class: "btn-u btn-u-small"%> </li>
<%end%>
</ul>
<% utskott.each do |u| %>
<li><%= link_to u.title, council_path u %></li>
<% end %>
<% if (current_user) && (current_user.moderator?(:utskott)) %>
<li><%= link_to (content_tag(:i, nil, class: 'fa fa-edit') + ' Lägg till utskott'), new_council_path, class: 'btn-u btn-u-small'%> </li>
<% end %>
</ul>
Loading

0 comments on commit cd92aa6

Please sign in to comment.