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

Merge branch 'master' of https://github.com/fetsite/fetsite

Browse Source 
Conflicts:
	app/views/themen/_form.html.erb
This commit is contained in:
Andreas Stephanides
2014-07-09 20:18:07 +02:00
parent 6a730c7411 4bc7c4b001
commit 397721f89e
47 changed files with 1354 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -123,6 +123,7 @@ GEM
httpclient (2.4.0) httpclient (2.4.0)
i18n (0.6.1) i18n (0.6.1)
journey (1.0.4) journey (1.0.4)
jquery-datetimepicker-rails (2.2.5.0)
jquery-fileupload-rails (0.4.1) jquery-fileupload-rails (0.4.1)
actionpack (>= 3.1) actionpack (>= 3.1)
railties (>= 3.1) railties (>= 3.1)
@@ -248,7 +249,7 @@ GEM
ref ref
thor (0.18.1) thor (0.18.1)
tilt (1.4.1) tilt (1.4.1)
tinymce-rails (3.5.8) tinymce-rails (4.1.0)
railties (>= 3.1.1) railties (>= 3.1.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot
@@ -289,6 +290,7 @@ DEPENDENCIES
globalize-versioning globalize-versioning
gollum-lib gollum-lib
haml haml
jquery-datetimepicker-rails
jquery-fileupload-rails jquery-fileupload-rails
jquery-rails jquery-rails
jquery-ui-rails (~> 4.1.1) jquery-ui-rails (~> 4.1.1)
@@ -310,7 +312,7 @@ DEPENDENCIES
sqlite3 sqlite3
themes_for_rails themes_for_rails
therubyracer therubyracer
tinymce-rails (~> 3.5.8) tinymce-rails (~> 4.1.0)
uglifier (>= 1.0.3) uglifier (>= 1.0.3)
webrick (= 1.3.1) webrick (= 1.3.1)
wikicloth wikicloth

BIN
app/assets/fonts/flatfeticon.eot Normal file
View File

Binary file not shown.

3
app/assets/fonts/flatfeticon.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 1.1 MiB

BIN
app/assets/fonts/flatfeticon.ttf Normal file
View File

Binary file not shown.

BIN
app/assets/fonts/flatfeticon.woff Normal file
View File

Binary file not shown.

14
app/assets/javascripts/application.js
View File

@@ -31,21 +31,13 @@
function insertAttachment(url,name) { function insertAttachment(url,name) {
var ext = url.split('.').pop().toLowerCase(); var ext = url.split('.').pop().toLowerCase();
var img_ext = [ "jpg", "png", "bmp" , "jpeg" ]; var img_ext = [ "jpg", "png", "bmp" , "jpeg" ];
// if ( img_ext.indexOf(ext) > -1) {
// tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<img src=\"" + url + "\" title=\"" + name + "\">");
// }
// else {
// tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "<a href=\"" + url + "\">" + name +"</a>");
// }
if ( img_ext.indexOf(ext) > -1) { if ( img_ext.indexOf(ext) > -1) {
tinymce.activeEditor.execCommand('mceInsertContent', false, "<img src=\"" + url + "\" title=\"" + name + "\">"); tinymce.activeEditor.execCommand('mceInsertContent', false, "<img src=\"" + url + "\" title=\"" + name + "\">");
} }
else { else {
tinymce.activeEditor.execCommand('mceInsertContent', false, "<a href=\"" + url + "\">" + name +"</a>"); tinymce.activeEditor.execCommand('mceInsertContent', false, "<a href=\"" + url + "\">" + name +"</a>");
} }
}
function insertIcon_ffi1(name) {
tinymce.activeEditor.execCommand('mceInsertContent',false,'<span class="'+name+'">&nbsp;</span>&nbsp;')
} }

786
app/assets/stylesheets/flatfeticon1.css.scss Normal file
View File

@@ -0,0 +1,786 @@
@font-face {
font-family: "ffi1";
src: url("/assets/flatfeticon.eot");
src: url("/assets/flatfeticon.eot#iefix") format("embedded-opentype"),
url("/assets/flatfeticon.woff") format("woff"),
url("/assets/flatfeticon.ttf") format("truetype"),
url("/assets/flatfeticon.svg") format("svg");
font-weight: normal;
font-style: normal;
}
[class^="ffi1-"]:before, [class*=" ffi1-"]:before,
[class^="ffi1-"]:after, [class*=" ffi1-"]:after {
font-family: ffi1;
font-style: normal;
margin-left: 4px;
font-weight:normal;
}
.ffi1-academic:before {
content: "\e000";
}
.ffi1-apple:before {
content: "\e001";
}
.ffi1-auricular6:before {
content: "\e002";
}
.ffi1-bag2:before {
content: "\e003";
}
.ffi1-bald34:before {
content: "\e004";
}
.ffi1-balloons2:before {
content: "\e005";
}
.ffi1-banes:before {
content: "\e006";
}
.ffi1-bar1:before {
content: "\e007";
}
.ffi1-black268:before {
content: "\e008";
}
.ffi1-book119:before {
content: "\e009";
}
.ffi1-book135:before {
content: "\e00a";
}
.ffi1-book137:before {
content: "\e00b";
}
.ffi1-book139:before {
content: "\e00c";
}
.ffi1-books17:before {
content: "\e00d";
}
.ffi1-books19:before {
content: "\e00e";
}
.ffi1-books20:before {
content: "\e00f";
}
.ffi1-books30:before {
content: "\e010";
}
.ffi1-books8:before {
content: "\e011";
}
.ffi1-boy21:before {
content: "\e012";
}
.ffi1-bricks2:before {
content: "\e013";
}
.ffi1-briefcase32:before {
content: "\e014";
}
.ffi1-businessman216:before {
content: "\e015";
}
.ffi1-businessman217:before {
content: "\e016";
}
.ffi1-businessman56:before {
content: "\e017";
}
.ffi1-businessman65:before {
content: "\e018";
}
.ffi1-businessmen32:before {
content: "\e019";
}
.ffi1-calculator40:before {
content: "\e01a";
}
.ffi1-calendar130:before {
content: "\e01b";
}
.ffi1-call36:before {
content: "\e01c";
}
.ffi1-call7:before {
content: "\e01d";
}
.ffi1-candy1:before {
content: "\e01e";
}
.ffi1-candy10:before {
content: "\e01f";
}
.ffi1-career:before {
content: "\e020";
}
.ffi1-certificate2:before {
content: "\e021";
}
.ffi1-checkboxmark:before {
content: "\e022";
}
.ffi1-chemistry:before {
content: "\e023";
}
.ffi1-chemistry1:before {
content: "\e024";
}
.ffi1-circular114:before {
content: "\e025";
}
.ffi1-circular116:before {
content: "\e026";
}
.ffi1-class6:before {
content: "\e027";
}
.ffi1-classroom:before {
content: "\e028";
}
.ffi1-cleaning1:before {
content: "\e029";
}
.ffi1-clipboard44:before {
content: "\e02a";
}
.ffi1-close13:before {
content: "\e02b";
}
.ffi1-cocktail15:before {
content: "\e02c";
}
.ffi1-cocktail7:before {
content: "\e02d";
}
.ffi1-coffee20:before {
content: "\e02e";
}
.ffi1-coins24:before {
content: "\e02f";
}
.ffi1-colors3:before {
content: "\e030";
}
.ffi1-comfortable:before {
content: "\e031";
}
.ffi1-comments16:before {
content: "\e032";
}
.ffi1-compass58:before {
content: "\e033";
}
.ffi1-computer135:before {
content: "\e034";
}
.ffi1-computer136:before {
content: "\e035";
}
.ffi1-computers:before {
content: "\e036";
}
.ffi1-connected20:before {
content: "\e037";
}
.ffi1-contacts1:before {
content: "\e038";
}
.ffi1-copy12:before {
content: "\e039";
}
.ffi1-croissant1:before {
content: "\e03a";
}
.ffi1-data39:before {
content: "\e03b";
}
.ffi1-data45:before {
content: "\e03c";
}
.ffi1-delivered:before {
content: "\e03d";
}
.ffi1-delivery35:before {
content: "\e03e";
}
.ffi1-descendant1:before {
content: "\e03f";
}
.ffi1-diploma:before {
content: "\e040";
}
.ffi1-dislike:before {
content: "\e041";
}
.ffi1-dna9:before {
content: "\e042";
}
.ffi1-domain1:before {
content: "\e043";
}
.ffi1-drink24:before {
content: "\e044";
}
.ffi1-dwelling1:before {
content: "\e045";
}
.ffi1-earth23:before {
content: "\e046";
}
.ffi1-ecological2:before {
content: "\e047";
}
.ffi1-edit12:before {
content: "\e048";
}
.ffi1-education14:before {
content: "\e049";
}
.ffi1-education17:before {
content: "\e04a";
}
.ffi1-education20:before {
content: "\e04b";
}
.ffi1-educational8:before {
content: "\e04c";
}
.ffi1-educative1:before {
content: "\e04d";
}
.ffi1-electric6:before {
content: "\e04e";
}
.ffi1-electrical7:before {
content: "\e04f";
}
.ffi1-electronic32:before {
content: "\e050";
}
.ffi1-electronic51:before {
content: "\e051";
}
.ffi1-elegant8:before {
content: "\e052";
}
.ffi1-email20:before {
content: "\e053";
}
.ffi1-facebook1:before {
content: "\e054";
}
.ffi1-facebook30:before {
content: "\e055";
}
.ffi1-female188:before {
content: "\e056";
}
.ffi1-female189:before {
content: "\e057";
}
.ffi1-female218:before {
content: "\e058";
}
.ffi1-food23:before {
content: "\e059";
}
.ffi1-fork27:before {
content: "\e05a";
}
.ffi1-gears3:before {
content: "\e05b";
}
.ffi1-gingerbread:before {
content: "\e05c";
}
.ffi1-girl16:before {
content: "\e05d";
}
.ffi1-glass15:before {
content: "\e05e";
}
.ffi1-good2:before {
content: "\e05f";
}
.ffi1-graduate11:before {
content: "\e060";
}
.ffi1-graduate8:before {
content: "\e061";
}
.ffi1-graduate9:before {
content: "\e062";
}
.ffi1-graduates2:before {
content: "\e063";
}
.ffi1-graduation20:before {
content: "\e064";
}
.ffi1-graduation25:before {
content: "\e065";
}
.ffi1-grocery10:before {
content: "\e066";
}
.ffi1-halloween10:before {
content: "\e067";
}
.ffi1-hammer7:before {
content: "\e068";
}
.ffi1-hand132:before {
content: "\e069";
}
.ffi1-handbag6:before {
content: "\e06a";
}
.ffi1-hands-shake:before {
content: "\e06b";
}
.ffi1-handshake1:before {
content: "\e06c";
}
.ffi1-hardbound:before {
content: "\e06d";
}
.ffi1-head21:before {
content: "\e06e";
}
.ffi1-hierarchical:before {
content: "\e06f";
}
.ffi1-homework:before {
content: "\e070";
}
.ffi1-hot31:before {
content: "\e071";
}
.ffi1-hot50:before {
content: "\e072";
}
.ffi1-house25:before {
content: "\e073";
}
.ffi1-important:before {
content: "\e074";
}
.ffi1-index3:before {
content: "\e075";
}
.ffi1-instructor:before {
content: "\e076";
}
.ffi1-italian1:before {
content: "\e077";
}
.ffi1-job:before {
content: "\e078";
}
.ffi1-judge:before {
content: "\e079";
}
.ffi1-keys:before {
content: "\e07a";
}
.ffi1-kids1:before {
content: "\e07b";
}
.ffi1-kindergarden:before {
content: "\e07c";
}
.ffi1-laptop88:before {
content: "\e07d";
}
.ffi1-lecture1:before {
content: "\e07e";
}
.ffi1-lecture2:before {
content: "\e07f";
}
.ffi1-like3:before {
content: "\e080";
}
.ffi1-live2:before {
content: "\e081";
}
.ffi1-magnifier12:before {
content: "\e082";
}
.ffi1-magnifier13:before {
content: "\e083";
}
.ffi1-male103:before {
content: "\e084";
}
.ffi1-man183:before {
content: "\e085";
}
.ffi1-man204:before {
content: "\e086";
}
.ffi1-man315:before {
content: "\e087";
}
.ffi1-man388:before {
content: "\e088";
}
.ffi1-man397:before {
content: "\e089";
}
.ffi1-man82:before {
content: "\e08a";
}
.ffi1-men9:before {
content: "\e08b";
}
.ffi1-milk8:before {
content: "\e08c";
}
.ffi1-mirrors:before {
content: "\e08d";
}
.ffi1-money13:before {
content: "\e08e";
}
.ffi1-mop1:before {
content: "\e08f";
}
.ffi1-mop2:before {
content: "\e090";
}
.ffi1-movie19:before {
content: "\e091";
}
.ffi1-multiple25:before {
content: "\e092";
}
.ffi1-news:before {
content: "\e093";
}
.ffi1-newspaper9:before {
content: "\e094";
}
.ffi1-note20:before {
content: "\e095";
}
.ffi1-open127:before {
content: "\e096";
}
.ffi1-open135:before {
content: "\e097";
}
.ffi1-open160:before {
content: "\e098";
}
.ffi1-open161:before {
content: "\e099";
}
.ffi1-owl10:before {
content: "\e09a";
}
.ffi1-package8:before {
content: "\e09b";
}
.ffi1-paperclip14:before {
content: "\e09c";
}
.ffi1-party:before {
content: "\e09d";
}
.ffi1-party1:before {
content: "\e09e";
}
.ffi1-pen38:before {
content: "\e09f";
}
.ffi1-pen39:before {
content: "\e0a0";
}
.ffi1-pen43:before {
content: "\e0a1";
}
.ffi1-pencil54:before {
content: "\e0a2";
}
.ffi1-pencil66:before {
content: "\e0a3";
}
.ffi1-pens:before {
content: "\e0a4";
}
.ffi1-people30:before {
content: "\e0a5";
}
.ffi1-personal5:before {
content: "\e0a6";
}
.ffi1-persong:before {
content: "\e0a7";
}
.ffi1-persons8:before {
content: "\e0a8";
}
.ffi1-phone25:before {
content: "\e0a9";
}
.ffi1-pie46:before {
content: "\e0aa";
}
.ffi1-plate7:before {
content: "\e0ab";
}
.ffi1-plug12:before {
content: "\e0ac";
}
.ffi1-plugin:before {
content: "\e0ad";
}
.ffi1-power20:before {
content: "\e0ae";
}
.ffi1-power48:before {
content: "\e0af";
}
.ffi1-printer11:before {
content: "\e0b0";
}
.ffi1-printer70:before {
content: "\e0b1";
}
.ffi1-professor17:before {
content: "\e0b2";
}
.ffi1-professor4:before {
content: "\e0b3";
}
.ffi1-professor5:before {
content: "\e0b4";
}
.ffi1-professor7:before {
content: "\e0b5";
}
.ffi1-pumpkin2:before {
content: "\e0b6";
}
.ffi1-puzzle25:before {
content: "\e0b7";
}
.ffi1-question41:before {
content: "\e0b8";
}
.ffi1-question42:before {
content: "\e0b9";
}
.ffi1-quiz:before {
content: "\e0ba";
}
.ffi1-regular2:before {
content: "\e0bb";
}
.ffi1-remove9:before {
content: "\e0bc";
}
.ffi1-resistor1:before {
content: "\e0bd";
}
.ffi1-ruler14:before {
content: "\e0be";
}
.ffi1-running5:before {
content: "\e0bf";
}
.ffi1-sandwich:before {
content: "\e0c0";
}
.ffi1-scales2:before {
content: "\e0c1";
}
.ffi1-school31:before {
content: "\e0c2";
}
.ffi1-school35:before {
content: "\e0c3";
}
.ffi1-school6:before {
content: "\e0c4";
}
.ffi1-science2:before {
content: "\e0c5";
}
.ffi1-scissors3:before {
content: "\e0c6";
}
.ffi1-search4:before {
content: "\e0c7";
}
.ffi1-search54:before {
content: "\e0c8";
}
.ffi1-services:before {
content: "\e0c9";
}
.ffi1-serving1:before {
content: "\e0ca";
}
.ffi1-setting:before {
content: "\e0cb";
}
.ffi1-sheep1:before {
content: "\e0cc";
}
.ffi1-shop3:before {
content: "\e0cd";
}
.ffi1-shopping66:before {
content: "\e0ce";
}
.ffi1-shopping8:before {
content: "\e0cf";
}
.ffi1-soccer32:before {
content: "\e0d0";
}
.ffi1-social19:before {
content: "\e0d1";
}
.ffi1-speech84:before {
content: "\e0d2";
}
.ffi1-square74:before {
content: "\e0d3";
}
.ffi1-stack21:before {
content: "\e0d4";
}
.ffi1-stopwatch6:before {
content: "\e0d5";
}
.ffi1-store:before {
content: "\e0d6";
}
.ffi1-student13:before {
content: "\e0d7";
}
.ffi1-student15:before {
content: "\e0d8";
}
.ffi1-student40:before {
content: "\e0d9";
}
.ffi1-students3:before {
content: "\e0da";
}
.ffi1-students5:before {
content: "\e0db";
}
.ffi1-students6:before {
content: "\e0dc";
}
.ffi1-students7:before {
content: "\e0dd";
}
.ffi1-sweet8:before {
content: "\e0de";
}
.ffi1-tags2:before {
content: "\e0df";
}
.ffi1-tags3:before {
content: "\e0e0";
}
.ffi1-talking2:before {
content: "\e0e1";
}
.ffi1-teacher12:before {
content: "\e0e2";
}
.ffi1-teacher13:before {
content: "\e0e3";
}
.ffi1-teacher4:before {
content: "\e0e4";
}
.ffi1-teacher8:before {
content: "\e0e5";
}
.ffi1-teacher9:before {
content: "\e0e6";
}
.ffi1-test17:before {
content: "\e0e7";
}
.ffi1-text87:before {
content: "\e0e8";
}
.ffi1-textile:before {
content: "\e0e9";
}
.ffi1-three115:before {
content: "\e0ea";
}
.ffi1-thumb31:before {
content: "\e0eb";
}
.ffi1-toilet1:before {
content: "\e0ec";
}
.ffi1-tools:before {
content: "\e0ed";
}
.ffi1-two174:before {
content: "\e0ee";
}
.ffi1-two185:before {
content: "\e0ef";
}
.ffi1-two28:before {
content: "\e0f0";
}
.ffi1-users1:before {
content: "\e0f1";
}
.ffi1-users2:before {
content: "\e0f2";
}
.ffi1-users5:before {
content: "\e0f3";
}
.ffi1-users6:before {
content: "\e0f4";
}
.ffi1-verified9:before {
content: "\e0f5";
}
.ffi1-view2:before {
content: "\e0f6";
}
.ffi1-wifi10:before {
content: "\e0f7";
}
.ffi1-wind15:before {
content: "\e0f8";
}
.ffi1-winners2:before {
content: "\e0f9";
}
.ffi1-woman83:before {
content: "\e0fa";
}
.ffi1-worker12:before {
content: "\e0fb";
}
.ffi1-worker2:before {
content: "\e0fc";
}
.ffi1-worker4:before {
content: "\e0fd";
}
.ffi1-workers:before {
content: "\e0fe";
}
.ffi1-writing17:before {
content: "\e0ff";
}

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

@@ -15,11 +15,9 @@ a:hover {
text-decoration:none; text-decoration:none;
} }
@import 'tinymce';
@import 'fetlogo';
@import 'flatfeticon1';
@@ -43,6 +41,69 @@ a.linkbox:hover
box-shadow: 1px 1px 2px 2px lightgray; 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 a.linkbox li
{ {
} }
@@ -90,4 +151,16 @@ div.smallspan {
min-height:0; min-height:0;
} }
ul.linklist
{max-width:25em;
padding:0;
margin:0;
}
ul.linklist li{
list-style:none;
maring-bottom:5px;
}
ul.linklist li a i{
vertical-align:middle;
margin-right:6px;
font-size:2em;}

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

