Applying OpenSubdiv site template to docs.

This commit is contained in:
Susan Salituro 2013-07-18 11:26:54 -07:00
parent 46c385ef1a
commit a6fc3d935b
9 changed files with 1718 additions and 21 deletions

View File

@ -0,0 +1,283 @@
/*
Copyright (C) Pixar. All rights reserved.
This license governs use of the accompanying software. If you
use the software, you accept this license. If you do not accept
the license, do not use the software.
1. Definitions
The terms "reproduce," "reproduction," "derivative works," and
"distribution" have the same meaning here as under U.S.
copyright law. A "contribution" is the original software, or
any additions or changes to the software.
A "contributor" is any person or entity that distributes its
contribution under this license.
"Licensed patents" are a contributor's patent claims that read
directly on its contribution.
2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license,
including the license conditions and limitations in section 3,
each contributor grants you a non-exclusive, worldwide,
royalty-free copyright license to reproduce its contribution,
prepare derivative works of its contribution, and distribute
its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license,
including the license conditions and limitations in section 3,
each contributor grants you a non-exclusive, worldwide,
royalty-free license under its licensed patents to make, have
made, use, sell, offer for sale, import, and/or otherwise
dispose of its contribution in the software or derivative works
of the contribution in the software.
3. Conditions and Limitations
(A) No Trademark License- This license does not grant you
rights to use any contributor's name, logo, or trademarks.
(B) If you bring a patent claim against any contributor over
patents that you claim are infringed by the software, your
patent license from such contributor to the software ends
automatically.
(C) If you distribute any portion of the software, you must
retain all copyright, patent, trademark, and attribution
notices that are present in the software.
(D) If you distribute any portion of the software in source
code form, you may do so only under this license by including a
complete copy of this license with your distribution. If you
distribute any portion of the software in compiled or object
code form, you may only do so under a license that complies
with this license.
(E) The software is licensed "as-is." You bear the risk of
using it. The contributors give no express warranties,
guarantees or conditions. You may have additional consumer
rights under your local laws which this license cannot change.
To the extent permitted under your local laws, the contributors
exclude the implied warranties of merchantability, fitness for
a particular purpose and non-infringement.
*/
/*-------------------------------GENERAL STYLES-------------------------------*/
html, body {
margin:0;
padding:0;
font-family:Arial, Helvetica, Sans-serif;
background:#000;
}
a img {
border:none;
}
a {
text-decoration:none;
color:#999
}
a:hover {
color:#333;
}
a:active {
color:#000;
}
p {
color:#444;
font-family:Helvetica, Arial, sans-serif;
}
#mainNav {
float:right;
}
.twoThird, #twoThird {
width:66%;
float:left;
}
.oneThird, #oneThird {
width:33%;
float:right;
}
.hidden {
display:none;
}
.creatorMainNavActive a {
color:#333
}
.twoColumn {
float: left;
padding: 0 40px 0 0;
text-align: justify;
width: 450px;
}
.threeColumn {
float: left;
padding: 0 15px 0 0;
text-align: justify;
width: 310px;
}
.fourColumn {
float: left;
padding: 0 15px 0 0;
text-align: justify;
width: 230px;
}
.floatLeft {
float:left;
}
.floatRight {
float:right;
}
.clearBoth, .clearFloat {
clear:both;
}
.fullWidth, .fluidWidth {
width:100%;
}
.dateStamp {
font-size: 11px;
padding:0;
font-weight:bold;
color: #AAAAAA;
font-style: italic;
}
.socialLinksInPage {
margin-bottom:10px;
}
#mainSubNavigation ul, ul.creatorFooterNav, #headerSubNav ul, #blogPostPreview ul, #mainSiteNavigation ul, form#userRegistrationForm ul, #blogEntriesForSection ul, #galleryEntriesForSection ul {
list-style-type:none;
margin:0;
padding:0;
}
.breadcrumbs {
font-size: 10px;
padding: 10px 0 0;
text-align: right;
}
.center {
width:980px;
display:none;
margin:0 auto;
}
.logo {
float: left;
padding: 10px;
}
.adSidebar {
float:left;
margin:10px 0;
}
.sidebarLeft {
width:300px;
float:left;
}
.sidebarRight {
width:300px;
float:right;
}
.articleTextLeft {
width:640px;
padding:0 0 20px 20px;
float:left;
border-left: 1px solid #EEEEEE;
}
.articleTextRight {
width:640px;
padding:0 20px 20px 0;
float:left;
border-right:1px solid #ddd;
}
h2.commentHeading {
border-top:1px solid #ddd;
padding-top:20px;
}
/*-------------------------------BLOG STYLES-------------------------------*/
.blogPostSynopsis {
border-bottom: 1px solid #DDDDDD;
float: left;
margin-bottom: 20px;
padding-bottom: 50px;
}
.blogPostSynopsis h2 {
font-size: 21px;
margin: 0;
}
.blog .articleTextLeft {
border-left: 1px solid #EEEEEE;
float: left;
margin-left: 15px;
padding: 0 0 20px 20px;
width: 640px;
}
.blog .articleRightLeft {
border-right: 1px solid #EEEEEE;
float: left;
margin-right: 15px;
padding: 0 0 20px 20px;
width: 640px;
}
/*-------------------------------FOOTER STYLES-------------------------------*/
.footerColor p {
margin:0;
padding:0;
}
.footerColumn, #footerRight {
background:#ddd;
float:left;
}
ul.creatorFooterNav {
border-top:1px solid #686868;
margin-top:20px;
}
ul.creatorFooterNav li a {
float: left;
padding: 10px 25px 10px 0;
}
/*-------------------------------COLOR STYLES-------------------------------*/
.headerColor {
border-bottom: 1px solid #EEEEEE;
float: left;
}
.subHeaderColor {
border-bottom: 1px solid #EEEEEE;
float: left;
}
.footerColor {
float: left;
background:#000;
margin-top: 20px;
}
#flavorLogo {
float:left;
width:300px;
height:100px;
}
/*-------------------------------NAVIGATION STYLES-------------------------------*/
#mainSiteNavigation {
float:right;
}
#mainSiteNavigation li {
float: left;
padding: 10px;
}
#headerSubNav {
float:right;
}
#headerSubNav li {
float: left;
font-size: 13px;
padding: 10px;
}
#headerSubNav li a.active {
color:#222;
}
#mainSubNavigation {
font-family:'Oswald', Arial, Helvetica, sans-serif;
padding:20px;
}
#mainSubNavigation ul li {
line-height: 30px;
}
#mainSubNavigation li.navbarLabel {
font-size: 18px;
font-weight: bold;
margin: 20px 0 5px;
}

