incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject svn commit: r795826 - in /websites/production/openofficeorg: ./ content/openofficeorg/people.html content/openofficeorg/website-local.html
Date Fri, 16 Sep 2011 01:18:51 GMT
Author: wave
Date: Fri Sep 16 01:18:50 2011
New Revision: 795826

Log:
Adjustments. Changed the names of the two Confluence Wikis. Slight fixes to people.mdtext.
Update website-local.mdtext for the two different sites.

Modified:
    websites/production/openofficeorg/   (props changed)
    websites/production/openofficeorg/content/openofficeorg/people.html
    websites/production/openofficeorg/content/openofficeorg/website-local.html

Propchange: websites/production/openofficeorg/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 16 01:18:50 2011
@@ -1 +1 @@
-/websites/staging/openofficeorg/trunk:791146-795821
+/websites/staging/openofficeorg/trunk:791146-795825

Modified: websites/production/openofficeorg/content/openofficeorg/people.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/people.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/people.html Fri Sep 16 01:18:50
2011
@@ -91,12 +91,6 @@ to look at all contributors to our issue
 </thead>
 <tbody>
 <tr>
-<td>&nbsp;</td>
-<td>Kay Schenk</td>
-<td>Chico, CA, USA</td>
-<td>HTML, CSS, Javascript, Java, Perl, general technical writing</td>
-</tr>
-<tr>
 <td>arist</td>
 <td>Andrew Rist</td>
 <td>Menlo Park, CA, USA</td>
@@ -217,6 +211,12 @@ to look at all contributors to our issue
 <td>Japanese, Translation, Marketing, User Support</td>
 </tr>
 <tr>
+<td>kschenk</td>
+<td>Kay Schenk</td>
+<td>Chico, CA, USA</td>
+<td>HTML, CSS, Javascript, Java, Perl, general technical writing</td>
+</tr>
+<tr>
 <td>leiw</td>
 <td>Wang Lei</td>
 <td>BeiJing,China</td>
@@ -284,7 +284,7 @@ to look at all contributors to our issue
 </tr>
 <tr>
 <td>wolfhalton</td>
