Skip to content

Commit

Permalink
added ugly design
Browse files Browse the repository at this point in the history
  • Loading branch information
Roger Braun committed Oct 23, 2010
1 parent f5f3b2e commit 674c7db
Show file tree
Hide file tree
Showing 3 changed files with 300 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/controllers/prefectures_controller.rb
@@ -1,5 +1,5 @@
class PrefecturesController < ApplicationController
before_filter :authenticate_user!, :except => [:index, :show]
#before_filter :authenticate_user!, :except => [:index, :show]
# GET /prefectures
# GET /prefectures.xml
def index
Expand Down
62 changes: 47 additions & 15 deletions app/views/layouts/application.html.erb
@@ -1,21 +1,53 @@
<!DOCTYPE html>
<html>
<head>
<title>WS1011Landeskunde</title>
<!doctype html>
<html lang="de">
<head>
<meta charset="utf-8" />
<title>Landeskunde WS10/11</title>
<%= stylesheet_link_tag :all %>
<%= javascript_include_tag :defaults %>
<%= csrf_meta_tag %>
</head>
<body>
<p class="notice"><%= notice %></p>
<p class="alert"><%= alert %></p>
<!--[if IE]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
</head>
<body>
<div id="wrapper"><!-- #wrapper -->

<nav><!-- top nav -->
<div class="menu">
<ul>
<li><%= link_to "Regionen", regions_path %></li>
<li><%= link_to "Präfekturen", prefectures_path %></a></li>
<% if user_signed_in? %>
Hallo, <%= current_user.email %>! <%= link_to "Abmelden", destroy_user_session_path %>
<li><%= link_to "Abmelden", destroy_user_session_path %></li>
<% else %>
<%= link_to "Anmelden", new_user_session_path %>
<%= link_to "Registrieren", new_user_registration_path %>
<li><%= link_to "Anmelden", new_user_session_path %></li>
<li><%= link_to "Registrieren", new_user_registration_path %></li>
<%end %>
<%= yield %>

</body>
</html>
</ul>
</div>
</nav><!-- end of top nav -->

<header><!-- header -->
<h1><a href="#">Landeskunde WS10/11</a></h1>
</header><!-- end of header -->

<section id="main"><!-- #main content and sidebar area -->

<aside id="sidebar1"><!-- sidebar1 -->

</aside><!-- end of sidebar1 -->

<section id="content"><!-- #content -->
<p><%= notice %></p>
<p><%= alert%></p>

<%= yield %>
</section><!-- end of #content -->


</section><!-- end of #main content and sidebar-->


</div><!-- #wrapper -->
<!-- Free template created by http://freehtml5templates.com -->
</body>
</html>
252 changes: 252 additions & 0 deletions public/stylesheets/styles.css
@@ -0,0 +1,252 @@
/* Created by http://freehtml5templates.com */

/* reset */
* {
margin: 0;
padding: 0;
}

/* render html5 elements as block */
header, footer, section, aside, nav, article {
display: block;
}

body {
line-height: 1;
background: #fff;
font-family: Verdana, Arial, Helvetica, sans-serif;
color: #666;
font-size: 14px;
line-height: 18px;
}

/* layout */

#wrapper {
width: 940px;
margin: 0 auto;
margin-top: 5px;
margin-bottom: 5px;
border: 1px #000 solid;
}

nav {
width: 940px;
height: 50px;
margin: 0 auto;
background: #407E80;
}

header {
width: 940px;
height: 100px;
margin: 0 auto;
background: #000 ;
}

#main {
width: 940px;
margin: 0 auto;
padding-top: 30px;
background: #FFF;
overflow: hidden;
}

#content {
float: left;
width: 450px;
margin-left: 40px;
}

#sidebar1 {
float: left;
padding-left: 20px;
width: 180px;
}

#sidebar2 {
float: right;
padding-right: 30px;
width: 180px;
}

footer {
width: 940px;
margin: 0 auto;
clear: both;
}

/* basics */

h1,h2,h3,h4,h5,h6 {
font-weight: bold;
clear: both;
color: #333;
}

a:link, a:visited {
color:#407E80;
text-decoration: none;
}

a:hover, a:active {
color: #333;
text-decoration: underline;
}

p {
margin-bottom: 18px;
}

li {
padding-left: 5px;
}

/* nav */

nav .menu {
font-size: 16px;
font-weight: bold;
}

nav .menu ul {
margin: 0;
padding: 17px 0 0 20px;
list-style: none;
line-height: normal;
}

nav .menu li {
display: block;
float: left;
}

nav .menu a {
display: block;
float: left;
margin-right: 5px;
padding: 0px 15px;
text-decoration: none;
color: #FFF;
}

nav .menu a:hover {
text-decoration: underline;
}

/** HEADER */

header h1 {
margin: 0;
padding: 0 0 0 30px;
line-height: normal;
}

header h1 {
text-align: center;
padding-top: 20px;
font-size: 48px;
}

header h1 a:link, header h1 a:visited {
text-decoration: none;
color: #FFF;
}

header h1 a:hover {
text-decoration: underline;
}

/** ARTICLES **/
article img {
border: none;
-webkit-box-shadow: 3px 3px 7px #777;
-moz-box-shadow: 3px 3px 7px #777;
}

#content p, ul, ol, hr {
margin-bottom: 24px;
}

#content ul ul, ol ol, ul ol, ol ul {
margin-bottom: 0;
}

#content h1, h2, h3, h4, h5, h6 {
color: #333;
margin: 0 0 20px 0;
line-height: 1.5em;
text-shadow: 0px 2px 3px #ddd;
}

.alignleft, img.alignleft {
display: inline;
float: left;
margin-right: 24px;
margin-top: 4px;
}

.alignright, img.alignright {
display: inline;
float: right;
margin-left: 24px;
margin-top: 4px;
}

.aligncenter, img.aligncenter {
clear: both;
display: block;
margin-left: auto;
margin-right: auto;
}

img.alignleft, img.alignright, img.aligncenter {
margin-bottom: 12px;
}

/* sidebar and footer widget blocks */

aside h3 {
font-size: 18px;
text-shadow: 0px 2px 3px #ddd;
}

aside ul {
list-style: none;
margin-bottom: 20px;
margin-top: -15px;
}

#footer-area {
background: #000;
color: #FFF;
font-size: 90%;
padding: 18px 0;
overflow: hidden;
}

.footer-segment {
float: left;
margin-right: 20px;
margin-left: 20px;
width: 190px;
}

footer aside h4 {
color: #FFF;
font-size: 16px;
line-height: 1.5em;
text-shadow: 0px 2px 3px #ddd;
}

footer a:link, footer a:visited {
color: #FFF;
}

footer a:hover {
text-decoration: underline;
}

footer p {
margin-top: -15px;
}

0 comments on commit 674c7db

Please sign in to comment.