1097
documentation/css/flavor.css Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,138 @@
/*
Copyright (C) Pixar. All rights reserved.
This license governs use of the accompanying software. If you
use the software, you accept this license. If you do not accept
the license, do not use the software.
1. Definitions
The terms "reproduce," "reproduction," "derivative works," and
"distribution" have the same meaning here as under U.S.
copyright law. A "contribution" is the original software, or
any additions or changes to the software.
A "contributor" is any person or entity that distributes its
contribution under this license.
"Licensed patents" are a contributor's patent claims that read
directly on its contribution.
2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license,
including the license conditions and limitations in section 3,
each contributor grants you a non-exclusive, worldwide,
royalty-free copyright license to reproduce its contribution,
prepare derivative works of its contribution, and distribute
its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license,
including the license conditions and limitations in section 3,
each contributor grants you a non-exclusive, worldwide,
royalty-free license under its licensed patents to make, have
made, use, sell, offer for sale, import, and/or otherwise
dispose of its contribution in the software or derivative works
of the contribution in the software.
3. Conditions and Limitations
(A) No Trademark License- This license does not grant you
rights to use any contributor's name, logo, or trademarks.
(B) If you bring a patent claim against any contributor over
patents that you claim are infringed by the software, your
patent license from such contributor to the software ends
automatically.
(C) If you distribute any portion of the software, you must
retain all copyright, patent, trademark, and attribution
notices that are present in the software.
(D) If you distribute any portion of the software in source
code form, you may do so only under this license by including a
complete copy of this license with your distribution. If you
distribute any portion of the software in compiled or object
code form, you may only do so under a license that complies
with this license.
(E) The software is licensed "as-is." You bear the risk of
using it. The contributors give no express warranties,
guarantees or conditions. You may have additional consumer
rights under your local laws which this license cannot change.
To the extent permitted under your local laws, the contributors
exclude the implied warranties of merchantability, fitness for
a particular purpose and non-infringement.
*/
.coursewareBackground {
background: #efefef;
float: left;
margin: 0 25px 25px;
padding: 30px 50px;
width: 796px;
color: #333;
font-size: 13px!important;
}
.coursewareBackground hr {
display:none;
}
.coursewareBackground img {
margin-bottom:20px;
max-width: 776px;
}
.coursewareBackground strong, .coursewareBackground p, .coursewareBackground h1, .coursewareBackground h2, .coursewareBackground h3, .coursewareBackground h4, .coursewareBackground h5, .coursewareBackground h6, .coursewareBackground li, .coursewareBackground li a {
color:#333;
}
.coursewareBackground a {
color:#000;
text-decoration:underline;
}
.coursewareBackground a:hover {
color: #CC9900!important;
}
.coursewareBackground pre, .coursewareBackground code {
background:#ddd;
}
.coursewareBackground ul li {
padding-left: 6px!important;
list-style-type:square!important;
}
.coursewareBackground h1, .coursewareBackground h2, .coursewareBackground h1 a, .coursewareBackground h2 a {
padding-bottom:10px;
margin-bottom:10px!important;
clear: left;
border-bottom:1px solid #ccc;
text-decoration:none;
}
.coursewareBackground div.note {
margin-left: 15px;
margin-right: 15px;
padding:10px 5px 10px 5px;
clear: left;
border:1px solid #333;
background: #ccc;
}
.imageLeft {
float:left;
padding:0 10px 10px 0;
margin:0 10px 10px 0;
}
#mainContentContainer p {
font-family:Arial, Helvetica, sans-serif!important;
color:#333!important;
}
#mainContentContainer .entranceList p {
color: #aaa!important;
}
#mainContentContainer .entranceList h3 {
color: #FFCC03;
}
#mainContentContainer a:hover {
color: #FFCC03;
}
h1.articleContentTitle {
width:620px!important;
}
#mainContentContainer ul li {
color:#333;
font-weight:normal;
}
#mainContentContainer ol li {
color: #333!important;
font-weight: normal;
font-family: arial, sans-serif;
font-size: 13px!important;
}
ol img {
margin-left:-28px;
}

