Merge pull request #3698 from mozilla/rm-demos

Fix bug 1223109 - decomission demo studio

configs/htaccess

@@ -58,7 +58,14 @@ RewriteRule ^(\w{2,3}(?:-\w{2})?/)?learn/css /$1Learn/CSS [R=301,L]
 RewriteRule ^(\w{2,3}(?:-\w{2})?/)?learn/javascript /$1Learn/JavaScript [R=301,L]
 RewriteRule ^(\w{2,3}(?:-\w{2})?/)?learn /$1Learn [R=301,L]
 
-# Off-site redirects
+# BananaBread demo (bug 1238041)
+RewriteRule ^(\w{2,3}(?:-\w{2})?/)?demos/detail/bananabread$ https://github.com/kripken/BananaBread/ [R=301,L]
+RewriteRule ^(\w{2,3}(?:-\w{2})?/)?demos/detail/bananabread/launch$ https://kripken.github.io/BananaBread/cube2/index.html [R=301,L]
+
+# All other Demo Studio and Dev Derby paths (bug 1238037)
+RewriteRule ^(\w{2,3}(?:-\w{2})?/)?demos /$1docs/Web/Demos_of_open_web_technologies? [R=301,L]
+
+# Miscellaneous off-site redirects
 RewriteRule ^contests/$ http://labs.mozilla.com/contests/extendfirefox/ [R=302]
 RewriteRule ^contests/extendfirefox(/.*)? http://labs.mozilla.com/contests/extendfirefox$1 [R=302]
 RewriteRule ^es4(/.*)?$ http://wiki.ecmascript.org/ [R]

jinja2/403.html

@@ -50,9 +50,6 @@ <h1 class="page-title">{{ _('Permission Denied') }}</h1>
           <li><a href="{{ login_url }}">Sign in</a> to try again.</li>
         {% endtrans %}
       {% endif %}
-        {% trans demos_url=url('demos'), docs_url=wiki_url('Web') %}
-          <li><a href="{{ demos_url }}">View demos</a> or <a href="{{ docs_url }}">browse docs</a></li>
-        {% endtrans %}
       </ul>
 
       {% trans %}

jinja2/base.html

@@ -141,7 +141,6 @@
               <li><a href="{{ wiki_url('Web/Reference') }}">{{ _('References') }}</a></li>
               <li><a href="{{ wiki_url('Web/Guide') }}">{{ _('Developer Guides') }}</a></li>
               <li><a href="{{ wiki_url('Web/Accessibility') }}">{{ _('Accessibility') }}</a></li>
-              <li><a href="{{ url('demos') }}">{{ _('Demos') }}</a></li>
               <li><a href="{{ wiki_url('Web') }}">{{ _('...more docs') }}</a></li>
             </ul>
           </div>
@@ -159,7 +158,7 @@
             </ul>
           </div>
         </div>
-      </li><li><a href="{{ wiki_url('Tools') }}">{{ _('Developer Tools') }}</a></li><li><a href="{{ url('demos') }}">{{ _('Demos') }}</a></li><li><a href="{{ wiki_url('MDN/Feedback') }}">{{ _('Feedback') }}<i aria-hidden="true" class="icon-caret-down"></i></a>
+      </li><li><a href="{{ wiki_url('Tools') }}">{{ _('Developer Tools') }}</a></li><li><a href="{{ wiki_url('MDN/Feedback') }}">{{ _('Feedback') }}<i aria-hidden="true" class="icon-caret-down"></i></a>
 
         <div class="submenu js-submenu" id="nav-contact-submenu">
           <div class="submenu-column">

jinja2/handlers/400.html

@@ -37,9 +37,6 @@ <h1 class="page-title">Permission Denied</h1>
         <li><a href="{{ login_url }}">Sign in</a> to try again.</li>
         {% endtrans %}
       {% endif %}
-        {% trans %}
-        <li><a href="/demos">View demos</a> or <a href="/docs">browse docs</a></li>
-        {% endtrans %}
       </ul>
 
   </section>