climate-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject svn commit: r1491203 - in /incubator/climate/site/trunk: content/development/ content/development/edit-website.mdtext content/development/license.mdtext content/development/source.mdtext content/license.mdtext content/source.mdtext templates/skeleton.html
Date Sun, 09 Jun 2013 12:37:27 GMT
Author: smarru
Date: Sun Jun  9 12:37:27 2013
New Revision: 1491203

URL: http://svn.apache.org/r1491203
Log:
adding instructions to edit website

Added:
    incubator/climate/site/trunk/content/development/
    incubator/climate/site/trunk/content/development/edit-website.mdtext
    incubator/climate/site/trunk/content/development/license.mdtext
      - copied unchanged from r1490965, incubator/climate/site/trunk/content/license.mdtext
    incubator/climate/site/trunk/content/development/source.mdtext
      - copied unchanged from r1490965, incubator/climate/site/trunk/content/source.mdtext
Removed:
    incubator/climate/site/trunk/content/license.mdtext
    incubator/climate/site/trunk/content/source.mdtext
Modified:
    incubator/climate/site/trunk/templates/skeleton.html

Added: incubator/climate/site/trunk/content/development/edit-website.mdtext
URL: http://svn.apache.org/viewvc/incubator/climate/site/trunk/content/development/edit-website.mdtext?rev=1491203&view=auto
==============================================================================
--- incubator/climate/site/trunk/content/development/edit-website.mdtext (added)
+++ incubator/climate/site/trunk/content/development/edit-website.mdtext Sun Jun  9 12:37:27
2013
@@ -0,0 +1,127 @@
+Title:     How to edit the Climate website
+Notice:    Licensed to the Apache Software Foundation (ASF) under one
+           or more contributor license agreements.  See the NOTICE file
+           distributed with this work for additional information
+           regarding copyright ownership.  The ASF licenses this file
+           to you under the Apache License, Version 2.0 (the
+           "License"); you may not use this file except in compliance
+           with the License.  You may obtain a copy of the License at
+           .
+             http://www.apache.org/licenses/LICENSE-2.0
+           .
+           Unless required by applicable law or agreed to in writing,
+           software distributed under the License is distributed on an
+           "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+           KIND, either express or implied.  See the License for the
+           specific language governing permissions and limitations
+           under the License.
+
+This HowTo documentation will show the needed steps to edit the Climate
+website. This includes creation of new pages, modification, and deletion - for files
+and sub-directories.
+
+## How it works in general
+
+The website is hosted in a Content Management System (CMS). You will not edit the
+HTML pages directly. The actual edit is split up in 2 parts:
+
+ 1. First you edit the content which is provided as [Markdown text][1] (mdtext).
+    This will be committed into the staging section (see the SVN commit mail with
+    your log message) and automatically build HTML files out of the the mdtext files
+    (see the commit mail with "Staging update by buildbot" as log messge).
+     Before you publish youe changes in next step, you can verify the changes on the staging
site
+    - [http://climate.staging.apache.org/](http://climate.staging.apache.org/). 
+
+ 2. Second you need to publish the staging part to the production section (see the
+    commit mail with "Publishing merge to climate site by <your Apache ID>"
+    as log message).
+
+## What do you prefer: Working via commandline or in the browser?
+
+### Via commandline
+
+It is assumed that you have already checked out the code from the SVN repository
+[https://svn.apache.org/repos/asf/incubator/climate/site/trunk/](https://svn.apache.org/repos/asf/incubator/climate/site/trunk/).
+
+Edit the file via your favorite editor like vi and finally commit via SVN:
+
+    vi myfile.mdtext
+    svn ci -m "My log message" myfile.mdtext
+
+Now wait a few seconds so that the entire website can be rebuilt. Then:
+
+    curl -sL http://s.apache.org/cms-cli | perl
+
+If this does not work on your local machine just do it on "people.apache.org" by
+executing this:
+
+    ssh -t <user>@people.apache.org publish.pl climate <your Apache ID>
+
+### Editing in the browser
+
+#### Prerequisites
+
+##### Browser bookmark
+
+Normally you see the webpage in your browser. To update this page with an
+inline-editor and little preview you need to add a link as bookmark to your browser
+(more information see [here][2]).
+
+[Add this link as bookmark][3]
+
+##### Apache ID
+
+Furthermore, you need an Apache ID to authenticate to the system.
+
+#### Starting
+
+Browse to the respective webpage or directory you would like to edit and click on
+the bookmark. Now click on the [Edit this directory] link on the top. The following
+is displayed as content from the CMS.
+
+#### Edit an existing webpage
+
+Click on the actions link [Edit] in the appropriate table cell for editing the
+favorite file. If the file is not in this directory but in a subdir, just click on
+the directory name (e.g., "docs/") to enter this directory.
+
+Now you should see a new webpage with a 4 fields:
+
+ 1. Upper left is the inline editor for text in markdown syntax.
+ 2. Upper right shows the written text as a permanent preview or as HTML source code.
+ 3. Below the editor you can enter a log message.
+ 4. Enter a general header text, e.g., the license of the entered text.
+
+When you have finished writing your text, check the "Log message" box, enter a
+commit message and click on [Submit].
+
+#### Create a new webpage
+
+When in the correct directory, at the top enter a name for the new text file (e.g.,
+"my-file.mdtext"). Now you enter your text (see topic above).
+
+#### Create new subdirectory
+
+When in the correct directory, at the top enter a name for the new directory (e.g.,
+"my-dir/"). Make sure you entered a trailing "/"!
+
+#### Delete a webpage or subdirectory
+
+When in the corrext directory, click on the actions link [Delete] in the appropriate
+table cell and enter a commit message. Finally click on [Submit].
+
+#### How to put into production?
+
+After you have edited your files and/or directories, you need now to pubish your
+modifications into production. For this please click on the link
+[Publish site] on the top of the webpage. Enter a commit message on click on [Submit].
+Alterantively you can click on this [pubish link](https://cms.apache.org/climate/publish),
review the diff's and submit.
+
+### Links
+
+[CMS Documentation Reference][4]
+
+  [1]:  http://en.wikipedia.org/wiki/Markdown
+  [2]:  https://cms.apache.org/#bookmark
+  [3]:  javascript:void(location.href='https://cms.apache.org/redirect?uri='+escape(location.href))
+  [4]:  http://www.apache.org/dev/cmsref.html

Modified: incubator/climate/site/trunk/templates/skeleton.html
URL: http://svn.apache.org/viewvc/incubator/climate/site/trunk/templates/skeleton.html?rev=1491203&r1=1491202&r2=1491203&view=diff
==============================================================================
--- incubator/climate/site/trunk/templates/skeleton.html (original)
+++ incubator/climate/site/trunk/templates/skeleton.html Sun Jun  9 12:37:27 2013
@@ -55,14 +55,15 @@
         		<ul class="nav">
                     <li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">Development<b
class="caret"></b></a>
             		<ul class="dropdown-menu">
-                        <li><a href="/source.html">Source Code</a></li>
-                  		<li><a href="/license.html">Project License</a></li>
+                        <li><a href="/development/source.html">Source Code</a></li>
+                  		<li><a href="/development/license.html">Project License</a></li>
                         <li><a href="https://issues.apache.org/jira/browse/climate">Issue
Tracker</a></li>
+                        <li><a href="/development/edit-website.html">Editing
Website</a></li>
                 	</ul>
           			</li>
                     <li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">Documentation<b
class="caret"></b></a>
             		<ul class="dropdown-menu">
-                        <li><a href="https://cwiki.apache.org/CLIMATE">Climate
Wiki</a></li>
+                        <li><a href="https://cwiki.apache.org/confluence/display/CLIMATE/Home">Climate
Wiki</a></li>
                 	</ul>
           			</li>
                     <li class="dropdown"> <a class="dropdown-toggle" data-toggle="dropdown">Community<b
class="caret"></b></a>



Mime
View raw message