Skip to content

Commit 9ea5af5

Browse files
nicksloannicksloan
committed
Merge branch 'master' into prod
2 parents 79e6bde + a52b375 commit 9ea5af5

File tree

9 files changed

+93
-66
lines changed

9 files changed

+93
-66
lines changed

‎css/style.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,3 +462,6 @@ table.schedule tr.highlight td.minute {
462462
background-color: transparent;
463463
}
464464

465+
table.schedule a {
466+
color: #363636;
467+
}

‎resources/404.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h1>PHP Community
1010
<div id="nav">
1111
<ul>
1212
<li><a href="home">Home</a></li>
13-
<li><a href="speakers">Speakers</a></li>
13+
<li><a href="schedule">Schedule</a></li>
1414
<li><a href="location">Location</a></li>
1515
<li><a href="about">About</a></li>
1616
<li><a href="sponsorships">Sponsor</a></li>

‎resources/about.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ <h1>PHP Community
1010
<div id="nav">
1111
<ul>
1212
<li><a href="home">Home</a></li>
13-
<li><a href="speakers">Speakers</a></li>
13+
<li><a href="schedule">Schedule</a></li>
1414
<li><a href="location">Location</a></li>
1515
<li>About</li>
1616
<li><a href="sponsorships">Sponsor</a></li>

‎resources/home.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
1515
<div id="nav">
1616
<ul>
1717
<li>Home</li>
18-
<li><a href="speakers">Speakers</a></li>
18+
<li><a href="schedule">Schedule</a></li>
1919
<li><a href="location">Location</a></li>
2020
<li><a href="about">About</a></li>
2121
<li><a href="sponsorships">Sponsor</a></li>

‎resources/location.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h1>PHP Community
99
<div id="nav">
1010
<ul>
1111
<li><a href="home">Home</a></li>
12-
<li><a href="speakers">Speakers</a></li>
12+
<li><a href="schedule">Schedule</a></li>
1313
<li>Location</li>
1414
<li><a href="about">About</a></li>
1515
<li><a href="sponsorships">Sponsor</a></li>

‎resources/schedule.html‎

