Skip to content

Resource-centred layout 2017 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fiedl wants to merge 21 commits into
base: sf/renew-cache-2017
Choose a base branch
from
Open

Resource-centred layout 2017 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
9e7c5a6
updating rubyzip to fix CVE-2017-5946 (2017-Wuine5ko)
fiedl Mar 5, 2017
eb37a93
layouts: allow personal layout setting in the intranet
fiedl Mar 13, 2017
87d63ba
experimenting with resource-centred layout approach
fiedl Mar 14, 2017
0d7004e
deactivating the slim-breadcrumb behaviour
fiedl Mar 15, 2017
98b86f6
I think, we do not need the corporation names in the horizontal struc…
fiedl Mar 15, 2017
2eaae44
Merge branch 'sf/renew-cache-2017'.
fiedl Mar 24, 2017
ced1534
Merge branch 'master' into sf/resource-layout-2017
fiedl Mar 24, 2017
8566784
active job: retry if record is not ready, yet.
fiedl Mar 24, 2017
f2d4110
try not to initialize datatables twice
fiedl Mar 24, 2017
64ac50d
datatables: finxing js
fiedl Mar 24, 2017
202e4bb
fixing `DagLink.repair`
fiedl Mar 24, 2017
0ead9d7
updating nokogiri to fix CVE-2016-4658
fiedl Mar 24, 2017
36bc2db
brakeman security fixes
fiedl Mar 24, 2017
f6851c5
dag link repair: adding task to recalc indirect validity ranges
fiedl Mar 25, 2017
4f21251
beginning migration from `attr_accessible` to Strong Parameters
fiedl Mar 25, 2017
57a3743
migrating from cancan to cancancan
fiedl Mar 25, 2017
af57e1a
commenting out redundant step in dag-link repair
fiedl Mar 25, 2017
20f0c49
turbolinks: show button spinner
fiedl Mar 25, 2017
da978cb
fixing view memberships#index
fiedl Mar 25, 2017
836dfea
make dag link recalc validity ranges available for manual access
fiedl Mar 25, 2017
94209da
Merge branch 'master' into sf/resource-layout-2017
fiedl Mar 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 48 additions & 47 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ PATH
bootstrap-sass (= 3.3.3)
bootstrap_tokenfield_rails
bundler (>= 1.9.4)
cancan
cancancan
carrierwave (~> 0.11)
chartkick
coffee-rails (>= 4.1.0)
Expand Down Expand Up @@ -52,7 +52,7 @@ PATH
mail_form
merit
mini_magick
nokogiri (>= 1.6.8)
nokogiri (>= 1.7.1)
omniauth-facebook (~> 3.0.0)
omniauth-github
omniauth-google-oauth2
Expand Down Expand Up @@ -80,6 +80,7 @@ PATH
refile (~> 0.5.5)
responders (~> 2.0)
rest-client (>= 1.8)
rubyzip (>= 1.2.1)
sass-rails (>= 3.2)
sidekiq (>= 3.4.2)
sidekiq-limit_fetch
Expand Down Expand Up @@ -143,13 +144,14 @@ GEM
activerecord (>= 4.0)
acts_as_tree (2.6.1)
activerecord (>= 3.0.0)
addressable (2.4.0)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
ambry (1.0.0)
arel (6.0.3)
auto_html (1.6.4)
redcarpet (~> 3.1)
rinku (~> 1.5.0)
autoprefixer-rails (6.7.2)
autoprefixer-rails (6.7.7.1)
execjs
autosize-rails (1.18.17)
rails (>= 3.1)
Expand Down Expand Up @@ -178,9 +180,9 @@ GEM
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
browser (2.3.0)
builder (3.2.2)
cancan (1.6.10)
capybara (2.10.1)
builder (3.2.3)
cancancan (1.15.0)
capybara (2.13.0)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
Expand All @@ -193,8 +195,8 @@ GEM
json (>= 1.7)
mime-types (>= 1.16)
mimemagic (>= 0.3.0)
chartkick (2.2.2)
childprocess (0.5.9)
chartkick (2.2.3)
childprocess (0.6.2)
ffi (~> 1.0, >= 1.0.11)
cliver (0.3.2)
codeclimate-test-reporter (0.4.8)
Expand All @@ -208,7 +210,7 @@ GEM
execjs
coffee-script-source (1.10.0)
colored (1.2)
concurrent-ruby (1.0.4)
concurrent-ruby (1.0.5)
connection_pool (2.2.1)
coveralls (0.8.10)
json (~> 1.8)
Expand All @@ -221,7 +223,7 @@ GEM
debug_inspector (0.0.2)
decent_exposure (3.0.2)
activesupport (>= 4.0)
devise (4.2.0)
devise (4.2.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0, < 5.1)
Expand Down Expand Up @@ -251,7 +253,7 @@ GEM
launchy (~> 2.1)
mail (~> 2.2)
erubis (2.7.0)
eventmachine (1.2.2)
eventmachine (1.2.3)
execjs (2.7.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
Expand All @@ -260,16 +262,16 @@ GEM
railties (>= 3.0.0)
faker (1.7.3)
i18n (~> 0.5)
faraday (0.10.1)
faraday (0.11.0)
multipart-post (>= 1.2, < 3)
fastercsv (1.5.5)
ffi (1.9.14)
ffi (1.9.18)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
foreman (0.83.0)
thor (~> 0.19.1)
formatador (0.2.5)
formtastic (3.1.4)
formtastic (3.1.5)
actionpack (>= 3.2.13)
fuubar (1.3.3)
rspec (>= 2.14.0, < 3.1.0)
Expand Down Expand Up @@ -304,13 +306,13 @@ GEM
tilt
has_secure_token (1.0.0)
activerecord (>= 3.0)
hashie (3.5.1)
hashie (3.5.5)
highline (1.7.8)
hike (1.2.3)
http-cookie (1.0.2)
domain_name (~> 0.5)
i18n (0.7.0)
i18n-js (3.0.0.rc15)
i18n (0.8.1)
i18n-js (3.0.0.rc16)
i18n (~> 0.6, >= 0.6.6)
icalendar (2.4.1)
jbuilder (2.3.2)
Expand All @@ -321,14 +323,14 @@ GEM
actionpack (>= 3.1)
railties (>= 3.1)
sass (>= 3.2)
jquery-rails (4.2.2)
jquery-rails (4.3.1)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (1.8.3)
json (1.8.6)
judge (2.1.1)
rails (>= 3.1)
jwt (1.5.6)
Expand All @@ -354,34 +356,34 @@ GEM
method_source (0.8.2)
mime-types (2.99.3)
mimemagic (0.3.2)
mini_magick (4.6.0)
mini_magick (4.6.1)
mini_portile2 (2.1.0)
minitest (5.9.1)
minitest (5.10.1)
multi_json (1.12.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
mysql2 (0.4.2)
nenv (0.2.0)
netrc (0.11.0)
nokogiri (1.6.8.1)
nokogiri (1.7.1)
mini_portile2 (~> 2.1.0)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
oauth (0.5.1)
oauth2 (1.3.0)
faraday (>= 0.8, < 0.11)
oauth2 (1.3.1)
faraday (>= 0.8, < 0.12)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.4.1)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth (1.6.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-facebook (3.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.2.1)
omniauth (~> 1.4.0)
omniauth-github (1.2.3)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-google-oauth2 (0.4.1)
jwt (~> 1.5.2)
Expand All @@ -403,16 +405,14 @@ GEM
parallel
passgen (1.0.2)
pdf-core (0.6.1)
phony (2.15.40)
phony (2.15.42)
poltergeist (1.11.0)
capybara (~> 2.1)
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
prawn (2.0.2)
pdf-core (~> 0.6.0)
ttfunk (~> 1.4.0)
protected_attributes (1.1.3)
activemodel (>= 4.0.1, < 5.0)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
Expand All @@ -422,6 +422,7 @@ GEM
activerecord (>= 3.0)
i18n (>= 0.5.0)
railties (>= 3.0.0)
public_suffix (2.0.5)
rack (1.6.5)
rack-mini-profiler (0.10.2)
rack (>= 1.2.0)
Expand Down Expand Up @@ -451,17 +452,17 @@ GEM
rails-assets-jquery (>= 1.7.0)
rails-assets-font-awesome (4.7.0)
rails-assets-inline-attachment (2.0.3)
rails-assets-jquery (3.1.1)
rails-assets-jquery (3.2.1)
rails-assets-jquery-ui (1.12.1)
rails-assets-jquery (>= 1.6)
rails-assets-jquery-ujs (1.2.2)
rails-assets-jquery (> 1.8)
rails-assets-trentrichardson--jQuery-Timepicker-Addon (1.6.3)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
rails-dom-testing (1.0.8)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
nokogiri (~> 1.6)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
Expand All @@ -476,7 +477,7 @@ GEM
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.15.0)
rake (11.3.0)
rake (10.5.0)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
Expand All @@ -490,7 +491,7 @@ GEM
redis-activesupport (5.0.1)
activesupport (>= 3, < 6)
redis-store (~> 1.2.0)
redis-namespace (1.5.2)
redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
redis-rack (1.6.0)
rack (~> 1.5)
Expand Down Expand Up @@ -540,14 +541,14 @@ GEM
rspec-mocks (~> 2.14.0)
rspec-rerun (0.3.1)
rspec
ruby-ole (1.2.12)
ruby-ole (1.2.12.1)
ruby-progressbar (1.7.5)
ruby2ruby (2.2.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
ruby_parser (3.7.2)
sexp_processor (~> 4.1)
rubyzip (1.2.0)
rubyzip (1.2.1)
safe_yaml (1.0.4)
sass (3.2.19)
sass-rails (4.0.5)
Expand All @@ -558,13 +559,13 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
selenium-webdriver (3.0.1)
selenium-webdriver (3.2.2)
childprocess (~> 0.5)
rubyzip (~> 1.0)
websocket (~> 1.0)
sexp_processor (4.6.0)
shellany (0.0.1)
sidekiq (4.2.9)
sidekiq (4.2.10)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
rack-protection (>= 1.5.0)
Expand Down Expand Up @@ -610,8 +611,8 @@ GEM
therubyracer (0.12.2)
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
thread_safe (0.3.5)
thor (0.19.4)
thread_safe (0.3.6)
tilt (1.4.1)
timecop (0.8.0)
tins (1.6.0)
Expand Down Expand Up @@ -650,7 +651,7 @@ GEM
activemodel (>= 4.2)
debug_inspector
railties (>= 4.2)
websocket (1.2.3)
websocket (1.2.4)
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
Expand Down Expand Up @@ -685,9 +686,9 @@ DEPENDENCIES
mysql2!
parallel_tests!
poltergeist!
protected_attributes!
pry!
rails (~> 4.2.1)!
rake (< 11.0)!
redcarpet!
rspec-instafail!
rspec-rails (= 2.14.1)!
Expand All @@ -711,4 +712,4 @@ RUBY VERSION
ruby 2.3.1p112

BUNDLED WITH
1.13.7
1.14.6
1 change: 1 addition & 0 deletions app/assets/images/your_platform/spinner.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions app/assets/javascripts/your_platform/datatables.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@ App.datatables = {
create: (selector, options)->
if $(selector).size() > 0
unless $.fn.dataTable.isDataTable(selector)
configuration = {}
$.extend configuration, App.datatables.common_configuration()
$.extend configuration, options
$(selector).dataTable(configuration)
App.datatables.adjust_css()
if $(selector).parents('.dataTables_wrapper').size() == 0
configuration = {}
$.extend configuration, App.datatables.common_configuration()
$.extend configuration, options
$(selector).dataTable(configuration)
App.datatables.adjust_css()
}

$(document).ready ->
Expand Down
5 changes: 5 additions & 0 deletions app/assets/javascripts/your_platform/resource_nav.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$(document).ready ->
current_tab = $('body').data('tab')

$('#resource_nav li').removeClass 'active'
$("#resource_nav li.#{current_tab}").addClass 'active'
15 changes: 15 additions & 0 deletions app/assets/javascripts/your_platform/turbolinks.js.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,18 @@
#
$(document).on 'turbolinks:before-cache', ->
$(".alert").remove()
App.spinner.hide()

App.spinner = {
hide: ->
$(".spinner").remove()
$(".hidden-by-spinner").removeClass('hidden-by-spinner')
show: (link)->
link.find('img, i, .glyphicon').addClass('hidden-by-spinner')
link.prepend('<span class="spinner"></span>')
}

$(document).on 'turbolinks:click', (event)->
button = $(event.target)
App.spinner.hide()
App.spinner.show(button)
Loading