From 7697a43cf49ad8e4f0bd2dc0fbc3d785ad9cfc2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Fri, 15 Mar 2013 09:38:06 -0700
Subject: [PATCH 1/2] Fix typo in signup forms

LMS Lighthouse [#263]
---
 lms/templates/signup_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html
index 01bc17bd65..9224ccc0b4 100644
--- a/lms/templates/signup_modal.html
+++ b/lms/templates/signup_modal.html
@@ -25,7 +25,7 @@
           <label data-field="password">Password*</label>
           <input name="password" type="password" placeholder="****">
           <label data-field="username">Public Username*</label>
-          <input name="username" type="text" placeholder="Shown on forms">
+          <input name="username" type="text" placeholder="Shown on forums">
           <label data-field="name">Full Name*</label>
           <input name="name" type="text" placeholder="For your certificate">
 	  % else:

From 93a59f244d63d17843620537c8e81eb3750c42f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= <rocha@edx.org>
Date: Fri, 15 Mar 2013 10:29:30 -0700
Subject: [PATCH 2/2] XBlock SDK announcement

LMS Lighthouse [#261]
---
 lms/templates/feed.rss                        | 31 +++++----
 .../press_releases/xblock_announcement.html   | 63 +++++++++++++++++++
 lms/urls.py                                   |  6 +-
 3 files changed, 87 insertions(+), 13 deletions(-)
 create mode 100644 lms/templates/static_templates/press_releases/xblock_announcement.html

diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss
index 37c7a8ce6e..a6fda0d20a 100644
--- a/lms/templates/feed.rss
+++ b/lms/templates/feed.rss
@@ -4,9 +4,18 @@
 <feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
   <id>tag:www.edx.org,2012:/blog</id>
   <link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
-  ##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
+  <link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
   <title>EdX Blog</title>
-  <updated>2013-03-14T14:00:12-07:00</updated>
+  <updated>2013-03-15T14:00:12-07:00</updated>
+  <entry>
+    <id>tag:www.edx.org,2013:Post/16</id>
+    <published>2013-03-15T10:00:00-07:00</published>
+    <updated>2013-03-15T10:00:00-07:00</updated>
+    <link type="text/html" rel="alternate" href="${reverse('press/xblock-announcement')}"/>
+    <title>edX releases XBlock SDK, first step toward open source vision</title>
+    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
+        &lt;p&gt;&lt;/p&gt;</content>
+  </entry>
   <entry>
     <id>tag:www.edx.org,2013:Post/15</id>
     <published>2013-03-14T10:00:00-07:00</published>
@@ -16,15 +25,15 @@
     <content type="html">&lt;img src=&quot;${static.url('images/press/releases/201x_240x180.jpg')}&quot; /&gt;
         &lt;p&gt;&lt;/p&gt;</content>
   </entry>
-  <entry>
-    <id>tag:www.edx.org,2013:Post/14</id>
-    <published>2013-02-20T10:00:00-07:00</published>
-    <updated>2013-02-20T10:00:00-07:00</updated>
-    <link type="text/html" rel="alternate" href="${reverse('press/edx-expands-internationally')}"/>
-    <title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title>
-    <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt;
-        &lt;p&gt;&lt;/p&gt;</content>
-  </entry>
+  <!-- <entry> -->
+  <!--   <id>tag:www.edx.org,2013:Post/14</id> -->
+  <!--   <published>2013-02-20T10:00:00-07:00</published> -->
+  <!--   <updated>2013-02-20T10:00:00-07:00</updated> -->
+  <!--   <link type="text/html" rel="alternate" href="${reverse('press/edx-expands-internationally')}"/> -->
+  <!--   <title>edX Expands Internationally and Doubles its Institutional Membership with the Addition of Six New Schools</title> -->
+  <!--   <content type="html">&lt;img src=&quot;${static.url('images/press/releases/edx-logo_240x180.png')}&quot; /&gt; -->
+  <!--       &lt;p&gt;&lt;/p&gt;</content> -->
+  <!-- </entry> -->
   <entry>
     <id>tag:www.edx.org,2013:Post/14</id>
     <published>2013-01-30T10:00:00-07:00</published>
diff --git a/lms/templates/static_templates/press_releases/xblock_announcement.html b/lms/templates/static_templates/press_releases/xblock_announcement.html
new file mode 100644
index 0000000000..e6deaae23c
--- /dev/null
+++ b/lms/templates/static_templates/press_releases/xblock_announcement.html
@@ -0,0 +1,63 @@
+<%! from django.core.urlresolvers import reverse %>
+<%inherit file="../../main.html" />
+
+<%namespace name='static' file='../../static_content.html'/>
+
+<%block name="title"><title>edX Takes First Step toward Open Source Vision by Releasing XBlock SDK</title></%block>
+<div id="fb-root"></div>
+<script>(function(d, s, id) {
+var js, fjs = d.getElementsByTagName(s)[0];
+if (d.getElementById(id)) return;
+js = d.createElement(s); js.id = id;
+js.src = "//connect.facebook.net/en_US/all.js#xfbml=1";
+fjs.parentNode.insertBefore(js, fjs);
+}(document, 'script', 'facebook-jssdk'));</script>
+
+<section class="pressrelease">
+  <section class="container">
+    <h1>edX Takes First Step toward Open Source Vision by Releasing XBlock SDK</h1>
+    <hr class="horizontal-divider"/>
+    <article>
+      <h2>With Release of XBlock Source Code, Global Community Invited to Participate in the Development of the edX Learning Platform and the Next Generation of Online and Blended Courses</h2>
+
+      <p><strong>CAMBRIDGE, MA and SANTA CLARA, CA (PyCon 2013) &ndash; March 14, 2013 &ndash; </strong> <a href="https://www.edx.org/">EdX</a>, the not-for-profit online learning enterprise founded by <a href="http://harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> (MIT), today released its XBlock SDK to the general public under the Affero GPL open source license.   XBlock is the underlying architecture supporting the rich, interactive course content found in edX courses.  With XBlock, educational institutions are able to go far beyond simple text and videos to deliver interactive learning built specifically for the Internet environment.  The release of the XBlock source code marks the first step toward edX’s vision of creating an open online learning platform that mirrors the collaborative philosophy of MOOCs themselves and is an invitation to the global community of developers to work with edX to deliver the world’s best and most accessible online learning experience.</p>
+
+      <p>XBlock is a component architecture that enables developers to create independent course components, or XBlocks, that are able to work seamlessly with other components in the construction and presentation of an online course.  Course authors are able to combine XBlocks from a variety of sources – from text and video to sophisticated wiki-based collaborative learning environments and online laboratories – to create rich engaging online courses.  The XBlock architecture will enable the easy integration of next generation education tools like the circuit simulator in edX’s popular <a href="https://www.edx.org/courses/MITx/6.002x/2013_Spring/about">Circuits and Electronics</a> course (6.002x) and the molecular manipulator in the new <a href="https://www.edx.org/courses/MITx/7.00x/2013_Spring/about">Introduction to Biology – The Secret of Life</a> course (7.00x) taught by Eric Lander, one of the leaders of the Human Genome Project.</p>
+
+      <p>XBlock is not limited to just delivering courses.  A complete educational ecosystem will make use of a number of web applications, all of which require access to course content and data.  XBlocks provide the structure and APIs needed to build components for use by those applications.  edX will be working with independent developers to continue to extend the functionality of XBlock through the XBlock SDK and future open source initiatives.</p>
+
+      <p>“From its beginning, edX has been committed to developing the world’s best learning platform and tapping our global community to help us get there,” said Rob Rubin, edX Vice President of Engineering. “We look forward to working with the world’s developers, educators and researchers to help evolve the platform and ensure that everyone, everywhere has access to the world-class education that edX provides.”</p>
+
+      <p>The XBlock source code is available immediately and can be accessed at <a href="http://github.com/edX/XBlock">http://github.com/edX/XBlock</a>.</p>
+
+      <h2>About edX</h2>
+
+      <p><a href="https://www.edx.org/">EdX</a> is a not-for-profit enterprise of its founding partners <a href="http://www.harvard.edu">Harvard University</a> and the <a href="http://www.mit.edu">Massachusetts Institute of Technology</a> focused on transforming online and on-campus learning through groundbreaking methodologies, game-like experiences and cutting-edge research. EdX provides inspirational and transformative knowledge to students of all ages, social status, and income who form worldwide communities of learners. EdX uses its open source technology to transcend physical and social borders. We’re focused on people, not profit. EdX is based in Cambridge, Massachusetts in the USA.</p>
+
+      <section class="contact">
+        <p><strong>Media Contacts:</strong></p>
+        <p>Dan O'Connell</p>
+        <p>oconnell@edx.org</p>
+        <p>(617) 480-6585</p>
+        <br/>
+        <p>Gerald Kimber White</p>
+        <p>gerald.kimberwhite@rfbinder.com</p>
+        <p>781-455-8250</p>
+      </section>
+
+      <section class="footer">
+        <hr class="horizontal-divider"/>
+        <div class="logo"></div><h3 class="date">03 - 15 - 2013</h3>
+        <div class="social-sharing">
+          <hr class="horizontal-divider"/>
+          <p>Share with friends and family:</p>
+          <a href="http://twitter.com/intent/tweet?text=edX+Takes+First+Step+toward+Open+Source+Vision+by+Releasing+XBlock+SDK:+http://www.edx.org/press/xblock-announcement" class="share">
+          <img src="${static.url('images/social/twitter-sharing.png')}"/></a>
+          <a href="mailto:?subject=edX%20Takes%20First%20Step%20toward%20Open%20Source%20Vision%20by%20Releasing%20XBlock%20SDK…http://www.edx.org/press/xblock-announcement" class="share">
+          <img src="${static.url('images/social/email-sharing.png')}"/></a>
+          <div class="fb-like" data-href="http://edx.org/press/xblock-announcement" data-send="true" data-width="450" data-show-faces="true"></div>
+        </div>
+      </section>
+    </article>
+  </section>
+</section>
diff --git a/lms/urls.py b/lms/urls.py
index 2c738913c3..ee213f2b8c 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -172,11 +172,13 @@ urlpatterns = ('',
     url(r'^press/edx-expands-internationally$', 'static_template_view.views.render',
         {'template': 'press_releases/edx_expands_internationally.html'},
         name="press/edx-expands-internationally"),
-
+    url(r'^press/xblock_announcement$', 'static_template_view.views.render',
+        {'template': 'press_releases/xblock_announcement.html'},
+        name="press/xblock-announcement"),
 
     # Should this always update to point to the latest press release?
     (r'^pressrelease$', 'django.views.generic.simple.redirect_to',
-     {'url': '/press/edx-expands-internationally'}),
+     {'url': '/press/xblock-announcement'}),
 
 
     (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),