styling zeugs

app/assets/stylesheets/application.css.scss

@@ -1,3 +1,4 @@
+
 /*
  * This is a manifest file that'll be compiled into application.css, which will include all the files
  * listed below.
@@ -16,9 +17,21 @@
  
  */
 // Colorshema #0A64A4
-$bodyBackground: #FFFFFF;
-$navbarBackground: #FFCE40;
-$navbarBackgroundHighlight:#FFDB73;
+$color_prim: #0A64A4;
+$color_prim_light: 0B65A5;
+$color_prim_vlight: 2B85C5;
+$color_cont: FFDB73;
+$color_cont_light:FFDB73;
+
+$white: #FFFFFF;
+
+$bodyBackground: $white;
+$navbarBackground: lighten(#FFCE40,20%);
+//$navbarBackground: #FFFFFF;
+
+$navbarBackgroundHighlight:lighten(#FFDB73,20%);
+//$navbarBackgroundHighlight:#FFFFFF;
+
 $navbarLinkBackgroundHover:#FFBE00;
 $infoBackground:#65A5D1;
 $infoText:#03406A;
@@ -74,6 +87,10 @@ div.header {
   min-width: 100%;
 }
 
+.navbar .navbar-inner {
+border:none;
+box-shadow:none;
+}
 #contentdiv{
   background: #FFFFFF
 }

app/assets/stylesheets/scaffolds.css.scss

@@ -1,58 +0,0 @@
-body {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-p, ol, ul, td {
-  font-family: verdana, arial, helvetica, sans-serif;
-  font-size: 13px;
-  line-height: 18px;
-}
-
-pre {
-  background-color: #eee;
-  padding: 10px;
-  font-size: 11px;
-}
-
-
-
-div {
-  &.field, &.actions {
-    margin-bottom: 10px;
-  }
-}
-
-#notice {
-  color: green;
-}
-
-.field_with_errors {
-  padding: 2px;
-  background-color: red;
-  display: table;
-}
-
-#error_explanation {
-  width: 450px;
-  border: 2px solid red;
-  padding: 7px;
-  padding-bottom: 0;
-  margin-bottom: 20px;
-  background-color: #f0f0f0;
-  h2 {
-    text-align: left;
-    font-weight: bold;
-    padding: 5px 5px 5px 15px;
-    font-size: 12px;
-    margin: -7px;
-    margin-bottom: 0px;
-    background-color: #c00;
-    color: #fff;
-  }
-  ul li {
-    
-    list-style: square;
-  }
-}

app/controllers/galleries_controller.rb

@@ -1,4 +1,7 @@
 class GalleriesController < ApplicationController
+  before_filter {@toolbar_elements=[]}
+  load_and_authorize_resource
+
   # GET /galleries
   # GET /galleries.json
   def index
@@ -14,7 +17,9 @@ class GalleriesController < ApplicationController
   # GET /galleries/1.json
   def show
     @gallery = Gallery.find(params[:id])
-
+    @toolbar_elements << {:hicon=>'icon-plus', :text=> "NewFoto", :path=>new_gallery_foto_path(@gallery)}
+    @toolbar_elements << {:hicon=>'icon-pencil', :text => I18n.t('common.edit'), :path=>edit_gallery_path(@gallery)}
+    @toolbar_elements << {:text=>"Back", :path=>galleries_path()}
     respond_to do |format|
       format.html # show.html.erb
       format.json { render json: @gallery }

app/views/galleries/index.html.erb

@@ -16,7 +16,7 @@
 				</div>
 			</div>
 			<% end %>
-			<%= link_to 'Edit', edit_gallery_path(gallery) %>
+
 		<% end %>
 		</div>
 	</div>

app/views/galleries/show.html.erb

@@ -1,20 +1,19 @@
 
 <p id="notice"><%= notice %></p>
-
-<p>
-  <b>Name:</b>
+<div>
+  <small> <%= @gallery.datum %> </small>
+  <h1>
     <%= @gallery.name %>
-</p>
+  </h1>
 
+</div>
 <p>
-  <b>Desc:</b>
   <%= @gallery.desc %>
 </p>
 
-<p>
-  <b>Datum:</b>
-  <%= @gallery.datum %>
-</p>
+
+ 
+
 <!-- modal-gallery is the modal dialog used for the image gallery -->
 <div id="modal-gallery" class="modal hide fade modal-gallery modal-fullscreen modal-loading" tabindex="-1">
   <div class="modal-header">
@@ -40,9 +39,10 @@
 <% end %>
 </div>
 
-<%= link_to 'NewFoto' , new_gallery_foto_path(@gallery)  %> | 
-<%= link_to 'Edit', edit_gallery_path(@gallery) %> |
-<%= link_to 'Back', galleries_path %>
+<%= render 'layouts/pretty_toolbar' %>
+
+
+
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
 <script src="js/bootstrap.js"></script>
 <script src="js/load-image.js"></script>

app/views/layouts/application.html.erb

@@ -18,16 +18,20 @@
   <div id="maincontainer" class="container-fluid">
     <div class="row-fluid">
 	<div class="header">
-		<h1 style="display:block;float:none">Fachschaft Elektrotechnik</h1>
+	  <h1 style="display:block">Fachschaft Elektrotechnik</h1>
 	</div>
     </div>
     <div class="row-fluid">
       <div class="span2 earlymax">
+
+	
 	<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
-	</div>	<div class="span10 earlymax" id="contentdiv">
+      </div>	
+      <div class="span10 earlymax" id="contentdiv">
 	
 	<%= yield %>
       </div>
     </div>
+  </div>
 </body>
 </html>