Merge branch 'bug-547279' into development

pcraciunoiu · Feb 26, 2010 · b90fc3c · b90fc3c · davedash · Feb 27, 2010
2 parents 3bef785 + b49e90e
commit b90fc3c
Show file tree

Hide file tree

Showing 25 changed files with 1,407 additions and 208 deletions.
diff --git a/media/css/main.css b/media/css/main.css
diff --git a/media/css/search.css b/media/css/search.css
@@ -0,0 +1,69 @@
+.search-query {
+    border: 1px solid #E16601;
+    width: 270px;
+    margin-right: 5px;
+}
+.btn-large {
+    text-transform: none;
+}
+
+.pager {
+    padding: 10px 20px;
+    text-align: center;
+}
+
+.pager li {
+    float: left;
+}
+
+.pager a, .pager span {
+    padding: 0 4px;
+}
+
+div.search-count {
+    font-size: 120%;
+    padding: 0.2em 0 0.3em;
+}
+
+/* Bug 525944 - Using pspell for spelling suggestions */
+div.search-suggestion {
+    color: #cc4047;
+    font-size: 120%;
+    padding: .3em 0;
+}
+
+span.corrected {
+    font-weight: bold;
+}
+/* END Bug 525944 */
+
+/* Bug 527859 - Add search form to top and bottom of results */
+div.search-refine {
+    margin: .5em 0;
+}
+
+input.search-refine-query {
+    padding: 4px 2px 2px;
+}
+
+input.search-refine-submit {
+    text-transform: none;
+    padding: 2px 4px;
+}
+input.search-refine-submit:hover {
+    background-color: #f90;
+}
+/* END Bug 527859 */
+/* Bug 501880 -- advanced search */
+.show-search-tabs {
+    padding: 0.5em;
+    display: inline-block;
+}
+input.search-empty-query {
+    padding: 5px;
+}
+input.search-empty-submit {
+    -moz-border-radius: 8px;
+    padding: 5px 10px;
+}
+/* END Bug 501880 */
diff --git a/media/css/sidebar.css b/media/css/sidebar.css
@@ -0,0 +1,69 @@
+/* default sidebar, used on most SUMO pages */
+#sidebar {
+    float: right;
+    width: 200px;
+}
+
+#side-menu {
+    margin: -3px 0 0 15px;
+    list-style-type: none;
+    font-family: verdana;
+    font-size: 80%;
+}
+
+#side-menu li {
+    list-style-type: none;
+    margin: 0;
+    padding: 5px;
+    background: url(../img/side-menu-divider.png) top left no-repeat;
+}
+
+#side-menu li.first { 
+    font-family: georgia, freeserif, serif;
+    font-size: 205%;
+    padding: 4px 5px 2px;
+    background: none;
+}
+
+#side-menu li ul {
+    margin: 5px 0 0 0;
+    left: auto;
+}
+
+#side-menu li ul li {
+    padding-left: 8px;
+}
+
+#side-menu h3 {
+    margin: 0;
+    font-weight: normal;
+}
+
+#side-menu a:link,
+#side-menu a:visited {
+    color: #1e4262;
+    text-decoration: none;
+}
+
+#side-menu a.on:link,
+#side-menu a.on:visited {
+    color: #fff;
+    font-weight: bold;
+}
+
+.mini #side-menu a.on:link,
+.mini #side-menu a.on:visited {
+    color: #0489B7;
+}
+
+#side-menu h3 a.on:link,
+#side-menu h3 a.on:visited {
+    font-weight: normal;
+}
+
+#side-menu a:hover,
+#side-menu a:active {
+    text-decoration: underline;
+}
+
+
diff --git a/media/img/background-feature.jpg b/media/img/background-feature.jpg
diff --git a/media/img/background-tile.png b/media/img/background-tile.png
diff --git a/media/img/botbar.png b/media/img/botbar.png
diff --git a/media/img/cc-ie6.png b/media/img/cc-ie6.png
diff --git a/media/img/cc.png b/media/img/cc.png
diff --git a/media/img/favicon.ico b/media/img/favicon.ico
diff --git a/media/img/footer-border.png b/media/img/footer-border.png
diff --git a/media/img/header-background.png b/media/img/header-background.png
diff --git a/media/img/header-nav-divider.png b/media/img/header-nav-divider.png
diff --git a/media/img/header-nav-menu-backgrounds.png b/media/img/header-nav-menu-backgrounds.png
diff --git a/media/img/side-menu-divider.png b/media/img/side-menu-divider.png
diff --git a/media/img/topbar.png b/media/img/topbar.png
diff --git a/media/js/mozilla-menu.js b/media/js/mozilla-menu.js
diff --git a/templates/base/base.html b/templates/base/base.html
diff --git a/templates/base/head.html b/templates/base/head.html
diff --git a/templates/base/header.html b/templates/base/header.html
diff --git a/templates/common/base.html b/templates/common/base.html
@@ -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 %}
diff --git a/templates/layout/base.html b/templates/layout/base.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="{{ locale }}" dir="{{ dir }}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>{{ title }} | {{ _('Firefox Support') }}</title>
+
+<link rel="shortcut icon" type="image/x-icon" href="{{ MEDIA_URL }}img/favicon.ico"/>
+
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/main.css"/>
+<link rel="stylesheet" href="{{ MEDIA_URL }}css/sidebar.css"/>
+{% for style in styles %}
+<link rel="stylesheet" href="{{ MEDIA_URL }}{{ style }}"/>
+{% endfor %}
+
+</head>
+<body>
+
+<ul id="nav-access">
+    <li><a href="#navigation">{{ _('skip to navigation') }}</a></li>
+    <li><a href="#switch">{{ _('switch language') }}</a></li>
+</ul>
+
+<div id="header" role="banner">
+{% include 'layout/header.html' %}
+</div>
+
+<div id="content">
+
+<div id="sidebar">
+{% include 'layout/sidebar.html' %}
+</div>
+
+{% block breadcrumbs %}
+<div id="breadcrumbs">
+    <ul>
+        <li><a href="{{ locale }}/kb/">{{ _('Firefox Support') }}</a></li>
+        <li class="divider">/</li><li>{{ title }}</li>
+    </ul>
+</div>
+{% endblock %}
+
+<div id="main" role="main">
+{% block content_area %}
+{% endblock %}
+</div>
+
+<br class="clear" />
+</div><!-- /#content -->
+<div id="footer">
+<div id="footer-contents" role="contentinfo">
+{% include 'layout/footer.html' %}
+</div><!-- /#footer-contents -->
+</div><!-- /#footer -->
+
+<script type="text/javascript" src="{{ MEDIA_URL }}js/mozilla-menu.js"></script>
+</body>
+</html>