
cherokee at cherokee-project
Oct 14, 2009, 9:20 AM
Post #1 of 1
(119 views)
Permalink
|
|
[3704] web: Some rework for the website
|
|
Revision: 3704 http://svn.cherokee-project.com/changeset/3704 Author: taher Date: 2009-10-14 18:20:02 +0200 (Wed, 14 Oct 2009) Log Message: ----------- Some rework for the website Modified Paths: -------------- web/HEADER.php web/Makefile web/images/release.png web/images/release.xcf web/index.php web/logos.php web/media.php web/news.php web/static/cherokee.css web/static/js/ahah.js web/widgets/render-commits.py web/widgets/render-twitter.py Added Paths: ----------- web/screencasts.php web/static/closelabel.gif web/static/js/slimbox2.js web/static/links.xcf web/static/links_logos.png web/static/links_media.png web/static/links_partners.png web/static/links_tshirt.jpg web/static/links_tshirt.xcf web/static/links_who.png web/static/loading.gif web/static/nextlabel.gif web/static/prevlabel.gif web/static/slimbox2.css web/static/thumbs/Cherokee-drawing-01_3300x2550_thumb.jpg web/static/thumbs/Cherokee-drawing-02_3300x2550_thumb.jpg web/static/thumbs/Cherokee-drawing-03_3300x2550_thumb.jpg web/static/thumbs/Cherokee-drawing-04_3300x2550_thumb.jpg Removed Paths: ------------- web/images/tshirt.jpg Modified: web/HEADER.php =================================================================== --- web/HEADER.php 2009-10-14 12:16:40 UTC (rev 3703) +++ web/HEADER.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -16,6 +16,8 @@ <link href="/static/cherokee.css" rel="stylesheet" type="text/css" media="all" /> <link href="/static/blog.css" rel="stylesheet" type="text/css" media="all" /> <script type="text/javascript" src="/static/js/jquery-1.2.6.pack.js"></script> + <script type="text/javascript" src="/static/js/slimbox2.js"></script> + <link rel="stylesheet" href="/static/slimbox2.css" type="text/css" media="screen" /> </head> <body id="cherokee_body"> Modified: web/Makefile =================================================================== --- web/Makefile 2009-10-14 12:16:40 UTC (rev 3703) +++ web/Makefile 2009-10-14 16:20:02 UTC (rev 3704) @@ -12,6 +12,7 @@ partners.html \ benchmarks.html \ news.html \ +screencasts.html \ mediacontent/Yahoo_on_Cherokee.html \ mediacontent/Tiscali_on_Cherokee.html Modified: web/images/release.png =================================================================== (Binary files differ) Modified: web/images/release.xcf =================================================================== (Binary files differ) Deleted: web/images/tshirt.jpg =================================================================== (Binary files differ) Modified: web/index.php =================================================================== --- web/index.php 2009-10-14 12:16:40 UTC (rev 3703) +++ web/index.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -6,33 +6,28 @@ <div class="title">The <b>Fastest</b> free Web Server out there!</div> <div class="message"> - <p><strong>Cherokee </strong>is a very fast, flexible and easy + <p><strong>Cherokee</strong> is a very fast, flexible and easy to configure Web Server. It supports the widespread technologies - nowadays: FastCGI, SCGI, PHP, CGI, SSI, TLS and SSL encrypted - connections, Virtual hosts, Authentication, on the fly encoding, - Load Balancing, Apache compatible log files, Data Base Balancing, - Reverse HTTP Proxy, Traffic Shaper, Video Streaming and much more.</p> + nowadays: FastCGI, SCGI, PHP, CGI, uWSGI, SSI, TLS and SSL + encrypted connections, Virtual hosts, Authentication, on the fly + encoding, Load Balancing, Apache compatible log files, Data Base + Balancing, Reverse HTTP Proxy, Traffic Shaper, Video Streaming + and much more.</p> - <p>A user friendly interface called - <strong>cherokee-admin</strong> is provided for a no-hassle - configuration of the server. Check out the benchmarks and - documentation to learn more, and give it a try to squeeze your - hardware to the fullest!</p> - </div> + <p><strong>Cherokee-Admin</strong>, a user friendly interface, + provides a no-hassle configuration of the server. Check out the + benchmarks and documentation to learn more, join our active + Community and give it a try to squeeze your hardware to the + fullest!</p> - <div class="links"> - <a href="/cherokee-domain-list.html">Who is using Cherokee?</a> • - <a href="/media.html">Media & Contact</a> • - <a href="/partners.html">Partners</a> • - <a href="/logos.html" title="Cherokee branding">Logos</a> </div> </div> </div> -<div class="twobars"><div class="right50"><br /><br /><br /></div></div> +<br/><br/> <div class="twobars clearfix"> - <div class="left50"> + <div class="left35"> <div class="index-section download" onclick="window.location = '/downloads.html';"> <h2><a href="/downloads.html">Get Cherokee!</a></h2> <p><a href="/downloads.html">Download the latest release!</a></p> @@ -47,50 +42,106 @@ </div> </div> - <div class="right50"> - <h2>Latest News</h2> - <div class="latest-item"><a href="/news.html#23">Cherokee 0.99 hits the streets!</a></div> - <div class="latest-date">February 25, 7:47 pm</div> - <div class="latest-item"><a href="/news.html#22">Cherokee 0.98 is out!</a></div> - <div class="latest-date">January 23, 8:23 pm</div> - <div class="latest-item"><a href="/news.html#21">Bumping Cherokee to 0.11.5</a></div> - <div class="latest-date">December 18, 10:01 am</div> - <div class="latest-item"><a href="/news.html#20">EeePC contest results!</a></div> - <div class="latest-date">December 1, 12:34 pm</div> - <div class="latest-item"><a href="/news.html#19">Cherokee 0.11.2 released</a></div> - <div class="latest-date">November 31, 11:01 am</div> + <div class="right65 tab_container" id="tab_container"> + + <div id="tab_menu" class="hidden"> + <ul class="tabs"> + <li><a href="#tab_list">List</a></li> + <li><a href="#tab_commits">Commits</a></li> + <li><a href="#tab_twitter">Twitter</a></li> + <li><a href="#tab_links">Links</a></li> + <li><a href="#tab_contact">Contact</a></li> + </ul> + </div> + + <div class="tab_frame"> + <div id="tab_links" class="tab_content"> + <h2>Links</a></h2> + <span id="ul"><p>Sites</p><a href="/cherokee-domain-list.html"><img src="/static/links_who.png"></a></span> + <span id="ur"><p>Media</p><a href="/media.html"><img src="/static/links_media.png"></a></span> + <span id="cc"><p>Project T-Shirts<br/><a href="http://www.freewear.org/?page=list_items&org=Cherokee" title="Want one?"><img src="/static/links_tshirt.jpg" width="103" height="100" border="0" alt="T-Shirt" /></a></p></span> + <span id="ll"><p>Partners</p><a href="/partners.html"><img src="/static/links_partners.png"></a></span> + <span id="lr"><p>Branding</p><a href="/logos.html" title="Cherokee branding"><img src="/static/links_logos.png"></a></span> + <div class="clearfix"></div> + </div> + </div> + + <!--Tab container ends--> </div> </div> -<div class="twobars clearfix"> - <div class="left50"> - <h2><a style="text-decoration: none" href="http://lists.cherokee-project.com/">Mailing List</a></h2> - <div id="cherokee-list"></div> - </div> - <div class="right50"> - <h2>Latest Commits</h2> - <div id="cherokee-svn"></div> - - <h2>Cherokee T-Shirts</h2> - <div id="cols"><ul> - <li><a href="http://www.freewear.org/?page=list_items&org=Cherokee" title="Want one?"><img src="images/tshirt.jpg" width="103" height="100" border="0" alt="T-Shirt" /></a></li> - <li>Shirts with the<br /> - Cherokee Project<br /> - logo.<br /><br /> - <p><a href="http://www.freewear.org/?page=list_items&org=Cherokee" title="Want one?">Get yours now!</a></p> - </li></ul> +<div class="twobars clearfix delete_on_relocate"> + <div class="left35"> + <div id="tab_contact" class="tab_content relocate"> + <h2>Contact</h2> + <p>Please contact us with questions and suggestions.</p> + <p> + <strong>Project Leader</strong>:<br/> <a href="mailto:alvaro [at] alobbs">Alvaro Lopez Ortega</a> + </p> + <p> + <strong>Community</strong>:<br/> <a href="/cgi-bin/mailman/listinfo/cherokee">Cherokee mail list</a> + </p> </div> - </div> </div> + + <div class="right65"> + <div id="tab_list" class="tab_content relocate"> + <h2>Mailing List</a></h2> + <div id="cherokee-list"><ul>Loading...</ul></div> + </div> + + <div id="tab_commits" class="tab_content relocate"> + <h2>Latest Commits</h2> + <div id="cherokee-svn"><ul>Loading...</ul></div> + </div> + + <div id="tab_twitter" class="tab_content relocate"> + <h2>Tweets</a></h2> + <div id="cherokee-twitter"><ul>Loading...</ul></div> + <div class="latest-date">Follow us on <a + href="http://twitter.com/webserver"><img class="twitter" + src="/static/twitter.png" title="Twitter"></a></div> + </div> + + </div> </div> <script src="/static/js/ahah.js" type="text/javascript"></script> + <script type="text/javascript"> + //Tab thingie + $(document).ready(function() { + //When page loads... + $("#tab_menu").removeClass('hidden'); + $(".tab_content").hide(); //Hide all content + $(".relocate").appendTo(".tab_frame"); + $("ul.tabs li:first").addClass("active").show(); //Activate first tab + $("#tab_list").show(); //Show first tab content + //cleanup + $(".delete_on_relocate").empty(); + $(".tab_content h2").empty(); //Remove titles + + //On Click Event + $("ul.tabs li").click(function() { + $("ul.tabs li").removeClass("active"); //Remove any "active" class + $(this).addClass("active"); //Add "active" class to selected tab + $(".tab_content").hide(); //Hide all tab content + var activeTab = $(this).find("a").attr("href"); + $(activeTab).fadeIn(); //Fade in the active ID content + return false; + }); + }); + + //Dynamic content tmp = new ajaxObject ('cherokee-list', '/dynamic/cherokee-list.html'); tmp.update(); tmp = new ajaxObject ('cherokee-svn', '/dynamic/cherokee-svn.html'); tmp.update(); + + tmp = new ajaxObject ('cherokee-twitter', '/dynamic/cherokee-tweets.html'); + tmp.update(); + </script> <!-- FOOTER begins --> Modified: web/logos.php =================================================================== --- web/logos.php 2009-10-14 12:16:40 UTC (rev 3703) +++ web/logos.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -4,9 +4,9 @@ <h1>Logos, banners, buttons and wallpapers</h1> <h2>Main logo</h2> -<p><a href="/images/cherokee2.png"><img border="0" src="/images/cherokee2-mini.png" /></a></p> +<p><a href="/images/cherokee2.png" rel="lightbox"><img border="0" src="/images/cherokee2-mini.png" /></a></p> <ul> - <li><a href="/images/cherokee2.png">Cherokee Logo</a>: PNG, 3000x1166px, 160Kb</li> + <li><a href="/images/cherokee2.png" rel="lightbox">Cherokee Logo</a>: PNG, 3000x1166px, 160Kb</li> <li><a href="/images/cherokee.svg">Cherokee Logo</a>: SVG, vectorial, 28Kb</li> </ul> <p> </p> @@ -14,20 +14,29 @@ <h2>Wallpapers</h2> <ul id="parallel"> <li>1600x1200 <br /> -<p><a href="/download/misc/Cherokee-background-01_1600x1200.jpg"><img src="/static/thumbs/Cherokee-background-01_1600x1200_thumb.jpg"></a></p> +<p><a href="/download/misc/Cherokee-background-01_1600x1200.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-background-01_1600x1200_thumb.jpg"></a></p> </li> <li>1680x1050 <br /> -<p><a href="/download/misc/Cherokee-background-01_1680x1050.jpg"><img src="/static/thumbs/Cherokee-background-01_1680x1050_thumb.jpg"></a></p> -<p><a href="/download/misc/Cherokee-background-02_1680x1050.jpg"><img src="/static/thumbs/Cherokee-background-02_1680x1050_thumb.jpg"></a></p> +<p><a href="/download/misc/Cherokee-background-01_1680x1050.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-background-01_1680x1050_thumb.jpg"></a></p> +<p><a href="/download/misc/Cherokee-background-02_1680x1050.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-background-02_1680x1050_thumb.jpg"></a></p> </li> <li>1280x1024 <br /> -<p><a href="/download/misc/Cherokee-LeszekT-01_1280x1024.jpg"><img src="/static/thumbs/Cherokee-LeszekT-01_1280x1024_thumb.jpg"></a></p> -<p><a href="/download/misc/Cherokee-LeszekT-02_1280x1024.jpg"><img src="/static/thumbs/Cherokee-LeszekT-02_1280x1024_thumb.jpg"></a></p> +<p><a href="/download/misc/Cherokee-LeszekT-01_1280x1024.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-LeszekT-01_1280x1024_thumb.jpg"></a></p> +<p><a href="/download/misc/Cherokee-LeszekT-02_1280x1024.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-LeszekT-02_1280x1024_thumb.jpg"></a></p> </li> + +3300x2550 <br /> +<p> +<a href="/download/misc/Cherokee-drawing-01_3300x2550.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-drawing-01_3300x2550_thumb.jpg"></a> +<a href="/download/misc/Cherokee-drawing-02_3300x2550.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-drawing-02_3300x2550_thumb.jpg"></a> +<a href="/download/misc/Cherokee-drawing-03_3300x2550.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-drawing-03_3300x2550_thumb.jpg"></a> +<a href="/download/misc/Cherokee-drawing-04_3300x2550.jpg" rel="lightbox"><img src="/static/thumbs/Cherokee-drawing-04_3300x2550_thumb.jpg"></a> +</p> </ul> + <h2>Promotional banners</h2> <p><img src="/images/cherokee-mini-button1.png" /></p> <p><img src="/images/cherokee-mini-button2.png" /></p> Modified: web/media.php =================================================================== --- web/media.php 2009-10-14 12:16:40 UTC (rev 3703) +++ web/media.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -59,24 +59,6 @@ <td valign="top"></td> </tr> </table> - <h2>Contact</h2> - <p>Please contact us with questions and suggestions.</p> -<p>You can reach us here:</p> - <div style="border: 1px solid rgb(221, 221, 221);" align="center"> - <table border="0"><tr><td> - <ul> - <li>Alvaro Lopez Ortega<br /> - Project Leader<br /> - E-mail at <a href="mailto:alvaro [at] alobbs">alvaro [at] alobbs</a><br /> - Available in both English and Spanish<br />.</li> - <li><a href="/cgi-bin/mailman/listinfo/cherokee">Cherokee community mail list</a><br /> - - Available in English</li> - </ul> - </td></tr></table> - </div> - <p>.</p> - <!-- FOOTER begins --> <?php include 'FOOTER.php'; ?> Modified: web/news.php =================================================================== --- web/news.php 2009-10-14 12:16:40 UTC (rev 3703) +++ web/news.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -4,6 +4,31 @@ <h1>News</h1> +<a name="24"></a> +<div class="blog-entry"> + <div class="blog-title">Cherokee is gaining momentum!</div> + <div class="blog-body"> +<p> +As every Cherokee release goes by, our user base goes up and up. +At the beggining, every new project has to slowly struggle to gain +momentum until it finally reaches a critical mass and goes mainstream. +</p> + +<p> It seems those times are over for us. Cherokee's <a +href="http://www.cherokee-project.com/cherokee-domain-list.html">user +base</a> is in constant growth, the Community is stronger than ever, a +lot of sites are buzzing about us and it doesn't look like our +development speed will be getting slower any time soon. Ah, and +release date for 0.99.25 is getting closer and closer. </p> + +<p> +Make sure to check it out as soon as it's out, because the new +features will sure make your life easier. We promise! +</p> +</div> + <div class="blog-addinfo">October 12, 2:19 pm</div> +</div> + <a name="23"></a> <div class="blog-entry"> <div class="blog-title">Cherokee 0.99 hits the streets!</div> Added: web/screencasts.php =================================================================== --- web/screencasts.php (rev 0) +++ web/screencasts.php 2009-10-14 16:20:02 UTC (rev 3704) @@ -0,0 +1,15 @@ +<?php include 'HEADER.php'; ?> +<!-- HEADER ends --> + +<h1>Screencasts: Configuration in under a minute</h1> + +<div id="screencast_container"> +<a href="static/indiankid.png" rel="lightbox-sc" title="PHP"><img src="static/indiankid.png" width="141" height="165" alt="" /></a> +<a href="static/indiankid.png" rel="lightbox-sc" title="Ruby on Rails"><img src="static/indiankid.png" width="141" height="165" alt="" /></a> +<a href="static/indiankid.png" rel="lightbox-sc" title="Django"><img src="static/indiankid.png" width="141" height="165" alt="" /></a> +<a href="static/indiankid.png" rel="lightbox-sc" title="WordPress"><img src="static/indiankid.png" width="141" height="165" alt="" /></a> +<a href="static/indiankid.png" rel="lightbox-sc" title="Drupal"><img src="static/indiankid.png" width="141" height="165" alt="" /></a> +</div> + +<!-- FOOTER begins --> +<?php include 'FOOTER.php'; ?> Modified: web/static/cherokee.css =================================================================== --- web/static/cherokee.css 2009-10-14 12:16:40 UTC (rev 3703) +++ web/static/cherokee.css 2009-10-14 16:20:02 UTC (rev 3704) @@ -10,12 +10,13 @@ h1, h2, h3, h4 { -# margin: 10px; +//margin: 10px; padding: 0px; } h1, h2 { - text-shadow: 0.5px 0.5px 1.5px #900; +//text-shadow: 0.5px 0.5px 1.5px #900; + text-shadow: 0.5px 0.5px 1px #ccc; font-weight: normal; } @@ -121,7 +122,7 @@ } .indian-say .message { - font-size: 110%; + _font-size: 110%; color: #777; margin: 10px; } @@ -383,10 +384,10 @@ } .latest-commit-l { - margin-left: 20px; + _margin-left: 20px; float: left; color: #999; - font-size: x-small; + _font-size: x-small; text-align: left; } @@ -604,7 +605,7 @@ .hover p{margin:2em; text-align:center ; line-height:1em} -/*Tabs for index and download pages*/ +/*Tabs for download page*/ .tabs { height: 45px; margin-right: 0px; @@ -613,14 +614,14 @@ padding-top: 0px; border: none; display: block; -text-shadow: 0.5px 0.5px 1.5px #900; +//text-shadow: 0.5px 0.5px 1.5px #900; font-weight: normal; } .tab_active { color: #D12123; text-decoration: none; -font-size: 2em; +font-size: 1.5em; display: block; width: 100%; height: 25px; @@ -628,12 +629,12 @@ padding-top: 10px; padding-bottom: 10px; cursor: pointer; -text-shadow: 0.5px 0.5px 1.5px #900; +//text-shadow: 0.5px 0.5px 1.5px #900; font-weight: normal; } .tab_inactive { -font-size: 2em; +font-size: 1.5em; color: #5E5E5C; display: block; width: 100%; @@ -643,12 +644,12 @@ padding-bottom: 10px; cursor: pointer; border-bottom: 1px solid #ddd; -text-shadow: 0.5px 0.5px 1.5px #900; +//text-shadow: 0.5px 0.5px 1.5px #900; font-weight: normal; } #tabs_container { -display: none; + display: none; } #tabs_container a { @@ -675,5 +676,168 @@ h1.tabbed { margin: 0px; +font-size: 1.5em; padding-top: 10px; } + + + + +/********************************************************** + * Rework October 2009 * + **********************************************************/ +.left35 { + width: 280px; + float: left; + padding: 10px; +} + +.right65 { + width: 445px; + float: right; + padding: 0;// 10px 0 10px; +} + +.hidden { + visibility: hidden; +} + +img.twitter { + vertical-align: middle; + border:0; + width: 61px; + height: 15px; +} + +/********************************************************** + * Tabs on the main page + **********************************************************/ +// Tabs + +div.tab_frame { + padding-top: 10px; + margin-bottom: 10px; + min-height: 300px; +} + +ul.tabs { + margin: 0; + padding: 0; + float: left; + list-style: none; + height: 32px; /*--Set height of tabs--*/ + //border-bottom: 1px solid #ccd; + border-left: 1px solid #ccd; + width: 100%; +} +ul.tabs li { + float: left; + margin: 0; + padding: 0; + height: 31px; /*--Subtract 1px from the height of the unordered list--*/ + line-height: 31px; /*--Vertically aligns the text within the tab--*/ + border: 1px solid #ccd; + border-left: none; + margin-bottom: -1px; /*--Pull the list item down 1px--*/ + overflow: hidden; + position: relative; + background: #f8f8f8; +} +ul.tabs li a { + text-decoration: none; + text-shadow: 0.5px 0.5px 1px #ccc; + color: #204A87; + display: block; + font-size: 1em; + padding: 0 10px; + border: 1px solid #fff; /*--Gives the bevel look with a 1px white border inside the list item--*/ + outline: none; +} +ul.tabs li a:hover { + background: #eee; +} +html ul.tabs li.active, html ul.tabs li.active a:hover { /*--Makes sure that the active tab does not listen to the hover properties--*/ + background: #fff; + border-bottom: 1px solid #fff; /*--Makes the active tab look like it's connected with its content--*/ +} + + +//Tab content +.tab_container { + border: 1px solid #ccc; + border-top: none; + overflow: hidden; + clear: both; + float: left; + width: 100%; + background: #fff; +} + +.tab_content { + padding: 20px; + padding-bottom: 10px; + font-size: 1em; + border: 1px solid #ccd; +} + +/********************************************************** + * Tab containers + **********************************************************/ + +#tab_links span { + font-size: x-small; + list-style: none; + text-shadow: 0.5px 0.5px 1.5px #ccc; + color: #c00; +} + +#tab_links img { + border: 0; + height: 62px; + width: 57px; +} + +#tab_links span p { + text-align: center; +} + +#tab_links #ul, +#tab_links #ll, +.left { + float: left; + margin-left:10px; +} + +#tab_links #ur, +#tab_links #lr, +.right { + float: right; + margin-right:10px; +} + +#tab_links #cc { + vertical-align: middle; + clear: both; +} + +#tab_links #cc img { + height: 100px; + width: 103px; +} + +#tab_links #cc p { + margin-top: 100px; + margin-bottom: -40px; +} + +/********************************************************** + * Screencasts + **********************************************************/ +#screencast_container img { + border:0; + padding: 50px; +} + +/********************************************************** + * + **********************************************************/ Added: web/static/closelabel.gif =================================================================== (Binary files differ) Property changes on: web/static/closelabel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: web/static/js/ahah.js =================================================================== --- web/static/js/ahah.js 2009-10-14 12:16:40 UTC (rev 3703) +++ web/static/js/ahah.js 2009-10-14 16:20:02 UTC (rev 3704) @@ -34,8 +34,8 @@ return true; } } - + // This area set up on constructor calls. var LayerID = document.getElementById(layer); var urlCall = url; -} +} Added: web/static/js/slimbox2.js =================================================================== --- web/static/js/slimbox2.js (rev 0) +++ web/static/js/slimbox2.js 2009-10-14 16:20:02 UTC (rev 3704) @@ -0,0 +1,13 @@ +/* + Slimbox v2.02 - The ultimate lightweight Lightbox clone for jQuery + (c) 2007-2009 Christophe Beyls <http://www.digitalia.be> + MIT-style license. +*/ +(function(w){var E=w(window),u,g,F=-1,o,x,D,v,y,L,s,n=!window.XMLHttpRequest,e=window.opera&&(document.compatMode=="CSS1Compat")&&(w.browser.version>=9.3),m=document.documentElement,l={},t=new Image(),J=new Image(),H,a,h,q,I,d,G,c,A,K;w(function(){w("body").append(w([H=w('<div id="lbOverlay" />')[0],a=w('<div id="lbCenter" />')[0],G=w('<div id="lbBottomContainer" />')[0]]).css("display","none"));h=w('<div id="lbImage" />').appendTo(a).append(q=w('<div style="position: relative;" />').append([I=w('<a id="lbPrevLink" href="#" />').click(B)[0],d=w('<a id="lbNextLink" href="#" />').click(f)[0]])[0])[0];c=w('<div id="lbBottom" />').appendTo(G).append([w('<a id="lbCloseLink" href="#" />').add(H).click(C)[0],A=w('<div id="lbCaption" />')[0],K=w('<div id="lbNumber" />')[0],w('<div style="clear: both;" />')[0]])[0]});w.slimbox=function(O,N,M){u=w.extend({loop:false,overlayOpacity:0.8,overlayFadeDuration:400,resizeDuration:400,resizeEasing:"swing",initialWidth:250,initialHeight:250,im ageFadeDuration:400,captionAnimationDuration:400,counterText:"Image {x} of {y}",closeKeys:[27,88,67],previousKeys:[37,80],nextKeys:[39,78]},M);if(typeof O=="string"){O=[[O,N]];N=0}y=E.scrollTop()+((e?m.clientHeight:E.height())/2);L=u.initialWidth;s=u.initialHeight;w(a).css({top:Math.max(0,y-(s/2)),width:L,height:s,marginLeft:-L/2}).show();v=n||(H.currentStyle&&(H.currentStyle.position!="fixed"));if(v){H.style.position="absolute"}w(H).css("opacity",u.overlayOpacity).fadeIn(u.overlayFadeDuration);z();k(1);g=O;u.loop=u.loop&&(g.length>1);return b(N)};w.fn.slimbox=function(M,P,O){P=P||function(Q){return[Q.href,Q.title]};O=O||function(){return true};var N=this;return N.unbind("click").click(function(){var S=this,U=0,T,Q=0,R;T=w.grep(N,function(W,V){return O.call(S,W,V)});for(R=T.length;Q<R;++Q){if(T[Q]==S){U=Q}T[Q]=P(T[Q],Q)}return w.slimbox(T,U,M)})};function z(){var N=E.scrollLeft(),M=e?m.clientWidth:E.width();w([a,G]).css("left",N+(M/2));if(v){w(H).css({left:N,top:E.scrollTop( ),width:M,height:E.height()})}}function k(M){w("object").add(n?"select":"embed").each(function(O,P){if(M){w.data(P,"slimbox",P.style.visibility)}P.style.visibility=M?"hidden":w.data(P,"slimbox")});var N=M?"bind":"unbind";E[N]("scroll resize",z);w(document)[N]("keydown",p)}function p(O){var N=O.keyCode,M=w.inArray;return(M(N,u.closeKeys)>=0)?C():(M(N,u.nextKeys)>=0)?f():(M(N,u.previousKeys)>=0)?B():false}function B(){return b(x)}function f(){return b(D)}function b(M){if(M>=0){F=M;o=g[F][0];x=(F||(u.loop?g.length:0))-1;D=((F+1)%g.length)||(u.loop?0:-1);r();a.className="lbLoading";l=new Image();l.onload=j;l.src=o}return false}function j(){a.className="";w(h).css({backgroundImage:"url("+o+")",visibility:"hidden",display:""});w(q).width(l.width);w([q,I,d]).height(l.height);w(A).html(g[F][1]||"");w(K).html((((g.length>1)&&u.counterText)||"").replace(/{x}/,F+1).replace(/{y}/,g.length));if(x>=0){t.src=g[x][0]}if(D>=0){J.src=g[D][0]}L=h.offsetWidth;s=h.offsetHeight;var M=Math.max(0,y -(s/2));if(a.offsetHeight!=s){w(a).animate({height:s,top:M},u.resizeDuration,u.resizeEasing)}if(a.offsetWidth!=L){w(a).animate({width:L,marginLeft:-L/2},u.resizeDuration,u.resizeEasing)}w(a).queue(function(){w(G).css({width:L,top:M+s,marginLeft:-L/2,visibility:"hidden",display:""});w(h).css({display:"none",visibility:"",opacity:""}).fadeIn(u.imageFadeDuration,i)})}function i(){if(x>=0){w(I).show()}if(D>=0){w(d).show()}w(c).css("marginTop",-c.offsetHeight).animate({marginTop:0},u.captionAnimationDuration);G.style.visibility=""}function r(){l.onload=null;l.src=t.src=J.src=o;w([a,h,c]).stop(true);w([I,d,h,G]).hide()}function C(){if(F>=0){r();F=x=D=-1;w(a).hide();w(H).stop().fadeOut(u.overlayFadeDuration,k)}return false}})(jQuery); + +// AUTOLOAD CODE BLOCK (MAY BE CHANGED OR REMOVED) +jQuery(function($) { + $("a[rel^='lightbox']").slimbox({/* Put custom options here */}, null, function(el) { + return (this == el) || ((this.rel.length > 8) && (this.rel == el.rel)); + }); +}); \ No newline at end of file Added: web/static/links.xcf =================================================================== (Binary files differ) Property changes on: web/static/links.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_logos.png =================================================================== (Binary files differ) Property changes on: web/static/links_logos.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_media.png =================================================================== (Binary files differ) Property changes on: web/static/links_media.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_partners.png =================================================================== (Binary files differ) Property changes on: web/static/links_partners.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_tshirt.jpg =================================================================== (Binary files differ) Property changes on: web/static/links_tshirt.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_tshirt.xcf =================================================================== (Binary files differ) Property changes on: web/static/links_tshirt.xcf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/links_who.png =================================================================== (Binary files differ) Property changes on: web/static/links_who.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/loading.gif =================================================================== (Binary files differ) Property changes on: web/static/loading.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/nextlabel.gif =================================================================== (Binary files differ) Property changes on: web/static/nextlabel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/prevlabel.gif =================================================================== (Binary files differ) Property changes on: web/static/prevlabel.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/slimbox2.css =================================================================== --- web/static/slimbox2.css (rev 0) +++ web/static/slimbox2.css 2009-10-14 16:20:02 UTC (rev 3704) @@ -0,0 +1,85 @@ +/********************************************************** + * SLIMBOX + **********************************************************/ + +#lbOverlay { + position: fixed; + z-index: 9999; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-color: #000; + cursor: pointer; +} + +#lbCenter, #lbBottomContainer { + position: absolute; + z-index: 9999; + overflow: hidden; + background-color: #fff; +} + +.lbLoading { + background: #fff url(loading.gif) no-repeat center; +} + +#lbImage { + position: absolute; + left: 0; + top: 0; + border: 10px solid #fff; + background-repeat: no-repeat; +} + +#lbPrevLink, #lbNextLink { + display: block; + position: absolute; + top: 0; + width: 50%; + outline: none; +} + +#lbPrevLink { + left: 0; +} + +#lbPrevLink:hover { + background: transparent url(prevlabel.gif) no-repeat 0 15%; +} + +#lbNextLink { + right: 0; +} + +#lbNextLink:hover { + background: transparent url(nextlabel.gif) no-repeat 100% 15%; +} + +#lbBottom { + font-family: Verdana, Arial, Geneva, Helvetica, sans-serif; + font-size: 10px; + color: #666; + line-height: 1.4em; + text-align: left; + border: 10px solid #fff; + border-top-style: none; +} + +#lbCloseLink { + display: block; + float: right; + width: 66px; + height: 22px; + background: transparent url(closelabel.gif) no-repeat center; + margin: 5px 0; + outline: none; +} + +#lbCaption, #lbNumber { + margin-right: 71px; +} + +#lbCaption { + font-weight: bold; +} Added: web/static/thumbs/Cherokee-drawing-01_3300x2550_thumb.jpg =================================================================== (Binary files differ) Property changes on: web/static/thumbs/Cherokee-drawing-01_3300x2550_thumb.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/thumbs/Cherokee-drawing-02_3300x2550_thumb.jpg =================================================================== (Binary files differ) Property changes on: web/static/thumbs/Cherokee-drawing-02_3300x2550_thumb.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/thumbs/Cherokee-drawing-03_3300x2550_thumb.jpg =================================================================== (Binary files differ) Property changes on: web/static/thumbs/Cherokee-drawing-03_3300x2550_thumb.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: web/static/thumbs/Cherokee-drawing-04_3300x2550_thumb.jpg =================================================================== (Binary files differ) Property changes on: web/static/thumbs/Cherokee-drawing-04_3300x2550_thumb.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: web/widgets/render-commits.py =================================================================== --- web/widgets/render-commits.py 2009-10-14 12:16:40 UTC (rev 3703) +++ web/widgets/render-commits.py 2009-10-14 16:20:02 UTC (rev 3704) @@ -6,7 +6,7 @@ # Retrieve the commit list # -f = os.popen ("svn log svn://cherokee-project.com/cherokee/ | head -%d" % (LIMIT*30)) +f = os.popen ("svn log svn://cherokee-project.com/cherokee/ -l%d" % LIMIT) lines = [x.strip() for x in f.readlines()] f.close() @@ -23,8 +23,8 @@ user = line[1] date = line[2].split('(')[1][:-1] - content += '<div class="latest-commit-l"><a href="%s">%s</a></div>' % (url, num) - content += '<div class="latest-commit-r">%s | <b>%s</b></div><br/>' % (user, date) + content += '<a href="%s">%s</a>' % (url, num) + content += '<div class="latest-date">%s | <b>%s</b></div>' % (user, date) content += '\n' Modified: web/widgets/render-twitter.py =================================================================== --- web/widgets/render-twitter.py 2009-10-14 12:16:40 UTC (rev 3703) +++ web/widgets/render-twitter.py 2009-10-14 16:20:02 UTC (rev 3704) @@ -1,9 +1,9 @@ import re -import json import urllib +import simplejson as json from dateutil.parser import parse -LIMIT = 4 +LIMIT = 6 URL = "http://twitter.com/statuses/user_timeline/webserver.json?count=%d" % LIMIT OUTPUT = "dynamic/cherokee-tweets.html" URL_RE = '((https?|s?ftp|ssh)://[^"\s\<\>]*[^.,;">\:\s\<\>\)\]\!])'
|