Skip to content
This repository has been archived by the owner on Aug 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1447 from darkwing/homepage-edits-918111
Browse files Browse the repository at this point in the history 
Fix bug 918111 - Add final homepage content
  • Loading branch information
@lmorchard
lmorchard committed Oct 1, 2013
2 parents 381ad8d + 2e36000 commit c6228b5
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 46 deletions.
49 changes: 6 additions & 43 deletions apps/landing/templates/landing/homepage.html
View file
Expand Up @@ -46,17 +46,15 @@ <h3><i class="icon-file-text-alt"></i><span>{{ _('Web<br />Platform') }}</span><
<div class="column-home-features">
<h3 class="zones"><i class="icon-suitcase"></i><span>{{ _('Zones') }}</span></h3>
<ul>
<li><a href="{{ devmo_url('Web/Apps/Apps_Zone') }}">{{ _('App Center') }}</a></li>
<li><a href="{{ devmo_url('Web/Apps') }}">{{ _('App Center') }}</a></li>
<li><a href="{{ devmo_url('Mozilla/Firefox_OS') }}">{{ _('Firefox OS') }}</a></li>
<li><a href="">{{ _('Firefox Marketplace') }}</a></li>
<li><a href="{{ devmo_url('Web') }}">{{ _('Web Platform') }}</a></li>
<li><a href="">{{ _('more...') }}</a></li>
<li><a href="{{ devmo_url('Mozilla/Persona') }}">{{ _('Persona') }}</a></li>
</ul>
</div>
<div class="column-home-features">
<h3><i class="icon-wrench"></i><span>{{ _('Developer<br />Tools') }}</span></h3>
<ul>
<li><a href="{{ devmo_url('Tools/Firefox_OS_Simulator') }}">{{ _('Firefox OS SImulator') }}</a></li>
<li><a href="{{ devmo_url('Tools/Firefox_OS_Simulator') }}">{{ _('Firefox OS Simulator') }}</a></li>
<li><a href="{{ devmo_url('Tools/Page_Inspector') }}">{{ _('Page Inspector') }}</a></li>
<li><a href="{{ devmo_url('Tools/Debugger') }}">{{ _('JavaScript Debugger') }}</a></li>
<li><a href="{{ devmo_url('Tools/Web_Console') }}">{{ _('Web Console') }}</a></li>
Expand All @@ -68,7 +66,7 @@ <h3><i class="icon-wrench"></i><span>{{ _('Developer<br />Tools') }}</span></h3>
<h3><i class="icon-beaker"></i><span>{{ _('MDN<br />Beta') }}</span></h3>
<ul>
<li>{{ _('Welcome to the MDN Beta. ') }}</li>
<li><a href="">{{ _('Learn how you can help!') }}</a></li>
<li><a href="https://wiki.mozilla.org/MDN/Development/About_the_2013_redesign">{{ _('Learn how you can help!') }}</a></li>
</ul>
</div>
</div>
Expand All @@ -94,47 +92,12 @@ <h3><i class="icon-beaker"></i><span>{{ _('MDN<br />Beta') }}</span></h3>
<div class="column-hacks">
<h2><i class="icon-star"></i> {{ _('Hacks Blog <a href="http://hacks.mozilla.org">read more at hacks.mozilla.org <i class="icon-arrow-right"></i></a>') }}</h2>
{{ newsfeed(updates, section_headers=True) }}

