andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Themen und themes_for_rails neues design

Browse Source 
Neues design mit theme=2003 ansehen
This commit is contained in:
Andreas Stephanides
2014-01-08 20:23:58 +01:00
parent 4853a1192d
commit b86d3aca23
21 changed files with 923 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,8 @@
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_tree .
* require_tree .
*= require 'calendars'
*= require jquery.fileupload-ui
* require 'bootstrap'
@@ -138,47 +139,8 @@ div.contentbox
margin: 5px;
}
table.calendar tr td
{
width:14.28%;
height:2em;
position:relative;
padding:0
}
table.calendar tr td.day div
{
display:block;
position:absolute;
padding:2px;
}
table.calendar tr td.day div div
{
display:none;
position:relative;
}
table.calendar tr td.day.events
{ color:blue
}
table.calendar tr td.day div:hover div
{
display:block;
z-index: 10000;
background:none;
border: none;
}
table.calendar tr td.day div:hover
{
background:white;
border: solid black 1px;
z-index:9999;
}
table.calendar tr td.day div:hover div
{
}
table.calendar tr td.day div div.day_number
{
display:block;
}
.navbar .nav li {
min-width:100%;
background:44F;
}

44
app/assets/stylesheets/calendars.css.scss
View File

@@ -2,3 +2,47 @@
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
table.calendar tr td
{
width:14.28%;
height:2em;
position:relative;
padding:0
}
table.calendar tr td.day div
{
display:block;
position:absolute;
padding:2px;
}
table.calendar tr td.day div div
{
display:none;
position:relative;
}
table.calendar tr td.day.events
{ color:blue
}
table.calendar tr td.day div:hover div
{
display:block;
z-index: 10000;
background:none;
border: none;
}
table.calendar tr td.day div:hover
{
background:white;
border: solid black 1px;
z-index:9999;
}
table.calendar tr td.day div:hover div
{
}
table.calendar tr td.day div div.day_number
{
display:block;
}

25
app/assets/stylesheets/layout.css.scss
View File

@@ -0,0 +1,25 @@
// Colorshema #0A64A4
$color_prim: #0A64A4;
$color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5;
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: #03006E;
$white: #FFFFFF;
$bodyBackground: $white;
$navbarBackground: $color_cont;
$navbarBackground: #FFFFFF;
$navbarBackgroundHighlight:lighten($navbarBackground,30%);
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#cccccc,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';

4
app/assets/stylesheets/test.css.scss Normal file
View File

@@ -0,0 +1,4 @@
#content
{
background:red;
}

200
app/assets/stylesheets/themes/2003/application.css.scss Executable file
View File

@@ -0,0 +1,200 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_tree .
*= require jquery.fileupload-ui
* require 'bootstrap'
*= require 'neuigkeiten'
*/
// Colorshema #0A64A4
$color_prim: #7070a0;
$color_prim_light: lighten($color_prim ,10%);
$color_prim_vlight: lighten($color_prim ,30%);
$color_prim_dark: darken($color_prim ,10%);
$color_prim_vdark: darken($color_prim ,30%);
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: $color_prim_vdark;
$white: #FFFFFF;
$bodyBackground: $white;
$navbarBackground: $color_prim;
$navbarText: black;$navbarLinkColor: black;
$navbarBackgroundHighlight: $color_prim;
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: darken($navbarBackground,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';
h1 {
font-size: 23px
}
h2 {
font-size: 19px
}
body,html {
padding:0;
margin:0;
}
a:hover {
text-decoration:none;
}
div.header {
display: block;
// background: url('../../../../header1.png') no-repeat;
// background-color:white;// $color_prim;
background-position: right;
border-bottom:1px solid black;
float:left;
color:#000;
padding-left:87px;
padding-top:0px;
// overflow:hidden;
margin-bottom: 0 px
}
div.header h1 {
padding:0;
margin:4px;
font-size:20px;
line-height:32px;
}
div.headerrow {
background: $color_prim
}
#menudiv {
// width:100%;
}
div.smallspan {
min-height:0;
}
.navbar .nav li {
min-width:100%;
}
.navbar .nav .divider {
border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}
.navbar .navbar-inner
{
border:none;
box-shadow:none;
}
#contentdiv
{
background: #FFFFFF
}
#contentdiv .container-fluid
{
padding:0;
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius: 10px;
border: lightgray solid 1px;
}
a.linkbox:hover
{
box-shadow: 1px 1px 2px 2px lightgray;
}
a.linkbox li
{
}
ul.linkbox-list li
{
margin-bottom:10px;
}
ul.linkbox-list
{
max-width:70em;
}
div.contentbox
{
margin: 5px;
}
table.calendar tr td
{
width:14.28%;
height:2em;
position:relative;
padding:0
}
table.calendar tr td.day div
{
display:block;
position:absolute;
padding:2px;
}
table.calendar tr td.day div div
{
display:none;
position:relative;
}
table.calendar tr td.day.events
{ color:blue
}
table.calendar tr td.day div:hover div
{
display:block;
z-index: 10000;
background:none;
border: none;
}
table.calendar tr td.day div:hover
{
background:white;
border: solid black 1px;
z-index:9999;
}
table.calendar tr td.day div:hover div
{
}
table.calendar tr td.day div div.day_number
{
display:block;
}
.navbar .nav li {
min-width:0;
background:44F;
}

