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
=== modified file 'Makefile'
--- Makefile 2011-11-18 12:15:11 +0000
+++ Makefile 2012-06-02 00:54:20 +0000
@@ -1,2 +1,7 @@
1excludes = .DS_Store .bzr Makefile .*.swp resources
2
3exclude_args = $(foreach e, $(excludes), --exclude $(e))
4
1live:5live:
2 rsync -e ssh -avz . cranberry.canonical.com:/srv/hwe.ubuntu.com/www/ --exclude .bzr/ --exclude .DS_Store --exclude Makefile6 rsync -e ssh -avz $(exclude_args) \
7 . cranberry.canonical.com:/srv/hwe.ubuntu.com/www/
38
=== modified file 'css/default.css'
--- css/default.css 2011-11-15 12:20:12 +0000
+++ css/default.css 2012-06-02 00:54:20 +0000
@@ -30,6 +30,7 @@
30blockquote, q { quotes:none; }30blockquote, q { quotes:none; }
31blockquote:before, blockquote:after, q:before, q:after { content:''; }31blockquote:before, blockquote:after, q:before, q:after { content:''; }
32a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }32a { cursor:pointer; margin:0; padding:0; border:0; font-size:100%; vertical-align:baseline; background:transparent; text-decoration:none; }
33a, a:link, a:visited { color: rgb(221, 72, 20); }
33ins { background-color:#ff9; color:#000; text-decoration:none; }34ins { background-color:#ff9; color:#000; text-decoration:none; }
34mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }35mark { background-color:#ff9; color:#000; font-style:italic; font-weight:bold; }
35del { text-decoration: line-through; }36del { text-decoration: line-through; }
@@ -126,13 +127,6 @@
126/*- Decoration127/*- Decoration
127-------------------------------------------------------------------------------------------------------- */128-------------------------------------------------------------------------------------------------------- */
128129
129h1,
130h2,
131h3,
132h4,
133h5,
134h6 { color:#DD4814; }
135
136130
137body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }131body { background:url("../images/dotted.png") repeat scroll 0 0 #FFFFFF; color:#333333; }
138#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }132#page-header { background:url("../images/header.png") repeat-x scroll 0 0 #dd4814; height:70px; }
@@ -145,7 +139,7 @@
145#main-nav { border-left: 1px solid #EF7149; z-index:10;}139#main-nav { border-left: 1px solid #EF7149; z-index:10;}
146.main-nav-item,140.main-nav-item,
147.main-nav-itam.current,141.main-nav-itam.current,
148.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; }142.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; }
149.main-nav-item:hover,143.main-nav-item:hover,
150.main-nav-item:active,144.main-nav-item:active,
151.main-nav-item:focus { background: url(../images/mainnav.png) 0 0 repeat; }145.main-nav-item:focus { background: url(../images/mainnav.png) 0 0 repeat; }
@@ -313,4 +307,4 @@
313article ol, article ul {307article ol, article ul {
314 padding-top: .5em;308 padding-top: .5em;
315 padding-left: .5em;309 padding-left: .5em;
316}
317\ No newline at end of file310\ No newline at end of file
311}
318312
=== added directory 'docs'
=== added file 'docs/ubuntu-bios-uefi-requirements.pdf'
319Binary 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 differ313Binary 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
=== modified file 'images/booklet.png'
320Binary files images/booklet.png 2011-12-02 13:29:46 +0000 and images/booklet.png 2012-06-02 00:54:20 +0000 differ314Binary files images/booklet.png 2011-12-02 13:29:46 +0000 and images/booklet.png 2012-06-02 00:54:20 +0000 differ
=== modified file 'index.html'
--- index.html 2011-12-13 10:11:02 +0000
+++ index.html 2012-06-02 00:54:20 +0000
@@ -77,14 +77,18 @@
77<div class="container" >77<div class="container" >
78<section id="showcase">78<section id="showcase">
79<section class="showcase-item">79<section class="showcase-item">
80<h2 class="showcase-heading">Ubuntu Hardware Summit 2011</h2>80<h2 class="showcase-heading">Ubuntu and BIOS/UEFI</h2>
81<h3 class="showcase-subheading">Presentation Material</h3>81<h3 class="showcase-subheading">Requirements document</h3>
82<p class="showcase-text">82<p class="showcase-text">
83Building 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.83We are proud to announce the first release of the <a
84</p>84href="docs/ubuntu-bios-uefi-requirements.pdf">Ubuntu BIOS/UEFI Requirements
85<p class="showcase-text">85Document</a>. This technical document is intended to help OEMs, ODMs and IBVs
86<a href="/uhs/2011/">Download Material&hellip;</a>86achieve maximum compatibility with Ubuntu.</p>
87</p>87<p class="showcase-text">This document is being updated regularly, so be sure
88to check back often for new versions.</p>
89<p class="showcase-text"><a
90href="docs/ubuntu-bios-uefi-requirements.pdf">Download the
91document&hellip;</a></p>
88</section>92</section>
89<figure class="showcase-figure">93<figure class="showcase-figure">
90<img class="showcase-img" src="images/uhs.png" width="600" alt="Attendees at the Ubuntu Hardware Summit" />94<img class="showcase-img" src="images/uhs.png" width="600" alt="Attendees at the Ubuntu Hardware Summit" />
@@ -114,7 +118,8 @@
114<li><a href="https://wiki.ubuntu.com/Kernel/Reference/S3SystemTapDebug">System Tap Utilities</a></li>118<li><a href="https://wiki.ubuntu.com/Kernel/Reference/S3SystemTapDebug">System Tap Utilities</a></li>
115<li><a href="https://wiki.ubuntu.com/PackagingGuide">Packaging Guide</a></li>119<li><a href="https://wiki.ubuntu.com/PackagingGuide">Packaging Guide</a></li>
116<li><a href="https://help.ubuntu.com/community/Kernel/Compile">Build your own Kernel</a></li>120<li><a href="https://help.ubuntu.com/community/Kernel/Compile">Build your own Kernel</a></li>
117</ul>121<li><a href="/docs/ubuntu-bios-uefi-requirements.pdf">Ubuntu BIOS/UEFI
122requirements</a></li> </ul>
118</article>123</article>
119<article class="side-content alone">124<article class="side-content alone">
120<h3>Debugging Tips</h3>125<h3>Debugging Tips</h3>
121126
=== added directory 'resources'
=== added file 'resources/header-template.xcf'
122Binary files resources/header-template.xcf 1970-01-01 00:00:00 +0000 and resources/header-template.xcf 2012-06-02 00:54:20 +0000 differ127Binary 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