Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

  • Loading branch information...
commit d98af8df868557036fc2e7f43db62a0836ea2fa0 2 parents 4cdd77b + bd843a6
Andrew Fresh authored

Showing 61 changed files with 237 additions and 6 deletions. Show diff stats Hide diff stats

  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
38 bin/get_hn9.pl
@@ -43,6 +43,19 @@
43 43 q{"} => qr/“|”/,
44 44 );
45 45
  46 +my %fixup_ids = (
  47 + connos => 'connor',
  48 + gonzales => 'gonzalez',
  49 + klien => 'klein',
  50 + mrobinson => 'mrobison',
  51 + neaman => 'newman',
  52 + robinson => 'robison',
  53 + roboson => 'robison',
  54 + shaw => 'shah',
  55 + vilas => 'vivas',
  56 +);
  57 +
  58 +
46 59 my $schedule = schedule();
47 60 print Mojo::JSON->new->encode($schedule);
48 61
@@ -59,12 +72,18 @@ sub speakers {
59 72 next unless $name;
60 73 next unless $name->all_text;
61 74
62   - $name->replace( $name->at('strong') );
  75 + #$name->replace( $name->at('strong') );
  76 + $name->replace('');
  77 +
  78 + my $id = $fixup_ids{ $name->{name} } || $name->{name};
  79 + next unless $id;
  80 +
  81 + warn "Already have a bio for $name" if $speakers{$id};
63 82
64 83 $bio = $bio->content_xml;
65 84 $bio =~ s/^\s+|\s+$//gs;
66   -
67   - $speakers{ $name->{name} } = {
  85 + $bio =~ s/^,\s*//; # remove the comma from Robert Steele's bio
  86 + $speakers{$id} = {
68 87 name => $name->all_text,
69 88 bio => $bio,
70 89 };
@@ -106,9 +125,14 @@ sub schedule {
106 125 next unless $id;
107 126 $speaker->replace('');
108 127
  128 + $id = $fixup_ids{ $id } || $id;
  129 +
  130 + my $bio = $speakers->{$id}->{bio} || '';
  131 + warn "No bio for $speaker" unless $bio;
  132 +
109 133 push @{ $talk{speakers} }, {
110 134 name => $speaker->all_text,
111   - bio => $speakers->{$id}->{bio} || '',
  135 + bio => $bio,
112 136 };
113 137 }
114 138
@@ -124,6 +148,7 @@ sub schedule {
124 148 if ( $ww ) {
125 149 $ww =~ s/^\s+|\s+$//g;
126 150 my ( $day, $time, @rooms ) = split /\s+/, $ww;
  151 + s/,$//g for @rooms;
127 152
128 153 my $length = '';
129 154 if ($rooms[-1] =~ /\)$/) {
@@ -144,10 +169,11 @@ sub schedule {
144 169 hours => $hours,
145 170 minutes => $minutes
146 171 );
147   -
  172 +
148 173 $talk{when} = "$when";
149 174 $talk{timestamp} = $when->epoch;
150   - $talk{location} = join ' ', @rooms;
  175 + $talk{rooms} = \@rooms;
  176 + $talk{location} = join ', ', @rooms;
151 177 $talk{length} = $length if $length;
152 178 }
153 179
BIN  logos/number9/background.gif
BIN  logos/number9/hope_number_nine.xcf
Binary file not shown
BIN  logos/number9/icon_32x32.png
BIN  logos/number9/icon_48x48.png
BIN  logos/number9/icon_64x64.png
BIN  logos/number9/masthead.jpg
BIN  logos/number9/navside_bg.jpg
BIN  logos/number9/nine.xcf
Binary file not shown
205 logos/number9/styles.css
... ... @@ -0,0 +1,205 @@
  1 +body {
  2 + margin: 0px;
  3 + background-color: #C2C1AA;
  4 + background-image: url(../images/background.gif);
  5 + background-repeat: repeat-y;
  6 + background-position: center;
  7 +}
  8 +p {
  9 + margin: 0px;
  10 + padding: 0px;
  11 +}
  12 +
  13 +#div_wrapper {
  14 + width: 880px;
  15 + margin-top: 0px;
  16 + margin-right: auto;
  17 + margin-bottom: 0px;
  18 + margin-left: auto;
  19 +}
  20 +#div_header {
  21 + height: 350px;
  22 + background-color:#67a9b3;
  23 +}
  24 +#div_header h1 {
  25 + font-family: "Trebuchet MS", arial;
  26 + font-size: 31px;
  27 + font-weight: normal;
  28 + letter-spacing: 3px;
  29 + margin-top: 45px;
  30 + margin-right: 0px;
  31 + margin-bottom: 0px;
  32 + margin-left: 35px;
  33 + padding: 0px;
  34 + float: left;
  35 +}
  36 +
  37 +h1{ margin-top:0px;}
  38 +
  39 +.div_toplinks {
  40 + float: right;
  41 + font-family: "Trebuchet MS", Arial, verdana;
  42 + font-size: 12px;
  43 + padding-top: 25px;
  44 + padding-right: 35px;
  45 + padding-bottom: 25px;
  46 + padding-left: 25px;
  47 +}
  48 +.div_toplinks a:link, a:visited {
  49 + text-decoration: none;
  50 + color: #000000;
  51 +}
  52 +.div_toplinks a:hover {
  53 + text-decoration: underline;
  54 +}
  55 +
  56 +#div_navigation {
  57 + height: 57px;
  58 + background-image: url(../images/nav_bg.gif);
  59 + background-repeat: repeat-x;
  60 + margin: 0px;
  61 + clear: both;
  62 + padding-top: 0px;
  63 + padding-right: 0px;
  64 + padding-bottom: 0px;
  65 + padding-left: 25px;
  66 +}
  67 +#div_navigation a {
  68 + font-family: "Trebuchet MS", Arial, verdana;
  69 + font-size: 16px;
  70 + color: #FFFFFF;
  71 + text-decoration: none;
  72 + font-weight: normal;
  73 + display: block;
  74 + float: left;
  75 + padding-top: 18px;
  76 + padding-right: 18px;
  77 + padding-bottom: 18px;
  78 + padding-left: 18px;
  79 +}
  80 +#div_navigation a:link, a:visited {
  81 + color: #FFFFFF;
  82 +}
  83 +
  84 +#navlinksmain a {
  85 + font-family: "Trebuchet MS", Arial, verdana;
  86 + font-size: 16px;
  87 + font-weight: bold;
  88 + text-decoration: none;
  89 + display: block;
  90 + border-bottom-width: 1px;
  91 + border-bottom-style: solid;
  92 + border-bottom-color: #D5D4BC;
  93 + padding: 5px;
  94 + color: #5F6345;
  95 +}
  96 +#navlinksmain a:visited {
  97 + color: #5F6345;
  98 +}
  99 +
  100 +#navlinksmain a:hover {
  101 + background-color: #F3F2E4;
  102 +}
  103 +#navlinksmain {
  104 + margin-bottom: 55px;
  105 +}
  106 +
  107 +#div_leftcol {
  108 + width: 500px;
  109 + padding-top: 40px;
  110 + padding-right: 50px;
  111 + padding-bottom: 20px;
  112 + padding-left: 50px;
  113 + font-family: Arial, Helvetica, sans-serif;
  114 + font-size: 12px;
  115 + line-height: 21px;
  116 + color: #000000;
  117 + float: left;
  118 +}
  119 +#div_leftcol p {
  120 + padding: 0px;
  121 + margin-top: 0px;
  122 + margin-right: 0px;
  123 + margin-bottom: 19px;
  124 + margin-left: 0px;
  125 +}
  126 +#div_navlinks {
  127 + float: right;
  128 + background-image: url(../images/navside_bg.jpg);
  129 + height: 550px;
  130 + background-repeat: no-repeat;
  131 + padding-left: 70px;
  132 + padding-top: 15px;
  133 + width: 189px;
  134 + padding-right: 15px;
  135 +}
  136 +#div_rightcol h2 {
  137 + font-family: "Trebuchet MS", Arial, verdana;
  138 + font-size: 18px;
  139 + font-weight: normal;
  140 + display: block;
  141 + background-image: url(../images/button.gif);
  142 + background-repeat: no-repeat;
  143 + padding-top: 7px;
  144 + padding-right: 7px;
  145 + padding-bottom: 7px;
  146 + padding-left: 55px;
  147 + color: #FFFFFF;
  148 + margin: 0px;
  149 +}
  150 +#div_navlinks h2 a {
  151 + text-decoration: none;
  152 + color: #FFFFFF;
  153 + display: block;
  154 + margin: 0px;
  155 + padding: 0px;
  156 +}
  157 +
  158 +.contentarea {
  159 + margin-top: 25px;
  160 +}
  161 +#div_footer {
  162 + clear: both;
  163 + font-family: "Trebuchet MS", Arial, verdana;
  164 + font-size: 12px;
  165 + padding-top: 15px;
  166 + padding-right: 15px;
  167 + padding-bottom: 15px;
  168 + padding-left: 45px;
  169 + background-color: #F0F0F0;
  170 + border-top-width: 1px;
  171 + border-top-style: solid;
  172 + border-top-color: #D6D6D6;
  173 +}
  174 +#div_footer a:link, a:visited {
  175 + color: #046466;
  176 +}
  177 +
  178 +/* Additions by @Skram */
  179 +#image-logo {
  180 + margin-left:85px;
  181 + width:100%;
  182 + height:100%;
  183 + background-image: url(../images/masthead.jpg);
  184 + background-repeat:no-repeat;
  185 +}
  186 +
  187 +#top-navigation{
  188 + position:relative;
  189 + left:520px;
  190 + top:-330px;
  191 + width:300px;
  192 +}
  193 +#top-navigation ul{margin: 0; padding: 0; list-style-type: none; list-style-image: none;}
  194 +#top-navigation li{ padding: 5px 20px 5px 20px;}
  195 +#top-navigation li a:hover{ color: teal;}
  196 +#top-navigation li a{
  197 + font-family: 'Orbitron', sans-serif;
  198 + display:block;
  199 + letter-spacing:2px;
  200 + font-weight: 600;
  201 + color: #67a9b3;
  202 + line-height:110%;
  203 + text-decoration:none;
  204 + height:24px;
  205 +}