5
app/assets/stylesheets/themes/2003/bootstrap-responsive.scss vendored Normal file
View File

@@ -0,0 +1,5 @@
@import "bootstrap/responsive";
@media (max-width: 979px){
.earlymax {
min-width: 100%;
}}

4
app/assets/stylesheets/themes/2003/test.css.scss Normal file
View File

@@ -0,0 +1,4 @@
#content
{
background:red;
}

25
app/assets/themes/2003/stylesheets/layout.css.scss Executable file
View File

@@ -0,0 +1,25 @@
// Colorshema #0A64A4
$color_prim: #ff0;
$color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5;
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: #03006E;
$white: #FFFFFF;
$bodyBackground: $red;
$navbarBackground: $color_cont;
$navbarBackground: #FFFFFF;
$navbarBackgroundHighlight:lighten($navbarBackground,30%);
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#cccccc,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';

17
app/assets/themes/2003/stylesheets/mod.css Normal file
View File

@@ -0,0 +1,17 @@
.navbar .nav li {
min-width:0;
background:44F;
}
div.header h1
{
color:F32;
font-size:10px;
}
#menudiv{
background-color: #D25FD2;
width:100%;
}
.navbar-inner {
}

187
app/assets/themes/2003/stylesheets/sass/application.css.scss Executable file
View File

@@ -0,0 +1,187 @@
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
*
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
*
* You're free to add application-wide styles to this file and they'll appear at the top of the
* compiled file, but it's generally better to create a new file per style scope.
*
*= require_self
*= require_tree .
*= require jquery.fileupload-ui
* require 'bootstrap'
*/
// Colorshema #0A64A4
$color_prim: #0A64A4;
$color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5;
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: #03006E;
$white: #FFFFFF;
$bodyBackground: $white;
$navbarBackground: $color_cont;
$navbarBackground: #FFFFFF;
$navbarBackgroundHighlight:lighten($navbarBackground,30%);
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#cccccc,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
//@import 'bootstrap';
//@import 'bootstrap-responsive';
//@import 'bootstrap/image-gallery';
h1 {
font-size: 23px
}
h2 {
font-size: 19px
}
body,html {
padding:0;
margin:0;
}
a:hover {
text-decoration:none;
}
div.header {
display: block;
background: url('/header1.png') no-repeat;
background-color: #FFF;
background-position: right;
border-bottom:1px solid black;
height:41px;
color:#000;
padding-left:87px;
padding-top:0px;
overflow:hidden;
margin-bottom: 20px
}
div.header h1 {
padding:0;
margin:4px;
font-size:20px;
line-height:32px;
}
#menudiv {
width:100%;
}
.navbar .nav li {
min-width:100%;
}
.navbar .nav .divider {
border-style: solid;
border-width: 1px 0px 0px 0px;
border-color: grey;
min-width: 100%;
}
.navbar .navbar-inner
{
border:none;
box-shadow:none;
}
#contentdiv
{
background: #FFFFFF
}
#contentdiv .container-fluid
{
padding:0;
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius: 10px;
border: lightgray solid 1px;
}
a.linkbox:hover
{
box-shadow: 1px 1px 2px 2px lightgray;
}
a.linkbox li
{
}
ul.linkbox-list li
{
margin-bottom:10px;
}
ul.linkbox-list
{
max-width:70em;
}
div.contentbox
{
margin: 5px;
}
table.calendar tr td
{
width:14.28%;
height:2em;
position:relative;
padding:0
}
table.calendar tr td.day div
{
display:block;
position:absolute;
padding:2px;
}
table.calendar tr td.day div div
{
display:none;
position:relative;
}
table.calendar tr td.day.events
{ color:blue
}
table.calendar tr td.day div:hover div
{
display:block;
z-index: 10000;
background:none;
border: none;
}
table.calendar tr td.day div:hover
{
background:white;
border: solid black 1px;
z-index:9999;
}
table.calendar tr td.day div:hover div
{
}
table.calendar tr td.day div div.day_number
{
display:block;
}
@import "bootstrap-sass"

