From eabb53076a49855adcdb70b0661f52271f236666 Mon Sep 17 00:00:00 2001
From: Tim Freund <tim@freunds.net>
Date: Fri, 17 Oct 2014 00:24:21 -0400
Subject: [PATCH] Scale images in the upstream-training guide
Most images that exceeded the slide area were too wide. These were
fixed by adding a 'max-width: 100%' CSS rule. Release cycle images in
the 01-release-cycle.rst presentation were too tall because the
two-column layout was not preserved when the presentation was converted
from the ODP source document. This change restores the two-column
layout. The images now scale appropriately across a variety of
operating systems and browsers. The print.css changes were tested with
the print rendering engines of Firefox and Chrome.
Change-Id: Ic5d4c3c959d37fda0d57009f282be1238388cc59
---
doc/upstream-training/01-release-cycle.rst | 19 ++++++++++++++++++-
doc/upstream-training/theme/css/print.css | 14 ++++++++++++++
doc/upstream-training/theme/css/screen.css | 16 +++++++++++++++-
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/doc/upstream-training/01-release-cycle.rst b/doc/upstream-training/01-release-cycle.rst
index 4b903d41..4a1e4607 100644
--- a/doc/upstream-training/01-release-cycle.rst
+++ b/doc/upstream-training/01-release-cycle.rst
@@ -12,10 +12,12 @@ OpenStack Upstream Training
Planning : Design
=================
+.. class:: colleft
- Planning stage is at the start of a cycle
- take a step back
- focus on what we want to do for the next one
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -23,11 +25,13 @@ Planning : Design
Planning : Discuss
==================
+.. class:: colleft
- With our peers
- feedback and comments
- create the corresponding blueprint
- 4 weeks, Design Summit on the third week
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -35,11 +39,13 @@ Planning : Discuss
Planning : Target
=================
+.. class:: colleft
- file new blueprints and/or specs
- set a target milestone
- when in the cycle they intend to complete it
- PTLs triage the submitted blueprints and set priority
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -47,11 +53,13 @@ Planning : Target
Implementation : Milestone
==========================
+.. class:: colleft
- pushed to our Gerrit review
- weeks before the milestone publication date
- milestone-proposed branch
- feature-frozen
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -59,10 +67,12 @@ Implementation : Milestone
Implementation : freezes
========================
+.. class:: colleft
- Feature proposal freeze
- String freeze
- Feature freeze
+.. class:: colright
.. image:: ./_assets/01-01-release.png
@@ -71,12 +81,14 @@ Implementation : freezes
Release Candidates
==================
+.. class:: colleft
- After the last milestone
- file bugs about everything you find
- prioritize bugs / bug triage
- write documentation
- fix as many bugs as you can
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -84,11 +96,13 @@ Release Candidates
Release candidate 1
===================
+.. class:: colleft
- Between the last milestone and the RC1
- stop adding features and concentrate on bug fixes
- Once all the release-critical bugs are fixed, we produce the first - - - release candidate for that project (RC1)
- used as-is as the final release
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -96,12 +110,14 @@ Release candidate 1
Other release candidates
========================
+.. class:: colleft
- regressions and integration issues
- new release-critical bugs
- (RC2), with bugs targeted to it
- merged in the master branch first
- repeated as many times as necessary
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -109,9 +125,11 @@ Other release candidates
Release day
===========
+.. class:: colleft
- last published release candidate
- published collectively as the OpenStack release
+.. class:: colright
.. image:: ./_assets/01-01-release.png
----
@@ -121,4 +139,3 @@ Exercise
Based on the Icehouse release schedule, find the URL of a document or a patch that belongs to each of the steps.
-
diff --git a/doc/upstream-training/theme/css/print.css b/doc/upstream-training/theme/css/print.css
index 41b5f8f7..f91e7477 100644
--- a/doc/upstream-training/theme/css/print.css
+++ b/doc/upstream-training/theme/css/print.css
@@ -92,3 +92,17 @@ code {
.presenter_notes, #current_presenter_notes, #presenter_note {
display: none;
}
+
+.colleft {
+ float: left;
+ max-width: 48%;
+ height: 550px;
+ padding-left: 2em;
+}
+
+.colright {
+ float: right;
+ max-width: 48%;
+ height: 550px;
+ padding: 0;
+}
diff --git a/doc/upstream-training/theme/css/screen.css b/doc/upstream-training/theme/css/screen.css
index bdecb670..6162c0ba 100644
--- a/doc/upstream-training/theme/css/screen.css
+++ b/doc/upstream-training/theme/css/screen.css
@@ -310,7 +310,7 @@ section, .slide header:only-child h1 {
overflow: hidden;
}
-img { display: block; margin: auto; }
+img { display: block; margin: auto; max-width: 100%; max-height: 100%}
section img.align-center {
display: block;
@@ -562,3 +562,17 @@ aside {
z-index: 64;
display: none;
}
+
+.colleft {
+ float: left;
+ max-width: 48%;
+ height: 600px;
+ padding-left: 2em;
+}
+
+.colright {
+ float: right;
+ max-width: 48%;
+ height: 600px;
+ padding: 0;
+}