@@ -17,16 +17,30 @@
* require 'neuigkeiten' * require 'neuigkeiten'
*/ */
// Colorshema #0A64A4
$color_prim: #071672; $color_schema_1: #006599;
$color_schema_2: #630CE8;
$color_schema_3: #FF0021;
$color_schema_4: #E8820C;
$color_schema_5: #FFF30D;
$color_schema_1_dark: darken($color_schema_1, 10%);
$color_schema_2_dark: darken($color_schema_2, 10%);
$color_schema_3_dark: darken($color_schema_3, 10%);
$color_schema_4_dark: darken($color_schema_4, 10%);
$color_schema_5_dark: darken($color_schema_5, 10%);
$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%);
$color_prim_vdark: darken($color_prim ,30%); $color_prim_vdark: darken($color_prim ,30%);
$color_cont: FFDB73; $color_cont: $color_schema_3;
$color_cont_light:FFDB73; $color_cont_light:lighten($color_cont ,10%);
$linkColor: $color_prim; $linkColor: $color_prim;
$linkColorHover: $color_schema_1;
$white: #FFFFFF; $white: #FFFFFF;
$bodyBackground: #EEE; $bodyBackground: #EEE;
@@ -37,7 +51,7 @@ $bodyBackground: #EEE;
$navbarBackground: #EEE;//$color_prim; $navbarBackground: #EEE;//$color_prim;
$navbarText: $color_prim; $navbarText: $color_prim;
$navbarLinkColor: $color_prim; $navbarLinkColor: $color_prim;
$navbarLinkColorHover: $color_prim_dark; $navbarLinkColorHover: $color_schema_1;
$dropdownLinkColor: black; $dropdownLinkColor: black;
$navbar-default-brand-color: black; $navbar-default-brand-color: black;
$navbarBrandColor:black; $navbarBrandColor:black;
@@ -46,7 +60,7 @@ $navbarBrandColor:black;
$navbarBackgroundHighlight: #EEE; $navbarBackgroundHighlight: #EEE;
//$navbarBackgroundHighlight:#FFFFFF; //$navbarBackgroundHighlight:#FFFFFF;
$navbarLinkBackgroundHover:#FFBE00;
$navbarLinkBackgroundHover: darken($navbarBackground,10%); $navbarLinkBackgroundHover: darken($navbarBackground,10%);
@@ -66,21 +80,19 @@ div.header {
// background: url('../../../../header1.png') no-repeat; // background: url('../../../../header1.png') no-repeat;
// background-color:white;// $color_prim; // background-color:white;// $color_prim;
// background-position: right; // background-position: right;
vertical-align:middle;
float:left; float:left;
color:#000; color:#000;
padding-left:87px;
padding-top:0px; padding-top:0px;
overflow:visible; overflow:visible;
height:45px; height:45px;
margin-bottom: 0 px margin-bottom: 0 px
} }
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;
@@ -91,7 +103,8 @@ border-bottom: $color_prim solid 3px;
} }
div.headerrow { div.headerrow {
} }
$contentdiv-background:none;
$contentdiv-background:none;
$navbar-li-minwidth: 0; $navbar-li-minwidth: 0;
@@ -99,6 +112,6 @@ $navbar-li-minwidth: 0;
$box-border: lightgray solid 1px; $box-border: lightgray solid 1px;
$box-border-radius:0px; $box-border-radius:0px;
$box-background: white; $box-background: white;
@import 'layout'; @import 'layout';
@import 'calendars'; @import 'calendars';
@import 'tinymce';

