bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

fixing blue2 index

Browse Source
This commit is contained in:
Andreas Stephanides
2017-07-27 09:23:02 +02:00
parent 610e6ae3dd
commit 070e0dfedb
2 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/themes/blue2/home/index.html.erb
View File

@@ -26,7 +26,7 @@
<li> <li>
<%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %> <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
</li> </li>
<li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li> <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox if Studium.count > 0 %></li>
<li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li> <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
</ul> </ul>

109
app/views/themes/blue2/layouts/application.html.erb
View File

@@ -1,65 +1,64 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>"> <link rel="shortcut icon" href="<%= absurl("/logo2014_64.png")%>">
<link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" />
<link rel="alternate" hreflang="de" href="<%= url_for(params.merge(:locale=>:de))%>" /> <link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
<link rel="alternate" hreflang="en" href="<%= url_for(params.merge(:locale=>:en))%>" />
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %> <%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
<% if content_for?(:header) %> <% if content_for?(:header) %>
<%= yield :header %> <%= yield :header %>
<% else %> <% else %>
<title>Fetsite</title> <title>Fetsite</title>
<% end %> <% end %>
</head> </head>
<body> <body>
<div id="maincontainer" class="container-fluid"> <div id="maincontainer" class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span10 offset1 header_span"> <div class="span10 offset1 header_span">
<% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %> <% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %>
<div class="header_wrap"> <div class="header_wrap">
<div class="header hidden-print"> <div class="header hidden-print">
<%= link_to home_index_path do %> <%= link_to home_index_path do %>
<!-- <span class="feticon-fet_logo fa-4x color-1"> </span>--> <!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
<% end %> <% end %>
</div> </div>
<div class="header visible-print"> <div class="header visible-print">
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %> <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
</div> </div>
<div class="visible-print"> <div class="visible-print">
Fachschaft Elektrotechnik Fachschaft Elektrotechnik
<hr/> <hr/>
</div> </div>
<div id="menudiv" style="margin-top:12px" class="hidden-print"> <div id="menudiv" style="margin-top:12px" class="hidden-print">
<%= render :template => 'layouts/menu' %> <%= render :template => 'layouts/menu' %>
</div> </div>
</div> </div>
<% end %> <% end %>
</div> </div>
</div>
<div class="row-fluid">
<div class="span10 offset1" id="contentdiv">
<%= yield %>
</div>
</div>
</div> </div>
<div class="row-fluid"> <script>
<div class="span10 offset1" id="contentdiv"> $('.dropdown-toggle').click(function(e) {
<%= yield %> e.preventDefault();
</div> setTimeout($.proxy(function() {
</div> if ('ontouchstart' in document.documentElement) {
</div> $(this).siblings('.dropdown-backdrop').off().remove();
<script> }
$('.dropdown-toggle').click(function(e) { }, this), 0);
e.preventDefault(); });
setTimeout($.proxy(function() { </script>
if ('ontouchstart' in document.documentElement) {
$(this).siblings('.dropdown-backdrop').off().remove();
}
}, this), 0);
});
</script>
</body> </body>
</html> </html>