Merge lp:~jk-ozlabs/odm-portal/bios-reqs-doc into lp:odm-portal

Proposed by Jeremy Kerr
Status: Merged
Approved by: David Murphy
Approved revision: 21
Merged at revision: 18
Proposed branch: lp:~jk-ozlabs/odm-portal/bios-reqs-doc
Merge into: lp:odm-portal
Diff against target: 104 lines (+23/-19)
3 files modified
Makefile (+6/-1)
css/default.css (+3/-9)
index.html (+14/-9)
To merge this branch: bzr merge lp:~jk-ozlabs/odm-portal/bios-reqs-doc
Reviewer Review Type Date Requested Status
David Murphy (community) Approve
Review via email: mp+107784@code.launchpad.net

Description of the change

Minor updates to style & infrastructure before adding the bios reqs doc.

To post a comment you must log in.
Revision history for this message
David Murphy (schwuk) :
review: Approve
22. By Jeremy Kerr

Add BIOS/UEFI requirements document

Add the PDF doc, update the showcase text with a description, and add a
link in the resources list.

Revision history for this message
David Murphy (schwuk) wrote :

96 +<li><a href="/docs/ubuntu-bios-uefi-requirements.pdf">Ubuntu BIOS/UEFI

Although this will work in production, it breaks when testing locally (because of the leading slash).

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2011-11-18 12:15:11 +0000
3+++ Makefile 2012-06-02 00:54:20 +0000
4@@ -1,2 +1,7 @@
5+excludes = .DS_Store .bzr Makefile .*.swp resources
6+
7+exclude_args = $(foreach e, $(excludes), --exclude $(e))
8+
9 live:
10- rsync -e ssh -avz . cranberry.canonical.com:/srv/hwe.ubuntu.com/www/ --exclude .bzr/ --exclude .DS_Store --exclude Makefile
11+ rsync -e ssh -avz $(exclude_args) \
12+ . cranberry.canonical.com:/srv/hwe.ubuntu.com/www/
13
14=== modified file 'css/default.css'
15--- css/default.css 2011-11-15 12:20:12 +0000
16+++ css/default.css 2012-06-02 00:54:20 +0000
17@@ -30,6 +30,7 @@
18 blockquote, q { quotes:none; }
19 blockquote:before, blockquote:after, q:before, q:after { content:''; }
20 a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }
21+a, a:link, a:visited { color: rgb(221, 72, 20); }
22 ins { background-color:#ff9; color:#000; text-decoration:none; }
23 mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
24 del { text-decoration: line-through; }
25@@ -126,13 +127,6 @@
26 /*- Decoration
27 -------------------------------------------------------------------------------------------------------- */
28
29-h1,
30-h2,
31-h3,
32-h4,
33-h5,
34-h6 { color:#DD4814; }
35-
36
37 body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
38 #page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }
39@@ -145,7 +139,7 @@
40 #main-nav { border-left: 1px solid #EF7149; z-index:10;}
41 .main-nav-item,
42 .main-nav-itam.current,
43-.main-nav-item:visited { border-right: 1px solid #EF7149; border-bottom: 0; border-top: 0; color: #fff; display: block; float: left; height: 70px; line-height: 70px; margin:0px; padding: 0 15px; text-shadow: 1px 1px 1px #333; }
44+.main-nav-item:visited { border-right: 1px solid #EF7149; border-bottom: 0; border-top: 0; color: #fff !important; display: block; float: left; height: 70px; line-height: 70px; margin:0px; padding: 0 15px; text-shadow: 1px 1px 1px #333; }
45 .main-nav-item:hover,
46 .main-nav-item:active,
47 .main-nav-item:focus { background: url(../images/mainnav.png) 0 0 repeat; }
48@@ -313,4 +307,4 @@
49 article ol, article ul {
50 padding-top: .5em;
51 padding-left: .5em;
52-}
53\ No newline at end of file
54+}
55
56=== added directory 'docs'
57=== added file 'docs/ubuntu-bios-uefi-requirements.pdf'
58Binary files docs/ubuntu-bios-uefi-requirements.pdf 1970-01-01 00:00:00 +0000 and docs/ubuntu-bios-uefi-requirements.pdf 2012-06-02 00:54:20 +0000 differ
59=== modified file 'images/booklet.png'
60Binary files images/booklet.png 2011-12-02 13:29:46 +0000 and images/booklet.png 2012-06-02 00:54:20 +0000 differ
61=== modified file 'index.html'
62--- index.html 2011-12-13 10:11:02 +0000
63+++ index.html 2012-06-02 00:54:20 +0000
64@@ -77,14 +77,18 @@
65 <div class="container" >
66 <section id="showcase">
67 <section class="showcase-item">
68-<h2 class="showcase-heading">Ubuntu Hardware Summit 2011</h2>
69-<h3 class="showcase-subheading">Presentation Material</h3>
70-<p class="showcase-text">
71-Building on the success of 2010 (over 200 attendees), the <strong>2011 Ubuntu Hardware Summit</strong> delivered more sessions about working with Ubuntu than ever before. You can access the presentation material for UHS 2011.
72-</p>
73-<p class="showcase-text">
74-<a href="/uhs/2011/">Download Material&hellip;</a>
75-</p>
76+<h2 class="showcase-heading">Ubuntu and BIOS/UEFI</h2>
77+<h3 class="showcase-subheading">Requirements document</h3>
78+<p class="showcase-text">
79+We are proud to announce the first release of the <a
80+href="docs/ubuntu-bios-uefi-requirements.pdf">Ubuntu BIOS/UEFI Requirements
81+Document</a>. This technical document is intended to help OEMs, ODMs and IBVs
82+achieve maximum compatibility with Ubuntu.</p>
83+<p class="showcase-text">This document is being updated regularly, so be sure
84+to check back often for new versions.</p>
85+<p class="showcase-text"><a
86+href="docs/ubuntu-bios-uefi-requirements.pdf">Download the
87+document&hellip;</a></p>
88 </section>
89 <figure class="showcase-figure">
90 <img class="showcase-img" src="images/uhs.png" width="600" alt="Attendees at the Ubuntu Hardware Summit" />
91@@ -114,7 +118,8 @@
92 <li><a href="https://wiki.ubuntu.com/Kernel/Reference/S3SystemTapDebug">System Tap Utilities</a></li>
93 <li><a href="https://wiki.ubuntu.com/PackagingGuide">Packaging Guide</a></li>
94 <li><a href="https://help.ubuntu.com/community/Kernel/Compile">Build your own Kernel</a></li>
95-</ul>
96+<li><a href="/docs/ubuntu-bios-uefi-requirements.pdf">Ubuntu BIOS/UEFI
97+requirements</a></li> </ul>
98 </article>
99 <article class="side-content alone">
100 <h3>Debugging Tips</h3>
101
102=== added directory 'resources'
103=== added file 'resources/header-template.xcf'
104Binary files resources/header-template.xcf 1970-01-01 00:00:00 +0000 and resources/header-template.xcf 2012-06-02 00:54:20 +0000 differ

Subscribers

People subscribed via source and target branches