2
app/assets/stylesheets/themes/darkblue/application.css.scss
View File

@@ -77,7 +77,7 @@ $sansFontFamily: cmunrm, Helvetica, Arial;
@import 'neuigkeiten'; @import 'neuigkeiten';
@import 'fetlogo'; @import 'fetlogo';
#menudiv { #menudiv {
font-family: ayuma2yk;
} }
div.header { div.header {

15
app/assets/stylesheets/themes/white_1/application.css.scss
View File

@@ -17,6 +17,20 @@
* require 'neuigkeiten' * require 'neuigkeiten'
*/ */
$color_schema_1: #006599;
$color_schema_2: #630CE8;
$color_schema_3: #FF0021;
$color_schema_4: #E8820C;
$color_schema_5: #FFF30D;
$color_schema_1_dark: darken($color_schema_1, 30%);
$color_schema_2_dark: darken($color_schema_2, 30%);
$color_schema_3_dark: darken($color_schema_3, 30%);
$color_schema_4_dark: darken($color_schema_4, 30%);
$color_schema_5_dark: darken($color_schema_5, 30%);
$color_prim: #0A64A4; $color_prim: #0A64A4;
$color_prim_light: #0B65A5; $color_prim_light: #0B65A5;
$color_prim_vlight: #2B85C5; $color_prim_vlight: #2B85C5;
@@ -74,3 +88,4 @@ $box-border-radius:8px;
$box-background: white; $box-background: white;
@import 'layout'; @import 'layout';
@import 'calendars'; @import 'calendars';
@import 'tinymce';

2
app/assets/stylesheets/tinymce.css → app/assets/stylesheets/tinymce.css.scss
View File

@@ -15,3 +15,5 @@ i.fa-red { color:red; }
font-weight:bold; font-weight:bold;
text-align: center; text-align: center;
} }
@import 'flatfeticon1'

