Commit bf07427b authored by Christoph's avatar Christoph
Browse files

Merge remote-tracking branch 'origin/themesupport'

parents 5c2a044f fe92cd47
......@@ -25,4 +25,28 @@ sendmails = True
pdf2txt = "pdf2txt"
## config for by-url theme-selection
themes_by_url = [ ("eva.fsi.informatik.uni-erlangen.de", "fsi_inf")
, ("www.eva.fsi.informatik.uni-erlangen.de", "fsi_inf")
, ("eva.fsi.cs.fau.de", "fsi_inf")
, ("www.eva.fsi.cs.fau.de", "fsi_inf")
, ("eva.fsi.mb.fau.de", "fsi_mb")
, ("www.eva.fsi.mb.fau.de", "fsi_mb")
, ("eva.fsi.mb.uni-erlangen.de", "fsi_mb")
, ("www.eva.fsi.mb.uni-erlangen.de", "fsi_mb")
, ("eva.mb.fsi.fau.de", "fsi_mb")
, ("www.eva.mb.fsi.fau.de", "fsi_mb")
, ("eva.mb.fsi.uni-erlangen.de", "fsi_mb")
, ("www.eva.mb.fsi.uni-erlangen.de", "fsi_mb")
, ("eva.fachschaft.techfak.fau.de", "fsv_tech")
, ("www.eva.fachschaft.techfak.fau.de", "fsv_tech")
, ("eva.fachschaft.techfak.uni-erlangen.de", "fsv_tech")
, ("www.eva.fachschaft.techfak.uni-erlangen.de", "fsv_tech")
]
default_theme = "fsi_inf"
from config.local import *
=== geschichte ===
bis WS2014/15 war die fsi-eva ein fsi-inf-projekt, und die entsprechende
"corporate identity" war einfach mit eingeflochten.
dann kamen die maschinenbauer und haben gefragt, ob sie
mit{machen,benutzen} können. zuerst war die idee, unter
eva.mb.fsi.fau.de (oder ähnlicher subdomain) eine zweite instanz
aufzusetzen. dann kam man aber drauf, dass man sowieso dinge wie ggs.
exportveranstaltungen verlinken wollen würde, und es viel sinnvoller
wäre, ein gemeinsames portal zu haben, mit verschiedenen ansichten.
=== theme-orte ===
an verschiedenen orten war zum zeitpunkt als ich theme-zeug eingebaut
hab fsi-inf-spezifisches design im rest verwoben. die idee war, das
durch entsprechend <theme-name>/<urspruenglicher-datei-name> zu
ersetzen, so dass es jetzt kein style.css mehr sondern ein
fsi_inf/style.css gibt.
== übersicht ==
* static/style.css -> static/$theme/style.css
* web/templates/(.*).xml -> web/templates/$theme/$1.xml
ich hab's mittlerweile so gebaut, dass für $theme zuerst in
web/templates/$theme/$file geschaut wird, und dann in web/templates/$file
(geht nicht für static-zeugs, das wird nicht vom gleichen loader geladen)
=== neues theme ===
* web/templates/$theme/header.xml anlegen
* static/$theme/style.css anlegen
* in web/templates/faq.xml stehen bisher hardcoded fsi-inf und fsi-mb
adressen; man kann aber im theme eigene faq.xml bauen, die nur passende™
adressen enthalten
--dario 2015-07-19
......@@ -94,7 +94,7 @@ a {
}
a:hover, .fat a:hover {
backgorund-color: inherit;
background-color: inherit;
color: #000;
}
......@@ -118,7 +118,7 @@ ul {
ul.head_navigation, ul.head_subnavigation
{
border-left: 1px solid #000;
border-right: solid 1px #666;
border-right: 1px solid #666;
margin: 0;
padding: 0;
display: inline-block;
......@@ -464,4 +464,8 @@ ul#entries a span.state, ul#latest a span.state {
padding: 0px;
}
label {
display: inline-block;
}
/* vim: set expandtab shiftwidth=2 tabstop=2: */
/*
Meyer-Reset
http://meyerweb.com/eric/tools/css/reset/
v2.0 | 20110126
License: none (public domain)
*/
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
del, dfn, em, img, ins, kbd, q, s, samp,
small, strike, strong, sub, sup, tt, var,
b, u, i, center,
dl, dt, dd, ol, ul, li,
fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, embed,
figure, figcaption, footer, header, hgroup,
menu, nav, output, ruby, section, summary,
time, mark, audio, video {
margin: 0;
padding: 0;
border: 0;
font-size: 100%;
font: inherit;
vertical-align: baseline;
}
/* HTML5 display-role reset for older browsers */
article, aside, details, figcaption, figure,
footer, header, hgroup, menu, nav, section {
display: block;
}
body {
line-height: 1;
}
ol, ul {
list-style: none;
}
blockquote, q {
quotes: none;
}
blockquote:before, blockquote:after,
q:before, q:after {
content: '';
content: none;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
/*
Meyer Reset End
*/
/*
Colors
For later use:
uebrschriften dunkles dunkles gruen : #202225;
Dark Green Link color: #141412;
main menu background mint grren: #eef8f6;
main menu background hover deep green: #398647;
dunkles footer green: #0a3112;
footer helles gruen #2f7d3d
footer hover gruen #266331
*/
* {
box-sizing: border-box;
}
html {
font-family: "Source Sans Pro", Helvetica, sans-serif;
font-size: 100%;
overflow-y: scroll;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
}
html, body {
margin: 0;
padding: 0;
min-height: 100%;
}
body {
background-color: white;
line-height: 1.5;
}
h1,
h2,
h3,
h4,
h5,
h6 {
clear: both;
font-family: Bitter, Georgia, serif;
line-height: 1.3;
}
h1 {
font-size: 48px;
margin: 33px 0;
}
h2 {
font-size: 30px;
margin: 25px 0;
}
h3 {
font-size: 22px;
margin: 22px 0;
}
h4 {
font-size: 20px;
margin: 25px 0;
}
h5 {
font-size: 18px;
margin: 30px 0;
}
h6 {
font-size: 16px;
margin: 36px 0;
}
p {
padding-bottom: 1em;
}
/*
die zwei verschachtelten divs:
#topofthepops und #floppy waren im inf div notwendig um
2 bg images zu haben (schatten links und schatten rechts)
*/
#topofthepops{
/* position:relative; */
margin:0 auto;
max-width: 1600px;
width: 100%;
border-left: 1px solid #f2f2f2;
border-right: 1px solid #f2f2f2;
}
#content{
overflow:hidden;
}
#head_logo
{
background: url(img/header-green.png);
background-position: top;
background-repeat: no-repeat;
background-size: 1600px auto;
height:230px;
text-align: left;
}
#head_logo img {
display: none;
}
.home-link {
color: #141412;
display: block;
margin: 0 auto;
max-width: 1080px;
min-height: 230px;
padding: 0 20px;
text-decoration: none;
width: 100%;
}
.site-title {
font-size: 60px;
font-weight: bold;
line-height: 1;
margin: 0;
padding: 58px 0 10px;
}
.site-description {
font: 300 italic 24px "Source Sans Pro", Helvetica, sans-serif;
margin: 0;
}
/*
Hauptnavi Beginn
*/
.head_navigation_container
{
background-color: #eef8f6;
color: #fff;
display: block;
height: 45px;
line-height: 1;
padding: 0 40px 0 0;
text-align: center;
}
ul.head_navigation, ul.head_subnavigation
{
display: inline-block;
margin: 0;
}
ul.head_navigation li, ul.head_subnavigation li
{
display: inline-block;
}
ul.head_navigation li a, ul.head_subnavigation li a
{
color: #141412;
display: block;
font-size: 15px;
font-weight: normal;
list-style: none;
padding: 15px 20px;
text-decoration: none;
}
ul.head_navigation li a img
{
}
ul.head_navigation li.active
{
}
ul.head_navigation li.active a
{
}
ul.head_navigation li a:hover, ul.head_subnavigation li a:hover
{
background-color: #398647;
color: #fff;
}
ul.head_navigation li a:active,
ul.head_navigation li a:focus
{
}
/*
Hauptnavi Ennde
*/
.head_subnavigation_container
{
text-align:center;
padding: 2px 0 2px 0;
color: #fff;
background-color: #000;
}
.head_navigation_container li, .head_subnavigation_container li
{
float: left;
display: inline-block;
}
div#body {
position: relative;
max-width: 1080px;
margin:0 auto;
padding-bottom: 20px;
padding-right: 376px;
}
a {
text-decoration: none;
font-weight:normal;
background-color: inherit;
color: #2f7d3d;
}
a:hover, .fat a:hover {
backgorund-color: inherit;
color: #000;
}
ul {
list-height: 1.5em;
list-style-image: url(https://fsi.informatik.uni-erlangen.de/dw/lib/tpl/fsi/images/bullet.gif);
list-style-type: square;
padding: 0;
}
ul.sem {
margin: 0 0 0.5em 1.5em;
}
#footer p.search-js-warn {
margin-top: 10px;
}
.discreet {
color: #707070;
font-size: 80%;
}
table.modtable {
margin-top: 0.5em;
margin-left: auto;
margin-right: auto;
border: 1px dashed black;
padding: 0.3em;
}
.modtable > tr > td + td {
display: flex;
}
.modtable > tr > td + td > textarea {
width: 100%;
}
.modtable > tr > td + td > input {
width: 100%;
}
#submitter_title {
width: 10em;
margin-right: 5px;
}
#lecture_type {
width: 20em;
}
#semester_jahr {
width: 4em;
}
#footer{
background-color:#0a3112;
clear:both;
overflow:hidden;
margin-left:0;
margin-right:0;
margin-bottom:0;
height: 200px;
width:auto;
padding:0 10px 4px 10px;
}
#footer ul{
margin:0;
padding: 20px;
}
#footer ul li{
float:left;
display:block;
margin:0.6em 0 0.4em 0;
}
#footer li a{
background-color: inherit;
color: #2f7d3d;
text-decoration: none;
padding: 30px 10px;
}
div.searchbox{
float: right;
text-align:right;
width: 20%;
margin-right: 4px;
}
div.searchbox > form > input {
background-color: inherit;
color: inherit;
border-width: 1px;
border-style: solid;
border-color: #436976;
width: 100%;
min-width: 7em;
border-radius: 2px;
}
#footer form{
margin:0;
padding:0;
}
#footer input{
color:#fff;
background-color:#000;
border:solid 1px;
border-color:#aaa;
font-size:80%;
margin-top:0;
margin-left:2px;
}
#footer p{
margin:0;
}
#footer li.popup{
color:#888;
cursor:pointer;
font-weight:bold;
padding:0 10px 0 10px;
}
#footer li.popup:hover{
color:#aaa;
background:#333;
}
#footer li.popup div{
display:none;
}
#footer li.popup:hover div{
display:block;
position:absolute;
bottom:1.5em;
min-height:0px;
background-image:url(https://fsi.informatik.uni-erlangen.de/dw/lib/tpl/fsi/images/header_background_fsi_trans.png);
background-position:center;
background-repeat:repeat;
border:solid 1px #88a;
padding:10px 10px 10px 10px;
}
#footer li.popup:hover div a{
display:block;
width:auto;
font-weight:bold;
color:#225;margin:0;
}
#footer li.popup:hover div a:hover{
background:#fff;
}
#poweredby {
background-color:#eef8f6;
overflow:hidden;
color: #2f7d3d;
}
#poweredby p {
margin: 30px auto;
text-align:center;
width: 100%;
}
#poweredby a {
color: #2f7d3d;
}
#poweredby a:hover {
color: #266331;
text-decoration: underline;
}
.notice
{
/*var-bubble-bg-color: hsla(221, 72%, 55%, 0.41);
var-bubble-fg-color: hsla(0, 0%, 30%, 1);*/
background-color: hsla(221, 72%, 55%, 0.41) !important;
color: hsla(0, 0%, 30%, 1) !important;
}
.error
{
/*var-bubble-bg-color: hsla(0, 90%, 61%, .6);
var-bubble-fg-color: hsla(0, 0%, 30%, 1);*/
background-color: hsla(0, 90%, 61%, .6) !important;
color: hsla(0, 0%, 30%, 1) !important;
}
.bubble
{
color: inherit;
background-color: hsla(221, 72%, 55%, 0.41);
border-radius: 2px 5px 2px 5px;
padding: .75em;
margin: 1em;
text-shadow: 1px hsla(0, 0%, 20%, .8);
font-weight: bold;
font-size: 1em;
box-shadow: hsla(0, 0%, 10%, .5) 3px 3px;
}
.extern a, .intern a
{
color: hsl(0, 0%, 80%) !important;
}
.download
{
padding-left: 8px;
padding-right: 5px;
float: left;
}
ul#entries, ul.sem, ul#latest
{
list-style: none;
list-style-image: none;
padding-bottom: 2px;
}