Adding news item and photos for a linux.conf.au quiz slide show. :-) :-)

deryck

git-svn-id: file:///home/svn/samba-web/trunk@641 44aeb9d7-1cd8-0310-b257-a505e0beeac2

diff --git a/news/images/quiz-pics/img_1610.jpg b/news/images/quiz-pics/img_1610.jpg
new file mode 100644 (file)
index 0000000..8ba1260
Binary files /dev/null and b/news/images/quiz-pics/img_1610.jpg differ

diff --git a/news/images/quiz-pics/img_1611.jpg b/news/images/quiz-pics/img_1611.jpg
new file mode 100644 (file)
index 0000000..f444817
Binary files /dev/null and b/news/images/quiz-pics/img_1611.jpg differ

diff --git a/news/images/quiz-pics/img_1613.jpg b/news/images/quiz-pics/img_1613.jpg
new file mode 100644 (file)
index 0000000..462e8fd
Binary files /dev/null and b/news/images/quiz-pics/img_1613.jpg differ

diff --git a/news/images/quiz-pics/img_1614.jpg b/news/images/quiz-pics/img_1614.jpg
new file mode 100644 (file)
index 0000000..1dd290a
Binary files /dev/null and b/news/images/quiz-pics/img_1614.jpg differ

diff --git a/news/images/quiz-pics/img_1617.jpg b/news/images/quiz-pics/img_1617.jpg
new file mode 100644 (file)
index 0000000..bfca322
Binary files /dev/null and b/news/images/quiz-pics/img_1617.jpg differ

diff --git a/news/images/quiz-pics/img_1630.jpg b/news/images/quiz-pics/img_1630.jpg
new file mode 100644 (file)
index 0000000..ae91a65
Binary files /dev/null and b/news/images/quiz-pics/img_1630.jpg differ

diff --git a/news/images/quiz-pics/img_1636.jpg b/news/images/quiz-pics/img_1636.jpg
new file mode 100644 (file)
index 0000000..f57c371
Binary files /dev/null and b/news/images/quiz-pics/img_1636.jpg differ

diff --git a/news/images/quiz-pics/img_1637.jpg b/news/images/quiz-pics/img_1637.jpg
new file mode 100644 (file)
index 0000000..bb00e20
Binary files /dev/null and b/news/images/quiz-pics/img_1637.jpg differ

diff --git a/news/images/quiz-pics/img_1639.jpg b/news/images/quiz-pics/img_1639.jpg
new file mode 100644 (file)
index 0000000..25e76fe
Binary files /dev/null and b/news/images/quiz-pics/img_1639.jpg differ

diff --git a/news/images/quiz-pics/img_1640.jpg b/news/images/quiz-pics/img_1640.jpg
new file mode 100644 (file)
index 0000000..df1d0f4
Binary files /dev/null and b/news/images/quiz-pics/img_1640.jpg differ

diff --git a/news/images/quiz-pics/img_1641.jpg b/news/images/quiz-pics/img_1641.jpg
new file mode 100644 (file)
index 0000000..391c778
Binary files /dev/null and b/news/images/quiz-pics/img_1641.jpg differ

diff --git a/news/images/quiz-pics/img_1643.jpg b/news/images/quiz-pics/img_1643.jpg
new file mode 100644 (file)
index 0000000..5468e1c
Binary files /dev/null and b/news/images/quiz-pics/img_1643.jpg differ

diff --git a/news/images/quiz-pics/img_1644.jpg b/news/images/quiz-pics/img_1644.jpg
new file mode 100644 (file)
index 0000000..a61aeda
Binary files /dev/null and b/news/images/quiz-pics/img_1644.jpg differ

diff --git a/news/images/quiz-pics/img_1645.jpg b/news/images/quiz-pics/img_1645.jpg
new file mode 100644 (file)
index 0000000..2af63a7
Binary files /dev/null and b/news/images/quiz-pics/img_1645.jpg differ

diff --git a/news/images/quiz-pics/img_1647.jpg b/news/images/quiz-pics/img_1647.jpg
new file mode 100644 (file)
index 0000000..1931242
Binary files /dev/null and b/news/images/quiz-pics/img_1647.jpg differ

diff --git a/news/images/quiz-pics/img_1648.jpg b/news/images/quiz-pics/img_1648.jpg
new file mode 100644 (file)
index 0000000..b48ae48
Binary files /dev/null and b/news/images/quiz-pics/img_1648.jpg differ

