www/adium.im 577:7de4a9066e00: Merge 536d0a41d7bb

commits at adium.im commits at adium.im
Sun Feb 19 04:02:06 UTC 2012


details:	http://hg.adium.im/www/adium.im/rev/7de4a9066e00
revision:	577:7de4a9066e00
branch:		rewrite
author:		Paul Wilde <me at paulwilde.co.uk>
date:		Sun Feb 19 02:59:32 2012 +0000

Merge 536d0a41d7bb
Subject: www/adium.im 578:19ca44103107: Reduce height of sub-navigation, move a.closed and span.closed into global.css as it's used for other pages also. Fixed active navigation :hover style. Style <code>.

details:	http://hg.adium.im/www/adium.im/rev/19ca44103107
revision:	578:19ca44103107
branch:		rewrite
author:		Paul Wilde <me at paulwilde.co.uk>
date:		Sun Feb 19 03:03:35 2012 +0000

Reduce height of sub-navigation, move a.closed and span.closed into global.css as it's used for other pages also. Fixed active navigation :hover style. Style <code>.
Subject: www/adium.im 579:47a3f7f46610: New beta page.

details:	http://hg.adium.im/www/adium.im/rev/47a3f7f46610
revision:	579:47a3f7f46610
branch:		rewrite
author:		Paul Wilde <me at paulwilde.co.uk>
date:		Sun Feb 19 04:01:53 2012 +0000

New beta page.

diffs (656 lines):

