seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

* fix any youtube URI in http

This commit is contained in:
Seth Call 2015-05-15 16:14:18 -05:00
parent 2c6a5fe81a
commit b0cfad89f1
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/app/controllers/users_controller.rb
View File

@ -366,12 +366,12 @@ class UsersController < ApplicationController
end if params[:id].present? && (service=params[:service]).present?
service ||= 'facebook'
url = CGI::escape('http://www.jamkazam.com')
url = CGI::escape('https://www.jamkazam.com')
txt = CGI::escape('Check out JamKazam -- Play music together over the Internet as if in the same room')
if 'twitter'==service
url = "https://twitter.com/intent/tweet?text=#{txt}&url=#{url}"
elsif 'facebook'==service
url = "http://www.facebook.com/sharer/sharer.php?u=#{url}&t=#{txt}"
url = "https://www.facebook.com/sharer/sharer.php?u=#{url}&t=#{txt}"
elsif 'google'==service
url = "https://plus.google.com/share?url=#{url}"
end

12
web/app/views/clients/_ftue.html.erb
View File

@ -140,20 +140,20 @@
<ul class="device_type">
<li class="ftue-video-link first"
external-link-win="http://www.youtube.com/watch?v=b1JrwGeUcOo"
external-link-mac="http://www.youtube.com/watch?v=TRzb7OTlO-Q">
external-link-win="https://www.youtube.com/watch?v=b1JrwGeUcOo"
external-link-mac="https://www.youtube.com/watch?v=TRzb7OTlO-Q">
AUDIO DEVICE WITH PORTS FOR INSTRUMENT OR MIC INPUT JACKS<br/>
<p><%= image_tag "content/audio_capture_ftue.png", {:width => 243, :height => 70} %></p>
</li>
<li class="ftue-video-link"
external-link-win="http://www.youtube.com/watch?v=IDrLa8TOXwQ"
external-link-mac="http://www.youtube.com/watch?v=vIs7ArrjMpE">
external-link-win="https://www.youtube.com/watch?v=IDrLa8TOXwQ"
external-link-mac="https://www.youtube.com/watch?v=vIs7ArrjMpE">
USB MICROPHONE<br/>
<p><%= image_tag "content/microphone_ftue.png", {:width => 70, :height => 113} %></p>
</li>
<li class="ftue-video-link"
external-link-win="http://www.youtube.com/watch?v=PCri4Xed4CA"
external-link-mac="http://www.youtube.com/watch?v=Gatmd_ja47U">
external-link-win="https://www.youtube.com/watch?v=PCri4Xed4CA"
external-link-mac="https://www.youtube.com/watch?v=Gatmd_ja47U">
COMPUTER'S BUILT-IN MIC &amp; SPEAKERS/HEADPHONES<br/>
<p><%= image_tag "content/computer_ftue.png", {:width => 118, :height => 105} %></p>
</li>

6
web/app/views/clients/wizard/loopback/_loopback_wizard.html.haml
View File

@ -14,18 +14,18 @@
%ul.device_type
%li.ftue-video-link.first{'external-link-win'=>"http://www.youtube.com/watch?v=b1JrwGeUcOo", 'external-link-mac'=>"http://www.youtube.com/watch?v=TRzb7OTlO-Q"}
%li.ftue-video-link.first{'external-link-win'=>"https://www.youtube.com/watch?v=b1JrwGeUcOo", 'external-link-mac'=>"https://www.youtube.com/watch?v=TRzb7OTlO-Q"}
AUDIO DEVICE WITH PORTS FOR INSTRUMENT OR MIC INPUT JACKS
%br
%p
= image_tag "content/audio_capture_ftue.png", {:width => 243, :height => 70}
%li.ftue-video-link{'external-link-win'=>"http://www.youtube.com/watch?v=IDrLa8TOXwQ",'external-link-mac'=>"http://www.youtube.com/watch?v=vIs7ArrjMpE"}
%li.ftue-video-link{'external-link-win'=>"https://www.youtube.com/watch?v=IDrLa8TOXwQ",'external-link-mac'=>"https://www.youtube.com/watch?v=vIs7ArrjMpE"}
USB MICROPHONE
%br
%p
= image_tag "content/microphone_ftue.png", {:width => 70, :height => 113}
%li.ftue-video-link{'external-link-win'=>"http://www.youtube.com/watch?v=PCri4Xed4CA",'external-link-mac'=>"http://www.youtube.com/watch?v=Gatmd_ja47U"}
%li.ftue-video-link{'external-link-win'=>"https://www.youtube.com/watch?v=PCri4Xed4CA",'external-link-mac'=>"https://www.youtube.com/watch?v=Gatmd_ja47U"}
COMPUTER'S BUILT-IN MIC &amp; SPEAKERS/HEADPHONES
%br
%p

2
web/app/views/dialogs/_gettingStartedDialog.html.slim
View File

@ -69,7 +69,7 @@
| There is a lot you can do with JamKazam, and more great features available every week. Check the
following link for a list of videos and other resources you can use to take advantage of everything that’s
available:
a rel="external" purpose="youtube-tutorials" href="http://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA" JamKazam Tutorials & Resources
a rel="external" purpose="youtube-tutorials" href="https://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA" JamKazam Tutorials & Resources
br clear="both"
.row.dialog-buttons
.buttons