12
app/controllers/gremien_controller.rb
View File

@@ -85,7 +85,17 @@ class GremienController < ApplicationController
respond_to do |format| respond_to do |format|
if @gremium.update_attributes(params[:gremium]) if @gremium.update_attributes(params[:gremium])
format.html { redirect_to @gremium, notice: 'Gremium was successfully updated.' } format.html {
unless params[:button]=="continue" || params[:commit]=="continue"
redirect_to @gremium, notice: 'Gremium was successfully updated.'
else
@memberships=@gremium.memberships.order(:typ)
@memberships<< Membership.new
@memberships<< Membership.new
@memberships<< Membership.new
render action: "edit", notice: 'gremium was successfully updated.'
}
format.json { head :no_content } format.json { head :no_content }
else else
format.html { render action: "edit" } format.html { render action: "edit" }

13
app/controllers/neuigkeiten_controller.rb
View File

@@ -75,6 +75,17 @@ class NeuigkeitenController < ApplicationController
redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet' redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet'
end end
end end
def mail_to_fet
@neuigkeit = Neuigkeit.find(params[:id])
authorize! :publish, @neuigkeit
unless @neuigkeit.published?
redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit muss veröffentlicht sein um sie als Mail zu versenden.'
else
NewsMailer.neuigkeit_mail("andis@fet.at", params[:id]).deliver
redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit versendet'
end
end
def edit def edit
@neuigkeit = Neuigkeit.find(params[:id]) @neuigkeit = Neuigkeit.find(params[:id])
@@ -151,6 +162,8 @@ private
@toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=> I18n.t('neuigkeit.publish_sure') } if can?(:publish, @neuigkeit) && !@neuigkeit.published? @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('neuigkeit.publish'),:path => publish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=> I18n.t('neuigkeit.publish_sure') } if can?(:publish, @neuigkeit) && !@neuigkeit.published?
@toolbar_elements << {:hicon=>'icon-facebook', :text=> I18n.t('neuigkeit.publishfb'),:path => publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>I18n.t('neuigkeit.publishfb_sure') } if can?(:publish, @neuigkeit) && @neuigkeit.published? @toolbar_elements << {:hicon=>'icon-facebook', :text=> I18n.t('neuigkeit.publishfb'),:path => publish_to_facebook_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>I18n.t('neuigkeit.publishfb_sure') } if can?(:publish, @neuigkeit) && @neuigkeit.published?
@toolbar_elements << {:hicon=>'icon-facebook', :text=> I18n.t('neuigkeit.publishfetmail'),:path => mail_to_fet_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=>I18n.t('neuigkeit.publishfetmail_sure') } if can?(:publish, @neuigkeit) && @neuigkeit.published?
@toolbar_elements << {:hicon=>'icon-minus', :text=> I18n.t('neuigkeit.unpublish'),:path => unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=> I18n.t('neuigkeit.unpublish_sure') } if can?(:unpublish, @neuigkeit) && @neuigkeit.published? @toolbar_elements << {:hicon=>'icon-minus', :text=> I18n.t('neuigkeit.unpublish'),:path => unpublish_rubrik_neuigkeit_path(@neuigkeit.rubrik,@neuigkeit),:confirm=> I18n.t('neuigkeit.unpublish_sure') } if can?(:unpublish, @neuigkeit) && @neuigkeit.published?

