From 4c6f2ff942b3849da2a17df04970fce773042c02 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 1 Mar 2017 11:00:32 +0100 Subject: [PATCH 1/3] remove faint circle --- lib/vrng/src/vrng/sporktrum.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vrng/src/vrng/sporktrum.cljs b/lib/vrng/src/vrng/sporktrum.cljs index a4a2481dc..6b92a8e23 100644 --- a/lib/vrng/src/vrng/sporktrum.cljs +++ b/lib/vrng/src/vrng/sporktrum.cljs @@ -24,7 +24,7 @@ ;; --- STATE & HELPERS -(defonce audio (atom {:volume 10})) +(defonce audio (atom {:volume 0})) (swap! audio assoc :browser (.browser js/window)) From 2056491b0fbf39b328b69ddfe2f0f5d2d7b8a405 Mon Sep 17 00:00:00 2001 From: phil Date: Wed, 1 Mar 2017 11:46:31 +0100 Subject: [PATCH 2/3] some wording changes --- app/views/pages/publish_talk.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/pages/publish_talk.html.haml b/app/views/pages/publish_talk.html.haml index d13da1a49..013e403df 100644 --- a/app/views/pages/publish_talk.html.haml +++ b/app/views/pages/publish_talk.html.haml @@ -21,7 +21,7 @@ %li = link_to new_talk_path, class: 'big-button' do = naked_icon "clock" - schedule live talk + schedule live stream %p.publish-advice = t('.advice_live').html_safe %li @@ -48,13 +48,13 @@ %li = link_to new_talk_path, class: 'big-button' do = naked_icon "clock" - schedule live talk + schedule live stream %p.publish-advice = t('.advice_live').html_safe %li = link_to new_talk_path(talk: {dryrun: true}), class: 'big-button' do = naked_icon "beaker" - test a talk + test live stream %p.publish-advice = t('.advice_test').html_safe From 6dfcba5c633fb186ef22220c2421dfd00b8a67f8 Mon Sep 17 00:00:00 2001 From: phil Date: Thu, 2 Mar 2017 10:44:37 +0100 Subject: [PATCH 3/3] some wording changes --- lib/vrng/src/vrng/venues/core.cljs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/vrng/src/vrng/venues/core.cljs b/lib/vrng/src/vrng/venues/core.cljs index 6b5041f63..89ac1e738 100644 --- a/lib/vrng/src/vrng/venues/core.cljs +++ b/lib/vrng/src/vrng/venues/core.cljs @@ -188,6 +188,7 @@ (filter #(= (venue-device-id) (:id %)) (user-owned-devices)))) +;; TODO use correct name, noop is not (defn device-display-name [] (or (venue-device-name) (:name (selected-device)))) @@ -631,7 +632,7 @@ (device-display-name)] [:button#device-button.tiny.button.btn-white.btn-hover-green {:on-click toggle-source-wizard-action} - "change streaming source"]]) + "choose streaming source"]]) (defn talk-item-comp [talk] ^{:key (:id talk)} @@ -667,7 +668,7 @@ [:span.float-right.time-info (format-countdown (time-to-next-talk))]] ;;) [:div#next - [:a {:href (new-talk-path)} "+ Create a Talk"]]) + [:a {:href (new-talk-path)} "+ Schedule Live Stream"]]) ;;dropdown [:div#list-toggle