diff --git a/news/images/quiz-pics/img_1650.jpg b/news/images/quiz-pics/img_1650.jpg
new file mode 100644 (file)
index 0000000..388f2c0
Binary files /dev/null and b/news/images/quiz-pics/img_1650.jpg differ

diff --git a/news/images/quiz-pics/img_1651.jpg b/news/images/quiz-pics/img_1651.jpg
new file mode 100644 (file)
index 0000000..23116c8
Binary files /dev/null and b/news/images/quiz-pics/img_1651.jpg differ

diff --git a/news/images/quiz-pics/img_1653.jpg b/news/images/quiz-pics/img_1653.jpg
new file mode 100644 (file)
index 0000000..1a0dc5d
Binary files /dev/null and b/news/images/quiz-pics/img_1653.jpg differ

diff --git a/news/images/quiz-pics/img_1655.jpg b/news/images/quiz-pics/img_1655.jpg
new file mode 100644 (file)
index 0000000..d5b5eb2
Binary files /dev/null and b/news/images/quiz-pics/img_1655.jpg differ

diff --git a/news/images/quiz-pics/img_1656.jpg b/news/images/quiz-pics/img_1656.jpg
new file mode 100644 (file)
index 0000000..ac3e8c7
Binary files /dev/null and b/news/images/quiz-pics/img_1656.jpg differ

diff --git a/news/images/quiz-pics/img_1659.jpg b/news/images/quiz-pics/img_1659.jpg
new file mode 100644 (file)
index 0000000..285231f
Binary files /dev/null and b/news/images/quiz-pics/img_1659.jpg differ

diff --git a/news/images/quiz-pics/img_1660.jpg b/news/images/quiz-pics/img_1660.jpg
new file mode 100644 (file)
index 0000000..e19704f
Binary files /dev/null and b/news/images/quiz-pics/img_1660.jpg differ

diff --git a/news/images/quiz-pics/img_1661.jpg b/news/images/quiz-pics/img_1661.jpg
new file mode 100644 (file)
index 0000000..1978db7
Binary files /dev/null and b/news/images/quiz-pics/img_1661.jpg differ

diff --git a/news/images/quiz-pics/img_1662.jpg b/news/images/quiz-pics/img_1662.jpg
new file mode 100644 (file)
index 0000000..8866c2b
Binary files /dev/null and b/news/images/quiz-pics/img_1662.jpg differ

diff --git a/news/images/quiz-pics/img_1664.jpg b/news/images/quiz-pics/img_1664.jpg
new file mode 100644 (file)
index 0000000..b632b9f
Binary files /dev/null and b/news/images/quiz-pics/img_1664.jpg differ

diff --git a/news/images/quiz-pics/img_1665.jpg b/news/images/quiz-pics/img_1665.jpg
new file mode 100644 (file)
index 0000000..9986cc4
Binary files /dev/null and b/news/images/quiz-pics/img_1665.jpg differ

diff --git a/news/images/quiz-pics/img_1668.jpg b/news/images/quiz-pics/img_1668.jpg
new file mode 100644 (file)
index 0000000..936ff9c
Binary files /dev/null and b/news/images/quiz-pics/img_1668.jpg differ

diff --git a/news/images/quiz-pics/img_1671.jpg b/news/images/quiz-pics/img_1671.jpg
new file mode 100644 (file)
index 0000000..b45d8c5
Binary files /dev/null and b/news/images/quiz-pics/img_1671.jpg differ

diff --git a/news/images/quiz-pics/img_1674.jpg b/news/images/quiz-pics/img_1674.jpg
new file mode 100644 (file)
index 0000000..7ff8f74
Binary files /dev/null and b/news/images/quiz-pics/img_1674.jpg differ

diff --git a/news/images/quiz-pics/img_1677.jpg b/news/images/quiz-pics/img_1677.jpg
new file mode 100644 (file)
index 0000000..5b56b84
Binary files /dev/null and b/news/images/quiz-pics/img_1677.jpg differ

diff --git a/news/images/quiz-pics/img_1678.jpg b/news/images/quiz-pics/img_1678.jpg
new file mode 100644 (file)
index 0000000..66c4a10
Binary files /dev/null and b/news/images/quiz-pics/img_1678.jpg differ

diff --git a/news/images/quiz-pics/img_1679.jpg b/news/images/quiz-pics/img_1679.jpg
new file mode 100644 (file)
index 0000000..a013573
Binary files /dev/null and b/news/images/quiz-pics/img_1679.jpg differ