1
app/controllers/themen_controller.rb
View File

@@ -57,6 +57,7 @@ class ThemenController < ApplicationController
# POST /themen.json # POST /themen.json
def create def create
@thema = Thema.new(params[:thema]) @thema = Thema.new(params[:thema])
@themen = @thema.themengruppe.themen.order(:priority).reverse
respond_to do |format| respond_to do |format|
if @thema.save if @thema.save

20
app/helpers/application_helper.rb
View File

@@ -8,6 +8,26 @@ module ApplicationHelper
current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/" current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/"
end end
def ffi1_icon (name)
content_tag("i","", class: "ffi1-"+name )
end
def ff_icon (name)
content_tag("i","", class: name )
end
def ffi1_list
y=YAML.load_file("#{::Rails.root.to_s}/config/flatfeticon1.yml")
y["ffi1"]
end
def tinymce_icon_choice
s=""
ffi1_list.each do |i|
s=s+'<a onclick="insertIcon_ffi1(\'ffi1-'+i+'\')">'+ffi1_icon(i)+'</a>'
end
raw(s)
end
def toolbar_html(elemente) def toolbar_html(elemente)
html = "" html = ""
limiter = " | " limiter = " | "

9
app/models/ability.rb
View File

@@ -63,7 +63,14 @@ class Ability
can [:delete],Calentry can [:delete],Calentry
can :doadmin, User can :doadmin, User
end end
unless user.has_role?("fetadmin")
cannot :delete, Modulgruppe
cannot :delete, Rubrik
cannot :delete, Themengruppe
cannot :delete, Fetprofile
cannot :delete, Studium
cannot :delete, Modul
end
# Rechteverwaltung fuer Neuigkeiten # Rechteverwaltung fuer Neuigkeiten
# can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik) # can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik)

2
app/models/gremium.rb
View File

@@ -12,7 +12,7 @@
# #
class Gremium < ActiveRecord::Base class Gremium < ActiveRecord::Base
TYPEN={1=>"offiziell", 2=>"offiziell-temporär", 3 => "inoffiziell",4=>"inoffiziell-tempo", 11=> "berufungskommission",12=> "habilitationskommission" } # Kategorien, im Wesentlichen wichtig für Listung oder nicht Listung TYPEN={1=>"offiziell", 2=>"offiziell-notab", 3 => "inoffiziell",4=>"inoffiziell-notab", 11=> "berufungskommission",12=> "habilitationskommission" } # Kategorien, im Wesentlichen wichtig für Listung oder nicht Listung
GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"} # Geschlecht des Gremiums zur richtige Deklination GESCHLECHT={0=>"saechlich", 1 => "maennlich", 2 => "weiblich"} # Geschlecht des Gremiums zur richtige Deklination
ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht
ART4FALL={0=>"das", 1=>"den",2=>"die"} # Artikel 2.Fall abhängig vom Geschlecht ART4FALL={0=>"das", 1=>"den",2=>"die"} # Artikel 2.Fall abhängig vom Geschlecht

2
app/models/rubrik.rb
View File

@@ -11,7 +11,7 @@
# #
class Rubrik < ActiveRecord::Base class Rubrik < ActiveRecord::Base
attr_accessible :desc, :name, :prio, :calendar, :public attr_accessible :desc, :name, :prio, :calendar, :public, :icon, :color
has_many :neuigkeiten, :class_name => "Neuigkeit" has_many :neuigkeiten, :class_name => "Neuigkeit"
has_many :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"] has_many :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"]
has_many :calentries, :through => :neuigkeiten, :as=>:object has_many :calentries, :through => :neuigkeiten, :as=>:object

8
app/models/themengruppe.rb
View File

@@ -10,7 +10,7 @@
class Themengruppe < ActiveRecord::Base class Themengruppe < ActiveRecord::Base
WORD_COUNT = 50 WORD_COUNT = 50
attr_accessible :text, :title, :picture, :priority, :public attr_accessible :text, :title, :picture, :priority, :public, :icon
has_many :themen, class_name: 'Thema' has_many :themen, class_name: 'Thema'
has_many :fragen, through: :themen has_many :fragen, through: :themen
@@ -21,13 +21,15 @@ class Themengruppe < ActiveRecord::Base
translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true translates :title,:text, :versioning =>true, :fallbacks_for_empty_translations => true
scope :intern,-> {where("NOT public")} scope :intern,-> {where(:public=>false)}
scope :public,-> {where(:public=>true)} scope :public,-> {where(:public=>true)}
def self.find_wiki_default def self.find_wiki_default
where(:wiki_default=>true).first where(:wiki_default=>true).first
end end
def intern
! self.public
end
def make_wiki_default def make_wiki_default
Themengruppe.where(:wiki_default=>:true).update_all(:wiki_default=>:false) Themengruppe.where(:wiki_default=>:true).update_all(:wiki_default=>:false)
self.wiki_default=true; self.wiki_default=true;

