sr-rolando/contactorama
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Get rid of old header.

Browse source
This commit is contained in:
Roland Jesse 2012-04-04 23:08:43 +02:00
parent b1ae0c4a21
commit 93a5f77516
3 changed files with 12 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

37
app/views/layouts/application.html.erb
View file

@ -17,18 +17,24 @@
<body>
<%# The new test header. %>
<div class="header_new">
<div class="header">
<div class="container">
<div class="row">
<div class="onecol">&nbsp;</div>
<div class="onecol header_home"><span class="logo_contact">Home</span></div>
<div class="threecol header_menu">[A..Z] [gift] [new]</div>
<div class="threecol header_home"><span class="logo_contact">Contact</span><span class="logo_o-rama">-o-Rama</span></div>
<div class="twocol header_menu">[^] [A..Z] [gift] [new]</div>
<div class="threecol header_search">
<%= form_tag("/search", :method => "get") do %>
<%= text_field_tag(:q, nil, :placeholder => "Suchen...") %>
<% end %>
</div>
<div class="threecol header_user">name@domain.com [out]</div>
<div class="threecol header_user">
<% if current_user.nil? %>
&nbsp;
<% else %>
<%= current_user.email %>
(<%= link_to '|', destroy_user_session_path %>)
<% end %>
</div>
<div class="onecol">&nbsp;</div>
</div>
</div>
@ -36,27 +42,6 @@
<br /><br /><br />
<div class="container">
<%# The header. %>
<div class="row header">
<div class="threecol"><span class="logo_contact">Contact</span><span class="logo_o-rama">-o-Rama</span></div>
<div class="threecol">
<%= form_tag("/search", :method => "get") do %>
<%= text_field_tag(:q, nil, :placeholder => "Vorname / Nachname") %>
<%= submit_tag("Search") %>
<% end %>
</div>
<div class="onecol header_actions"><%= link_to "Geb", birthdays_path %></div>
<div class="onecol header_actions"><%= link_to "Neu", new_contact_path %></div>
<div class="threecol omega header_email">
<% if current_user.nil? %>
&nbsp;
<% else %>
<%= current_user.email %>
(<%= link_to t('sessions.actions.logout'), destroy_user_session_path %>)
<% end %>
</div>
</div> <%# row %>
<% unless flash.empty? %>
<div class="row">
<div class="fourcol">&nbsp;</div>

2
app/views/layouts/login.html.erb
View file

@ -16,7 +16,7 @@
<body>
<div class="header_new">
<div class="header">
<div align="center"><span class="logo_contact">Contact</span><span class="logo_o-rama">-o-Rama</span></div>
</div>

6
public/stylesheets/layout.css
View file

@ -36,12 +36,6 @@ h2 {
/* Header & Footer */
.header {
background: #f9f9f9; /* very light grey */
padding-top: 15px;
padding-bottom: 15px;
}
.header_new {
background: #f9f9f9; /* very light grey */
box-shadow: 5px 5px 3px #888;
padding-top: 15px;