Lines changed: 76 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
$title = 'Speakers - ';
2+
$title = 'Schedule - ';
33
ob_start();
44
?>
55
<div id="container" class="sub speakers">
@@ -9,7 +9,7 @@ <h1>PHP Community
99
<div id="nav">
1010
<ul>
1111
<li><a href="home">Home</a></li>
12-
<li>Speakers</li>
12+
<li>Schedule</li>
1313
<li><a href="location">Location</a></li>
1414
<li><a href="about">About</a></li>
1515
<li><a href="sponsorships">Sponsor</a></li>
@@ -31,178 +31,219 @@ <h1>PHP Community
3131
</thead>
3232
<tbody>
3333
<tr>
34-
<td rowspan="4" class="hour">09</td>
34+
<td class="hour">09</td>
3535
<td class="minute">00</td>
3636
<td rowspan="4" colspan="2" class="registration">Registration Opens</td>
3737
<td rowspan="4" colspan="2" class="registration">Registration Opens</td>
3838
</tr>
3939
<tr>
40+
<td class="hour">09</td>
4041
<td class="minute">15</td>
4142
</tr>
4243
<tr>
44+
<td class="hour">09</td>
4345
<td class="minute">30</td>
4446
</tr>
4547
<tr>
48+
<td class="hour">09</td>
4649
<td class="minute">45</td>
4750
</tr>
4851
<tr>
49-
<td rowspan="4" class="hour">10</td>
52+
<td class="hour">10</td>
5053
<td class="minute">00</td>
51-
<td rowspan="12">Lorna Mitchell - Web Services</td>
52-
<td rowspan="12">Matthew Weier O'Phinney - Mastering
53-
Zend Framework 2 Patterns</td>
54-
<td colspan="2" rowspan="4">Rasmus Lerdorf - Opening
55-
Keynote</td>
54+
<td rowspan="12"><a
55+
href="speakers/#mitchell">Lorna Mitchell
56+
- Web Services</a></td>
57+
<td rowspan="12"><a href="speakers/#ophinney">Matthew Weier O'Phinney - Mastering
58+
Zend Framework 2 Patterns</a></td>
59+
<td colspan="2" rowspan="4"><a href="speakers/#lerdorf">Rasmus Lerdorf - Opening
60+
Keynote</a></td>
5661
</tr>
5762
<tr>
63+
<td class="hour">10</td>
5864
<td class="minute">15</td>
5965
</tr>
6066
<tr>
67+
<td class="hour">10</td>
6168
<td class="minute">30</td>
6269
</tr>
6370
<tr>
71+
<td class="hour">10</td>
6472
<td class="minute">45</td>
6573
</tr>
6674
<tr>
67-
<td rowspan="4" class="hour">11</td>
75+
<td class="hour">11</td>
6876
<td class="minute">00</td>
6977
<td rowspan="2" colspan="2" class="break">Break</td>
7078
</tr>
7179
<tr>
80+
<td class="hour">11</td>
7281
<td class="minute">15</td>
7382
</tr>
7483
<tr>
84+
<td class="hour">11</td>
7585
<td class="minute">30</td>
76-
<td rowspan="3">Brian Moon - Phorum</td>
77-
<td rowspan="3">Drew Mclellan - The Original Hypertext
78-
Preprocessor</td>
86+
<td rowspan="3"><a href="speakers/#moon">Brian Moon -
87+
Phorum</a></td>
88+
<td rowspan="3"><a href="speakers/#mclellan">Drew Mclellan - The Original Hypertext
89+
Preprocessor</a></td>
7990
</tr>
8091
<tr>
92+
<td class="hour">11</td>
8193
<td class="minute">45</td>
8294
</tr>
8395
<tr>
84-
<td rowspan="4" class="hour">12</td>
96+
<td class="hour">12</td>
8597
<td class="minute">00</td>
8698
</tr>
8799
<tr>
100+
<td class="hour">12</td>
88101
<td class="minute">15</td>
89102
<td rowspan="4" colspan="2" class="lunch">Lunch</td>
90103
</tr>
91104
<tr>
105+
<td class="hour">12</td>
92106
<td class="minute">30</td>
93107
</tr>
94108
<tr>
109+
<td class="hour">12</td>
95110
<td class="minute">45</td>
96111
</tr>
97112
<tr>
98-
<td rowspan="4" class="hour">13</td>
113+
<td class="hour">13</td>
99114
<td class="minute">00</td>
100115
<td rowspan="4" colspan="2" class="lunch">Lunch</td>
101116
</tr>
102117
<tr>
118+
<td class="hour">13</td>
103119
<td class="minute">15</td>
104-
<td rowspan="3">Ed Finkler - The Story of Spaz</td>
105-
<td rowspan="3">Paul Reinheimer - XHProf &amp;
106-
Wonderproxy</td>
120+
<td rowspan="3"><a href="speakers/#finkler">Ed Finkler
121+
- The Story of Spaz</a></td>
122+
<td rowspan="3"><a href="speakers/#reinheimer">Paul Reinheimer - XHProf &amp;
123+
Wonderproxy</a></td>
107124
</tr>
108125
<tr>
126+
<td class="hour">13</td>
109127
<td class="minute">30</td>
110128
</tr>
111129
<tr>
130+
<td class="hour">13</td>
112131
<td class="minute">45</td>
113132
</tr>
114133
<tr>
115-
<td rowspan="4" class="hour">14</td>
134+
<td class="hour">14</td>
116135
<td class="minute">00</td>
117-
<td rowspan="12">Helgi Þorbjörnsson - Frontend Caching:
118-
The New Frontier</td>
119-
<td rowspan="12">Jöel Perras - Lithium</td>
136+
<td rowspan="12"><a href="speakers/#securityoverride">Helgi Þorbjörnsson - Frontend Caching:
137+
The New Frontier</a></td>
138+
<td rowspan="12"><a href="speakers/#perras">Jöel Perras
139+
- Lithium</a></td>
120140
<td rowspan="2" colspan="2" class="break">Break</td>
121141
</tr>
122142
<tr>
143+
<td class="hour">14</td>
123144
<td class="minute">15</td>
124145
</tr>
125146
<tr>
147+
<td class="hour">14</td>
126148
<td class="minute">30</td>
127-
<td rowspan="3">Laura Beth Lincoln Denker - Is It
128-
Handmade Code If You Use Power Tools?</td>
129-
<td rowspan="3">Sean Coates - Gimme Bar</td>
149+
<td rowspan="3"><a href="speakers/#denker">Laura Beth Lincoln Denker - Is It
150+
Handmade Code If You Use Power Tools?</a></td>
151+
<td rowspan="3"><a href="speakers/#coates">Sean Coates - Gimme Bar</a></td>
130152
</tr>
131153
<tr>
154+
<td class="hour">14</td>
132155
<td class="minute">45</td>
133156
</tr>
134157
<tr>
135-
<td rowspan="4" class="hour">15</td>
158+
<td class="hour">15</td>
136159
<td class="minute">00</td>
137160
</tr>
138161
<tr>
162+
<td class="hour">15</td>
139163
<td class="minute">15</td>
140164
<td rowspan="2" colspan="2" class="break">Break</td>
141165
</tr>
142166
<tr>
167+
<td class="hour">15</td>
143168
<td class="minute">30</td>
144169
</tr>
145170
<tr>
171+
<td class="hour">15</td>
146172
<td class="minute">45</td>
147-
<td rowspan="3">Andrei Zmievski - The Good, The Bad
148-
&amp; The Ugly: What Happened to Unicode in PHP 6</td>
149-
<td rowspan="3">Marcel Esser - From Earth to Jupiter
150-
With NASA</td>
173+
<td rowspan="3"><a href="speakers/#zmievski">Andrei Zmievski - The Good, The Bad
174+
&amp; The Ugly: What Happened to Unicode in PHP
175+
6</a></td>
176+
<td rowspan="3"><a href="speakers/#esser">Marcel Esser - From Earth to Jupiter
177+
With NASA</a></td>
151178
</tr>
152179
<tr>
153-
<td rowspan="4" class="hour">16</td>
180+
<td class="hour">16</td>
154181
<td class="minute">00</td>
155182
</tr>
156183
<tr>
184+
<td class="hour">16</td>
157185
<td class="minute">15</td>
158186
</tr>
159187
<tr>
188+
<td class="hour">16</td>
160189
<td class="minute">30</td>
161190
<td rowspan="2" colspan="2" class="break">Break</td>
162191
</tr>
163192
<tr>
193+
<td class="hour">16</td>
164194
<td class="minute">45</td>
165195
</tr>
166196
<tr>
167-
<td rowspan="4" class="hour">17</td>
197+
<td class="hour">17</td>
168198
<td class="minute">00</td>
169199
<td rowspan="12" colspan="2"></td>
170-
<td rowspan="4" colspan="2">Terry Chay - Closing Keynote</td>
200+
<td rowspan="4" colspan="2"><a
201+
href="speakers/#chay">Terry Chay - Closing
202+
Keynote</a></td>
171203
</tr>
172204
<tr>
205+
<td class="hour">17</td>
173206
<td class="minute">15</td>
174207
</tr>
175208
<tr>
209+
<td class="hour">17</td>
176210
<td class="minute">30</td>
177211
</tr>
178212
<tr>
213+
<td class="hour">17</td>
179214
<td class="minute">45</td>
180215
</tr>
181216
<tr>
182-
<td rowspan="4" class="hour">18</td>
217+
<td class="hour">18</td>
183218
<td class="minute">00</td>
184219
<td rowspan="8" colspan="2">Ramsey Break Dances</td>
185220
</tr>
186221
<tr>
222+
<td class="hour">18</td>
187223
<td class="minute">15</td>
188224
</tr>
189225
<tr>
226+
<td class="hour">18</td>
190227
<td class="minute">30</td>
191228
</tr>
192229
<tr>
230+
<td class="hour">18</td>
193231
<td class="minute">45</td>
194232
</tr>
195233
<tr>
196-
<td rowspan="4" class="hour">19</td>
234+
<td class="hour">19</td>
197235
<td class="minute">00</td>
198236
</tr>
199237
<tr>
238+
<td class="hour">19</td>
200239
<td class="minute">15</td>
201240
</tr>
202241
<tr>
242+
<td class="hour">19</td>
203243
<td class="minute">30</td>
204244
</tr>
205245
<tr>
246+
<td class="hour">19</td>
206247
<td class="minute">45</td>
207248
</tr>
208249
</tbody>

0 commit comments

Comments
 (0)