diff --git a/news/images/quiz-pics/img_1681.jpg b/news/images/quiz-pics/img_1681.jpg
new file mode 100644 (file)
index 0000000..7ad4cc7
Binary files /dev/null and b/news/images/quiz-pics/img_1681.jpg differ

diff --git a/news/images/quiz-pics/img_1684.jpg b/news/images/quiz-pics/img_1684.jpg
new file mode 100644 (file)
index 0000000..970f6b8
Binary files /dev/null and b/news/images/quiz-pics/img_1684.jpg differ

diff --git a/news/images/quiz-pics/img_1686.jpg b/news/images/quiz-pics/img_1686.jpg
new file mode 100644 (file)
index 0000000..b22b570
Binary files /dev/null and b/news/images/quiz-pics/img_1686.jpg differ

diff --git a/news/images/quiz-pics/img_1689.jpg b/news/images/quiz-pics/img_1689.jpg
new file mode 100644 (file)
index 0000000..de46531
Binary files /dev/null and b/news/images/quiz-pics/img_1689.jpg differ

diff --git a/news/images/quiz-pics/img_1694.jpg b/news/images/quiz-pics/img_1694.jpg
new file mode 100644 (file)
index 0000000..1a8d17a
Binary files /dev/null and b/news/images/quiz-pics/img_1694.jpg differ

diff --git a/news/static/linux-conf-au-pics.html b/news/static/linux-conf-au-pics.html
new file mode 100755 (executable)
index 0000000..514c201
--- /dev/null
+++ b/news/static/linux-conf-au-pics.html
@@ -0,0 +1,80 @@
+<!--#include virtual="/samba/news/header.html" -->
+
+  <title>linux.conf.au Quiz Show</title>
+
+  <script language="Javascript" type="text/javascript">
+    quizPics = new Array;
+    quizPics[0] = "/samba/news/images/quiz-pics/img_1610.jpg";
+    quizPics[1] = "/samba/news/images/quiz-pics/img_1611.jpg";
+    quizPics[2] = "/samba/news/images/quiz-pics/img_1613.jpg";
+    quizPics[3] = "/samba/news/images/quiz-pics/img_1614.jpg";
+    quizPics[4] = "/samba/news/images/quiz-pics/img_1617.jpg";
+    quizPics[5] = "/samba/news/images/quiz-pics/img_1630.jpg";
+    quizPics[6] = "/samba/news/images/quiz-pics/img_1636.jpg";
+    quizPics[7] = "/samba/news/images/quiz-pics/img_1637.jpg";
+    quizPics[8] = "/samba/news/images/quiz-pics/img_1639.jpg";
+    quizPics[9] = "/samba/news/images/quiz-pics/img_1640.jpg";
+    quizPics[10] = "/samba/news/images/quiz-pics/img_1641.jpg";
+    quizPics[11] = "/samba/news/images/quiz-pics/img_1643.jpg";
+    quizPics[12] = "/samba/news/images/quiz-pics/img_1644.jpg";
+    quizPics[13] = "/samba/news/images/quiz-pics/img_1645.jpg";
+    quizPics[14] = "/samba/news/images/quiz-pics/img_1647.jpg";
+    quizPics[15] = "/samba/news/images/quiz-pics/img_1648.jpg";
+    quizPics[16] = "/samba/news/images/quiz-pics/img_1650.jpg";
+    quizPics[17] = "/samba/news/images/quiz-pics/img_1651.jpg";
+    quizPics[18] = "/samba/news/images/quiz-pics/img_1653.jpg";
+    quizPics[19] = "/samba/news/images/quiz-pics/img_1655.jpg";
+    quizPics[20] = "/samba/news/images/quiz-pics/img_1656.jpg";
+    quizPics[21] = "/samba/news/images/quiz-pics/img_1659.jpg";
+    quizPics[22] = "/samba/news/images/quiz-pics/img_1660.jpg";
+    quizPics[23] = "/samba/news/images/quiz-pics/img_1661.jpg";
+    quizPics[24] = "/samba/news/images/quiz-pics/img_1662.jpg";
+    quizPics[25] = "/samba/news/images/quiz-pics/img_1664.jpg";
+    quizPics[26] = "/samba/news/images/quiz-pics/img_1665.jpg";
+    quizPics[27] = "/samba/news/images/quiz-pics/img_1668.jpg";
+    quizPics[28] = "/samba/news/images/quiz-pics/img_1671.jpg";
+    quizPics[29] = "/samba/news/images/quiz-pics/img_1674.jpg";
+    quizPics[30] = "/samba/news/images/quiz-pics/img_1677.jpg";
+    quizPics[31] = "/samba/news/images/quiz-pics/img_1678.jpg";
+    quizPics[32] = "/samba/news/images/quiz-pics/img_1679.jpg";
+    quizPics[33] = "/samba/news/images/quiz-pics/img_1681.jpg";
+    quizPics[34] = "/samba/news/images/quiz-pics/img_1684.jpg";
+    quizPics[35] = "/samba/news/images/quiz-pics/img_1686.jpg";
+    quizPics[36] = "/samba/news/images/quiz-pics/img_1689.jpg";
+    quizPics[37] = "/samba/news/images/quiz-pics/img_1694.jpg";
+
+    allPics = quizPics.length - 1;
+    curPic = 0;
+
+    function nextPic() 
+    {
+            if (curPic < allPics) {
+                curPic++;
+                document.canvas.src=quizPics[curPic];
+            }
+    }
+
+    function prevPic() 
+    {
+            if (curPic > 0) {
+                curPic--;
+                document.canvas.src=quizPics[curPic];
+            }
+    }
+    </script>
+
+<!--#include virtual="/samba/news/header2.html" -->
+
+<h2>Pics from linux.conf.au Quiz Show</h2>
+
+  <div class="pic_nav">
+    <a href="javascript:prevPic()" class="l">&lt;- Previous Pic</a><a href="javascript:nextPic()" class="r">Next Pic -&gt;</a>
+  </div>
+
+  <div id="pic">
+    <img src="/samba/news/images/quiz-pics/img_1610.jpg" name="canvas" 
+        alt="Slideshow of linux.conf.au Quiz Show" />
+  </div>
+
+
+<!--#include virtual="/samba/news/footer.html" -->

