[openstack-cinder/el6-havana] remove dependency on python-oslo-sphinx
Pádraig Brady
pbrady at fedoraproject.org
Mon Jul 22 02:16:08 UTC 2013
commit 9f742f0542098595ae10b9666a8a59654b5f401c
Author: Pádraig Brady <P at draigBrady.com>
Date: Mon Jul 22 03:14:39 2013 +0100
remove dependency on python-oslo-sphinx
This will be reinstated when that package is available
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 1233 ++++++++++++++++++++
openstack-cinder.spec | 2 +
2 files changed, 1235 insertions(+), 0 deletions(-)
---
diff --git a/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
new file mode 100644
index 0000000..e4ce484
--- /dev/null
+++ b/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -0,0 +1,1233 @@
+From 07bf3fd184609676ec91b322b7e8f2b88f547db1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
+Date: Mon, 22 Jul 2013 03:14:27 +0100
+Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
+
+This reverts commit 8b1ae18ba95f04fedc04592b419401d75d448543.
+
+Conflicts:
+
+ test-requirements.txt
+---
+ doc/source/_static/basic.css | 416 ++++++++++++++++++++++++++++++++++++
+ doc/source/_static/default.css | 230 ++++++++++++++++++++
+ doc/source/_static/jquery.tweet.js | 154 +++++++++++++
+ doc/source/_static/tweaks.css | 218 +++++++++++++++++++
+ doc/source/_theme/layout.html | 95 ++++++++
+ doc/source/_theme/theme.conf | 5 +
+ doc/source/conf.py | 8 +-
+ test-requirements.txt | 1 -
+ 8 files changed, 1121 insertions(+), 6 deletions(-)
+ create mode 100644 doc/source/_static/.gitignore
+ create mode 100644 doc/source/_static/.placeholder
+ create mode 100644 doc/source/_static/basic.css
+ create mode 100644 doc/source/_static/default.css
+ create mode 100644 doc/source/_static/jquery.tweet.js
+ create mode 100644 doc/source/_static/tweaks.css
+ create mode 100644 doc/source/_templates/.gitignore
+ create mode 100644 doc/source/_templates/.placeholder
+ create mode 100644 doc/source/_theme/layout.html
+ create mode 100644 doc/source/_theme/theme.conf
+
+diff --git a/doc/source/_static/.gitignore b/doc/source/_static/.gitignore
+new file mode 100644
+index 0000000..e69de29
+diff --git a/doc/source/_static/.placeholder b/doc/source/_static/.placeholder
+new file mode 100644
+index 0000000..e69de29
+diff --git a/doc/source/_static/basic.css b/doc/source/_static/basic.css
+new file mode 100644
+index 0000000..d909ce3
+--- /dev/null
++++ b/doc/source/_static/basic.css
+@@ -0,0 +1,416 @@
++/**
++ * Sphinx stylesheet -- basic theme
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
++
++/* -- main layout ----------------------------------------------------------- */
++
++div.clearer {
++ clear: both;
++}
++
++/* -- relbar ---------------------------------------------------------------- */
++
++div.related {
++ width: 100%;
++ font-size: 90%;
++}
++
++div.related h3 {
++ display: none;
++}
++
++div.related ul {
++ margin: 0;
++ padding: 0 0 0 10px;
++ list-style: none;
++}
++
++div.related li {
++ display: inline;
++}
++
++div.related li.right {
++ float: right;
++ margin-right: 5px;
++}
++
++/* -- sidebar --------------------------------------------------------------- */
++
++div.sphinxsidebarwrapper {
++ padding: 10px 5px 0 10px;
++}
++
++div.sphinxsidebar {
++ float: left;
++ width: 230px;
++ margin-left: -100%;
++ font-size: 90%;
++}
++
++div.sphinxsidebar ul {
++ list-style: none;
++}
++
++div.sphinxsidebar ul ul,
++div.sphinxsidebar ul.want-points {
++ margin-left: 20px;
++ list-style: square;
++}
++
++div.sphinxsidebar ul ul {
++ margin-top: 0;
++ margin-bottom: 0;
++}
++
++div.sphinxsidebar form {
++ margin-top: 10px;
++}
++
++div.sphinxsidebar input {
++ border: 1px solid #98dbcc;
++ font-family: sans-serif;
++ font-size: 1em;
++}
++
++img {
++ border: 0;
++}
++
++/* -- search page ----------------------------------------------------------- */
++
++ul.search {
++ margin: 10px 0 0 20px;
++ padding: 0;
++}
++
++ul.search li {
++ padding: 5px 0 5px 20px;
++ background-image: url(file.png);
++ background-repeat: no-repeat;
++ background-position: 0 7px;
++}
++
++ul.search li a {
++ font-weight: bold;
++}
++
++ul.search li div.context {
++ color: #888;
++ margin: 2px 0 0 30px;
++ text-align: left;
++}
++
++ul.keywordmatches li.goodmatch a {
++ font-weight: bold;
++}
++
++/* -- index page ------------------------------------------------------------ */
++
++table.contentstable {
++ width: 90%;
++}
++
++table.contentstable p.biglink {
++ line-height: 150%;
++}
++
++a.biglink {
++ font-size: 1.3em;
++}
++
++span.linkdescr {
++ font-style: italic;
++ padding-top: 5px;
++ font-size: 90%;
++}
++
++/* -- general index --------------------------------------------------------- */
++
++table.indextable td {
++ text-align: left;
++ vertical-align: top;
++}
++
++table.indextable dl, table.indextable dd {
++ margin-top: 0;
++ margin-bottom: 0;
++}
++
++table.indextable tr.pcap {
++ height: 10px;
++}
++
++table.indextable tr.cap {
++ margin-top: 10px;
++ background-color: #f2f2f2;
++}
++
++img.toggler {
++ margin-right: 3px;
++ margin-top: 3px;
++ cursor: pointer;
++}
++
++/* -- general body styles --------------------------------------------------- */
++
++a.headerlink {
++ visibility: hidden;
++}
++
++h1:hover > a.headerlink,
++h2:hover > a.headerlink,
++h3:hover > a.headerlink,
++h4:hover > a.headerlink,
++h5:hover > a.headerlink,
++h6:hover > a.headerlink,
++dt:hover > a.headerlink {
++ visibility: visible;
++}
++
++div.body p.caption {
++ text-align: inherit;
++}
++
++div.body td {
++ text-align: left;
++}
++
++.field-list ul {
++ padding-left: 1em;
++}
++
++.first {
++}
++
++p.rubric {
++ margin-top: 30px;
++ font-weight: bold;
++}
++
++/* -- sidebars -------------------------------------------------------------- */
++
++div.sidebar {
++ margin: 0 0 0.5em 1em;
++ border: 1px solid #ddb;
++ padding: 7px 7px 0 7px;
++ background-color: #ffe;
++ width: 40%;
++ float: right;
++}
++
++p.sidebar-title {
++ font-weight: bold;
++}
++
++/* -- topics ---------------------------------------------------------------- */
++
++div.topic {
++ border: 1px solid #ccc;
++ padding: 7px 7px 0 7px;
++ margin: 10px 0 10px 0;
++}
++
++p.topic-title {
++ font-size: 1.1em;
++ font-weight: bold;
++ margin-top: 10px;
++}
++
++/* -- admonitions ----------------------------------------------------------- */
++
++div.admonition {
++ margin-top: 10px;
++ margin-bottom: 10px;
++ padding: 7px;
++}
++
++div.admonition dt {
++ font-weight: bold;
++}
++
++div.admonition dl {
++ margin-bottom: 0;
++}
++
++p.admonition-title {
++ margin: 0px 10px 5px 0px;
++ font-weight: bold;
++}
++
++div.body p.centered {
++ text-align: center;
++ margin-top: 25px;
++}
++
++/* -- tables ---------------------------------------------------------------- */
++
++table.docutils {
++ border: 0;
++ border-collapse: collapse;
++}
++
++table.docutils td, table.docutils th {
++ padding: 1px 8px 1px 0;
++ border-top: 0;
++ border-left: 0;
++ border-right: 0;
++ border-bottom: 1px solid #aaa;
++}
++
++table.field-list td, table.field-list th {
++ border: 0 !important;
++}
++
++table.footnote td, table.footnote th {
++ border: 0 !important;
++}
++
++th {
++ text-align: left;
++ padding-right: 5px;
++}
++
++/* -- other body styles ----------------------------------------------------- */
++
++dl {
++ margin-bottom: 15px;
++}
++
++dd p {
++ margin-top: 0px;
++}
++
++dd ul, dd table {
++ margin-bottom: 10px;
++}
++
++dd {
++ margin-top: 3px;
++ margin-bottom: 10px;
++ margin-left: 30px;
++}
++
++dt:target, .highlight {
++ background-color: #fbe54e;
++}
++
++dl.glossary dt {
++ font-weight: bold;
++ font-size: 1.1em;
++}
++
++.field-list ul {
++ margin: 0;
++ padding-left: 1em;
++}
++
++.field-list p {
++ margin: 0;
++}
++
++.refcount {
++ color: #060;
++}
++
++.optional {
++ font-size: 1.3em;
++}
++
++.versionmodified {
++ font-style: italic;
++}
++
++.system-message {
++ background-color: #fda;
++ padding: 5px;
++ border: 3px solid red;
++}
++
++.footnote:target {
++ background-color: #ffa
++}
++
++.line-block {
++ display: block;
++ margin-top: 1em;
++ margin-bottom: 1em;
++}
++
++.line-block .line-block {
++ margin-top: 0;
++ margin-bottom: 0;
++ margin-left: 1.5em;
++}
++
++/* -- code displays --------------------------------------------------------- */
++
++pre {
++ overflow: auto;
++}
++
++td.linenos pre {
++ padding: 5px 0px;
++ border: 0;
++ background-color: transparent;
++ color: #aaa;
++}
++
++table.highlighttable {
++ margin-left: 0.5em;
++}
++
++table.highlighttable td {
++ padding: 0 0.5em 0 0.5em;
++}
++
++tt.descname {
++ background-color: transparent;
++ font-weight: bold;
++ font-size: 1.2em;
++}
++
++tt.descclassname {
++ background-color: transparent;
++}
++
++tt.xref, a tt {
++ background-color: transparent;
++ font-weight: bold;
++}
++
++h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt {
++ background-color: transparent;
++}
++
++/* -- math display ---------------------------------------------------------- */
++
++img.math {
++ vertical-align: middle;
++}
++
++div.body div.math p {
++ text-align: center;
++}
++
++span.eqno {
++ float: right;
++}
++
++/* -- printout stylesheet --------------------------------------------------- */
++
++ at media print {
++ div.document,
++ div.documentwrapper,
++ div.bodywrapper {
++ margin: 0 !important;
++ width: 100%;
++ }
++
++ div.sphinxsidebar,
++ div.related,
++ div.footer,
++ #top-link {
++ display: none;
++ }
++}
+diff --git a/doc/source/_static/default.css b/doc/source/_static/default.css
+new file mode 100644
+index 0000000..c8091ec
+--- /dev/null
++++ b/doc/source/_static/default.css
+@@ -0,0 +1,230 @@
++/**
++ * Sphinx stylesheet -- default theme
++ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++ */
++
++ at import url("basic.css");
++
++/* -- page layout ----------------------------------------------------------- */
++
++body {
++ font-family: sans-serif;
++ font-size: 100%;
++ background-color: #11303d;
++ color: #000;
++ margin: 0;
++ padding: 0;
++}
++
++div.document {
++ background-color: #1c4e63;
++}
++
++div.documentwrapper {
++ float: left;
++ width: 100%;
++}
++
++div.bodywrapper {
++ margin: 0 0 0 230px;
++}
++
++div.body {
++ background-color: #ffffff;
++ color: #000000;
++ padding: 0 20px 30px 20px;
++}
++
++div.footer {
++ color: #ffffff;
++ width: 100%;
++ padding: 9px 0 9px 0;
++ text-align: center;
++ font-size: 75%;
++}
++
++div.footer a {
++ color: #ffffff;
++ text-decoration: underline;
++}
++
++div.related {
++ background-color: #133f52;
++ line-height: 30px;
++ color: #ffffff;
++}
++
++div.related a {
++ color: #ffffff;
++}
++
++div.sphinxsidebar {
++}
++
++div.sphinxsidebar h3 {
++ font-family: 'Trebuchet MS', sans-serif;
++ color: #ffffff;
++ font-size: 1.4em;
++ font-weight: normal;
++ margin: 0;
++ padding: 0;
++}
++
++div.sphinxsidebar h3 a {
++ color: #ffffff;
++}
++
++div.sphinxsidebar h4 {
++ font-family: 'Trebuchet MS', sans-serif;
++ color: #ffffff;
++ font-size: 1.3em;
++ font-weight: normal;
++ margin: 5px 0 0 0;
++ padding: 0;
++}
++
++div.sphinxsidebar p {
++ color: #ffffff;
++}
++
++div.sphinxsidebar p.topless {
++ margin: 5px 10px 10px 10px;
++}
++
++div.sphinxsidebar ul {
++ margin: 10px;
++ padding: 0;
++ color: #ffffff;
++}
++
++div.sphinxsidebar a {
++ color: #98dbcc;
++}
++
++div.sphinxsidebar input {
++ border: 1px solid #98dbcc;
++ font-family: sans-serif;
++ font-size: 1em;
++}
++
++/* -- body styles ----------------------------------------------------------- */
++
++a {
++ color: #355f7c;
++ text-decoration: none;
++}
++
++a:hover {
++ text-decoration: underline;
++}
++
++div.body p, div.body dd, div.body li {
++ text-align: left;
++ line-height: 130%;
++}
++
++div.body h1,
++div.body h2,
++div.body h3,
++div.body h4,
++div.body h5,
++div.body h6 {
++ font-family: 'Trebuchet MS', sans-serif;
++ background-color: #f2f2f2;
++ font-weight: normal;
++ color: #20435c;
++ border-bottom: 1px solid #ccc;
++ margin: 20px -20px 10px -20px;
++ padding: 3px 0 3px 10px;
++}
++
++div.body h1 { margin-top: 0; font-size: 200%; }
++div.body h2 { font-size: 160%; }
++div.body h3 { font-size: 140%; }
++div.body h4 { font-size: 120%; }
++div.body h5 { font-size: 110%; }
++div.body h6 { font-size: 100%; }
++
++a.headerlink {
++ color: #c60f0f;
++ font-size: 0.8em;
++ padding: 0 4px 0 4px;
++ text-decoration: none;
++}
++
++a.headerlink:hover {
++ background-color: #c60f0f;
++ color: white;
++}
++
++div.body p, div.body dd, div.body li {
++ text-align: left;
++ line-height: 130%;
++}
++
++div.admonition p.admonition-title + p {
++ display: inline;
++}
++
++div.admonition p {
++ margin-bottom: 5px;
++}
++
++div.admonition pre {
++ margin-bottom: 5px;
++}
++
++div.admonition ul, div.admonition ol {
++ margin-bottom: 5px;
++}
++
++div.note {
++ background-color: #eee;
++ border: 1px solid #ccc;
++}
++
++div.seealso {
++ background-color: #ffc;
++ border: 1px solid #ff6;
++}
++
++div.topic {
++ background-color: #eee;
++}
++
++div.warning {
++ background-color: #ffe4e4;
++ border: 1px solid #f66;
++}
++
++p.admonition-title {
++ display: inline;
++}
++
++p.admonition-title:after {
++ content: ":";
++}
++
++pre {
++ padding: 5px;
++ background-color: #eeffcc;
++ color: #333333;
++ line-height: 120%;
++ border: 1px solid #ac9;
++ border-left: none;
++ border-right: none;
++}
++
++tt {
++ background-color: #ecf0f3;
++ padding: 0 1px 0 1px;
++ font-size: 0.95em;
++}
++
++.warning tt {
++ background: #efc2c2;
++}
++
++.note tt {
++ background: #d6d6d6;
++}
+diff --git a/doc/source/_static/jquery.tweet.js b/doc/source/_static/jquery.tweet.js
+new file mode 100644
+index 0000000..79bf0bd
+--- /dev/null
++++ b/doc/source/_static/jquery.tweet.js
+@@ -0,0 +1,154 @@
++(function($) {
++
++ $.fn.tweet = function(o){
++ var s = {
++ username: ["seaofclouds"], // [string] required, unless you want to display our tweets. :) it can be an array, just do ["username1","username2","etc"]
++ list: null, //[string] optional name of list belonging to username
++ avatar_size: null, // [integer] height and width of avatar if displayed (48px max)
++ count: 3, // [integer] how many tweets to display?
++ intro_text: null, // [string] do you want text BEFORE your your tweets?
++ outro_text: null, // [string] do you want text AFTER your tweets?
++ join_text: null, // [string] optional text in between date and tweet, try setting to "auto"
++ auto_join_text_default: "i said,", // [string] auto text for non verb: "i said" bullocks
++ auto_join_text_ed: "i", // [string] auto text for past tense: "i" surfed
++ auto_join_text_ing: "i am", // [string] auto tense for present tense: "i was" surfing
++ auto_join_text_reply: "i replied to", // [string] auto tense for replies: "i replied to" @someone "with"
++ auto_join_text_url: "i was looking at", // [string] auto tense for urls: "i was looking at" http:...
++ loading_text: null, // [string] optional loading text, displayed while tweets load
++ query: null // [string] optional search query
++ };
++
++ if(o) $.extend(s, o);
++
++ $.fn.extend({
++ linkUrl: function() {
++ var returning = [];
++ var regexp = /((ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
++ this.each(function() {
++ returning.push(this.replace(regexp,"<a href=\"$1\">$1</a>"));
++ });
++ return $(returning);
++ },
++ linkUser: function() {
++ var returning = [];
++ var regexp = /[\@]+([A-Za-z0-9-_]+)/gi;
++ this.each(function() {
++ returning.push(this.replace(regexp,"<a href=\"http://twitter.com/$1\">@$1</a>"));
++ });
++ return $(returning);
++ },
++ linkHash: function() {
++ var returning = [];
++ var regexp = / [\#]+([A-Za-z0-9-_]+)/gi;
++ this.each(function() {
++ returning.push(this.replace(regexp, ' <a href="http://search.twitter.com/search?q=&tag=$1&lang=all&from='+s.username.join("%2BOR%2B")+'">#$1</a>'));
++ });
++ return $(returning);
++ },
++ capAwesome: function() {
++ var returning = [];
++ this.each(function() {
++ returning.push(this.replace(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'));
++ });
++ return $(returning);
++ },
++ capEpic: function() {
++ var returning = [];
++ this.each(function() {
++ returning.push(this.replace(/\b(epic)\b/gi, '<span class="epic">$1</span>'));
++ });
++ return $(returning);
++ },
++ makeHeart: function() {
++ var returning = [];
++ this.each(function() {
++ returning.push(this.replace(/(<)+[3]/gi, "<tt class='heart'>♥</tt>"));
++ });
++ return $(returning);
++ }
++ });
++
++ function relative_time(time_value) {
++ var parsed_date = Date.parse(time_value);
++ var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
++ var delta = parseInt((relative_to.getTime() - parsed_date) / 1000);
++ var pluralize = function (singular, n) {
++ return '' + n + ' ' + singular + (n == 1 ? '' : 's');
++ };
++ if(delta < 60) {
++ return 'less than a minute ago';
++ } else if(delta < (45*60)) {
++ return 'about ' + pluralize("minute", parseInt(delta / 60)) + ' ago';
++ } else if(delta < (24*60*60)) {
++ return 'about ' + pluralize("hour", parseInt(delta / 3600)) + ' ago';
++ } else {
++ return 'about ' + pluralize("day", parseInt(delta / 86400)) + ' ago';
++ }
++ }
++
++ function build_url() {
++ var proto = ('https:' == document.location.protocol ? 'https:' : 'http:');
++ if (s.list) {
++ return proto+"//api.twitter.com/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?per_page="+s.count+"&callback=?";
++ } else if (s.query == null && s.username.length == 1) {
++ return proto+'//twitter.com/status/user_timeline/'+s.username[0]+'.json?count='+s.count+'&callback=?';
++ } else {
++ var query = (s.query || 'from:'+s.username.join('%20OR%20from:'));
++ return proto+'//search.twitter.com/search.json?&q='+query+'&rpp='+s.count+'&callback=?';
++ }
++ }
++
++ return this.each(function(){
++ var list = $('<ul class="tweet_list">').appendTo(this);
++ var intro = '<p class="tweet_intro">'+s.intro_text+'</p>';
++ var outro = '<p class="tweet_outro">'+s.outro_text+'</p>';
++ var loading = $('<p class="loading">'+s.loading_text+'</p>');
++
++ if(typeof(s.username) == "string"){
++ s.username = [s.username];
++ }
++
++ if (s.loading_text) $(this).append(loading);
++ $.getJSON(build_url(), function(data){
++ if (s.loading_text) loading.remove();
++ if (s.intro_text) list.before(intro);
++ $.each((data.results || data), function(i,item){
++ // auto join text based on verb tense and content
++ if (s.join_text == "auto") {
++ if (item.text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) {
++ var join_text = s.auto_join_text_reply;
++ } else if (item.text.match(/(^\w+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&\?\/.=]+) .*/i)) {
++ var join_text = s.auto_join_text_url;
++ } else if (item.text.match(/^((\w+ed)|just) .*/im)) {
++ var join_text = s.auto_join_text_ed;
++ } else if (item.text.match(/^(\w*ing) .*/i)) {
++ var join_text = s.auto_join_text_ing;
++ } else {
++ var join_text = s.auto_join_text_default;
++ }
++ } else {
++ var join_text = s.join_text;
++ };
++
++ var from_user = item.from_user || item.user.screen_name;
++ var profile_image_url = item.profile_image_url || item.user.profile_image_url;
++ var join_template = '<span class="tweet_join"> '+join_text+' </span>';
++ var join = ((s.join_text) ? join_template : ' ');
++ var avatar_template = '<a class="tweet_avatar" href="http://twitter.com/'+from_user+'"><img src="'+profile_image_url+'" height="'+s.avatar_size+'" width="'+s.avatar_size+'" alt="'+from_user+'\'s avatar" title="'+from_user+'\'s avatar" border="0"/></a>';
++ var avatar = (s.avatar_size ? avatar_template : '');
++ var date = '<a href="http://twitter.com/'+from_user+'/statuses/'+item.id+'" title="view tweet on twitter">'+relative_time(item.created_at)+'</a>';
++ var text = '<span class="tweet_text">' +$([item.text]).linkUrl().linkUser().linkHash().makeHeart().capAwesome().capEpic()[0]+ '</span>';
++
++ // until we create a template option, arrange the items below to alter a tweet's display.
++ list.append('<li>' + avatar + date + join + text + '</li>');
++
++ list.children('li:first').addClass('tweet_first');
++ list.children('li:odd').addClass('tweet_even');
++ list.children('li:even').addClass('tweet_odd');
++ });
++ if (s.outro_text) list.after(outro);
++ });
++
++ });
++ };
++})(jQuery);
+\ No newline at end of file
+diff --git a/doc/source/_static/tweaks.css b/doc/source/_static/tweaks.css
+new file mode 100644
+index 0000000..046ead8
+--- /dev/null
++++ b/doc/source/_static/tweaks.css
+@@ -0,0 +1,218 @@
++ul.todo_list {
++ list-style-type: none;
++ margin: 0;
++ padding: 0;
++}
++
++ul.todo_list li {
++ display: block;
++ margin: 0;
++ padding: 7px 0;
++ border-top: 1px solid #eee;
++}
++
++ul.todo_list li p {
++ display: inline;
++}
++
++ul.todo_list li p.link {
++ font-weight: bold;
++}
++
++ul.todo_list li p.details {
++ font-style: italic;
++}
++
++ul.todo_list li {
++}
++
++div.admonition {
++ border: 1px solid #8F1000;
++}
++
++div.admonition p.admonition-title {
++ background-color: #8F1000;
++ border-bottom: 1px solid #8E8E8E;
++}
++
++a {
++ color: #CF2F19;
++}
++
++div.related ul li a {
++ color: #CF2F19;
++}
++
++div.sphinxsidebar h4 {
++ background-color:#8E8E8E;
++ border:1px solid #255E6E;
++ color:white;
++ font-size:1em;
++ margin:1em 0 0.5em;
++ padding:0.1em 0 0.1em 0.5em;
++}
++
++em {
++ font-style: normal;
++}
++
++table.docutils {
++ font-size: 11px;
++}
++
++.tweet_list li {
++ font-size: 0.9em;
++ border-bottom: 1px solid #eee;
++ padding: 5px 0;
++}
++
++.tweet_list li .tweet_avatar {
++ float: left;
++}
++
++/* ------------------------------------------
++PURE CSS SPEECH BUBBLES
++by Nicolas Gallagher
++- http://nicolasgallagher.com/pure-css-speech-bubbles/
++
++http://nicolasgallagher.com
++http://twitter.com/necolas
++
++Created: 02 March 2010
++Version: 1.1 (21 October 2010)
++
++Dual licensed under MIT and GNU GPLv2 © Nicolas Gallagher
++------------------------------------------ */
++/* THE SPEECH BUBBLE
++------------------------------------------------------------------------------------------------------------------------------- */
++
++/* THE SPEECH BUBBLE
++------------------------------------------------------------------------------------------------------------------------------- */
++
++.triangle-border {
++ position:relative;
++ padding:15px;
++ margin:1em 0 3em;
++ border:5px solid #BC1518;
++ color:#333;
++ background:#fff;
++
++ /* css3 */
++ -moz-border-radius:10px;
++ -webkit-border-radius:10px;
++ border-radius:10px;
++}
++
++/* Variant : for left positioned triangle
++------------------------------------------ */
++
++.triangle-border.left {
++ margin-left:30px;
++}
++
++/* Variant : for right positioned triangle
++------------------------------------------ */
++
++.triangle-border.right {
++ margin-right:30px;
++}
++
++/* THE TRIANGLE
++------------------------------------------------------------------------------------------------------------------------------- */
++
++.triangle-border:before {
++ content:"";
++ display:block; /* reduce the damage in FF3.0 */
++ position:absolute;
++ bottom:-40px; /* value = - border-top-width - border-bottom-width */
++ left:40px; /* controls horizontal position */
++ width:0;
++ height:0;
++ border:20px solid transparent;
++ border-top-color:#BC1518;
++}
++
++/* creates the smaller triangle */
++.triangle-border:after {
++ content:"";
++ display:block; /* reduce the damage in FF3.0 */
++ position:absolute;
++ bottom:-26px; /* value = - border-top-width - border-bottom-width */
++ left:47px; /* value = (:before left) + (:before border-left) - (:after border-left) */
++ width:0;
++ height:0;
++ border:13px solid transparent;
++ border-top-color:#fff;
++}
++
++/* Variant : top
++------------------------------------------ */
++
++/* creates the larger triangle */
++.triangle-border.top:before {
++ top:-40px; /* value = - border-top-width - border-bottom-width */
++ right:40px; /* controls horizontal position */
++ bottom:auto;
++ left:auto;
++ border:20px solid transparent;
++ border-bottom-color:#BC1518;
++}
++
++/* creates the smaller triangle */
++.triangle-border.top:after {
++ top:-26px; /* value = - border-top-width - border-bottom-width */
++ right:47px; /* value = (:before right) + (:before border-right) - (:after border-right) */
++ bottom:auto;
++ left:auto;
++ border:13px solid transparent;
++ border-bottom-color:#fff;
++}
++
++/* Variant : left
++------------------------------------------ */
++
++/* creates the larger triangle */
++.triangle-border.left:before {
++ top:10px; /* controls vertical position */
++ left:-30px; /* value = - border-left-width - border-right-width */
++ bottom:auto;
++ border-width:15px 30px 15px 0;
++ border-style:solid;
++ border-color:transparent #BC1518;
++}
++
++/* creates the smaller triangle */
++.triangle-border.left:after {
++ top:16px; /* value = (:before top) + (:before border-top) - (:after border-top) */
++ left:-21px; /* value = - border-left-width - border-right-width */
++ bottom:auto;
++ border-width:9px 21px 9px 0;
++ border-style:solid;
++ border-color:transparent #fff;
++}
++
++/* Variant : right
++------------------------------------------ */
++
++/* creates the larger triangle */
++.triangle-border.right:before {
++ top:10px; /* controls vertical position */
++ right:-30px; /* value = - border-left-width - border-right-width */
++ bottom:auto;
++ left:auto;
++ border-width:15px 0 15px 30px;
++ border-style:solid;
++ border-color:transparent #BC1518;
++}
++
++/* creates the smaller triangle */
++.triangle-border.right:after {
++ top:16px; /* value = (:before top) + (:before border-top) - (:after border-top) */
++ right:-21px; /* value = - border-left-width - border-right-width */
++ bottom:auto;
++ left:auto;
++ border-width:9px 0 9px 21px;
++ border-style:solid;
++ border-color:transparent #fff;
++}
++
+diff --git a/doc/source/_templates/.gitignore b/doc/source/_templates/.gitignore
+new file mode 100644
+index 0000000..e69de29
+diff --git a/doc/source/_templates/.placeholder b/doc/source/_templates/.placeholder
+new file mode 100644
+index 0000000..e69de29
+diff --git a/doc/source/_theme/layout.html b/doc/source/_theme/layout.html
+new file mode 100644
+index 0000000..f5b388c
+--- /dev/null
++++ b/doc/source/_theme/layout.html
+@@ -0,0 +1,95 @@
++{% extends "sphinxdoc/layout.html" %}
++{% set css_files = css_files + ['_static/tweaks.css'] %}
++{% set script_files = script_files + ['_static/jquery.tweet.js'] %}
++{% block extrahead %}
++ <script type='text/javascript'>
++ $(document).ready(function(){
++ $("#twitter_feed").tweet({
++ username: "openstack",
++ query: "from:openstack",
++ avatar_size: 32,
++ count: 10,
++ loading_text: "loading tweets..."
++ });
++ });
++ </script>
++{% endblock %}
++
++{%- macro sidebar() %}
++ {%- if not embedded %}{% if not theme_nosidebar|tobool %}
++ <div class="sphinxsidebar">
++ <div class="sphinxsidebarwrapper">
++ {%- block sidebarlogo %}
++ {%- if logo %}
++ <p class="logo"><a href="{{ pathto(master_doc) }}">
++ <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
++ </a></p>
++ {%- endif %}
++ {%- endblock %}
++ {%- block sidebartoc %}
++ {%- if display_toc %}
++ <h3><a href="{{ pathto(master_doc) }}">{{ _('Table Of Contents') }}</a></h3>
++ {{ toc }}
++ {%- endif %}
++ {%- endblock %}
++ {%- block sidebarrel %}
++ {%- if prev %}
++ <h4>{{ _('Previous topic') }}</h4>
++ <p class="topless"><a href="{{ prev.link|e }}"
++ title="{{ _('previous chapter') }}">{{ prev.title }}</a></p>
++ {%- endif %}
++ {%- if next %}
++ <h4>{{ _('Next topic') }}</h4>
++ <p class="topless"><a href="{{ next.link|e }}"
++ title="{{ _('next chapter') }}">{{ next.title }}</a></p>
++ {%- endif %}
++ {%- endblock %}
++ {%- block sidebarsourcelink %}
++ {%- if show_source and has_source and sourcename %}
++ <h3>{{ _('This Page') }}</h3>
++ <ul class="this-page-menu">
++ <li><a href="{{ pathto('_sources/' + sourcename, true)|e }}"
++ rel="nofollow">{{ _('Show Source') }}</a></li>
++ </ul>
++ {%- endif %}
++ {%- endblock %}
++ {%- if customsidebar %}
++ {% include customsidebar %}
++ {%- endif %}
++ {%- block sidebarsearch %}
++ {%- if pagename != "search" %}
++ <div id="searchbox" style="display: none">
++ <h3>{{ _('Quick search') }}</h3>
++ <form class="search" action="{{ pathto('search') }}" method="get">
++ <input type="text" name="q" size="18" />
++ <input type="submit" value="{{ _('Go') }}" />
++ <input type="hidden" name="check_keywords" value="yes" />
++ <input type="hidden" name="area" value="default" />
++ </form>
++ <p class="searchtip" style="font-size: 90%">
++ {{ _('Enter search terms or a module, class or function name.') }}
++ </p>
++ </div>
++ <script type="text/javascript">$('#searchbox').show(0);</script>
++
++ <p class="triangle-border right">
++ Psst... hey. You're reading the latest content, but it's for the Block Storage project only. You can read <a href="http://docs.openstack.org">all OpenStack docs</a> too.
++ </p>
++
++ {%- endif %}
++
++ {%- if pagename == "index" %}
++
++
++ <h3>{{ _('Twitter Feed') }}</h3>
++ <div id="twitter_feed" class='twitter_feed'></div>
++ {%- endif %}
++
++
++
++
++ {%- endblock %}
++ </div>
++ </div>
++ {%- endif %}{% endif %}
++{%- endmacro %}
+diff --git a/doc/source/_theme/theme.conf b/doc/source/_theme/theme.conf
+new file mode 100644
+index 0000000..e039fe0
+--- /dev/null
++++ b/doc/source/_theme/theme.conf
+@@ -0,0 +1,5 @@
++[theme]
++inherit = sphinxdoc
++stylesheet = sphinxdoc.css
++pygments_style = friendly
++
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 7a2bf1a..01bd3b4 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -33,9 +33,7 @@ extensions = ['sphinx.ext.autodoc',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.pngmath',
+ 'sphinx.ext.ifconfig',
+- 'sphinx.ext.graphviz',
+- 'oslo.sphinx',
+- ]
++ 'sphinx.ext.graphviz']
+
+ # autodoc generation is a bit aggressive and a nuisance
+ # when doing heavy text edit cycles. Execute "export SPHINX_DEBUG=1"
+@@ -133,8 +131,8 @@ man_pages = [
+
+ # The theme to use for HTML and HTML Help pages. Major themes that come with
+ # Sphinx are currently 'default' and 'sphinxdoc'.
+-# html_theme_path = ["."]
+-# html_theme = '_theme'
++html_theme_path = ["."]
++html_theme = '_theme'
+
+ # Theme options are theme-specific and customize the look and feel of a theme
+ # further. For a list of options available for each theme, see the
+diff --git a/test-requirements.txt b/test-requirements.txt
+index 98a6a67..47ca74d 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -15,4 +15,3 @@ sphinx>=1.1.2
+ python-subunit
+ testtools>=0.9.32
+ testrepository>=0.0.15
+-oslo.sphinx
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 69dd056..7e32256 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -28,6 +28,7 @@ Source20: cinder-sudoers
Patch0001: 0001-Ensure-we-don-t-access-the-net-when-building-docs.patch
Patch0002: 0002-Use-updated-parallel-install-versions-of-epel-packag.patch
Patch0003: 0003-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
+Patch0004: 0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
BuildArch: noarch
BuildRequires: intltool
@@ -136,6 +137,7 @@ This package contains documentation files for cinder.
%patch0001 -p1
%patch0002 -p1
%patch0003 -p1
+%patch0004 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
More information about the scm-commits
mailing list