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

blue2 update

Browse Source
This commit is contained in:
Andreas Stephanides
2015-06-01 17:21:47 +02:00
parent 5a7eb23a1f
commit 6c2238e740
4 changed files with 55 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/assets/stylesheets/themes/blue2/application.css.scss
View File

@@ -32,7 +32,6 @@ $color_schema_4_dark: darken($color_schema_4, 10%);
$color_schema_5_dark: darken($color_schema_5, 10%); $color_schema_5_dark: darken($color_schema_5, 10%);
$color_prim: $color_schema_1_dark; // #006599; //071672; $color_prim: $color_schema_1_dark; // #006599; //071672;
$color_prim_light: lighten($color_prim ,10%); $color_prim_light: lighten($color_prim ,10%);
$color_prim_vlight: lighten($color_prim ,30%); $color_prim_vlight: lighten($color_prim ,30%);
$color_prim_dark: darken($color_prim ,10%); $color_prim_dark: darken($color_prim ,10%);
@@ -44,12 +43,12 @@ $linkColor: $color_prim;
$linkColorHover: $color_schema_1; $linkColorHover: $color_schema_1;
$white: #FFFFFF; $white: #FFFFFF;
$bodyBackground: #EEE; $bodyBackground: #FEFEFE;
$navbarBackground: #EEE;//$color_prim; $navbarBackground: #FFF; //$color_prim;
$navbarText: $color_prim; $navbarText: $color_prim;
$navbarLinkColor: $color_prim; $navbarLinkColor: $color_prim;
$navbarLinkColorHover: $color_schema_1; $navbarLinkColorHover: $color_schema_1;
@@ -58,7 +57,7 @@ $navbar-default-brand-color: black;
$navbarBrandColor:black; $navbarBrandColor:black;
$navbarBackgroundHighlight: #EEE; $navbarBackgroundHighlight: #FFF;
//$navbarBackgroundHighlight:#FFFFFF; //$navbarBackgroundHighlight:#FFFFFF;
@@ -76,27 +75,27 @@ $sansFontFamily: Helvetica, Arial;
@import 'neuigkeiten'; @import 'neuigkeiten';
@import 'themengruppen'; @import 'themengruppen';
div.header { div.header {
display: block; display: block;
// background: url('../../../../header1.png') no-repeat; // backgro und: url('../../../../header1.png') no-repeat;
// background-color:white;// $color_prim; // background-color:white;// $color_prim;
// background-position: right; // background-position: right;
vertical-align:middle; vertical-align:middle;
float:left; float:left;
color:#000; color:#000;
padding-top:0px; padding-top:0px;
overflow:visible; overflow:visible;
height:45px; height:45px;
margin-bottom: 0 px margin-bottom: 0 px
} }
div.header_span { div.header_span {
background:white background:white
} }
div.header h1 { div.header h1 {
padding:0; padding:0;
margin:4px; margin:4px;
font-size:20px; font-size:20px;
line-height:32px; line-height:32px;
} }
div.header img { div.header img {
//top:2px; //top:2px;
@@ -108,9 +107,9 @@ border-bottom: $color_prim solid 3px;
div.headerrow { div.headerrow {
} }
$contentdiv-background:rgba(255,255,255,0.9) ; $contentdiv-background:rgba(255,255,255,1) ;
#contentdiv { #contentdiv {
padding:7px;
} }
$navbar-li-minwidth: 0; $navbar-li-minwidth: 0;
@@ -126,6 +125,6 @@ $box-background: white;
@import 'extra'; @import 'extra';
body { body {
background: $color_schema_1_dark; background: #EFEFEF;
background-size:100%; background-size:100%;
} }

2
app/assets/stylesheets/themes/blue2/extra.css.scss
View File

@@ -7,5 +7,5 @@ div.content-wrap {
} }
a.linkbox, div.contentbox a.linkbox, div.contentbox
{ {
border-color: $color-schema-1 border-color: lightgray; //$color-schema-1
} }

13
app/controllers/application_controller.rb
View File

