diff --git a/Gemfile.lock b/Gemfile.lock index 1574ef4..ac311a3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -123,6 +123,7 @@ GEM httpclient (2.4.0) i18n (0.6.1) journey (1.0.4) + jquery-datetimepicker-rails (2.2.5.0) jquery-fileupload-rails (0.4.1) actionpack (>= 3.1) railties (>= 3.1) @@ -248,7 +249,7 @@ GEM ref thor (0.18.1) tilt (1.4.1) - tinymce-rails (3.5.8) + tinymce-rails (4.1.0) railties (>= 3.1.1) treetop (1.4.15) polyglot @@ -289,6 +290,7 @@ DEPENDENCIES globalize-versioning gollum-lib haml + jquery-datetimepicker-rails jquery-fileupload-rails jquery-rails jquery-ui-rails (~> 4.1.1) @@ -310,7 +312,7 @@ DEPENDENCIES sqlite3 themes_for_rails therubyracer - tinymce-rails (~> 3.5.8) + tinymce-rails (~> 4.1.0) uglifier (>= 1.0.3) webrick (= 1.3.1) wikicloth diff --git a/app/assets/fonts/flatfeticon.eot b/app/assets/fonts/flatfeticon.eot new file mode 100644 index 0000000..efcb7d2 Binary files /dev/null and b/app/assets/fonts/flatfeticon.eot differ diff --git a/app/assets/fonts/flatfeticon.svg b/app/assets/fonts/flatfeticon.svg new file mode 100644 index 0000000..ce499b4 --- /dev/null +++ b/app/assets/fonts/flatfeticon.svg @@ -0,0 +1,3 @@ + + + diff --git a/app/assets/fonts/flatfeticon.ttf b/app/assets/fonts/flatfeticon.ttf new file mode 100644 index 0000000..957497d Binary files /dev/null and b/app/assets/fonts/flatfeticon.ttf differ diff --git a/app/assets/fonts/flatfeticon.woff b/app/assets/fonts/flatfeticon.woff new file mode 100644 index 0000000..e70424b Binary files /dev/null and b/app/assets/fonts/flatfeticon.woff differ diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ebf404f..f15c483 100755 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -31,21 +31,13 @@ function insertAttachment(url,name) { var ext = url.split('.').pop().toLowerCase(); var img_ext = [ "jpg", "png", "bmp" , "jpeg" ]; - - // if ( img_ext.indexOf(ext) > -1) { -// tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + ""); -// } -// else { -// tinymce.activeEditor.setContent(tinymce.activeEditor.getContent({format : 'raw'}) + "" + name +""); -// } - - if ( img_ext.indexOf(ext) > -1) { tinymce.activeEditor.execCommand('mceInsertContent', false, ""); } else { tinymce.activeEditor.execCommand('mceInsertContent', false, "" + name +""); } - - +} +function insertIcon_ffi1(name) { + tinymce.activeEditor.execCommand('mceInsertContent',false,'  ') } diff --git a/app/assets/stylesheets/flatfeticon1.css.scss b/app/assets/stylesheets/flatfeticon1.css.scss new file mode 100644 index 0000000..08ea9d3 --- /dev/null +++ b/app/assets/stylesheets/flatfeticon1.css.scss @@ -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"; +} diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index b9dcd60..65afdb4 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -15,11 +15,9 @@ a:hover { text-decoration:none; } - - - - - +@import 'tinymce'; +@import 'fetlogo'; +@import 'flatfeticon1'; @@ -43,6 +41,69 @@ 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 { } @@ -90,4 +151,16 @@ div.smallspan { 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;} diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index 2760907..a24cf52 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -17,16 +17,30 @@ * 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_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; +$color_cont: $color_schema_3; +$color_cont_light:lighten($color_cont ,10%); $linkColor: $color_prim; +$linkColorHover: $color_schema_1; $white: #FFFFFF; $bodyBackground: #EEE; @@ -37,7 +51,7 @@ $bodyBackground: #EEE; $navbarBackground: #EEE;//$color_prim; $navbarText: $color_prim; $navbarLinkColor: $color_prim; -$navbarLinkColorHover: $color_prim_dark; +$navbarLinkColorHover: $color_schema_1; $dropdownLinkColor: black; $navbar-default-brand-color: black; $navbarBrandColor:black; @@ -46,7 +60,7 @@ $navbarBrandColor:black; $navbarBackgroundHighlight: #EEE; //$navbarBackgroundHighlight:#FFFFFF; -$navbarLinkBackgroundHover:#FFBE00; + $navbarLinkBackgroundHover: darken($navbarBackground,10%); @@ -66,21 +80,19 @@ div.header { // background: url('../../../../header1.png') no-repeat; // background-color:white;// $color_prim; // background-position: right; - + vertical-align:middle; float:left; color:#000; - padding-left:87px; padding-top:0px; - overflow:visible; -height:45px; + height:45px; margin-bottom: 0 px } div.header h1 { padding:0; -margin:4px; -font-size:20px; -line-height:32px; + margin:4px; + font-size:20px; + line-height:32px; } div.header img { //top:2px; @@ -91,7 +103,8 @@ border-bottom: $color_prim solid 3px; } div.headerrow { } - $contentdiv-background:none; + +$contentdiv-background:none; $navbar-li-minwidth: 0; @@ -99,6 +112,6 @@ $navbar-li-minwidth: 0; $box-border: lightgray solid 1px; $box-border-radius:0px; $box-background: white; + @import 'layout'; @import 'calendars'; -@import 'tinymce'; \ No newline at end of file diff --git a/app/assets/stylesheets/themes/darkblue/application.css.scss b/app/assets/stylesheets/themes/darkblue/application.css.scss index 5f5e261..1cf6ef4 100755 --- a/app/assets/stylesheets/themes/darkblue/application.css.scss +++ b/app/assets/stylesheets/themes/darkblue/application.css.scss @@ -77,7 +77,7 @@ $sansFontFamily: cmunrm, Helvetica, Arial; @import 'neuigkeiten'; @import 'fetlogo'; #menudiv { - font-family: ayuma2yk; + } div.header { diff --git a/app/assets/stylesheets/themes/white_1/application.css.scss b/app/assets/stylesheets/themes/white_1/application.css.scss index 8cbca33..22de038 100644 --- a/app/assets/stylesheets/themes/white_1/application.css.scss +++ b/app/assets/stylesheets/themes/white_1/application.css.scss @@ -17,6 +17,20 @@ * 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_light: #0B65A5; $color_prim_vlight: #2B85C5; @@ -73,4 +87,5 @@ $box-border: lightgray solid 1px; $box-border-radius:8px; $box-background: white; @import 'layout'; -@import 'calendars'; \ No newline at end of file +@import 'calendars'; +@import 'tinymce'; \ No newline at end of file diff --git a/app/assets/stylesheets/tinymce.css b/app/assets/stylesheets/tinymce.css.scss similarity index 92% rename from app/assets/stylesheets/tinymce.css rename to app/assets/stylesheets/tinymce.css.scss index ded5154..d6b224d 100644 --- a/app/assets/stylesheets/tinymce.css +++ b/app/assets/stylesheets/tinymce.css.scss @@ -14,4 +14,6 @@ i.fa-red { color:red; } color: red; font-weight:bold; text-align: center; -} \ No newline at end of file +} + +@import 'flatfeticon1' \ No newline at end of file diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 3aec4da..c1c18d6 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -85,7 +85,17 @@ class GremienController < ApplicationController respond_to do |format| 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 } else format.html { render action: "edit" } diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 8867f72..889f793 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -75,6 +75,17 @@ class NeuigkeitenController < ApplicationController redirect_to [@neuigkeit.rubrik,@neuigkeit], notice: 'Neuigkeit auf Facebook gepostet' 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 @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-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? diff --git a/app/controllers/themen_controller.rb b/app/controllers/themen_controller.rb index 8c5558a..5b4d39c 100644 --- a/app/controllers/themen_controller.rb +++ b/app/controllers/themen_controller.rb @@ -57,6 +57,7 @@ class ThemenController < ApplicationController # POST /themen.json def create @thema = Thema.new(params[:thema]) + @themen = @thema.themengruppe.themen.order(:priority).reverse respond_to do |format| if @thema.save diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b2acb74..32b5582 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -8,6 +8,26 @@ module ApplicationHelper current_url1({:locale=>target_locale}) .sub "/"+I18n.locale.to_s+"/", "/"+target_locale.to_s+"/" 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+''+ffi1_icon(i)+'' + end + raw(s) + end + def toolbar_html(elemente) html = "" limiter = " | " diff --git a/app/models/ability.rb b/app/models/ability.rb index 0f57417..91c4509 100755 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -63,7 +63,14 @@ class Ability can [:delete],Calentry can :doadmin, User 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 # can :write, Neuigkeit if user.has_role?("newsmoderator", Neuigkeit.rubrik) diff --git a/app/models/gremium.rb b/app/models/gremium.rb index fe5d2d1..3fd6acf 100644 --- a/app/models/gremium.rb +++ b/app/models/gremium.rb @@ -12,7 +12,7 @@ # 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 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 diff --git a/app/models/rubrik.rb b/app/models/rubrik.rb index 74340d2..ca4bfec 100755 --- a/app/models/rubrik.rb +++ b/app/models/rubrik.rb @@ -11,7 +11,7 @@ # 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 :published, :class_name => "Neuigkeit", :conditions=>["Neuigkeit.published"] has_many :calentries, :through => :neuigkeiten, :as=>:object diff --git a/app/models/themengruppe.rb b/app/models/themengruppe.rb index b60f5c2..8b22b5d 100644 --- a/app/models/themengruppe.rb +++ b/app/models/themengruppe.rb @@ -10,7 +10,7 @@ class Themengruppe < ActiveRecord::Base 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 :fragen, through: :themen @@ -21,13 +21,15 @@ class Themengruppe < ActiveRecord::Base 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)} def self.find_wiki_default where(:wiki_default=>true).first end - + def intern + ! self.public +end def make_wiki_default Themengruppe.where(:wiki_default=>:true).update_all(:wiki_default=>:false) self.wiki_default=true; diff --git a/app/views/fetprofiles/_form.html.erb b/app/views/fetprofiles/_form.html.erb index cfbd0ce..b179549 100644 --- a/app/views/fetprofiles/_form.html.erb +++ b/app/views/fetprofiles/_form.html.erb @@ -67,8 +67,8 @@
<%= f.actions do %> - <%= f.action :submit, :as => :input , :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.save") %> + <%= 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 %>
diff --git a/app/views/gremien/_form.html.erb b/app/views/gremien/_form.html.erb index 9537158..7873320 100644 --- a/app/views/gremien/_form.html.erb +++ b/app/views/gremien/_form.html.erb @@ -5,9 +5,6 @@ <%= f.input :typ, :as => :select, :collection => Gremium::TYPEN.invert %> <%= f.input :geschlecht, :as => :select, :collection => Gremium::GESCHLECHT.invert %> <%= f.input :thema, :as=> :select, :collection => Thema.all %> - - - <% @memberships.each do |m| %> <%= f.semantic_fields_for :memberships, m do |memberships_attributes| %>
@@ -33,6 +30,9 @@ <%= f.actions do %> <%= 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 %> diff --git a/app/views/gremien/verwalten.html.erb b/app/views/gremien/verwalten.html.erb index 27b7113..62f3cc1 100644 --- a/app/views/gremien/verwalten.html.erb +++ b/app/views/gremien/verwalten.html.erb @@ -4,11 +4,10 @@ <% @gremien.each do |gremium| %>
- <%= gremium.typ %> + <%= Gremium::TYPEN[gremium.typ.to_i] %>
<%= gremium.name %> - <%= gremium.desc %>
@@ -18,10 +17,9 @@
    -
  • - <%= link_to 'Show', gremium %>
    • -
  • <%= link_to 'Edit', edit_gremium_path(gremium) %>
    • -
  • <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %> +
  • <%= link_to 'Show', gremium %>
    • +
  • <%= link_to 'Edit', edit_gremium_path(gremium) %>
    • +
  • <%= link_to 'Destroy', gremium, method: :delete, data: { confirm: 'Are you sure?' }, class:"btn-danger" %>
diff --git a/app/views/home/_search_results.html.erb b/app/views/home/_search_results.html.erb index b4153fb..9719807 100644 --- a/app/views/home/_search_results.html.erb +++ b/app/views/home/_search_results.html.erb @@ -27,12 +27,16 @@

Themen

<% end %> -<% @themen.each do |thema| %>
    + +<% @themen.each do |thema| %> +<% if can? :show, thema %>
  • <%= link_to thema.title,thema %>
    <%= render :partial=>"themen/small", :object=>thema %>
    • -
<% end %> + +<% end %> + diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 206f079..d89b64c 100755 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -5,7 +5,7 @@
  • <%= render n if can?(:show, n) %>
    • <% end %> -

    +

    <%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>

    diff --git a/app/views/home/intern.html.erb b/app/views/home/intern.html.erb index e5d5eef..4dbf69d 100644 --- a/app/views/home/intern.html.erb +++ b/app/views/home/intern.html.erb @@ -2,9 +2,12 @@
    - <%= link_to "Adressliste", internlist_fetprofiles_path %> - <%= link_to "Admin" , admin_home_index_path if current_user.has_role?(:fetadmin) %> - +
      +
    • + <%= link_to "Adressliste", internlist_fetprofiles_path ,class: :linkbox %>
      • +
    • <%= link_to "Admin" , admin_home_index_path, class: :linkbox if current_user.has_role?(:fetadmin) %> +
      • +
    • <% @themengruppen.each do |themengruppe| %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 4b96b2e..e00f27d 100755 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -12,16 +12,8 @@ <%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %> <% theme_stylesheet_link_tag "test", :media => "all" %> <% theme_stylesheet_link_tag "mod", :media=>"all" %> - - - <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> - @@ -29,10 +21,13 @@
      -
      +
      - <%= 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 %> + <%= link_to home_index_path do %> + + <% end %> +
    • <%= link_to 'Intern' , intern_home_index_path %>
      • <% end %> -
    -
    - <%= neuigkeit.rubrik.name %> + <%= ff_icon(neuigkeit.rubrik.icon) unless neuigkeit.rubrik.icon.nil? or neuigkeit.rubrik.icon.empty? %> <%= neuigkeit.rubrik.name %> <%= I18n.t("neuigkeit.am")+" "+ I18n.l(neuigkeit.try(:datum).try(:to_date)) unless neuigkeit.try(:datum).try(:to_date).nil? %>

    diff --git a/app/views/neuigkeiten/_neuigkeit.html.erb b/app/views/neuigkeiten/_neuigkeit.html.erb index dd98a3a..9e17f73 100755 --- a/app/views/neuigkeiten/_neuigkeit.html.erb +++ b/app/views/neuigkeiten/_neuigkeit.html.erb @@ -1,4 +1,5 @@ - -<%= link_to [neuigkeit.rubrik,neuigkeit], {class: :linkbox} do %> +<% c =[:linkbox] %> +<% 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} %> <% end %> diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index 0021b45..10e32ef 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -3,7 +3,7 @@

    <%= notice %>

    - <%= @neuigkeit.rubrik.name %> + <%= ff_icon(@neuigkeit.rubrik.icon) unless @neuigkeit.rubrik.icon.nil? or @neuigkeit.rubrik.icon.empty? %> <%= @neuigkeit.rubrik.name %> <%= @neuigkeit.author.email.to_s unless @neuigkeit.try(:author).try(:email).to_s %> diff --git a/app/views/rubriken/_form.html.erb b/app/views/rubriken/_form.html.erb index ab6d620..4221474 100755 --- a/app/views/rubriken/_form.html.erb +++ b/app/views/rubriken/_form.html.erb @@ -3,8 +3,10 @@ <%= f.input :name %> <%= f.input :desc %> <%= f.input :prio %> + <%= f.input :color ,:as=>:radio,:collection=>{raw('color1')=>1, raw('color2')=>2, raw('color3')=>3, raw('color4')=>4, raw('color5')=>5} %> <%= f.input :public %> - + <%= f.input :icon , :input_html=>{:id=>"iconfield"}%> + <% end %> @@ -12,3 +14,13 @@ <%= f.action :submit, :as => :input %> <% end %> <% end %> + + + + <% ffi1_list.each do |i| %> + <%=ffi1_icon(i)%> + +<% end %> diff --git a/app/views/themen/_attachment_list.html.erb b/app/views/themen/_attachment_list.html.erb index a1c128d..a210446 100644 --- a/app/views/themen/_attachment_list.html.erb +++ b/app/views/themen/_attachment_list.html.erb @@ -1,4 +1,4 @@ - +
    <% attachment_list.each do |a| %>
    diff --git a/app/views/themen/_form.html.erb b/app/views/themen/_form.html.erb index a062904..4995656 100644 --- a/app/views/themen/_form.html.erb +++ b/app/views/themen/_form.html.erb @@ -57,8 +57,12 @@ <% end %> <% end %> <%= tinymce %> + + +<%= tinymce_icon_choice %>

    Attachments:

    <%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %> + diff --git a/app/views/themen/_small.html.erb b/app/views/themen/_small.html.erb index e3b6652..dfa0fc3 100644 --- a/app/views/themen/_small.html.erb +++ b/app/views/themen/_small.html.erb @@ -15,7 +15,7 @@
    <% small.fragen.each do |frage| %>

    - <%= frage.title %>
    + <%= frage.title %>
    <%= raw(frage.text) %>

    <% end %> diff --git a/app/views/themengruppen/_form.html.erb b/app/views/themengruppen/_form.html.erb index 90e9409..f005481 100644 --- a/app/views/themengruppen/_form.html.erb +++ b/app/views/themengruppen/_form.html.erb @@ -5,7 +5,8 @@ <%= f.input :public %> <%= f.input :picture, :as => :file %> <%= f.input :text %> - + <%= f.input :icon , :input_html=>{:id=>"iconfield"}%> + <% end %> <%= f.actions do %> @@ -13,3 +14,13 @@ <%= f.action :cancel,:label => I18n.t("common.back"), :as => :link %> <% end %> <% end %> + + + + <% ffi1_list.each do |i| %> + <%=ffi1_icon(i)%> + +<% end %> diff --git a/app/views/themengruppen/_themengruppe.html.erb b/app/views/themengruppen/_themengruppe.html.erb index a310498..3070f82 100644 --- a/app/views/themengruppen/_themengruppe.html.erb +++ b/app/views/themengruppen/_themengruppe.html.erb @@ -1,13 +1,21 @@ -<%= link_to themengruppe,{:class=>'linkbox'} do %> +<%= link_to themengruppe,{:class=>'linkbox color-4-dark'} do %>
    -
    +
    + <% if themengruppe.icon.nil? or themengruppe.icon.empty? %> <%= image_tag themengruppe.picture.thumb.url,{:class=>"img-rounded"} %> + <% end %> +
    -

    <%=themengruppe.title%>

    +

    + <% unless themengruppe.icon.nil? or themengruppe.icon.empty? %> + <% end %> + +<%=themengruppe.title%>

    +
    diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb index f758585..4dc64ce 100644 --- a/app/views/themengruppen/faqs.html.erb +++ b/app/views/themengruppen/faqs.html.erb @@ -1,4 +1,4 @@ -

    <%= I18n.t("themengruppe.faqs") %> +

    <%= I18n.t("themengruppe.faqs") %>

    <% @themengruppen.each do |tg| %>
    @@ -10,7 +10,7 @@
      <% t.fragen.each do |f| %>
    • <%= f.title %>? -

      <%= f.text %>

      +

      <%= raw(f.text) %>

      • <% end %> diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb index 7f1a920..9e5acf4 100644 --- a/app/views/themengruppen/index.html.erb +++ b/app/views/themengruppen/index.html.erb @@ -1,7 +1,10 @@
      <%= render :partial=>'layouts/pretty_toolbar' %> -

      - <%= link_to I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :btn %> +

        +
      • + <%= link_to fa_icon("question")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %> +
        • +

      • diff --git a/app/views/themengruppen/show.html.erb b/app/views/themengruppen/show.html.erb index 8dacb84..fa3ac99 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -1,9 +1,18 @@
        - <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %> - <%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %> +
          +<% if @themengruppe.public %> +
        • <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("themengruppe.showall"), themengruppen_path, :class=>"linkbox" %>
          • +<% else %> +
        • <%= link_to fa_icon("arrow-circle-left 2x")+I18n.t("common.intern"), intern_home_index_path, :class=>"linkbox" %>
          • +<% end %> +
        • <%= link_to fa_icon("question 2x")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path(:anchor=>"themengruppe_"+@themengruppe.id.to_s), :class=>"linkbox" %> +
          • +
        <%= render :partial=>'layouts/pretty_toolbar' %> -

        <%= @themengruppe.title %>

        +

        <% unless @themengruppe.icon.nil? or @themengruppe.icon.empty? %> + <% end %> +<%= @themengruppe.title %>

        <%= @themengruppe.text %> diff --git a/app/views/themes/blue1/home/index.html.erb b/app/views/themes/blue1/home/index.html.erb index b10b28b..65429b0 100644 --- a/app/views/themes/blue1/home/index.html.erb +++ b/app/views/themes/blue1/home/index.html.erb @@ -6,7 +6,7 @@

        -<%= 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) %>

        Beta Test

        @@ -15,6 +15,7 @@ Fehlermeldungen auf GitHub melden.

        + <%= link_to "Issues", "http://www.github.com/fetsite/fetsite/issues" %>

        diff --git a/config/flatfeticon1.yml b/config/flatfeticon1.yml new file mode 100644 index 0000000..95c6553 --- /dev/null +++ b/config/flatfeticon1.yml @@ -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 diff --git a/config/locales/de.yml b/config/locales/de.yml index 6a37ddd..e1f4d42 100755 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -14,6 +14,7 @@ de: cancel: "Abbrechen" save: "Speichern" savecont: "Zwischenspeichern" + intern: "Intern" home: sprache: "Deutsch" kontakt: "Kontakt" diff --git a/config/routes.rb b/config/routes.rb index e5b55b0..2a67d45 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -116,6 +116,7 @@ Fetsite::Application.routes.draw do get 'create_link' get 'find_link' get 'publish_to_facebook' + get 'mail_to_fet' end end end diff --git a/config/tinymce.yml b/config/tinymce.yml index a48ef7c..7a40cb3 100755 --- a/config/tinymce.yml +++ b/config/tinymce.yml @@ -27,5 +27,5 @@ toolbar: formats: boldred: {selector: "p",block: "p", classes: "mc-important"} 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'); }}); } diff --git a/db/migrate/20140707161951_add_icon.rb b/db/migrate/20140707161951_add_icon.rb new file mode 100644 index 0000000..414af1a --- /dev/null +++ b/db/migrate/20140707161951_add_icon.rb @@ -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 diff --git a/db/migrate/20140708181055_add_color.rb b/db/migrate/20140708181055_add_color.rb new file mode 100644 index 0000000..1a16502 --- /dev/null +++ b/db/migrate/20140708181055_add_color.rb @@ -0,0 +1,6 @@ +class AddColor < ActiveRecord::Migration + def change + add_column :rubriken, :color, :integer + end + +end