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

default theme -> blue1

Browse Source
This commit is contained in:
Andreas Stephanides
2014-02-20 10:48:30 +01:00
parent b7c577d3b9
commit c314be8574
12 changed files with 155 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/views/layouts/application.html.erb
View File

@@ -4,11 +4,12 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Fetsite</title>
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.nil? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.nil? %>
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<%= theme_stylesheet_link_tag "test", :media => "all" %>
<% theme_stylesheet_link_tag "mod", :media=>"all" %>
<link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/bootstrap-responsive.css">
@@ -18,28 +19,39 @@
<%= csrf_meta_tags %>
</head>
<body>
<div id="maincontainer" class="container-fluid">
<div class="row-fluid">
<div class="header">
<%= image_tag('/fetlogo.png',{:style=>"float:left"}) %>
<h1 style="display:block">Fachschaft Elektrotechnik</h1>
</div>
</div>
<div class="row-fluid">
<div class="span2 earlymax">
<body>
<div id="maincontainer" class="container-fluid">
<div class="row-fluid">
<div class="span1 "></div>
<div class="span10 ">
<div class="header_wrap" style="background:7070a0">
<div class="header">
<%= image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
<h1 style="display:block"></h1>
</div>
<div id="menudiv" style="margin-top:12px">
<%= render :template => 'layouts/menu' %>
</div>
</div>
</div>
<div class="span1 "></div>
</div>
<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
<%= render 'layouts/login' %>
</div>
<div class="span10" id="contentdiv">
<%= yield %>
</div>
</div>
<div class="row-fluid">
<div class="span1">
</div>
<div class="span10" id="contentdiv">
<%= yield %>
<span class="pull-right"> <%= render 'layouts/login' %></span>
</div>
<div class="span1">
</div>
</div>
</div>
</body>
</div>
</body>
</html>

24
app/views/layouts/menu.html.erb Executable file → Normal file
View File

@@ -1,7 +1,7 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
@@ -12,24 +12,24 @@
<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
</li>
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path %></li>
<li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path %></li>
<li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path %></li>
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path %></li>
<li class="divider"></li>
<li><%if I18n.locale == :en %>
<%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
<%end %>
</li>
<li> <%= link_to I18n.t("home.search"), search_home_index_path %></li>
<li>
<%= link_to 'Admin' , config_path%>
</li>
</ul>
<span class="pull-right"><%if I18n.locale == :en %>
<%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
<% elsif I18n.locale == :de %>
<%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
<%end %>
</span>
</div>
</div>
</div>
</div>
</div>
</div>