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 index ed3643a..08ea9d3 100644 --- a/app/assets/stylesheets/flatfeticon1.css.scss +++ b/app/assets/stylesheets/flatfeticon1.css.scss @@ -11,9 +11,9 @@ [class^="ffi1-"]:before, [class*=" ffi1-"]:before, [class^="ffi1-"]:after, [class*=" ffi1-"]:after { font-family: ffi1; - font-size: 20px; -font-style: normal; -margin-left: 20px; + font-style: normal; + margin-left: 4px; + font-weight:normal; } .ffi1-academic:before { diff --git a/app/assets/stylesheets/layout.css.scss b/app/assets/stylesheets/layout.css.scss index acd1b97..65afdb4 100755 --- a/app/assets/stylesheets/layout.css.scss +++ b/app/assets/stylesheets/layout.css.scss @@ -40,6 +40,7 @@ a.linkbox:hover { box-shadow: 1px 1px 2px 2px lightgray; } + a.linkbox.color-1 { color:$color_schema_1; @@ -61,6 +62,47 @@ 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 { diff --git a/app/assets/stylesheets/themes/blue1/application.css.scss b/app/assets/stylesheets/themes/blue1/application.css.scss index b486d03..a24cf52 100755 --- a/app/assets/stylesheets/themes/blue1/application.css.scss +++ b/app/assets/stylesheets/themes/blue1/application.css.scss @@ -24,7 +24,14 @@ $color_schema_3: #FF0021; $color_schema_4: #E8820C; $color_schema_5: #FFF30D; -$color_prim: #006599; //071672; +$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%); @@ -33,6 +40,7 @@ $color_prim_vdark: darken($color_prim ,30%); $color_cont: $color_schema_3; $color_cont_light:lighten($color_cont ,10%); $linkColor: $color_prim; +$linkColorHover: $color_schema_1; $white: #FFFFFF; $bodyBackground: #EEE; @@ -43,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; diff --git a/app/assets/stylesheets/themes/white_1/application.css.scss b/app/assets/stylesheets/themes/white_1/application.css.scss index 3e010c2..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; 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/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9ae53e7..32b5582 100755 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -11,11 +11,23 @@ module ApplicationHelper 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 3420a3f..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 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/neuigkeiten/_compact.html.erb b/app/views/neuigkeiten/_compact.html.erb index 0a01cb9..6065ba3 100644 --- a/app/views/neuigkeiten/_compact.html.erb +++ b/app/views/neuigkeiten/_compact.html.erb @@ -6,7 +6,7 @@
- <%= 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/_form.html.erb b/app/views/themen/_form.html.erb index 0185a60..bfed884 100644 --- a/app/views/themen/_form.html.erb +++ b/app/views/themen/_form.html.erb @@ -44,6 +44,7 @@ <% end %> <% end %><% end %> <%= tinymce %> + <%= tinymce_icon_choice %>

Attachments:

<%= render :partial => "themen/select", :object => @thema,:locals =>{ :editor => :true} %> 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 3c06939..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 color-4'} 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/show.html.erb b/app/views/themengruppen/show.html.erb index 59decb8..fa3ac99 100644 --- a/app/views/themengruppen/show.html.erb +++ b/app/views/themengruppen/show.html.erb @@ -10,7 +10,9 @@ <%= 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 07871f6..65429b0 100644 --- a/app/views/themes/blue1/home/index.html.erb +++ b/app/views/themes/blue1/home/index.html.erb @@ -6,9 +6,6 @@

-<% ffi1_list.each do |i| %> -<%= ffi1_icon i %> -<% end %> <%= ffi1_icon "academic" %><%= link_to I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>

diff --git a/config/tinymce.yml b/config/tinymce.yml index f7f0993..7a40cb3 100755 --- a/config/tinymce.yml +++ b/config/tinymce.yml @@ -26,6 +26,6 @@ toolbar: - styleselect | bold boldred_btn italic forecolor | list link image table | undo redo | fullscreen code 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'); }}); -# } +setup: function(ed) { + 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