make federation page work

base.php

@@ -30,7 +30,7 @@ if(is_page('oc-news') || is_page('blogfeed')) { include roots_template_path(); }
 
 	<?php } else { // Handle further special layouts ?>
 
-	  <?php if(is_page('5years') || is_page('conf') || is_page('register') || is_page('federation') || is_page('thankyou')) { // Handle alternative layout ?>
+	  <?php if(is_page('5years') /*|| is_page('conf') || is_page('register') || is_page('federation') || is_page('thankyou')*/) { // Handle alternative layout ?>
 	    <div class="conference">
 	      <div class="wrap container conf-content" role="document">
 		<div class="content row">
@@ -39,7 +39,7 @@ if(is_page('oc-news') || is_page('blogfeed')) { include roots_template_path(); }
 		  </main><!-- /.main -->
 		</div><!-- /.content -->
 	      </div><!-- /.wrap -->
-	    </div><!-- /.conference -->
+	    </div>
 
 	  <?php } else { // Handle all other layouts ?>
 

page-federation.php

@@ -10,30 +10,30 @@ $(document).ready(function() {
 <div class="row col-md-12">
 	<h2 class="conf-location">Share across Nextclouds!</h2>
 </div>
-<div class="row conf-info">
+<!--<div class="row conf-info">
 	<div class="col-lg-4 col-md-5 text-center no-underline">
 		<a href="https://www.youtube.com/watch?v=9-JEmlH2DEg" target="_blank" style="border: none;"><img src="<?php echo get_template_directory_uri(); ?>/assets/img/federation/federation.gif" alt="in action" /></a>
 	</div>
-	<div class="col-lg-8 col-md-7">
+	<div class="col-md-8 col-md-offset-2">-->
 		<p>Sharing files across Nextcloud servers is as easy as sending an email from a Gmail address to a Yahoo account! Instead of an email address, you use a <em>Federated Cloud ID</em>.</p>
 		<p class="federation-id"><span id="IDtext">An example Federated Cloud ID is</span><strong> <span id="userName">username@example.com/nextcloud</span></strong></p>
 		<p>To share a file, enter the Federated Cloud ID in the 'share' dialog. A notification will pop up on the Nextcloud server of the recipient.</p>
 		<p>You can find your own Federated Cloud ID in your user settings. Give it to your friends so they can share files with you!</p>
-	</div>
+<!--	</div>
 </div>
 <div class="row conf-partners-title">
-	<div class="col-md-12">
+	<div class="col-md-12">-->
 		<h2>More details</h2>
-	</div>
+<!--	</div>
 </div>
 <div class="row">
-        <div class="col-md-6 col-md-offset-3">
-                Learn more in the Nextcloud <a href="<?php echo $DOCUMENTATION_USER; ?>files/federated_cloud_sharing.html" target="_blank">user documentation</a> and <a href="<?php echo $DOCUMENTATION_ADMIN; ?>configuration_files/federated_cloud_sharing_configuration.html">administrator documentation</a>. Find <a href="https://nextcloud.com/it-is-time-to-federate-our-clouds/" target="_blank">technical details in this series of blog posts</a>.
-        </div>
+        <div class="col-md-6 col-md-offset-3">-->
+                Learn more in the Nextcloud <a href="<?php echo $DOCUMENTATION_USER; ?>files/federated_cloud_sharing.html" target="_blank">user documentation</a> and <a href="<?php echo $DOCUMENTATION_ADMIN; ?>configuration_files/federated_cloud_sharing_configuration.html">administrator documentation</a>. <!--Find <a href="https://nextcloud.com/it-is-time-to-federate-our-clouds/" target="_blank">technical details in this series of blog posts</a>.-->
+<!--        </div>
 </div>
 <div class="row">
         <div class="col-md-6 text-center col-md-offset-3"><iframe width="100%" height="360" src="https://www.youtube.com/embed/9-JEmlH2DEg?rel=0" frameborder="0" allowfullscreen></iframe></div>
-</div>
+</div>-->
 
 
 

templates/head.php

@@ -13,7 +13,7 @@
 	<link rel="shortcut icon" href="<?php echo get_template_directory_uri(); ?>/assets/img/common/favicon.png" />
 	<link rel="apple-touch-icon-precomposed" href="<?php echo get_template_directory_uri(); ?>/assets/img/common/favicon.png" />
 	<?php wp_head(); ?>
-	<?php if(is_page('5years') || is_page('conf') || is_page('federation') || is_page('register') || is_page('thankyou')) { ?><link rel="stylesheet" type="text/css" href="<?php echo get_template_directory_uri(); ?>/assets/css/conf.css"><?php } ?>
+	<?php if(is_page('5years')/* || is_page('conf') || is_page('federation') || is_page('register') || is_page('thankyou')*/) { ?><link rel="stylesheet" type="text/css" href="<?php echo get_template_directory_uri(); ?>/assets/css/conf.css"><?php } ?>
 	<?php if(is_page('news')) { ?>
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
 	<script src="<?php echo get_template_directory_uri(); ?>/assets/js/vendor/jquery.infinitescroll.min.js"></script>