More https fixes

diff --git a/source/blog/blog.cgi b/source/blog/blog.cgi
index f59201af49d5c03d521e6871fe2472c689731729..0875ea76d7069d5bbe183981fadac4a207c31a09 100755 (executable)
--- a/source/blog/blog.cgi
+++ b/source/blog/blog.cgi
@@ -548,7 +548,7 @@ def valid_link(link):
        if re.match(mail_re, link, re.I):
                return 'mailto:' + link
        elif re.match(url_re, link, re.I):
-               return 'http://' + link
+               return 'https://' + link
 
        return None
 
@@ -563,7 +563,7 @@ try:
        s = os.environ['SCRIPT_NAME']
        if p == '80': p = ''
        else: p = ':' + p
-       full_url = 'http://%s%s%s' % (n, p, s)
+       full_url = 'https://%s%s%s' % (n, p, s)
 except KeyError:
        full_url = 'Not needed'
 
@@ -927,51 +927,21 @@ class Article (object):
                import re
                rst = re.sub(r'.. youtube:: (.*)', r'''.. raw:: html
 
-                       <div style="text-align: center; margin-bottom: 8pt">
-                       <object width="500" height="375">
-                           <param name="movie"
-                               value="http://www.youtube.com/v/\1&amp;hl=en&amp;fs=1"
-                               ></param>
-                           <param name="allowFullScreen" value="true"></param>
-                           <param name="allowscriptaccess" value="always"></param>
-                           <embed src="http://www.youtube.com/v/\1&amp;hl=en&amp;fs=1"
-                               type="application/x-shockwave-flash" allowscriptaccess="always"
-                               allowfullscreen="true" width="500" height="375"></embed>
-                       </object>
-                       </div>''', rst)
+                        <iframe width="560" height="315"
+                                src="https://www.youtube.com/embed/\1"
+                                frameborder="0" allowfullscreen></iframe>
+                       ''', rst)
                rst = re.sub(r'.. vimeo:: (\w*)', r'''.. raw:: html
 