diff --git a/news/style/news.css b/news/style/news.css
index a3bad58fec711619b916a65025446a84e0932136..fd2d0abdc42373a47f5ceac92b71420d8e11062b 100644 (file)
--- a/news/style/news.css
+++ b/news/style/news.css
@@ -128,3 +128,26 @@ input, textarea, select {
 .interview li {
   list-style-type:none;
 }
+
+/* Styles for picture slide shows */
+#pic {
+       text-align:center;
+}
+#pic img {
+       width:95%;
+       height:95%;
+       border:1px groove #6878CD;
+}
+.pic_nav {
+       margin:auto;
+       width:90%;
+}
+.l {
+       margin:0 0 0 -20px;
+}
+.r {
+       position:relative;
+       left:20px;
+       bottom:20px;
+       float:right;
+}

diff --git a/news/team/linux_conf_au_quiz.html b/news/team/linux_conf_au_quiz.html
new file mode 100644 (file)
index 0000000..8df5708
--- /dev/null
+++ b/news/team/linux_conf_au_quiz.html
@@ -0,0 +1,16 @@
+    <h3><a name="linux_conf_au_quiz">Samba Team at linux.conf.au Quiz Show</a></h3> 
+        
+    <div class="article">
+    <p>The Samba Team was well represented at linux.conf.au's quiz show.
+    Andrew Tridgell, Tim Potter, and Martin Pool were judges, and 
+    Jeremy Allison hosted the event.  Andrew Bartlett was on Ted Tso's team, 
+    which narrowly lost (by 1000 points) to Mark Shuttleworth's "Ubuntu" 
+    team.</p>
+
+    <p>And the moment was captured in all its stunning photographic glory 
+    by Michael Davies.  So don't miss this 
+    <a href="/samba/news/static/linux-conf-au-pics.html">linux.conf.au Quiz
+    Slideshow</a>.</p>
+    </div>
+        
+       

diff --git a/scripts/updateNews.py b/scripts/updateNews.py
index 2928f15c635833b8862d5e2b8e50c61fea130af2..b9ca384a1341eae9c36f0b493ade4c8764fa967b 100755 (executable)
--- a/scripts/updateNews.py
+++ b/scripts/updateNews.py
@@ -23,7 +23,8 @@ import os, time, re
 from stat import ST_MTIME
 
 top_dir = '/data/httpd/html/samba/news'      # set to news directory path
-not_news = ['.svn', 'images', 'style', 'calendar', 'index.html', 'articles']
+not_news = ['.svn', 'images', 'style', 'calendar', 'index.html', 
+                'articles', 'static']
 
 
 # Get list of news directories.  Then, pair up dir name with dir files.