Skip to content
Browse files

Merge branch 'master' of github.com:afresh1/hope_webos

  • Loading branch information...
2 parents 4cdd77b + bd843a6 commit d98af8df868557036fc2e7f43db62a0836ea2fa0 @afresh1 committed Jul 1, 2012
Showing with 237 additions and 6 deletions.
  1. +32 −6 bin/get_hn9.pl
  2. BIN logos/number9/background.gif
  3. BIN logos/number9/hope_number_nine.xcf
  4. BIN logos/number9/icon_32x32.png
  5. BIN logos/number9/icon_48x48.png
  6. BIN logos/number9/icon_64x64.png
  7. BIN logos/number9/masthead.jpg
  8. BIN logos/number9/navside_bg.jpg
  9. BIN logos/number9/nine.xcf
  10. +205 −0 logos/number9/styles.css
  11. 0 logos/{ → tnh}/icon_32x32.png
  12. 0 logos/{ → tnh}/icon_48x48.png
  13. 0 logos/{ → tnh}/icon_64x64.png
  14. 0 logos/{ → tnh}/tnh_logo_big_green.jpg
  15. 0 logos/{ → tnh}/tnh_logo_prototype.png
  16. 0 logos/{ → tnh}/tnh_logo_temp.png
  17. 0 logos/{ → tnh}/tnh_logo_wiki.png
  18. BIN screenshots/number9/hope-webos_2012-01-07_130103.png
  19. BIN screenshots/number9/hope-webos_2012-01-07_130130.png
  20. BIN screenshots/number9/hope-webos_2012-01-07_130217.png
  21. BIN screenshots/number9/hope-webos_2012-01-07_130234.png
  22. BIN screenshots/number9/hope-webos_2012-01-07_130258.png
  23. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134555.png
  24. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134603.png
  25. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134609.png
  26. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134659.png
  27. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134711.png
  28. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_134750.png
  29. 0 screenshots/{ → tnh}/hope-webos-beta_2010-08-07_135230.png
  30. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095125.png
  31. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095131.png
  32. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095136.png
  33. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095151.png
  34. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095157.png
  35. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_095213.png
  36. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_231535.png
  37. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_231543.png
  38. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_231606.png
  39. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_231611.png
  40. 0 screenshots/{ → tnh}/hope-webos-beta_2010-09-07_231616.png
  41. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_000235.png
  42. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_000245.png
  43. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_000256.png
  44. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_000309.png
  45. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_105415.png
  46. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_105428.png
  47. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_105435.png
  48. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_105441.png
  49. 0 screenshots/{ → tnh}/hope-webos-beta_2010-10-07_105445.png
  50. 0 screenshots/{ → tnh}/hope-webos-beta_2010-11-07_180408.png
  51. 0 screenshots/{ → tnh}/hope-webos-beta_2010-11-07_180419.png
  52. 0 screenshots/{ → tnh}/hope-webos-beta_2010-11-07_180430.png
  53. 0 screenshots/{ → tnh}/hope-webos-beta_2010-11-07_180439.png
  54. 0 screenshots/{ → tnh}/hope-webos-beta_2010-11-07_180443.png
  55. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_182408.png
  56. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_182426.png
  57. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_182436.png
  58. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_182444.png
  59. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_182449.png
  60. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_183137.png
  61. 0 screenshots/{ → tnh}/hope-webos_2010-11-07_183259.png
