[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r23314: {website} increase max img width, link to about/overview rather than a (in website/branches/web20: about/en css donate/en en images)

To: or-cvs@xxxxxxxxxxxxx
Subject: [or-cvs] r23314: {website} increase max img width, link to about/overview rather than a (in website/branches/web20: about/en css donate/en en images)
From: Andrew Lewman <andrew@xxxxxxxxxxxxxx>
Date: Mon, 27 Sep 2010 19:27:00 +0000 (UTC)
Delivered-to: archiver@xxxxxxxx
Delivered-to: or-cvs-outgoing@xxxxxxxx
Delivered-to: or-cvs@xxxxxxxx
Delivery-date: Mon, 27 Sep 2010 15:27:06 -0400
Reply-to: or-dev@xxxxxxxxxxxxx
Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: phobos
Date: 2010-09-27 19:27:00 +0000 (Mon, 27 Sep 2010)
New Revision: 23314

Added:
   website/branches/web20/images/htw1.png
   website/branches/web20/images/htw2.png
   website/branches/web20/images/htw3.png
Modified:
   website/branches/web20/about/en/about.wml
   website/branches/web20/about/en/board.wml
   website/branches/web20/about/en/contact.wml
   website/branches/web20/about/en/contributors.wml
   website/branches/web20/about/en/corepeople.wml
   website/branches/web20/about/en/future.wml
   website/branches/web20/about/en/overview.wml
   website/branches/web20/about/en/people.wml
   website/branches/web20/about/en/sponsors.wml
   website/branches/web20/about/en/staying.wml
   website/branches/web20/about/en/torusers.wml
   website/branches/web20/about/en/translators.wml
   website/branches/web20/about/en/volunteers.wml
   website/branches/web20/about/en/why.wml
   website/branches/web20/css/layout.css
   website/branches/web20/donate/en/donate.wml
   website/branches/web20/en/index.wml
   website/branches/web20/en/navigation.wmi
Log:
increase max img width, link to about/overview rather than about/about.


Modified: website/branches/web20/about/en/about.wml
===================================================================
--- website/branches/web20/about/en/about.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/about.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About</a>
+    <a href="<page about/overview>">About</a>
   </div>
   <div id="maincol">
     <h1>Tor Overview</h1>

Modified: website/branches/web20/about/en/board.wml
===================================================================
--- website/branches/web20/about/en/board.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/board.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/board>">Board of Directors</a>
   </div>
 	<div id="maincol">

Modified: website/branches/web20/about/en/contact.wml
===================================================================
--- website/branches/web20/about/en/contact.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/contact.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -7,7 +7,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/contact>">Contact</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/about/en/contributors.wml
===================================================================
--- website/branches/web20/about/en/contributors.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/contributors.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -5,7 +5,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/contributors>">Past Contributors</a>
   </div>
 	<div id="maincol">

Modified: website/branches/web20/about/en/corepeople.wml
===================================================================
--- website/branches/web20/about/en/corepeople.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/corepeople.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -5,7 +5,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/corepeople>">Tor People</a>
   </div>
 	<div id="maincol">

Modified: website/branches/web20/about/en/future.wml
===================================================================
--- website/branches/web20/about/en/future.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/future.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/future>">The Future of Tor</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/about/en/overview.wml
===================================================================
--- website/branches/web20/about/en/overview.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/overview.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,8 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
-    <a href="<page about/about>">Overview</a>
+    <a href="<page about/overview>">About &raquo; </a>
   </div>
   <div id="maincol">
     <a name="overview"></a>
@@ -162,7 +161,7 @@
     that each hop can't trace these connections as they pass through.
     </p>
     
-    <p><img alt="Tor circuit step two" src="$(IMGROOT)/htw2.png" /></p>
+    <p><img alt="Tor circuit step two"  src="$(IMGROOT)/htw2.png" /></p>
     
     <p>
     Once a circuit has been established, many kinds of data can be exchanged

Modified: website/branches/web20/about/en/people.wml
===================================================================
--- website/branches/web20/about/en/people.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/people.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/board>">Board of Directors</a>
   </div>
   <div class="maincol">

Modified: website/branches/web20/about/en/sponsors.wml
===================================================================
--- website/branches/web20/about/en/sponsors.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/sponsors.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/sponsors>">Sponsors</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/about/en/staying.wml
===================================================================
--- website/branches/web20/about/en/staying.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/staying.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/staying>">Staying Anonymous</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/about/en/torusers.wml
===================================================================
--- website/branches/web20/about/en/torusers.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/torusers.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -7,7 +7,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/torusers>">Who Uses Tor</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/about/en/translators.wml
===================================================================
--- website/branches/web20/about/en/translators.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/translators.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/volunteers>">Translators</a>
   </div>
 	<div id="maincol">

Modified: website/branches/web20/about/en/volunteers.wml
===================================================================
--- website/branches/web20/about/en/volunteers.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/volunteers.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
 	<div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/volunteers>">Volunteers</a>
   </div>
 	<div id="maincol">

Modified: website/branches/web20/about/en/why.wml
===================================================================
--- website/branches/web20/about/en/why.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/about/en/why.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -6,7 +6,7 @@
 <div id="content" class="clearfix">
   <div id="breadcrumbs">
     <a href="<page index>">Home &raquo; </a>
-    <a href="<page about/about>">About &raquo; </a>
+    <a href="<page about/overview>">About &raquo; </a>
     <a href="<page about/why>">Why We Need Tor</a>
   </div>
   <div id="maincol">

Modified: website/branches/web20/css/layout.css
===================================================================
--- website/branches/web20/css/layout.css	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/css/layout.css	2010-09-27 19:27:00 UTC (rev 23314)
@@ -176,7 +176,7 @@
 	width: 960px;
 }
 