0  logos/icon_32x32.png → logos/tnh/icon_32x32.png
File renamed without changes
0  logos/icon_48x48.png → logos/tnh/icon_48x48.png
File renamed without changes
0  logos/icon_64x64.png → logos/tnh/icon_64x64.png
File renamed without changes
0  logos/tnh_logo_big_green.jpg → logos/tnh/tnh_logo_big_green.jpg
File renamed without changes
0  logos/tnh_logo_prototype.png → logos/tnh/tnh_logo_prototype.png
File renamed without changes
0  logos/tnh_logo_temp.png → logos/tnh/tnh_logo_temp.png
File renamed without changes
0  logos/tnh_logo_wiki.png → logos/tnh/tnh_logo_wiki.png
File renamed without changes
BIN  screenshots/number9/hope-webos_2012-01-07_130103.png
BIN  screenshots/number9/hope-webos_2012-01-07_130130.png
BIN  screenshots/number9/hope-webos_2012-01-07_130217.png
BIN  screenshots/number9/hope-webos_2012-01-07_130234.png
BIN  screenshots/number9/hope-webos_2012-01-07_130258.png
0  screenshots/hope-webos-beta_2010-08-07_134555.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134555.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_134603.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134603.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_134609.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134609.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_134659.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134659.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_134711.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134711.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_134750.png → ...enshots/tnh/hope-webos-beta_2010-08-07_134750.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-08-07_135230.png → ...enshots/tnh/hope-webos-beta_2010-08-07_135230.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095125.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095125.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095131.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095131.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095136.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095136.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095151.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095151.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095157.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095157.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_095213.png → ...enshots/tnh/hope-webos-beta_2010-09-07_095213.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_231535.png → ...enshots/tnh/hope-webos-beta_2010-09-07_231535.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_231543.png → ...enshots/tnh/hope-webos-beta_2010-09-07_231543.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_231606.png → ...enshots/tnh/hope-webos-beta_2010-09-07_231606.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_231611.png → ...enshots/tnh/hope-webos-beta_2010-09-07_231611.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-09-07_231616.png → ...enshots/tnh/hope-webos-beta_2010-09-07_231616.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_000235.png → ...enshots/tnh/hope-webos-beta_2010-10-07_000235.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_000245.png → ...enshots/tnh/hope-webos-beta_2010-10-07_000245.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_000256.png → ...enshots/tnh/hope-webos-beta_2010-10-07_000256.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_000309.png → ...enshots/tnh/hope-webos-beta_2010-10-07_000309.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_105415.png → ...enshots/tnh/hope-webos-beta_2010-10-07_105415.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_105428.png → ...enshots/tnh/hope-webos-beta_2010-10-07_105428.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_105435.png → ...enshots/tnh/hope-webos-beta_2010-10-07_105435.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_105441.png → ...enshots/tnh/hope-webos-beta_2010-10-07_105441.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-10-07_105445.png → ...enshots/tnh/hope-webos-beta_2010-10-07_105445.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-11-07_180408.png → ...enshots/tnh/hope-webos-beta_2010-11-07_180408.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-11-07_180419.png → ...enshots/tnh/hope-webos-beta_2010-11-07_180419.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-11-07_180430.png → ...enshots/tnh/hope-webos-beta_2010-11-07_180430.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-11-07_180439.png → ...enshots/tnh/hope-webos-beta_2010-11-07_180439.png
File renamed without changes
0  screenshots/hope-webos-beta_2010-11-07_180443.png → ...enshots/tnh/hope-webos-beta_2010-11-07_180443.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_182408.png → screenshots/tnh/hope-webos_2010-11-07_182408.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_182426.png → screenshots/tnh/hope-webos_2010-11-07_182426.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_182436.png → screenshots/tnh/hope-webos_2010-11-07_182436.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_182444.png → screenshots/tnh/hope-webos_2010-11-07_182444.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_182449.png → screenshots/tnh/hope-webos_2010-11-07_182449.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_183137.png → screenshots/tnh/hope-webos_2010-11-07_183137.png
File renamed without changes
0  screenshots/hope-webos_2010-11-07_183259.png → screenshots/tnh/hope-webos_2010-11-07_183259.png
File renamed without changes

0 comments on commit d98af8d

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