4
app/views/fetprofiles/_form.html.erb
View File

@@ -67,8 +67,8 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :input , :label=>I18n.t("common.save") %> <%= f.action :submit, :as => :button, :label=>I18n.t("common.save") %>
<%= f.action :submit, :as => :input , :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %> <%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %> <%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
<% end %> <% end %>
</div> </div>

6
app/views/gremien/_form.html.erb
View File

@@ -5,9 +5,6 @@
<%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %> <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %>
<%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %> <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %>
<%= f.input :thema, :as=> :select, :collection => Thema.all %> <%= f.input :thema, :as=> :select, :collection => Thema.all %>
<% @memberships.each do |m| %> <% @memberships.each do |m| %>
<%= f.semantic_fields_for :memberships, m do |memberships_attributes| %> <%= f.semantic_fields_for :memberships, m do |memberships_attributes| %>
<div class="row-fluid"> <div class="row-fluid">
@@ -33,6 +30,9 @@
<%= f.actions do %> <%= f.actions do %>
<%= f.action :submit, :as => :input %> <%= f.action :submit, :as => :input %>
<%= f.action :submit, :as => :button, :label=>I18n.t("common.savecont"), :button_html=>{value: "continue"} %>
<%= f.action :cancel, :as=> :link , :label=>I18n.t("common.cancel") %>
<% end %> <% end %>
<% end %> <% end %>
<script>$('.datepicker').datepicker()</script> <script>$('.datepicker').datepicker()</script>

10
app/views/gremien/verwalten.html.erb
View File

@@ -4,11 +4,10 @@
<% @gremien.each do |gremium| %> <% @gremien.each do |gremium| %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span2"> <div class="span2">
<%= gremium.typ %> <%= Gremium::TYPEN[gremium.typ.to_i] %>
</div> </div>
<div class="span8"> <div class="span8">
<b><%= gremium.name %></b> <b><%= gremium.name %></b>
<%= gremium.desc %>
</div> </div>
<div class="span2"> <div class="span2">
<div class="btn-group"> <div class="btn-group">
@@ -18,10 +17,9 @@
<span class="caret"></span> <span class="caret"></span>
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li> <li><%= link_to 'Show', gremium %></li>
<%= link_to 'Show', gremium %></li> <li><%= link_to 'Edit', edit_gremium_path(gremium) %></li>
<li> <%= link_to 'Edit', edit_gremium_path(gremium) %></li> <li><%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
<li> <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
</li> </ul> </li> </ul>
</div> </div>
</div> </div>

8
app/views/home/_search_results.html.erb
View File

@@ -27,12 +27,16 @@
<h2>Themen</h2> <h2>Themen</h2>
<% end %> <% end %>
<% @themen.each do |thema| %>
<ul class="unstyled content-list" style="max-width:70em"> <ul class="unstyled content-list" style="max-width:70em">
<% @themen.each do |thema| %>
<% if can? :show, thema %>
<li><%= link_to thema.title,thema %> <li><%= link_to thema.title,thema %>
<div class="contentbox"> <div class="contentbox">
<%= render :partial=>"themen/small", :object=>thema %> <%= render :partial=>"themen/small", :object=>thema %>
</div> </div>
</li> </li>
</ul>
<% end %> <% end %>
<% end %>
</ul>

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

@@ -5,7 +5,7 @@
<li><%= render n if can?(:show, n) %> </li> <li><%= render n if can?(:show, n) %> </li>
<% end %> <% end %>
</ul> </ul>
<p> <p><i class="ffi1-bar1 ffi1"></i>
<%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %> <%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
</p> </p>
<div class="alert"> <div class="alert">

9
app/views/home/intern.html.erb
View File

@@ -2,9 +2,12 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span6">
<%= link_to "Adressliste", internlist_fetprofiles_path %> <ul class="linklist">
<%= link_to "Admin" , admin_home_index_path if current_user.has_role?(:fetadmin) %> <li>
<%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %></li>
<li> <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %>
</li>
</ul>
<ul class="unstyled linkbox-list"> <ul class="unstyled linkbox-list">
<li> <li>
<% @themengruppen.each do |themengruppe| %> <% @themengruppen.each do |themengruppe| %>

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

@@ -12,16 +12,8 @@
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
<% theme_stylesheet_link_tag "test", :media => "all" %> <% theme_stylesheet_link_tag "test", :media => "all" %>
<% theme_stylesheet_link_tag "mod", :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">
<link rel="stylesheet" href="css/bootstrap-image-gallery.css">
-->
<!--[if lt IE 7]><link rel="stylesheet" href="css/bootstrap-ie6.css"><![endif]-->
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= csrf_meta_tags %> <%= csrf_meta_tags %>
</head> </head>
<body> <body>
@@ -29,10 +21,13 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span1 "></div> <div class="span1 "></div>
<div class="span10 "> <div class="span10 ">
<div class="header_wrap" style="background:7070a0"> <div class="header_wrap">
<div class="header"> <div class="header">
<%= link_to image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}),home_index_path %> <% link_to image_tag('/fetlogo90.png',{:style=>"float:left;height:50px",:height=>"50"}),home_index_path %>
<h1 style="display:block"></h1> <%= link_to home_index_path do %>
<span class="feticon-fet_logo fa-4x color-1"> </span>
<% end %>
</div> </div>
<div id="menudiv" style="margin-top:12px"> <div id="menudiv" style="margin-top:12px">

3
app/views/layouts/menu.html.erb
View File

@@ -23,8 +23,7 @@
<li> <li>
<%= link_to 'Intern' , intern_home_index_path %> <%= link_to 'Intern' , intern_home_index_path %>
</li><% end %> </li><% end %>
</ul>
<ul class="nav navbar-nav">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">

2
app/views/neuigkeiten/_compact.html.erb
View File

@@ -6,7 +6,7 @@
</div> </div>
<div class="media-body"> <div class="media-body">
<div> <div>
<small><%= neuigkeit.rubrik.name %></small> <small><%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %>&nbsp;<%= neuigkeit.rubrik.name %></small>
<small class="pull-right"> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small> <small class="pull-right"> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %></small>
</div> </div>
<h1> <h1>