View
38 bin/get_hn9.pl
@@ -43,6 +43,19 @@
q{"} => qr/“|”/,
);
+my %fixup_ids = (
+ connos => 'connor',
+ gonzales => 'gonzalez',
+ klien => 'klein',
+ mrobinson => 'mrobison',
+ neaman => 'newman',
+ robinson => 'robison',
+ roboson => 'robison',
+ shaw => 'shah',
+ vilas => 'vivas',
+);
+
+
my $schedule = schedule();
print Mojo::JSON->new->encode($schedule);
@@ -59,12 +72,18 @@ sub speakers {
next unless $name;
next unless $name->all_text;
- $name->replace( $name->at('strong') );
+ #$name->replace( $name->at('strong') );
+ $name->replace('');
+
+ my $id = $fixup_ids{ $name->{name} } || $name->{name};
+ next unless $id;
+
+ warn "Already have a bio for $name" if $speakers{$id};
$bio = $bio->content_xml;
$bio =~ s/^\s+|\s+$//gs;
-
- $speakers{ $name->{name} } = {
+ $bio =~ s/^,\s*//; # remove the comma from Robert Steele's bio
+ $speakers{$id} = {
name => $name->all_text,
bio => $bio,
};
@@ -106,9 +125,14 @@ sub schedule {
next unless $id;
$speaker->replace('');
+ $id = $fixup_ids{ $id } || $id;
+
+ my $bio = $speakers->{$id}->{bio} || '';
+ warn "No bio for $speaker" unless $bio;
+
push @{ $talk{speakers} }, {
name => $speaker->all_text,
- bio => $speakers->{$id}->{bio} || '',
+ bio => $bio,
};
}
@@ -124,6 +148,7 @@ sub schedule {
if ( $ww ) {
$ww =~ s/^\s+|\s+$//g;
my ( $day, $time, @rooms ) = split /\s+/, $ww;
+ s/,$//g for @rooms;
my $length = '';
if ($rooms[-1] =~ /\)$/) {
@@ -144,10 +169,11 @@ sub schedule {
hours => $hours,
minutes => $minutes
);
-
+
$talk{when} = "$when";
$talk{timestamp} = $when->epoch;
- $talk{location} = join ' ', @rooms;
+ $talk{rooms} = \@rooms;
+ $talk{location} = join ', ', @rooms;
$talk{length} = $length if $length;
}
View
BIN logos/number9/background.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/hope_number_nine.xcf
Binary file not shown.
View
BIN logos/number9/icon_32x32.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/icon_48x48.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/icon_64x64.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/masthead.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/navside_bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN logos/number9/nine.xcf
Binary file not shown.
View
205 logos/number9/styles.css
@@ -0,0 +1,205 @@
+body {
+ margin: 0px;
+ background-color: #C2C1AA;
+ background-image: url(../images/background.gif);
+ background-repeat: repeat-y;
+ background-position: center;
+}
+p {
+ margin: 0px;
+ padding: 0px;
+}
+
+#div_wrapper {
+ width: 880px;
+ margin-top: 0px;
+ margin-right: auto;
+ margin-bottom: 0px;
+ margin-left: auto;
+}
+#div_header {
+ height: 350px;
+ background-color:#67a9b3;
+}
+#div_header h1 {
+ font-family: "Trebuchet MS", arial;
+ font-size: 31px;
+ font-weight: normal;
+ letter-spacing: 3px;
+ margin-top: 45px;
+ margin-right: 0px;
+ margin-bottom: 0px;
+ margin-left: 35px;
+ padding: 0px;
+ float: left;
+}
+
+h1{ margin-top:0px;}
+
+.div_toplinks {
+ float: right;
+ font-family: "Trebuchet MS", Arial, verdana;
+ font-size: 12px;
+ padding-top: 25px;
+ padding-right: 35px;
+ padding-bottom: 25px;
+ padding-left: 25px;
+}
+.div_toplinks a:link, a:visited {
+ text-decoration: none;
+ color: #000000;
+}
+.div_toplinks a:hover {
+ text-decoration: underline;
+}
+
+#div_navigation {
+ height: 57px;
+ background-image: url(../images/nav_bg.gif);
+ background-repeat: repeat-x;
+ margin: 0px;
+ clear: both;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+ padding-left: 25px;
+}
+#div_navigation a {
+ font-family: "Trebuchet MS", Arial, verdana;
+ font-size: 16px;
+ color: #FFFFFF;
+ text-decoration: none;
+ font-weight: normal;
+ display: block;
+ float: left;
+ padding-top: 18px;
+ padding-right: 18px;
+ padding-bottom: 18px;
+ padding-left: 18px;
+}
+#div_navigation a:link, a:visited {
+ color: #FFFFFF;
+}
+
+#navlinksmain a {
+ font-family: "Trebuchet MS", Arial, verdana;
+ font-size: 16px;
+ font-weight: bold;
+ text-decoration: none;
+ display: block;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #D5D4BC;
+ padding: 5px;
+ color: #5F6345;
+}
+#navlinksmain a:visited {
+ color: #5F6345;
+}
+
+#navlinksmain a:hover {
+ background-color: #F3F2E4;
+}
+#navlinksmain {
+ margin-bottom: 55px;
+}
+
+#div_leftcol {
+ width: 500px;
+ padding-top: 40px;
+ padding-right: 50px;
+ padding-bottom: 20px;
+ padding-left: 50px;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ line-height: 21px;
+ color: #000000;
+ float: left;
+}
+#div_leftcol p {
+ padding: 0px;
+ margin-top: 0px;
+ margin-right: 0px;
+ margin-bottom: 19px;
+ margin-left: 0px;
+}
+#div_navlinks {
+ float: right;
+ background-image: url(../images/navside_bg.jpg);
+ height: 550px;
+ background-repeat: no-repeat;
+ padding-left: 70px;
+ padding-top: 15px;
+ width: 189px;
+ padding-right: 15px;
+}
+#div_rightcol h2 {
+ font-family: "Trebuchet MS", Arial, verdana;
+ font-size: 18px;
+ font-weight: normal;
+ display: block;
+ background-image: url(../images/button.gif);
+ background-repeat: no-repeat;
+ padding-top: 7px;
+ padding-right: 7px;
+ padding-bottom: 7px;
+ padding-left: 55px;
+ color: #FFFFFF;
+ margin: 0px;
+}
+#div_navlinks h2 a {
+ text-decoration: none;
+ color: #FFFFFF;
+ display: block;
+ margin: 0px;
+ padding: 0px;
+}
+
+.contentarea {
+ margin-top: 25px;
+}
+#div_footer {
+ clear: both;
+ font-family: "Trebuchet MS", Arial, verdana;
+ font-size: 12px;
+ padding-top: 15px;
+ padding-right: 15px;
+ padding-bottom: 15px;
+ padding-left: 45px;
+ background-color: #F0F0F0;
+ border-top-width: 1px;
+ border-top-style: solid;
+ border-top-color: #D6D6D6;
+}
+#div_footer a:link, a:visited {
+ color: #046466;
+}
+
+/* Additions by @Skram */
+#image-logo {
+ margin-left:85px;
+ width:100%;
+ height:100%;
+ background-image: url(../images/masthead.jpg);
+ background-repeat:no-repeat;
+}
+
+#top-navigation{
+ position:relative;
+ left:520px;
+ top:-330px;
+ width:300px;
+}
+#top-navigation ul{margin: 0; padding: 0; list-style-type: none; list-style-image: none;}
+#top-navigation li{ padding: 5px 20px 5px 20px;}
+#top-navigation li a:hover{ color: teal;}
+#top-navigation li a{
+ font-family: 'Orbitron', sans-serif;
+ display:block;
+ letter-spacing:2px;
+ font-weight: 600;
+ color: #67a9b3;
+ line-height:110%;
+ text-decoration:none;
+ height:24px;
+}
View
0 logos/icon_32x32.png → logos/tnh/icon_32x32.png
File renamed without changes
View
0 logos/icon_48x48.png → logos/tnh/icon_48x48.png
File renamed without changes
View
0 logos/icon_64x64.png → logos/tnh/icon_64x64.png
File renamed without changes
View
0 logos/tnh_logo_big_green.jpg → logos/tnh/tnh_logo_big_green.jpg
File renamed without changes
View
0 logos/tnh_logo_prototype.png → logos/tnh/tnh_logo_prototype.png
File renamed without changes
View
0 logos/tnh_logo_temp.png → logos/tnh/tnh_logo_temp.png
File renamed without changes
View
0 logos/tnh_logo_wiki.png → logos/tnh/tnh_logo_wiki.png
File renamed without changes
View
BIN screenshots/number9/hope-webos_2012-01-07_130103.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN screenshots/number9/hope-webos_2012-01-07_130130.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN screenshots/number9/hope-webos_2012-01-07_130217.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN screenshots/number9/hope-webos_2012-01-07_130234.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN screenshots/number9/hope-webos_2012-01-07_130258.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0 ...ots/hope-webos-beta_2010-08-07_134555.png → ...tnh/hope-webos-beta_2010-08-07_134555.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_134603.png → ...tnh/hope-webos-beta_2010-08-07_134603.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_134609.png → ...tnh/hope-webos-beta_2010-08-07_134609.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_134659.png → ...tnh/hope-webos-beta_2010-08-07_134659.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_134711.png → ...tnh/hope-webos-beta_2010-08-07_134711.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_134750.png → ...tnh/hope-webos-beta_2010-08-07_134750.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-08-07_135230.png → ...tnh/hope-webos-beta_2010-08-07_135230.png
File renamed without changes
View
0 ...ots/hope-webos-beta_2010-09-07_095125.png → ...tnh/hope-webos-beta_2010-09-07_095125.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_095131.png → ...tnh/hope-webos-beta_2010-09-07_095131.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_095136.png → ...tnh/hope-webos-beta_2010-09-07_095136.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_095151.png → ...tnh/hope-webos-beta_2010-09-07_095151.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_095157.png → ...tnh/hope-webos-beta_2010-09-07_095157.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_095213.png → ...tnh/hope-webos-beta_2010-09-07_095213.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_231535.png → ...tnh/hope-webos-beta_2010-09-07_231535.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_231543.png → ...tnh/hope-webos-beta_2010-09-07_231543.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_231606.png → ...tnh/hope-webos-beta_2010-09-07_231606.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_231611.png → ...tnh/hope-webos-beta_2010-09-07_231611.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-09-07_231616.png → ...tnh/hope-webos-beta_2010-09-07_231616.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_000235.png → ...tnh/hope-webos-beta_2010-10-07_000235.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_000245.png → ...tnh/hope-webos-beta_2010-10-07_000245.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_000256.png → ...tnh/hope-webos-beta_2010-10-07_000256.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_000309.png → ...tnh/hope-webos-beta_2010-10-07_000309.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_105415.png → ...tnh/hope-webos-beta_2010-10-07_105415.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_105428.png → ...tnh/hope-webos-beta_2010-10-07_105428.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_105435.png → ...tnh/hope-webos-beta_2010-10-07_105435.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_105441.png → ...tnh/hope-webos-beta_2010-10-07_105441.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-10-07_105445.png → ...tnh/hope-webos-beta_2010-10-07_105445.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-11-07_180408.png → ...tnh/hope-webos-beta_2010-11-07_180408.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-11-07_180419.png → ...tnh/hope-webos-beta_2010-11-07_180419.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-11-07_180430.png → ...tnh/hope-webos-beta_2010-11-07_180430.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-11-07_180439.png → ...tnh/hope-webos-beta_2010-11-07_180439.png
Diff not rendered.
View
0 ...ots/hope-webos-beta_2010-11-07_180443.png → ...tnh/hope-webos-beta_2010-11-07_180443.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_182408.png → ...hots/tnh/hope-webos_2010-11-07_182408.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_182426.png → ...hots/tnh/hope-webos_2010-11-07_182426.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_182436.png → ...hots/tnh/hope-webos_2010-11-07_182436.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_182444.png → ...hots/tnh/hope-webos_2010-11-07_182444.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_182449.png → ...hots/tnh/hope-webos_2010-11-07_182449.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_183137.png → ...hots/tnh/hope-webos_2010-11-07_183137.png
Diff not rendered.
View
0 screenshots/hope-webos_2010-11-07_183259.png → ...hots/tnh/hope-webos_2010-11-07_183259.png
Diff not rendered.

0 comments on commit d98af8d

Please sign in to comment.
Something went wrong with that request. Please try again.