Browse code

download: merge in download-easy (#14686)

traumschule authored on 10/09/2018 04:47:43
Showing 10 changed files
... ...
@@ -61,7 +61,10 @@ RewriteRule ^contact(.*) /about/contact$1 [R=301,L]
61 61
 # Download websites
62 62
 RewriteRule ^download/$ /download/download [R=301,L]
63 63
 RewriteRule ^download.html(.*) /download/download.html$1 [R=301,L]
64
-RewriteRule ^easy-download(.*) /download/download-easy$1 [R=301,L]
64
+RewriteRule ^easy-download(.*) /download/download$1 [R=301,L]
65
+RewriteRule ^download-easy(.*) /download/download$1 [R=301,L]
66
+RewriteRule ^download-unix(.*) /download/download$1 [R=301,L]
67
+RewriteRule ^tor(.*) /download/download [R=301,L]
65 68
 
66 69
 # Relays
67 70
 RewriteRule ^relays(.*) /getinvolved/relays [R=301,L]
... ...
@@ -604,11 +604,12 @@ table tr img {
604 604
   }
605 605
 
606 606
 .package {
607
+  display: block;
607 608
   float: left;
608
-  height: 280px;
609
+  width: 238px;
609 610
   margin: 0px;
610 611
   padding: 25px 20px 20px 20px;
611
-  border-top: 1px solid #888888;
612
+  -border-top: 1px solid #888888;
612 613
   }
613 614
 
614 615
   .package h2 {
... ...
@@ -621,9 +622,6 @@ table tr img {
621 622
     }
622 623
 
623 624
 .downloads {
624
-  display: block;
625
-  float: left;
626
-  width: 238px;
627 625
   padding: 0 16px 0 0;
628 626
   text-align: center;
629 627
   }
... ...
@@ -673,16 +671,11 @@ table tr img {
673 671
 .sig {
674 672
   display: block;
675 673
   margin: 3px 0px 20px 0px;
674
+  margin-bottom: 5px
676 675
   }
677 676
 
678 677
 /* DOWNLOAD-EASY ---*/
679 678
 
680
-.easy {
681
-	width: 712px;
682
-	margin-bottom: 10px;
683
-	padding-bottom: 8px;
684
-}
685
-
686 679
 #download-donate {
687 680
 	background-attachment: scroll;
688 681
 	background-clip: border-box;
... ...
@@ -694,31 +687,31 @@ table tr img {
694 687
 	background-size: 100% 100%;
695 688
 }
696 689
 
697
-.easy .package h2,
698
-.easy .package em {
690
+.package h2,
691
+.package em {
699 692
   display: block;
700 693
   width: 100%;
701 694
   text-align: left;
702 695
   }
703 696
 
704
-.easy .package h2 {
697
+.package h2 {
705 698
   padding-top: 10px;
706 699
   padding-bottom: 5px;
707 700
   }
708 701
 
709
-.easy .package em {
702
+.package em {
710 703
   font-size: 1.2em;
711 704
   padding-top: 8px;
712 705
   padding-bottom: 4px;
713 706
   }
714 707
 
715
-.easy .package p {
708
+.package p {
716 709
   padding-left: 0px;
717 710
   font-size: 15px;
718 711
   text-align: justify;
719 712
   }
720 713
 
721
-.easy .package p.alt-dl {
714
+.package p.alt-dl {
722 715
   text-align: left;
723 716
   text-indent: 0px;
724 717
   padding-left: 0px;
... ...
@@ -741,11 +734,6 @@ table tr img {
741 734
   text-decoration: underline;
742 735
 }
743 736
 
744
-.easy .package {
745
-  float: none;
746
-  padding: 0 8px 0 12px ;
747
-  }
748
-
749 737
 .open {
750 738
   display: block;
751 739
   }
... ...
@@ -1 +1 @@
1
-@charset "UTF-8";body{background:#fff}#wrap{width:960px;max-width:100%;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px;max-width:100%}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;max-width:75%;margin-bottom:20px}.tb#maincol{max-width:100%}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;-padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent;background-size:24px}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{float:left;height:280px;margin:0;padding:25px 20px 20px 20px;border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{display:block;float:left;width:238px;padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0}.easy{width:712px;margin-bottom:10px;padding-bottom:8px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.easy .package h2,.easy .package em{display:block;width:100%;text-align:left}.easy .package h2{padding-top:10px;padding-bottom:5px}.easy .package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.easy .package p{padding-left:0;font-size:15px;text-align:justify}.easy .package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.easy .package{float:none;padding:0 8px 0 12px}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.note{float:left;_float:none;padding:25px 25px;margin-top:4px}.note p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block}.accordion{margin:10px auto 30px auto}.accordion pre{padding:15px;line-height:150%}.accordion .hint{color:grey;font-size:90%}.accordion input{display:none}.accordion label:hover,.accordion input:checked+label,.accordion input:checked+label:hover{text-shadow:0 1px 1px rgba(255,255,255,0.6)}.accordion label{padding:5px 0;position:relative;z-index:19;display:block;cursor:pointer;text-shadow:1px 1px 1px rgba(255,255,255,0.8);background:linear-gradient(top,#fff 1%,#bda5cc 100%)}.accordion label a{color:#66a516}.accordion div.nav{right:50px}.accordion .nav{float:right;max-width:400px;text-decoration:none}.accordion .nav ul{list-style:none;text-align:right}.accordion .nav hint{font-size:-50%}.accordion article{height:0;overflow:hidden;position:relative;z-index:10;transition:height .3s ease-in-out,box-shadow .6s linear}.accordion .ac-box input:active ~ label p a,.accordion .ac-box input:checked ~ label p a{font-weight:bold;color:red;text-decoration:underline}.accordion div:hover ~ article,.accordion div:active ~ article,.accordion input:checked ~ article{height:100%;transition:height .5s ease-in-out,box-shadow .1s linear}.accordion input:active ~ article.ac-box .accordion input:checked ~ article.ac-box{-background:grey;border:solid 1px #66a516;padding:15px;margin-bottom:30px}.accordion article h4{margin:15px}.accordion article.ac-box label,.accordion article.ac-box label h4{display:inline}.accordion.download label{margin-left:50px;padding-left:50px}.tor-source{margin-left:75px;float:left}
2 1
\ No newline at end of file
2
+@charset "UTF-8";body{background:#fff}#wrap{width:960px;max-width:100%;margin:0 auto}.left{float:left}.right{float:right}.twenty{width:20%}.thirty{width:30%}.forty{width:40%}.fifty{width:50%}.sixty{width:60%}.hundred{width:100%}.nopad{padding:0}.toppad{padding-top:10px}.toptwenty{margin-top:20px}.topforty{margin-top:40px}.hidden{display:none}#header{width:960px;height:97px;margin-bottom:23px;position:relative}h1#logo{margin:0;float:left}h1#logo a,h1#logo a:visited{background:url(../images/tor-logo.png) left top no-repeat;background-size:150px 97px;text-indent:-9999px;overflow:hidden;width:150px;height:97px;display:block}#nav{position:absolute;top:30px;left:115px;float:right}#nav ul{height:50px;float:right;margin-bottom:0}#nav ul li{float:left;display:inline;width:auto}#calltoaction{height:30px;float:right;margin-top:100px;margin-right:5px;text-align:center}#calltoaction ul{padding:0;margin:0;height:30px;list-style:none;float:right}#calltoaction ul li{list-style:none;display:inline;float:none;width:100px;margin-left:0}#calltoaction ul li a:link,#calltoaction ul li a:visited{display:block;background:url(../images/cta-buttons.jpg) top center no-repeat #885ca4;padding:4px 8px;color:#fff;font-weight:bold;text-decoration:none;font-size:13px;line-height:22px;height:22px;width:84px;float:left;text-shadow:1px 1px 0 #111}#calltoaction ul li:hover a{background:url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800;font-weight:bold;text-shadow:1px 1px 0 #111}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited,#calltoaction ul li:hover:first-child a{-webkit-border-top-left-radius:7px;-webkit-border-bottom-left-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-bottomleft:7px;border-top-left-radius:7px;border-bottom-left-radius:7px}#calltoaction ul li:first-child a:link,#calltoaction ul li:first-child a:visited{background:url(../images/cta-buttons.jpg) top left no-repeat #885ca4}#calltoaction ul li:hover:first-child a{background:url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited,#calltoaction ul li:hover:last-child a{-webkit-border-top-right-radius:7px;-webkit-border-bottom-right-radius:7px;-moz-border-radius-topright:7px;-moz-border-radius-bottomright:7px;border-top-right-radius:7px;border-bottom-right-radius:7px}#calltoaction ul li:last-child a:link,#calltoaction ul li:last-child a:visited{background:url(../images/cta-buttons.jpg) top right no-repeat #885ca4;color:#fff}#calltoaction ul li:hover:last-child a{background:url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800}#banner{background:url(../images/bg-banner.jpg) left top no-repeat;height:200px;width:600px;padding:23px 15px;margin-bottom:15px}#download a:link,#download a:visited{margin:-17px 0 0;background:url(../images/button-download.png) left top no-repeat;width:257px;height:79px;float:left;padding:35px 0 0 80px;text-decoration:none}#download a .download-tor{background:url(../images/button-download-arrow.png) right center no-repeat;font-family:"Arial Narrow",Arial,sans-serif;color:#fff;font-size:2.167em;letter-spacing:1px;padding-right:25px}#download a .version{color:#bda5cc;font-size:1.167em;line-height:1.167em}#download a .info{color:#bda5cc;font-size:.833em;line-height:.833em}#download a:hover{background-position:0 -114px}#download a:hover .version,#download a:hover .info{color:#f1c6a1}#banner ul{background:#387520 url(../images/banner-gradient.jpg) left top repeat-x;border:1px solid #366b32;width:180px;float:right;margin:0 15px 0 0;padding:10px 10px 10px 30px}#banner ul li{list-style:url(../images/white-bullet.png) outside;padding:5px 0}#content{width:960px;max-width:100%}#content img{max-width:710px}#breadcrumbs{padding:0 0 10px 5px}#home #maincol{float:left;width:620px;margin-right:20px}#maincol{float:right;width:710px;max-width:75%;margin-bottom:20px}.tb#maincol{max-width:100%}#dow-don-left,#maincol-left{float:left;width:710px;margin-bottom:20px}#maincol .topforty .icon img{border:0}.subcol{width:280px;float:left;margin:0 0 25px}#content .first{margin-right:20px}#home #sidecol{float:right;width:300px}#sidecol{float:left;width:230px;margin-right:20px}#dow-don-right,#sidecol-right{float:right;width:230px;margin-left:20px;-padding-top:100px}#torusers{margin:0 0 27px}.user{margin:0 0 12px;height:auto}.user img,.project-icon{border:1px solid #cac8a7;float:left;margin:3px 10px 0 0}.user p{margin:0}.img-shadow{float:left;background:url(../images/shadowAlpha.png) no-repeat bottom right !important;background:url(../images/shadow.gif) no-repeat bottom right;margin:10px 0 10px 10px !important;margin:10px 0 10px 5px}.img-shadow .infoblock,.img-shadow .important-infoblock,.img-shadow .custom-infoblock,.img-shadow #sidenav,.img-shadow .sidenav-sub{display:block;position:relative;margin:-6px 6px 6px -6px;background-color:#fff;border:1px solid #ddd}.img-shadow .important-infoblock{background-color:#f7f8f0;border:1px solid #eeefe8}.img-shadow .infoblock,.img-shadow .important-infoblock{padding:15px;width:188px}.img-shadow .custom-infoblock{padding:15px;height:120px;width:426px}.img-shadow .infoblock p,.img-shadow .important-infoblock p,.img-shadow .custom-infoblock p{margin:0}.img-shadow #sidenav,.img-shadow .sidenav-sub{padding:10px 0 0;width:218px}#sidenav ul li,.sidenav-sub ul li{border-bottom:1px solid #ddd}#sidenav ul li.dropdown a:link,#sidenav ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left center no-repeat}#sidenav ul li.dropdown a.active{background:url(../images/sidenav-arrow-active.gif) left center no-repeat}.sidenav-sub ul li.dropdown a:link,.sidenav-sub ul li.dropdown a:visited{background:url(../images/sidenav-arrow.gif) left top no-repeat;margin-top:12px}#sidenav ul li a:link,#sidenav ul li a:visited{display:block;height:auto;padding:8px 15px 8px 26px}#sidenav ul li ul li a:link,#sidenav ul li ul li a:visited{padding-left:37px}.sidenav-sub ul li a:link,.sidenav-sub ul li a:visited{display:block;padding:0 15px 10px 26px;line-height:16px}#sidenav ul li.active{background:url(../images/sidenav-active.png) left center no-repeat;width:230px;border:0}#sidenav ul li ul li ul li a:link,#sidenav ul li ul li ul li a:visited{padding-left:48px}#press tr:nth-child(even){background-color:#e5e5e5}table{width:100%}td{padding:12px}table td img,table tr img{border:0;float:left;margin-right:10px}.icon{float:left;width:auto;margin-right:15px;padding:10px 0;border:0}.calendar{background:url(../images/icon-calendar.jpg) left top no-repeat;float:left;margin-right:10px;width:45px;height:54px;text-align:center;padding:4px 0}.fauxhead{background:url(../images/table-arrow.jpg) right top no-repeat;width:100%;height:11px}#home-our-projects td{height:92px;width:296px;padding:6px}#ecosystem_presentation{height:30px;padding-top:10px;padding-left:60px;vertical-align:middle;background:url("../images/video.png") no-repeat scroll left center transparent;font-size:1.7em;font-weight:bold}#ecosystem_presentation a{text-decoration:none}.project{float:left;padding:6px;border:1px solid #cac8a7;height:76px;width:284px;-webkit-border-radius:10px;-moz-border-radius:10px;border-radius:10px}.project img{border:0;margin-right:6px}.beige{background:#f5f5df}.gray{background:#e0e0e0}.meta{float:right;width:auto}.windows24{background:url("../images/icon-windows24.png") no-repeat scroll left center transparent}.mac24{background:url("../images/icon-mac24.png") no-repeat scroll left center transparent}.linux24{background:url("../images/icon-linux24.png") no-repeat scroll left center transparent}.android24{background:url("../images/icon-android24.png") no-repeat scroll left center transparent;background-size:24px}.smartphone24{background:url("../images/icon-smartphone24.png") no-repeat scroll left center transparent}.sourcecode24{background:url("../images/icon-sourcecode24.png") no-repeat scroll left center transparent}.windows24,.mac24,.linux24,.android24,.smartphone24,.sourcecode24{display:block;line-height:32px;padding:0 0 0 33px}.accordionButton{background:url("../images/table-title.jpg") repeat-x left bottom #885ca4;color:#fff;margin:0;font-size:1.1em;font-weight:bold;height:32px;float:left;_float:none;border:1px solid #fff;border-bottom:0;cursor:pointer;-webkit-border-top-left-radius:7px;-webkit-border-top-right-radius:7px;-moz-border-radius-topleft:7px;-moz-border-radius-topright:7px;border-top-left-radius:7px;border-top-right-radius:7px;position:relative;padding-left:30px;width:680px}.accordionButton:hover{background:url("../images/table-title-hover.jpg") repeat-x left bottom #885ca4;text-shadow:1px 1px 0 rgba(17,17,17,1)}.on:before,.off:before{position:absolute;content:'';height:0;width:0;font-size:0;line-height:0}.on:before{top:14px;left:10px;border-left:7px solid transparent;border-right:7px solid transparent;border-top:7px solid #fff}.off:before{top:9px;left:14px;border-bottom:7px solid transparent;border-top:7px solid transparent;border-left:7px solid #fff}.accordionContent{width:708px;float:left;_float:none;background:#fff;display:block}.accordionContent .fauxhead{width:710px}.package{display:block;float:left;width:238px;margin:0;padding:25px 20px 20px 20px;-border-top:1px solid #888}.package h2{margin-bottom:3px}.package p{margin-top:16px;padding-left:10px}.downloads{padding:0 16px 0 0;text-align:center}.lang{float:right;display:none;width:80px;height:20px;margin:0 7px 0 0;padding:0 0 0 3px;background-color:#fefff7;border:2px solid #cccfb8;border-top:0;-webkit-border-bottom-left-radius:5px;-webkit-border-bottom-right-radius:5px;-moz-border-radius-bottomleft:5px;-moz-border-radius-bottomright:5px;border-bottom-left-radius:5px;border-bottom-right-radius:5px}.button{text-align:center;display:block;width:234px;height:69px;text-decoration:none;background:url(../images/button-downloadpage.png) bottom left no-repeat;margin:0 auto 8px auto;text-shadow:1px 1px 0 rgba(17,17,17,1);-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.button .strong{display:block;padding:10px 0 0 57px}.button .normal{padding:5px 0 0 57px;display:block}.sig{display:block;margin:3px 0 20px 0;margin-bottom:5px}#download-donate{background-attachment:scroll;background-clip:border-box;background-color:transparent;background-image:url(../images/headerbg.jpg);background-origin:padding-box;background-position:0 0;background-repeat:no-repeat;background-size:100% 100%}.package h2,.package em{display:block;width:100%;text-align:left}.package h2{padding-top:10px;padding-bottom:5px}.package em{font-size:1.2em;padding-top:8px;padding-bottom:4px}.package p{padding-left:0;font-size:15px;text-align:justify}.package p.alt-dl{text-align:left;text-indent:0;padding-left:0;margin-top:32px}.all-dl{display:block;text-align:left;width:100%;font-size:15px}.all-dl a{text-decoration:none;font-weight:bold}.all-dl a:hover{text-decoration:underline}.open{display:block}.lang-alt{line-height:15px;font-size:10px;float:right;margin-right:10px}.expander{text-align:right;float:right;padding:10px 20px 0 0;font-size:15px;display:none}.title{background:url(../images/table-title-arrow.jpg) right top no-repeat;padding:10px 25px 0 10px;height:33px;float:left}.title a:link,.title a:visited{background:url(../images/table-title.jpg) left top no-repeat;height:33px;display:block}.paypal{float:left;width:auto;min-height:159px;max-width:365px}.paypal span{padding-right:20px}.warning-top{width:618px;padding:10px 10px 10px 60px;margin:0 10px 0 10px;display:block;background:url("../images/warning.png") no-repeat scroll 2px 23px #fffeb6;border:1px solid #a6a427;border-bottom:0;-webkit-border-top-left-radius:5px;-webkit-border-top-right-radius:5px;-moz-border-radius-topleft:5px;-moz-border-radius-topright:5px;border-top-left-radius:5px;border-top-right-radius:5px}.warning-top h2{padding-right:15px;padding-left:0;margin-bottom:5px}.warning-top p{padding-left:10px;margin-bottom:0}.note{float:left;_float:none;padding:25px 25px;margin-top:4px}.note p{padding-left:10px}.focus{background:#f4f2c7;border:1px solid #ebd4a9;padding:10px 15px}.focus .icon{float:left;width:auto;margin-right:10px}.featured-project{width:313px}input,select{margin:0 3px 10px 0}input.textfield{padding:0 10px;vertical-align:top}.donate-btn{background:left top no-repeat;height:26px;width:92px;text-indent:-9999px;overflow:hidden;border:0;vertical-align:top;margin-top:5px}.donate-btn:hover{background-position:0 -26px;cursor:pointer}.signup{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;height:31px;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em}.signup:hover{background:#6ab334}select#lang{float:left;width:160px;margin-right:3px}.go{background:#96c35a;border-top:1px solid #6ab334;border-left:1px solid #6ab334;border-bottom:1px solid #5a952b;border-right:1px solid #5a952b;padding:0 5px;vertical-align:top;color:#222c14;font-weight:bold;font-size:1em;line-height:1em;height:18px}.go:hover{background:#6ab334}#footer{width:1024px;height:200px;border-top:1px solid #ddd;padding:20px 0;margin:20px 0 0}.onion{float:left;width:88px;padding-right:20px;height:100%}#footer .about{width:180px;padding-right:30px;border-right:1px solid #ddd;float:left}#footer .newsletter{padding:0 0 15px 30px;width:auto;margin-left:308px}#footer input.textfield{width:220px;height:26px}#footer input{margin:0}#footer .col{float:left;width:100px;margin-left:20px}#footer .first{margin-left:30px}#footer .wider{width:201px}small{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:italic}.hlist{text-align:center;display:block;width:100%;padding:0;list-style:none;margin:0 0 18px 0}.hlist li{display:inline-block;border-right:1px solid #444;margin-left:-4px}.hlist li.last{border-right:0 solid #444}.hlist a{display:block;top:0;right:0;bottom:0;left:0;text-decoration:none;font-weight:bold;padding:0 8px}.dbox{float:none;text-align:center;color:#222;border:0;padding:1.4em .7em;width:163px;margin:0 0 0 10px}.dbox p{display:block;padding:0;margin:0}.dbox h2{padding:13px 0 15px 0;position:relative;color:black;font-family:Helvetica,Arial,sans-serif;font-size:18px;font-weight:normal;height:35px;margin-bottom:-20px;margin-left:-6px;z-index:-10}.dbox input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:68px;width:186px;margin-top:0;display:block;background-color:transparent;color:transparent;margin:10px auto 10px auto;padding:0}.dbox span{float:left;padding-right:0}.dbox div label{padding:0 10px 0 0}.dbox h6#ppinfo{width:100%;text-align:center;margin:-15px auto 0 auto}.dbox small,.dbox.donate #ppinfo{margin:0 auto 0 auto;text-align:center;font-size:10px;font-style:normal}.dbox.dl{float:none;width:177px;margin:0 5px 20px 5px}.dbox.dl input.amount{width:87px}.dbox.donate{float:none;padding:30px 30px;width:626px;min-height:0;max-width:none;text-align:left}.dbox.donate input,.dbox.donate select{padding-bottom:0;margin-bottom:0}.dbox.donate .drow{margin:0 0 0 20px}.dbox.donate .drow div{padding:0;width:auto;display:block}.dbox.donate h3{padding-left:0;color:#23300e;margin:0 0 10px 0}.dbox.donate h4{padding-left:20px}.dbox.donate p{padding:5px 20px 15px 40px}.dbox.donate span{float:left;padding-right:0}.dbox.donate div label{padding:0 10px 0 0}.dbox.donate .type{padding-left:20px}.dbox.donate select#t3{width:auto;margin-bottom:0}.dbox.donate ul.amounts{width:auto}.dbox.donate ul.amounts li{display:inline-block}.dbox.donate ul.amounts li label{padding:0 0 0 5px}.dbox.donate input.donate-btn{background:url(../images/btn_donateCC_LG.gif) left top no-repeat transparent;height:26px;width:115px;margin-top:-3px;display:inline-block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall{position:relative;display:inline-block;width:170px;height:140px;text-align:center;margin:0 10px;vertical-align:top}.dbox.dsmall input.donate-btn{background:url() left top no-repeat transparent;width:auto;height:auto;margin-top:0;display:block;background-color:transparent;color:transparent;border:0 solid transparent}.dbox.dsmall div label{padding:0}.dbox.dsmall small{display:block;position:absolute;width:172px;float:none;bottom:20px;margin:0 auto}.givv p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}dwolla p{text-align:justify;margin-top:10px;font-size:11px;line-height:13px}div.blogRow,div.blogFirstRow{height:40px;padding:3px 10px;margin:0}div.blogLastRow{height:20px;text-align:center}div.blogFirstRow{height:22px;background:url(../images/table-head.jpg) left top repeat-x #885ca4}.blogRow:hover{background:#f6ffd5}div.blogRow1,div.blogRow3{background:#eee8f1}.blogFeed a{text-decoration:none}.blogFeed p{margin:0;font-size:12px}p.blogTitle{font-weight:bold;text-decoration:underline}p.blogAuthor{color:#000;text-align:right;margin-top:-20px}p.blogAuthor em{color:#4e6a20;text-align:right;margin-top:-20px}p.blogDate{color:#000}.blogFeed h2{font-size:1.467em;margin:0;line-height:23px;color:#f6f6ed}#projectpage td{width:50%}.projectbox{width:710px;position:relative;margin-bottom:80px}.projectbox .name{font-size:1.5em;font-weight:bold}.projectbox a img{float:none;position:absolute;top:0;left:0}.projectbox .projectdesc{margin-left:100px}.clearfix:after{content:".";display:block;height:0;clear:both;visibility:hidden}.clearfix{display:inline-block}/*\*/* html .clearfix{height:1%}.clearfix{display:block}/**/.joblink{display:block;font-size:128%;font-weight:bold;padding:10px 5px;text-align:right}.joblink a{text-decoration:none}.dropbtn{background-color:white;padding:16px 0 0 0;font-size:100%;border:0;cursor:pointer}.dropdown{position:relative;display:inline-block;padding:0;margin-top:-16px;top:0}.dropdown-content{display:none;position:absolute;background-color:#f9f9f9;box-shadow:0 8px 16px 0 rgba(0,0,0,0.2);z-index:1;margin:48px 0 0 0}.dropdown-content a{color:black;padding-top:12px 16px;text-decoration:none;display:block}.dropdown:hover .dropdown-content{display:block}.accordion{margin:10px auto 30px auto}.accordion pre{padding:15px;line-height:150%}.accordion .hint{color:grey;font-size:90%}.accordion input{display:none}.accordion label:hover,.accordion input:checked+label,.accordion input:checked+label:hover{text-shadow:0 1px 1px rgba(255,255,255,0.6)}.accordion label{padding:5px 0;position:relative;z-index:19;display:block;cursor:pointer;text-shadow:1px 1px 1px rgba(255,255,255,0.8);background:linear-gradient(top,#fff 1%,#bda5cc 100%)}.accordion label a{color:#66a516}.accordion div.nav{right:50px}.accordion .nav{float:right;max-width:400px;text-decoration:none}.accordion .nav ul{list-style:none;text-align:right}.accordion .nav hint{font-size:-50%}.accordion article{height:0;overflow:hidden;position:relative;z-index:10;transition:height .3s ease-in-out,box-shadow .6s linear}.accordion .ac-box input:active ~ label p a,.accordion .ac-box input:checked ~ label p a{font-weight:bold;color:red;text-decoration:underline}.accordion div:hover ~ article,.accordion div:active ~ article,.accordion input:checked ~ article{height:100%;transition:height .5s ease-in-out,box-shadow .1s linear}.accordion input:active ~ article.ac-box .accordion input:checked ~ article.ac-box{-background:grey;border:solid 1px #66a516;padding:15px;margin-bottom:30px}.accordion article h4{margin:15px}.accordion article.ac-box label,.accordion article.ac-box label h4{display:inline}.accordion.download label{margin-left:50px;padding-left:50px}.tor-source{margin-left:75px;float:left}
3 3
\ No newline at end of file
... ...
@@ -813,7 +813,7 @@
813 813
     it sends. Tor Browser tries to keep application-level data,
814 814
     like the user-agent string, uniform for all users. Tor Browser can't
815 815
     do anything about text that you type into forms, though. <a
816
-    href="<page download/download-easy>#warning">Be
816
+    href="<page download/download>#warning">Be
817 817
     careful and be smart.</a>
818 818
     </p>
819 819
 
... ...
@@ -112,7 +112,7 @@
112 112
 
113 113
     <h3>Currently deployed PTs</h3>
114 114
 
115
-    <p>These Pluggable Transports are currently deployed in Tor Browser, and you can start using them by <a href="<page download/download-easy>">downloading and using Tor Browser</a>.
115
+    <p>These Pluggable Transports are currently deployed in Tor Browser, and you can start using them by <a href="<page download/download>">downloading and using Tor Browser</a>.
116 116
     </p>
117 117
 
118 118
       <ul>
119 119
deleted file mode 100644
... ...
@@ -1,259 +0,0 @@
1
-## translation metadata
2
-# Revision: $Revision$
3
-# Translation-Priority: 3-low
4
-
5
-#<!-- ATTENTION TRANSLATOR -->
6
-#<!-- You MUST copy '/include/lang.wmi' along with this file! -->
7
-
8
-#<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)-->
9
-#<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' -->
10
-<define-tag lang>en-US</define-tag>
11
-
12
-#<!-- Download button text for language enabled packages -->
13
-<define-tag button-win-tbb32>Tor Browser</define-tag>
14
-<define-tag button-win-tbb64>Windows 64-bit</define-tag>
15
-<define-tag button-osx-tbb64>Tor Browser</define-tag>
16
-<define-tag button-lin-tbb32>Tor Browser</define-tag>
17
-<define-tag button-lin-tbb64>Linux 64-bit</define-tag>
18
-
19
-#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8"
20
-
21
-<div id="content" class="clearfix">
22
- <div id="breadcrumbs"><a href="<page index>">Home &raquo; </a><a href="<page download/download>">Download</a></div>
23
-  <div id="maincol-left">
24
-<!-- BEGIN TEASER WARNING -->
25
-   <div class="warning-top">
26
-    <h2>Want Tor to really work?</h2>
27
-    <p>You need to change some of your habits, as some things won't work exactly as you are used to. Please read the <a href="#warning">full list of warnings</a> for details.</p>
28
-   </div>
29
-<!-- END TEASER WARNING -->
30
-
31
-<!-- START DOWNLOADS -->
32
-   <div id="dow-don-left">
33
-  <div id="tor" style="padding: 15px">
34
-    Are you looking for the <a href="<page download/download>">Tor source tarball</a>?
35
-  </div>
36
-<!-- START WINDOWS -->
37
-<!-- START WINDOWS 64-Bit -->
38
-      <div id="windows" class="easy windows">
39
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
40
-	  <div class="desc">
41
-	    <h2>Tor Browser for Windows (64 bit)</h2>
42
-	    <em>Version <version-torbrowserbundle> - Windows 10, 8, and 7</em>
43
-	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
44
-	  </div>
45
-	  <form class="downloads">
46
-	    <a class="button win-tbb64" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-win64-<version-torbrowserbundle>_<lang>.exe"><span
47
-            class="strong">Download</span><span class="normal"><button-win-tbb64></span></a>
48
-	    <select name="language" id="win-tbb64" class="lang">
49
-#include <lang.wmi>
50
-	    </select>
51
-	    <div class="sig" style="margin-bottom: 5px;">
52
-	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
53
-	      (<a class="win-tbb64-sig"
54
-               href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-win64-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
55
-	    </div>
56
-	  </form>
57
-	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>
58
-	</div>
59
-      </div>
60
-<!-- START WINDOWS 32-Bit -->
61
-      <div id="windows" class="easy windows">
62
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
63
-	  <div class="desc">
64
-	    <h2>Tor Browser for Windows</h2>
65
-	    <em>Version <version-torbrowserbundle> - Windows 10, 8, and 7</em>
66
-	    <p>Everything you need to safely browse the Internet. <br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
67
-	  </div>
68
-	  <form class="downloads">
69
-	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
70
-	    <select name="language" id="win-tbb" class="lang">
71
-#include <lang.wmi>
72
-	    </select>
73
-	    <div class="sig" style="margin-bottom: 5px;">
74
-	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
75
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
76
-	    </div>
77
-	  </form>
78
-	  <p class="alt-dl">Not Using Windows?<br />Download for <a href="#mac">Mac</a> or <a href="#linux">Linux</a></p>
79
-	</div>
80
-      </div>
81
-<!-- START MAC -->
82
-      <div id="mac" class="easy mac">
83
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
84
-	  <div class="desc">
85
-	    <h2>Tor Browser for Mac</h2>
86
-	    <em>Version <version-torbrowserbundleosx64> - OS X (10.9+)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
87
-	    <p>Everything you need to safely browse the Internet.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
88
-	  </div>
89
-	  <form class="downloads">
90
-	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
91
-	    <select name="language" id="osx-tbb" class="lang">
92
-#include <lang.wmi>
93
-	    </select>
94
-	    <div class="sig" style="margin-bottom: 5px;">
95
-	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
96
-	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
97
-	    </div>
98
-	  </form>
99
-	  <p class="alt-dl">Not Using Mac? Download for <a href="#windows">Windows</a> or <a href="#linux">Linux</a></p>
100
-        </div>
101
-      </div>
102
-<!-- START LINUX 64-Bit -->
103
-      <div id="linux" class="easy linux">
104
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
105
-	  <div class="desc">
106
-	    <h2>Tor Browser for Linux (64-Bit)</h2>
107
-	    <em>Version <version-torbrowserbundlelinux64> - Linux (64-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
108
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br /><a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
109
-	  </div>
110
-	  <form class="downloads">
111
-	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
112
-	    <select name="language" id="lin-tbb64" class="lang">
113
-#include <lang.wmi>
114
-	    </select>
115
-	    <div class="sig" style="margin-bottom: 5px;">
116
-	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
117
-	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
118
-	    </div>
119
-	  </form>
120
-	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
121
-	</div>
122
-      </div>
123
-<!-- START LINUX -->
124
-      <div class="easy linux">
125
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
126
-	  <div class="desc">
127
-	    <h2>Tor Browser for Linux (32-Bit)</h2>
128
-	    <em>Version <version-torbrowserbundlelinux32> - Linux (32-Bit)</em> <a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a>
129
-	    <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run.<br />
130
-	    <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
131
-	  </div>
132
-	  <form class="downloads">
133
-	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
134
-	    <select name="language" id="lin-tbb32" class="lang">
135
-#include <lang.wmi>
136
-	    </select>
137
-	    <div class="sig" style="margin-bottom: 5px;">
138
-	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
139
-	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
140
-	    </div>
141
-	  </form>
142
-	  <p class="alt-dl">Not Using Linux? Download for <a href="#mac">Mac</a> or <a href="#windows">Windows</a></p>
143
-	</div>
144
-      </div>
145
-<!-- START BSD -->
146
-
147
-  <div id="openbsd" class="easy bsd">
148
-    <div class="package" style="padding-top: 13px; border-top: 0px;">
149
-      <div class="desc">
150
-        <h2>Tor Browser OpenBSD</h2>
151
-	<p>
152
-        To install Tor Browser on OpenBSD, run:</p>
153
-        <pre>pkg_add tor-browser</pre>
154
-
155
-	<p>
156
-        Sometimes the most recent version of Tor Browser on OpenBSD is
157
-        behind the current release.<br/>
158
-        The available version of TB on OpenBSD should be checked with:
159
-        </p>
160
-	<pre>pkg_info -Q tor-browser</pre>
161
-	<p>
162
-        If provided version is not the current Tor Browser version, it is
163
-        not recommended. To install the Tor Browser port from an updated ports
164
-        tree, run:</p>
165
-        <pre>cd /usr/ports/meta/tor-browser && make install</pre>
166
-      </div>
167
-    </div>
168
-  </div>
169
-<!-- START ANDROID -->
170
-  <div id="android" class="easy android">
171
-    <div class="package" style="padding-top: 13px; border-top: 0px;">
172
-      <div class="desc">
173
-	  <h2>Tor Browser for Android</h2>
174
-          <p>Tor Browser for Android has only be released in alpha-version. <br />
175
-					You can download the alpha release on <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">GooglePlay</a> or from
176
-					our <a href="https://www.torproject.org/projects/torbrowser.html.en#downloads-alpha">alpha download list</a>.
177
-					</p>
178
-<!--
179
-          <p>
180
-          Introducing Tor Browser for Android, the mobile browser with the
181
-          highest privacy protections ever available and on par with Tor
182
-          Browser for desktop. You can download the alpha release on
183
-          <a href="https://play.google.com/store/apps/details?id=org.torproject.android">GooglePlay</a>
184
-          or <a href="">FDroid</a>, or you can get the apk by clicking on the
185
-          button below.
186
-          </p>
187
-          <p>
188
-          Note: For this release, you also need to install Orbot, you can
189
-          learn more about it
190
-          <a href="https://www.torproject.org/docs/android.html.en">here</a>.
191
-          </p>
192
-          <p>
193
-          Known issue: Our Security Slider is now under ‘Security Settings,
194
-          but because of a small issue, it’s only showing up after you restart
195
-          the app. We plan on fixing it for the next release.
196
-          </p>
197
-          <form class="downloads">
198
-            <a class="button" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span class="strong">Download</span><span class="normal">Android</span></a>
199
-	    <div class="sig">
200
-              (<a class="android-tbb-sig" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/TorBrowser-<version-torbrowserbundleandroid>.asc">sig</a>)
201
-              <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
202
-            </div>
203
-          </form>
204
-      </div>
205
-    </div>
206
-  </div>
207
-<!-- END ANDROID -->
208
-      <p class="all-dl">Looking For Something Else? <a href="<page download/download>">View All Downloads</a></p>
209
-<!-- END DOWNLOADS --><br>
210
-</div>
211
-<!-- END dow-don-left -->
212
-
213
-<!-- BEGIN WARNING -->
214
-#include <warning.wmi>
215
-<!-- END WARNING -->
216
-</div>
217
-<!-- END MAINCOL -->
218
-
219
-<!-- START dow-don-right -->
220
-<div id="dow-don-right">
221
-<!-- START SIDECOL -->
222
-  <div id="sidecol-right">
223
-   <div class="img-shadow sidenav-ez">
224
-    <div class="sidenav-sub">
225
-     <ul>
226
-      <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
227
-      <li class="dropdown"><a href="#mac">Apple OS X</a></li>
228
-      <li class="dropdown"><a href="#linux">Linux</a></li>
229
-      <li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
230
-      <li class="dropdown"><a href="#android">Android</a></li>
231
-      <li class="dropdown"><a href="<page download/download>">All Downloads</a></li>
232
-     </ul>
233
-    </div>
234
-   </div>
235
-<!-- START DONATE -->
236
-   <div id="download-donate">
237
-    <a href="<page donate/donate-download>"><img src="../images/btn_donateCC_LG.gif"></a>
238
-   </div>
239
-<!-- END DONATE -->
240
-<!-- START INFO -->
241
-   <div class="img-shadow">
242
-    <div class="sidenav-sub">
243
-     <h2>Having Trouble?</h2>
244
-     <ul>
245
-      <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
246
-     </ul>
247
-    </div>
248
-   </div>
249
-<!-- END INFO -->
250
-  </div>
251
-<!-- END SIDECOL -->
252
-</div>
253
-<!-- END dow-don-right -->
254
-
255
-</div>
256
-<!-- END CONTENT -->
257
-
258
-#include <foot.wmi>
... ...
@@ -40,7 +40,9 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
40 40
   This section uses a CSS accordion to hide and show topics.
41 41
   Styles are defined at the bottom of layout.css.
42 42
 -->
43
-
43
+<p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a><br/>
44
+<a href="https://blog.torproject.org/category/tags/tbb">Read the release announcements!</a></p>
45
+<p><a class="additional" href="#torbrowser-alpha">Download Unstable</a></p>
44 46
 <!-- START WINDOWS -->
45 47
  <div id="windows">
46 48
    <input id="ac-0" name="accordion-0" type="checkbox" />
... ...
@@ -48,9 +50,32 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
48 50
     <h1><a name="windows">Microsoft Windows</a></h1>
49 51
    </label>
50 52
    <article class="ac-small">
51
-<!-- TOR BROWSER BUNDLE -->
52
-#<!-- NOTE - change language enabled button text at the top of this page -->
53
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
53
+<!-- WINDOWS 64 Bit -->
54
+     <div class="package">
55
+	  <div class="desc">
56
+	    <h2>64 Bit</h2>
57
+	    <em>Version <version-torbrowserbundle> - Windows 10, 8, and 7</em>
58
+	  </div>
59
+	  <form class="downloads">
60
+	    <a class="button win-tbb64" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-win64-<version-torbrowserbundle>_<lang>.exe">
61
+            <span class="strong">Download</span><span class="normal"><button-win-tbb64></span></a>
62
+	    <select name="language" id="win-tbb64" class="lang">
63
+#include <lang.wmi>
64
+	    </select>
65
+	    <div class="sig">
66
+	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">
67
+              Other Languages</a>
68
+	      (<a class="win-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-win64-<version-torbrowserbundle>_<lang>.exe.asc">
69
+              sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
70
+	    </div>
71
+	  </form>
72
+    </div>
73
+<!-- WINDOWS 32-Bit -->
74
+    <div class="package">
75
+	  <div class="desc">
76
+	    <h2>32 Bit</h2>
77
+	    <em>Version <version-torbrowserbundle> - Windows 10, 8, and 7</em>
78
+	  </div>
54 79
 	  <form class="downloads">
55 80
 	    <a class="button win-tbb" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>
56 81
 	    <select name="language" id="win-tbb" class="lang">
... ...
@@ -58,43 +83,53 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
58 83
 	    </select>
59 84
 	    <div class="sig">
60 85
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
61
-	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
86
+	      (<a class="win-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundle>/torbrowser-install-<version-torbrowserbundle>_<lang>.exe.asc">
87
+              sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
62 88
 	    </div>
63
-	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
64
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlealpha>/tor-browser-<version-torbrowserbundlealpha>_en-US.exe.asc">sig</a>)-->
65 89
 	  </form>
66 90
 
67 91
 	  <h2>Tor Browser</h2>
68 92
 	  <em>Version <version-torbrowserbundle> (<releasedate-torbrowserbundle>) - Windows 10, 8, and 7</em>
69 93
 	  <p>Everything you need to safely browse the Internet. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
70 94
 	</div>
71
-<!-- EXPERT BUNDLE -->
72
-	<div class="package">
95
+        </div>
96
+<!-- WINDOWS EXPPERT BUNDLE -->
97
+    <div class="package">
98
+	  <div class="desc">
99
+	    <h2>Expert Bundle</h2>
100
+	    <em>Version <version-torbrowserbundle> - Windows 10, 8, 7, Vista,
101
+                XP, 2000, 2003 Server, ME, and Windows 98SE</em>
102
+	  </div>
73 103
 	  <div class="downloads">
74
-	    <a class="button" href="<package-win32-stable>"><span class="strong">Download</span><span class="normal">Expert Bundle</span></a>
104
+	    <a class="button" href="<package-win32-stable>"><span class="strong">
105
+            Download</span><span class="normal">Expert Bundle</span></a>
75 106
 	    <div class="sig">
76
-	      (<a href="<package-win32-stable>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
107
+	      (<a href="<package-win32-stable>.asc">sig</a>)
108
+             <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
77 109
 	    </div>
78 110
 	  </div>
79
-
80
-	  <h2>Expert Bundle</h2>
81
-	  <em>Windows 10, 8, 7, Vista, XP, 2000, 2003 Server, ME, and Windows 98SE</em>
82
-	  <p>Contains just Tor and nothing else. You'll need to configure Tor and all of your applications manually. This installer must be run as Administrator.</p>
83
-	</div>
111
+	  <p>
112
+          Contains just Tor and nothing else. You'll need to configure Tor and
113
+          all of your applications manually. This installer must be run as
114
+          Administrator.
115
+          </p>
116
+     </div>
84 117
    </article>
85 118
   </div>
86 119
 <!-- END WINDOWS -->
87 120
 
88 121
 <!-- START OS X -->
89 122
  <div id="apple">
90
-   <input id="ac-1" name="accordion-1" type="checkbox" />
91
-   <label for="ac-1" class="mac24">
92
-    <h1><a name="apple">Mac OS X</a></h1>
123
+   <input id="ac-mac" name="accordion-mac" type="checkbox" />
124
+   <label for="ac-mac" class="mac24">
125
+    <h1><a name="mac">Mac OS X</a></h1>
93 126
    </label>
94
-   <article class="ac-small">
95
-<!-- TOR BROWSER BUNDLE -->
96
-#<!-- NOTE - change language enabled button text at the top of this page -->
97
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
127
+   <article id="osx" class="ac-small">
128
+	<div class="package">
129
+	  <div class="desc">
130
+            <h2>Tor Browser Bundle</h2>
131
+	    <em>Version <version-torbrowserbundleosx64> - OS X (10.9+)</em> 
132
+	  </div>
98 133
 	  <form class="downloads">
99 134
 	    <a class="button osx-tbb" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>
100 135
 	    <select name="language" id="osx-tbb" class="lang">
... ...
@@ -104,58 +139,83 @@ you are used to. Please read the <a href="#warning">full list of warnings</a> fo
104 139
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
105 140
 	      (<a class="osx-tbb-sig" href="../dist/torbrowser/<version-torbrowserbundleosx64>/TorBrowser-<version-torbrowserbundleosx64>-osx64_<lang>.dmg.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
106 141
 	    </div>
107
-	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
108 142
 	  </form>
109
-	  <em>Version <version-torbrowserbundleosx64> (<releasedate-torbrowserbundleosx64>)- OS X Intel</em>
110
-	  <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
111
-	</div>
143
+      </div>
112 144
    </article>
113 145
   </div>
114 146
 <!-- END OS X -->
115 147
 
116 148
 <!-- START UNIX -->
117
- <div id="linux">
149
+ <div id="unix">
118 150
    <input id="ac-2" name="accordion-0" type="checkbox" />
119 151
    <label for="ac-2" class="linux24">
120 152
     <h1><a name="linux">Linux</a></h1>
121 153
    </label>
122 154
    <article class="ac-small">
123
-  <!-- TOR BROWSER BUNDLE -->
124
-#<!-- NOTE - change language enabled button text at the top of this page -->
125
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
155
+<!-- LINUX 64 Bit -->
156
+	<div class="package" >
157
+	  <div class="desc">
158
+	    <h2>64 Bit</h2>
159
+	    <em>Version <version-torbrowserbundlelinux64> - Linux, BSD, and Unix<</em>
160
+	  </div>
126 161
 	  <form class="downloads">
127 162
 	    <a class="button lin-tbb64" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>
128 163
 	    <select name="language" id="lin-tbb64" class="lang">
129 164
 #include <lang.wmi>
130 165
 	    </select>
131
-	    <div class="sig">
166
+	    <div class="sig" style="margin-bottom: 5px;">
132 167
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
133 168
 	      (<a class="lin-tbb64-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux64>/tor-browser-linux64-<version-torbrowserbundlelinux64>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
134 169
 	    </div>
135
-	    <a class="additional" href="<page projects/torbrowser>#downloads-alpha">Download Unstable</a><br />
136
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux64alpha>/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64alpha>-dev-en-US.tar.gz.asc">sig</a>)-->
137
-
170
+	  </form>
171
+      </div>
172
+<!-- LINUX 32 Bit -->
173
+	<div class="package" style="padding-top: 13px; border-top: 0px;">
174
+	  <div class="desc">
175
+	    <h2>32-Bit</h2>
176
+	    <em>Version <version-torbrowserbundlelinux32> - Linux, BSD, and Unix<</em>
177
+	  </div>
178
+	  <form class="downloads">
138 179
 	    <a class="button lin-tbb32" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>
139 180
 	    <select name="language" id="lin-tbb32" class="lang">
140 181
 #include <lang.wmi>
141 182
 	    </select>
142
-	    <div class="sig">
183
+	    <div class="sig" style="margin-bottom: 5px;">
143 184
 	      <a class="lang-alt" href="<page projects/torbrowser>#downloads">Other Languages</a>
144 185
 	      (<a class="lin-tbb32-sig" href="../dist/torbrowser/<version-torbrowserbundlelinux32>/tor-browser-linux32-<version-torbrowserbundlelinux32>_<lang>.tar.xz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
145 186
 	    </div>
146
-<!--	    <a class="additional" href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz">Download Unstable</a> (<a href="../dist/torbrowser/<version-torbrowserbundlelinux32alpha>/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32alpha>-dev-en-US.tar.gz.asc">sig</a>)<p>-->
147
-
148 187
 	  </form>
149
-
150
-	  <em>Version <version-torbrowserbundlelinux32> (<releasedate-torbrowserbundlelinux32>) - Linux, BSD, and Unix</em>
151
-	  <p>Everything you need to safely browse the Internet. This
152
-package requires no installation. Just extract it and run. <a
153
-href="<page projects/torbrowser>">Learn more &raquo;</a></p>
154 188
       </div>
155 189
    </article>
156 190
   </div>
157 191
 <!-- END UNIX -->
158
-
192
+<!-- START OPENBSD -->
193
+ <div id="bsd">
194
+   <input id="ac-bsd" name="accordion-bsd" type="checkbox" />
195
+   <label for="ac-bsd" class="openbsd24">
196
+    <h1><a name="openbsd">OpenBSD</a></h1>
197
+   </label>
198
+   <article id="openbsd" class="ac-small">
199
+      <div class="desc">
200
+	<p>
201
+        To install Tor Browser on OpenBSD, run:</p>
202
+        <pre>pkg_add tor-browser</pre>
203
+
204
+	<p>
205
+        Sometimes the most recent version of Tor Browser on OpenBSD is
206
+        behind the current release.<br/>
207
+        The available version of TB on OpenBSD should be checked with:
208
+        </p>
209
+	<pre>pkg_info -Q tor-browser</pre>
210
+	<p>
211
+        If provided version is not the current Tor Browser version, it is
212
+        not recommended. To install the Tor Browser port from an updated ports
213
+        tree, run:</p>
214
+        <pre>cd /usr/ports/meta/tor-browser && make install</pre>
215
+      </div>
216
+   </article>
217
+  </div>
218
+<!-- END OPENBSD -->
159 219
 <!-- START ANDROID -->
160 220
  <div id="android">
161 221
    <input id="ac-3" name="accordion-0" type="checkbox" />
... ...
@@ -163,7 +223,34 @@ href="<page projects/torbrowser>">Learn more &raquo;</a></p>
163 223
     <h1><a name="android">Android</a></h1>
164 224
    </label>
165 225
    <article class="ac-small">
166
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
226
+	<div class="package">
227
+	  <div class="desc">
228
+	    <h2>Stable</h2>
229
+	    <!--<em>Version <version-torbrowserbundleandroid> - Android</em>-->
230
+	  </div>
231
+          <p>
232
+          Tor Browser for Android has no stable version yet.
233
+          It is expected for early 2019
234
+          </p>
235
+          <p>
236
+          You can help by testing the Alpha version and
237
+          <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback">reporting issues</a>.
238
+          </p>
239
+        </div>
240
+  	<div class="package">
241
+          <h2>Alpha</h2>
242
+          <p>
243
+          Introducing Tor Browser for Android, the mobile browser with the
244
+          highest privacy protections ever available and on par with Tor
245
+          Browser for desktop.
246
+          </p>
247
+          <p>
248
+          Note: For this release, you also need to install
249
+          <a href="https://www.torproject.org/docs/android.html.en">Orbot</a>.
250
+          </p>
251
+	  <div class="desc">
252
+	    <em>Version <version-torbrowserbundleandroid> - Android</em> <a href="https://blog.torproject.org/category/tags/mobile">Read the release announcements!</a></p>
253
+	  </div>
167 254
           <form class="downloads">
168 255
             <a class="button" href="../dist/torbrowser/mobile/<version-torbrowserbundleandroid>/tor-browser-android-arm-<version-torbrowserbundleandroid>.apk"><span class="strong">Download</span><span class="normal">Android</span></a>
169 256
             <div class="sig">
... ...
@@ -172,20 +259,13 @@ href="<page projects/torbrowser>">Learn more &raquo;</a></p>
172 259
             </div>
173 260
           </form>
174 261
           <p>
175
-          Introducing Tor Browser for Android, the mobile browser with the
176
-          highest privacy protections ever available and on par with Tor
177
-          Browser for desktop. You can download the alpha release on
178
-          <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha">GooglePlay</a>,
179
-          or you can get the apk by clicking on the button below.
180
-          </p>
181
-          <p>
182
-          Note: For this release, <b>you also need to install Orbot</b>, you can
183
-          learn more about it <a href="https://guardianproject.info/apps/orbot">here</a>.
184
-          </p>
185
-          <p>
186 262
           Known issue: Our Security Slider is now under ‘Security Settings,
187 263
           but because of a small issue, it’s only showing up after you restart
188
-	  the app. We plan on fixing it for the next release.
264
+          the app. We plan on fixing it for the next release.
265
+          </p>
266
+          <p>Also available on
267
+          <a href="https://play.google.com/store/apps/details?id=org.torproject.android">GooglePlay</a>.
268
+          <!--and <a href="https://guardianproject.info/fdroid/">FDroid</a>-->
189 269
           </p>
190 270
        </div>
191 271
    </article>
... ...
@@ -193,22 +273,27 @@ href="<page projects/torbrowser>">Learn more &raquo;</a></p>
193 273
 <!-- END ANDROID -->
194 274
 
195 275
 <!-- START SMARTPHONES -->
196
- <div id="smartphones">
276
+ <div id="smartphone">
197 277
    <input id="ac-4" name="accordion-0" type="checkbox" />
198 278
    <label for="ac-4" class="smartphone24">
199
-    <h1><a name="smartphones">Smartphones</a></h1>
279
+    <h1><a name="smartphone">Smartphones</a></h1>
200 280
    </label>
201 281
    <article class="ac-small">
202 282
 <!-- START IOS -->
203
-	<div class="package" style="padding-top: 13px; border-top: 0px;">
204
-          <p>
205
-          Unfortunately we do not have the capacity to offer a version of
206
-          Tor Browser for IOS at the moment, but
207
-          <a href="https://support.torproject.org/#tormobile-3">
208
-          we recommend Onion Browser</a>. See also
209
-          <a href="https://prism-break.org/en/categories/ios">IOS | prism-break</a>.
210
-          </p>
211
-	</div>
283
+     <div class="package">
284
+       <div class="desc">
285
+         <h2>iOS</h2>
286
+	 <!--<em>Version <version-torbrowserbundleios> - iOS</em>-->
287
+       </div>
288
+       <p>
289
+       Unfortunately we do not have the capacity to offer a version of
290
+       Tor Browser for IOS at the moment, but
291
+       <a href="https://support.torproject.org/#tormobile-3">
292
+       we recommend Onion Browser</a>. Check
293
+       <a href="https://prism-break.org/en/categories/ios">prism-break</a>
294
+       for security limitations of iOS.
295
+       </p>
296
+     </div>
212 297
 <!-- END IOS -->
213 298
    </article>
214 299
   </div>
... ...
@@ -230,10 +315,6 @@ href="<page projects/torbrowser>">Learn more &raquo;</a></p>
230 315
         </div>
231 316
    </article>
232 317
   </div>
233
-<!-- END SOURCE -->
234
-<!-- TODO remove (hidden because js was removed)
235
-      <div class="expander"><a href="javascript:void(0)" class="switch">Expand All</a></div>
236 318
 </section>
237 319
 <!-- END TOR BROWSER -->
238 320
 
... ...
@@ -387,7 +468,7 @@ href="<page projects/torbrowser>">Learn more &raquo;</a></p>
387 468
 <!-- END DOWNLOADS -->
388 469
 <hr/>
389 470
 <!-- START NOTES-->
390
-<div class="note">
471
+<div id="license" class="note">
391 472
 <h2>License</h2>
392 473
 <p>
393 474
 Tor is distributed as <a href="http://www.fsf.org/">Free Software</a>
... ...
@@ -411,13 +492,13 @@ not change for many months.
411 492
 <p>
412 493
 Unstable packages are released so you can help us test new features and bugfixes. Even though they have a higher version number
413 494
 than the stable versions listed above, there is a much higher chance of
414
-serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://bugs.torproject.org/">report bugs</a>.
495
+serious reliability and security bugs in these downloads.  Please be prepared to <a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback">report bugs</a>.
415 496
 </p>
416 497
 </div>
417 498
 
418 499
 <hr/>
419 500
 
420
-<div class="note">
501
+<div id="other" class="note">
421 502
 <h2>Security updates and alternative download options</h2>
422 503
 <p>
423 504
 To keep informed of security advisories and new stable releases, subscribe
... ...
@@ -450,15 +531,15 @@ href="<page getinvolved/mirrors>">list of sites mirroring the Tor site</a>.
450 531
  <div class="img-shadow sidenav-ez">
451 532
   <div class="sidenav-sub">
452 533
    <ul>
453
-    <li class="dropdown"><a href="<page
454
-download/download>#windows">Microsoft Windows</a></li>
455
-    <li class="dropdown"><a href="<page download/download>#apple">Apple OS X</a></li>
456
-    <li class="dropdown"><a href="<page download/download>#linux">Linux/Unix</a></li>
457
-    <li class="dropdown"><a href="<page download/download>#openbsd">OpenBSD</a></li>
534
+    <li class="dropdown"><a href="#windows">Microsoft Windows</a></li>
535
+    <li class="dropdown"><a href="#apple">Apple OS X</a></li>
536
+    <li class="dropdown"><a href="#linux">Linux/Unix</a></li>
537
+    <li class="dropdown"><a href="#openbsd">OpenBSD</a></li>
458 538
     <li class="dropdown"><a href="#android">Android</a></li>
459
-    <li class="dropdown"><a href="<page download/download>#smartphone">Smartphones</a></li>
460
-    <li class="dropdown"><a href="<page download/download>#source">Source
461
-Code</a></li>
539
+    <li class="dropdown"><a href="#smartphone">Smartphones</a></li>
540
+    <li class="dropdown"><a href="#source">Source</a></li>
541
+    <li class="dropdown"><a href="#license">License</a></li>
542
+    <li class="dropdown"><a href="#other">Mirrors</a></li>
462 543
    </ul>
463 544
   </div>
464 545
  </div>
... ...
@@ -470,7 +551,11 @@ Code</a></li>
470 551
   <div class="sidenav-sub">
471 552
    <h2>Having Trouble?</h2>
472 553
    <ul>
554
+    <li class="dropdown"><a href="#warning">Check the warnings</a></li>
473 555
     <li class="dropdown"><a href="<page docs/documentation>">Read the fine manuals</a></li>
556
+    <li class="dropdown"><a href="<page about/contact>#irc>">Get Support on IRC</a></li>
557
+    <li class="dropdown"><a href="https://trac.torproject.org/projects/tor/wiki/doc/community/HowToReportBugFeedback">Report Bugs</a></li>
558
+    <li class="dropdown"><a href="#other">Subscribe for Announcements</a></li>
474 559
    </ul>
475 560
   </div>
476 561
  </div>
477 562
deleted file mode 100644
... ...
@@ -1,29 +0,0 @@
1
-#!/usr/bin/wml
2
-
3
-## translation metadata
4
-# Revision: $Revision$
5
-# Translation-Priority: 1-high
6
-
7
-<:
8
-    # path                              link text
9
-    my @navigation = (
10
-        'index'                        , 'Home',
11
-        'about/overview'              , 'About Tor',
12
-        'docs/documentation'          , 'Documentation',
13
-        'press/press'                 , 'Press',
14
-        '<blog>'                      , 'Blog',
15
-        '<newsletter>'                , 'Newsletter',
16
-	'about/contact'			, 'Contact',
17
-    );
18
-    my @donatenav = (
19
-        'index'                        , 'Home',
20
-        'about/overview'              , 'About Tor',
21
-        'about/contact'               , 'Contact',
22
-    );
23
-    my @calltoaction = (
24
-        'download/download-easy'                , 'Download',
25
-        'getinvolved/volunteer'            , 'Volunteer',
26
-        'donate/donate-button'                    , 'Donate',
27
-    );
28
-
29
-:>
30 0
new file mode 120000
... ...
@@ -0,0 +1 @@
1
+../include/navigation.wmi
0 2
\ No newline at end of file
... ...
@@ -1,7 +1,7 @@
1 1
 #!/usr/bin/wml
2 2
 
3 3
 ## translation metadata
4
-# Revision: $Revision: 22069 $
4
+# Revision: $Revision$
5 5
 # Translation-Priority: 1-high
6 6
 
7 7
 <:
... ...
@@ -21,8 +21,8 @@
21 21
         'about/contact'               , 'Contact',
22 22
     );
23 23
     my @calltoaction = (
24
-        'download/download-easy'           , 'Download',
25
-        'getinvolved/volunteer'            , 'Get Involved',
24
+        'download/download'           , 'Download',
25
+        'getinvolved/volunteer'            , 'Volunteer',
26 26
         'donate/donate-button'             , 'Donate',
27 27
     );
28 28