-<td>[Wolf Halton] (http://wolfhalton.info/)</td>
+<td><a href="http://wolfhalton.info/">Wolf Halton</a></td>
 <td>Atlanta, GA, USA</td>
 <td>Security, Documentation, Website, HTML, PHP, Python</td>
 </tr>

Modified: websites/production/openofficeorg/content/openofficeorg/website-local.html
==============================================================================
--- websites/production/openofficeorg/content/openofficeorg/website-local.html (original)
+++ websites/production/openofficeorg/content/openofficeorg/website-local.html Fri Sep 16
01:18:50 2011
@@ -89,22 +89,29 @@ repository</a> in your web browser.</p>
 <li><a href="#submitting_your_results">Submitting Your Results</a> - How
to contribute your edits.</li>
 </ul>
 <h2 id="setup">Setup</h2>
-<h3 id="create_a_directory_on_your_computer">Create a directory on your computer.</h3>
-<div class="codehilite"><pre><span class="nb">mkdir</span> <span
class="n">ooo</span><span class="o">-</span><span class="n">site</span>
-<span class="n">cd</span> <span class="n">ooo</span><span class="o">-</span><span
class="n">site</span>
+<h3 id="create_a_directory_on_your_computer_for_the_apache_cms_work_with_both_the_podlings">Create
a directory on your computer for the Apache CMS work with both the podling's</h3>
+<p>incubator site and the migrating openoffice.org website.</p>
+<div class="codehilite"><pre><span class="nb">mkdir</span> <span
class="n">ooo</span><span class="o">-</span><span class="n">web</span>
+<span class="n">cd</span> <span class="n">ooo</span><span class="o">-</span><span
class="n">web</span>
 </pre></div>
 
 
-<h3 id="download_the_svn_repos_for_the_ooo_site">Download the svn repos for the OOo
site.</h3>
+<h3 id="download_the_svn_repos_for_the_aooo_site">Download the svn repos for the AOOo
site.</h3>
 <div class="codehilite"><pre><span class="n">svn</span> <span
class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span
class="n">asf</span><span class="sr">/incubator/ooo/site/</span><span
class="n">trunk</span> <span class="n">site</span>
 </pre></div>
 
 
+<h3 id="download_the_svn_repos_for_the_openofficeorg_migration_website">Download the
svn repos for the OpenOffice.org migration website.</h3>
+<div class="codehilite"><pre><span class="n">svn</span> <span
class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/repos/</span><span
class="n">asf</span><span class="sr">/incubator/ooo/ooo-site/</span><span
class="n">trunk</span> <span class="n">ooo</span><span class="o">-</span><span
class="n">site</span>
+</pre></div>
+
+
 <h3 id="download_the_svn_repos_for_the_apache_cms">Download the svn repos for the Apache
CMS.</h3>
 <div class="codehilite"><pre><span class="n">svn</span> <span
class="n">co</span> <span class="n">https:</span><span class="sr">//s</span><span
class="n">vn</span><span class="o">.</span><span class="n">apache</span><span
class="o">.</span><span class="n">org</span><span class="sr">/repos/i</span><span
class="n">nfra</span><span class="sr">/websites/cms</span><span class="o">/</span>
<span class="n">cms</span>
 </pre></div>
 
 
+<p>You will have three sub-directories in your local website directory - <code>site</code>,
<code>ooo-site</code>, and <code>cms</code>.</p>
 <h3 id="install_python_dependencies">Install Python dependencies.</h3>
 <p>Adapted from the <a href="http://www.apache.org/dev/cmsref.html#local-build">Apache
CMS Reference</a></p>
 <p>The easiest way to install the dependencies is to use Python setuptools.</p>
@@ -122,16 +129,18 @@ repository</a> in your web browser.</p>
 
 
 <h2 id="directory_layout">Directory Layout</h2>
-<h4 id="content_directory">Content directory</h4>
-<p>The <code>site/content/openofficeorg</code> directory contains web content
- markdown, html, javascript, css, images and other files. Files that do not fit recognized
patterns from <code>site/lib/path.pm</code> are copied as is to the web site during
the build.</p>
+<h4 id="content_directories">Content directories</h4>
+<p>The <code>site/content/openofficeorg</code> and <code>ooo-site/content/</code>
directories contain web content - markdown, html, javascript, css, images and other files.
Files that do not fit recognized patterns from <code>site/lib/path.pm</code> or
<code>ooo-site/lib/path.pm</code> are copied as is to the web site during the
build.</p>
 <h4 id="templates_directory">Templates directory</h4>
-<p>The <code>site/templates</code> directory contains the html skeletons
used during the site build.</p>
+<p>The <code>site/templates</code> and <code>ooo-site/templates</code>
directories contain the html skeletons used during the site build.</p>
 <ul>
 <li><code>skeleton.html</code> - our current html page template.</li>
 <li><code>sidenav.mdtext</code> - markdown of the side navigation panel.</li>
+<li><code>html_page.html</code> - wrapping for html pages.</li>
+<li><code>single_narrative.html</code> - extends skeleton.html.</li>
 </ul>
 <h4 id="lib_directory">Lib directory</h4>
-<p>The <code>site/lib</code> directory contains two python modules that
determine how content files are processed during the site build.</p>
+<p>The <code>site/lib</code> and <code>ooo-site/lib</code>
directories contain two python modules that determine how content files are processed during
the site build.</p>
 <ul>
 <li><code>path.pm</code> - maps file patterns like <code>.mdtext</code>
into the view building routines. We can expand to cover other patterns.</li>
 <li><code>view.pm</code> - a set of python subroutines for converting content
into web pages.</li>
@@ -150,22 +159,23 @@ repository</a> in your web browser.</p>
 <h3 id="python_markdown_daemon">Python Markdown Daemon</h3>
 <p>Start the Python Markdown daemon.</p>
 <div class="codehilite"><pre><span class="n">export</span> <span
class="n">MARKDOWN_SOCKET</span><span class="o">=</span><span class="sb">`pwd`</span><span
class="o">/</span><span class="n">markdown</span><span class="o">.</span><span
class="nb">socket</span> <span class="n">PYTHONPATH</span><span class="o">=</span><span
class="sb">`pwd`</span>
-<span class="n">python</span> <span class="n">markdownd</span><span
class="o">.</span><span class="n">py</span>
+<span class="n">python</span> <span class="n">cms</span><span
class="sr">/build/m</span><span class="n">arkdownd</span><span class="o">.</span><span
class="n">py</span>
 </pre></div>
 
 
-<h3 id="build_the_site">Build the site.</h3>
+<h3 id="build_the_sites">Build the sites.</h3>
 <div class="codehilite"><pre><span class="n">cms</span><span class="sr">/build/</span><span
class="n">build_site</span><span class="o">.</span><span class="n">pl</span>
<span class="o">--</span><span class="n">source</span><span class="o">-</span><span
class="n">base</span> <span class="n">site</span> <span class="o">--</span><span
class="n">target</span><span class="o">-</span><span class="n">base</span>
<span class="n">www</span>
+<span class="n">cms</span><span class="sr">/build/</span><span
class="n">build_site</span><span class="o">.</span><span class="n">pl</span>
<span class="o">--</span><span class="n">source</span><span class="o">-</span><span
class="n">base</span> <span class="n">ooo</span><span class="o">-</span><span
class="n">site</span> <span class="o">--</span><span class="n">target</span><span
class="o">-</span><span class="n">base</span> <span class="n">www</span>
 </pre></div>
 
 
 <h3 id="copy_the_site_to_your_computers_web_server">Copy the site to your computer's
web server.</h3>
 <p>On my Mac:</p>
-<div class="codehilite"><pre><span class="n">sudo</span> <span
class="n">scp</span> <span class="o">-</span><span class="n">rp</span>
<span class="n">www</span><span class="sr">/content/o</span><span
class="n">penofficeorg</span> <span class="sr">/Library/</span><span
class="n">WebServer</span><span class="sr">/Documents/</span><span
class="o">.</span>
+<div class="codehilite"><pre><span class="n">sudo</span> <span
class="n">scp</span> <span class="o">-</span><span class="n">rp</span>
<span class="n">www</span><span class="sr">/content /</span><span
class="n">Library</span><span class="sr">/WebServer/</span><span class="n">Documents</span><span
class="o">/.</span>
 </pre></div>
 
 
-<p>The site is then available with <a href="http://localhost/openofficeorg">http://localhost/openofficeorg/</a>.</p>
+<p>The site is then available with <a href="http://localhost/openofficeorg">http://localhost/openofficeorg/</a>
or <a href="http://localhost/">http://localhost/</a></p>
 <h2 id="submitting_your_results">Submitting your results.</h2>
 <h3 id="committer">Committer</h3>
 <p>Do the appropriate combination of svn status, svn add, and svn commits. Commits
will cause staging rebuilds.



Mime
View raw message