Merge lp:~mhall119/uds-project/virtual-changes into lp:uds-project

[Michael Hall]

Changes for Online UDS

[Anthony Dillon (ya-bo-ng)]

Looks great. Just a small design note:
template-register.php line 94

I would make it:
<div class="span-8 last">

[lp:~mhall119/uds-project/virtual-changes]

67. By Michael Hall on 2013-02-26

Change span-4 to span-8 as ant suggested

68. By Michael Hall on 2013-02-26

Text changes from Michelle

[Anthony Dillon (ya-bo-ng)]

Looks perfect.

review: Approve

=== modified file 'template-about.php'
--- template-about.php	2012-11-19 11:42:26 +0000
+++ template-about.php	2013-02-26 17:33:20 +0000
@@ -10,7 +10,10 @@
 	<div class="row row-hero">
 		<div class="span-6">
 			<h1>Ubuntu Developer Summit</h1>
-			<p>Since the birth of Ubuntu in 2004, The Ubuntu Developer Summit (UDS) has been held in the weeks following each release, enabling the Ubuntu community members in attendance to determine the direction the project will take in the forthcoming cycle.	</p>
+			<p>The Ubuntu Developer Summit is where we get together to discuss, design, and 
+            plan the future of Ubuntu. Taking place every three months online across a 
+            range of interactive video sessions and available to all, join us to help 
+            shape Ubuntu across the desktop, devices, and cloud.</p>
 		</div>
 	</div><!-- END .row -->
 	
@@ -62,44 +65,7 @@
 		</div>
 	</div><!-- END .row -->
 	
-	<div class="row row-apply">
-		<div class="clearfix">
-			<div class="span-4">
-				<h3>Apply for sponsorship</h3>
-				<p>With each Ubuntu Developer Summit, Canonical offers limited sponsorship to provide travel and accommodation assistance to community members and upstreams who are unable to afford to attend the event in person.</p>
-				<p>If you feel you fit into one of the eligible groups, apply below.</p>
-				<a href="<?php echo get_post_meta($post->ID, 'About Sponsorship URL', true) ?>" class="link-cta">Apply online now</a>
-			</div>
-			<div class="span-4">
-				<ul>
-					<li>
-						<p>Community members who are actively involved in Ubuntu and who are providing significant contributions to the Ubuntu project</p>
-					</li>
-					<li>
-						<p>Upstream contributors who are bringing value to Ubuntu indirectly via active participation in their upstream project, but who are keen to see quality support in Ubuntu</p>
-					</li>
-					<li>
-						<p>Contributors are willing to actively participate, not only throughout the full Ubuntu Developer Summit week, but also following with active contributions in the release cycle</p>
-					</li>
-				</ul>
-			</div>
-			<div class="span-4 last">
-				<ul>
-					<li>
-						<p>We are always keen to welcome members of the community who have never been to UDS before and are keen to participate and experience the event</p>
-					</li>
-					<li>
-						<p>You don't have to provide technical contributions to apply &ndash; if you have participated in the areas of advocacy, documentation, testing, art, design, etc., you are encouraged to apply</p>
-					</li>
-					<li>
-						<p>UDS is an event that encourages diversity &ndash; we welcome everyone to apply for sponsorship, irrespective of gender, race, impairment, technical expertise, or other factors</p>
-					</li>
-				</ul>
-			</div>
-		</div>
-	</div><!-- END .row -->
 	
-	<?php get_template_part('partial', 'sponsors'); ?>
 	<script type="text/javascript" src="<?php echo get_template_directory_uri(); ?>/assets/js/about-tabs.js"></script>
 		
 <?php get_footer(); ?>

=== modified file 'template-home.php'
--- template-home.php	2012-11-19 11:42:26 +0000
+++ template-home.php	2013-02-26 17:33:20 +0000
@@ -50,7 +50,5 @@
 			</div>
 		</div>
 	</div><!-- END .row -->
-	
-	<?php get_template_part('partial', 'sponsors'); ?>
-		
-<?php get_footer(); ?>
\ No newline at end of file
+			
+<?php get_footer(); ?>

=== modified file 'template-register.php'
--- template-register.php	2013-01-25 17:30:24 +0000
+++ template-register.php	2013-02-26 17:33:20 +0000
@@ -10,7 +10,7 @@
 	<div class="row row-hero">
 		<div class="span-6">
 			<h1>Register</h1>
-			<p>Apply to attend the Ubuntu Developer Summit.</p>
+			<p>Register to participate in the Ubuntu Developer Summit.</p>
 		</div>
 	</div><!-- END .row -->
 	
@@ -20,7 +20,7 @@
 				<h3>Registration</h3>
 				<p>You can commence your registration for the Ubuntu Developer Summit from this page.</p>
 			</div>
-			<div class="span-4">
+			<div class="span-8 last">
 				<div class="box-event developer">
 					<h2>Developer Summit</h2>
 					<p><?php echo get_post_meta($post->ID, 'Register UDS Date', true) ?></p>
@@ -28,14 +28,6 @@
 					<a href="<?php echo get_post_meta($post->ID, 'Register UDS URL', true) ?>" class="link-cta<?php $url = get_post_meta($post->ID, 'Register UDS URL', true); if (empty($url)) { echo ' disabled'; } ?>">Register for the Developer Summit</a>
 				</div>
 			</div>
-			<div class="span-4 last">
-				<div class="box-event enterprise">
-					<h2>Enterprise Summit</h2>
-					<p><?php echo get_post_meta($post->ID, 'Register UES Date', true) ?></p>
-					<p><?php echo get_post_meta($post->ID, 'Register UES Copy', true) ?></p>
-					<a href="<?php echo get_post_meta($post->ID, 'Register UES URL', true) ?>" class="link-cta<?php $url = get_post_meta($post->ID, 'Register UES URL', true); if (empty($url)) { echo ' disabled'; } ?>">Register for the Enterprise Summit</a>
-				</div>
-			</div>
 		</div>
 	</div><!-- END .row -->
 	
@@ -43,7 +35,9 @@
 		<div class="clearfix">
 			<div class="span-4">
 				<h3>FAQs</h3>
-				<p>Answers to the most frequent queries are on this page. If you have a question not covered by this section, or if you need a supporting letter for your visa application, please contact <a href="mailto:[e-mail]">[e-mail]</a> directly.</p>
+				<p>Answers to the most frequent queries are on this page. If you have a 
+             question not covered by this section, or if you need a supporting letter for 
+             your visa application, please contact <a href="mailto:[e-mail]">[e-mail]</a> directly.</p>
 			</div>
 			<div class="span-8 last">
 				<ul>
@@ -70,6 +64,4 @@
 		</div>
 	</div><!-- END .row -->
 	
-	<?php get_template_part('partial', 'sponsors'); ?>
-	
 <?php get_footer(); ?>