WWSF changes

collectiveaccess · Jan 14, 2016 · c46de34 · c46de34
1 parent 18074ab
commit c46de34
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/themes/wwsf/views/Detail/ca_objects_detail_html.php b/themes/wwsf/views/Detail/ca_objects_detail_html.php
@@ -452,11 +452,12 @@
 					}
 
 					$vn_show_zoom = true;
+					/*
 					if($t_rep && $t_rep->getAnnotationCount() > 0) {
 						print '<a href="#" onclick="openClipList(); return false;" style="margin-right:30px;">'._t('Chapters').'</a> ';
 						//$vn_show_download_link = false;
 						$vn_show_zoom = false;
-					}
+					}*/
 
 					# --- download link if creative commons
 					if($vn_show_download_link){

diff --git a/themes/wwsf/views/pageFormat/pageHeader.php b/themes/wwsf/views/pageFormat/pageHeader.php
@@ -7,9 +7,8 @@
 
 	<link href="<?php print $this->request->getThemeUrlPath(true); ?>/css/global.css" rel="stylesheet" type="text/css" />
 	<link href="<?php print $this->request->getThemeUrlPath(true); ?>/css/sets.css" rel="stylesheet" type="text/css" />
-	<link rel="stylesheet" href="<?php print $this->request->getBaseUrlPath(); ?>/js/videojs/video-js.css" type="text/css" media="screen" />
-	<!--<link rel="stylesheet" href="<?php print $this->request->getBaseUrlPath(); ?>/js/jquery/jquery-jplayer/jplayer.blue.monday.css" type="text/css" media="screen" />-->
-	<script src='/js/flowplayer/flowplayer-3.2.6.min.js' type='text/javascript'></script>
+	<link rel="stylesheet" href="<?php print $this->request->getBaseUrlPath(); ?>/assets/videojs/video-js.css" type="text/css" media="screen" />
+	<!--<link rel="stylesheet" href="<?php print $this->request->getBaseUrlPath(); ?>/assets/jquery/jquery-jplayer/jplayer.blue.monday.css" type="text/css" media="screen" />-->
 	<!--[if IE]>
     <link rel="stylesheet" type="text/css" href="<?php print $this->request->getThemeUrlPath(true); ?>/css/iestyles.css" />
 	<![endif]-->