-	#content img { max-width: 250px; }
+	#content img { max-width: 550px; } 
 
 	#breadcrumbs { padding: 0 0 10px 5px; }
 

Modified: website/branches/web20/donate/en/donate.wml
===================================================================
--- website/branches/web20/donate/en/donate.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/donate/en/donate.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -18,10 +18,10 @@
       <div class="left hundred">
 	<div class="paypal focus">
 	  <h4>Make a recurring donation</h4>
+	    <table>
 	    <form id="subscribe" action="https://www.paypal.com/cgi-bin/webscr"; method="post">
 	      <div class="toppad">
-		<table>
-		  <tr>
+		<tr>
 		    <td>Choose your currency:</td>
 		      <td>
 			<select name="currency_code">
@@ -57,7 +57,7 @@
 		  </tr>
 		</table>
 	      </div>
-	    </form>
+	     </form>
 	  </div>
 	<div class="or left">OR</div>
 	<div class="paypal focus">
@@ -104,9 +104,9 @@
     <div class="hundred left">
       <div class="paypal focus">
       	<h4>Make a one-time donation</h4>
-      <table>
-      <tr>
-	    <form action="https://authorize.payments.amazon.com/pba/paypipeline"; method="post">
+	<form action="https://authorize.payments.amazon.com/pba/paypipeline"; method="post">
+	<table>
+	<tr>
 	    <input type="hidden" name="immediateReturn" value="1" />
 	    <input type="hidden" name="collectShippingAddress" value="0" />
 	    <input type="hidden" name="signatureVersion" value="2" />
@@ -136,9 +136,10 @@
 	  <td colspan="3"><input type="image" src="http://g-ecx.images-amazon.com/images/G/01/asp/golden_small_donate_withmsg_whitebg.gif"; border="0" /></td>
       </tr>
       </table>
-	</form>
+      </form>
     </div>
     </div>
+    </div>
     <! -- END AMAZON -->
     <!-- BEGIN GIVV -->
     <div class="title topforty">Donate via Givv.org</div>

Modified: website/branches/web20/en/index.wml
===================================================================
--- website/branches/web20/en/index.wml	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/en/index.wml	2010-09-27 19:27:00 UTC (rev 23314)
@@ -29,7 +29,7 @@
             threatens personal freedom and privacy, confidential business
             activities and relationships, and state security known as <a
             href="<page about/overview>">traffic analysis</a><br /><span
-            class="continue"><a href="<page about/about>">Learn more
+            class="continue"><a href="<page about/overview>">Learn more
             about Tor &raquo;</a></span></p>
           </div>
           <!-- END SUBCOL -->
@@ -43,7 +43,7 @@
           Tor works with many of your existing applications, including
           web browsers, instant messaging clients, remote login, and
           other applications based on the TCP protocol.<br /><span
-          class="continue"><a href="<page about/about>">Get involved
+          class="continue"><a href="<page about/overview>">Get involved
           with Tor &raquo;</a></span></p> </div>
         </div>
         <!-- END SUBCOL -->

Modified: website/branches/web20/en/navigation.wmi
===================================================================
--- website/branches/web20/en/navigation.wmi	2010-09-27 18:38:43 UTC (rev 23313)
+++ website/branches/web20/en/navigation.wmi	2010-09-27 19:27:00 UTC (rev 23314)
@@ -8,7 +8,7 @@
     # path                              link text
     my @navigation = (
         'index'                       , 'Home',
-        'about/about'                 , 'About Tor',
+        'about/overview'                 , 'About Tor',
         'docs/documentation'          , 'Documentation',
         'projects/clientside'         , 'Projects',
         'press/index'                 , 'Press',

Added: website/branches/web20/images/htw1.png
===================================================================
(Binary files differ)


Property changes on: website/branches/web20/images/htw1.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: website/branches/web20/images/htw2.png
===================================================================
(Binary files differ)


Property changes on: website/branches/web20/images/htw2.png
___________________________________________________________________
Added: svn:mime-type
   + image/png

Added: website/branches/web20/images/htw3.png
===================================================================
(Binary files differ)


Property changes on: website/branches/web20/images/htw3.png
___________________________________________________________________
Added: svn:mime-type
   + image/png
Prev by Author: [or-cvs] r23313: {website} clean up the confusing overview that isn't overview. (website/branches/web20/about/en)
Next by Author: [or-cvs] r23315: {} remove the about page now that nothing links to it. (website/branches/web20/about/en)
Previous by thread: [or-cvs] r23313: {website} clean up the confusing overview that isn't overview. (website/branches/web20/about/en)
Next by thread: [or-cvs] r23315: {} remove the about page now that nothing links to it. (website/branches/web20/about/en)
Index(es):
- Author
- Thread