incubator-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r1011334 - in /websites/staging/incubator/trunk/content: ./ guides/website.html report-next-month.html sitemap.html
Date Sat, 29 Apr 2017 01:27:43 GMT
Author: buildbot
Date: Sat Apr 29 01:27:43 2017
New Revision: 1011334

Log:
Staging update by buildbot for incubator

Modified:
    websites/staging/incubator/trunk/content/   (props changed)
    websites/staging/incubator/trunk/content/guides/website.html
    websites/staging/incubator/trunk/content/report-next-month.html
    websites/staging/incubator/trunk/content/sitemap.html

Propchange: websites/staging/incubator/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Sat Apr 29 01:27:43 2017
@@ -1 +1 @@
-1793156
+1793161

Modified: websites/staging/incubator/trunk/content/guides/website.html
==============================================================================
--- websites/staging/incubator/trunk/content/guides/website.html (original)
+++ websites/staging/incubator/trunk/content/guides/website.html Sat Apr 29 01:27:43 2017
@@ -111,20 +111,13 @@
 <p>
                 This means that you can edit the content either directly in svn
                 (and use ant to generate and check the results), or edit via the
-                CMS interface, but final publishing has to be done via the CMS
-                (see below for how).
+                CMS browser interface, and preview the result in your browser.  
+                In either case, you make changes in your private workspace, then
+               commit those changes, then final publishing has to be done via the CMS
+                (see below for how).  Each of these is a separate step.
             </p>
-<p>The source to the Incubator website lives at:</p>
-<div class="note">
-<note><a href="https://svn.apache.org/repos/asf/incubator/public/trunk">
-                https://svn.apache.org/repos/asf/incubator/public/trunk</a></note>
 </div>
-<p>The incubator website is built using <a href="https://cms.apache.org">CMS</a>.
 After changes are made,
-                you must publish the website.</p>
-</div>
-        <h2 id='Edit+the+content'><img src="../images/redarrow.gif" />Edit the
content</h2>
-<div class="section-content">
-<h3 id='Help+Wanted'>Help Wanted!</h3>
+        <h2 id='Help+Wanted'><img src="../images/redarrow.gif" />Help Wanted!</h2>
 <div class="section-content">
 <p>
                     People with commit access to the "incubator" SVN can edit the source
@@ -139,6 +132,77 @@
                     Anyone else can send patches to those documents to the INCUBATOR issue
tracker.
                 </p>
 </div>
+        <h2 id='Edit+the+content+in+CMS'><img src="../images/redarrow.gif" />Edit
the content in CMS</h2>
+<div class="section-content">
+<p>The CMS has a useful browser-based editor, that avoids the need to move between
editor and SVN.
+            All steps in the process (Edit or Create, Commit, Build, Publish) can be done
in the browser.</p>
+<ol>
+              <li>Before you start, make sure you have this javascript link bookmarked
in your browser:
+                <a href="javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))">ASF
CMS</a>.
+                It will help move you to the correct location in the Content Management System
for a given page. </li>
+              <li>Navigate to the existing publicly viewable page you wish to edit.
 While viewing it, click or select 
+                the ASF CMS bookmark.  The CMS will create a private workspace for you, and
place you in that workspace
+                at the necessary location to work on a copy of the target page.
+                <ul>
+                  <li>If you are editing an Incubator Status page for your podling
project, you will see the HTML raw text for that 
+                    page, in an editing window.  Such pages are typically located in the
SVN path 
+                    .../trunk/content/projects/PROJECTNAME.xml , which you can see in the
upper right corner of the browser.</li>
+                  <li>If you are attempting to edit the top-level Incubator Welcome
page at <a href="http://incubator.apache.org/">
+                    http://incubator.apache.org/</a> you will enter a directory data
structure that is more confusing, because the
+                    Incubator pages are table-generated rather than being simple HTML text.
 This directory is .../trunk/content/ in SVN,
