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

styling zeugs

Browse Source
This commit is contained in:
Andreas Stephanides
2013-09-06 18:04:57 +02:00
parent 41e54281bd
commit bb4b24d9cb
6 changed files with 68 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/assets/stylesheets/application.css.scss
View File

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

58
app/assets/stylesheets/scaffolds.css.scss
View File

@@ -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;
}
}

7
app/controllers/galleries_controller.rb
View File

@@ -1,4 +1,7 @@
class GalleriesController < ApplicationController class GalleriesController < ApplicationController
before_filter {@toolbar_elements=[]}
load_and_authorize_resource
# GET /galleries # GET /galleries
# GET /galleries.json # GET /galleries.json
def index def index
@@ -14,7 +17,9 @@ class GalleriesController < ApplicationController
# GET /galleries/1.json # GET /galleries/1.json
def show def show
@gallery = Gallery.find(params[:id]) @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| respond_to do |format|
format.html # show.html.erb format.html # show.html.erb
format.json { render json: @gallery } format.json { render json: @gallery }

2
app/views/galleries/index.html.erb
View File

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

50
app/views/galleries/show.html.erb
View File

@@ -1,37 +1,36 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div>
<small> <%= @gallery.datum %> </small>
<h1>
<%= @gallery.name %>
</h1>
</div>
<p> <p>
<b>Name:</b>
<%= @gallery.name %>
</p>
<p>
<b>Desc:</b>
<%= @gallery.desc %> <%= @gallery.desc %>
</p> </p>
<p>
<b>Datum:</b>
<%= @gallery.datum %>
</p>
<!-- modal-gallery is the modal dialog used for the image gallery --> <!-- 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 id="modal-gallery" class="modal hide fade modal-gallery modal-fullscreen modal-loading" tabindex="-1">
<div class="modal-header"> <div class="modal-header">
<a class="close" data-dismiss="modal">&times;</a> <a class="close" data-dismiss="modal">&times;</a>
<h3 class="modal-title"></h3> <h3 class="modal-title"></h3>
</div> </div>
<div class="modal-body"><div class="modal-image"></div></div> <div class="modal-body"><div class="modal-image"></div></div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-primary modal-next">Next <i class="icon-arrow-right icon-white"></i></a> <a class="btn btn-primary modal-next">Next <i class="icon-arrow-right icon-white"></i></a>
<a class="btn btn-info modal-prev"><i class="icon-arrow-left icon-white"></i> Previous</a> <a class="btn btn-info modal-prev"><i class="icon-arrow-left icon-white"></i> Previous</a>
<a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000"><i class="icon-play icon-white"></i> Slideshow</a> <a class="btn btn-success modal-play modal-slideshow" data-slideshow="5000"><i class="icon-play icon-white"></i> Slideshow</a>
<a class="btn modal-download" target="_blank"><i class="icon-download"></i> Download</a> <a class="btn modal-download" target="_blank"><i class="icon-download"></i> Download</a>
</div> </div>
</div> </div>
<div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery"> <div id="gallery" data-toggle="modal-gallery" data-target="#modal-gallery">
<% @gallery.fotos.each do |f| %> <% @gallery.fotos.each do |f| %>
<a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery"> <a href="<%= f.datei.resized.url%>" title="<%=f.title%>" data-gallery="gallery">
<%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a> <%=image_tag(f.datei.thumb.url,{:class=>"img-polaroid"}) %></a>
@@ -40,9 +39,10 @@
<% end %> <% end %>
</div> </div>
<%= link_to 'NewFoto' , new_gallery_foto_path(@gallery) %> | <%= render 'layouts/pretty_toolbar' %>
<%= link_to 'Edit', edit_gallery_path(@gallery) %> |
<%= link_to 'Back', galleries_path %>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"></script>
<script src="js/bootstrap.js"></script> <script src="js/bootstrap.js"></script>
<script src="js/load-image.js"></script> <script src="js/load-image.js"></script>

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

@@ -15,19 +15,23 @@
</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="header"> <div class="header">
<h1 style="display:block;float:none">Fachschaft Elektrotechnik</h1> <h1 style="display:block">Fachschaft Elektrotechnik</h1>
</div> </div>
</div> </div>
<div class="row-fluid"> <div class="row-fluid">
<div class="span2 earlymax"> <div class="span2 earlymax">
<div id="menudiv"><%= render :template => 'layouts/menu' %></div>
</div> <div class="span10 earlymax" id="contentdiv">
<%= yield %> <div id="menudiv"><%= render :template => 'layouts/menu' %></div>
</div> </div>
</div> <div class="span10 earlymax" id="contentdiv">
<%= yield %>
</div>
</div>
</div>
</body> </body>
</html> </html>