<ul class="hfeed">
<li class="hentry">
<h2 class="entry-title"><a href="https://hacks.mozilla.org/2013/09/firefox-os-development-web-components-and-mozilla-brick/" rel="bookmark">Firefox OS Development: Web Components and Mozilla Brick</a></h2>
<p class="entry-summary">In this edition of “Firefox OS: The platform HTML5 deserves” (the previous six videos are published here), Mozilla’s Principal Evangelist Chris Heilmann (@codepo8) grilled Mozilla’s “Senior HTML5 Engineer Angle Bracket Coordinator” Matthew Claypotch (@potch) about the exciting new possibilities of Web Components for Web App developers and how Mozilla’s Brick ...</p>
<p class="entry-meta vcard">
Posted <time class="updated" datetime="2013-09-27" title="2013-09-27">September 27, 2013</time> by <cite class="author fn">Chris Heilmann</cite> </p>
</li>
<li class="hentry">
<h2 class="entry-title"><a href="https://hacks.mozilla.org/2013/09/new-features-in-the-firefox-developer-tools-episode-26/" rel="bookmark">New Features in the Firefox Developer Tools: Episode 26</a></h2>
<p class="entry-summary">Firefox 26 was just uplifted to the Aurora release channel which means we are back to report on new features in Firefox Developer Tools. Here’s a summary of some of the most exciting new features. Inspector: pseudo element support To get more flexibility in the design of an element without ...</p>
<p class="entry-meta vcard">
Posted <time class="updated" datetime="2013-09-26" title="2013-09-26">September 26, 2013</time> by <cite class="author fn">Paul Rouget</cite> </p>
</li>
<li class="hentry">
<h2 class="entry-title"><a href="https://hacks.mozilla.org/2013/09/reintroducing-the-firefox-developer-tools-part-1-the-web-console-and-the-javascript-debugger/" rel="bookmark">Reintroducing the Firefox Developer Tools, part 1: the Web Console and the JavaScript Debugger</a></h2>
<p class="entry-summary">This is part one, out of 5, focusing on the built-in Developer Tools in Firefox, their features and where we are now with them. The intention is to show you all the possibilities available, the progress and what we are aiming for. Firefox 4 saw the launch of the Web ...</p>
<p class="entry-meta vcard">
Posted <time class="updated" datetime="2013-09-24" title="2013-09-24">September 24, 2013</time> by <cite class="author fn">Jason Weathersby</cite> </p>
</li>
<li class="hentry">
<h2 class="entry-title"><a href="https://hacks.mozilla.org/2013/09/firefox-24-for-android-gets-webrtc-support-by-default/" rel="bookmark">Firefox 24 for Android gets WebRTC support by default</a></h2>
<p class="entry-summary">WebRTC is now on Firefox for Android as well as Firefox Desktop! Firefox 24 for Android now supports mozGetUserMedia, mozRTCPeerConnection, and DataChannels by default. mozGetUserMedia has been in desktop releases since Firefox 20, and mozPeerConnection and DataChannels since Firefox 22, and we’re excited that Android is now joining Desktop releases ...</p>
<p class="entry-meta vcard">
Posted <time class="updated" datetime="2013-09-17" title="2013-09-17">September 17, 2013</time> by <cite class="author fn">Maire Reavy</cite> </p>
</li>
<li class="hentry">
<h2 class="entry-title"><a href="https://hacks.mozilla.org/2013/09/user-agent-detection-history-and-checklist/" rel="bookmark">User-Agent detection, history and checklist</a></h2>
<p class="entry-summary">History User-Agent: &lt;something&gt; is a string of characters sent by HTTP clients (browsers, bots, calendar applications, etc.) for each individual HTTP request to a server. The HTTP Protocol as defined in 1991 didn’t have this field, but the next version defined in 1992 added User-Agent in the HTTP requests headers. ...</p>
<p class="entry-meta vcard">
Posted <time class="updated" datetime="2013-09-12" title="2013-09-12">September 12, 2013</time> by <cite class="author fn">Karl Dubost</cite> </p>
</li>
</ul>


</div>
<div class="column-involved">
<div class="home-involved-card"><a href="{{ devmo_url('Project:MDN/Contributing') }}">
<h3 class="title">{{ _('Get Involved') }}</h3>

<p class="numbers">{{ _('<span class="row1">Join <span class="number">%s</span> contributors</span> <span class="row2">in <span class="number">%s</span> languages and locales</span> <span class="row3">around the world.</span>') % (num_users|intcomma, num_languages) }}</p>
<p class="numbers">{{ _('<span class="row1">Join <span class="number">3,414</span> contributors</span> <span class="row2">in <span class="number">31</span> languages and locales</span> <span class="row3">around the world.</span>') }}</p>
<p><span class="button">{{ _('Help improve MDN') }}</span></p>
</a></div>
</div>
Expand Down Expand Up @@ -169,7 +132,7 @@ <h2><i class="icon-magic blue"></i> {{ _('See & submit demos') }}

<!-- contributions section -->
<div class="home-contribute"><div class="center">
<h2><i class="icon-smile"></i> {{ _('How to contribute to MDN') }}</h2>
<h2><i class="icon-smile"></i> {{ _('Help improve MDN') }}</h2>

<div class="column-container">
<div class="column-half">
Expand Down
2 changes: 0 additions & 2 deletions apps/landing/views.py
View file
Expand Up @@ -36,8 +36,6 @@ def home(request):

return render(request, 'landing/homepage.html',
{'demos': demos, 'updates': updates,
'num_languages': len(settings.MDN_LANGUAGES),
'num_users': len(User.objects.all()),
'current_challenge_tag_name':
str(constance.config.DEMOS_DEVDERBY_CURRENT_CHALLENGE_TAG).strip()})

Expand Down
3 changes: 2 additions & 1 deletion templates/base.html
View file
Expand Up @@ -144,8 +144,9 @@
<div class="submenu submenu-single">
<div class="submenu-column">
<ul>
<li><a href="{{ devmo_url('Web/Apps/Apps_Zone') }}?menu">App Center</a></li>
<li><a href="{{ devmo_url('Web/Apps') }}?menu">App Center</a></li>
<li><a href="{{ devmo_url('Mozilla/Firefox_OS') }}?menu">Firefox OS</a></li>
<li><a href="{{ devmo_url('Mozilla/Persona') }}?menu">Persona</a></li>
</ul>
</div>
</div>
Expand Down

0 comments on commit c6228b5

Please sign in to comment.