-                       <div style="text-align: center; margin-bottom: 8pt">
-                       <object width="500" height="375">
-                           <param name="allowfullscreen" value="true" />
-                           <param name="allowscriptaccess" value="always" />
-                           <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=\1&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" />
-                           <embed src="http://vimeo.com/moogaloop.swf?clip_id=\1&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1"
-                               type="application/x-shockwave-flash"
-                               allowfullscreen="true"
-                               allowscriptaccess="always"
-                               width="500"
-                               height="375">
-                           </embed>
-                       </object>
-                       </div>''', rst)
+                        <iframe src="https://player.vimeo.com/video/\1"
+                                width="500" height="281" frameborder="0"
+                                webkitallowfullscreen mozallowfullscreen
+                                allowfullscreen></iframe>
+                       ''', rst)
                rst = re.sub(r'.. grooveshark:: (\w*)', r'''.. raw:: html
 
-                       <div class="grooveshark">
-                       <object width="220" height="300">
-                         <param name="movie"
-                           value="http://listen.grooveshark.com/widget.swf" />
-                         <param name="wmode" value="window" />
-                         <param name="allowScriptAccess" value="always" />
-                         <param name="flashvars"
-                           value="hostname=cowbell.grooveshark.com&playlistID=\1&style=metal&p=0" />
-                         <embed src="http://listen.grooveshark.com/widget.swf"
-                           type="application/x-shockwave-flash"
-                           width="220" height="300"
-                           flashvars="hostname=cowbell.grooveshark.com&playlistID=\1&style=metal&p=0"
-                           allowScriptAccess="always" wmode="window" />
-                       </object>
-                       </div>''', rst)
+                        Grooveshark is no more! This was supposed to show \1.
+                       ''', rst)
                return rst_to_html(rst)
 
        def to_vars(self):

diff --git a/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst b/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst
index 836b646fa84363122b33a14a68293f7011e319e1..68dffdafaf38720dcc4c24a90ac7ecd61518df5c 100644 (file)
--- a/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst
+++ b/source/blog/posts/2009/09/fantastic-photos-of-our-solar-system.rst
@@ -1,8 +1,7 @@
 Title: Fantastic Photos of our Solar System
 Tags: es, en, photo, solar system, sun, flare
 
-.. image:: http://media.smithsonianmag.com/images/erupting-prominence-3.jpg
-    :alt: Erupting Prominence
+Erupting Prominence: http://media.smithsonianmag.com/images/erupting-prominence-3.jpg
 
 More `fantastic photos of our solar system`__.
 

diff --git a/source/blog/posts/2009/11/06-ted:-witricity.rst b/source/blog/posts/2009/11/06-ted:-witricity.rst
index 3343c83a85ee1defa421bc07052065e46c6d6504..c271bcf2ea05f661e615bf67918ad57acf173516 100644 (file)
--- a/source/blog/posts/2009/11/06-ted:-witricity.rst
+++ b/source/blog/posts/2009/11/06-ted:-witricity.rst
@@ -26,27 +26,9 @@ __ http://www.ted.com/talks/eric_giler_demos_wireless_electricity.html
 
 .. raw:: html
 
-    <div style="text-align: center; margin-bottom: 8pt">
-    <object width="446" height="326">
-    <param name="movie"
-        value="http://video.ted.com/assets/player/swf/EmbedPlayer.swf"></param>
-    <param name="allowFullScreen" value="true" />
-    <param name="wmode" value="transparent"></param>
-    <param name="bgColor" value="#ffffff"></param>
-    <param name="flashvars" value="vu=http://video.ted.com/talks/dynamic/EricGiler_2009G-medium.flv&su=http://images.ted.com/images/ted/tedindex/embed-posters/EricGiler-2009G.embed_thumbnail.jpg&vw=432&vh=240&ap=0&ti=619&introDuration=16500&adDuration=4000&postAdDuration=2000&adKeys=talk=eric_giler_demos_wireless_electricity;year=2009;theme=what_s_next_in_tech;theme=new_on_ted_com;theme=the_creative_spark;theme=tales_of_invention;event=TEDGlobal+2009;&preAdTag=tconf.ted/embed;tile=1;sz=512x288;"/>
-    <embed src="http://video.ted.com/assets/player/swf/EmbedPlayer.swf"
-        pluginspace="http://www.macromedia.com/go/getflashplayer"
-        type="application/x-shockwave-flash"
-        wmode="transparent"
-        bgColor="#ffffff"
-        width="446"
-        height="326"
-        allowFullScreen="true"
-        flashvars="vu=http://video.ted.com/talks/dynamic/EricGiler_2009G-medium.flv&su=http://images.ted.com/images/ted/tedindex/embed-posters/EricGiler-2009G.embed_thumbnail.jpg&vw=432&vh=240&ap=0&ti=619&introDuration=16500&adDuration=4000&postAdDuration=2000&adKeys=talk=eric_giler_demos_wireless_electricity;year=2009;theme=what_s_next_in_tech;theme=new_on_ted_com;theme=the_creative_spark;theme=tales_of_invention;event=TEDGlobal+2009;">
-    </embed>
-    </object>
-    </div>
-
+    <iframe src="https://embed-ssl.ted.com/talks/eric_giler_demos_wireless_electricity.html"
+            width="560" height="315" frameborder="0" scrolling="no"
+            webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
 
 .. _RFID: http://en.wikipedia.org/wiki/Radio-frequency_identification
 

diff --git a/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst b/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst
index 108c137f27b055a18e26b1550548fcee49c7b341..ef0f87bbde6e412f5db23708d6f80287b83138f5 100644 (file)
--- a/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst
+++ b/source/blog/posts/2010/02/13-la-odisea-del-pasaporte.rst
@@ -27,14 +27,6 @@ recorrido`__.
 
 __ http://quikmaps.com/full/131436
 
-.. raw:: html
-
-   <div class="center">
-   <iframe
-   src="http://quikmaps.com/ext2/131436?t=1&amp;ln=0&amp;sn=1&amp;zb=0&amp;d=1&amp;o=0&amp;lat=-34.60201356359536&amp;lng=-58.37478160858154&amp;zl=17&amp;mt=2"
-   frameborder="0" scrolling="no" width="600" height="400" marginwidth="0"
-   marginheight="0"></iframe></div>
-
 
 Hacia el consulado
 ==================

diff --git a/source/blog/posts/2011/05/23-10-songs-of....rst b/source/blog/posts/2011/05/23-10-songs-of....rst
index 44ed804d8bc396986e519a03fb2863a048d72015..ae3b1966db8b240f41b52f4687ebdb43dedb2793 100644 (file)
--- a/source/blog/posts/2011/05/23-10-songs-of....rst
+++ b/source/blog/posts/2011/05/23-10-songs-of....rst
@@ -10,22 +10,7 @@ bands, but maybe in the future I can go more *global*.
 This time, the theme is **songs that have, in one way or another, some native
 rhythm**.
 
-.. raw:: html
-
-   <div class="center">
-   <object width="350" height="380">
-     <param name="movie" value="http://grooveshark.com/widget.swf" />
-     <param name="wmode" value="window" />
-     <param name="allowScriptAccess" value="always" />
-     <param name="flashvars"
-       value="hostname=cowbell.grooveshark.com&songIDs=26749094,26148436,25664882,23501702,7334757,23542663,24535537,27925174,23293440,27064115&bbg=ffffff&bth=ffffff&pfg=ffffff&lfg=ffffff&bt=0088FF&pbg=0088FF&pfgh=0088FF&si=0088FF&lbg=0088FF&lfgh=0088FF&sb=0088FF&bfg=07123d&pbgh=07123d&lbgh=07123d&sbh=07123d&p=0" />
-     <embed src="http://grooveshark.com/widget.swf"
-       type="application/x-shockwave-flash"
-       width="350" height="380"
-     flashvars="hostname=cowbell.grooveshark.com&songIDs=26749094,26148436,25664882,23501702,7334757,23542663,24535537,27925174,23293440,27064115&bbg=ffffff&bth=ffffff&pfg=ffffff&lfg=ffffff&bt=0088FF&pbg=0088FF&pfgh=0088FF&si=0088FF&lbg=0088FF&lfgh=0088FF&sb=0088FF&bfg=07123d&pbgh=07123d&lbgh=07123d&sbh=07123d&p=0"
-       allowScriptAccess="always" wmode="window" />
-   </object>
-   </div>
+[Groveshark died, and with it this list]
 
 
 .. vim: set et sw=3 sts=3 :

diff --git a/source/blog/posts/2011/06/12-babasónicos---dopádromo.rst b/source/blog/posts/2011/06/12-babasónicos---dopádromo.rst
index 8d8f1329dc0767b7136bae4affc107e4e03a1137..94c956d896cb8ca6c1d50e21c37e84142c13ccbe 100644 (file)
--- a/source/blog/posts/2011/06/12-babasónicos---dopádromo.rst
+++ b/source/blog/posts/2011/06/12-babasónicos---dopádromo.rst
@@ -7,23 +7,5 @@ a **good album**!
 __ http://en.wikipedia.org/wiki/Dop%C3%A1dromo
 __ http://en.wikipedia.org/wiki/Babas%C3%B3nicos
 
-So here, listen:
-
-.. raw:: html
-
-   <div class="center">
-   <object width="350" height="380">
-     <param name="movie" value="http://grooveshark.com/widget.swf" />
-     <param name="wmode" value="window" />
-     <param name="allowScriptAccess" value="always" />
-     <param name="flashvars"
-       value="hostname=cowbell.grooveshark.com&playlistID=55215079&bbg=000000&bth=000000&pfg=000000&lfg=000000&bt=FFFFFF&pbg=FFFFFF&pfgh=FFFFFF&si=FFFFFF&lbg=FFFFFF&lfgh=FFFFFF&sb=FFFFFF&bfg=666666&pbgh=666666&lbgh=666666&sbh=666666&p=0" />
-     <embed src="http://grooveshark.com/widget.swf"
-       type="application/x-shockwave-flash"
-       width="350" height="380"
-     flashvars="hostname=cowbell.grooveshark.com&playlistID=55215079&bbg=000000&bth=000000&pfg=000000&lfg=000000&bt=FFFFFF&pbg=FFFFFF&pfgh=FFFFFF&si=FFFFFF&lbg=FFFFFF&lfgh=FFFFFF&sb=FFFFFF&bfg=666666&pbgh=666666&lbgh=666666&sbh=666666&p=0"
-       allowScriptAccess="always" wmode="window" />
-   </object>
-   </div>
 
 .. vim: set et sw=3 sts=3 :

diff --git a/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst b/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst
index 7588bcde2823e0994f8038a2ff94c14643b09d89..ecdcaa5c2aba3b9ffd72157f702cc5f482d5ccb8 100644 (file)
--- a/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst
+++ b/source/blog/posts/2011/07/06-10-delirious-songs-with-strange-vocals.rst
@@ -3,21 +3,6 @@ Tags: en, es, 10 songs of, playlist, music, grooveshark, delirious, vocals
 
 10 canciones delirantes con voces extrañas
 
-.. raw:: html
-
-   <div class="center">
-   <object width="350" height="380">
-     <param name="movie" value="http://grooveshark.com/widget.swf" />
-     <param name="wmode" value="window" />
-     <param name="allowScriptAccess" value="always" />
-     <param name="flashvars"
-       value="hostname=cowbell.grooveshark.com&songIDs=23206717,22993361,23484435,26584441,27278258,7693042,26683162,25246634,22100131,27934889&bbg=ffffff&bth=ffffff&pfg=ffffff&lfg=ffffff&bt=0088FF&pbg=0088FF&pfgh=0088FF&si=0088FF&lbg=0088FF&lfgh=0088FF&sb=0088FF&bfg=07123d&pbgh=07123d&lbgh=07123d&sbh=07123d&p=0" />
-     <embed src="http://grooveshark.com/widget.swf"
-       type="application/x-shockwave-flash"
-       width="350" height="380"
-     flashvars="hostname=cowbell.grooveshark.com&songIDs=23206717,22993361,23484435,26584441,27278258,7693042,26683162,25246634,22100131,27934889&bbg=ffffff&bth=ffffff&pfg=ffffff&lfg=ffffff&bt=0088FF&pbg=0088FF&pfgh=0088FF&si=0088FF&lbg=0088FF&lfgh=0088FF&sb=0088FF&bfg=07123d&pbgh=07123d&lbgh=07123d&sbh=07123d&p=0"
-       allowScriptAccess="always" wmode="window" />
-   </object>
-   </div>
+[Grooveshark murió y con él esta lista]
 
 .. vim: set et sw=3 sts=3 :