Skip to content

Commit

Permalink
Creating 'common' theme and extending search/results.html from that. …
Browse files Browse the repository at this point in the history
…Also restructure header.html inclusion for consistency
  • Loading branch information
Paul Craciunoiu committed Feb 24, 2010
1 parent b2b5995 commit b49e90e
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 40 deletions.
10 changes: 10 additions & 0 deletions templates/common/base.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% extends "layout/base.html" %}
{% block content_area %}
<div class="topbar"></div>
<div id="content-inner">
{% block content %}
{% endblock %}
</div><!-- /#content-inner -->
<br class="clear" />
<div class="botbar"></div>
{% endblock %}
7 changes: 3 additions & 4 deletions templates/layout/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<li><a href="#switch">{{ _('switch language') }}</a></li>
</ul>

<div id="header" role="banner">
{% include 'layout/header.html' %}
</div>

<div id="content">

Expand All @@ -38,10 +40,7 @@
{% endblock %}

<div id="main" role="main">
{% block content %}
<div class="topbar"></div>
<br class="clear" />
<div class="botbar"></div>
{% block content_area %}
{% endblock %}
</div>

Expand Down
54 changes: 26 additions & 28 deletions templates/layout/header.html
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
<div id="header" role="banner">
<h1><a href="http://www.mozilla.com/" title="{{ _('Back to Mozilla.com') }}"><img src="http://support.mozilla.com/styles/mozcommon/mozilla-logo.png" height="56" width="145" alt="Mozilla" /></a></h1>
<div id="nav-main" class="yuimenubar yuimenubarnav" role="navigation">
<div class="bd"><ul class="first-of-type">
<li id="menu_products" class="yuimenubaritem"><a href="http://www.mozilla.com/products/">{{ _('Products') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_firefox" class="yuimenuitem"><a href="http://www.mozilla.com/products/firefox/">{{ _('Firefox') }}</a></li><li id="submenu_thunderbird" class="yuimenuitem"><a href="http://www.mozilla.com/products/thunderbird/">{{ _('Thunderbird') }}</a></li></ul>
</div></div>
</li>
<li id="menu_addons" class="yuimenubaritem"><a href="https://addons.mozilla.org/">Add-ons</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_addons_all" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/">All Add-ons</a></li><li id="submenu_addons_recommended" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/recommended">{{ _('Recommended') }}</a></li><li id="submenu_addons_popular" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:1/cat:all?sort=popular">{{ _('Popular') }}</a></li><li id="submenu_addons_themes" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:2">{{ _('Themes') }}</a></li><li id="submenu_addons_search" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:4">{{ _('Search Engines') }}</a></li><li id="submenu_addons_plugins" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:7">{{ _('Plugins') }}</a></li></ul>
</div></div>
</li>
<li id="menu_support" class="yuimenubaritem"><span class="current">{{ _('Support') }}</span>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_support_kb" class="yuimenuitem"><a href="http://support.mozilla.com/{{ locale }}/kb/">{{ _('Firefox Support') }}</a></li><li id="submenu_support_mobile" class="yuimenuitem"><a href="http://mobile.support.mozilla.com/{{ locale }}/kb/">{{ _('Mobile Support') }}</a></li><li id="submenu_support_thunderbird" class="yuimenuitem"><a href="http://www.mozilla.org/support/thunderbird/">{{ _('Thunderbird Support') }}</a></li></ul>
</div></div>
</li><li id="menu_community" class="yuimenubaritem"><a href="http://www.mozilla.com/manyfaces/">{{ _('Community') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_community_addons" class="yuimenuitem"><a href="https://addons.mozilla.org/">Add-ons</a></li><li id="submenu_community_bugzilla" class="yuimenuitem"><a href="https://bugzilla.mozilla.org/">{{ _('Bugzilla') }}</a></li><li id="submenu_community_devmo" class="yuimenuitem"><a href="http://developer.mozilla.org/">{{ _('Mozilla Developer Center') }}</a></li><li id="submenu_community_labs" class="yuimenuitem"><a href="http://labs.mozilla.com/">{{ _('Mozilla Labs') }}</a></li><li id="submenu_community_mozillaorg" class="yuimenuitem"><a href="http://www.mozilla.org/">Mozilla.org</a></li><li id="submenu_community_mozillazine" class="yuimenuitem"><a href="http://www.mozillazine.org/">{{ _('MozillaZine') }}</a></li><li id="submenu_community_planet" class="yuimenuitem"><a href="http://planet.mozilla.org/">{{ _('Planet Mozilla') }}</a></li><li id="submenu_community_qmo" class="yuimenuitem"><a href="http://quality.mozilla.org/">{{ _('QMO') }}</a></li><li id="submenu_community_spreadfirefox" class="yuimenuitem"><a href="http://www.spreadfirefox.com/">{{ _('SpreadFirefox') }}</a></li><li id="submenu_community_support" class="yuimenuitem"><span class="current">{{ _('Support') }}</span></li></ul>
</div></div>
</li><li id="menu_aboutus" class="yuimenubaritem"><a href="http://www.mozilla.com/about/">{{ _('About') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_about" class="yuimenuitem"><a href="http://www.mozilla.com/about/whatismozilla.html">What is Mozilla?</a></li><li id="submenu_getinvolved" class="yuimenuitem"><a href="http://www.mozilla.com/about/get-involved.html">{{ _('Get Involved') }}</a></li><li id="submenu_press" class="yuimenuitem"><a href="http://www.mozilla.com/press/">{{ _('Press Center') }}</a></li><li id="submenu_careers" class="yuimenuitem"><a href="http://www.mozilla.com/about/careers.html">{{ _('Careers') }}</a></li><li id="submenu_partnerships" class="yuimenuitem"><a href="http://www.mozilla.com/about/partnerships.html">{{ _('Partnerships') }}</a></li><li id="submenu_licensing" class="yuimenuitem"><a href="http://www.mozilla.com/about/licensing.html">{{ _('Licensing') }}</a></li><li id="submenu_blog" class="yuimenuitem"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li><li id="submenu_store" class="yuimenuitem"><a href="http://store.mozilla.org/">{{ _('Store') }}</a></li><li id="submenu_contact" class="yuimenuitem"><a href="http://www.mozilla.com/about/contact.html">{{ _('Contact Us') }}</a></li></ul>
</div></div>
</li></ul>
</div>
<h1><a href="http://www.mozilla.com/" title="{{ _('Back to Mozilla.com') }}"><img src="http://support.mozilla.com/styles/mozcommon/mozilla-logo.png" height="56" width="145" alt="Mozilla" /></a></h1>
<div id="nav-main" class="yuimenubar yuimenubarnav" role="navigation">
<div class="bd"><ul class="first-of-type">
<li id="menu_products" class="yuimenubaritem"><a href="http://www.mozilla.com/products/">{{ _('Products') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_firefox" class="yuimenuitem"><a href="http://www.mozilla.com/products/firefox/">{{ _('Firefox') }}</a></li><li id="submenu_thunderbird" class="yuimenuitem"><a href="http://www.mozilla.com/products/thunderbird/">{{ _('Thunderbird') }}</a></li></ul>
</div></div>
</li>
<li id="menu_addons" class="yuimenubaritem"><a href="https://addons.mozilla.org/">Add-ons</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_addons_all" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/">All Add-ons</a></li><li id="submenu_addons_recommended" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/recommended">{{ _('Recommended') }}</a></li><li id="submenu_addons_popular" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:1/cat:all?sort=popular">{{ _('Popular') }}</a></li><li id="submenu_addons_themes" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:2">{{ _('Themes') }}</a></li><li id="submenu_addons_search" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:4">{{ _('Search Engines') }}</a></li><li id="submenu_addons_plugins" class="yuimenuitem"><a href="https://addons.mozilla.org/firefox/browse/type:7">{{ _('Plugins') }}</a></li></ul>
</div></div>
</li>
<li id="menu_support" class="yuimenubaritem"><span class="current">{{ _('Support') }}</span>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_support_kb" class="yuimenuitem"><a href="http://support.mozilla.com/{{ locale }}/kb/">{{ _('Firefox Support') }}</a></li><li id="submenu_support_mobile" class="yuimenuitem"><a href="http://mobile.support.mozilla.com/{{ locale }}/kb/">{{ _('Mobile Support') }}</a></li><li id="submenu_support_thunderbird" class="yuimenuitem"><a href="http://www.mozilla.org/support/thunderbird/">{{ _('Thunderbird Support') }}</a></li></ul>
</div></div>
</li><li id="menu_community" class="yuimenubaritem"><a href="http://www.mozilla.com/manyfaces/">{{ _('Community') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_community_addons" class="yuimenuitem"><a href="https://addons.mozilla.org/">Add-ons</a></li><li id="submenu_community_bugzilla" class="yuimenuitem"><a href="https://bugzilla.mozilla.org/">{{ _('Bugzilla') }}</a></li><li id="submenu_community_devmo" class="yuimenuitem"><a href="http://developer.mozilla.org/">{{ _('Mozilla Developer Center') }}</a></li><li id="submenu_community_labs" class="yuimenuitem"><a href="http://labs.mozilla.com/">{{ _('Mozilla Labs') }}</a></li><li id="submenu_community_mozillaorg" class="yuimenuitem"><a href="http://www.mozilla.org/">Mozilla.org</a></li><li id="submenu_community_mozillazine" class="yuimenuitem"><a href="http://www.mozillazine.org/">{{ _('MozillaZine') }}</a></li><li id="submenu_community_planet" class="yuimenuitem"><a href="http://planet.mozilla.org/">{{ _('Planet Mozilla') }}</a></li><li id="submenu_community_qmo" class="yuimenuitem"><a href="http://quality.mozilla.org/">{{ _('QMO') }}</a></li><li id="submenu_community_spreadfirefox" class="yuimenuitem"><a href="http://www.spreadfirefox.com/">{{ _('SpreadFirefox') }}</a></li><li id="submenu_community_support" class="yuimenuitem"><span class="current">{{ _('Support') }}</span></li></ul>
</div></div>
</li><li id="menu_aboutus" class="yuimenubaritem"><a href="http://www.mozilla.com/about/">{{ _('About') }}</a>
<div class="yuimenu"><div class="bd">
<ul><li id="submenu_about" class="yuimenuitem"><a href="http://www.mozilla.com/about/whatismozilla.html">What is Mozilla?</a></li><li id="submenu_getinvolved" class="yuimenuitem"><a href="http://www.mozilla.com/about/get-involved.html">{{ _('Get Involved') }}</a></li><li id="submenu_press" class="yuimenuitem"><a href="http://www.mozilla.com/press/">{{ _('Press Center') }}</a></li><li id="submenu_careers" class="yuimenuitem"><a href="http://www.mozilla.com/about/careers.html">{{ _('Careers') }}</a></li><li id="submenu_partnerships" class="yuimenuitem"><a href="http://www.mozilla.com/about/partnerships.html">{{ _('Partnerships') }}</a></li><li id="submenu_licensing" class="yuimenuitem"><a href="http://www.mozilla.com/about/licensing.html">{{ _('Licensing') }}</a></li><li id="submenu_blog" class="yuimenuitem"><a href="http://blog.mozilla.com/">{{ _('Blog') }}</a></li><li id="submenu_store" class="yuimenuitem"><a href="http://store.mozilla.org/">{{ _('Store') }}</a></li><li id="submenu_contact" class="yuimenuitem"><a href="http://www.mozilla.com/about/contact.html">{{ _('Contact Us') }}</a></li></ul>
</div></div>
</li></ul>
</div>
</div>
<br class="clear"/>
10 changes: 2 additions & 8 deletions templates/search/results.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
{% extends "layout/base.html" %}
{% extends "common/base.html" %}
{% set title = _("Search") %}
{% set styles = ('css/search.css',) %}

{% block content %}
<div class="topbar"></div>

<div id="content-inner">
<div id="basic-search" class="search-refine">
<form role="search" method="get" action="search">
<input type="hidden" value="{% if w %}{{ w }}{% else %}3{% endif %}" name="w">
Expand Down Expand Up @@ -71,7 +68,4 @@

</div>
<p>Can't find what you're looking for? <a href="/kb/Ask+a+question">Ask a support question instead!</a></p>
</div><!-- /#content-inner -->
<br class="clear" />
<div class="botbar"></div>
{% endblock %}
{% endblock %}

0 comments on commit b49e90e

Please sign in to comment.