swap announcements and tor use cases, add the latest blog post to the announcements.
Andrew Lewman

Andrew Lewman commited on 2013-06-11 03:54:58
Zeige 1 geänderte Dateien mit 38 Einfügungen und 32 Löschungen.

... ...
@@ -153,6 +153,44 @@
153 153
       </div>
154 154
       <!-- END MAINCOL -->
155 155
       <div id="sidecol">
156
+        <div id="home-announcements" class="clearfix">
157
+       	<h2>Announcements</h2>
158
+          <div class="fauxhead"></div>
159
+          <table>
160
+            <tr>
161
+              <td>
162
+                <div class="calendar"><span class="month">Jun</span><br><span class="day">10</span></div>
163
+                <p>Read our <a href="https://blog.torproject.org/blog/tors-response-prism-surveillance-program">response</a> to NSA PRISM and the Eric Snowden interview.</p>
164
+	      </td>
165
+	    </tr>
166
+            <tr>
167
+              <td>
168
+                <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div>
169
+                <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p>
170
+	      </td>
171
+	    </tr>
172
+            <tr>
173
+              <td>
174
+                <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div>
175
+                <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgian-police">trip report about teaching
176
+                the Dutch and Belgian police about Tor</a>.</p>
177
+	      </td>
178
+	    </tr>
179
+            <tr>
180
+              <td>
181
+                <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div>
182
+                <p>Combined flashproxy and pyobfsproxy bundles now available.
183
+                See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-bundles">the announcement</a> for details.</p>
184
+	      </td>
185
+	    </tr>
186
+	    <tr>
187
+	      <td>
188
+		<div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div>
189
+		<p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p>
190
+	      </td>
191
+            </tr>
192
+          </table>
193
+        </div>
156 194
       	<div id="torusers">
157 195
           <h2>Who Uses Tor?</h2>
158 196
           <div class="user">
... ...
@@ -186,38 +224,6 @@
186 224
             <p>Militaries and law enforcement use Tor to protect their communications, investigations, and intelligence gathering online.</p>
187 225
           </div>
188 226
         </div>
189
-        <div id="home-announcements" class="clearfix">
190
-        	<h2>Announcements</h2>
191
-          <div class="fauxhead"></div>
192
-          <table>
193
-            <tr>
194
-              <td>
195
-                <div class="calendar"><span class="month">Jun</span><br><span class="day">8</span></div>
196
-                <p>Read our <a href="https://blog.torproject.org/blog/prism-vs-tor">thoughts on the NSA PRISM</a> revelation and how it relates to Tor.</p>
197
-	      </td>
198
-	    </tr>
199
-            <tr>
200
-              <td>
201
-                <div class="calendar"><span class="month">Feb</span><br><span class="day">5</span></div>
202
-                <p>Read Roger's <a href="https://blog.torproject.org/blog/trip-report-tor-trainings-dutch-and-belgian-police">trip report about teaching
203
-                the Dutch and Belgian police about Tor</a>.</p>
204
-	      </td>
205
-	    </tr>
206
-            <tr>
207
-              <td>
208
-                <div class="calendar"><span class="month">Jan</span><br><span class="day">14</span></div>
209
-                <p>Combined flashproxy and pyobfsproxy bundles now available.
210
-                See <a href="https://blog.torproject.org/blog/combined-flash-proxy-pyobfsproxy-browser-bundles">the announcement</a> for details.</p>
211
-	      </td>
212
-	    </tr>
213
-	    <tr>
214
-	      <td>
215
-		<div class="calendar"><span class="month">Jan</span><br><span class="day">11</span></div>
216
-		<p>Tails, The Amnesic Incognito Live System, <a href="https://blog.torproject.org/blog/tails-016-out">version 0.16</a>, is now available.</p>
217
-	      </td>
218
-            </tr>
219
-          </table>
220
-        </div>
221 227
         <!-- END TABLE -->
222 228
       </div>
223 229
       <!-- END SIDECOL -->
224 230