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

AutoCommit Mit Sep 2 23:03:01 CEST 2015

Browse Source
This commit is contained in:
Andreas Stephanides
2015-09-02 23:03:01 +02:00
parent 194a8375dd
commit 889d7ac3d0
8 changed files with 172 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,3 +147,4 @@ background:44F;
@import 'galleries';
@import 'tinymce';
@import 'linkboxes';

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

@@ -44,98 +44,6 @@ a:hover {
ul.linkbox-list
{
max-width:70em;
margin-left:auto;
margin-right:auto;
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
}
a.linkbox:hover
{
box-shadow: 1px 1px 2px 2px lightgray;
}
a.linkbox.color-1
{
color:$color_schema_1;
}
a.linkbox.color-2
{
color:$color_schema_2;
}
a.linkbox.color-3
{
color:$color_schema_3;
}
a.linkbox.color-4
{
color:$color_schema_4;
}
a.linkbox.color-5
{
color:$color_schema_5;
}
a.color-1-dark
{
color:$color_schema_1_dark;
}
a.color-2-dark
{
color:$color_schema_2_dark;
}
a.color-3-dark
{
color:$color_schema_3_dark;
}
a.color-4-dark
{
color:$color_schema_4_dark;
}
a.color-5-dark
{
color:$color_schema_5_dark;
}
a.color-1-dark:hover
{
color:$color_schema_1;
}
a.color-2-dark:hover
{
color:$color_schema_2;
}
a.color-3-dark:hover
{
color:$color_schema_3;
}
a.color-4-dark:hover
{
color:$color_schema_4;
}
a.color-5-dark:hover
{
color:$color_schema_5;
}
a.linkbox li
{
}
ul.linkbox-list li
{
margin-bottom:10px;
}
div.contentbox
{
margin: 5px;
@@ -175,28 +83,6 @@ div.smallspan {
min-height:0;
}
ul.linklist
{max-width:100%;
padding:0;
margin:5px;
}
ul.linklist li{
list-style:none;
margin-bottom:2px;
}
ul.linklist li a i{
vertical-align:middle;
margin-right:6px;
font-size:2em;}
span.linklist a {
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
display:block;
float:left;
}
form.inline div {
float:left;}

1
app/assets/stylesheets/themes/blue1/application.css.scss
View File

@@ -117,5 +117,6 @@ $box-border-radius:0px;
$box-background: white;
@import 'layout';
@import 'linkboxes';
@import 'calendars';
@import 'formtastic-bootstrap'

61
app/assets/stylesheets/themes/blue1/linkboxes.css.scss Normal file
View File

@@ -0,0 +1,61 @@
ul.linkbox-list
{
max-width:70em;
margin-left:auto;
margin-right:auto;
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
}
a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; }
a.linkbox.color-1 { color:$color_schema_1; }
a.linkbox.color-2 { color:$color_schema_2; }
a.linkbox.color-3 { color:$color_schema_3; }
a.linkbox.color-4 { color:$color_schema_4;}
a.linkbox.color-5 { color:$color_schema_5;}
a.color-1-dark { color:$color_schema_1_dark; }
a.color-2-dark { color:$color_schema_2_dark; }
a.color-3-dark { color:$color_schema_3_dark;}
a.color-4-dark { color:$color_schema_4_dark;}
a.color-5-dark { color:$color_schema_5_dark;}
a.color-1-dark:hover { color:$color_schema_1; }
a.color-2-dark:hover { color:$color_schema_2; }
a.color-3-dark:hover { color:$color_schema_3; }
a.color-4-dark:hover { color:$color_schema_4; }
a.color-5-dark:hover { color:$color_schema_5; }
a.linkbox li { }
ul.linkbox-list li {
margin-bottom:10px;
}
ul.linklist {
max-width:100%;
padding:0;
margin:5px;
}
ul.linklist li {
list-style:none;
margin-bottom:2px;
}
ul.linklist li a i{
vertical-align:middle;
margin-right:6px;
font-size:2em;}
span.linklist a {
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
display:block;
float:left;
}

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

@@ -1,4 +1,6 @@
/* This is the main file for theme "blue2"
*/
/*
* This is a manifest file that'll be compiled into application.css, which will include all the files
* listed below.
@@ -89,9 +91,11 @@ div.header {
height:45px;
margin-bottom: 0 px
}
div.header_span {
background:white
}
div.header h1 {
padding:0;
margin:4px;
@@ -117,13 +121,13 @@ $navbar-li-minwidth: 0;
$box-border: lightgray solid 1px;
$box-border-radius:4px;
$box-border-radius:6px;
$box-background: white;
@import 'layout';
@import 'calendars';
@import 'formtastic-bootstrap';
@import 'linkboxes';
@import 'extra';
body {
background: #FFF; //#EFEFEF;

84
app/assets/stylesheets/themes/blue2/linkboxes.css.scss Normal file
View File

@@ -0,0 +1,84 @@
ul.linkbox-list
{
max-width:70em;
margin-left:auto;
margin-right:auto;
}
ul.linkbox-list > li {
margin-bottom:0px;
}
ul.linkbox-list > li:first-child a.linkbox {
border-top-left-radius:$box-border-radius;
border-top-right-radius:$box-border-radius;
border: $box-border;
}
ul.linkbox-list > li:last-child a.linkbox {
border-bottom-left-radius:$box-border-radius;
border-bottom-right-radius:$box-border-radius;
}
ul.linkbox-list > li a.linkbox {
border-radius: 0;
border-top: none;
}
ul.linkbox-list > li a.linkbox:hover {
z-index:2000
}
a.linkbox, div.contentbox
{
display:block;
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
}
a.linkbox:hover{ box-shadow: 1px 1px 2px 2px lightgray; }
a.linkbox.color-1 { color:$color_schema_1; }
a.linkbox.color-2 { color:$color_schema_2; }
a.linkbox.color-3 { color:$color_schema_3; }
a.linkbox.color-4 { color:$color_schema_4;}
a.linkbox.color-5 { color:$color_schema_5;}
a.color-1-dark { color:$color_schema_1_dark; }
a.color-2-dark { color:$color_schema_2_dark; }
a.color-3-dark { color:$color_schema_3_dark;}
a.color-4-dark { color:$color_schema_4_dark;}
a.color-5-dark { color:$color_schema_5_dark;}
a.color-1-dark:hover { color:$color_schema_1; }
a.color-2-dark:hover { color:$color_schema_2; }
a.color-3-dark:hover { color:$color_schema_3; }
a.color-4-dark:hover { color:$color_schema_4; }
a.color-5-dark:hover { color:$color_schema_5; }
a.linkbox li { }
ul.linklist {
max-width:100%;
padding:0;
margin:5px;
}
ul.linklist li {
list-style:none;
margin-bottom:2px;
}
ul.linklist li a i{
vertical-align:middle;
margin-right:6px;
font-size:2em;}
span.linklist a {
padding:5px;
border-radius:$box-border-radius;
border: $box-border;
background: $box-background;
display:block;
float:left;
}

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

@@ -46,7 +46,7 @@
</div>
<div class="span5">
<ul class="unstyled linklist">
<ul class="unstyled linkbox-list">
<% @neuigkeiten.each do |n| %>
<li><%= render n if can?(:show, n) %> </li>
<% end %>

31
spec/views/fetprofiles/index.html.erb_spec.rb
View File

@@ -1,28 +1,31 @@
require 'spec_helper'
describe "fetprofiles/index" do
describe "fetprofiles/index" , :type=>:view do
before(:each) do
default_url_options[:locale] = :de
fetprofile1 = FactoryGirl.create(:fetprofile)
fetprofile2 = FactoryGirl.create(:fetprofile2)
fetprofile3 = FactoryGirl.create(:fetprofile3)
fetprofile4 = FactoryGirl.create(:fetprofile_withadress)
@fetprofiles=[fetprofile1, fetprofile2, fetprofile3, fetprofile4]
# default_url_options[:locale] = :de
@fetprofile1 = FactoryGirl.create(:fetprofile)
@fetprofile2 = FactoryGirl.create(:fetprofile2)
@fetprofile3 = FactoryGirl.create(:fetprofile3)
@fetprofile4 = FactoryGirl.create(:fetprofile_withadress)
@fetprofiles=[@fetprofile1, @fetprofile2, @fetprofile3, @fetprofile4]
assign(:fetprofiles,@fetprofiles)
assign(:gremientabs, [])
end
it "renders a list of fetprofiles" do
render
expect(rendered).to match(/#{@fetprofile1.vorname}/)
expect(rendered).to match(/#{@fetprofile1.nachname}/)
expect(rendered).to match(/#{@fetprofile2.vorname}/)
expect(rendered).to match(/#{@fetprofile2.nachname}/)
expect(rendered).to match(/#{@fetprofile3.vorname}/)
expect(rendered).to match(/#{@fetprofile3.nachname}/)
expect(rendered).to match(/#{@fetprofile4.vorname}/)
expect(rendered).to match(/#{@fetprofile4.nachname}/)
# expect(rendered).to have_tag("fetprofile_#{@fetprofile1.id}")
assert_select "tr>td", :text => "Vorname".to_s, :count => 2
assert_select "tr>td", :text => "Nachname".to_s, :count => 2
assert_select "tr>td", :text => "Short".to_s, :count => 2
assert_select "tr>td", :text => "Fetmailalias".to_s, :count => 2
assert_select "tr>td", :text => "MyText".to_s, :count => 2
assert_select "tr>td", :text => "Picture".to_s, :count => 2
assert_select "tr>td", :text => false.to_s, :count => 2
end
end