5
app/views/neuigkeiten/_neuigkeit.html.erb
View File

@@ -1,4 +1,5 @@
<% c =[:linkbox] %>
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: :linkbox} do %> <% c << "color-"+neuigkeit.rubrik.color.to_s+"-dark" unless neuigkeit.rubrik.color.nil? %>
<%= link_to [neuigkeit.rubrik,neuigkeit], {class: c} do %>
<%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %> <%= render :partial=>"neuigkeiten/compact",:locals=> {:neuigkeit=> neuigkeit} %>
<% end %> <% end %>

2
app/views/neuigkeiten/show.html.erb
View File

@@ -3,7 +3,7 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<div class="contentbox"> <div class="contentbox">
<span> <span>
<%= @neuigkeit.rubrik.name %> <%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %>&nbsp;<%= @neuigkeit.rubrik.name %>
</span> </span>
<span class="pull-right"> <span class="pull-right">
<%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %>

14
app/views/rubriken/_form.html.erb
View File

@@ -3,8 +3,10 @@
<%= f.input :name %> <%= f.input :name %>
<%= f.input :desc %> <%= f.input :desc %>
<%= f.input :prio %> <%= f.input :prio %>
<%= f.input :color ,:as=>:radio,:collection=>{raw('<a class="color-1-dark">color1</a>')=>1, raw('<a class="color-2-dark">color2</a>')=>2, raw('<a class="color-3-dark">color3</a>')=>3, raw('<a class="color-4-dark">color4</a>')=>4, raw('<a class="color-5-dark">color5</a>')=>5} %>
<%= f.input :public %> <%= f.input :public %>
<%= f.input :icon , :input_html=>{:id=>"iconfield"}%>
<i id="icon"></i>
<% end %> <% end %>
@@ -12,3 +14,13 @@
<%= f.action :submit, :as => :input %> <%= f.action :submit, :as => :input %>
<% end %> <% end %>
<% end %> <% end %>
<script>
$(document).ready(function(){
$('#iconfield').on('change', function(){$('#icon').attr("class",$(this).val())})});
</script>
<% ffi1_list.each do |i| %>
<a onclick="$('#iconfield').val('ffi1-<%= i %>');$('#icon').attr('class','ffi1-<%= i %>')" href="#"><%=ffi1_icon(i)%>
</a>
<% end %>

2
app/views/themen/_attachment_list.html.erb
View File

@@ -1,4 +1,4 @@
<table> <table class="table-striped">
<% attachment_list.each do |a| %> <% attachment_list.each do |a| %>
<tr> <tr>
<td> <td>

4
app/views/themen/_form.html.erb
View File

@@ -57,8 +57,12 @@
<% end %> <% end %>
<% end %> <% end %>
<%= tinymce %> <%= tinymce %>
</div> </div>
<%= tinymce_icon_choice %>
<h2>Attachments:</h2> <h2>Attachments:</h2>
<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %> <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %>

2
app/views/themen/_small.html.erb
View File

@@ -15,7 +15,7 @@
<br/> <br/>
<% small.fragen.each do |frage| %> <% small.fragen.each do |frage| %>
<p> <p>
<b> <%= frage.title %> </b> <br/> <b> <%= frage.title %> </b> <br/>
<%= raw(frage.text) %> <%= raw(frage.text) %>
</p> </p>
<% end %> <% end %>

13
app/views/themengruppen/_form.html.erb
View File

@@ -5,7 +5,8 @@
<%= f.input :public %> <%= f.input :public %>
<%= f.input :picture, :as => :file %> <%= f.input :picture, :as => :file %>
<%= f.input :text %> <%= f.input :text %>
<%= f.input :icon , :input_html=>{:id=>"iconfield"}%>
<i id="icon"></i>
<% end %> <% end %>
<%= f.actions do %> <%= f.actions do %>
@@ -13,3 +14,13 @@
<%= f.action :cancel,:label => I18n.t("common.back"), :as => :link %> <%= f.action :cancel,:label => I18n.t("common.back"), :as => :link %>
<% end %> <% end %>
<% end %> <% end %>
<script>
$(document).ready(function(){
$('#iconfield').on('change', function(){$('#icon').attr("class",$(this).val())})});
</script>
<% ffi1_list.each do |i| %>
<a onclick="$('#iconfield').val('ffi1-<%= i %>');$('#icon').attr('class','ffi1-<%= i %>')" href="#"><%=ffi1_icon(i)%>
</a>
<% end %>

14
app/views/themengruppen/_themengruppe.html.erb
View File

@@ -1,13 +1,21 @@
<%= link_to themengruppe,{:class=>'linkbox'} do %> <%= link_to themengruppe,{:class=>'linkbox color-4-dark'} do %>
<div class="row-fluid"> <div class="row-fluid">
<div class="span6"> <div class="span12">
<div class="media"> <div class="media">
<span class="pull-left"> <span class="pull-left">
<% if themengruppe.icon.nil? or themengruppe.icon.empty? %>
<%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %> <%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %>
<% end %>
</span> </span>
<div class="media-body"> <div class="media-body">
<h3><%=themengruppe.title%> </h3> <h3>
<% unless themengruppe.icon.nil? or themengruppe.icon.empty? %> <i class="<%= themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
<% end %>
<%=themengruppe.title%> </h3>
</div> </div>
</div> </div>
</div> </div>
</div> </div>

4
app/views/themengruppen/faqs.html.erb
View File

@@ -1,4 +1,4 @@
<h1><%= I18n.t("themengruppe.faqs") %> <h1><%= I18n.t("themengruppe.faqs") %></h1>
<div class="content-wrap content-column"> <div class="content-wrap content-column">
<% @themengruppen.each do |tg| %> <% @themengruppen.each do |tg| %>
<div class="contentbox"> <div class="contentbox">
@@ -10,7 +10,7 @@
<ul> <% t.fragen.each do |f| %> <ul> <% t.fragen.each do |f| %>
<li> <li>
<b> <%= f.title %>?</b> <b> <%= f.title %>?</b>
<p> <%= f.text %></p> <p> <%= raw(f.text) %></p>
</li> </li>
<% end %> <% end %>

7
app/views/themengruppen/index.html.erb
View File

@@ -1,7 +1,10 @@
<div class="content-wrap content-column"> <div class="content-wrap content-column">
<%= render :partial=>'layouts/pretty_toolbar' %> <%= render :partial=>'layouts/pretty_toolbar' %>
<p> <ul class="linklist">
<%= link_to I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :btn %> <li>
<%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
</li>
</ul>
</p> </p>
<ul class="unstyled linkbox-list"> <ul class="unstyled linkbox-list">
<li> <li>

