diff --git a/.directory b/.directory new file mode 100644 index 0000000..d1d4fb1 --- /dev/null +++ b/.directory @@ -0,0 +1,7 @@ +[Dolphin] +Timestamp=2015,3,17,13,30,24 +Version=3 +ViewMode=1 + +[Settings] +HiddenFilesShown=true diff --git a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc index 3f2b1cc..9b9135a 100755 --- a/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc +++ b/sites/all/modules/contrib/fields/video_embed_field/video_embed_field.field.inc @@ -153,7 +153,7 @@ function video_embed_field_field_presave($entity_type, $entity, $field, $instanc $items[$delta]['video_url'] = trim($item['video_url']); // Try to load thumbnail URL - $info = video_embed_field_thumbnail_url($item['video_url']); + $info = video_embed_field_thumbnail_url($item['video_url']); if (isset($info['url']) && $info['url']) { $thumb_url = $info['url']; $local_path = 'public://video_embed_field_thumbnails/' . $info['handler'] . '/' . $info['id'] . '.jpg'; diff --git a/sites/all/modules/gui/jeemod/jeemod.module b/sites/all/modules/gui/jeemod/jeemod.module index 93e0638..202b672 100644 --- a/sites/all/modules/gui/jeemod/jeemod.module +++ b/sites/all/modules/gui/jeemod/jeemod.module @@ -30,4 +30,71 @@ function jeemod_entity_info_alter(&$entity_info) { 'label' => t('chapter'), 'custom settings' => TRUE, ); -} \ No newline at end of file +} + + + + +/** + * Implements hook_video_embed_field_handlers_alter(). + */ +function jeemod_video_embed_field_handlers_alter(&$handlers) { + $handlers['vimeo']['function'] = 'jeemod_handle_vimeo'; +} + +/** + * Wrapper function to allow forcing API to be enabled for Vimeo videos. + */ +function jeemod_handle_vimeo($url, $settings) { + // dsm($settings, 'settings'); + // dsm($url, 'url'); + + $settings['api'] = 1; + + // $r = db_query("SELECT entity_id FROM {field_data_field_video} WHERE field_video_video_url = :url", array( + // ':url' => $url + // )); + + // foreach($r as $result){ + // $id = $result->entity_id; + // } + + // $id = + // $settings['player_id'] = "video".$id; + + // return video_embed_field_handle_vimeo($url, $settings); + // needed to rewrite the whole output here + // https://github.com/jrue/Vimeo-jQuery-API + + // Get ID of video from URL + $vid = _video_embed_field_get_vimeo_id($url); + if (!$vid) { + return array( + '#markup' => l($url, $url), + ); + } + + // Construct the embed code + $settings['portrait'] = 0; + + $width = $settings['width']; + $height = $settings['height']; + + unset($settings['width']); + unset($settings['height']); + unset($settings['color']); + unset($settings['portrait']); + unset($settings['title']); + unset($settings['byline']); + unset($settings['autoplay']); + unset($settings['loop']); + + $settings['player_id'] = "video-".uniqid(); + + $settings_str = _video_embed_code_get_settings_str($settings); + + return array( + '#markup' => '', + ); +} diff --git a/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc b/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc index 718ac35..31e6bd6 100644 Binary files a/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc and b/sites/all/themes/gui/jee/.sass-cache/06dcbe1fa5b03937e94c01bbbc1f20c6e165e878/jee.scssc differ diff --git a/sites/all/themes/gui/jee/assets/img/home-btn.svg b/sites/all/themes/gui/jee/assets/img/home-btn.svg new file mode 100644 index 0000000..022840d --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/home-btn.svg @@ -0,0 +1,62 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/logo-blured.png b/sites/all/themes/gui/jee/assets/img/logo-blured.png index 2f0bb84..a80f803 100644 Binary files a/sites/all/themes/gui/jee/assets/img/logo-blured.png and b/sites/all/themes/gui/jee/assets/img/logo-blured.png differ diff --git a/sites/all/themes/gui/jee/assets/img/logo-blured.svg b/sites/all/themes/gui/jee/assets/img/logo-blured.svg index 49f492a..ead06e4 100644 --- a/sites/all/themes/gui/jee/assets/img/logo-blured.svg +++ b/sites/all/themes/gui/jee/assets/img/logo-blured.svg @@ -18,7 +18,1337 @@ inkscape:version="0.91 r13725" sodipodi:docname="logo-blured.svg"> + id="defs12609"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -46,7 +1376,7 @@ image/svg+xml - + @@ -56,17 +1386,1624 @@ id="layer1" transform="translate(0,-742.36212)"> - + transform="translate(-324.16347,6242.3319)" + id="g34591" + style="opacity:0.605;filter:url(#filter6771)"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/logo.png b/sites/all/themes/gui/jee/assets/img/logo.png index 9470362..10f8fbc 100644 Binary files a/sites/all/themes/gui/jee/assets/img/logo.png and b/sites/all/themes/gui/jee/assets/img/logo.png differ diff --git a/sites/all/themes/gui/jee/assets/img/logo.svg b/sites/all/themes/gui/jee/assets/img/logo.svg index 1ccbfe0..82a0996 100644 --- a/sites/all/themes/gui/jee/assets/img/logo.svg +++ b/sites/all/themes/gui/jee/assets/img/logo.svg @@ -19,8 +19,11 @@ sodipodi:docname="logo.svg"> - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2950,7 +4269,7 @@ image/svg+xml - + @@ -2960,1707 +4279,1611 @@ id="layer1" transform="translate(0,-817.36216)"> + transform="translate(-364.1635,6278.3319)" + id="g34591"> + id="g34593"> + - + id="g34597"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g34599"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + id="g34683"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g34685"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + id="g35200"> + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-BC-blur.svg b/sites/all/themes/gui/jee/assets/img/title-BC-blur.svg new file mode 100644 index 0000000..500799c --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-BC-blur.svg @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-BC.png b/sites/all/themes/gui/jee/assets/img/title-BC.png new file mode 100644 index 0000000..bb686c4 Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-BC.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-BC.svg b/sites/all/themes/gui/jee/assets/img/title-BC.svg new file mode 100644 index 0000000..38f8e62 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-BC.svg @@ -0,0 +1,125 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-DPH-blur.svg b/sites/all/themes/gui/jee/assets/img/title-DPH-blur.svg new file mode 100644 index 0000000..1b6016b --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-DPH-blur.svg @@ -0,0 +1,215 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-DPH.png b/sites/all/themes/gui/jee/assets/img/title-DPH.png new file mode 100644 index 0000000..1932455 Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-DPH.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-DPH.svg b/sites/all/themes/gui/jee/assets/img/title-DPH.svg new file mode 100644 index 0000000..31d5ddf --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-DPH.svg @@ -0,0 +1,200 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-DUB-blur.svg b/sites/all/themes/gui/jee/assets/img/title-DUB-blur.svg new file mode 100644 index 0000000..f97e061 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-DUB-blur.svg @@ -0,0 +1,248 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-DUB.png b/sites/all/themes/gui/jee/assets/img/title-DUB.png new file mode 100644 index 0000000..5f3f20d Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-DUB.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-DUB.svg b/sites/all/themes/gui/jee/assets/img/title-DUB.svg new file mode 100644 index 0000000..6017071 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-DUB.svg @@ -0,0 +1,233 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-JUSO-blur.svg b/sites/all/themes/gui/jee/assets/img/title-JUSO-blur.svg new file mode 100644 index 0000000..744b9d6 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-JUSO-blur.svg @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-JUSO.png b/sites/all/themes/gui/jee/assets/img/title-JUSO.png new file mode 100644 index 0000000..f3b55e8 Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-JUSO.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-JUSO.svg b/sites/all/themes/gui/jee/assets/img/title-JUSO.svg new file mode 100644 index 0000000..7d5bf1a --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-JUSO.svg @@ -0,0 +1,140 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-OPP-blur.svg b/sites/all/themes/gui/jee/assets/img/title-OPP-blur.svg new file mode 100644 index 0000000..ea0c6f7 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-OPP-blur.svg @@ -0,0 +1,2006 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-OPP.png b/sites/all/themes/gui/jee/assets/img/title-OPP.png new file mode 100644 index 0000000..5230597 Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-OPP.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-OPP.svg b/sites/all/themes/gui/jee/assets/img/title-OPP.svg new file mode 100644 index 0000000..4c11a6e --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-OPP.svg @@ -0,0 +1,1992 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-SOL-blur.svg b/sites/all/themes/gui/jee/assets/img/title-SOL-blur.svg new file mode 100644 index 0000000..bf7bc75 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-SOL-blur.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-SOL.png b/sites/all/themes/gui/jee/assets/img/title-SOL.png new file mode 100644 index 0000000..14a55ee Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-SOL.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-SOL.svg b/sites/all/themes/gui/jee/assets/img/title-SOL.svg new file mode 100644 index 0000000..0b39c28 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-SOL.svg @@ -0,0 +1,119 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-SUB-blur.svg b/sites/all/themes/gui/jee/assets/img/title-SUB-blur.svg new file mode 100644 index 0000000..2197f92 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-SUB-blur.svg @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/assets/img/title-SUB.png b/sites/all/themes/gui/jee/assets/img/title-SUB.png new file mode 100644 index 0000000..30a6548 Binary files /dev/null and b/sites/all/themes/gui/jee/assets/img/title-SUB.png differ diff --git a/sites/all/themes/gui/jee/assets/img/title-SUB.svg b/sites/all/themes/gui/jee/assets/img/title-SUB.svg new file mode 100644 index 0000000..f1f29d9 --- /dev/null +++ b/sites/all/themes/gui/jee/assets/img/title-SUB.svg @@ -0,0 +1,126 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sites/all/themes/gui/jee/bower.json b/sites/all/themes/gui/jee/bower.json index 0382b5a..d3903b7 100644 --- a/sites/all/themes/gui/jee/bower.json +++ b/sites/all/themes/gui/jee/bower.json @@ -4,7 +4,8 @@ "foundation": "~5.5.0", "jquery.transit": "~0.9.12", "jquery.pep": "~0.6.3", - "Peppermint": "~1.3.7" + "Peppermint": "~1.3.7", + "vimeo-jquery-api": "~0.9.3" }, "version": "7.x-0.1", "authors": [ diff --git a/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/.bower.json b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/.bower.json new file mode 100644 index 0000000..43d3a10 --- /dev/null +++ b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/.bower.json @@ -0,0 +1,50 @@ +{ + "name": "vimeo-jquery-api", + "version": "0.9.3", + "homepage": "https://github.com/jrue/Vimeo-jQuery-API", + "authors": [ + "Jeremy Rue " + ], + "description": "A jQuery plugin to easily control Vimeo videos through their API.", + "main": [ + "dist/jquery.vimeo.api.js", + "dist/jquery.vimeo.api.min.js" + ], + "keywords": [ + "video", + "Vimeo", + "iframe", + "api", + "javascript", + "jquery-plugin" + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests", + "example.html", + "src", + "Gruntfile.js", + "LICENSE", + "package.json", + "vimeoapi.jquery.json", + "readme.md", + "bower.json" + ], + "dependencies": { + "jquery": ">=1.7" + }, + "_release": "0.9.3", + "_resolution": { + "type": "version", + "tag": "v0.9.3", + "commit": "3c6b2d6b367131f09227b447bb0d1e1976952d24" + }, + "_source": "git://github.com/jrue/Vimeo-jQuery-API.git", + "_target": "~0.9.3", + "_originalSource": "vimeo-jquery-api", + "_direct": true +} \ No newline at end of file diff --git a/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/bower.json b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/bower.json new file mode 100644 index 0000000..8e5f58c --- /dev/null +++ b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/bower.json @@ -0,0 +1,40 @@ +{ + "name": "vimeo-jquery-api", + "version": "0.9.2", + "homepage": "https://github.com/jrue/Vimeo-jQuery-API", + "authors": [ + "Jeremy Rue " + ], + "description": "A jQuery plugin to easily control Vimeo videos through their API.", + "main": [ + "dist/jquery.vimeo.api.js", + "dist/jquery.vimeo.api.min.js" + ], + "keywords": [ + "video", + "Vimeo", + "iframe", + "api", + "javascript", + "jquery-plugin" + ], + "license": "MIT", + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests", + "example.html", + "src", + "Gruntfile.js", + "LICENSE", + "package.json", + "vimeoapi.jquery.json", + "readme.md", + "bower.json" + ], + "dependencies": { + "jquery": ">=1.7" + } +} \ No newline at end of file diff --git a/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.js b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.js new file mode 100644 index 0000000..fe8cae2 --- /dev/null +++ b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.js @@ -0,0 +1,196 @@ +/**! + * Simple jQuery Vimeo API -- By Jeremy Rue + * + * Description: A jQuery plugin to easily control Vimeo videos through their API. + * Author: Jeremy Rue, jrue@berkeley.edu + * License: MIT + * Version: 0.9.3 + */ +;(function($, window) { + + var vimeoJqueryAPI = { + + //catches return messages when methods like getVolume are called. + //counter is if multiple calls are made before one returns. + catchMethods : {methodreturn:[], count:0}, + + //This kicks things off on window message event + init : function(d){ + + var vimeoVideo, + vimeoAPIurl, + data; + + //is this window message from vimeo? + if(!d.originalEvent.origin.match(/vimeo/g)) + return; + + //make sure data was sent + if(!("data" in d.originalEvent)) + return; + + //store data as JSON object + data = $.type(d.originalEvent.data) === "string" ? $.parseJSON(d.originalEvent.data) : d.originalEvent.data; + + //make sure data is not blank + if(!data) + return; + + //get the id of this vimeo video, hopefully they set it. If not, use first one we find + vimeoVideo = this.setPlayerID(data); + vimeoAPIurl = this.setVimeoAPIurl(vimeoVideo); + + //If this is an event message, like ready or paused + if(data.hasOwnProperty("event")) + this.handleEvent(data, vimeoVideo, vimeoAPIurl); + + //IF this is a return event message, like getVolume or getCurrentTime + if(data.hasOwnProperty("method")) + this.handleMethod(data, vimeoVideo, vimeoAPIurl); + + }, + + setPlayerID : function(d){ + + //if they set an player_id as a query string in the URL + if(d.hasOwnProperty("player_id")){ + if($("#" + d.player_id).length){ + return $("#" + d.player_id); + } else { + return $("iframe[src*=" + d.player_id + "]"); + } + } else { + + //No player_id. Use the first Vimeo video on the page, and hope they don't have multiples + return $("iframe[src*='vimeo']").eq(0); + } + + }, + + setVimeoAPIurl : function(d){ + + //prepend vimeo url with proper protocol + if(d.attr('src').substr(0, 4) !== 'http'){ + return window.location.protocol !== 'https:' ? 'http:'+d.attr('src').split('?')[0] : 'https:'+d.attr('src').split('?')[0]; + } else { + return d.attr('src').split('?')[0]; + } + }, + + handleMethod : function(d, vid, api){ + + //If the message is returned from a method call, store it for later. + this.catchMethods.methodreturn.push(d.value); + + }, + + handleEvent : function(d, vid, api){ + switch (d.event.toLowerCase()) { + case 'ready': + + //Go through all events attached to this element, and set an event listener + for(var prop in $._data(vid[0], "events")){ + if(prop.match(/loadProgress|playProgress|play|pause|finish|seek|cuechange/)){ + vid[0].contentWindow.postMessage(JSON.stringify({method: 'addEventListener', value: prop}), api); + } + } + + //if methods are sent before video is ready, call them now + if(vid.data("vimeoAPICall")){ + var vdata = vid.data("vimeoAPICall"); + for(var i=0; i< vdata.length; i++){ + vid[0].contentWindow.postMessage(JSON.stringify(vdata[i].message), vdata[i].api); + } + vid.removeData("vimeoAPICall"); + } + + //this video is ready + vid.data("vimeoReady", true); + vid.triggerHandler("ready"); + + break; + + case 'seek': + vid.triggerHandler("seek", [d.data]); + break; + + case 'loadprogress': + vid.triggerHandler("loadProgress", [d.data]); + break; + + case 'playprogress': + vid.triggerHandler("playProgress", [d.data]); + break; + + case 'pause': + vid.triggerHandler("pause"); + break; + + case 'finish': + vid.triggerHandler("finish"); + break; + + case 'play': + vid.triggerHandler("play"); + break; + + case 'cuechange': + vid.triggerHandler("cuechange"); + break; + } + } + }; + + $(window).on("message", function(e){ vimeoJqueryAPI.init(e); }); + + + /** + * Vimeo jQuery method plugin + * + * @param element {jQuery Object} The element this was called on (verifies it's an iframe) + * @param option1 {string} The method to send to vimeo. + * @param option2 {string|function} If a string, it's the value (i.e. setVolume 2) otherwise, it's a callback function + */ + $.vimeo = function(element, option1, option2) { + + var message = {}, + catchMethodLength = vimeoJqueryAPI.catchMethods.methodreturn.length; + + if(typeof option1 === "string") + message.method = option1; + + if(typeof option2 !== undefined && typeof option2 !== "function") + message.value = option2; + + //call method, but check if video was ready, otherwise cue it up with jQuery data to be called when video is ready + if(element.prop("tagName").toLowerCase() === 'iframe' && message.hasOwnProperty("method")){ + if(element.data("vimeoReady")){ + element[0].contentWindow.postMessage(JSON.stringify(message), vimeoJqueryAPI.setVimeoAPIurl(element)); + } else { + var _data = element.data("vimeoAPICall") ? element.data("vimeoAPICall") : []; + _data.push({message:message, api:vimeoJqueryAPI.setVimeoAPIurl(element)}); + element.data("vimeoAPICall", _data); + } + } + + //If this method will return data, (starts with "get") then use callback once return message comes through + if((option1.toString().substr(0, 3) === "get" || option1.toString() === "paused") && typeof option2 === "function"){ + (function(cml, func, i){ + var interval = window.setInterval(function(){ + + if(vimeoJqueryAPI.catchMethods.methodreturn.length != cml){ + window.clearInterval(interval); + func(vimeoJqueryAPI.catchMethods.methodreturn[i]); + } + }, 10); + })(catchMethodLength, option2, vimeoJqueryAPI.catchMethods.count); + vimeoJqueryAPI.catchMethods.count++; + } + return element; + }; + + $.fn.vimeo = function(option1, option2) { + return $.vimeo(this, option1, option2); + }; + +})(jQuery, window); \ No newline at end of file diff --git a/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.min.js b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.min.js new file mode 100644 index 0000000..f72912d --- /dev/null +++ b/sites/all/themes/gui/jee/bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.min.js @@ -0,0 +1,2 @@ +/*! vimeo-jquery-api 2015-03-09 */ +!function(a,b){var c={catchMethods:{methodreturn:[],count:0},init:function(b){var c,d,e;b.originalEvent.origin.match(/vimeo/g)&&"data"in b.originalEvent&&(e="string"===a.type(b.originalEvent.data)?a.parseJSON(b.originalEvent.data):b.originalEvent.data,e&&(c=this.setPlayerID(e),d=this.setVimeoAPIurl(c),e.hasOwnProperty("event")&&this.handleEvent(e,c,d),e.hasOwnProperty("method")&&this.handleMethod(e,c,d)))},setPlayerID:function(b){return b.hasOwnProperty("player_id")?a(a("#"+b.player_id).length?"#"+b.player_id:"iframe[src*="+b.player_id+"]"):a("iframe[src*='vimeo']").eq(0)},setVimeoAPIurl:function(a){return"http"!==a.attr("src").substr(0,4)?"https:"!==b.location.protocol?"http:"+a.attr("src").split("?")[0]:"https:"+a.attr("src").split("?")[0]:a.attr("src").split("?")[0]},handleMethod:function(a){this.catchMethods.methodreturn.push(a.value)},handleEvent:function(b,c,d){switch(b.event.toLowerCase()){case"ready":for(var e in a._data(c[0],"events"))e.match(/loadProgress|playProgress|play|pause|finish|seek|cuechange/)&&c[0].contentWindow.postMessage(JSON.stringify({method:"addEventListener",value:e}),d);if(c.data("vimeoAPICall")){for(var f=c.data("vimeoAPICall"),g=0;g .region, #main > .region > .block-system, #main > .region > .block-system > .content { position: relative; width: 100%; height: 100%; overflow: hidden; } -/* line 190, jee.scss */ +/* line 189, jee.scss */ #main #node-2.node-teaser::after { background: transparent url("../assets/img/bgd-sol.png") no-repeat center center; background: none, url("../assets/img/bgd-sol.svg") no-repeat center center; } -/* line 191, jee.scss */ +/* line 190, jee.scss */ #main #node-2.node-teaser, #main #node-2.node-teaser a { color: #b24c14; } @@ -4002,147 +4002,196 @@ div.messages { color: #d85509; } /* line 193, jee.scss */ +#main #node-2.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-SOL.png") no-repeat center center; + background: none, url("../assets/img/title-SOL.svg") no-repeat center center; + width: 170px; + height: 35px; +} +/* line 195, jee.scss */ #main #node-2.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-sol.png") no-repeat center center; background: none, url("../assets/img/shadow-sol.svg") no-repeat center center; } -/* line 194, jee.scss */ +/* line 196, jee.scss */ #main #node-2.node-teaser .line { background-color: #ea5b0c; } -/* line 200, jee.scss */ +/* line 202, jee.scss */ #main #node-3.node-teaser::after { background: transparent url("../assets/img/bgd-dph.png") no-repeat center center; background: none, url("../assets/img/bgd-dph.svg") no-repeat center center; } -/* line 201, jee.scss */ +/* line 203, jee.scss */ #main #node-3.node-teaser, #main #node-3.node-teaser a { color: #686b00; } -/* line 202, jee.scss */ +/* line 205, jee.scss */ #main #node-3.node-teaser h2.node-title, #main #node-3.node-teaser h2.node-title a { color: #afaf00; } -/* line 203, jee.scss */ +/* line 206, jee.scss */ +#main #node-3.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-DPH.png") no-repeat center center; + background: none, url("../assets/img/title-DPH.svg") no-repeat center center; + width: 180px; + height: 80px; +} +/* line 208, jee.scss */ #main #node-3.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-dph.png") no-repeat center center; background: none, url("../assets/img/shadow-dph.svg") no-repeat center center; } -/* line 204, jee.scss */ +/* line 209, jee.scss */ #main #node-3.node-teaser .line { background-color: #cecd00; } -/* line 210, jee.scss */ +/* line 215, jee.scss */ #main #node-4.node-teaser::after { background: transparent url("../assets/img/bgd-sub.png") no-repeat center center; background: none, url("../assets/img/bgd-sub.svg") no-repeat center center; } -/* line 211, jee.scss */ +/* line 216, jee.scss */ #main #node-4.node-teaser, #main #node-4.node-teaser a { color: #b71330; } -/* line 212, jee.scss */ +/* line 218, jee.scss */ #main #node-4.node-teaser h2.node-title, #main #node-4.node-teaser h2.node-title a { color: #cd0734; } -/* line 213, jee.scss */ +/* line 219, jee.scss */ +#main #node-4.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-SUB.png") no-repeat center center; + background: none, url("../assets/img/title-SUB.svg") no-repeat center center; + width: 200px; + height: 35px; +} +/* line 221, jee.scss */ #main #node-4.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-sub.png") no-repeat center center; background: none, url("../assets/img/shadow-sub.svg") no-repeat center center; } -/* line 214, jee.scss */ +/* line 222, jee.scss */ #main #node-4.node-teaser .line { background-color: #de003a; } -/* line 220, jee.scss */ +/* line 228, jee.scss */ #main #node-5.node-teaser::after { background: transparent url("../assets/img/bgd-bc.png") no-repeat center center; background: none, url("../assets/img/bgd-bc.svg") no-repeat center center; } -/* line 221, jee.scss */ +/* line 229, jee.scss */ #main #node-5.node-teaser, #main #node-5.node-teaser a { color: #033d6f; } -/* line 222, jee.scss */ +/* line 231, jee.scss */ #main #node-5.node-teaser h2.node-title, #main #node-5.node-teaser h2.node-title a { color: #024b87; } -/* line 223, jee.scss */ +/* line 232, jee.scss */ +#main #node-5.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-BC.png") no-repeat center center; + background: none, url("../assets/img/title-BC.svg") no-repeat center center; + width: 120px; + height: 45px; +} +/* line 234, jee.scss */ #main #node-5.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-bc.png") no-repeat center center; background: none, url("../assets/img/shadow-bc.svg") no-repeat center center; } -/* line 224, jee.scss */ +/* line 235, jee.scss */ #main #node-5.node-teaser .line { background-color: #0066b1; } -/* line 230, jee.scss */ +/* line 241, jee.scss */ #main #node-6.node-teaser::after { background: transparent url("../assets/img/bgd-opp.png") no-repeat center center; background: none, url("../assets/img/bgd-opp.svg") no-repeat center center; } -/* line 231, jee.scss */ +/* line 242, jee.scss */ #main #node-6.node-teaser, #main #node-6.node-teaser a { color: #7f1965; } -/* line 232, jee.scss */ +/* line 244, jee.scss */ #main #node-6.node-teaser h2.node-title, #main #node-6.node-teaser h2.node-title a { color: #941b80; } -/* line 233, jee.scss */ +/* line 245, jee.scss */ +#main #node-6.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-OPP.png") no-repeat center center; + background: none, url("../assets/img/title-OPP.svg") no-repeat center center; + width: 245px; + height: 95px; +} +/* line 247, jee.scss */ #main #node-6.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-opp.png") no-repeat center center; background: none, url("../assets/img/shadow-opp.svg") no-repeat center center; } -/* line 234, jee.scss */ +/* line 248, jee.scss */ #main #node-6.node-teaser .line { background-color: #af1380; } -/* line 240, jee.scss */ +/* line 254, jee.scss */ #main #node-7.node-teaser::after { background: transparent url("../assets/img/bgd-dub.png") no-repeat center center; background: none, url("../assets/img/bgd-dub.svg") no-repeat center center; } -/* line 241, jee.scss */ +/* line 255, jee.scss */ #main #node-7.node-teaser, #main #node-7.node-teaser a { color: #22742c; } -/* line 242, jee.scss */ +/* line 257, jee.scss */ #main #node-7.node-teaser h2.node-title, #main #node-7.node-teaser h2.node-title a { color: #288d80; } -/* line 243, jee.scss */ +/* line 258, jee.scss */ +#main #node-7.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-DUB.png") no-repeat center center; + background: none, url("../assets/img/title-DUB.svg") no-repeat center center; + width: 195px; + height: 65px; +} +/* line 260, jee.scss */ #main #node-7.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-dub.png") no-repeat center center; background: none, url("../assets/img/shadow-dub.svg") no-repeat center center; } -/* line 244, jee.scss */ +/* line 261, jee.scss */ #main #node-7.node-teaser .line { background-color: #62a530; } -/* line 250, jee.scss */ +/* line 267, jee.scss */ #main #node-8.node-teaser::after { background: transparent url("../assets/img/bgd-juso.png") no-repeat center center; background: none, url("../assets/img/bgd-juso.svg") no-repeat center center; } -/* line 251, jee.scss */ +/* line 268, jee.scss */ #main #node-8.node-teaser, #main #node-8.node-teaser a { color: #0b7f8a; } -/* line 252, jee.scss */ +/* line 270, jee.scss */ #main #node-8.node-teaser h2.node-title, #main #node-8.node-teaser h2.node-title a { color: #009aa8; } -/* line 253, jee.scss */ +/* line 271, jee.scss */ +#main #node-8.node-teaser h2.node-title a { + background: transparent url("../assets/img/title-JUSO.png") no-repeat center center; + background: none, url("../assets/img/title-JUSO.svg") no-repeat center center; + width: 200px; + height: 65px; +} +/* line 273, jee.scss */ #main #node-8.node-teaser .field-name-field-vignette { background: transparent url("../assets/img/shadow-juso.png") no-repeat center center; background: none, url("../assets/img/shadow-juso.svg") no-repeat center center; } -/* line 254, jee.scss */ +/* line 274, jee.scss */ #main #node-8.node-teaser .line { background-color: #33b4b5; } -/* line 265, jee.scss */ +/* line 285, jee.scss */ #main .node-chapitre.node-teaser { z-index: 2; position: absolute; @@ -4194,8 +4243,8 @@ div.messages { |_| /_/ */ } -/* line 288, jee.scss */ -#main .node-chapitre.node-teaser h2.node-title { +/* line 308, jee.scss */ +#main .node-chapitre.node-teaser h2.node-title a { -webkit-transform: none; -ms-transform: none; transform: none; @@ -4208,11 +4257,11 @@ div.messages { transition-property: transform; z-index: 5; } -/* line 295, jee.scss */ +/* line 315, jee.scss */ #main .node-chapitre.node-teaser > .content { position: relative; } -/* line 296, jee.scss */ +/* line 316, jee.scss */ #main .node-chapitre.node-teaser .texts { opacity: 0; height: 1px; @@ -4223,7 +4272,7 @@ div.messages { transition-property: opacity height; position: absolute; } -/* line 302, jee.scss */ +/* line 322, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-partie { opacity: 0; position: absolute; @@ -4232,12 +4281,12 @@ div.messages { -webkit-transition-property: opacity -webkit-transform; transition-property: opacity transform; } -/* line 308, jee.scss */ +/* line 328, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-partie:nth-child(2) { z-index: 2; opacity: 1; } -/* line 312, jee.scss */ +/* line 332, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-partie:nth-child(2) > .field-type-text { opacity: 0; -webkit-transition: 1s ease-out 0.9s; @@ -4245,12 +4294,19 @@ div.messages { -webkit-transition-property: opacity; transition-property: opacity; } -/* line 317, jee.scss */ +/* line 337, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-partie:nth-child(2) > .field-name-field-vignette { cursor: pointer; z-index: 2; + -webkit-transform: scale(0.5); + -ms-transform: scale(0.5); + transform: scale(0.5); + -webkit-transition: 1s ease-out; + transition: 1s ease-out; + -webkit-transition-property: -webkit-transform; + transition-property: transform; } -/* line 320, jee.scss */ +/* line 344, jee.scss */ #main .node-chapitre.node-teaser:after { opacity: 0; -webkit-transition: 2s ease-in; @@ -4262,11 +4318,11 @@ div.messages { bottom: 2px; right: 2px; } -/* line 338, jee.scss */ +/* line 362, jee.scss */ #main .node-chapitre.node-teaser.previewed { z-index: 100; } -/* line 340, jee.scss */ +/* line 364, jee.scss */ #main .node-chapitre.node-teaser.previewed:after { opacity: 1; top: 2em; @@ -4274,44 +4330,50 @@ div.messages { right: -12em; bottom: -30em; } -/* line 347, jee.scss */ -#main .node-chapitre.node-teaser.previewed h2.node-title { +/* line 371, jee.scss */ +#main .node-chapitre.node-teaser.previewed h2.node-title a { -webkit-transform: scale(2, 2); -ms-transform: scale(2, 2); transform: scale(2, 2); } -/* line 348, jee.scss */ +/* line 372, jee.scss */ #main .node-chapitre.node-teaser.previewed .texts { opacity: 1; height: 8em; } -/* line 349, jee.scss */ +/* line 373, jee.scss */ #main .node-chapitre.node-teaser.previewed .field-name-field-partie { opacity: 1; z-index: 0; } -/* line 352, jee.scss */ +/* line 376, jee.scss */ #main .node-chapitre.node-teaser.previewed .field-name-field-partie > .field { opacity: 1; z-index: -1; cursor: default; } -/* line 362, jee.scss */ +/* line 378, jee.scss */ +#main .node-chapitre.node-teaser.previewed .field-name-field-partie:nth-child(2) > .field-name-field-vignette { + -webkit-transform: scale(1.3); + -ms-transform: scale(1.3); + transform: scale(1.3); +} +/* line 392, jee.scss */ #main .node-chapitre.node-teaser.mitigated { opacity: 0.3; } -/* line 373, jee.scss */ +/* line 403, jee.scss */ .chapter-displayed #main .node-chapitre.node-teaser { opacity: 0.1; } -/* line 385, jee.scss */ +/* line 415, jee.scss */ #main .node-chapitre.node-teaser:after { content: " "; background-size: contain !important; position: absolute; z-index: -1; } -/* line 392, jee.scss */ +/* line 422, jee.scss */ #main .node-chapitre.node-teaser h2.node-title { font-family: "epflulb"; font-weight: normal; @@ -4322,30 +4384,36 @@ div.messages { z-index: 5; } @media only screen and (min-width: 64.063em) { - /* line 392, jee.scss */ + /* line 422, jee.scss */ #main .node-chapitre.node-teaser h2.node-title { font-size: 1.3em; } } @media only screen and (min-width: 90.063em) { - /* line 392, jee.scss */ + /* line 422, jee.scss */ #main .node-chapitre.node-teaser h2.node-title { font-size: 1.8em; } } -/* line 412, jee.scss */ +/* line 436, jee.scss */ +#main .node-chapitre.node-teaser h2.node-title a { + display: block; + text-indent: -1000px; + overflow: hidden; +} +/* line 447, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-comprendre { min-width: 16em; } -/* line 413, jee.scss */ +/* line 448, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-comprendre h1, #main .node-chapitre.node-teaser .field-name-field-comprendre h2, #main .node-chapitre.node-teaser .field-name-field-comprendre h3, #main .node-chapitre.node-teaser .field-name-field-comprendre h4, #main .node-chapitre.node-teaser .field-name-field-comprendre h5, #main .node-chapitre.node-teaser .field-name-field-comprendre h6 { display: none !important; } -/* line 415, jee.scss */ +/* line 450, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-comprendre p { margin: 0; } -/* line 419, jee.scss */ +/* line 454, jee.scss */ #main .node-chapitre.node-teaser ul.links { display: block; margin: 0; @@ -4354,11 +4422,11 @@ div.messages { position: relative; width: 100%; } -/* line 421, jee.scss */ +/* line 456, jee.scss */ #main .node-chapitre.node-teaser ul.links li.node-readmore { padding: 0; } -/* line 423, jee.scss */ +/* line 458, jee.scss */ #main .node-chapitre.node-teaser ul.links li.node-readmore a { display: inline-block; height: 25px; @@ -4370,12 +4438,12 @@ div.messages { background: transparent url("../assets/img/readmore-btn.png") no-repeat right center; background: none, url("../assets/img/readmore-btn.svg") no-repeat right center; } -/* line 436, jee.scss */ +/* line 471, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-partie { clear: both; padding-top: 1em; } -/* line 440, jee.scss */ +/* line 475, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-vignette { position: relative; float: left; @@ -4386,28 +4454,28 @@ div.messages { margin-left: 0; background-size: contain; } -/* line 453, jee.scss */ +/* line 487, jee.scss */ #main .node-chapitre.node-teaser .field-type-text { min-width: 16em; } -/* line 454, jee.scss */ +/* line 488, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-titre { font-family: "epflul"; font-size: 1.6em; line-height: 1.1; } -/* line 459, jee.scss */ +/* line 493, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-sous-titre { font-family: "epflul"; font-size: 1.4em; line-height: 1.2; } -/* line 464, jee.scss */ +/* line 498, jee.scss */ #main .node-chapitre.node-teaser .field-name-field-description { font-size: 0.88em; line-height: 1.2; } -/* line 470, jee.scss */ +/* line 504, jee.scss */ #main .node-chapitre.node-teaser .line { z-index: -1; position: absolute; @@ -4419,7 +4487,7 @@ div.messages { width: 2px; opacity: 0.4; } -/* line 489, jee.scss */ +/* line 523, jee.scss */ #main #chapter-wrapper { position: absolute; top: 0; @@ -4432,11 +4500,6 @@ div.messages { transition: 2s ease-out; -webkit-transition-property: opacity; transition-property: opacity; -} -/* line 498, jee.scss */ -#main #chapter-wrapper.visible { - opacity: 1; - z-index: 500; /* _____ _____ __ _____ _____ _____ _____ __ __ _____ _____ ____ _____ | | | | | | __ | __| | __ | | | | | | | \| __| @@ -4451,110 +4514,207 @@ div.messages { |__| */ } -/* line 509, jee.scss */ -#main #chapter-wrapper.visible #node-2 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-2 h2.node-title, -#main #chapter-wrapper.visible #node-2 .field-name-field-dbatre li:before { - color: #ea5b0c; -} -/* line 516, jee.scss */ -#main #chapter-wrapper.visible #node-3 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-3 h2.node-title, -#main #chapter-wrapper.visible #node-3 .field-name-field-dbatre li:before { - color: #cecd00; -} -/* line 523, jee.scss */ -#main #chapter-wrapper.visible #node-4 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-4 h2.node-title, -#main #chapter-wrapper.visible #node-4 .field-name-field-dbatre li:before { - color: #de003a; -} -/* line 530, jee.scss */ -#main #chapter-wrapper.visible #node-5 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-5 h2.node-title, -#main #chapter-wrapper.visible #node-5 .field-name-field-dbatre li:before { - color: #0066b1; +/* line 532, jee.scss */ +#main #chapter-wrapper.visible { + opacity: 1; + z-index: 500; } /* line 537, jee.scss */ -#main #chapter-wrapper.visible #node-6 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-6 h2.node-title, -#main #chapter-wrapper.visible #node-6 .field-name-field-dbatre li:before { +#main #chapter-wrapper #home-btn { + background: transparent url("../assets/img/home-btn.png") no-repeat center center; + background: none, url("../assets/img/home-btn.svg") no-repeat center center; + position: absolute; + z-index: 100; + top: 20px; + left: 20px; + width: 25px; + height: 20px; + cursor: pointer; +} +/* line 552, jee.scss */ +#main #chapter-wrapper #node-2 { + background: transparent url("../assets/img/bgd-sol.png") no-repeat center center; + background: none, url("../assets/img/bgd-sol.svg") no-repeat center center; +} +/* line 554, jee.scss */ +#main #chapter-wrapper #node-2 .field-type-text-long .field-label, +#main #chapter-wrapper #node-2 h2.node-title, +#main #chapter-wrapper #node-2 .field-name-field-dbatre li:before { + color: #ea5b0c; +} +/* line 559, jee.scss */ +#main #chapter-wrapper #node-2 h2.node-title { + background: transparent url("../assets/img/title-SOL-blur.png") no-repeat center center; + background: none, url("../assets/img/title-SOL-blur.svg") no-repeat center center; +} +/* line 562, jee.scss */ +#main #chapter-wrapper #node-3 { + background: transparent url("../assets/img/bgd-dph.png") no-repeat center center; + background: none, url("../assets/img/bgd-dph.svg") no-repeat center center; +} +/* line 564, jee.scss */ +#main #chapter-wrapper #node-3 .field-type-text-long .field-label, +#main #chapter-wrapper #node-3 h2.node-title, +#main #chapter-wrapper #node-3 .field-name-field-dbatre li:before { + color: #cecd00; +} +/* line 569, jee.scss */ +#main #chapter-wrapper #node-3 h2.node-title { + background: transparent url("../assets/img/title-DPH-blur.png") no-repeat center center; + background: none, url("../assets/img/title-DPH-blur.svg") no-repeat center center; +} +/* line 572, jee.scss */ +#main #chapter-wrapper #node-4 { + background: transparent url("../assets/img/bgd-sub.png") no-repeat center center; + background: none, url("../assets/img/bgd-sub.svg") no-repeat center center; +} +/* line 574, jee.scss */ +#main #chapter-wrapper #node-4 .field-type-text-long .field-label, +#main #chapter-wrapper #node-4 h2.node-title, +#main #chapter-wrapper #node-4 .field-name-field-dbatre li:before { + color: #de003a; +} +/* line 579, jee.scss */ +#main #chapter-wrapper #node-4 h2.node-title { + background: transparent url("../assets/img/title-SUB-blur.png") no-repeat center center; + background: none, url("../assets/img/title-SUB-blur.svg") no-repeat center center; +} +/* line 582, jee.scss */ +#main #chapter-wrapper #node-5 { + background: transparent url("../assets/img/bgd-bc.png") no-repeat center center; + background: none, url("../assets/img/bgd-bc.svg") no-repeat center center; +} +/* line 584, jee.scss */ +#main #chapter-wrapper #node-5 .field-type-text-long .field-label, +#main #chapter-wrapper #node-5 h2.node-title, +#main #chapter-wrapper #node-5 .field-name-field-dbatre li:before { + color: #0066b1; +} +/* line 589, jee.scss */ +#main #chapter-wrapper #node-5 h2.node-title { + background: transparent url("../assets/img/title-BC-blur.png") no-repeat center center; + background: none, url("../assets/img/title-BC-blur.svg") no-repeat center center; +} +/* line 592, jee.scss */ +#main #chapter-wrapper #node-6 { + background: transparent url("../assets/img/bgd-opp.png") no-repeat center center; + background: none, url("../assets/img/bgd-opp.svg") no-repeat center center; +} +/* line 594, jee.scss */ +#main #chapter-wrapper #node-6 .field-type-text-long .field-label, +#main #chapter-wrapper #node-6 h2.node-title, +#main #chapter-wrapper #node-6 .field-name-field-dbatre li:before { color: #af1380; } -/* line 544, jee.scss */ -#main #chapter-wrapper.visible #node-7 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-7 h2.node-title, -#main #chapter-wrapper.visible #node-7 .field-name-field-dbatre li:before { +/* line 599, jee.scss */ +#main #chapter-wrapper #node-6 h2.node-title { + background: transparent url("../assets/img/title-OPP-blur.png") no-repeat center center; + background: none, url("../assets/img/title-OPP-blur.svg") no-repeat center center; +} +/* line 602, jee.scss */ +#main #chapter-wrapper #node-7 { + background: transparent url("../assets/img/bgd-bub.png") no-repeat center center; + background: none, url("../assets/img/bgd-bub.svg") no-repeat center center; +} +/* line 604, jee.scss */ +#main #chapter-wrapper #node-7 .field-type-text-long .field-label, +#main #chapter-wrapper #node-7 h2.node-title, +#main #chapter-wrapper #node-7 .field-name-field-dbatre li:before { color: #62a530; } -/* line 551, jee.scss */ -#main #chapter-wrapper.visible #node-8 .field-type-text-long .field-label, -#main #chapter-wrapper.visible #node-8 h2.node-title, -#main #chapter-wrapper.visible #node-8 .field-name-field-dbatre li:before { +/* line 609, jee.scss */ +#main #chapter-wrapper #node-7 h2.node-title { + background: transparent url("../assets/img/title-DUB-blur.png") no-repeat center center; + background: none, url("../assets/img/title-DUB-blur.svg") no-repeat center center; +} +/* line 612, jee.scss */ +#main #chapter-wrapper #node-8 { + background: transparent url("../assets/img/bgd-juso.png") no-repeat center center; + background: none, url("../assets/img/bgd-juso.svg") no-repeat center center; +} +/* line 614, jee.scss */ +#main #chapter-wrapper #node-8 .field-type-text-long .field-label, +#main #chapter-wrapper #node-8 h2.node-title, +#main #chapter-wrapper #node-8 .field-name-field-dbatre li:before { color: #33b4b5; } -/* line 567, jee.scss */ +/* line 619, jee.scss */ +#main #chapter-wrapper #node-8 h2.node-title { + background: transparent url("../assets/img/title-JUSO-blur.png") no-repeat center center; + background: none, url("../assets/img/title-JUSO-blur.svg") no-repeat center center; +} +/* line 630, jee.scss */ #main #chapter-wrapper .node { position: relative; height: 100%; width: 100%; } -/* line 570, jee.scss */ +/* line 633, jee.scss */ #main #chapter-wrapper .node a { color: inherit; } -/* line 573, jee.scss */ +/* line 636, jee.scss */ #main #chapter-wrapper .node-title { font-family: "epflulb"; font-weight: normal; text-transform: uppercase; text-align: center; - max-width: 8.5em; line-height: 0.85; font-size: 2.268em; + position: absolute; + display: block; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-size: contain !important; + text-indent: -5000px; + z-index: -1; + opacity: 0.4; } -/* line 583, jee.scss */ +/* line 652, jee.scss */ #main #chapter-wrapper .node > .field { position: absolute; } -/* line 587, jee.scss */ +/* line 656, jee.scss */ #main #chapter-wrapper .field-type-text-long { background-color: rgba(255, 255, 255, 0.9); width: 23em; padding: 1em; z-index: 10; + cursor: move; } -/* line 592, jee.scss */ +/* line 661, jee.scss */ #main #chapter-wrapper .field-type-text-long .field-label { text-transform: uppercase; font-family: "epflulb"; font-size: 1.5em; } -/* line 598, jee.scss */ +/* line 667, jee.scss */ #main #chapter-wrapper .field-type-text-long h2 { font-size: 0.88em; } -/* line 601, jee.scss */ +/* line 670, jee.scss */ #main #chapter-wrapper .field-type-text-long p { font-size: 0.88em; margin-bottom: 0.5em; } -/* line 606, jee.scss */ +/* line 675, jee.scss */ #main #chapter-wrapper .field-name-field-dbatre { left: 60em; } -/* line 608, jee.scss */ +/* line 677, jee.scss */ #main #chapter-wrapper .field-name-field-dbatre ul { margin-left: 1em; } -/* line 610, jee.scss */ +/* line 679, jee.scss */ #main #chapter-wrapper .field-name-field-dbatre ul li { list-style: none; line-height: 1; margin-bottom: 1em; position: relative; } -/* line 615, jee.scss */ +/* line 684, jee.scss */ #main #chapter-wrapper .field-name-field-dbatre ul li:before { content: "?"; position: absolute; @@ -4562,14 +4722,14 @@ div.messages { left: -1em; font-family: "epflul"; } -/* line 626, jee.scss */ +/* line 695, jee.scss */ #main #chapter-wrapper .field-name-field-partie { height: 60%; width: 100%; top: 20%; left: 0; } -/* line 629, jee.scss */ +/* line 698, jee.scss */ #main #chapter-wrapper .field-name-field-partie .field-items { position: relative; top: 0; @@ -4577,12 +4737,12 @@ div.messages { height: 100%; width: auto; } -/* line 634, jee.scss */ +/* line 703, jee.scss */ #main #chapter-wrapper .field-name-field-partie .field-items .field { position: relative; display: inline-block; } -/* line 637, jee.scss */ +/* line 706, jee.scss */ #main #chapter-wrapper .field-name-field-partie .field-items .field .mask { position: absolute; width: 100%; @@ -4590,6 +4750,7 @@ div.messages { top: 0; left: 0; z-index: 10; + cursor: move; } /* __________ ____ ________________ @@ -4598,13 +4759,13 @@ div.messages { / __/ / /_/ / /_/ / / / / /___/ _, _/ /_/ \____/\____/ /_/ /_____/_/ |_| */ -/* line 656, jee.scss */ +/* line 727, jee.scss */ #footer { position: fixed; bottom: 0; right: 0; } -/* line 659, jee.scss */ +/* line 730, jee.scss */ #footer .block { display: inline-block; vertical-align: top; @@ -4617,15 +4778,15 @@ div.messages { / / / // / ___/ / /___ /_/ /_/___//____/\____/ */ -/* line 671, jee.scss */ +/* line 742, jee.scss */ #fullscreen-btn { position: fixed; - top: 20px; + bottom: 20px; left: 20px; z-index: 1000; } -/* line 685, jee.scss */ +/* line 756, jee.scss */ .bubble-1 { position: absolute; z-index: 0; @@ -4638,7 +4799,7 @@ div.messages { left: -200px; } -/* line 689, jee.scss */ +/* line 760, jee.scss */ .bubble-2 { position: absolute; z-index: 0; @@ -4651,7 +4812,7 @@ div.messages { right: -400px; } -/* line 694, jee.scss */ +/* line 765, jee.scss */ .star { position: absolute; z-index: 0; @@ -4669,7 +4830,7 @@ div.messages { / /_/ / /___/ /_/ / /_/ / /_/ / /_____/_____/_____/\____/\____/ */ -/* line 708, jee.scss */ +/* line 779, jee.scss */ #fps { position: fixed; top: 20px; @@ -4677,7 +4838,7 @@ div.messages { z-index: 1000; } -/* line 714, jee.scss */ +/* line 785, jee.scss */ #nav-cursor { position: absolute; width: 6px; diff --git a/sites/all/themes/gui/jee/css/jee.scss b/sites/all/themes/gui/jee/css/jee.scss index be6acfd..972e776 100755 --- a/sites/all/themes/gui/jee/css/jee.scss +++ b/sites/all/themes/gui/jee/css/jee.scss @@ -80,7 +80,6 @@ body{ background-image: -webkit-linear-gradient(top, #FFFDE9 0%, #BECFD9 100%); /* W3C Markup, IE10 Release Preview */ background-image: linear-gradient(to bottom, #FFFDE9 0%, #BECFD9 100%); - } @keyframes introLogo{ @@ -189,7 +188,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-sol');} &, a{color:$SOL-col-txt;} - h2.node-title{&,a{color:$SOL-color;}} + h2.node-title{ + &,a{color:$SOL-color;} + a{@include bg-svg-png('title-SOL'); width:170px; height:35px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-sol');} .line{background-color:$SOL-col-active;} } @@ -199,7 +201,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-dph');} &, a{color:$DPH-col-txt;} - h2.node-title{&,a{color:$DPH-color;}} + h2.node-title{ + &,a{color:$DPH-color;} + a{@include bg-svg-png('title-DPH'); width:180px; height:80px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-dph');} .line{background-color:$DPH-col-active;} } @@ -209,7 +214,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-sub');} &, a{color:$SUB-col-txt;} - h2.node-title{&,a{color:$SUB-color;}} + h2.node-title{ + &,a{color:$SUB-color;} + a{@include bg-svg-png('title-SUB'); width:200px; height:35px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-sub');} .line{background-color:$SUB-col-active;} } @@ -219,7 +227,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-bc');} &, a{color:$BC-col-txt;} - h2.node-title{&,a{color:$BC-color;}} + h2.node-title{ + &,a{color:$BC-color;} + a{@include bg-svg-png('title-BC'); width:120px; height:45px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-bc');} .line{background-color:$BC-col-active;} } @@ -229,7 +240,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-opp');} &, a{color:$OPP-col-txt;} - h2.node-title{&,a{color:$OPP-color;}} + h2.node-title{ + &,a{color:$OPP-color;} + a{@include bg-svg-png('title-OPP'); width:245px; height:95px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-opp');} .line{background-color:$OPP-col-active;} } @@ -239,7 +253,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-dub');} &, a{color:$DUB-col-txt;} - h2.node-title{&,a{color:$DUB-color;}} + h2.node-title{ + &,a{color:$DUB-color;} + a{@include bg-svg-png('title-DUB'); width:195px; height:65px;} + } .field-name-field-vignette{@include bg-svg-png('shadow-dub');} .line{background-color:$DUB-col-active;} } @@ -249,7 +266,10 @@ div.messages{ &.node-teaser{ &::after{ @include bg-svg-png('bgd-juso');} &, a{color:$JUSO-col-txt;} - h2.node-title{&,a{color:$JUSO-color;}} + h2.node-title{ + &,a{color:$JUSO-color;} + a{@include bg-svg-png('title-JUSO'); width:200px; height:65px; } + } .field-name-field-vignette{@include bg-svg-png('shadow-juso');} .line{background-color:$JUSO-col-active;} } @@ -285,7 +305,7 @@ div.messages{ transition:1s ease-out; transition-property:opacity; - h2.node-title{ + h2.node-title a{ transform:none; transform-origin:bottom center; transition:1s ease-out; @@ -314,7 +334,11 @@ div.messages{ transition:1s ease-out 0.9s; transition-property: opacity; } - >.field-name-field-vignette{cursor:pointer;z-index:2;} + >.field-name-field-vignette{ + cursor:pointer;z-index:2; + transform:scale(0.5); + transition:1s ease-out; transition-property:transform; + } } } &:after{ @@ -344,12 +368,18 @@ div.messages{ left:$pad*6; right:$pad*6; bottom:$pad*15; } - h2.node-title{transform:scale(2,2);} + h2.node-title a{transform:scale(2,2);} .texts{opacity:1; height:8em;} .field-name-field-partie{ opacity:1; z-index:0; // display all fields inside each parties >.field{opacity:1; z-index:-1; cursor:default;} + &:nth-child(2){ + >.field-name-field-vignette{ + transform:scale(1.3); + // transition:1s ease-out 0.5s; transition-property:transform; + } + } } } @@ -403,6 +433,11 @@ div.messages{ font-size:1.8em; } z-index: 5; + a{ + display:block; + text-indent: -1000px; + overflow:hidden; + } } .texts{ @@ -440,7 +475,6 @@ div.messages{ .field-name-field-vignette{ position:relative; float:left; - $shadow-size:3.5em; padding:$shadow-size; margin-top:-$shadow-size*1.15; margin-right:-$shadow-size+1.5em; @@ -498,6 +532,15 @@ div.messages{ &.visible{ opacity:1; z-index: 500; + } + + #home-btn{ + @include bg-svg-png('home-btn'); + position:absolute; + z-index:100; top:20px; left:20px; + width:25px; height:20px; cursor:pointer; + } + /* _____ _____ __ _____ _____ _____ _____ __ __ _____ _____ ____ _____ | | | | | | __ | __| | __ | | | | | | | \| __| @@ -505,54 +548,75 @@ div.messages{ |_____|_____|_____|_____|__|__|_____| |_____| |_| |_|___|_____|____/|_____| */ + // SOL #node-2{ + @include bg-svg-png('bgd-sol'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$SOL-col-active; } + h2.node-title{@include bg-svg-png('title-SOL-blur');} } + // DPH #node-3{ + @include bg-svg-png('bgd-dph'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$DPH-col-active; } + h2.node-title{@include bg-svg-png('title-DPH-blur');} } + // SUB #node-4{ + @include bg-svg-png('bgd-sub'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$SUB-col-active; } + h2.node-title{@include bg-svg-png('title-SUB-blur');} } + // BC #node-5{ + @include bg-svg-png('bgd-bc'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$BC-col-active; } + h2.node-title{@include bg-svg-png('title-BC-blur');} } + // OPP #node-6{ + @include bg-svg-png('bgd-opp'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$OPP-col-active; } + h2.node-title{@include bg-svg-png('title-OPP-blur');} } + // DUB #node-7{ + @include bg-svg-png('bgd-bub'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$DUB-col-active; } + h2.node-title{@include bg-svg-png('title-DUB-blur');} } + // JUSO #node-8{ + @include bg-svg-png('bgd-juso'); .field-type-text-long .field-label, h2.node-title, .field-name-field-dbatre li:before{ color:$JUSO-col-active; } + h2.node-title{@include bg-svg-png('title-JUSO-blur');} } /* @@ -562,7 +626,6 @@ div.messages{ |_____|_____|_|___|_____|__|__|_____|__ _|_____|_____| |__| */ - } .node{ position:relative; @@ -575,9 +638,15 @@ div.messages{ font-weight:normal; text-transform: uppercase; text-align: center; - max-width: 8.5em; + // max-width: 8.5em; line-height: 0.85; font-size: 2.268em; + position:absolute; display:block; + top:0; left:0; width:100%; height:100%; + background-size: contain!important; + text-indent: -5000px; + z-index:-1; + opacity:0.4; } .node>.field{ @@ -588,7 +657,7 @@ div.messages{ background-color: rgba(255,255,255,0.9); width:23em; padding:1em; z-index:10; - + cursor:move; .field-label{ text-transform: uppercase; font-family: "epflulb"; @@ -639,6 +708,7 @@ div.messages{ width:100%; height:100%; top:0; left:0; z-index:10; + cursor:move; } } } @@ -646,6 +716,7 @@ div.messages{ } // #chapter-wrapper } // #main + /* __________ ____ ________________ / ____/ __ \/ __ \/_ __/ ____/ __ \ / /_ / / / / / / / / / / __/ / /_/ / @@ -670,7 +741,7 @@ div.messages{ */ #fullscreen-btn{ position:fixed; - top:20px; left:20px; + bottom:20px; left:20px; z-index: 1000; } diff --git a/sites/all/themes/gui/jee/jee.info b/sites/all/themes/gui/jee/jee.info index 76b276a..690919a 100755 --- a/sites/all/themes/gui/jee/jee.info +++ b/sites/all/themes/gui/jee/jee.info @@ -13,6 +13,7 @@ stylesheets[all][] = "css/jee.css" ;----------// Scripts scripts[] = "bower_components/jquery.pep/src/jquery.pep.js" scripts[] = "bower_components/Peppermint/dist/peppermint.min.js" +scripts[] = "bower_components/vimeo-jquery-api/dist/jquery.vimeo.api.min.js" scripts[] = "js/jee.js" ;----------// Regions diff --git a/sites/all/themes/gui/jee/js/jee.js b/sites/all/themes/gui/jee/js/jee.js index 2cc4a16..c92269b 100755 --- a/sites/all/themes/gui/jee/js/jee.js +++ b/sites/all/themes/gui/jee/js/jee.js @@ -46,6 +46,7 @@ jQuery(document).ready(function($) { if(_debug) initDebug(); + initChapterWrapper(); initChapters(); launchNav(); @@ -99,6 +100,18 @@ jQuery(document).ready(function($) { }); }; + function initChapterWrapper(){ + $('
') + .on("click", closeChapterWrapper) + .appendTo(_$chapter_wrapper); + }; + + function closeChapterWrapper(e){ + _loaded_chapter = false; + _$chapter_wrapper.removeClass('visible'); + _$body.removeClass('chapter-displayed'); + }; + function initChapters(){ // Place each chapters on the ellipse contained on the screen var base_a = Math.random() *360; @@ -165,6 +178,10 @@ jQuery(document).ready(function($) { .bind('document touchstart', function(e){ console.log('touchstart'); clearTimeout(_timeout_dragging); + + if(_loaded_chapter) + return false; + // set initial pos updateNavPos(e.originalEvent.touches[0].clientX, e.originalEvent.touches[0].clientY, true); @@ -176,12 +193,22 @@ jQuery(document).ready(function($) { }) .bind('touchmove', function(e){ console.log('document touchmove'); + + if(_loaded_chapter) + return false; + updateNavPos(e.originalEvent.touches[0].clientX, e.originalEvent.touches[0].clientY, false); }) .bind('touchend', function(e){ console.log("document touchend"); + + if(_loaded_chapter) + return false; + stopMoveNav(); }); + + // TODO : nav on scroll events }; function updateNavPos(x,y,init){ @@ -299,6 +326,15 @@ jQuery(document).ready(function($) { this.trans = {x:0, y:0,z:0}; this.ease = randB(0.05, 0.3); + //drifting + this.$title = $('h2.node-title', this.$e); + this.$content = $('.content:first', this.$e); + this.title_x = 0; + this.content_x = 0; + this.drifting_direction = Math.random()-0.5 > 0 ? 1 : -1; + this.drifting_time = null; + + //preview this.is_previewed = false; @@ -315,9 +351,12 @@ jQuery(document).ready(function($) { // chapter this.$n = false; this.$blocks = false; + this.$vids_container = false; this.$vids = false; this.texts_pos = shuffleArray([1,2,3]); this.dimvideo = {w:0, h:0}; + this.$slider = null; + this.cur_vid_playing = 0; // prototypes if (typeof Chapter.initialized == "undefined") { @@ -326,6 +365,7 @@ jQuery(document).ready(function($) { this.setInitPos(); this.drawLines(); this.setEvents(); + this.initDrifiting(); }; Chapter.prototype.setInitPos = function(){ @@ -348,9 +388,9 @@ jQuery(document).ready(function($) { // change randomly radius if(this.i%2){ - this.geom.r = randB(this.geom.r*2, this.geom.r*3); + this.geom.r = randB(this.geom.r*1.5, this.geom.r*2); }else{ - this.geom.r = randB(this.geom.r, this.geom.r*2); + this.geom.r = randB(this.geom.r*0.8, this.geom.r*1.5); } this.pos.x = Math.round(_center.x+this.geom.r * this.geom.c) - this.geom.w/2; @@ -384,6 +424,40 @@ jQuery(document).ready(function($) { }); }; + Chapter.prototype.initDrifiting = function(){ + // an other option could be to drift the whole page with the same engine than draging + requestAnimationFrame(this.drift.bind(this)); + }; + + Chapter.prototype.drift = function(timestamp){ + requestAnimationFrame(this.drift.bind(this)); + + var now = new Date().getTime(), + dt = now - (this.drifting_time || now); + + this.drifting_time = now; + + if(!this.is_previewed){ + + this.title_x += (10/1000)*dt*this.drifting_direction; + this.content_x += (6/1000)*dt*this.drifting_direction; + + this.drifting_direction = + this.content_x > randB(100,130) + ? -1 + : this.content_x < -randB(100,130) + ? 1 + : this.drifting_direction; + + this.$title.css({ + transform:"translate3d("+this.title_x+"px,0,0)", + }); + this.$content.css({ + transform:"translate3d("+this.content_x+"px,0,0)", + }); + } + }; + Chapter.prototype.move = function(){ this.trans.x += (_nav_pos.x - this.trans.x)*this.ease; this.trans.y += (_nav_pos.y - this.trans.y)*this.ease; @@ -545,6 +619,12 @@ jQuery(document).ready(function($) { }; }; + + // _____ _____ _____ _____ _____ _____ _____ _____ _____ _____ _____ + // | | _ | __| | | | | | | _ | _ |_ _| __| __ | + // | | | __| __| | | | | --| | | __| | | | __| -| + // |_____|__| |_____|_|___| |_____|__|__|__|__|__| |_| |_____|__|__| + Chapter.prototype.loadNode = function(e){ // console.log("Chapter :: open : nid", this.nid); $.getJSON( @@ -558,14 +638,17 @@ jQuery(document).ready(function($) { Chapter.prototype.nodeLoaded = function(json, textstatus){ console.log('Chapter :: nodeLoaded '+this.nid+' : json', json); + // remove previous loaded nodes + _$chapter_wrapper.find('.node').remove(); + // insert ajax loaded into dom - _$chapter_wrapper.html(json.node); + _$chapter_wrapper.append(json.node); // record some usefull data this.$n = $('.node-chapitre', _$chapter_wrapper); this.$blocks = $('.field-type-text-long', this.$n); - this.$vids = $('.field-name-field-partie', this.$n); - + this.$vids_container = $('.field-name-field-partie', this.$n); + this.$vids = $('iframe', this.$vids_container); // record the current loaded chapter // this will stop first interface to run _loaded_chapter = this; @@ -590,10 +673,10 @@ jQuery(document).ready(function($) { // build video player this.buildVideos(); - $('.node-title', this.$n).pep(); - // show the whole thing _$chapter_wrapper.addClass('visible'); + + // this.$vids.eq(this.cur_vid_playing).vimeo('play'); }; Chapter.prototype.placeText = function(i, e){ @@ -629,22 +712,24 @@ jQuery(document).ready(function($) { Chapter.prototype.buildVideos = function(){ console.log('Chapter :: buildVideos'); - this.dimvideo.h = this.$vids.height(); + this.dimvideo.h = this.$vids_container.height(); // redim each iframe to fit // add a mask on top of each iframe to avoid bad interaction with vimeo - $('iframe', this.$vids) - .each(this.redimVideo.bind(this)) - .after('
'); + this.$vids + .after('
') + .each(this.redimVideo.bind(this)); - this.$vids.css({ - width:this.dimvideo.w*1.3, + this.$vids_container.css({ + width:this.dimvideo.w*1.2, height:this.dimvideo.h, - marginLeft:(_container.w-this.dimvideo.w*1.3)/2 + marginLeft:(_container.w-this.dimvideo.w*1.2)/2 }); // create the slider with peppermint - $('.field-items', this.$vids).Peppermint(); + this.$slider = $('.field-items', this.$vids_container).Peppermint({ + onSlideChange:this.onSlideChange.bind(this) + }); }; Chapter.prototype.redimVideo = function(i,e){ @@ -655,10 +740,45 @@ jQuery(document).ready(function($) { .css({ width:this.dimvideo.w, height:this.dimvideo.h }) .attr({ width:this.dimvideo.w, height:this.dimvideo.h }) // add some paading to parent for slider display - .parent().css({ + .parent() + .css({ paddingLeft:this.dimvideo.w*0.15, paddingright:this.dimvideo.w*0.15 - }); + }) + .on("click", this.onClickVid.bind(this)); + }; + + Chapter.prototype.onClickVid = function(e){ + e.stopPropagation(); + e.preventDefault(); + console.log('Chapter :: onClickVid '+this.nid, e); + + var $vid = $('iframe', e.currentTarget); + + $vid.vimeo('paused', function(data){ + + console.log('paused : ', data); + + if(data){ + $vid.vimeo('play'); + }else{ + $vid.vimeo('pause'); + } + }); + + + return false; + }; + + Chapter.prototype.onSlideChange = function(){ + console.log('onSlideChange '+this.nid, this.$slider.data('Peppermint').getCurrentPos()); + + //stop current video playing + this.$vids.eq(this.cur_vid_playing).vimeo('pause'); + + // start new current video + this.cur_vid_playing = this.$slider.data('Peppermint').getCurrentPos(); + this.$vids.eq(this.cur_vid_playing).vimeo('play'); }; Node.initialized = true; @@ -708,6 +828,65 @@ jQuery(document).ready(function($) { init(); }); +/* + ____ __________ __ ___________________ ___ _ ________ ______ ______________ _ __ __________ ___ __ _________ + / __ \/ ____/ __ \/ / / / ____/ ___/_ __/ / | / | / / _/ |/ / |/_ __/ _/ __ \/ | / / / ____/ __ \/ | / |/ / ____/ + / /_/ / __/ / / / / / / / __/ \__ \ / / / /| | / |/ // // /|_/ / /| | / / / // / / / |/ / / /_ / /_/ / /| | / /|_/ / __/ + / _, _/ /___/ /_/ / /_/ / /___ ___/ // / / ___ |/ /| // // / / / ___ |/ / _/ // /_/ / /| / / __/ / _, _/ ___ |/ / / / /___ +/_/ |_/_____/\___\_\____/_____//____//_/ /_/ |_/_/ |_/___/_/ /_/_/ |_/_/ /___/\____/_/ |_/ /_/ /_/ |_/_/ |_/_/ /_/_____/ + +*/ +(function() { + var lastTime = 0; + var vendors = ['ms', 'moz', 'webkit', 'o']; + for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { + window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame']; + window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] + || window[vendors[x]+'CancelRequestAnimationFrame']; + } + + if (!window.requestAnimationFrame) + window.requestAnimationFrame = function(callback, element) { + var currTime = new Date().getTime(); + var timeToCall = Math.max(0, 16 - (currTime - lastTime)); + var id = window.setTimeout(function() { callback(currTime + timeToCall); }, + timeToCall); + lastTime = currTime + timeToCall; + return id; + }; + + if (!window.cancelAnimationFrame) + window.cancelAnimationFrame = function(id) { + clearTimeout(id); + }; +}()); + + +/* + ____ ____ + / __/_ __/ / / __________________ ___ ____ + / /_/ / / / / / / ___/ ___/ ___/ _ \/ _ \/ __ \ + / __/ /_/ / / / (__ ) /__/ / / __/ __/ / / / +/_/ \__,_/_/_/ /____/\___/_/ \___/\___/_/ /_/ +*/ + +// http://davidwalsh.name/fullscreen +// http://www.sitepoint.com/html5-full-screen-api/ + +// Find the right method, call on correct element +function launchIntoFullscreen(element) { + if(element.requestFullscreen) { + element.requestFullscreen(); + } else if(element.mozRequestFullScreen) { + element.mozRequestFullScreen(); + } else if(element.webkitRequestFullscreen) { + element.webkitRequestFullscreen(); + } else if(element.msRequestFullscreen) { + element.msRequestFullscreen(); + } +} + + /* ____ __ __ _____________ _______ / __ \/ / / / / / ____/ _/ | / / ___/ @@ -758,64 +937,9 @@ jQuery(document).ready(function($) { // } // })(jQuery); -/* - ____ __________ __ ___________________ ___ _ ________ ______ ______________ _ __ __________ ___ __ _________ - / __ \/ ____/ __ \/ / / / ____/ ___/_ __/ / | / | / / _/ |/ / |/_ __/ _/ __ \/ | / / / ____/ __ \/ | / |/ / ____/ - / /_/ / __/ / / / / / / / __/ \__ \ / / / /| | / |/ // // /|_/ / /| | / / / // / / / |/ / / /_ / /_/ / /| | / /|_/ / __/ - / _, _/ /___/ /_/ / /_/ / /___ ___/ // / / ___ |/ /| // // / / / ___ |/ / _/ // /_/ / /| / / __/ / _, _/ ___ |/ / / / /___ -/_/ |_/_____/\___\_\____/_____//____//_/ /_/ |_/_/ |_/___/_/ /_/_/ |_/_/ /___/\____/_/ |_/ /_/ /_/ |_/_/ |_/_/ /_/_____/ - -*/ -(function() { - var lastTime = 0; - var vendors = ['ms', 'moz', 'webkit', 'o']; - for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) { - window.requestAnimationFrame = window[vendors[x]+'RequestAnimationFrame']; - window.cancelAnimationFrame = window[vendors[x]+'CancelAnimationFrame'] - || window[vendors[x]+'CancelRequestAnimationFrame']; - } - - if (!window.requestAnimationFrame) - window.requestAnimationFrame = function(callback, element) { - var currTime = new Date().getTime(); - var timeToCall = Math.max(0, 16 - (currTime - lastTime)); - var id = window.setTimeout(function() { callback(currTime + timeToCall); }, - timeToCall); - lastTime = currTime + timeToCall; - return id; - }; - - if (!window.cancelAnimationFrame) - window.cancelAnimationFrame = function(id) { - clearTimeout(id); - }; -}()); -/* ____ ____ - / __/_ __/ / / __________________ ___ ____ - / /_/ / / / / / / ___/ ___/ ___/ _ \/ _ \/ __ \ - / __/ /_/ / / / (__ ) /__/ / / __/ __/ / / / -/_/ \__,_/_/_/ /____/\___/_/ \___/\___/_/ /_/ -*/ - -// http://davidwalsh.name/fullscreen -// http://www.sitepoint.com/html5-full-screen-api/ - -// Find the right method, call on correct element -function launchIntoFullscreen(element) { - if(element.requestFullscreen) { - element.requestFullscreen(); - } else if(element.mozRequestFullScreen) { - element.mozRequestFullScreen(); - } else if(element.webkitRequestFullscreen) { - element.webkitRequestFullscreen(); - } else if(element.msRequestFullscreen) { - element.msRequestFullscreen(); - } -} - // remove navbar