www: 31b2080c: fixing validation errors on homepage, al...
caseyho at pidgin.im
caseyho at pidgin.im
Sat Dec 20 00:20:48 EST 2008
-----------------------------------------------------------------
Revision: 31b2080c7104bd9ef40752ea4e4ed1a074e3e57a
Ancestor: 989ccba5287525328c74b5541077fb3ad0e0370c
Author: caseyho at pidgin.im
Date: 2008-12-20T05:17:09
Branch: im.pidgin.www
URL: http://d.pidgin.im/viewmtn/revision/info/31b2080c7104bd9ef40752ea4e4ed1a074e3e57a
Modified files:
htdocs/home.php htdocs/index.php htdocs/shared/css/main.css
inc/blurb.download_new.inc inc/header.inc
ChangeLog:
fixing validation errors on homepage, also testing new version of download button
-------------- next part --------------
============================================================
--- htdocs/home.php cf04b34fb4ac9caaa8479be9849b79167e82b3b9
+++ htdocs/home.php 235ab7f00ec1af6bdec1e30b6230b458584ebd0a
@@ -22,27 +22,22 @@
<div id="sidebar">
<!--<a href="/shared/img/blist.jpg" id="screen0" class="multibox"> -->
- <img src="/shared/img/blist.jpg" alt="Sample IM buddy list">
+ <img src="/shared/img/blist.jpg" alt="Sample IM buddy list" />
<!-- </a> -->
</div>
<div id="main_content">
-
-<h1>IM <strong>all</strong> your friends in one place</h1>
-
-
<?
include($_SERVER['DOCUMENT_ROOT'] . "/../inc/blurb.download_new.inc");
?>
+<br />
-<div class="linkbar">
- <a href="/download/">Other Versions</a> |
- <a href="http://developer.pidgin.im/wiki/ChangeLog">ChangeLog</a> |
- <a href="http://developer.pidgin.im/wiki/FAQ" title="Frequently Asked Questions">FAQ</a>
-</div>
+<h1>IM <strong>all</strong> your friends in one place</h1>
+
+
<?php if($_GET['v'] == "2") { ?>
<p>Pidgin is an easy to use and free IM client used by millions.</p>
@@ -68,9 +63,9 @@ An intuitive interface that can be exten
</div>
-<a href="/about/"><img
+<p class="more"><a href="/about/"><img
src="/shared/img/button.learn-more.png" alt="Learn More" width="128"
-height="32"/></a>
+height="32"/></a></p>
<?php } else { ?>
@@ -88,15 +83,11 @@ to AIM, MSN, Yahoo, and more IM networks
<li>Google Talk</li>
<li>Groupwise</li>
<li>ICQ</li>
-</ul>
-<ul class="condensed">
<li>IRC</li>
<li>MSN</li>
<li>MySpaceIM</li>
<li>QQ</li>
<li>SILC</li>
-</ul>
-<ul class="condensed">
<li>SIMPLE</li>
<li>Sametime</li>
<li>XMPP</li>
@@ -104,17 +95,16 @@ to AIM, MSN, Yahoo, and more IM networks
<li>Zephyr</li>
</ul>
-<a href="/about/"><img
+<p class="more"><a href="/about/"><img
src="/shared/img/button.learn-more.png" alt="Learn More" width="128"
height="32"/></a>
+</p>
<? } ?>
</div>
-
</div>
</div>
-</div>
<?php /*
<div style="display:none">
============================================================
--- htdocs/index.php 425a50eabac29775f34ba038a9efdcbc1d17fd01
+++ htdocs/index.php d4a80e33945515d2983523d01b50116c7a341fde
@@ -1,23 +1,7 @@
-<!-- Begin Google Website Optimizer tracking code -->
-<script>
-_udn=".pidgin.im";
-function utmx_section(){}function utmx(){}
-(function(){var k='1527532502',d=document,l=d.location,c=d.cookie;function f(n){
-if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.
-length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;
-d.write('<sc'+'ript src="'+
-'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'
-+'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='
-+new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
-'" type="text/javascript" charset="utf-8"></sc'+'ript>')})();
-</script><script>utmx("url",'A/B');</script>
-<!-- End Google Website Optimizer tracking code -->
-
-
<?
// Update these to match the current page.
$page['title'] = "Pidgin, the universal IM client";
- $page['section'] = "Home";
+ $page['section'] = "Home2";
$page['description'] = "Pidgin is an easy to use and free IM client used by millions. Connect to AIM, Yahoo, MSN and other IM networks all at once.";
include($_SERVER['DOCUMENT_ROOT'] . "/../inc/header.inc");
@@ -62,15 +46,11 @@ include($_SERVER['DOCUMENT_ROOT'] . "/..
<li>Google Talk</li>
<li>Groupwise</li>
<li>ICQ</li>
-</ul>
-<ul class="condensed">
<li>IRC</li>
<li>MSN</li>
<li>MySpaceIM</li>
<li>QQ</li>
<li>SILC</li>
-</ul>
-<ul class="condensed">
<li>SIMPLE</li>
<li>Sametime</li>
<li>XMPP</li>
============================================================
--- htdocs/shared/css/main.css 3c67396f0c390362f32380d36b5d5f25e717fdd6
+++ htdocs/shared/css/main.css 457d7b5d2161a3629b2c87e642f9baf7b9ef5261
@@ -98,11 +98,6 @@ a:hover, a:active {
height: 500px;
}
-#main_content .condensed {
- margin-top: 0px;
- width: 20%;
-}
-
#sidebar {
float: right;
width: 270px;
@@ -120,32 +115,22 @@ a:hover, a:active {
*/
#download_new {
- padding: 5px 0px;
+ padding: 5px 0px 10px 0px;
text-align: center;
- width: 388px;
- font-size: 1px;
+ border: 1px solid #999;
+ background-color: #EEE;
}
-#download_new DIV {
- margin-top: -1px;
- font-size: 18px;
- background: url('/shared/img/bigdownload.middle.gif') repeat-y;
+#download_new BUTTON {
+ font-size: 24px;
+ border-style: outset;
+ border-width: 3px;
}
-#download_new A {
- text-decoration: none;
- display: block;
- color: #000;
-}
-
DIV.linkbar {
- display:block;
- padding: 5px 20px;
- width:388px;
- text-align:center;
+ margin-top: 10px;
}
-
/* END styles related to test version of home page */
@@ -389,15 +374,18 @@ DIV.linkbar {
}
#main p.more {
- clear: both;
- text-align: right;
+ padding-top: 20px;
+ float: right;
}
ul.condensed {
- margin: 26px 0 0 2px;
- width: 20%;
+ padding-bottom: 38px;
+ display: block;
+}
+
+.condensed LI {
+ width: 30%;
float: left;
- padding-bottom: 38px;
}
h1 {
============================================================
--- inc/blurb.download_new.inc 4f42316e1c0b5c0bfeb08bb3c38e38b91fa674ac
+++ inc/blurb.download_new.inc bddfa8fbbf15999dc47b34813c8e23bfb990dac2
@@ -3,19 +3,29 @@ include($_SERVER['DOCUMENT_ROOT'] . "/..
?>
<div id="download_new">
-<img src="/shared/img/bigdownload.top.gif" alt="" />
+<form method="get" action="<? echo $download_link; ?>">
<div>
-<a id="download_link" href="<? echo $download_link; ?>"
+<button type="submit" id="download_link"
<?php if (strlen($download_goal) > 0) { ?>
onClick="javascript:ConversionCount();"
<?php } ?>
>
-<strong>Download Pidgin <? echo $download_os; ?> </strong> <br />
+Download Pidgin
+</button>
+</div>
+</form>
+<br />
-version <? echo $pidgin_version; ?>
+
+Version <? echo $pidgin_version; ?> <? echo $download_os; ?>
+
+<br />
+
+<div class="linkbar">
+ <a href="/download/">Other Versions</a> |
+ <a href="http://developer.pidgin.im/wiki/ChangeLog">ChangeLog</a> |
+ <a href="http://developer.pidgin.im/wiki/FAQ" title="Frequently Asked Questions">FAQ</a>
</div>
-<img src="/shared/img/bigdownload.bottom.gif" alt="" />
-
</div>
============================================================
--- inc/header.inc 5f8ced5f7ab24bb3937e4ba7a0eb6bab09d2b457
+++ inc/header.inc 066824b09f864be473de90e1e2f3738b2cf2dd79
@@ -57,13 +57,37 @@ $sections['Support & Development'] = "ht
<link rel="stylesheet" href="/shared/css/ie7.css" type="text/css" />
<![endif]-->
- <?php if($page['section'] == 'Home2') { ?>
- <?php include("multibox.header.inc"); ?>
- <?php } ?>
+ <?php /* if($page['section'] == 'Home2') {
+ include("multibox.header.inc");
+ } */ ?>
</head>
<body>
+<?php if($page['section'] == 'Home2') {
+ // This is a hack to differentiate between the test page and the original page
+ $page['section'] = 'Home';
+?>
+<!-- Begin Google Website Optimizer tracking code -->
+<script>
+_udn=".pidgin.im";
+function utmx_section(){}function utmx(){}
+(function(){var k='1527532502',d=document,l=d.location,c=d.cookie;function f(n){
+if(c){var i=c.indexOf(n+'=');if(i>-1){var j=c.indexOf(';',i);return c.substring(i+n.
+length+1,j<0?c.length:j)}}}var x=f('__utmx'),xx=f('__utmxx'),h=l.hash;
+d.write('<sc'+'ript src="'+
+'http'+(l.protocol=='https:'?'s://ssl':'://www')+'.google-analytics.com'
++'/siteopt.js?v=1&utmxkey='+k+'&utmx='+(x?x:'')+'&utmxx='+(xx?xx:'')+'&utmxtime='
++new Date().valueOf()+(h?'&utmxhash='+escape(h.substr(1)):'')+
+'" type="text/javascript" charset="utf-8"></sc'+'ript>')})();
+</script><script>utmx("url",'A/B');</script>
+<!-- End Google Website Optimizer tracking code -->
+
+<? } ?>
+
+
+
+
<div id="header">
<a href="/"><img src="/shared/img/logo.text.jpg" alt="Pidgin" /></a>
<ul>
More information about the Commits
mailing list