15
app/views/themengruppen/show.html.erb
View File

@@ -1,9 +1,18 @@
<div class="content-wrap content-column" > <div class="content-wrap content-column" >
<%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %> <ul class="linklist">
<%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %> <% if @themengruppe.public %>
<li> <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %></li>
<% else %>
<li> <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %></li>
<% end %>
<li><%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %>
</li>
</ul>
<%= render :partial=>'layouts/pretty_toolbar' %> <%= render :partial=>'layouts/pretty_toolbar' %>
<h1><%= @themengruppe.title %></h1> <h1> <% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %> <i class="<%= @themengruppe.icon %>" style="font-size:1.5em;margin:0"></i>
<% end %>
<%= @themengruppe.title %></h1>
<p> <p>
<%= @themengruppe.text %> <%= @themengruppe.text %>

3
app/views/themes/blue1/home/index.html.erb
View File

@@ -6,7 +6,7 @@
<p> <p>
<%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %> <%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
</p> </p>
<div class="alert"> <div class="alert">
<h2>Beta Test</h2> <h2>Beta Test</h2>
@@ -15,6 +15,7 @@
Fehlermeldungen auf GitHub melden. Fehlermeldungen auf GitHub melden.
</p> </p>
<p> <p>
<%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %> <%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>
</p> </p>
<p> <p>

257
config/flatfeticon1.yml Normal file
View File

@@ -0,0 +1,257 @@
ffi1:
- academic
- apple
- auricular6
- bag2
- bald34
- balloons2
- banes
- bar1
- black268
- book119
- book135
- book137
- book139
- books17
- books19
- books20
- books30
- books8
- boy21
- bricks2
- briefcase32
- businessman216
- businessman217
- businessman56
- businessman65
- businessmen32
- calculator40
- calendar130
- call36
- call7
- candy1
- candy10
- career
- certificate2
- checkboxmark
- chemistry
- chemistry1
- circular114
- circular116
- class6
- classroom
- cleaning1
- clipboard44
- close13
- cocktail15
- cocktail7
- coffee20
- coins24
- colors3
- comfortable
- comments16
- compass58
- computer135
- computer136
- computers
- connected20
- contacts1
- copy12
- croissant1
- data39
- data45
- delivered
- delivery35
- descendant1
- diploma
- dislike
- dna9
- domain1
- drink24
- dwelling1
- earth23
- ecological2
- edit12
- education14
- education17
- education20
- educational8
- educative1
- electric6
- electrical7
- electronic32
- electronic51
- elegant8
- email20
- facebook1
- facebook30
- female188
- female189
- female218
- food23
- fork27
- gears3
- gingerbread
- girl16
- glass15
- good2
- graduate11
- graduate8
- graduate9
- graduates2
- graduation20
- graduation25
- grocery10
- halloween10
- hammer7
- hand132
- handbag6
- hands-shake
- handshake1
- hardbound
- head21
- hierarchical
- homework
- hot31
- hot50
- house25
- important
- index3
- instructor
- italian1
- job
- judge
- keys
- kids1
- kindergarden
- laptop88
- lecture1
- lecture2
- like3
- live2
- magnifier12
- magnifier13
- male103
- man183
- man204
- man315
- man388
- man397
- man82
- men9
- milk8
- mirrors
- money13
- mop1
- mop2
- movie19
- multiple25
- news
- newspaper9
- note20
- open127
- open135
- open160
- open161
- owl10
- package8
- paperclip14
- party
- party1
- pen38
- pen39
- pen43
- pencil54
- pencil66
- pens
- people30
- personal5
- persong
- persons8
- phone25
- pie46
- plate7
- plug12
- plugin
- power20
- power48
- printer11
- printer70
- professor17
- professor4
- professor5
- professor7
- pumpkin2
- puzzle25
- question41
- question42
- quiz
- regular2
- remove9
- resistor1
- ruler14
- running5
- sandwich
- scales2
- school31
- school35
- school6
- science2
- scissors3
- search4
- search54
- services
- serving1
- setting
- sheep1
- shop3
- shopping66
- shopping8
- soccer32
- social19
- speech84
- square74
- stack21
- stopwatch6
- store
- student13
- student15
- student40
- students3
- students5
- students6
- students7
- sweet8
- tags2
- tags3
- talking2
- teacher12
- teacher13
- teacher4
- teacher8
- teacher9
- test17
- text87
- textile
- three115
- thumb31
- toilet1
- tools
- two174
- two185
- two28
- users1
- users2
- users5
- users6
- verified9
- view2
- wifi10
- wind15
- winners2
- woman83
- worker12
- worker2
- worker4
- workers
- writing17

1
config/locales/de.yml
View File

@@ -14,6 +14,7 @@ de:
cancel: "Abbrechen" cancel: "Abbrechen"
save: "Speichern" save: "Speichern"
savecont: "Zwischenspeichern" savecont: "Zwischenspeichern"
intern: "Intern"
home: home:
sprache: "Deutsch" sprache: "Deutsch"
kontakt: "Kontakt" kontakt: "Kontakt"

1
config/routes.rb
View File

@@ -116,6 +116,7 @@ Fetsite::Application.routes.draw do
get 'create_link' get 'create_link'
get 'find_link' get 'find_link'
get 'publish_to_facebook' get 'publish_to_facebook'
get 'mail_to_fet'
end end
end end
end end

2
config/tinymce.yml
View File

@@ -27,5 +27,5 @@ toolbar:
formats: formats:
boldred: {selector: "p",block: "p", classes: "mc-important"} boldred: {selector: "p",block: "p", classes: "mc-important"}
setup: function(ed) { setup: function(ed) {
ed.addButton('boldred_btn', {title:'Bold-Red',icon:"fa fa-red fa-bold", onclick:function() {ed.focus();ed.formatter.toggle('boldred'); }, onPostRender:function() {var ctrl = this; ed.on('NodeChange', function(e) {ctrl.active(e.element.formatter.match('boldred'));}); }}); ed.addButton('boldred_btn', {title:'Bold-Red',icon:"fa fa-red fa-bold", onclick:function() {ed.focus();ed.formatter.toggle('boldred'); }});
} }

8
db/migrate/20140707161951_add_icon.rb Normal file
View File

@@ -0,0 +1,8 @@
class AddIcon < ActiveRecord::Migration
def change
add_column :themengruppen, :icon, :string
add_column :rubriken, :icon, :string
add_column :themen, :icon, :string
end
end

6
db/migrate/20140708181055_add_color.rb Normal file
View File

@@ -0,0 +1,6 @@
class AddColor < ActiveRecord::Migration
def change
add_column :rubriken, :color, :integer
end
end