diff --git a/Gemfile b/Gemfile index 12ef8d2..c9cd78b 100644 --- a/Gemfile +++ b/Gemfile @@ -7,6 +7,8 @@ ruby '2.3.1' gem 'nanoc' gem 'kramdown' gem 'coffee-script' +# Needed for relativize_urls +gem 'nokogiri' gem 'sass' group :development do diff --git a/Gemfile.lock b/Gemfile.lock index ba4381b..6305a42 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -35,12 +35,17 @@ GEM ruby_dep (~> 1.2) lumberjack (1.0.10) method_source (0.8.2) + mini_portile2 (2.1.0) nanoc (4.2.0) cri (~> 2.3) nenv (0.3.0) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) notiffany (0.1.0) nenv (~> 0.1) shellany (~> 0.0) + pkg-config (1.1.7) pry (0.10.3) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -64,6 +69,7 @@ DEPENDENCIES guard-nanoc kramdown nanoc + nokogiri sass RUBY VERSION diff --git a/Rules b/Rules index 44bcb03..3f62a26 100644 --- a/Rules +++ b/Rules @@ -1,14 +1,10 @@ #!/usr/bin/env ruby -# HTML -# compile '/**/*.html' do -# layout '/default.*' -# end - compile '/**/*.erb' do filter :erb - layout '/index.erb' - write "#{@item.identifier.without_ext}.html" + layout '/default.erb' + + filter :relativize_paths, type: :html end compile '/**/*.coffee' do @@ -24,13 +20,17 @@ end # Markdown compile '/**/*.md' do filter :kramdown + layout '/eventpost.erb' filter :erb - layout '/index.erb' + + layout '/default.erb' filter :erb + + filter :relativize_paths, type: :html end -route '/**/*.{html,md}' do +route '/**/*.{erb, html,md}' do "#{item.identifier.without_ext}/index.html" end diff --git a/content/cammie.coffee b/content/cammie.coffee new file mode 100644 index 0000000..3a64eec --- /dev/null +++ b/content/cammie.coffee @@ -0,0 +1,6 @@ +$('.ctrl').click -> + $.ajax "//kelder.zeus.ugent.be/webcam/cgi/ptdc.cgi", + data: + command: $(this).attr("command") + posX: $(this).attr("posX") + posY: $(this).attr("posY") diff --git a/content/cammie.erb b/content/cammie.erb new file mode 100644 index 0000000..fb7a974 --- /dev/null +++ b/content/cammie.erb @@ -0,0 +1,21 @@ +
+ +
+ +
+ +
+ +
+
+ +
+
+ + diff --git a/content/index.erb b/content/index.erb index 3c07db4..dec7927 100644 --- a/content/index.erb +++ b/content/index.erb @@ -19,7 +19,7 @@ diff --git a/content/stylesheet.scss b/content/stylesheet.scss index 018bb17..c59bdb8 100644 --- a/content/stylesheet.scss +++ b/content/stylesheet.scss @@ -2,6 +2,8 @@ $zeus_orange: #FF7F00; $event-padding: 10px; $navbar-border-color: #CCC; +$cammie-controls-color: rgba(0, 0, 0, 0.60); + @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700); html, button, input, select, textarea, @@ -9,6 +11,11 @@ html, button, input, select, textarea, font-family: 'Open Sans', sans-serif; } +html, body { + width: 100%; + height: 100%; +} + #container { height: 700px; margin-top: 35px; @@ -145,3 +152,58 @@ html, button, input, select, textarea, width: 100%; background-color: white; } + +#cammie { + width: 100%; +} +.fullpage { + min-width: 100%; + min-height: 100%; + display: flex; + flex-direction: column; + justify-content: center; + background-color: black; +} + +.ctrl { + background-color: $cammie-controls-color; + color: white; + position: absolute; + z-index: 100; + + // Chevron centering + display: flex; + justify-content: center; + align-items: center; + + &:hover { + background-color: $zeus_orange; + z-index: 200; + } +} + +#left { + height: 100%; + width: 100px; + top: 0; + left: 0; +} + +#right { + height: 100%; + width: 100px; + top: 0; + right: 0; +} + +#up { + height: 100px; + width: 100%; + top: 0; +} + +#down { + height: 100px; + width: 100%; + bottom: 0; +} diff --git a/layouts/default.erb b/layouts/default.erb index 67eeaa0..1a90939 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -2,21 +2,23 @@ - A Brand New Nanoc Site - <%= @item[:title] %> - - - - - - - - - - + + + Zeus WPI: Werkgroep Informatica van de Universiteit Gent + + + + + + + + + + + + <%= yield %> diff --git a/layouts/index.erb b/layouts/index.erb deleted file mode 100644 index 1a90939..0000000 --- a/layouts/index.erb +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - Zeus WPI: Werkgroep Informatica van de Universiteit Gent - - - - - - - - - - - - - - <%= yield %> - -