[spalenque] - #13019 * fix bugs on videos page

Author: santipalenque

openstack/code/ConferencePage.php

@@ -49,7 +49,8 @@ class ConferencePage extends Page
     );
 
     static $has_one = array(
-        'Summit' => 'Summit'
+        'Summit' => 'Summit',
+        'SummitImage' => 'BetterImage'
     );
 
     function getCMSFields()
@@ -63,6 +64,9 @@ function getCMSFields()
         $SummitDropDownField = new DropdownField("SummitID", "Summit", $summits->map("ID", "Name"));
         $fields->addFieldToTab('Root.Main', $SummitDropDownField);
 
+        $SummitImageField = new UploadField('SummitImage','Summit Image');
+        $fields->addFieldToTab('Root.Main', $SummitImageField);
+
         //Google Conversion Tracking params
         $fields->addFieldToTab("Root.GoogleConversionTracking",new TextField("GAConversionId","Conversion Id","994798451"));
         $fields->addFieldToTab("Root.GoogleConversionTracking",new TextField("GAConversionLanguage","Conversion Language","en"));

summit-video-app/code/SummitVideoAppBackend.php

@@ -377,19 +377,30 @@ protected function createVideoJSON(PresentationVideo $v)
         ];
     }
 
+    private function getSummitImage(Summit $s) {
+        $image = null;
+
+        if ($page = SummitPage::get()->filter('SummitID', $s->ID)->first()) {
+            $image = $page->SummitImage()->Image();
+        } else if ($page = ConferencePage::get()->filter('SummitID', $s->ID)->first()) {
+            $image = $page->SummitImage();
+        }
+
+        $image_url = 'summit-video-app/production/images/placeholder-image.jpg';
+
+        if($image && $image->exists() && Director::fileExists($image->Filename)) {
+            $image_url = $image->CroppedImage(263, 148)->URL;
+        }
+
+        return $image_url;
+    }
 
     /**
      * @param Summit $s
      * @return array
      */
     protected function createSummitJSON(Summit $s)
     {
-        $page = SummitPage::get()->filter('SummitID', $s->ID)->first();
-        $image = null;
-        if ($page) {
-            $image = $page->SummitImage()->Image();
-        }
-
         $tracks = array_map(function ($t) {
             return [
                 'id'         => $t->ID,
@@ -426,9 +437,7 @@ protected function createSummitJSON(Summit $s)
                 'Processed' => true,
                 'PresentationID' => $s->Presentations()->column('ID')
             ])->count(),
-            'imageURL' => ($image && $image->exists() && Director::fileExists($image->Filename)) ?
-                $image->CroppedImage(263, 148)->URL :
-                'summit-video-app/production/images/placeholder-image.jpg',
+            'imageURL' => $this->getSummitImage($s),
             'slug' => $s->Slug,
             'tracks' => $tracks
         ];
@@ -444,6 +453,7 @@ protected function createSpeakerJSON(PresentationSpeaker $s)
         return [
             'id' => $s->ID,
             'name' => $s->getName(),
+            'slug' => singleton('SiteTree')->generateURLSegment($s->getName()),
             'jobTitle' => $s->Title,
             'imageURL' => ($s->Photo()->exists() && Director::fileExists($s->Photo()->Filename)) ?
                 $s->Photo()->CroppedImage(263, 148)->URL :

summit-video-app/ui/source/js/components/containers/SpeakerItem.js

@@ -15,7 +15,7 @@ const SpeakerItem = ({
 		imageHeight={148}	
 		title={`${speaker.name} (${speaker.videoCount} videos)`}
 		subtitle={speaker.jobTitle || ''}
-		link={URL.create(`speakers/${speaker.id}`)}
+		link={URL.create(`speakers/${speaker.id}/${speaker.slug}`)}
 		onItemClicked={onItemClicked}
 	/>
 );

summit-video-app/ui/source/js/components/pages/Featured.js

@@ -45,7 +45,7 @@ class Featured extends React.Component {
 				<div className="container">
 					<div className="row">
 						<div className="col-sm-12">
-							<RouterLink link={`video/${featuredVideo.id}`}>								
+							<RouterLink link={`${featuredVideo.summit.slug}/${featuredVideo.slug}`}>
 								<div className='featured-video'>	
 									<h3>Don't Miss</h3>
 									<FeatureImagePanel

summit-video-app/ui/source/js/components/pages/Search.js

@@ -36,7 +36,7 @@ class Search extends React.Component {
 
                     return (
                         <VideoPanel
-                            title={`Videos matching title "${term}"`}
+                            title={`Videos matching "${term}"`}
                             videos={this.props.videos}
                         />
                     );

summit-video-app/ui/source/js/components/pages/SpeakerDetail.js

@@ -49,7 +49,7 @@ class SpeakerDetail extends React.Component {
 					<div className="row">
 						<div className="col-sm-12 video-breadcrumbs">
 							<RouterLink link='speakers'>All speakers</RouterLink> > 
-							<a href="#" className="active">{this.props.speaker.name}</a>
+							{this.props.speaker.name}
 						</div>
 					</div>
 					<div className="row">

summit-video-app/ui/source/js/components/pages/SummitDetail.js

@@ -47,8 +47,8 @@ class SummitDetail extends React.Component {
 				<div className="container">
 					<div className="row">
 						<div className="col-sm-12 video-breadcrumbs">
-							<RouterLink link='summits'>All summits</RouterLink> > 
-							<a href="#" className="active">{this.props.summit.title}</a>
+							<RouterLink link='summits'>All summits</RouterLink> >
+							{this.props.summit.title}
 						</div>
 					</div>
 					<div className="row">

summit-video-app/ui/source/js/reducers/childVideoReducers.js

@@ -82,8 +82,8 @@ export const summitVideos = (
 ) => {
 	switch(action.type) {
 		case 'REQUEST_SUMMIT_VIDEOS':
-			if( (action.payload.summit && !state.summit) ||
-				(state.summit && +state.summit.slug !== +action.payload.summit)
+			if( (action.payload.id && !state.summit) ||
+				(state.summit && state.summit.slug !== action.payload.id)
 			) {
 				return {
 					summit: null,
@@ -132,8 +132,8 @@ export const tagVideos = (
 ) => {
     switch(action.type) {
         case 'REQUEST_TAG_VIDEOS':
-            if( (action.payload.tag && !state.tag) ||
-                (state.tag && +state.tag.tag !== +action.payload.tag)
+            if( (action.payload.id && !state.tag) ||
+                (state.tag && state.tag.tag !== action.payload.id)
                 ) {
                 return {
                     tag: null,
@@ -181,8 +181,8 @@ export const trackVideos = (
 ) => {
     switch(action.type) {
         case 'REQUEST_TRACK_VIDEOS':
-            if( (action.payload.track && !state.track) ||
-                (state.track && +state.track.slug !== +action.payload.track)
+            if( (action.payload.id && !state.track) ||
+                (state.track && state.track.slug !== action.payload.id)
                 ) {
                 return {
                     track: null,
@@ -231,8 +231,8 @@ export const speakerVideos = (
 ) => {
 	switch(action.type) {
 		case 'REQUEST_SPEAKER_VIDEOS':
-			if( (action.payload.speaker && !state.speaker) ||
-				(state.speaker && +state.speaker.id !== +action.payload.speaker)
+			if( (action.payload.id && !state.speaker) ||
+				(state.speaker && +state.speaker.id !== +action.payload.id)
 			) {
 				return {
 					speaker: null,

summit-video-app/ui/source/less/style.less

@@ -680,7 +680,7 @@ ul.search-tabs {
     a {
         font-size: 10px;
         text-transform: uppercase;
-        color: @darkblue;
+        color: #428bca;
         margin: 0 5px;
         &.active {
             color: @projectblue;

summit/code/pages/SummitHomePage.php

@@ -17,7 +17,19 @@ public function getCMSFields() {
         return $fields;
     }
 
-    private static $allowed_children = array ('SummitOverviewPage', 'SummitFutureLanding', 'SummitStaticAboutBostonPage', 'SummitBostonLanding', 'RedirectorPage', 'SummitHighlightsPage', 'SummitStaticAboutPage', 'SummitStaticSponsorPage', 'SummitNewStaticAboutPage');
+    private static $allowed_children = array (
+        'SummitOverviewPage',
+        'SummitFutureLanding',
+        'SummitStaticAboutBostonPage',
+        'SummitBostonLanding',
+        'RedirectorPage',
+        'SummitHighlightsPage',
+        'SummitStaticAboutPage',
+        'SummitStaticSponsorPage',
+        'SummitNewStaticAboutPage',
+        'SummitPage',
+        'ConferencePage'
+    );
 
     private static $default_child = "SummitOverviewPage";