From de5612e5b2dcdda9791ddb99230ca95f18cfc916 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 12:21:50 -0800 Subject: [PATCH 01/13] back to working gmail share, mobile is broken though --- src/main.js | 14 +++++++++----- src/views/Misc/tpl/ShareButtons.html | 3 +-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main.js b/src/main.js index 126f438..902ec68 100644 --- a/src/main.js +++ b/src/main.js @@ -403,13 +403,17 @@ define(function(require, exports, module) { // }], text: 'Share the guide and follow @Loggly on twitter to enter to win VIP to re:Invent 2015. First 100 get a limited edition shirt!', email: { - subject: 'AWS re:Invent Must Have Guide!', + subject: encodeURI('AWS re:Invent Must Have Guide!'), - body: "If you're headed to AWS re:Invent, you need this! %0D%0A" + - "Use this crowdsourced mobile guide to score killer booth swag and access to after-parties %0D%0A%0D%0A" + - "http://loggly.com/reinvent %0D%0A%0D%0A" + - "Bonus: share the guide and follow Loggly on twitter to be entered to win a VIP pass to AWS re:Invent 2015, first 100 get a limited edition shirt from their booth." + body: encodeURI("If you're headed to AWS re:Invent, you need this! \r\n" + + "Use this crowdsourced mobile guide to score killer booth swag and access to after-parties \r\n\r\n" + + "http://loggly.com/reinvent \r\n\r\n" + + "Bonus: share the guide and follow Loggly on twitter to be entered to win a VIP pass to AWS re:Invent 2015, first 100 get a limited edition shirt from their booth.") }, + // email_gmail: { + // subject: 'AWS Crowdsourced guide!', + // body: 'http://loggly.com/reinvent' + // }, twitter: { text: encodeURI('Awesome mobile crowdsourced AWS #reInvent guide to score booth swag and after-party access http://loggly.com/reinvent via @Loggly').replace(/\#/g, "%23") }, diff --git a/src/views/Misc/tpl/ShareButtons.html b/src/views/Misc/tpl/ShareButtons.html index 77c628b..389b9b6 100644 --- a/src/views/Misc/tpl/ShareButtons.html +++ b/src/views/Misc/tpl/ShareButtons.html @@ -6,8 +6,7 @@ {{#if email}}
  • - {{print email.subject}} - + From 258a81231ab5d8d69e065b413c04f9848dab6b56 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 12:22:15 -0800 Subject: [PATCH 02/13] removed my email --- src/views/Misc/tpl/ShareButtons.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/Misc/tpl/ShareButtons.html b/src/views/Misc/tpl/ShareButtons.html index 389b9b6..e695e51 100644 --- a/src/views/Misc/tpl/ShareButtons.html +++ b/src/views/Misc/tpl/ShareButtons.html @@ -6,7 +6,8 @@ {{#if email}}
  • - + {{print email.subject}} + From 51f5f3e43bd39b4275d0694bdae5104ece72f39b Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 12:48:49 -0800 Subject: [PATCH 03/13] copy --- src/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 902ec68..b823312 100644 --- a/src/main.js +++ b/src/main.js @@ -403,8 +403,9 @@ define(function(require, exports, module) { // }], text: 'Share the guide and follow @Loggly on twitter to enter to win VIP to re:Invent 2015. First 100 get a limited edition shirt!', email: { + // subject: 'bullshit this works', + // body: 'tsting this again', subject: encodeURI('AWS re:Invent Must Have Guide!'), - body: encodeURI("If you're headed to AWS re:Invent, you need this! \r\n" + "Use this crowdsourced mobile guide to score killer booth swag and access to after-parties \r\n\r\n" + "http://loggly.com/reinvent \r\n\r\n" + From 3e1ee62285d475413a6ac41f157e648eec023e96 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 13:48:07 -0800 Subject: [PATCH 04/13] copy updates --- css/app.css | 10 +-- src/main.js | 4 +- src/models/data/party_list.json | 105 ++++++++++++++++---------------- src/models/data/tip_list.json | 3 +- src/views/Party/tpl/Party.html | 10 +-- 5 files changed, 67 insertions(+), 65 deletions(-) diff --git a/css/app.css b/css/app.css index ac25810..5f80bd5 100644 --- a/css/app.css +++ b/css/app.css @@ -238,9 +238,10 @@ box-shadow: 0px 4px 10px -5px rgba(0,0,0,0.75); } -.party-list-item > div > div.name { - font-size: 22px; - line-height: 28px; +.party-list-item div.name a, +.party-list-item div.name { + font-size: 20px; + line-height: 24px; color: #000; } @@ -268,12 +269,11 @@ } -.party-list-item > div .starttime { +.party-list-item > div .details { font-size: 18px; line-height: 24px; color: #555; - } diff --git a/src/main.js b/src/main.js index b823312..ca275aa 100644 --- a/src/main.js +++ b/src/main.js @@ -98,8 +98,8 @@ require.config({ // "src/lib/requestAnimationFrame.js", }, - urlArgs: new Date().toString(), - // urlArgs: 'v1.8' + // urlArgs: new Date().toString(), + urlArgs: 'v1.9' }); diff --git a/src/models/data/party_list.json b/src/models/data/party_list.json index c611175..73541ee 100644 --- a/src/models/data/party_list.json +++ b/src/models/data/party_list.json @@ -1,79 +1,80 @@ [ + { + "Event":"T2.microbrews, hosted by Evident.io and Cloudability", + "Link":"http://t2microbrews.splashthat.com/", + "When":"11/11 19:00", + "Details":"Free, but invite only at Public House." + }, + { + "Event":"Gene Kim Book Signing and Giveaway", + "Link":"http://blog.threatstack.com/labs/2014/10/6/bringing-infosec-into-the-devops-tribe-qa-with-gene-kim", + "When":"11/12 11:00", + "Details":"Free for all attendees at Booth #742." + }, { "Event":"Beer & Banter - free beer in Skytap booth", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 16:00", - "Where":"Booth #104" + "Link":"", + "When":"11/12 16:00", + "Details":"Free for all attendees at Booth #104." }, { - "Event":"2nd Watch: 2W After Party", - "Who":"Invite Only", - "Fee":"Free", - "Starttime":"11/12 21:00", - "Where":"V Bar" + "Event":"AWS Pub Crawl", + "Link":"https://fbcdn-sphotos-c-a.akamaihd.net/hphotos-ak-xpa1/v/t1.0-9/10603769_699869066787108_2174703295657704170_n.jpg?oh=a5b9aed004fbe6528d0853a91cb3bb9e&oe=54E5526F&__gda__=1423951831_a7b9b8f1d00d99ac47a3d079e639ae7a", + "When":"11/12 17:30", + "Details":"Free for all attendees" }, { "Event":"VictorOps: AWS re:Invent Pub Crawl", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 17:30", - "Where":"V Bar" + "Link":"http://try.victorops.com/AWS-reInvent-bar-crawl-2014", + "When":"11/12 17:30", + "Details":"Free for all attendees at V Bar." }, { "Event":"Pubcrawl at Aquanix", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 17:30", - "Where":"Aquaknox" + "Link":"http://go.datadoghq.com/Pub-Crawl-DD-LE-PD?utm_source=datadog", + "When":"11/12 17:30", + "Details":"Free for all attendees at Aquaknox." }, { - "Event":"Gene Kim Book Signing and Giveaway", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 11:00", - "Where":"Booth #742" + "Event":"Booth Crawl Prize Drawing! ", + "Link":"http://www.zeffirinolasvegas.com/", + "When":"11/12 17:30", + "Details":"Free for all attendees at Zeffirino." }, { - "Event":"DISYS client appreciation event", - "Who":"Invite Only", - "Fee":"Free", - "Starttime":"11/12 19:00", - "Where":"Lounge at Tao" + "Event":"Pub Crawl @ Morels w/ Alfresco", + "Link":"http://www.cloudnexa.com/reinvent-2014/", + "When":"11/12 17:30", + "Details":"Free for all attendees at Morels @ the Palazzo." }, { - "Event":"Booth Crawl Prize Drawing! ", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 17:30", - "Where":"Zeffirino" + "Event":"Evident.io Super Hero Pub Crawl", + "Link":"http://evidentpubcrawl.splashthat.com/", + "When":"11/12 17:30", + "Details":"Free for all attendees at Madame Tussauds." }, { - "Event":"T2.microbrews, hosted by Evident.io and Cloudability", - "Who":"Invite Only", - "Fee":"Free", - "Starttime":"11/11 19:00", - "Where":"Public House" + "Event":"DISYS client appreciation event", + "Link":"https://www.eventbrite.com/e/disys-customer-appreciation-event-tickets-13536930323", + "When":"11/12 19:00", + "Details":"Free, but invite only at the Lounge at Tao." }, { - "Event":"Pub Crawl @ Morels w/ Alfresco", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 17:30", - "Where":"Morels @ the Palazzo" + "Event":"2nd Watch: 2W After Party", + "Link":"", + "When":"11/12 21:00", + "Details":"Free, but invite only at V Bar." }, { - "Event":"Evident.io Super Hero Pub Crawl", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 17:30", - "Where":"Madame Tussauds" + "Event":"Nike Silicon Forest After-Party", + "Link":"http://nikeaws14.splashthat.com/ds", + "When":"11/12 22:00", + "Details":"Free for all attendees at The Rockhouse." }, { - "Event":"Nike Silicon Forest After-Party", - "Who":"All attendees", - "Fee":"Free", - "Starttime":"11/12 22:00", - "Where":"The Rockhouse" + "Event":"Re:Play Party", + "Link":"", + "When":"11/13 20:00", + "Details":"Free for all attendees" } ] \ No newline at end of file diff --git a/src/models/data/tip_list.json b/src/models/data/tip_list.json index 6146e2b..7f0c23f 100644 --- a/src/models/data/tip_list.json +++ b/src/models/data/tip_list.json @@ -72,5 +72,6 @@ ["Tips for #Winning","Winning Tip: Always Gamble On An Empty Stomach","Read more on this study that examined the counterintuitive hypothesis that hunger improves strategic decision making, arguing that people in a hot state are better able to make favorable decisions involving uncertain outcomes... maybe it will be your winning tip at the black jack table!","","" ], ["","","","View Article »","http://www.plosone.org/article/info:doi/10.1371/journal.pone.0111081" ], ["","Weather Forecast","","View Current Weather »","http://www.weather.com/weather/tenday/Las+Vegas+NV+USNV0049" ], - ["","Dont Forget:","• Comfortable shoes\n• Business Cards\n• Sweatshirt - Vegas is hot, but it's cold inside the casinos!\n• Extra phone charger - bonus if it is portable\n• Download and set up all your social media apps before you get there - there will be lots of info and pictures you'll want to share!\n• Use Evernote's mobile business card scanner feature to quickly and easily upload new contact information before you loose track of the card.\n","","" ] + ["","Dont Forget:","• Comfortable shoes\n• Business Cards\n• Sweatshirt - Vegas is hot, but it's cold inside the casinos!\n• Extra phone charger - bonus if it is portable\n• Download and set up all your social media apps before you get there - there will be lots of info and pictures you'll want to share!\n• Use Evernote's mobile business card scanner feature to quickly and easily upload new contact information before you loose track of the card.\n","","" ], + ["","Share this guide!","Find this guide awesome? Tweet it!","Tweet this Guide >>","http://twitter.com/intent/tweet?text=Don%27t%20miss%20the%20%231%20crowdsourced%20mobile%20%23AWS%20%23reInvent%20Guide%20for%20the%20best%20parties%2C%20booth%20swag%20%26%20sessions%3A%20loggly.com%2Freinvent%20via%20%40Loggly" ] ] \ No newline at end of file diff --git a/src/views/Party/tpl/Party.html b/src/views/Party/tpl/Party.html index f7473a1..aa50434 100644 --- a/src/views/Party/tpl/Party.html +++ b/src/views/Party/tpl/Party.html @@ -1,11 +1,11 @@
    - {{Event}} -
    -
    - {{Who}} - {{Fee}} + {{Event}}
    - {{Moment Starttime "ddd h:mma"}} @ {{Where}} + {{Moment When "ddd h:mma"}} +
    +
    + {{Details}}
    \ No newline at end of file From 47e629d06c51248eda621e9fcc58157041dee8d5 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 13:50:00 -0800 Subject: [PATCH 05/13] require Share earyly --- src/main.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main.js b/src/main.js index ca275aa..af4e235 100644 --- a/src/main.js +++ b/src/main.js @@ -356,6 +356,9 @@ define(function(require, exports, module) { // Main Header/Topbar (for sharing) var createMainTopbar = function(){ + // Require the PopoverShare for later + require('views/Misc/PopoverShare'); + App.Views.MainTopBar = new View(); App.Views.MainTopBar.Bg = new Surface({ From 395420ee5228c2c4d6a69387046b860bea0f0011 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 13:58:11 -0800 Subject: [PATCH 06/13] no links for missing links --- src/views/Party/tpl/Party.html | 6 +++++- src/views/Speaker/tpl/Speaker.html | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/views/Party/tpl/Party.html b/src/views/Party/tpl/Party.html index aa50434..5c67b96 100644 --- a/src/views/Party/tpl/Party.html +++ b/src/views/Party/tpl/Party.html @@ -1,6 +1,10 @@
    - {{Event}} + {{#if Link}} + {{Event}} + {{else}} + {{Event}} + {{/if}}
    {{Moment When "ddd h:mma"}} diff --git a/src/views/Speaker/tpl/Speaker.html b/src/views/Speaker/tpl/Speaker.html index 4afac00..1412461 100644 --- a/src/views/Speaker/tpl/Speaker.html +++ b/src/views/Speaker/tpl/Speaker.html @@ -1,6 +1,10 @@
    - {{Session}} + {{#if Link}} + {{Session}} + {{else}} + {{Session}} + {{/if}}
    {{Company}} From 61030c034e930152a7008b4603ccb2734086bc79 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 14:02:16 -0800 Subject: [PATCH 07/13] added nolink for missing links --- css/general.css | 8 +++++--- src/router.js | 5 ++++- src/views/Party/tpl/Party.html | 2 +- src/views/Speaker/tpl/Speaker.html | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/css/general.css b/css/general.css index 56ff5a2..c5a0e77 100644 --- a/css/general.css +++ b/css/general.css @@ -340,12 +340,14 @@ body { border: 1px solid #eee; - border-radius: 3px; + text-align: center; + + /*border-radius: 3px; -webkit-border-radius: 3px; -webkit-box-shadow: 0px 4px 10px -5px rgba(0,0,0,0.75); -moz-box-shadow: 0px 4px 10px -5px rgba(0,0,0,0.75); - box-shadow: 0px 4px 10px -5px rgba(0,0,0,0.75); + box-shadow: 0px 4px 10px -5px rgba(0,0,0,0.75);*/ } @@ -962,7 +964,7 @@ input[type="submit"].form-button-submit-default.cancel-button { color: white; /*padding: 8px 14px;*/ padding: 0px 8px; - + font-weight: bold; line-height: 48px; font-size: 18px; diff --git a/src/router.js b/src/router.js index 968ec4e..fc5f28c 100644 --- a/src/router.js +++ b/src/router.js @@ -45,6 +45,9 @@ define(function(require, exports, module) { // App.history.navigate('dash'); } }, + 'nolink' : function(){ + Utils.Popover.Alert('No link for this one!','OK'); + }, 'logout(/:force)' : function(){ @@ -227,7 +230,7 @@ define(function(require, exports, module) { 'tips/list' : function(){ document.title = 'Crowdsourced AWS ReInvent Guide: Vegas Tips'; - + App.Views.MainFooter.route_show = true; App.Views.MainFooter.Tabs.select('tips', false); defaultRoute('Tips', 'Tips/List', arguments); diff --git a/src/views/Party/tpl/Party.html b/src/views/Party/tpl/Party.html index 5c67b96..2ebcbb3 100644 --- a/src/views/Party/tpl/Party.html +++ b/src/views/Party/tpl/Party.html @@ -3,7 +3,7 @@ {{#if Link}} {{Event}} {{else}} - {{Event}} + {{Event}} {{/if}}
    diff --git a/src/views/Speaker/tpl/Speaker.html b/src/views/Speaker/tpl/Speaker.html index 1412461..920e1d0 100644 --- a/src/views/Speaker/tpl/Speaker.html +++ b/src/views/Speaker/tpl/Speaker.html @@ -3,7 +3,7 @@ {{#if Link}} {{Session}} {{else}} - {{Session}} + {{Session}} {{/if}}
    From 3db0c933f5b3a9383d2620c17653f2366dee917f Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 14:05:17 -0800 Subject: [PATCH 08/13] _blank --- src/views/Party/tpl/Party.html | 2 +- src/views/Speaker/tpl/Speaker.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Party/tpl/Party.html b/src/views/Party/tpl/Party.html index 2ebcbb3..f8ac8e4 100644 --- a/src/views/Party/tpl/Party.html +++ b/src/views/Party/tpl/Party.html @@ -1,7 +1,7 @@
    {{#if Link}} - {{Event}} + {{Event}} {{else}} {{Event}} {{/if}} diff --git a/src/views/Speaker/tpl/Speaker.html b/src/views/Speaker/tpl/Speaker.html index 920e1d0..1ae050c 100644 --- a/src/views/Speaker/tpl/Speaker.html +++ b/src/views/Speaker/tpl/Speaker.html @@ -1,7 +1,7 @@
    {{#if Link}} - {{Session}} + {{Session}} {{else}} {{Session}} {{/if}} From e044fbb513343b6c10e0148362e898745d984554 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 14:05:31 -0800 Subject: [PATCH 09/13] _blank --- src/views/Tips/tpl/Tip.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/Tips/tpl/Tip.html b/src/views/Tips/tpl/Tip.html index d514904..e20fcfb 100644 --- a/src/views/Tips/tpl/Tip.html +++ b/src/views/Tips/tpl/Tip.html @@ -12,7 +12,7 @@
    {{#if tip.[3]}} - {{tip.[3]}} + {{tip.[3]}} {{else}} {{tip.[2]}} {{/if}} @@ -27,7 +27,7 @@
    {{#if [3]}} - {{[3]}} + {{[3]}} {{else}} {{[2]}} {{/if}} From 58024f7c995a2cc97285f85e60d4171dd3979b5c Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 14:32:07 -0800 Subject: [PATCH 10/13] removed --- config.xml | 233 ------------------------------------- index_old.html | 43 ------- locales/dev/locale.strings | 1 - locales/dev/ns.common.json | 11 -- locales/en/locale.strings | 1 - locales/ru/locale.strings | 1 - locales/ru/ns.common.json | 11 -- plugins.txt | 6 - 8 files changed, 307 deletions(-) delete mode 100644 config.xml delete mode 100644 index_old.html delete mode 100644 locales/dev/locale.strings delete mode 100644 locales/dev/ns.common.json delete mode 100644 locales/en/locale.strings delete mode 100644 locales/ru/locale.strings delete mode 100644 locales/ru/ns.common.json delete mode 100644 plugins.txt diff --git a/config.xml b/config.xml deleted file mode 100644 index 9e97c86..0000000 --- a/config.xml +++ /dev/null @@ -1,233 +0,0 @@ - - - - Alchemist - - Alchemist Accelerator - - - Nicholas Reed - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/index_old.html b/index_old.html deleted file mode 100644 index bde5741..0000000 --- a/index_old.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - Hello World - - -
    -

    Apache Cordova

    - -
    - - - - - diff --git a/locales/dev/locale.strings b/locales/dev/locale.strings deleted file mode 100644 index 63333da..0000000 --- a/locales/dev/locale.strings +++ /dev/null @@ -1 +0,0 @@ -"dummy" = "dummy"; \ No newline at end of file diff --git a/locales/dev/ns.common.json b/locales/dev/ns.common.json deleted file mode 100644 index 9cd3566..0000000 --- a/locales/dev/ns.common.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "app": { - "name": "Waiting App" - }, - "footer" : { - "waiting" : "Home", - "messages" : "Messages", - "profiles" : "Profiles", - "friends" : "Friends" - } -} \ No newline at end of file diff --git a/locales/en/locale.strings b/locales/en/locale.strings deleted file mode 100644 index 63333da..0000000 --- a/locales/en/locale.strings +++ /dev/null @@ -1 +0,0 @@ -"dummy" = "dummy"; \ No newline at end of file diff --git a/locales/ru/locale.strings b/locales/ru/locale.strings deleted file mode 100644 index 63333da..0000000 --- a/locales/ru/locale.strings +++ /dev/null @@ -1 +0,0 @@ -"dummy" = "dummy"; \ No newline at end of file diff --git a/locales/ru/ns.common.json b/locales/ru/ns.common.json deleted file mode 100644 index cb518dc..0000000 --- a/locales/ru/ns.common.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "app": { - "name": "Немезида" - }, - "footer" : { - "highlights" : "основные моменты", - "play" : "играть", - "news" : "новости", - "profiles" : "профили" - } -} \ No newline at end of file diff --git a/plugins.txt b/plugins.txt deleted file mode 100644 index 38b588a..0000000 --- a/plugins.txt +++ /dev/null @@ -1,6 +0,0 @@ - -# Android -cordova plugin add https://github.com/nicholasareed/cordova-plugin-datepicker - -# iOS -cordova plugin add https://github.com/nicholasareed/cordova-plugin-datepicker From 49beaf3af3b5b21a56fc678bb5dfc4429e66a334 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Mon, 10 Nov 2014 15:36:25 -0800 Subject: [PATCH 11/13] dates and times working --- src/models/data/party_list.json | 26 +++++++++++++------------- src/models/data/speaker_list.json | 30 +++++++++++++++--------------- src/views/Party/tpl/Party.html | 2 +- src/views/Speaker/tpl/Speaker.html | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/models/data/party_list.json b/src/models/data/party_list.json index 73541ee..6b2b96b 100644 --- a/src/models/data/party_list.json +++ b/src/models/data/party_list.json @@ -2,79 +2,79 @@ { "Event":"T2.microbrews, hosted by Evident.io and Cloudability", "Link":"http://t2microbrews.splashthat.com/", - "When":"11/11 19:00", + "When":"Tuesday 7:00pm", "Details":"Free, but invite only at Public House." }, { "Event":"Gene Kim Book Signing and Giveaway", "Link":"http://blog.threatstack.com/labs/2014/10/6/bringing-infosec-into-the-devops-tribe-qa-with-gene-kim", - "When":"11/12 11:00", + "When":"Wednesday 11:00am", "Details":"Free for all attendees at Booth #742." }, { "Event":"Beer & Banter - free beer in Skytap booth", "Link":"", - "When":"11/12 16:00", + "When":"Wednesday 4:00pm", "Details":"Free for all attendees at Booth #104." }, { "Event":"AWS Pub Crawl", "Link":"https://fbcdn-sphotos-c-a.akamaihd.net/hphotos-ak-xpa1/v/t1.0-9/10603769_699869066787108_2174703295657704170_n.jpg?oh=a5b9aed004fbe6528d0853a91cb3bb9e&oe=54E5526F&__gda__=1423951831_a7b9b8f1d00d99ac47a3d079e639ae7a", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees" }, { "Event":"VictorOps: AWS re:Invent Pub Crawl", "Link":"http://try.victorops.com/AWS-reInvent-bar-crawl-2014", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees at V Bar." }, { "Event":"Pubcrawl at Aquanix", "Link":"http://go.datadoghq.com/Pub-Crawl-DD-LE-PD?utm_source=datadog", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees at Aquaknox." }, { "Event":"Booth Crawl Prize Drawing! ", "Link":"http://www.zeffirinolasvegas.com/", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees at Zeffirino." }, { "Event":"Pub Crawl @ Morels w/ Alfresco", "Link":"http://www.cloudnexa.com/reinvent-2014/", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees at Morels @ the Palazzo." }, { "Event":"Evident.io Super Hero Pub Crawl", "Link":"http://evidentpubcrawl.splashthat.com/", - "When":"11/12 17:30", + "When":"Wednesday 5:30pm", "Details":"Free for all attendees at Madame Tussauds." }, { "Event":"DISYS client appreciation event", "Link":"https://www.eventbrite.com/e/disys-customer-appreciation-event-tickets-13536930323", - "When":"11/12 19:00", + "When":"Wednesday 7:00pm", "Details":"Free, but invite only at the Lounge at Tao." }, { "Event":"2nd Watch: 2W After Party", "Link":"", - "When":"11/12 21:00", + "When":"Wednesday 9:00pm", "Details":"Free, but invite only at V Bar." }, { "Event":"Nike Silicon Forest After-Party", "Link":"http://nikeaws14.splashthat.com/ds", - "When":"11/12 22:00", + "When":"Wednesday 10:00pm", "Details":"Free for all attendees at The Rockhouse." }, { "Event":"Re:Play Party", "Link":"", - "When":"11/13 20:00", + "When":"Thursday 8:00pm", "Details":"Free for all attendees" } ] \ No newline at end of file diff --git a/src/models/data/speaker_list.json b/src/models/data/speaker_list.json index f9917f5..9364ec3 100644 --- a/src/models/data/speaker_list.json +++ b/src/models/data/speaker_list.json @@ -3,105 +3,105 @@ "Company":"Infor", "Session":"ENT202 - Four Keys to Move Your Core Business Applications to the Cloud", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10644", - "When":"11/12 11:00", + "When":"Wednesday 11:00am", "Level":"All Levels" }, { "Company":"Dome9", "Session":"Deep Dive Demo on AWS Security (@booth 1036)", "Link":"", - "When":"11/12 13:00", + "When":"Wednesday 1:00pm", "Level":"All Levels" }, { "Company":"Loggly", "Session":"SDD408 - Amazon Route 53 Deep Dive: Delivering Resiliency, Minimizing Latency", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=8992&tclass=popup", - "When":"11/12 13:15", + "When":"Wednesday 1:15pm", "Level":"Expert" }, { "Company":"Cloudability", "Session":"ENT207 - Creating a Culture of Cost Management in Your Organization", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10848", - "When":"11/12 14:15", + "When":"Wednesday 2:15pm", "Level":"Advanced" }, { "Company":"Datadog", "Session":"APP309 - Running & Monitoring Docker Containers at Scale", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10584", - "When":"11/12 16:30", + "When":"Wednesday 4:30pm", "Level":"Advanced" }, { "Company":"Cloudability", "Session":"ENT203 - Iterating Your Way To 95% Reserved Instance Usage", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10846", - "When":"11/12 16:30", + "When":"Wednesday 4:30pm", "Level":"Advanced" }, { "Company":"PagerDuty", "Session":"CTO-to-CTO Fireside Chat with Dr. Werner Vogels", "Link":"https://www.portal.reinvent.awsevents.com/connect/search.ww#loadSearch-searchPhrase=miklas&searchType=speaker&tc=0&sortBy=", - "When":"11/13 14:00", + "When":"Thursday 2:00pm", "Level":"All Levels" }, { "Company":"Cloudnexa & Clear ", "Session":"What do Airports & Sports Stadiums Have in Common? Managed Cloud Solutions Underpin Fast Secure Entry", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10904", - "When":"11/13 14:00", + "When":"Thursday 2:00pm", "Level":"Introductory" }, { "Company":"Docker", "Session":"APP303 - Lightning Fast Deploys with Docker Containers and AWS", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=8977", - "When":"11/13 14:15", + "When":"Thursday 2:15pm", "Level":"Advanced" }, { "Company":"Yamaha & 2nd Watch", "Session":"Yamaha Corporation: Migrating Business Applications to AWS ", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=11284", - "When":"11/13 14:15", + "When":"Thursday 2:15pm", "Level":"Advanced" }, { "Company":"RightScale", "Session":"AWS & VMware: How to Architect & Manage Hybrid Environments", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=10966", - "When":"11/13 15:15", + "When":"Thursday 3:15pm", "Level":"Expert" }, { "Company":"Ping Identity", "Session":"Integrating AWS with External Identity Management", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=9439", - "When":"11/13 16:30", + "When":"Thursday 4:30pm", "Level":"Advanced" }, { "Company":"Looker", "Session":"Modern BI @ AWS Marketplace", "Link":"", - "When":"11/13 17:15", + "When":"Thursday 5:15pm", "Level":"Introductory" }, { "Company":"Socialmetrix", "Session":"ARC202 - Real-World Real-Time Analytics", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=8813", - "When":"11/13 17:30", + "When":"Thursday 5:30pm", "Level":"All Levels" }, { "Company":"Cycle Computing", "Session":"HPC on AWS: Results from the Record-breaking 156,000 Core MegaRun, and Insights to On-demand Clusters for Manufacturing Production Workloads", "Link":"https://www.portal.reinvent.awsevents.com/connect/sessionDetail.ww?SESSION_ID=9885", - "When":"11/14 10:00", + "When":"Friday 10:00am", "Level":"Advanced" } ] \ No newline at end of file diff --git a/src/views/Party/tpl/Party.html b/src/views/Party/tpl/Party.html index f8ac8e4..04b3f78 100644 --- a/src/views/Party/tpl/Party.html +++ b/src/views/Party/tpl/Party.html @@ -7,7 +7,7 @@ {{/if}}
    - {{Moment When "ddd h:mma"}} + {{When}}
    {{Details}} diff --git a/src/views/Speaker/tpl/Speaker.html b/src/views/Speaker/tpl/Speaker.html index 1ae050c..7ea41cb 100644 --- a/src/views/Speaker/tpl/Speaker.html +++ b/src/views/Speaker/tpl/Speaker.html @@ -10,6 +10,6 @@ {{Company}}
    - {{Level}} - {{Moment When "ddd, h:mma"}} + {{Level}} - {{When}}
    \ No newline at end of file From 53a7dd57a562fbe91454b7b7363d02cc8b052eeb Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Tue, 11 Nov 2014 16:52:46 -0800 Subject: [PATCH 12/13] Exhibit hall time --- src/models/data/tip_list.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/models/data/tip_list.json b/src/models/data/tip_list.json index 7f0c23f..19f473f 100644 --- a/src/models/data/tip_list.json +++ b/src/models/data/tip_list.json @@ -25,7 +25,7 @@ ["","AWS GameDay","11/11, 10:00-18:00","","" ], ["","","","More Details »","https://reinvent.awsevents.com/gameday.html" ], ["","Opening Keynote","11/12, 09:00-10:30","","" ], - ["","Exhibit Hall Open - Sands Hall C","11/12-11/13, 10:30-18:00","","" ], + ["","Exhibit Hall Open - Sands Hall C","11/11 5pm-8pm and 11/12-11/13, 10:30-18:00","","" ], ["","AWS Pub Crawl","11/12, 17:30 - 19:30","","" ], ["","","","View the Casino Level Pub Crawl Map »","http://loggly.com/reinvent/img/maps/ReInvent_PubCrawl-CasinoLevel.png" ], ["","","","View the Level 2 Pub Crawl Map »","http://loggly.com/reinvent/img/maps/ReInvent_PubCrawl-Level2.png" ], From 2109cabc1128f1cc5cc922419b8cfbf3828b7c29 Mon Sep 17 00:00:00 2001 From: Nicholas Reed Date: Tue, 11 Nov 2014 17:32:01 -0800 Subject: [PATCH 13/13] day of updates --- src/models/data/booth_list.json | 112 +++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 1 deletion(-) diff --git a/src/models/data/booth_list.json b/src/models/data/booth_list.json index 8dc0210..73560ad 100644 --- a/src/models/data/booth_list.json +++ b/src/models/data/booth_list.json @@ -157,7 +157,7 @@ { "Company":"PagerDuty", "Booth":948, - "Giveaway":"MacBook Air, GoPro, Uber Gift Card, Pebble Steel Watch" + "Giveaway":"Giving away a MacBook Air and a GoPro" }, { "Company":"ElasticBox", @@ -243,5 +243,115 @@ "Company":"Orchestrate", "Booth":1432, "Giveaway":"The only all-in-one database service is giving away a Pinoccio (pinnocc.io) board. Come by the booth and pick up a pair of sunglasses, shirts, stickers, and enter to win. " + }, + { + "Company":"Global Knowledge", + "Booth":1045, + "Giveaway":"Giving away a voice-activated R2D2 and t-shirt." + }, + { + "Company":"Gravitant", + "Booth":633, + "Giveaway":"We'll be giving away Google Chromecasts, plenty of candy, and a Kindle Fire tablet too." + }, + { + "Company":"Cazena", + "Booth":1035, + "Giveaway":"Cotton Candy" + }, + { + "Company":"Palerra", + "Booth":1130, + "Giveaway":"Hourly giveaways of Beats Headphone or GoPro Hero 3+" + }, + { + "Company":"Accenture", + "Booth":425, + "Giveaway":"F1 fan? Come test drive your agility in an awesome simulator." + }, + { + "Company":"CoreSite", + "Booth":512, + "Giveaway":"Booth visitors will receive a free usb connector!" + }, + { + "Company":"Calm.io", + "Booth":1342, + "Giveaway":"Look out for our awesome 'Stay Calm.io' t-shirts, 6000 mAh battery banks, pens and other stuff!" + }, + { + "Company":"Atlassian", + "Booth":556, + "Giveaway":"t-shirts" + }, + { + "Company":"NuoDB", + "Booth":551, + "Giveaway":"shirts and notebooks" + }, + { + "Company":"CloudEndure", + "Booth":548, + "Giveaway":"remote helicopters" + }, + { + "Company":"MindPoint", + "Booth":649, + "Giveaway":"t-shirts and pens" + }, + { + "Company":"Safenet", + "Booth":644, + "Giveaway":"parrot ar drone 2.0" + }, + { + "Company":"Zayo", + "Booth":643, + "Giveaway":"Amazon fire tv, t-shirts, remote controlled helipcopters" + }, + { + "Company":"Softnas", + "Booth":638, + "Giveaway":"spin the wheel to win a daily prize" + }, + { + "Company":"Tibco Jaspersoft", + "Booth":539, + "Giveaway":"t-shirts \"what happens in the cloud stays in the cloud\"" + }, + { + "Company":"AppZero", + "Booth":533, + "Giveaway":"win an ipad for taking a survey" + }, + { + "Company":"Gravitant", + "Booth":633, + "Giveaway":"candy, pens, usb sticks" + }, + { + "Company":"Cloudamize", + "Booth":630, + "Giveaway":"tweet a picture of the booth and you could win an iPad mini 3" + }, + { + "Company":"Trend micro", + "Booth":625, + "Giveaway":"t-shirts, tote bags. Enter to win a $500 Amazon gift card" + }, + { + "Company":"Citrix", + "Booth":415, + "Giveaway":"Scan your badge to be entered to win a 13.3 MacBook Air" + }, + { + "Company":"Chef", + "Booth":506, + "Giveaway":"water bottles" + }, + { + "Company":"Attunity", + "Booth":639, + "Giveaway":"Las Vegas disaster recovery kit, cell phone and tablet cleaners, bags, Amazon gift card giveaway contest for following @attunity" } ] \ No newline at end of file