@@ -42,16 +42,13 @@
def get_theme def get_theme
# if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil? # if params[:theme]== "default" || params[:theme]=="2003" || params[:theme].nil?
# params[:theme]="blue1" # params[:theme]="blue1"
# end # end
# if ThemesForRails.available_theme_names.include?(params[:theme]) if ThemesForRails.available_theme_names.include?(params[:theme]) and can? :showintern,Thema
# params[:theme] params[:theme]
else
"blue1"
#else end
"blue1"
#end
end end
def current_ability def current_ability

72
app/views/themes/blue2/home/index.html.erb
View File

@@ -1,11 +1,20 @@
<div class="content-wrap content-column"> <div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
js = d.createElement(s); js.id = id;
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&appId=120379864660921&version=v2.0";
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="content-wrap content-column" style="max-width:90em;">
<h1><%= I18n.t('home.willkommen') %></h1> <h1><%= I18n.t('home.willkommen') %></h1>
<%= raw(@starttopic.text) %> <%= raw(@starttopic.text) %>
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span4">
<ul class="linklist"> <ul class="linklist">
<li> <li>
@@ -14,56 +23,43 @@
<li> <li>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %> <%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
</li> </li>
<li> <li>
<%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %> <%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
</li> </li>
<li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li> <li><%= link_to ffi1_icon("books19")+"Beispielsammlung", studium_path(Studium.first, {:ansicht=>'semesteransicht'}) ,class: :btn ,class: :linkbox %></li>
<li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li> <li><%= link_to "Alte Beispielsammlung", "http://www.fet.at/alt/bin/view/Beispielsammlung/WebHome" ,class: :btn ,class: :linkbox %></li>
</ul> </ul>
<!-- <div class="alert">
<h2>Beta Test</h2>
<p>Die Webseite befindet sich derzeit in einem Entwicklungsstadium,
volle Funktionsfähigkeit ist noch nicht erreicht. Bitte Featurerequests und
Fehlermeldungen auf GitHub melden.
</p>
<p>
<%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
</p>
<p>
Bezüglich Design und Steuerung sind Vorschläge erwünscht.
</p>
<p><%= link_to "Steuerelemente und Komponenten", "http://getbootstrap.com/2.3.2/index.html" %></p>
<p>Um bei der Entwicklung mitzuhelfen braucht nur Ruby on Rails installiert werden</p>
<p><%= link_to "Getting Started" , startdev_home_index_path %></p>
<p> Das Kalender Feature wird überarbeitet, in Zukunft soll folgender Link nicht mehr funktionieren <%= link_to "Kalender", calendars_path %>
</p>
</div>--> <% cache("stickytopics_startpage_"+cache_array_key(@stickythemen)) do %>
<ul class="linklist">
</p> <% @stickythemen.each do |t1| %>
<li>
<%= link_to t1,:class=>:linkbox do %>
<%= render partial: "themen/nlink", object: t1 %>
<% end %>
</li>
<% end %>
</ul>
<% end %>
<%= render 'beispiele' %>
<%= render 'beispiele' %>
</div> </div>
<div class="span6">
<ul class="unstyled linkbox-list" style="max-width:70em"> <div class="span5">
<ul class="unstyled linklist">
<% @neuigkeiten.each do |n| %> <% @neuigkeiten.each do |n| %>
<li><%= render n if can?(:show, n) %> </li> <li><%= render n if can?(:show, n) %> </li>
<% end %> <% end %>
</ul> </ul>
Verschiedene Styles </div>
<ul>
<li> <%= link_to "Darkblue", home_index_path({:theme=>"darkblue"}) %></li>
<li> <%= link_to "Blue1", home_index_path({:theme=>"blue1"}) %></li>
<li> <%= link_to "2003", home_index_path({:theme=>"2003"}) %></li> <div class="span3">
<li> <%= link_to "white_1", home_index_path({:theme=>"white_1"}) %></li> <% cache("calendar_" + cache_array_key(@calentries)+params[:month].to_s+params[:year].to_s) do %>
</ul> <%= render 'calendars/calentries', :object=>@calentries %>
<% end %>
<div class="fb-like-box" data-href="https://www.facebook.com/FachschaftET" data-colorscheme="light" data-show-faces="true" data-header="true" data-stream="false" data-show-border="true"></div>
</div> </div>
</div> </div>
</div> </div>