25
app/assets/themes/2003/stylesheets/sass/layout.css.scss Executable file
View File

@@ -0,0 +1,25 @@
// Colorshema #0A64A4
$color_prim: #ff0;
$color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5;
$color_cont: FFDB73;
$color_cont_light:FFDB73;
$linkColor: #03006E;
$white: #FFFFFF;
$bodyBackground: $red;
$navbarBackground: $color_cont;
$navbarBackground: #FFFFFF;
$navbarBackgroundHighlight:lighten($navbarBackground,30%);
//$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: lighten(#cccccc,10%);
$infoBackground:#65A5D1;
$infoText:#03406A;
$sansFontFamily: Helvetica, Arial;
@import 'bootstrap';
@import 'bootstrap-responsive';
@import 'bootstrap/image-gallery';

4
app/assets/themes/2003/stylesheets/sass/test.css.scss Normal file
View File

@@ -0,0 +1,4 @@
#content
{
background:red;
}

11
app/controllers/application_controller.rb
View File

@@ -2,6 +2,7 @@ class ApplicationController < ActionController::Base
protect_from_forgery
before_filter :set_i18n_locale_from_params
protected
theme :get_theme
def set_i18n_locale_from_params
if params[:locale]
if I18n.available_locales.include?(params[:locale].to_sym)
@@ -12,7 +13,15 @@ class ApplicationController < ActionController::Base
end
end
end
def get_theme
set_theme(params[:theme])
if valid_theme?
theme_name
else
nil
end
end
def default_url_options
{locale: I18n.locale}
{locale: I18n.locale, theme:theme_name}
end
end

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

@@ -4,7 +4,11 @@
<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Fetsite</title>
<%= stylesheet_link_tag "application", :media => "all" %>
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.nil? %>
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.nil? %>
<link rel="stylesheet" href="css/bootstrap.css">
<link rel="stylesheet" href="css/style.css">
<link rel="stylesheet" href="css/bootstrap-responsive.css">

57
app/views/themes/2003/layouts/application.html.erb Executable file
View File

@@ -0,0 +1,57 @@
<!DOCTYPE html>
<html>
<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.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">
<!--[if lt IE 7]><link rel="stylesheet" href="css/bootstrap-ie6.css"><![endif]-->
<link rel="stylesheet" href="css/bootstrap-image-gallery.css">
<%= javascript_include_tag "application" %>
<%= csrf_meta_tags %>
</head>
<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('/fetlogo.png',{:style=>"float:left"}) %>
<h1 style="display:block"></h1>
</div>
<div id="menudiv" style="margin-top:12px">
<%= render :template => 'layouts/menu' %>
</div>
</div>
</div>
<div class="span1 "><%= theme_name %></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>
</html>

33
app/views/themes/2003/layouts/menu.html.erb Normal file
View File

@@ -0,0 +1,33 @@
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<!-- <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>
<span class="icon-bar"></span>
</a>
<div class="nav-collapse collapse">
<ul class="nav nav-pills nav-stacked">
<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>
<%= 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>