+                    and has both subdirectories and content files.  To add or edit the info
about your podling, click
+                    on the "podlings.xml" link, which contains the XML specs for all the
podlings referenced from the Incubator
+                    pages.</li>
+                </ul>
+              </li>
+              <li>Alternatively, if you need to add a new page, go to the top-level
Incubator Welcome page at <a href="http://incubator.apache.org/">
+                    http://incubator.apache.org/</a> and click or select the ASF CMS
bookmark.  You will enter the CMS directory
+                 structure at SVN path .../trunk/content/ as described above.  Now navigate
to where you need to add the
+                new page.  For instance to add a new podling's Incubator Status page, click
on "projects/" to enter path
+                .../trunk/content/projects/ , where each podling has a PROJECTNAME.xml file.</li>
+              <li> Now, before you try to add or edit anything, UPDATE THE WORKSPACE
YOU ARE LOOKING AT.  
+                <note>The CMS will routinely 
+                show you a workspace that may be months out of date.  If your podling already
exists, you may not be able to
+                see it.  You also may not see edits done by others in the meantime.  You
must update, by clicking the "[Update]" link 
+                in the top left corner of the CMS page.  After it updates, you should see
content corresponding to the current public
+                  web site.</note>
+              </li>
+              <li>Now you are ready to edit.  
+                <ul>
+                  <li>If you are looking at the file you wish to edit, you can go ahead
and make changes.</li>
+                  <li>If you are looking at a directory, and want to edit a file, navigate
to that file.</li>
+                  <li>If you need to add a file, but you're looking at a different
file, move up to the directory structure by using the 
+                    path links in the top right corner of the CMS page.</li>
+                  <li>If you are looking at a directory and need to add a file, navigate
to the correct location in the directory tree
+                   then 
+                    <ol>
+                      <li>In the top left corner, either "Edit this Directory" or "Add
New File or Directory:" should be present.</li>
+                      <li>If "Edit this Directory" is present, click it, and "Add New
File or Directory:" should appear.</li>
+                      <li>Place your cursor in the "Add New File or Directory:" field,
type the relative path of the file you want to 
+                        add, and press the Return key.</li>
+                    </ol>
+                  </li>
+                </ul>
+              </li>
+              <li>You have to commit and build your changes before you can preview
them in a Staging area.  (Don't worry, Staging is still
+                 before Publish.)  At the bottom of the screen,
+                enter text in the Log Message field, click the checkbox for "Quick Commit",
and then click "Submit".  (If you don't choose
+                "Quick Commit" it will let you do a diff and more edits before committing.)</li>
+              <li>Once you commit, it sends you to a monitoring page.  You can monitor
the build if you wish in the "[Follow Staging Build] page.
+                When it completes, go back to the monitoring page.  If the build passed,
click "[Staged]" to preview your work.  Then go back
+                again to the monitoring page.</li>
+              <li>If you need to make more changes, press "[Edit]" to continue editing
your workspace.</li>
+              <li>When the Staged work is complete and satisfactory, press "[Publish
Site]" to make it public.  In a few seconds you can view it
+                by clicking "[Production]" or simply browsing to the public URL and refreshing
your browser cache.</li> 
+            </ol>
+</div>
+        <h2 id='Edit+the+content+in+SVN'><img src="../images/redarrow.gif" />Edit
the content in SVN</h2>
+<div class="section-content">
+<p>The source to the Incubator website lives at:</p>
+<div class="note">
+<note><a href="https://svn.apache.org/repos/asf/incubator/public/trunk">
+                https://svn.apache.org/repos/asf/incubator/public/trunk</a></note>
+</div>
 <h3 id='Checkout+the+Incubator+SVN'>Checkout the Incubator SVN site</h3>
 <div class="section-content">
 <code>

Modified: websites/staging/incubator/trunk/content/report-next-month.html
==============================================================================
--- websites/staging/incubator/trunk/content/report-next-month.html (original)
+++ websites/staging/incubator/trunk/content/report-next-month.html Sat Apr 29 01:27:43 2017
@@ -67,7 +67,7 @@
 <h1>
 <a href="http://incubator.apache.org">Apache Incubator</a> Podlings needing to
prepare report for May</h1>
 <div style="text-align:right;">
-<i>Generated on 2017-04-28T23:43:18Z</i>
+<i>Generated on 2017-04-29T01:27:13Z</i>
 </div>
 <nav>
 <ul>

Modified: websites/staging/incubator/trunk/content/sitemap.html
==============================================================================
--- websites/staging/incubator/trunk/content/sitemap.html (original)
+++ websites/staging/incubator/trunk/content/sitemap.html Sat Apr 29 01:27:43 2017
@@ -1311,12 +1311,15 @@ Site map of <a href="http://incubator.ap
 <a href="guides/website.html#Overview+of+the+Incubator+site">Overview of the Incubator
site</a>
 </li>
 <li>
-<a href="guides/website.html#Edit+the+content">Edit the content</a>
-<ul>
-<li>
 <a href="guides/website.html#Help+Wanted">Help Wanted!</a>
 </li>
 <li>
+<a href="guides/website.html#Edit+the+content+in+CMS">Edit the content in CMS</a>
+</li>
+<li>
+<a href="guides/website.html#Edit+the+content+in+SVN">Edit the content in SVN</a>
+<ul>
+<li>
 <a href="guides/website.html#Checkout+the+Incubator+SVN">Checkout the Incubator SVN
site</a>
 </li>
 <li>



---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@incubator.apache.org
For additional commands, e-mail: cvs-help@incubator.apache.org


Mime
View raw message