reverse bootstrap upgrade
This commit is contained in:
6
Gemfile
6
Gemfile
@@ -15,9 +15,11 @@ gem 'webrick'#, '1.3.1'
|
||||
|
||||
# Gems used only for assets and not required
|
||||
# in production environments by default.
|
||||
gem 'sass-rails', '~> 5.0'
|
||||
gem 'sass-rails'
|
||||
gem 'coffee-rails', '~> 4.2.2'
|
||||
gem 'bootstrap'#,'~> 3.4'
|
||||
gem 'bootstrap-sass','~> 2.3.0'
|
||||
gem 'autoprefixer-rails'#,'~>9.5'
|
||||
#gem 'concurrent-ruby'
|
||||
|
||||
#group :assets do
|
||||
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
|
||||
|
||||
153
Gemfile.lock
153
Gemfile.lock
@@ -8,7 +8,7 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/rgrove/sanitize
|
||||
revision: 424f02f4fd279e650117d32388d0840097dbc4c9
|
||||
revision: dd466918ce5728acdc6f63d746fa898f8b366988
|
||||
specs:
|
||||
sanitize (5.0.0)
|
||||
crass (~> 1.0.2)
|
||||
@@ -18,39 +18,39 @@ GIT
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
actionmailer (4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activejob (= 4.2.11)
|
||||
actionmailer (4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activejob (= 4.2.11.1)
|
||||
mail (~> 2.5, >= 2.5.4)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
actionpack (4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
actionpack (4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
rack (~> 1.6)
|
||||
rack-test (~> 0.6.2)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionpack-action_caching (1.2.0)
|
||||
actionpack (>= 4.0.0, < 6)
|
||||
actionview (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
actionview (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
builder (~> 3.1)
|
||||
erubis (~> 2.7.0)
|
||||
rails-dom-testing (~> 1.0, >= 1.0.5)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.3)
|
||||
active_record_query_trace (1.5.4)
|
||||
activejob (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
active_record_query_trace (1.6.2)
|
||||
activejob (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
globalid (>= 0.3.0)
|
||||
activemodel (4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
activemodel (4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
builder (~> 3.1)
|
||||
activerecord (4.2.11)
|
||||
activemodel (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
activerecord (4.2.11.1)
|
||||
activemodel (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
arel (~> 6.0)
|
||||
activesupport (4.2.11)
|
||||
activesupport (4.2.11.1)
|
||||
i18n (~> 0.7)
|
||||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
@@ -59,12 +59,12 @@ GEM
|
||||
addressable (2.6.0)
|
||||
public_suffix (>= 2.0.2, < 4.0)
|
||||
aes_key_wrap (1.0.1)
|
||||
annotate (2.7.4)
|
||||
activerecord (>= 3.2, < 6.0)
|
||||
annotate (2.7.5)
|
||||
activerecord (>= 3.2, < 7.0)
|
||||
rake (>= 10.4, < 13.0)
|
||||
arel (6.0.4)
|
||||
attr_required (1.0.1)
|
||||
autoprefixer-rails (9.5.0)
|
||||
autoprefixer-rails (9.5.1.1)
|
||||
execjs
|
||||
awesome_nested_set (3.1.4)
|
||||
activerecord (>= 4.0.0, < 5.3)
|
||||
@@ -74,15 +74,13 @@ GEM
|
||||
railties (>= 3.1.0)
|
||||
blueimp-gallery-rails (2.7.0)
|
||||
railties (>= 3.0, < 5.0)
|
||||
bootstrap (4.3.1)
|
||||
autoprefixer-rails (>= 9.1.0)
|
||||
popper_js (>= 1.14.3, < 2)
|
||||
sassc-rails (>= 2.0.0)
|
||||
bootstrap-addons-rails (0.1.2)
|
||||
rails
|
||||
bootstrap-sass (2.3.2.2)
|
||||
sass (~> 3.2)
|
||||
builder (3.2.3)
|
||||
cancan (1.6.10)
|
||||
capybara (3.13.2)
|
||||
capybara (3.18.0)
|
||||
addressable
|
||||
mini_mime (>= 0.1.3)
|
||||
nokogiri (~> 1.8)
|
||||
@@ -103,9 +101,9 @@ GEM
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
concurrent-ruby (1.1.4)
|
||||
concurrent-ruby (1.1.5)
|
||||
crass (1.0.4)
|
||||
devise (4.6.1)
|
||||
devise (4.6.2)
|
||||
bcrypt (~> 3.0)
|
||||
orm_adapter (~> 0.1)
|
||||
railties (>= 4.1.0, < 6.0)
|
||||
@@ -122,8 +120,8 @@ GEM
|
||||
multi_json (~> 1.0)
|
||||
factory_bot (5.0.2)
|
||||
activesupport (>= 4.2.0)
|
||||
factory_bot_rails (5.0.1)
|
||||
factory_bot (~> 5.0.0)
|
||||
factory_bot_rails (5.0.2)
|
||||
factory_bot (~> 5.0.2)
|
||||
railties (>= 4.2.0)
|
||||
faraday (0.15.4)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
@@ -133,8 +131,8 @@ GEM
|
||||
rack-oauth2 (>= 0.14.4)
|
||||
tzinfo
|
||||
ffi (1.10.0)
|
||||
font-awesome-rails (4.7.0.4)
|
||||
railties (>= 3.2, < 6.0)
|
||||
font-awesome-rails (4.7.0.5)
|
||||
railties (>= 3.2, < 6.1)
|
||||
formtastic (3.1.5)
|
||||
actionpack (>= 3.2.13)
|
||||
formtastic-bootstrap (3.0.0)
|
||||
@@ -146,18 +144,18 @@ GEM
|
||||
activemodel (>= 4.2, < 5.3)
|
||||
activerecord (>= 4.2, < 5.3)
|
||||
request_store (~> 1.0)
|
||||
globalize-accessors (0.1.5)
|
||||
globalize (>= 3)
|
||||
globalize-versioning (0.2.0)
|
||||
activemodel (>= 3.2.0, < 5)
|
||||
activerecord (>= 3.2.0, < 5)
|
||||
globalize (>= 3.0.4, < 6)
|
||||
paper_trail (>= 3.0.0, < 5)
|
||||
globalize-accessors (0.2.1)
|
||||
globalize (~> 5.0, >= 5.0.0)
|
||||
globalize-versioning (0.3.0)
|
||||
activemodel (>= 4.2.0, < 6)
|
||||
activerecord (>= 4.2.0, < 6)
|
||||
globalize (>= 5.1.0, < 6)
|
||||
paper_trail (>= 8, < 12)
|
||||
haml (5.0.4)
|
||||
temple (>= 0.8.0)
|
||||
tilt
|
||||
hashie (3.6.0)
|
||||
highline (2.0.1)
|
||||
highline (2.0.2)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
@@ -174,8 +172,8 @@ GEM
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (6.0.1)
|
||||
railties (>= 3.2.16)
|
||||
json (2.1.0)
|
||||
json-jwt (1.10.0)
|
||||
json (2.2.0)
|
||||
json-jwt (1.10.1)
|
||||
activesupport (>= 4.2)
|
||||
aes_key_wrap
|
||||
bindata
|
||||
@@ -192,7 +190,7 @@ GEM
|
||||
activerecord
|
||||
kaminari-core (= 1.1.1)
|
||||
kaminari-core (1.1.1)
|
||||
libv8 (6.7.288.46.1)
|
||||
libv8 (7.3.492.27.1)
|
||||
loofah (2.2.3)
|
||||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.5.9)
|
||||
@@ -202,20 +200,20 @@ GEM
|
||||
actionpack (>= 3.2.0, < 6.1)
|
||||
mime-types (3.2.2)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2018.0812)
|
||||
mime-types-data (3.2019.0331)
|
||||
mimemagic (0.3.3)
|
||||
mini_mime (1.0.1)
|
||||
mini_portile2 (2.4.0)
|
||||
mini_racer (0.2.4)
|
||||
libv8 (>= 6.3)
|
||||
mini_racer (0.2.5)
|
||||
libv8 (>= 6.9.411)
|
||||
minitest (5.11.3)
|
||||
multi_json (1.13.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
multipart-post (2.1.0)
|
||||
mysql2 (0.5.2)
|
||||
net-ldap (0.16.1)
|
||||
netrc (0.11.0)
|
||||
nokogiri (1.10.1)
|
||||
nokogiri (1.10.3)
|
||||
mini_portile2 (~> 2.4.0)
|
||||
nokogumbo (2.0.1)
|
||||
nokogiri (~> 1.8, >= 1.8.4)
|
||||
@@ -243,9 +241,8 @@ GEM
|
||||
nokogiri
|
||||
options (2.3.2)
|
||||
orm_adapter (0.5.0)
|
||||
paper_trail (4.2.0)
|
||||
activerecord (>= 3.0, < 6.0)
|
||||
activesupport (>= 3.0, < 6.0)
|
||||
paper_trail (10.3.0)
|
||||
activerecord (>= 4.2, < 6.1)
|
||||
request_store (~> 1.1)
|
||||
paperclip (6.1.0)
|
||||
activemodel (>= 4.2.0)
|
||||
@@ -253,7 +250,6 @@ GEM
|
||||
mime-types
|
||||
mimemagic (~> 0.3.0)
|
||||
terrapin (~> 0.6.0)
|
||||
popper_js (1.14.5)
|
||||
pr_geohash (1.0.0)
|
||||
progress_bar (1.3.0)
|
||||
highline (>= 1.6, < 3)
|
||||
@@ -261,7 +257,7 @@ GEM
|
||||
protected_attributes (1.1.4)
|
||||
activemodel (>= 4.0.1, < 5.0)
|
||||
public_suffix (3.0.3)
|
||||
puma (3.12.0)
|
||||
puma (3.12.1)
|
||||
pyu-ruby-sasl (0.0.3.3)
|
||||
rack (1.6.11)
|
||||
rack-oauth2 (1.9.3)
|
||||
@@ -272,16 +268,16 @@ GEM
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails (4.2.11)
|
||||
actionmailer (= 4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
actionview (= 4.2.11)
|
||||
activejob (= 4.2.11)
|
||||
activemodel (= 4.2.11)
|
||||
activerecord (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
rails (4.2.11.1)
|
||||
actionmailer (= 4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
actionview (= 4.2.11.1)
|
||||
activejob (= 4.2.11.1)
|
||||
activemodel (= 4.2.11.1)
|
||||
activerecord (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
bundler (>= 1.3.0, < 2.0)
|
||||
railties (= 4.2.11)
|
||||
railties (= 4.2.11.1)
|
||||
sprockets-rails
|
||||
rails-deprecated_sanitizer (1.0.3)
|
||||
activesupport (>= 4.2.0.alpha)
|
||||
@@ -291,16 +287,16 @@ GEM
|
||||
rails-deprecated_sanitizer (>= 1.0.1)
|
||||
rails-html-sanitizer (1.0.4)
|
||||
loofah (~> 2.2, >= 2.2.2)
|
||||
railties (4.2.11)
|
||||
actionpack (= 4.2.11)
|
||||
activesupport (= 4.2.11)
|
||||
railties (4.2.11.1)
|
||||
actionpack (= 4.2.11.1)
|
||||
activesupport (= 4.2.11.1)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (12.3.2)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.10.0)
|
||||
ffi (~> 1.0)
|
||||
regexp_parser (1.3.0)
|
||||
regexp_parser (1.4.0)
|
||||
request_store (1.4.1)
|
||||
rack (>= 1.4)
|
||||
responders (2.4.1)
|
||||
@@ -310,7 +306,7 @@ GEM
|
||||
http-cookie (>= 1.0.2, < 2.0)
|
||||
mime-types (>= 1.16, < 4.0)
|
||||
netrc (~> 0.8)
|
||||
rmagick (2.16.0)
|
||||
rmagick (3.1.0)
|
||||
rolify (5.2.0)
|
||||
rsolr (2.2.1)
|
||||
builder (>= 2.1.2)
|
||||
@@ -327,7 +323,7 @@ GEM
|
||||
rspec-expectations (>= 2.99.0.beta1)
|
||||
rspec-core (3.8.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-expectations (3.8.2)
|
||||
rspec-expectations (3.8.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.8.0)
|
||||
rspec-html-matchers (0.9.1)
|
||||
@@ -347,7 +343,7 @@ GEM
|
||||
rspec-support (3.8.0)
|
||||
rubyntlm (0.3.4)
|
||||
rubyzip (1.2.2)
|
||||
sass (3.7.3)
|
||||
sass (3.7.4)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
@@ -361,12 +357,6 @@ GEM
|
||||
sassc (2.0.1)
|
||||
ffi (~> 1.9)
|
||||
rake
|
||||
sassc-rails (2.1.0)
|
||||
railties (>= 4.0.0)
|
||||
sassc (>= 2.0)
|
||||
sprockets (> 3.0)
|
||||
sprockets-rails
|
||||
tilt
|
||||
seed_dump (3.3.1)
|
||||
activerecord (>= 4)
|
||||
activesupport (>= 4)
|
||||
@@ -400,7 +390,7 @@ GEM
|
||||
sunspot_test (0.4.1)
|
||||
sunspot_rails (>= 2.1.1)
|
||||
sunspot_solr
|
||||
temple (0.8.0)
|
||||
temple (0.8.1)
|
||||
terrapin (0.6.0)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
themes_on_rails (0.4.0)
|
||||
@@ -416,11 +406,11 @@ GEM
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.5)
|
||||
unf_ext (0.0.7.6)
|
||||
warden (1.2.7)
|
||||
rack (>= 1.0)
|
||||
webrick (1.4.2)
|
||||
whenever (0.10.0)
|
||||
whenever (0.11.0)
|
||||
chronic (>= 0.6.3)
|
||||
xpath (3.2.0)
|
||||
nokogiri (~> 1.8)
|
||||
@@ -436,12 +426,13 @@ DEPENDENCIES
|
||||
active_record_query_trace
|
||||
acts_as_votable
|
||||
annotate
|
||||
autoprefixer-rails
|
||||
awesome_nested_set
|
||||
blueimp-gallery
|
||||
blueimp-gallery-rails
|
||||
bootstrap
|
||||
bootstrap-addons-rails
|
||||
bootstrap-kaminari-views!
|
||||
bootstrap-sass (~> 2.3.0)
|
||||
cancan
|
||||
capybara
|
||||
carrierwave
|
||||
@@ -490,7 +481,7 @@ DEPENDENCIES
|
||||
rspec-support
|
||||
rubyzip
|
||||
sanitize!
|
||||
sass-rails (~> 5.0)
|
||||
sass-rails
|
||||
seed_dump
|
||||
shareable
|
||||
simple_calendar
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
//
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery-ui/core
|
||||
//= require jquery-ui
|
||||
// require jquery.ui.draggable
|
||||
// require jquery.ui.sortable
|
||||
// require jquery.ui.gallery
|
||||
|
||||
67
app/helpers/html_helper.rb
Normal file
67
app/helpers/html_helper.rb
Normal file
@@ -0,0 +1,67 @@
|
||||
require 'nokogiri'
|
||||
|
||||
module HtmlHelper
|
||||
def wrapper_html(tag,&block)
|
||||
content_tag(tag,nil, class:"test_wrapper", &block)
|
||||
end
|
||||
# make a ul with <li><a> structure a bootstrap nav list
|
||||
def bs_make_ul_nav(options={},&block)
|
||||
r=capture(&block)
|
||||
n=Nokogiri.XML(r)
|
||||
u= n.xpath("/ul").first
|
||||
u['class']=u['class'].to_s + " nav"
|
||||
n.xpath("/ul/li").each do |l|
|
||||
l['class'] = l['class'].to_s + " nav-item hello"
|
||||
l.xpath("a").each do |a|
|
||||
a['class']=a['class'].to_s+" nav-link"
|
||||
end
|
||||
end
|
||||
|
||||
return raw(n.to_html)
|
||||
end
|
||||
|
||||
# Generate Bootstrap Dropdown with toggler as the main button. and a block containing links
|
||||
def bs_dropdown_menu(toggler="",options={}, &block)
|
||||
id=options[:id] || SecureRandom.hex(12)
|
||||
|
||||
if options[:nav]
|
||||
tag=:li
|
||||
toggler=content_tag(:a, toggler, {:role => "button","id"=>id, "aria-haspopup"=>"true", "aria-expanded"=>"false", "data-toggle"=> "dropdown", "href"=>"#","class"=>"dropdown-toggle nav-link"})
|
||||
c = "dropdown nav-item"
|
||||
else
|
||||
toggler=content_tag(:a, toggler, {:role => "button","id"=>id, "aria-haspopup"=>"true", "aria-expanded"=>"false", "data-toggle"=> "dropdown", "href"=>"#","class"=>"btn dropdown-toggle"})
|
||||
c="dropdown"
|
||||
tag=(options[:tag].nil? ? :div : options[:tag])
|
||||
end
|
||||
|
||||
ctn= content_tag(:div, capture(&block), {class:"dropdown-menu", "aria-labelledby": id} )
|
||||
ctn=inject_html_class(:to_links,ctn, "dropdown-item")
|
||||
content_tag(tag, toggler+ ctn.html_safe, class: c)
|
||||
end
|
||||
|
||||
def bs_modal(toggler="", options={}, &block)
|
||||
id=options[:id] || SecureRandom.hex(12)
|
||||
title=options[:title]|| "Hello World!"
|
||||
ctn=capture(&block)
|
||||
|
||||
toggler=content_tag(:button, toggler,{type: "button", class: "btn", "data-toggle": "modal", "data-target":"#"+id})
|
||||
|
||||
close_btn=content_tag(:button, content_tag(:span,"×".html_safe, {"aria-hidden": "true"}), {type: "button", class: "close", "data-dismiss":"modal", "aria-label": "Close"})
|
||||
ctn=content_tag(:div,content_tag(:div, content_tag(:h5,title,{class: "modal-title"})+close_btn,{class: "modal-header"})+content_tag(:div, ctn,{class: "modal-body"}), {class: "modal-content"})
|
||||
toggler+content_tag(:div , content_tag(:div, ctn, {role: "document", class: "modal-dialog"}),{class: "modal fade", id: id, tabindex: "-1", role: "dialog", "aria-labelledby": id+"Label", "aria-hidden": "true"})
|
||||
end
|
||||
|
||||
private
|
||||
def inject_html_class(mode,html,c)
|
||||
n=Nokogiri.XML(html)
|
||||
|
||||
if mode==:to_links
|
||||
n.xpath("//a").each do |e|
|
||||
e['class'] = e['class'].to_s+" " + c
|
||||
end
|
||||
return n.to_html
|
||||
end
|
||||
|
||||
raise Error("wrong options for inject_html_class")
|
||||
end
|
||||
end
|
||||
@@ -104,9 +104,9 @@ end
|
||||
can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update ], Themengruppe
|
||||
can :manage, Attachment
|
||||
end
|
||||
can [:update,:edit,:verwalten, :showdraft], Thema, :id=>Thema.with_role(:editor, user).pluck(:id)
|
||||
can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update, :delete], Thema, :themengruppe_id=>Themengruppe.with_role(:admin,user).pluck(:id)
|
||||
can :delete, Themengruppe, :id=>Themengruppe.with_role(:admin,user).pluck(:id)
|
||||
# can [:update,:edit,:verwalten, :showdraft], Thema, :id=>Thema.with_role(:editor, user).pluck(:id)
|
||||
# can [:index, :faqs, :show,:new,:edit, :verwalten_all, :verwalten, :sort_themengruppen, :sort_themen, :create, :update, :delete], Thema, :themengruppe_id=>Themengruppe.with_role(:admin,user).pluck(:id)
|
||||
# can :delete, Themengruppe, :id=>Themengruppe.with_role(:admin,user).pluck(:id)
|
||||
if user.has_role?("fetadmin")
|
||||
can :delete, Themengruppe
|
||||
can :delete, Thema
|
||||
|
||||
@@ -12,26 +12,19 @@
|
||||
* compiled file, but it's generally better to create a new file per style scope.
|
||||
*
|
||||
*= require_self
|
||||
* ---require_tree .
|
||||
|
||||
*= require blueimp-gallery-all
|
||||
* require_tree .
|
||||
*= require jquery.fileupload-ui
|
||||
*= require jquery.datetimepicker
|
||||
*= require jquery-ui/dialog
|
||||
*= require jquery-ui/autocomplete
|
||||
*= require jquery-ui/progressbar
|
||||
*= require jquery-ui/tabs
|
||||
*= require jquery-ui/progressbar
|
||||
|
||||
* require 'bootstrap'
|
||||
|
||||
* require 'neuigkeiten'
|
||||
*/
|
||||
|
||||
|
||||
//
|
||||
|
||||
//Primary blue of this schema
|
||||
$color_schema_1: darken(#006599,10%);
|
||||
$color_schema_1: #006599;
|
||||
$color_schema_2: #630CE8;
|
||||
$color_schema_3: #FF0021;
|
||||
$color_schema_4: #E8820C;
|
||||
@@ -43,8 +36,7 @@ $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%);
|
||||
|
||||
// Primary Color is color number 1
|
||||
$color_prim: $color_schema_1; // #006599; //071672;
|
||||
$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%);
|
||||
@@ -52,45 +44,42 @@ $color_prim_vdark: darken($color_prim ,30%);
|
||||
|
||||
$color_cont: $color_schema_3;
|
||||
$color_cont_light:lighten($color_cont ,10%);
|
||||
|
||||
|
||||
$link-color: $color_prim;
|
||||
$link-hover-color: $color_prim_vlight;
|
||||
$link-decoration: none;
|
||||
$linkColor: $color_prim;
|
||||
$linkColorHover: $color_schema_1;
|
||||
$white: #FFFFFF;
|
||||
|
||||
$bodyBackground: #FFF; //#FEFEFE;
|
||||
|
||||
|
||||
|
||||
|
||||
$navbarBackground: #FFF; //$color_prim;
|
||||
$navbarText: $color_prim;
|
||||
$navbarLinkColor: $color_prim;
|
||||
$navbarLinkColorHover: $color_prim_vlight;
|
||||
$navbarLinkColorHover: $color_schema_1;
|
||||
$dropdownLinkColor: black;
|
||||
$navbar-default-brand-color: black;
|
||||
$navbarBrandColor:black;
|
||||
$navbarLinkBackgroundHover: darken($navbarBackground,10%);
|
||||
|
||||
|
||||
$navbarBackgroundHighlight: #FFF;
|
||||
//$navbarBackgroundHighlight:#FFFFFF;
|
||||
|
||||
|
||||
$navbarLinkBackgroundHover: darken($navbarBackground,10%);
|
||||
|
||||
|
||||
$infoBackground:#65A5D1;
|
||||
$infoText:#03406A;
|
||||
$sansFontFamily: Helvetica, Arial;
|
||||
|
||||
$font-family-base: Helvetica, Arial;
|
||||
$font-size-base: 0.9rem;
|
||||
|
||||
@import 'bootstrap';
|
||||
@import 'bootstrap-responsive';
|
||||
@import 'bootstrap/image-gallery';
|
||||
@import 'font-awesome';
|
||||
@import 'neuigkeiten';
|
||||
@import 'themengruppen';
|
||||
|
||||
|
||||
.navbar-light .navbar-nav a.nav-link {
|
||||
color: $color_prim;
|
||||
}
|
||||
div.header {
|
||||
display: block;
|
||||
// background: url('../../../../header1.png') no-repeat;
|
||||
@@ -106,7 +95,7 @@ div.header {
|
||||
}
|
||||
|
||||
div.header_span {
|
||||
background:white;
|
||||
background:white
|
||||
}
|
||||
|
||||
div.header h1 {
|
||||
@@ -115,16 +104,13 @@ div.header h1 {
|
||||
font-size:20px;
|
||||
line-height:32px;
|
||||
}
|
||||
|
||||
div.header img {
|
||||
//top:2px;
|
||||
//position:relative;
|
||||
}
|
||||
|
||||
div.navbar {
|
||||
border-bottom: $color_prim solid 3px;
|
||||
}
|
||||
|
||||
div.headerrow {
|
||||
}
|
||||
|
||||
|
||||
@@ -18,20 +18,26 @@
|
||||
<title>Fetsite</title>
|
||||
<% end %>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="maincontainer" class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-10 offset-md-1 header_span">
|
||||
<div class="row-fluid">
|
||||
<div class="span10 offset1 header_span">
|
||||
<% cache("menu_u"+user_signed_in?.to_s+current_user.try(:id).to_s+"l"+I18n.locale.to_s+ can?(:seeintern, User).to_s+ can?(:index,Gallery).to_s+params[:theme].to_s, expires_in: 24.hours) do %>
|
||||
<div class="header_wrap">
|
||||
<div class="header d-none d-print-block">
|
||||
<div class="header hidden-print">
|
||||
<%= link_to home_index_path do %>
|
||||
<!-- <span class="feticon-fet_logo fa-4x color-1"> </span>-->
|
||||
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
|
||||
<% end %>
|
||||
</div>
|
||||
<div class="header visible-print">
|
||||
<%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %>
|
||||
</div>
|
||||
<div class="visible-print">
|
||||
Fachschaft Elektrotechnik
|
||||
<hr/>
|
||||
|
||||
</div>
|
||||
<div id="menudiv" class="d-print-none">
|
||||
<div id="menudiv" style="margin-top:12px" class="hidden-print">
|
||||
<%= render :template => 'layouts/menu' %>
|
||||
</div>
|
||||
|
||||
@@ -39,8 +45,8 @@
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-10 offset-md-1" id="contentdiv">
|
||||
<div class="row-fluid">
|
||||
<div class="span10 offset1" id="contentdiv">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</div>
|
||||
@@ -56,4 +62,5 @@
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
|
||||
|
||||
<div class="navbar navbar-expand-lg navbar-light">
|
||||
<a class="navbar-brand" href="#"> <%= image_tag('/logo2014_64.png',{:style=>"float:left;height:50px",:height=>"50"}) %></a>
|
||||
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mymenudiv" >
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
||||
<div class="navbar-collapse collapse" id="mymenudiv">
|
||||
<ul class="nav navbar-nav mr-auto">
|
||||
<li class="nav-item"><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path, class: "nav-link" %>
|
||||
</li>
|
||||
<li class="nav-item"> <%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path, class: "nav-link" %></li>
|
||||
|
||||
<li><%= link_to I18n.t(:info,:scope=>'home' ),themengruppen_path , class: "nav-link" %></li>
|
||||
<li><%= link_to I18n.t('mitarbeiter',:scope=>'home' ),fetprofiles_path, class: "nav-link" %></li>
|
||||
<% if can? :index, Gallery %>
|
||||
<li><%= link_to I18n.t('fotos',:scope=>'home' ),galleries_path, class: "nav-link" %></li>
|
||||
<% end %>
|
||||
<li><%= link_to I18n.t(:studien,:scope=>'home' ), studien_path, class: "nav-link" %></li>
|
||||
<li> <%= link_to I18n.t("home.search"), search_home_index_path, class: "nav-link" %></li>
|
||||
<li> <%= link_to I18n.t("home.kontakt"), kontakt_home_index_path, class: "nav-link" %></li>
|
||||
<% if can?(:seeintern, User) %>
|
||||
<li>
|
||||
<%= link_to 'Intern' , intern_home_index_path, class: "nav-link" %>
|
||||
</li><% end %>
|
||||
</ul>
|
||||
<ul class="nav nav-pills nav-stacked pull-right">
|
||||
<li>
|
||||
|
||||
<!-- Split button -->
|
||||
<div class="btn-group navbar-btn">
|
||||
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
|
||||
<%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%>
|
||||
</button>
|
||||
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" data-toggle="dropdown" >
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu" aria-labelledby="navbarDropdown" role="menu">
|
||||
<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
|
||||
|
||||
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
|
||||
|
||||
</ul></div>
|
||||
</li>
|
||||
<li>
|
||||
<% if not user_signed_in? %>
|
||||
<% if Rails.env.development? %>
|
||||
<%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path %>
|
||||
<%= render 'layouts/login' %>
|
||||
|
||||
<% else %>
|
||||
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= render 'layouts/login' %>
|
||||
<% end %>
|
||||
|
||||
</li>
|
||||
<li class="nav-item dropdown">
|
||||
<a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||
Dropdown
|
||||
</a>
|
||||
<div class="dropdown-menu" aria-labelledby="navbarDropdown">
|
||||
<a class="dropdown-item" href="#">Action</a>
|
||||
<a class="dropdown-item" href="#">Another action</a>
|
||||
<div class="dropdown-divider"></div>
|
||||
<a class="dropdown-item" href="#">Something else here</a>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<form class="form-inline my-2 my-lg-0">
|
||||
<input class="form-control mr-sm-2" type="search" placeholder="Search" aria-label="Search">
|
||||
<button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button>
|
||||
</form>
|
||||
<!--<span class="pull-right"><%if I18n.locale == :en %>
|
||||
<%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%>
|
||||
<% elsif I18n.locale == :de %>
|
||||
<%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%>
|
||||
<%end %>
|
||||
</span>-->
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -8,9 +8,10 @@ top: 0" %>
|
||||
<% #, gallery_foto_path(@foto.gallery, ((@foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].nil?) ? (@foto.gallery.fotos[0].try(:id).to_i) : @foto.gallery.fotos[@foto.gallery.fotos.index(@foto)+1].try(:id).to_i) ) %>
|
||||
<div style="position:absolute; bottom:0; ">
|
||||
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, @foto.datei.url,
|
||||
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title.to_s,:target=>:blank, :style=>"" %>
|
||||
:class=>"btn",title: I18n.t('fotos.download')+': '+@foto.title,:target=>:blank, :style=>"" %>
|
||||
<!-- <div class="fb-like" data-href"<%= gallery_foto_path(@foto.gallery,@foto, {fotoid:@foto.id,theme: nil, locale: nil})%>" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>-->
|
||||
<%= render_shareable :url=>gallery_foto_url(@foto.gallery,@foto, {theme: nil, locale: nil}),:static_link=>true, :buttons=>[:facebook, :twitter, :google_plus] %>
|
||||
<p id="notice"><%= notice %></p>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@@ -145,12 +145,9 @@ end
|
||||
</div>
|
||||
</div>
|
||||
<%= link_to ff_icon('icon-circle-arrow-down').html_safe, f.datei.url,
|
||||
:class=>"btn-small",title: I18n.t('fotos.download').to_s+': '+f.title.to_s, rel: 'tooltip' %>
|
||||
:class=>"btn-small",title: I18n.t('fotos.download')+': '+f.title.to_s, rel: 'tooltip' %>
|
||||
<%= link_to ff_icon('icon-remove-circle').html_safe, gallery_foto_path(@gallery, f),
|
||||
:method => :delete, :class=>"btn-small btn-danger",
|
||||
title: I18n.t('fotos.delete').to_s+': '+f.title.to_s, rel: 'tooltip',
|
||||
confirm: I18n.t('fotos.delete').to_s+': '+f.title.to_s+',
|
||||
Sicher?' if can?(:delete,f) %>
|
||||
:method => :delete, :class=>"btn-small btn-danger",title: I18n.t('fotos.delete')+': '+f.title, rel: 'tooltip', confirm: I18n.t('fotos.delete')+': '+f.title+', Sicher?' if can?(:delete,f) %>
|
||||
<p></p>
|
||||
</div>
|
||||
<% end %>
|
||||
@@ -224,3 +221,5 @@ end
|
||||
* html .fb-like{display:inline}/* ie6 inline block fix*/
|
||||
*+html .fb-like{display:inline}/* ie7 inline block fix*/
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
@@ -18,10 +18,10 @@
|
||||
|
||||
<ul class="linklist">
|
||||
<li>
|
||||
<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_facebook_omniauth_authorize_path ,class: :linkbox %>
|
||||
<%= link_to ffi1_icon("facebook1") + I18n.t('home.fblogin'), user_omniauth_authorize_path(:facebook) ,class: :linkbox %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path ,class: :linkbox %>
|
||||
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) ,class: :linkbox %>
|
||||
</li>
|
||||
<li>
|
||||
<%= link_to ffi1_icon("quiz")+ I18n.t("themengruppe.faqs"), faqs_themengruppen_path,class: :linkbox %>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<%= stylesheet_link_tag "themes/"+theme_name+"/application", :media => "all" unless theme_name.empty? %>
|
||||
<%= stylesheet_link_tag "application", :media=>"all" if theme_name.empty? %>
|
||||
<%= stylesheet_link_tag "/iframe/infoscreenframe.css" %>
|
||||
<%= stylesheet_link_tag "infoscreenframe.css" %>
|
||||
|
||||
<%= javascript_include_tag "application" %>
|
||||
<%= javascript_include_tag "jmpress" %>
|
||||
|
||||
@@ -1,9 +1,14 @@
|
||||
<div class="navbar navbar-expand-lg navbar-light">
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
|
||||
<div class="navbar-collapse collapse">
|
||||
<ul class="navbar-nav mr-auto nav-pills nav-stacked">
|
||||
<div class="navbar">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
|
||||
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav nav-pills nav-stacked">
|
||||
<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
|
||||
</li>
|
||||
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
|
||||
@@ -23,7 +28,7 @@
|
||||
</ul>
|
||||
<ul class="nav nav-pills nav-stacked pull-right">
|
||||
<li>
|
||||
|
||||
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" > <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>-->
|
||||
<!-- Split button -->
|
||||
<div class="btn-group navbar-btn">
|
||||
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
|
||||
@@ -38,20 +43,9 @@
|
||||
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
|
||||
|
||||
</ul></div>
|
||||
</li>
|
||||
<li>
|
||||
<% if not user_signed_in? %>
|
||||
<% if Rails.env.development? %>
|
||||
<%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path %>
|
||||
<%= render 'layouts/login' %>
|
||||
|
||||
<% else %>
|
||||
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) %>
|
||||
<% end %>
|
||||
<% else %>
|
||||
<%= render 'layouts/login' %>
|
||||
<% end %>
|
||||
|
||||
</li><li>
|
||||
<%# link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
|
||||
<%# render 'layouts/login' %>
|
||||
</li></ul>
|
||||
|
||||
<!--<span class="pull-right"><%if I18n.locale == :en %>
|
||||
@@ -61,7 +55,9 @@
|
||||
<%end %>
|
||||
</span>-->
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -11,18 +11,18 @@
|
||||
<%= render 'tabs' %>
|
||||
<p id="notice"><%= notice %></p>
|
||||
<div class="content-wrap content-column">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="container-fluid">
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
|
||||
<h1><%= I18n.t("rubrik.title")%></h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="col-md-9">
|
||||
<div class="span9">
|
||||
|
||||
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<% @neuigkeiten.each do |n| %>
|
||||
<li><%= render n %> </li>
|
||||
<% end %>
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
</div>
|
||||
<% unless @calentries.nil? or @calentries.empty? or true%>
|
||||
<div class="col-md-3">
|
||||
<div class="span3">
|
||||
<% unless @calentries.nil? or @calentries.empty? %>
|
||||
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
|
||||
<%= render 'calendars/calentries', :object=>@calentries %>
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
<p id="notice"><%= notice %></p>
|
||||
<div class="content-wrap content-column">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
|
||||
<h1><%= @rubrik.name %></h1>
|
||||
<p>
|
||||
@@ -31,10 +31,10 @@
|
||||
<% end%>
|
||||
</i>
|
||||
</div></div>
|
||||
<div class="row">
|
||||
<div class="row-fluid">
|
||||
|
||||
<div class="col-md-9">
|
||||
<ul class="list-unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<div class="span9">
|
||||
<ul class="unstyled linkbox-list" style="max-width:70em" id="neuigkeiten">
|
||||
<% @neuigkeiten.each do |neuigkeit| %>
|
||||
<%= render neuigkeit, wrap_in: "li" %>
|
||||
<% end %>
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="span3">
|
||||
<% unless @calentries.nil? || @calentries.empty? %>
|
||||
<% cache("calendar_" + @calentries.map{|c| c.id}.join('') + @calentries.max{|c|c.updated_at.to_i}.updated_at.to_i.to_s+"_"+I18n.locale.to_s+params[:month].to_s+params[:year].to_s) do %>
|
||||
<%= render 'calendars/calentries', :object=>@calentries %>
|
||||
|
||||
Reference in New Issue
Block a user