svn commit: samba-web r1258 - in trunk: . scripts

deryck at samba.org deryck at samba.org
Mon Jan 12 16:59:38 GMT 2009


Author: deryck
Date: 2009-01-12 16:59:37 +0000 (Mon, 12 Jan 2009)
New Revision: 1258

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-web&rev=1258

Log:
Add a note about JavaScript to the mirrors page, should someone
end up there without JS enabled.

And don't assume we use the samba.html extension in the mirrors
list anymore.  (More hope is that this can be droppe from the
mirrors script, since it's legacy and not used anymore.)


Modified:
   trunk/redirect_us.html
   trunk/scripts/js_redirect.py


Changeset:
Modified: trunk/redirect_us.html
===================================================================
--- trunk/redirect_us.html	2009-01-05 10:38:32 UTC (rev 1257)
+++ trunk/redirect_us.html	2009-01-12 16:59:37 UTC (rev 1258)
@@ -30,6 +30,10 @@
 <body onload="loadUSMirror()">
 <noscript>
 <h2>Samba -- Opening Windows to a Wider World</h2>
+<p><strong>JavaScript</strong> is <strong>not</strong> required to use the Samba web site,
+but <strong> enabling JavaScript</strong> will add some useful features, mostly
+to do with content display and format.</p>
+
 <h3>Please choose a mirror</h3>
 
 <h4>For the samba.org web site:</h4>

Modified: trunk/scripts/js_redirect.py
===================================================================
--- trunk/scripts/js_redirect.py	2009-01-05 10:38:32 UTC (rev 1257)
+++ trunk/scripts/js_redirect.py	2009-01-12 16:59:37 UTC (rev 1258)
@@ -17,12 +17,12 @@
 
 for line in hosts:
     if line[:4] == '<li>':
-        parts = re.match('<li><a href=(.*)samba.html">(.*)</a>', line)
+        parts = re.match('<li><a href=(.*/samba/).*">(.*)</a>', line)
         # Make list of mirror_name/url pairs to preserve web_hosts sort. 
         mirrors.append((parts.group(2), parts.group(1)))
         # While we're here, get the US mirrors on their own
-        if re.match('<li><a href="(.*)samba.html">USA (.*)</a>', line) and not line.find('us2') > -1:
-            us_mirrors.append(re.match('<li><a href="(.*)samba.html">USA (.*)</a>', line).group(1))
+        if re.match('<li><a href="(.*/samba/).*">USA (.*)</a>', line) and not line.find('us2') > -1:
+            us_mirrors.append(re.match('<li><a href="(.*/samba/).*">USA (.*)</a>', line).group(1))
 
 # Write all mirrors to drop-down menu
 menu = open('menu_options.html', 'w')



More information about the samba-cvs mailing list