diff -r aaa6e986a351 -r 47a3f7f46610 assets/images/logo_medium.png
Binary file assets/images/logo_medium.png has changed
diff -r aaa6e986a351 -r 47a3f7f46610 assets/styles/beta.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/assets/styles/beta.css	Sun Feb 19 04:01:53 2012 +0000
@@ -0,0 +1,24 @@
+.revision {
+	float: right;
+	font-size: .9em;
+}
+
+.revision, .revision a, .revision a:hover { color: #aaa; }
+
+.beta-logo {
+	float: left;
+	position: relative;
+	top: 5px;
+	left: 5px;
+	height: 50px;
+	width: 55px;
+	background: url('../images/logo_medium.png') no-repeat;
+}
+
+ at media (max-width: 600px) {
+	.revision { 
+		float: none;
+		display: block;
+		padding-top: 8px; 
+	}
+}
\ No newline at end of file
diff -r aaa6e986a351 -r 47a3f7f46610 assets/styles/changelog.css
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/assets/styles/changelog.css	Sun Feb 19 04:01:53 2012 +0000
@@ -0,0 +1,1 @@
+This here stylesheet is for the changelogs!
\ No newline at end of file
diff -r aaa6e986a351 -r 47a3f7f46610 assets/styles/global.css
--- a/assets/styles/global.css	Sun Feb 19 00:13:33 2012 +0000
+++ b/assets/styles/global.css	Sun Feb 19 04:01:53 2012 +0000
@@ -191,15 +191,15 @@
 .help a:hover span:before { background-position: -112px -79px; }
 .help a:active span:before, .help.active a span:before { background-position: -112px -19px; }
 
-.dev a span:before, .dev.active a:hover span:before { background-position: -142px -49px; }
+.dev a span:before { background-position: -142px -49px; }
 .dev a:hover span:before { background-position: -142px -79px; }
 .dev a:active span:before, .dev.active a span:before { background-position: -142px -19px; }
 
-.merch a span:before, .merch.active a:hover span:before { background-position: -172px -49px; }
+.merch a span:before { background-position: -172px -49px; }
 .merch a:hover span:before { background-position: -172px -79px; }
 .merch a:active span:before, .merch.active a span:before { background-position: -172px -19px; }
 
-.xtras a span:before, .xtras.active a:hover span:before { background-position: -205px -49px; }
+.xtras a span:before { background-position: -205px -49px; }
 .xtras a:hover span:before { background-position: -205px -79px; }
 .xtras a:active span:before, .xtras.active a span:before { background-position: -205px -19px; }
 
@@ -226,7 +226,7 @@
 
 /********** Sub Navigation **********/
 
-nav.sub { 
+nav.sub {
 	top: 7px;
 	position: relative;
 	float: right;
@@ -238,7 +238,7 @@
 
 nav.sub li a {
 	display: block;
-	padding: 12px 12px 11px;
+	padding: 12px 13px 11px;
 	border-radius: 5px 5px 0 0;
 	border: 1px solid rgba(0, 0, 0, .6);
 	border-top-color: rgba(0, 0, 0, .55);
@@ -331,6 +331,7 @@
 
 /* Notice: Use padding-fix for titles that are not wrapped inside an <article> */
 .padding-fix { padding: 10px 0 5px 10px; }
+div.padding-fix { padding: 10px 0 0 10px; }
 
 /* Notice: Use margin-fix for tables that are the last content of a <section> */
 .margin-fix { margin-bottom: 10px; }
@@ -388,7 +389,7 @@
 th.side-two, td.side-two { border-left: 1px solid #ededed; }
 td.blank { background: transparent; border-right: 0; }
 
-pre {
+pre, code {
 	color: #555; 
 	font-family: Courier, sans-serif; 
 	white-space: pre-wrap;
@@ -421,6 +422,8 @@
 
 hr.one, hr.two, hr.three { display: none; }
 
+a:link.closed, span.closed { text-decoration: line-through; }
+
 /********** Thumbnails / Media **********/
 
 figure {
diff -r aaa6e986a351 -r 47a3f7f46610 assets/styles/help.css
--- a/assets/styles/help.css	Sun Feb 19 00:13:33 2012 +0000
+++ b/assets/styles/help.css	Sun Feb 19 04:01:53 2012 +0000
@@ -26,8 +26,6 @@
 	background-repeat: no-repeat;
 }
 
-a:link.closed, span.closed { text-decoration: line-through; }
-
 /* icons used on help homepage */
 .list-type-image.icons li { padding: 6px 0 6px 42px; }
 .li-msn { background: url('/rewrite/assets/images/help/icon_msn.png'); }
diff -r aaa6e986a351 -r 47a3f7f46610 beta/index.php
--- a/beta/index.php	Sun Feb 19 00:13:33 2012 +0000
+++ b/beta/index.php	Sun Feb 19 04:01:53 2012 +0000
@@ -1,5 +1,4 @@
 <?php
-
 // Adium Beta page
 // An empty $versions array will cause the "no beta" message to be displayed.
 // Place the array entries in reverse order (i.e., b5, b4, b3, b2, b1).
@@ -12,233 +11,219 @@
 // controls the actual contents.
 
 // --- Configure starting here ---
-
-$versions = array(
-		/*
-			Keep this example entry around.
+	$versions = array(
+		/*	Keep this example entry around. 
 			Copy it below for actual use.
 
-					array(
-						"ver" => "1.3.4b1",
-						"rev" => "???",
-						"date" => "2009-04-24",
-						"md5" => "c94754b2d7c3d5609c47612efedf32da"
-					)
+		array(
+			'ver' => '1.3.4b1',
+			'rev' => '???',
+			'date' => '2009-04-24',
+			'md5' => 'c94754b2d7c3d5609c47612efedf32da'
+		)
 		*/
-                       array(
-						"ver" => "1.5rc3",
-						"rev" => "9e55800b09b7",
-						"date" => "2012-02-01",
-						"md5" => "506e85ed69adeb63c8246d559111c69a",
-						"dsa" => "MC0CFFMTBnTvwfSigT2dZtW/zVJ4oHf7AhUAvIiF+MsUhKjEK2Z1ibzpqa7bvuI="
-						),
-					array(
-						"ver" => "1.5rc2",
-						"rev" => "f9c6c7e85abb",
-						"date" => "2012-01-29",
-						"md5" => "e25d9a8efbd299ad0aa914d03a4f9012",
-						"dsa" => "MC0CFQDSr79lw1l46H91lxu/8oVovmVGsgIUZYvrCuRMpwDuJ9xV1J2wz1jMdDM="
-						),
-					array(
-						"ver" => "1.5rc1",
-						"rev" => "1c62031359a1",
-						"date" => "2012-01-16",
-						"md5" => "a0eaeaef74c7ccba84cb39144d0a27a2",
-						"dsa" => "MC4CFQDRp82IUSm+hNuO4KOoBSpnn+MjgwIVANmHSHDX1RP70rAowJYg098PfV6D"
-						),
-					array(
-						"ver" => "1.5b9",
-						"rev" => "aa61bd5db2e4",
-						"date" => "2012-01-07",
-						"md5" => "8f4ef26c84727a64e47ba138a5ee847f",
-						"dsa" => "MC0CFCPkZUYzd9ReTmiw6h7FS1741+/3AhUAmzxbGAU/j4OQPOOyA3cC3CGG5Vs="
-						),
-                    array(
-						"ver" => "1.5b8",
-						"rev" => "28a0306802ee",
-						"date" => "2011-12-17",
-						"md5" => "c0451ae957082f556fd538f1f34dad50",
-						"dsa" => "MCwCFHS1cV1KOrR9/VYef+p7iqUG9CftAhRiKvM1MAD0iTMklmgXSmxjUxDkzQ=="
-						),
-					array(
-						"ver" => "1.5b7",
-						"rev" => "5be91264f5d8",
-						"date" => "2011-12-04",
-						"md5" => "b7a4017f944c5e67b30cd7760932908e",
-						"dsa" => "MC0CFQCc1IKzJn5Cg39uhIUtPjnMyrEbswIUMjF0ZQAaqKKNJYF877C6ngr/WUk="
-						),
-					array(
-						"ver" => "1.5b6",
-						"rev" => "45eb40ad9991",
-						"date" => "2011-12-03",
-						"md5" => "778e37ee0f0012cdfd7a9e3a1cbf3b7c",
-						"dsa" => "MCwCFE0Lm7/CfKS9/hnE2DOq5q/9+YQ/AhQ+aVIWmBKOOk0yKK9LlUJ31D1V+w=="
-					),
-					array(
-						"ver" => "1.5b5",
-						"rev" => "b08eeb55787a",
-						"date" => "2011-11-26",
-						"md5" => "4b14cd65a60504cda5d7e48ac59f11b9",
-						"dsa" => "MC0CFQDOl/WQxXgI4SnXS/lZDy/9es+NYwIUEbfJcZyrup+X7VVenZScfzF6AJ8="
-					),
-					array(
-						"ver" => "1.5b4",
-						"rev" => "92981866ae1f",
-						"date" => "2011-11-20",
-						"md5" => "ea6136a94bbea428f397ab4681df89be",
-						"dsa" => "MC4CFQCj44iqGBqB3B+tMTIADBdP0vCdyAIVALfKODSBkDSj99b2Mv8fNtrqXmgl"
-					),
-					array(
-						"ver" => "1.5b3",
-						"rev" => "30193567ea2e",
-						"date" => "2011-11-05",
-						"md5" => "07b64eb678c38787f8a450440fc4111b",
-						"dsa" => "MCwCFAUggWX7kbjeV3HnTEDUqjsC/koRAhRhIqFtH+/zPD57EW+j9/0urttfcw=="
-					),
-					array(
-						"ver" => "1.5b2",
-						"rev" => "12536b2265ba",
-						"date" => "2011-10-29",
-						"md5" => "747096d7ab4e657d467976fae8eab340",
-						"dsa" => "MC0CFB9od+VUWXuxmo1sKdLhe1Pn8MjwAhUA0FtfpBMi0pUF+peO9pEWjW5pTtM="
-					),
-					array(
-						"ver" => "1.5b1",
-						"rev" => "e0ac5e1080a1",
-						"date" => "2011-10-22",
-						"md5" => "0b24da74b25b7c26b8c544c8749ae4d7"
-					)
-			);
-
-// $motd = 'Please check <a href="http://trac.adium.im/query?status=assigned&status=new&status=pending&group=severity&milestone=Adium+1.4">open tickets</a> for 1.4 before filing bugs!';
-
-$motd = '';
-
-$repo = "adium";
+		array(
+			'ver' => '1.5rc4',
+			'rev' => '9e55800b09b7',
+			'date' => '2012-02-14',
+			'md5' => '6f6bab32571306cab4464f8a1951bc2d',
+			'dsa' => 'MCwCFEfUurtxN4TbPhvxmdqcrYPPH0I7AhRYw2YfmEtLIeR2X114R3oNhO91eQ=='
+		),
+		array(
+			'ver' => '1.5rc3',
+			'rev' => '9e55800b09b7',
+			'date' => '2012-02-01',
+			'md5' => '506e85ed69adeb63c8246d559111c69a',
+			'dsa' => 'MC0CFFMTBnTvwfSigT2dZtW/zVJ4oHf7AhUAvIiF+MsUhKjEK2Z1ibzpqa7bvuI='
+		),
+		array(
+			'ver' => '1.5rc3',
+			'rev' => '9e55800b09b7',
+			'date' => '2012-02-01',
+			'md5' => '506e85ed69adeb63c8246d559111c69a',
+			'dsa' => 'MC0CFFMTBnTvwfSigT2dZtW/zVJ4oHf7AhUAvIiF+MsUhKjEK2Z1ibzpqa7bvuI='
+		),
+		array(
+			'ver' => '1.5rc2',
+			'rev' => 'f9c6c7e85abb',
+			'date' => '2012-01-29',
+			'md5' => 'e25d9a8efbd299ad0aa914d03a4f9012',
+			'dsa' => 'MC0CFQDSr79lw1l46H91lxu/8oVovmVGsgIUZYvrCuRMpwDuJ9xV1J2wz1jMdDM='
+		),
+		array(
+			'ver' => '1.5rc1',
+			'rev' => '1c62031359a1',
+			'date' => '2012-01-16',
+			'md5' => 'a0eaeaef74c7ccba84cb39144d0a27a2',
+			'dsa' => 'MC4CFQDRp82IUSm+hNuO4KOoBSpnn+MjgwIVANmHSHDX1RP70rAowJYg098PfV6D'
+		),
+		array(
+			'ver' => '1.5b9',
+			'rev' => 'aa61bd5db2e4',
+			'date' => '2012-01-07',
+			'md5' => '8f4ef26c84727a64e47ba138a5ee847f',
+			'dsa' => 'MC0CFCPkZUYzd9ReTmiw6h7FS1741+/3AhUAmzxbGAU/j4OQPOOyA3cC3CGG5Vs='
+		),
+		array(
+			'ver' => '1.5b8',
+			'rev' => '28a0306802ee',
+			'date' => '2011-12-17',
+			'md5' => 'c0451ae957082f556fd538f1f34dad50',
+			'dsa' => 'MCwCFHS1cV1KOrR9/VYef+p7iqUG9CftAhRiKvM1MAD0iTMklmgXSmxjUxDkzQ=='
+		),
+		array(
+			'ver' => '1.5b7',
+			'rev' => '5be91264f5d8',
+			'date' => '2011-12-04',
+			'md5' => 'b7a4017f944c5e67b30cd7760932908e',
+			'dsa' => 'MC0CFQCc1IKzJn5Cg39uhIUtPjnMyrEbswIUMjF0ZQAaqKKNJYF877C6ngr/WUk='
+		),
+		array(
+			'ver' => '1.5b6',
+			'rev' => '45eb40ad9991',
+			'date' => '2011-12-03',
+			'md5' => '778e37ee0f0012cdfd7a9e3a1cbf3b7c',
+			'dsa' => 'MCwCFE0Lm7/CfKS9/hnE2DOq5q/9+YQ/AhQ+aVIWmBKOOk0yKK9LlUJ31D1V+w=='
+		),
+		array(
+			'ver' => '1.5b5',
+			'rev' => 'b08eeb55787a',
+			'date' => '2011-11-26',
+			'md5' => '4b14cd65a60504cda5d7e48ac59f11b9',
+			'dsa' => 'MC0CFQDOl/WQxXgI4SnXS/lZDy/9es+NYwIUEbfJcZyrup+X7VVenZScfzF6AJ8='
+		),
+		array(
+			'ver' => '1.5b4',
+			'rev' => '92981866ae1f',
+			'date' => '2011-11-20',
+			'md5' => 'ea6136a94bbea428f397ab4681df89be',
+			'dsa' => 'MC4CFQCj44iqGBqB3B+tMTIADBdP0vCdyAIVALfKODSBkDSj99b2Mv8fNtrqXmgl'
+		),
+		array(
+			'ver' => '1.5b3',
+			'rev' => '30193567ea2e',
+			'date' => '2011-11-05',
+			'md5' => '07b64eb678c38787f8a450440fc4111b',
+			'dsa' => 'MCwCFAUggWX7kbjeV3HnTEDUqjsC/koRAhRhIqFtH+/zPD57EW+j9/0urttfcw=='
+		),
+		array(
+			'ver' => '1.5b2',
+			'rev' => '12536b2265ba',
+			'date' => '2011-10-29',
+			'md5' => '747096d7ab4e657d467976fae8eab340',
+			'dsa' => 'MC0CFB9od+VUWXuxmo1sKdLhe1Pn8MjwAhUA0FtfpBMi0pUF+peO9pEWjW5pTtM='
+		),
+		array(
+			'ver' => '1.5b1',
+			'rev' => 'e0ac5e1080a1',
+			'date' => '2011-10-22',
+			'md5' => '0b24da74b25b7c26b8c544c8749ae4d7'
+		)
+	);
 
 // --- You shouldn't need to edit below ---
 
 // If we're asked to not display the main website, this is being displayed in Sparkle.
-$noTemplate = (isset($_GET['notemplate']));
-$forInclude = (isset($_GET['forinclude']));
+$no_template = (isset($_GET['notemplate']));
 
-$latest = $versions[0];
+$repo = 'adium';
+$latest = $versions[0]; ?>
+<!DOCTYPE html>
+<html>
 
-if (!$forInclude) {
-	?>
-	<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"
-		"http://www.w3.org/TR/html4/strict.dtd">
-	<html>
-	<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-	<?php
-	if(!$noTemplate) {
-		?>
-		<title>Adium Beta - <?=$latest['ver']?></title>
-		<link rel="stylesheet" type="text/css" href="http://adium.im/styles/layoutstyle.css">
-		<link rel="stylesheet" type="text/css" href="http://adium.im/styles/defaultstyle.css">
-		<link rel="shortcut icon" href="http://adium.im/favicon.ico">
-		<?php
-	}
-}
-	?>
-	<link rel="stylesheet" type="text/css" href="http://adium.im/styles/beta.css">
-	
-<?php
-	if (!$forInclude) {
-		echo('</head><body>');
-	}
+<head>
+	<title>Adium - Beta</title>
+	<meta charset="utf-8">
+<?php if (!$no_template) { ?>
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+	<!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
+	<link rel="stylesheet" href="/rewrite/assets/styles/global.css">
+	<link rel="stylesheet" href="/rewrite/assets/styles/beta.css">
+	<link rel="shortcut icon" href="/rewrite/favicon.ico">
+	<link rel="apple-touch-icon-precomposed" href="/rewrite/apple-touch-icon.png">
+<?php } else { ?>
+	<link rel="stylesheet" href="/rewrite/assets/styles/changelog.css">
+<?php } ?>
+</head>
 
-	if(!$noTemplate) {
-?>
-	<div id="container">
-		<div id="titlecontainer">
-			<a href="http://www.adium.im/">Adium</a>
-		</div>
-		<div id="navcontainer">
-			<a class="navtab" href="http://adium.im/">Download</a> 
-			<a class="navtab" href="http://adium.im/about/">About</a> 
-			<a class="navtab" href="http://adium.im/blog/">Blog</a> 
-			<a class="navtab" href="http://adium.im/help/">Help</a>
-			<a class="navtabcurrent" href="http://trac.adium.im">Development</a> 
-			<a class="navtab" href="http://adium.spreadshirt.com">Merchandise</a>
-			<a class="navtab" href="http://www.adiumxtras.com/">Xtras</a>
-		</div>
-		
-		<div id="content">
-<?php
-	}
-?>
-<?php	
-	if (count($versions) === 0) {
-		?><p>You can find the current version of Adium at the <a href="http://adium.im">main website</a>.</p>		
-<?php
-
-	if (strlen($motd)) {
-		printf('<p style="margin-top: 2em;">%s</p>', $motd);
-	}
-	
-	} else {
-		if(!$noTemplate || $forInclude) {
-?>			
-		<h2><?=$latest["ver"]?></h2>
-		<p id="download">
-			<a href="http://download.adium.im/Adium_<?=$latest["ver"]?>.dmg">
-				<?php if (!$forInclude) { ?>
-					<img src="http://adium.im/images/logo_small.png" alt="Adiumy">
-				<?php } ?>
-				Adium_<?=$latest["ver"]?>.dmg</a> (MD5: <code><?=$latest["md5"]?></code>)<br>
-			Requires 10.6.8 or later. Released <?=$latest["date"]?><br>
-			Download hosted by <a href="http://www.cachefly.com/">CacheFly</a>
-		</p>
-
-		<?php
-			if (strlen($motd)) {
-				printf('<p style="margin-top: 2em;">%s</p>', $motd);
-			}
-		}
-
-		foreach($versions as $version) {
-			?>
-				<div class="version">
-					<div class="summary">
-						<h3>Version <?=$version["ver"]?> (<?=$version["date"]?>)</h3>
-						<p>Revision: <a class="changeset" href="http://hg.adium.im/<?=$repo?>/rev/<?=$version["rev"]?>"><?=$version["rev"]?></a></p>
-					</div>
-					<?php
-						readfile(sprintf("../changelogs/%s.htmlfrag", $version["ver"]));
-					?>
-				</div>
-			<?php
-		}
-	}
-	if(!$noTemplate) {
-?>
-	</div>
-     	<!-- fix overlap -->
-         <div style="clear: both; margin-top: 30px;"> </div>
-		<!-- use footerfixed if this doesn't reach the bottom of a reasonable page; otherwise, use footer -->
-		<div id="footerfixed">
-			<div class="donate">
-				<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&submit.x=57&submit.y=8&encrypted=-----BEGIN+PKCS7-----%0D%0AMIIHFgYJKoZIhvcNAQcEoIIHBzCCBwMCAQExggEwMIIBLAIBADCBlDCBjjELMAkG%0D%0AA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQw%0D%0AEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UE%0D%0AAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20CAQAwDQYJ%0D%0AKoZIhvcNAQEBBQAEgYAFR5tF%2BRKUV3BS49vJraDG%2BIoWDoZMieUT%2FJJ1Fzjsr511%0D%0Au7hS1F2piJuHuqmm%2F0r8Kf8oaycOo74K3zLmUQ6T6hUS6%2Bh6lZAoIlhI3A1YmqIP%0D%0AdrdY%2FtfKRbWfolDumJ9Mdv%2FzJxPnpdQiTN5K1PMrPYE6GgPWE9WC4V9lqstSmTEL%0D%0AMAkGBSsOAwIaBQAwgZMGCSqGSIb3DQEHATAUBggqhkiG9w0DBwQIjtd%2BN9o4ZB6A%0D%0AcIbH8ZjOLmE35xBQ%2F93chtzIcRXHhIQJVpBRCkyJkdTD3libP3F7TgkrLij1DBxg%0D%0AfFlE0V%2FGTk29Ys%2FwsPO7hNs3YSNuSz0HT5F6sa8aXwFtMCE%2FgB1Ha4qdtYY%2BNETJ%0D%0AEETwNMLefjhaBfI%2BnRxl2K2gggOHMIIDgzCCAuygAwIBAgIBADANBgkqhkiG9w0B%0D%0AAQUFADCBjjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDV!
 QQHEw1Nb3Vu%0D%0AdGFpbiBWaWV3MRQwEgYDVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9j%0D%0AZXJ0czERMA8GA1UEAxQIbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBh%0D%0AbC5jb20wHhcNMDQwMjEzMTAxMzE1WhcNMzUwMjEzMTAxMzE1WjCBjjELMAkGA1UE%0D%0ABhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYD%0D%0AVQQKEwtQYXlQYWwgSW5jLjETMBEGA1UECxQKbGl2ZV9jZXJ0czERMA8GA1UEAxQI%0D%0AbGl2ZV9hcGkxHDAaBgkqhkiG9w0BCQEWDXJlQHBheXBhbC5jb20wgZ8wDQYJKoZI%0D%0AhvcNAQEBBQADgY0AMIGJAoGBAMFHTt38RMxLXJyO2SmS%2BNdl72T7oKJ4u4uw%2B6aw%0D%0AntALWh03PewmIJuzbALScsTS4sZoS1fKciBGoh11gIfHzylvkdNe%2FhJl66%2FRGqrj%0D%0A5rFb08sAABNTzDTiqqNpJeBsYs%2Fc2aiGozptX2RlnBktH%2BSUNpAajW724Nv2Wvhi%0D%0Af6sFAgMBAAGjge4wgeswHQYDVR0OBBYEFJaffLvGbxe9WT9S1wob7BDWZJRrMIG7%0D%0ABgNVHSMEgbMwgbCAFJaffLvGbxe9WT9S1wob7BDWZJRroYGUpIGRMIGOMQswCQYD%0D%0AVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDU1vdW50YWluIFZpZXcxFDAS%0D%0ABgNVBAoTC1BheVBhbCBJbmMuMRMwEQYDVQQLFApsaXZlX2NlcnRzMREwDwYDVQQD%0D%0AFAhsaXZlX2FwaTEcMBoGCSqGSIb3DQEJARYNcmVAcGF5cGFsL!
 mNvbYIBADAMBgNV%0D%0AHRMEBTADAQH%2FMA0GCSqGSIb3DQEBBQUAA4GBAIF!
 fOlaagFr
l71%2Bjq6OKidbWFSE%2B%0D%0AQ4FqROvdgIONth%2B8kSK%2F%2FY%2F4ihuE4Ymvzn5ceE3S%2FiBSQQMjyvb%2Bs2TWbQYDwcp1%0D%0A29OPIbD9epdr4tJOUNiSojw7BHwYRiPh58S1xGlFgHFXwrEBb3dgNbMUa%2Bu4qect%0D%0AsMAXpVHnD9wIyfmHMYIBmjCCAZYCAQEwgZQwgY4xCzAJBgNVBAYTAlVTMQswCQYD%0D%0AVQQIEwJDQTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLUGF5UGFs%0D%0AIEluYy4xEzARBgNVBAsUCmxpdmVfY2VydHMxETAPBgNVBAMUCGxpdmVfYXBpMRww%0D%0AGgYJKoZIhvcNAQkBFg1yZUBwYXlwYWwuY29tAgEAMAkGBSsOAwIaBQCgXTAYBgkq%0D%0AhkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0wNDAzMjUwNDQ0%0D%0AMzRaMCMGCSqGSIb3DQEJBDEWBBRzTAS6zk5cmMeC49IorY8CM%2BkX0TANBgkqhkiG%0D%0A9w0BAQEFAASBgBsyRfMv9mSyoYq00wIB7BmUHFGq5x%2Ffnr8M24XbKjhkyeULk2NC%0D%0As4jbCgaWNg6grvccJtjbvmDskMKt%2BdS%2BEAkeWwm1Zf%2F%2B5u1fMyb5vo1NNcRIs5oq%0D%0A7SvXiLTPRzVqzQdhVs7PoZG0i0RRIb0tMeo1IssZeB2GE5Nsg0D8PwpB%0D%0A-----END+PKCS7-----">Donate to Adium</a>
-			</div>
-			<div id="powered">
-				<a href="http://developer.apple.com/ada"><img class="libgaim" src="http://adium.im/images/ada.png" alt="Apple design awards 05 special mention"></a> <a href="http://www.pidgin.im"><img class="libgaim" src="http://www.adium.im/images/powered_by_libpurple.png" alt="Adium is powered by libpurple"></a> <a class="networkredux" href="http://networkredux.com/"><img src="http://adium.im/images/network_redux.png" alt="Network Redux Logo"></a>
+<body>
+<?php if (!$no_template) { ?>
+	<header>
+		<div class="menu">
+			<div class="container">
+				<div id="menu-logo"><a href="/rewrite/"><span>Adium</span></a></div>
+				<nav>
+					<ul>
+						<li class="home"><a href="/rewrite/"><span>Home</span></a></li>
+						<li class="about"><a href="/rewrite/about/"><span>About</span></a></li>
+						<li class="help"><a href="/rewrite/help/"><span>Help</span></a></li>
+						<li class="blog"><a href="/rewrite/blog/"><span>Blog</span></a></li>
+						<li class="xtras"><a href="http://xtras.adium.im"><span>Xtras</span></a></li>
+						<li class="dev active"><a href="http://trac.adium.im"><span>Development</span></a></li>
+						<li class="merch"><a href="http://adium.spreadshirt.com"><span>Merchandise</span></a></li>
+					</ul>
+				</nav>
 			</div>
 		</div>
+		<div class="heading">
+			<div class="container">
+				<h1>Beta</h1>
+				<nav class="sub">
+					<ul>
+						<li><a href="http://trac.adium.im/wiki/">Wiki</a></li>
+						<li><a href="http://trac.adium.im/timeline/">Timeline</a></li>
+						<li><a href="http://trac.adium.im/roadmap/">Roadmap</a></li>
+						<li><a href="http://trac.adium.im/query/">View Tickets</a></li>
+						<li><a href="http://trac.adium.im/doxygen/">Doxygen</a></li>
+						<li><a href="http://trac.adium.im/search?ticket=on&wiki=on">Search</a></li>
+						<li class="active"><a href="/rewrite/beta/">Beta</a></li>
+						<li><a href="http://nightly.adium.im">Nightly</a></li>
+						<li><a href="http://sparkle.adium.im">Sparkle</a></li>
+					</ul>
+				</nav>
+			</div>
+		</div>
+	</header>
+<?php } ?>
+	<div class="content">
+		<div class="container">
+			<section>
+				<div class="padding-fix">
+				<?php if (count($versions) === 0) { ?>
+					<p>You can find the current version of Adium at the <a href="http://adium.im">main website</a>.</p>
+				<?php } else { ?>
+					
+					<?php if (!$no_template) { ?>
+					<h1>Adium <?php echo $latest['ver']; ?></h1>
+					<a href="http://download.adium.im/Adium_<?php echo $latest['ver']; ?>.dmg">
+						<div class="beta-logo"></div>
+						<p>Adium_<?php echo $latest['ver']; ?>.dmg
+					</a> 
+					(MD5: <code><?php echo $latest['md5']; ?></code>)<br>
+					Requires 10.6.8 or later - Released <?php echo $latest['date']; ?><br>
+					Download hosted by <a href="http://www.cachefly.com/">CacheFly</a></p>
+				</div>
+			</section>
+			<section>
+				<article>
+					<h1>Changelog</h1>
+					<?php } foreach ($versions as $version) { ?>
+						<hr>
+					
+						<h2>
+							Version <?php echo $version['ver']; ?> (<?php echo $version['date']; ?>)
+							<span class="revision">
+								Revision: 
+								<a href="http://hg.adium.im/<?php echo $repo; ?>/rev/<?php echo $version['rev']; ?>">
+									<?php echo $version['rev']; ?>
+								</a>
+							</span>
+						</h2>
+						<?php readfile(sprintf('../changelogs/%s.htmlfrag', $version['ver']));
+					} 
+				} ?>
+				</article>
+			</section>
+		</div>
 	</div>
-	<script type="text/javascript">
-		var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-		document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-	</script>
-	<script type="text/javascript">
-		var pageTracker = _gat._getTracker("UA-347527-8");
-		pageTracker._trackPageview();
-	</script>
-<?php
-	}
-	
-	if (!$forInclude) {
-		echo('</body></html>');
-	}
-?>
+<?php if (!$no_template) include('../footer.php'); ?>
\ No newline at end of file
diff -r aaa6e986a351 -r 47a3f7f46610 changelogs/1.5rc4.htmlfrag
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/changelogs/1.5rc4.htmlfrag	Sun Feb 19 04:01:53 2012 +0000
@@ -0,0 +1,13 @@
+<div class="changegroup">
+<h3 id="General">General</h3>
+<ul>
+	<li>Fixed the contact list appearing in a wrong position at startup on Mac OS X Lion (<a class="closed ticket" href="http://trac.adium.im/ticket/15341" title="Wrong contact list windows position at startup of program on Lion OS (closed: fixed)">#15341</a>, <a class="closed ticket" href="http://trac.adium.im/ticket/15480" title="Auto hidden contact list misplaced on Lion (closed: fixed)">#15480</a>).</li>
+	<li>Fixed message history only showing on 1st tab, on startup (<a class="closed ticket" href="http://trac.adium.im/ticket/15377" title="Message History Only Shows on 1st Tab on Startup (closed: fixed)">#15377</a>).</li>
+	<li>Fixed message view jumps to the bottom when Twitter Timeline updates (<a class="closed ticket" href="http://trac.adium.im/ticket/15790" title="Message view jumps to the bottom when Twitter Timeline updates (closed: fixed)">#15790</a>).</li>
+	<li>Fixed the contact list shrinking when closing the search (<a class="closed ticket" href="http://trac.adium.im/ticket/14433" title="Closing the filter bar shrinks the contact list window (closed: fixed)">#14433</a>).</li>
+</ul>
+
+<h3 id="Localisation">Localization</h3>
+<ul>
+	<li>Fixed the Ukrainian localization not being used on Mac OS X Lion (<a class="closed ticket" href="http://trac.adium.im/ticket/15821" title="Ukrainian localization is not working (1.5rc3 on 10.7.3) (closed: fixed)">#15821</a>).</li>
+</ul>
\ No newline at end of file
diff -r aaa6e986a351 -r 47a3f7f46610 styles/beta.css
--- a/styles/beta.css	Sun Feb 19 00:13:33 2012 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#sparklechangelog {
-	min-width: 0;
-}
-#content {
-	font-family: Helvetica, "Helvetica Neue", Arial, Geneva, sans-serif;
-	font-size: 10pt;
-}
-#sparklechangelog #content {
-	font-size: 8pt;
-	padding: 10px;
-	padding-top: 0;
-}
-h1 {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-h2 {
-	margin-top: 5pt;
-	margin-bottom: .5em;
-	font-size: 22px;
-}
-p#download {
-	height: 3em;
-}
-p#download img {
-	width: 50px;
-	height: 50px;
-	float: left;
-}
-ul {
-	padding-left: 20px;
-}
-li > a[href*="/ticket/"] {
-	font-size: 8pt;
-	text-decoration: none;
-}
-.version {
-	clear: both;
-	margin-top: 2em;
-}
-.version .summary * {
-	display: inline;
-}
-.version .changegroup {
-	margin: 5px;
-	margin-bottom: 20px;
-	border: 1px dotted gray;
-}
-#sparklechangelog .version .changegroup {
-	margin: 2.5px;
-	margin-bottom: 10px;
-}
-.version .changegroup h3 {
-	background-color: #abff82;
-	padding: 4px 8px;
-	color: #333;
-	margin: 0;
-}
-.version #majorchanges h3 {
-	background-color: #ffadad;
-	background-color: #afd7ff;
-}
-
-h3.critical {
-	background-color: #ff9d9d !important;
-}
-.version .changegroup ul {
-	margin: 8px;
-}
-#powered img {
-	border-width: 0px;
-}




More information about the commits mailing list