[spalenque] - #14339 * fix summit about page link in nav

Author: santipalenque

summit/code/pages/StaticSummitAboutPage.php

@@ -19,4 +19,12 @@ public function init()
 		Requirements::javascript('summit/javascript/static-summit-about-page.js');
 
     }
+
+    public function getSummitAboutPageLink() {
+        return $this->Link();
+    }
+
+    public function getAboutPageNavClass(){
+        return 'current';
+    }
 }

summit/code/pages/SummitPage.php

@@ -252,29 +252,14 @@ function TwitterTrackingCode()
         return $tracking_code;
     }
 
-    public function getSummitRoot(){
-        if($this->ClassName === 'SummitOverviewPage')
-            return $this->Link();
-        else{
-            //childs page
-            return $this->Parent()->Link();
-        }
-    }
-
-    public function getSummitAboutLink() {
-        if($this->ClassName === 'SummitStaticAboutBostonPage')
-            return $this->Link();
-        else{
-            //childs page
-            return $this->Parent()->Link();
-        }
+    public function getSummitAboutPageLink() {
+        return $this->Summit()->Link;
     }
 
-    public function MainNavClass(){
-        if($this->ClassName === 'SummitOverviewPage' || $this->ClassName === 'SummitNewStaticAboutPage')
+    public function getAboutPageNavClass(){
+        if($this->Summit()->Link == $this->Link())
             return 'current';
-        else{
-            //childs page
+        else {
             return 'link';
         }
     }

summit/templates/Includes/StaticSummitPageHeader.ss

@@ -15,19 +15,20 @@
 
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
-                    <li class="{$MainNavClass} <% if $ClassName == 'SummitAboutPage' %> current<% end_if %> link">
-                        <a href="$SummitAboutLink">About</a>
+                    <li class="{$getAboutPageNavClass}">
+                        <a href="{$getSummitAboutPageLink}">About</a>
                     </li>
                     <% loop $Menu(3) %>
-                        <li class="$LinkingMode">
-                            <a href="$Link">$MenuTitle</a>
-                        </li>
-                        <% end_loop %>
+                    <li class="{$LinkingMode}">
+                        <a href="{$Link}">$MenuTitle</a>
+                    </li>
+                    <% end_loop %>
 
-                            <li class="link button-box">
-                                <a href="https://www.eventbrite.com/e/openstack-summit-november-2018-berlin-tickets-41880169715" class="btn register-btn-lrg">Get your tickets <i class="fa fa-arrow-right"></i>
-                                </a>
-                            </li>
+                    <li class="link button-box">
+                        <a href="https://www.eventbrite.com/e/openstack-summit-november-2018-berlin-tickets-41880169715" class="btn register-btn-lrg">
+                            Get your tickets <i class="fa fa-arrow-right"></i>
+                        </a>
+                    </li>
                 </ul>
             </div>
         </div>

summit/templates/Includes/StaticSummitPageHeaderSmall.ss

@@ -15,19 +15,20 @@
 
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
-                    <li class="{$MainNavClass} <% if $ClassName == 'SummitAboutPage' %> current<% end_if %> link">
-                        <a href="$SummitAboutLink">About</a>
+                    <li class="{$getAboutPageNavClass}">
+                        <a href="{$getSummitAboutPageLink}">About</a>
                     </li>
                     <% loop $Menu(3) %>
-                        <li class="$LinkingMode">
-                            <a href="$Link">$MenuTitle</a>
-                        </li>
-                        <% end_loop %>
+                    <li class="{$LinkingMode}">
+                        <a href="{$Link}">$MenuTitle</a>
+                    </li>
+                    <% end_loop %>
 
-                            <li class="link button-box">
-                                <a href="https://www.eventbrite.com/e/openstack-summit-november-2018-berlin-tickets-41880169715" class="btn register-btn-lrg">Get your tickets <i class="fa fa-arrow-right"></i>
-                                    </a>
-                            </li>
+                    <li class="link button-box">
+                        <a href="https://www.eventbrite.com/e/openstack-summit-november-2018-berlin-tickets-41880169715" class="btn register-btn-lrg">
+                            Get your tickets <i class="fa fa-arrow-right"></i>
+                        </a>
+                    </li>
                 </ul>
             </div>
         </div>

summit/templates/Includes/SummitNav.ss

@@ -9,12 +9,12 @@
 
     <div className="collapse navbar-collapse" id="header-navbar-collapse">
         <ul class="nav nav-tabs" >
-            <li class="{$MainNavClass} <% if $ClassName == 'SummitAboutPage' %> current<% end_if %>">
-                <a href="$SummitAboutLink">About The Summit</a>
+            <li class="{$getAboutPageNavClass}">
+                <a href="{$getSummitAboutPageLink}">About The Summit</a>
             </li>
             <% loop $Menu(3) %>
-                <li class="$LinkingMode">
-                    <a href="$Link">$MenuTitle</a>
+                <li class="{$LinkingMode}">
+                    <a href="{$Link}">$MenuTitle</a>
                 </li>
             <% end_loop %>
         </ul>