View File

@ -56,7 +56,7 @@
*/
/*Pixar Code Styles
/*Code Styles
________________________*/
@ -526,13 +526,14 @@ div.navigation a:hover {
div.document {
background: rgb(240,240,240);
margin-top: 5px;
/*
margin-left: 255px;
margin-top: 5px;
padding-top: 15px;
padding-left: 15px;
padding-right: 15px;
padding-bottom: 15px;
*/
border-top-left-radius: 15px;
-moz-border-top-left-radius: 15px;
@ -555,7 +556,7 @@ div.document a:hover {
}
div.footer {
background: rgb(240,240,240);
/* background: #FFF;*/
margin-left: 255px;
padding-top: 15px;
padding-left: 5px;

View File

@ -57,11 +57,6 @@
<div class="navigation">
<br>
<div>
<a href="intro.html"><img src="images/opensubdiv_logo_header.png" width=150 align="right" hspace=10></a>
<br style="clear:both" />
</div>
<hr>
<div class="searchBar">
<form action="search.html">
<input type="text" name="q" id="searchInput" />
@ -70,12 +65,10 @@
</div>
<div class="quickLinks">
<ul>
<hr>
<li><a href="intro.html">Introduction</a></li>
<li><a href="getting_started.html">Getting Started</a></li>
<li><a href="cmake_build.html">Building OpenSubdiv</a></li>
<li><a href="code_examples.html">Code Examples</a></li>
<hr>
<li><a href="subdivision_surfaces.html">Subdivision Surfaces</a>
<ul>
<li><a href="subdivision_surfaces.html#introduction">Introduction</a></li>
@ -84,7 +77,6 @@
<li><a href="subdivision_surfaces.html#hierarchical-edits">Hierarchical Edits</a></li>
</ul>
</li>
<hr>
<li><a href="api_overview.html">APIs Overview</a>
<ul>
<li><a href="api_overview.html#architecture">Architecture</a></li>
@ -93,7 +85,6 @@
<li><a href="api_overview.html#opensubdiv-osd">Osd</a></li>
</ul>
</li>
<hr>
<li><a href="using_osd.html">Using OpenSubdiv</a>
<ul>
<li><a href="using_osd_compile.html#compiling-linking">Compiling & Linking</a></li>
@ -103,12 +94,9 @@
<li><a href="using_osd.html">Primitive Batching</a></li>
</ul>
</li>
<hr>
<li><a href="release_notes.html">Release Notes</a>
<hr>
<li><a href="doxy_html/index.html" target="_blank">Doxygen</a></li>
</ul>
</div>
<hr>
<br>
</div>

View File

@ -109,6 +109,7 @@ class HtmlToTextParser(HTMLParser.HTMLParser):
def GetTitle(self):
return self.m_title
#-------------------------------------------------------------------------------
def StripHTMLComments(data):
regex = re.compile('\<![ \r\n\t]*(--([^\-]|[\r\n]|-[^\-])*--[ \r\n\t]*)\>')
@ -210,9 +211,15 @@ for root, dirs, files in os.walk(rootDir):
msg += "added navigation"
f.seek(0)
f.write(html)
f.close()
# replace the article title placeholder with the real title
if title:
html = string.replace(html,"OSD_ARTICLE_TITLE", title)
else:
html = string.replace(html,"OSD_ARTICLE_TITLE", "")
f.seek(0)
f.write(html)
f.close()
print msg

View File

@ -2,8 +2,100 @@
%(head)s
<link rel="icon" type="image/png" href="images/icon.png">
%(stylesheet)s
<link rel="stylesheet" href="css/default.css" type="text/css" />
<link rel="stylesheet" href="css/flavor.css" type="text/css" />
<link rel="stylesheet" href="css/renderman-university.css" type="text/css" />
<style>
#mainContentContainer {
left: 15px;
margin-left: 255px;
}
ul.creatorFooterNav {
margin-left: 100px;
}
.navigation {
background-color: #333333;
margin-top: 10px;
margin-left: 10px;
}
</style>
%(body_prefix)s
%(body_pre_docinfo)s
%(docinfo)s
<div id="mainContentContainer">
<div class="fullWidth headerColor">
<div class="center">
<div id="mainSiteNavigation">
<div class="homeRenderManLink">
<a href="index.html"><img alt="OpenSubdiv Logo" src="images/opensubdiv_logo_header.png"></a>
</div>
<!-- TOP NAVIGATION MENU -->
<ul class="creatorMainNav floatRight" id="menu">
<li class="" id="navbarId-23704">
<a href="intro.html">User Docs</a>
</li>
<li class="" id="navbarId-23887">
<a href="doxy_html/index.html">API Docs</a>
</li>
<li class="" id="navbarId-23703">
<a href="http://graphics.pixar.com/opensubdiv/forum.html">Forum</a>
</li>
<li class="" id="navbarId-23944">
<a href="release_notes.html">Release Notes</a>
</li>
</ul>
</div><!-- close mainSiteNavigation -->
</div><!-- close center -->
</div><!-- close fullWidth -->
<div class="clearBoth"></div>
<h1 class="articleContentTitle">OSD_ARTICLE_TITLE</h1>
<div class="clearBoth"></div>
<hr>
<div class="clearBoth"></div>
<div class="coursewareBackground">
<!-- <div class="topicLeftData-IntroPara"></div> -->
<div class="topicLeftData-MainData">
%(body)s
%(body_suffix)s
</div><!-- close topicLeftData-MainData -->
</div><!-- close coursewareBackground -->
</div> <!-- close mainContentContainer -->
</div> <!-- close center -->
<div class="clearBoth"></div>
<div class="center">
<div class="copyrightFooter">
</div>
<!-- BOTTOM NAVIGATION MENU -->
<ul class="creatorFooterNav">
<li class="" id="navbarId-23704">
<a href="intro.html">User Docs</a>
</li>
<li class="" id="navbarId-23887">
<a href="doxy_html/index.html">API Docs</a>
</li>
<li class="" id="navbarId-23703">
<a href="http://graphics.pixar.com/opensubdiv/forum.html">Forum</a>
</li>
<li class="" id="navbarId-23944">
<a href="release_notes.html">Release Notes</a>
</li>
</ul><!-- end bottom navigation menu -->
<div class="clearBoth"></div>

View File

@ -66,9 +66,69 @@
<script type="text/javascript" src="tipuesearch/tipuesearch_content.js"></script>
<link rel="stylesheet" href="css/rst.css" type="text/css" />
<link rel="stylesheet" type="text/css" href="tipuesearch/tipuesearch.css">
<link rel="stylesheet" href="css/default.css" type="text/css" />
<link rel="stylesheet" href="css/flavor.css" type="text/css" />
<link rel="stylesheet" href="css/renderman-university.css" type="text/css" />
<style>
#mainContentContainer {
left: 15px;
margin-left: 255px;
}
ul.creatorFooterNav {
margin-left: 100px;
}
.navigation {
background-color: #333333;
margin-top: 10px;
margin-left: 10px;
}
</style>
</head>
<body>
<div id="mainContentContainer">
<div class="fullWidth headerColor">
<div class="center">
<div id="mainSiteNavigation">
<div class="homeRenderManLink">
<a href="index.html"><img alt="OpenSubdiv Logo" src="images/opensubdiv_logo_header.png"></a>
</div>
<!-- TOP NAVIGATION MENU -->
<ul class="creatorMainNav floatRight" id="menu">
<li class="" id="navbarId-23704">
<a href="intro.html">User Docs</a>
</li>
<li class="" id="navbarId-23887">
<a href="doxy_html/index.html">API Docs</a>
</li>
<li class="" id="navbarId-23703">
<a href="http://graphics.pixar.com/opensubdiv/forum.html">Forum</a>
</li>
<li class="" id="navbarId-23944">
<a href="release_notes.html">Release Notes</a>
</li>
</ul>
</div><!-- close mainSiteNavigation -->
</div><!-- close center -->
</div><!-- close fullWidth -->
<div class="clearBoth"></div>
<h1 class="articleContentTitle">Search Results</h1>
<div class="clearBoth"></div>
<hr>
<div class="clearBoth"></div>
<div class="coursewareBackground">
<!-- <div class="topicLeftData-IntroPara"></div> -->
<div class="topicLeftData-MainData">
<!--
<span>
<input type="text" id="tipue_search_input">
@ -88,6 +148,37 @@
<script> $(document).ready(function() { $('#tipue_search_input').tipuesearch({ 'show': 6 }); }); </script>
</div>
</div>
</div><!-- close topicLeftData-MainData -->
</div><!-- close coursewareBackground -->
</div> <!-- close mainContentContainer -->
</div> <!-- close center -->
<div class="clearBoth"></div>
<div class="center">
<div class="copyrightFooter">
</div>
<!-- BOTTOM NAVIGATION MENU -->
<ul class="creatorFooterNav">
<li class="" id="navbarId-23704">
<a href="intro.html">User Docs</a>
</li>
<li class="" id="navbarId-23887">
<a href="doxy_html/index.html">API Docs</a>
</li>
<li class="" id="navbarId-23703">
<a href="http://graphics.pixar.com/opensubdiv/forum.html">Forum</a>
</li>
<li class="" id="navbarId-23944">
<a href="release_notes.html">Release Notes</a>
</li>
</ul><!-- end bottom navigation menu -->
<div class="clearBoth"></div>
</body>
</html>

View File

@ -115,9 +115,9 @@ http://www.tipue.com/search
}
div.search_result {
background: #FFF;
/* background: #FFF;*/
margin-top: 5px;
margin-left: 255px;
/* margin-left: 255px;*/
padding-top: 15px;
padding-left: 15px;