4
web/app/views/dialogs/_whatsNextDialog.html
View File

@ -46,10 +46,10 @@
<br><br>
<div class="left f20"><br>
<a purpose="youtube-tutorials" rel="external" href="http://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA" class="orange">See a List of<br>
<a purpose="youtube-tutorials" rel="external" href="https://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA" class="orange">See a List of<br>
Videos »</a></div>
<div class="right mr20">
<a purpose="youtube-tutorials" rel="external" href="http://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA">
<a purpose="youtube-tutorials" rel="external" href="https://www.youtube.com/channel/UC38nc9MMZgExJAd7ca3rkUA">
<%= image_tag "content/ftue_whatsnext_videos.png", {:height => 90, :width => 152 } %>
</a>
</div>

2
web/app/views/events/event.html.haml
View File

@ -39,7 +39,7 @@
%div{align: 'center'} LEARN ABOUT JAMKAZAM</div>
%br
= image_tag 'web/carousel_musicians.jpg', width:350, alt:'JamKazam Overview', class: 'video-slide',
:'data-video-header' => 'JamKazam Overview', :'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'
:'data-video-header' => 'JamKazam Overview', :'data-video-url' => 'https://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'
%br{clear:'all'}

2
web/app/views/music_sessions/show.html.erb
View File

@ -104,7 +104,7 @@
<br>
<%= image_tag('web/carousel_musicians.jpg', width:350, alt:'JamKazam Overview',
class: 'video-slide', :'data-video-header' => 'JamKazam Overview',
:'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1') %>
:'data-video-url' => 'https://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1') %>
</div>
</div>
<% else %>

6
web/app/views/shared/_cta_sidebar.html.erb
View File

@ -4,7 +4,7 @@
<a href="/signin">Already have an account?</a>
</div>
<br /><br />
<%= image_tag "web/thumbnail_jamtracks.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamTracks', :'data-video-url' => 'http://www.youtube.com/embed/askHvcCoNfw?autoplay=1'} %><br /><br />
<%= image_tag "web/thumbnail_platform.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'} %><br /><br />
<%= image_tag "web/thumbnail_jamblaster.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'http://www.youtube.com/embed/YHZQHfKDdMc?autoplay=1'} %>
<%= image_tag "web/thumbnail_jamtracks.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamTracks', :'data-video-url' => 'https://www.youtube.com/embed/askHvcCoNfw?autoplay=1'} %><br /><br />
<%= image_tag "web/thumbnail_platform.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'https://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'} %><br /><br />
<%= image_tag "web/thumbnail_jamblaster.jpg", {:width => 350, :alt => "", :class => 'video-slide', :'data-video-header' => 'JamKazam Platform', :'data-video-url' => 'https://www.youtube.com/embed/YHZQHfKDdMc?autoplay=1'} %>
</div>

6
web/app/views/users/home.html.slim
View File

@ -16,7 +16,7 @@
a.learn-more-jamtracks href='/products/jamtracks' learn more
.home-column
= link_to image_tag("web/thumbnail_platform.jpg", :alt => "JamKazam explanatory video!"), '#', class: "platform-video video-item", 'data-video-header' => 'JamKazam Platform', 'data-video-url' => 'http://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'
= link_to image_tag("web/thumbnail_platform.jpg", :alt => "JamKazam explanatory video!"), '#', class: "platform-video video-item", 'data-video-header' => 'JamKazam Platform', 'data-video-url' => 'https://www.youtube.com/embed/ylYcvTY9CVo?autoplay=1'
h3 Online Music Collaboration Platform
p
@ -33,7 +33,7 @@
br clear="all"
.home-column.last
= link_to image_tag("web/thumbnail_jamblaster.jpg", :alt => "JamBlaster explanatory video!"), '#', class: "jamblaster-video video-item", 'data-video-header' => 'JamBlaster', 'data-video-url' => 'http://www.youtube.com/embed/YHZQHfKDdMc?autoplay=1'
= link_to image_tag("web/thumbnail_jamblaster.jpg", :alt => "JamBlaster explanatory video!"), '#', class: "jamblaster-video video-item", 'data-video-header' => 'JamBlaster', 'data-video-url' => 'https://www.youtube.com/embed/YHZQHfKDdMc?autoplay=1'
h3 Ultra Low-Latency Audio Interface
p
@ -55,7 +55,7 @@ br clear="all"
.endorsement-promo
.home-buzz
h2 What Musicians in the JamKazam Community Are Saying
= link_to image_tag("web/thumbnail_buzz.jpg", :alt => "JamKazam Endorsements!", width:300), '#', class: "endorsements-video video-item", 'data-video-header' => 'JamKazam Community', 'data-video-url' => 'http://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1'
= link_to image_tag("web/thumbnail_buzz.jpg", :alt => "JamKazam Endorsements!", width:300), '#', class: "endorsements-video video-item", 'data-video-header' => 'JamKazam Community', 'data-video-url' => 'https://www.youtube.com/embed/_7qj5RXyHCo?autoplay=1'
br clear="all"