Skip to content

Commit

Permalink
Merge branch 't/10137b' into major
Browse files Browse the repository at this point in the history
  • Loading branch information
@Reinmar
Reinmar committed Feb 28, 2013
2 parents eaf5e73 + 9b3779c commit 516399f
Showing 1 changed file with 9 additions and 69 deletions.
78 changes: 9 additions & 69 deletions samples/filter.html
View file
Expand Up @@ -70,7 +70,9 @@ <h1 class="samples">
'img(left,right)[!src,alt,width,height];' +
'table tr th td caption;' +
'span{!font-family};' +'
'span{!color}'
'span{!color}' +
'span(!marker);' +
'del ins'
} );
</pre>
</div>
Expand All @@ -86,7 +88,9 @@ <h1 class="samples">
'img(left,right)[!src,alt,width,height];' +
'table tr th td caption;' +
'span{!font-family};' +
'span{!color}'
'span{!color};' +
'span(!marker);' +
'del ins'
} );

</script>
Expand All @@ -105,7 +109,7 @@ <h1 class="samples">
<pre class="samples">
CKEDITOR.replace( 'editor3', {
allowedContent: {
'b i ul ol': true,
'b i ul ol big small': true,
'h1 h2 h3 p blockquote li': {
styles: 'text-align'
},
Expand All @@ -126,7 +130,7 @@ <h1 class="samples">

CKEDITOR.replace( 'editor3', {
allowedContent: {
'b i ul ol': true,
'b i ul ol big small': true,
'h1 h2 h3 p blockquote li': {
styles: 'text-align'
},
Expand Down Expand Up @@ -180,76 +184,12 @@ <h1 class="samples">
<label for="editor5">
Editor 5:
</label>
<div class="description">
<p>
This editor is built on editable <code>&lt;div&gt;</code> element.
</p>
</div>
<div id="editor5" contenteditable="true">
<h1><img alt="Saturn V carrying Apollo 11" class="right" src="assets/sample.jpg" /> Apollo 11</h1>

<p><b>Apollo 11</b> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface 6 hours later on July 21 at 02:56 UTC.</p>

<p>Armstrong spent about <s>three and a half</s> two and a half hours outside the spacecraft, Aldrin slightly less; and together they collected 47.5 pounds (21.5&nbsp;kg) of lunar material for return to Earth. A third member of the mission, <a href="http://en.wikipedia.org/wiki/Michael_Collins_(astronaut)" title="Michael Collins (astronaut)">Michael Collins</a>, piloted the <a href="http://en.wikipedia.org/wiki/Apollo_Command/Service_Module" title="Apollo Command/Service Module">command</a> spacecraft alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.</p>

<h2>Broadcasting and <em>quotes</em> <a id="quotes" name="quotes"></a></h2>

<p>Broadcast on live TV to a world-wide audience, Armstrong stepped onto the lunar surface and described the event as:</p>

<blockquote>
<p>One small step for [a] man, one giant leap for mankind.</p>
</blockquote>

<h2>Technical details <a id="tech-details" name="tech-details"></a></h2>

<table align="right" border="1" bordercolor="#ccc" cellpadding="5" cellspacing="0" style="border-collapse:collapse;margin:10px 0 10px 15px;">
<caption><strong>Mission crew</strong></caption>
<thead>
<tr>
<th scope="col">Position</th>
<th scope="col">Astronaut</th>
</tr>
</thead>
<tbody>
<tr>
<td>Commander</td>
<td>Neil A. Armstrong</td>
</tr>
<tr>
<td>Command Module Pilot</td>
<td>Michael Collins</td>
</tr>
<tr>
<td>Lunar Module Pilot</td>
<td>Edwin &quot;Buzz&quot; E. Aldrin, Jr.</td>
</tr>
</tbody>
</table>

<p>Launched by a <strong>Saturn V</strong> rocket from <a href="http://en.wikipedia.org/wiki/Kennedy_Space_Center" title="Kennedy Space Center">Kennedy Space Center</a> in Merritt Island, Florida on July 16, Apollo 11 was the fifth manned mission of <a href="http://en.wikipedia.org/wiki/NASA" title="NASA">NASA</a>&#39;s Apollo program. The Apollo spacecraft had three parts:</p>

<ol>
<li><strong>Command Module</strong> with a cabin for the three astronauts which was the only part which landed back on Earth</li>
<li><strong>Service Module</strong> which supported the Command Module with propulsion, electrical power, oxygen and water</li>
<li><strong>Lunar Module</strong> for landing on the Moon.</li>
</ol>

<p>After being sent to the Moon by the Saturn V&#39;s upper stage, the astronauts separated the spacecraft from it and travelled for three days until they entered into lunar orbit. Armstrong and Aldrin then moved into the Lunar Module and landed in the <a href="http://en.wikipedia.org/wiki/Mare_Tranquillitatis" title="Mare Tranquillitatis">Sea of Tranquility</a>. They stayed a total of about 21 and a half hours on the lunar surface. After lifting off in the upper part of the Lunar Module and rejoining Collins in the Command Module, they returned to Earth and landed in the <a href="http://en.wikipedia.org/wiki/Pacific_Ocean" title="Pacific Ocean">Pacific Ocean</a> on July 24.</p>
</div>
</div>

<br>

<div>
<label for="editor6">
Editor 6:
</label>
<div class="description">
<p>
This editor is built on editable <code>&lt;h1&gt;</code> element.
</p>
</div>
<h1 id="editor6" contenteditable="true">
<h1 id="editor5" contenteditable="true">
<em>Apollo 11</em> was the spaceflight that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong" title="Neil Armstrong">Neil Armstrong</a> and <a href="http://en.wikipedia.org/wiki/Buzz_Aldrin" title="Buzz Aldrin">Buzz Aldrin</a>, on the Moon on July 20, 1969, at 20:18 UTC.
</h1>
</div>
Expand Down

0 comments on commit 516399f

Please sign in to comment.