UDS Project

Merge lp:~gbancroft-canonical/uds-project/uds-updates into lp:uds-project

  1. uds-updates
  2. Merge into wordpress-theme
Proposed by Graham Bancroft
Status: Merged
Approved by: Anthony Dillon
Approved revision: 68
Merged at revision: 68
Proposed branch: lp:~gbancroft-canonical/uds-project/uds-updates
Merge into: lp:uds-project
Diff against target: 282 lines (+21/-73)
4 files modified
assets/css/site.css (+3/-1)
template-about.php (+4/-7)
template-agenda.php (+12/-63)
template-register.php (+2/-2)
To merge this branch: bzr merge lp:~gbancroft-canonical/uds-project/uds-updates
Reviewer Review Type Date Requested Status
Anthony Dillon (community) Approve
Review via email: mp+161612@code.launchpad.net

Description of the change

Latest UDS updates

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore' (properties changed: -x to +x)
2=== modified file '404.php' (properties changed: -x to +x)
3=== removed file 'assets/css/.DS_Store'
4Binary files assets/css/.DS_Store 2012-03-06 10:56:48 +0000 and assets/css/.DS_Store 1970-01-01 00:00:00 +0000 differ
5=== modified file 'assets/css/core-grid.css' (properties changed: -x to +x)
6=== modified file 'assets/css/core-reset.css' (properties changed: -x to +x)
7=== modified file 'assets/css/core.css' (properties changed: -x to +x)
8=== modified file 'assets/css/site.css' (properties changed: -x to +x)
9--- assets/css/site.css 2012-11-19 11:42:26 +0000
10+++ assets/css/site.css 2013-04-30 14:30:35 +0000
11@@ -160,7 +160,8 @@
12 margin-top: 20px;
13 float: none;
14 text-align: center;
15- width: 240px;
16+ width: auto;
17+ display: inline-block;
18 }
19
20 .box-event.developer {
21@@ -480,6 +481,7 @@
22
23 .page-agenda .row-hero {
24 background: url("../img/conference-calendar.png") no-repeat scroll 636px 0 transparent;
25+ min-height: 12em;
26 }
27
28 .page-agenda .row-hero p {
29
30=== modified file 'assets/doc/uds_sponsorship_brochure_california_2012.pdf' (properties changed: -x to +x)
31=== modified file 'assets/doc/uds_sponsorship_brochure_copenhagen_2012.pdf' (properties changed: -x to +x)
32=== modified file 'assets/img/background-cta.png' (properties changed: -x to +x)
33=== modified file 'assets/img/background-dots-developer.png' (properties changed: -x to +x)
34=== modified file 'assets/img/background-dots-enterprise.png' (properties changed: -x to +x)
35=== modified file 'assets/img/cloud-summit-pictograms.jpg' (properties changed: -x to +x)
36=== modified file 'assets/img/community-faces.jpg' (properties changed: -x to +x)
37=== modified file 'assets/img/conference-calendar.png' (properties changed: -x to +x)
38=== modified file 'assets/img/conference-faces.jpg' (properties changed: -x to +x)
39=== modified file 'assets/img/enterprise-banner.jpg' (properties changed: -x to +x)
40=== modified file 'assets/img/enterprise-format.png' (properties changed: -x to +x)
41=== modified file 'assets/img/enterprise-hero.png' (properties changed: -x to +x)
42=== modified file 'assets/img/enterprise-register.png' (properties changed: -x to +x)
43=== modified file 'assets/img/favicon.ico' (properties changed: -x to +x)
44=== modified file 'assets/img/header_bg.png' (properties changed: -x to +x)
45=== modified file 'assets/img/header_bg_active.png' (properties changed: -x to +x)
46=== modified file 'assets/img/home-articles.png' (properties changed: -x to +x)
47=== modified file 'assets/img/home-cloud-summit.png' (properties changed: -x to +x)
48=== modified file 'assets/img/home-collaboration.png' (properties changed: -x to +x)
49=== modified file 'assets/img/home-discussion.png' (properties changed: -x to +x)
50=== modified file 'assets/img/home-faces.jpg' (properties changed: -x to +x)
51=== modified file 'assets/img/home-ibm.png' (properties changed: -x to +x)
52=== modified file 'assets/img/home-ideas.png' (properties changed: -x to +x)
53=== modified file 'assets/img/home-intel.png' (properties changed: -x to +x)
54=== modified file 'assets/img/home-planning.png' (properties changed: -x to +x)
55=== modified file 'assets/img/home-vmware.png' (properties changed: -x to +x)
56=== modified file 'assets/img/logo-footer.png' (properties changed: -x to +x)
57=== modified file 'assets/img/logo-google.jpg' (properties changed: -x to +x)
58=== modified file 'assets/img/logo-header.png' (properties changed: -x to +x)
59=== modified file 'assets/img/logo-hp.jpg' (properties changed: -x to +x)
60=== modified file 'assets/img/logo-intel.jpg' (properties changed: -x to +x)
61=== modified file 'assets/img/logo-linaro.jpg' (properties changed: -x to +x)
62=== modified file 'assets/img/overlay-sprite.png' (properties changed: -x to +x)
63=== modified file 'assets/img/play.png' (properties changed: -x to +x)
64=== modified file 'assets/img/register-pictogram.png' (properties changed: -x to +x)
65=== modified file 'assets/img/register-tick.png' (properties changed: -x to +x)
66=== modified file 'assets/img/sponsors-citrix.png' (properties changed: -x to +x)
67=== modified file 'assets/img/sponsors-google.png' (properties changed: -x to +x)
68=== modified file 'assets/img/sponsors-hp.png' (properties changed: -x to +x)
69=== modified file 'assets/img/sponsors-intel.png' (properties changed: -x to +x)
70=== modified file 'assets/img/sponsors-linaro.png' (properties changed: -x to +x)
71=== modified file 'assets/img/sponsors-linuxpro.png' (properties changed: -x to +x)
72=== modified file 'assets/img/sponsors-pictogram.png' (properties changed: -x to +x)
73=== modified file 'assets/img/sponsors-system76.png' (properties changed: -x to +x)
74=== modified file 'assets/img/sponsors-ubuntuuser.png' (properties changed: -x to +x)
75=== modified file 'assets/img/v2/about-arrow-history.png' (properties changed: -x to +x)
76=== modified file 'assets/img/v2/about-background-history.png' (properties changed: -x to +x)
77=== modified file 'assets/img/v2/agenda-picto-listening.png' (properties changed: -x to +x)
78=== modified file 'assets/img/v2/agenda-picto-noting.png' (properties changed: -x to +x)
79=== modified file 'assets/img/v2/agenda-picto-recording.png' (properties changed: -x to +x)
80=== modified file 'assets/img/v2/agenda-picto-watching.png' (properties changed: -x to +x)
81=== modified file 'assets/img/v2/home-hero.png' (properties changed: -x to +x)
82=== modified file 'assets/img/v2/home-picto-collaboration.png' (properties changed: -x to +x)
83=== modified file 'assets/img/v2/home-picto-discussion.png' (properties changed: -x to +x)
84=== modified file 'assets/img/v2/home-picto-ideas.png' (properties changed: -x to +x)
85=== modified file 'assets/img/v2/home-picto-planning.png' (properties changed: -x to +x)
86=== modified file 'assets/img/v2/register-picto-developer.png' (properties changed: -x to +x)
87=== modified file 'assets/img/v2/register-picto-enterprise.png' (properties changed: -x to +x)
88=== modified file 'assets/img/v2/sponsors-picto-brochure.png' (properties changed: -x to +x)
89=== modified file 'assets/img/v2/ubuntu-tick.gif' (properties changed: -x to +x)
90=== modified file 'assets/img/v2/venue-background.png' (properties changed: -x to +x)
91=== modified file 'assets/img/v2/venue-logo-bella-center.png' (properties changed: -x to +x)
92=== modified file 'assets/img/v2/venue-logo-bella-sky.png' (properties changed: -x to +x)
93=== modified file 'assets/img/v2/yui-sprite.png' (properties changed: -x to +x)
94=== modified file 'assets/js/about-tabs.js' (properties changed: -x to +x)
95=== modified file 'assets/js/enterprise-tooltips.js' (properties changed: -x to +x)
96=== modified file 'assets/js/sponsors-carousel.js' (properties changed: -x to +x)
97=== modified file 'assets/js/sponsors-overlay.js' (properties changed: -x to +x)
98=== modified file 'footer.php' (properties changed: -x to +x)
99=== modified file 'functions.php' (properties changed: -x to +x)
100=== modified file 'header.php' (properties changed: -x to +x)
101=== modified file 'index.php' (properties changed: -x to +x)
102=== modified file 'partial-analytics.php' (properties changed: -x to +x)
103=== modified file 'partial-social.php' (properties changed: -x to +x)
104=== modified file 'partial-sponsors.php' (properties changed: -x to +x)
105=== modified file 'template-about.php' (properties changed: -x to +x)
106--- template-about.php 2013-02-26 17:13:30 +0000
107+++ template-about.php 2013-04-30 14:30:35 +0000
108@@ -8,20 +8,17 @@
109 <?php get_header(); ?>
110
111 <div class="row row-hero">
112- <div class="span-6">
113+ <div class="span-7">
114 <h1>Ubuntu Developer Summit</h1>
115- <p>The Ubuntu Developer Summit is where we get together to discuss, design, and
116- plan the future of Ubuntu. Taking place every three months online across a
117- range of interactive video sessions and available to all, join us to help
118- shape Ubuntu across the desktop, devices, and cloud.</p>
119+ <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>
120 </div>
121 </div><!-- END .row -->
122
123 <div class="row row-history row-full-grey first last">
124 <div class="clearfix">
125- <div class="span-4">
126+ <div class="span-7">
127 <h3>History of the Summit</h3>
128- <p>UDS is the biggest event in the calendar of the Ubuntu project. It takes place twice a year, in keeping with the release schedule.</p>
129+ <p>UDS has a long history of being the place where we define and discuss what the next version of Ubuntu will look like. The event started as a small and focused develop event before expanding into a larger scale event. In 2013 we moved UDS to an online setting to provide a more accessible and transparent forum in which we can shape Ubuntu&rsquo;s future.</p>
130 </div>
131 <div class="span-12 last">
132 <ul class="list-history">
133
134=== modified file 'template-agenda.php' (properties changed: -x to +x)
135--- template-agenda.php 2012-11-19 11:42:26 +0000
136+++ template-agenda.php 2013-04-30 14:30:35 +0000
137@@ -10,7 +10,7 @@
138 <div class="row row-hero">
139 <div class="span-6">
140 <h1>Agenda</h1>
141- <p>Learn everything you need to know about what's going on at the forthcoming Ubuntu Developer Summit and its sister event, the business-focussed Ubuntu Enterprise Summit.</p>
142+ <p>Learn everything you need to know about what's going on at the forthcoming Ubuntu Developer Summit.</p>
143 </div>
144 </div><!-- END .row -->
145
146@@ -20,81 +20,33 @@
147 <h3>Event schedules</h3>
148 <p>The Ubuntu Developer Summit is the event at which we plan for the forthcoming version of Ubuntu. It brings together Canonical engineers, community members, partners, upstream representatives and cloud specialists, in an environment of active debate.</p>
149 </div>
150- <div class="span-4">
151+ <div class="span-8 last">
152 <div class="box-event developer">
153- <h2>Developer Summit</h2>
154+ <h2>Ubuntu Developer Summit</h2>
155 <p><?php echo get_post_meta($post->ID, 'Agenda UDS Date', true) ?></p>
156 <p><?php echo get_post_meta($post->ID, 'Agenda UDS Copy', true) ?></p>
157 <a href="<?php echo get_post_meta($post->ID, 'Agenda UDS Tracks URL', true) ?>" class="link-cta<?php $url = get_post_meta($post->ID, 'Agenda UDS Tracks URL', true); if (empty($url)) { echo ' disabled'; } ?>">Tracks</a>
158- <a href="<?php echo get_post_meta($post->ID, 'Agenda UDS Plenaries URL', true) ?>" class="link-cta<?php $url = get_post_meta($post->ID, 'Agenda UDS Plenaries URL', true); if (empty($url)) { echo ' disabled'; } ?>">Plenaries</a>
159 <br class="clear" />
160 </div>
161 </div>
162- <div class="span-4 last">
163- <div class="box-event enterprise">
164- <h2>Enterprise Summit</h2>
165- <p><?php echo get_post_meta($post->ID, 'Agenda UES Date', true) ?></p>
166- <p><?php echo get_post_meta($post->ID, 'Agenda UES Copy', true) ?></p>
167- <a href="<?php echo get_post_meta($post->ID, 'Agenda UES URL', true) ?>" class="link-cta<?php $url = get_post_meta($post->ID, 'Agenda UES URL', true); if (empty($url)) { echo ' disabled'; } ?>">Enterprise Summit agenda</a>
168- </div>
169- </div>
170- </div>
171- </div><!-- END .row -->
172-
173- <div class="row row-evening">
174- <div class="clearfix">
175- <div class="span-4">
176- <h3>Evening schedule</h3>
177- <p>It's not all work at UDS. There's plenty to do in the evenings too, with events scheduled throughout the week.</p>
178- </div>
179- <div class="span-8 last">
180- <ul>
181- <?php
182- // Get posts
183- $args = array();
184- $args['post_type'] = 'evening events';
185- $args['order'] = 'asc';
186- $query = new WP_Query($args);
187- ?>
188- <?php
189- if ($query->have_posts()) : while ($query->have_posts()) : $query->the_post();
190- $evening_event_date = get_post_meta($post->ID, 'Evening Event Date', true);
191- $evening_event_time = get_post_meta($post->ID, 'Evening Event Time', true);
192- $evening_event_venue = get_post_meta($post->ID, 'Evening Event Venue', true);
193- ?>
194- <li>
195- <h5><?php echo $evening_event_date; ?></h5>
196- <div>
197- <h4><?php echo get_the_title(); ?></h4>
198- <p><?php echo $evening_event_time; ?>, <?php echo $evening_event_venue; ?></p>
199- <p><?php echo get_the_content(); ?></p>
200- </div>
201- <br class="clear" />
202- </li>
203- <?php
204- endwhile;
205- endif;
206- ?>
207- </ul>
208- </div>
209- </div>
210- </div><!-- END .row -->
211+ </div>
212+ </div>
213
214 <div class="row row-participation">
215 <div class="clearfix">
216 <div class="span-4">
217- <h3>Remote participation</h3>
218- <p>If you can't make the trip, don't worry. There are many ways you can participate from your home or office.</p>
219+ <h3>How to participate</h3>
220+ <p><?php echo get_post_meta($post->ID, 'How to participate', true) ?></p>
221 </div>
222 <div class="span-4">
223 <ul>
224 <li class="watching">
225 <h4>Watching</h4>
226- <p>Plenaries can be watched via <br/><a href="http://video.ubuntu.com/live">a live video stream</a>.</p>
227+ <p><?php echo get_post_meta($post->ID, 'Watching', true) ?></p>
228 </li>
229 <li class="noting">
230 <h4>Note taking</h4>
231- <p>For note taking, we use <a href="http://pad.ubuntu.com">a collaborative text editor called Etherpad</a>. Click on the notes icon <a href="http://summit.ubuntu.com/uds-r">on the schedule</a> to go directly to the notes for that particular session.</p>
232+ <p><?php echo get_post_meta($post->ID, 'Note taking', true) ?></p>
233 </li>
234 </ul>
235 </div>
236@@ -102,17 +54,14 @@
237 <ul>
238 <li class="listening">
239 <h4>Listening</h4>
240- <p>Plenaries can be listened to via <a href="http://icecast.ubuntu.com">a live audio stream</a>.</p>
241+ <p><?php echo get_post_meta($post->ID, 'Listening', true) ?></p>
242 </li>
243 <li class="recording">
244 <h4>Recordings</h4>
245- <p>We will be recording all the plenary sessions and a selection of other sessions. You can review the recorded videos as they appear on the <a href="http://ubuntu.mirocommunity.org">Ubuntu Community Channel</a>.</p>
246+ <p><?php echo get_post_meta($post->ID, 'Recordings', true) ?></p>
247 </li>
248 </ul>
249 </div>
250 </div>
251- </div><!-- END .row -->
252-
253- <?php get_template_part('partial', 'sponsors'); ?>
254-
255+ </div><!-- END .row -->
256 <?php get_footer(); ?>
257
258=== modified file 'template-cloud.php' (properties changed: -x to +x)
259=== modified file 'template-community.php' (properties changed: -x to +x)
260=== modified file 'template-conference.php' (properties changed: -x to +x)
261=== modified file 'template-default.php' (properties changed: -x to +x)
262=== modified file 'template-enterprise.php' (properties changed: -x to +x)
263=== modified file 'template-home.php' (properties changed: -x to +x)
264=== modified file 'template-register.php' (properties changed: -x to +x)
265--- template-register.php 2013-02-27 14:49:15 +0000
266+++ template-register.php 2013-04-30 14:30:35 +0000
267@@ -22,10 +22,10 @@
268 </div>
269 <div class="span-8 last">
270 <div class="box-event developer">
271- <h2>Developer Summit</h2>
272+ <h2>Ubuntu Developer Summit</h2>
273 <p><?php echo get_post_meta($post->ID, 'Register UDS Date', true) ?></p>
274 <p><?php echo get_post_meta($post->ID, 'Register UDS Copy', true) ?></p>
275- <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>
276+ <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 Ubuntu Developer Summit</a>
277 </div>
278 </div>
279 </div>
280
281=== modified file 'template-sponsors.php' (properties changed: -x to +x)
282=== modified file 'template-venue.php' (properties changed: -x to +x)

Subscribers

People subscribed via source and target branches