Skip to content

Commit

Permalink
Merge branch 't/11134'
Browse files Browse the repository at this point in the history
  • Loading branch information
Piotr Jasiun committed Jan 9, 2014
2 parents 878898d + 1a27f55 commit f5676b6
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 0 deletions.
60 changes: 60 additions & 0 deletions plugins/image2/dev/image2.html
View file
Expand Up @@ -188,6 +188,59 @@ <h2>Technical details <a id="tech-details" name="tech-details"></a></h2>
<p style="text-align:right"><small>Source: <a href="http://en.wikipedia.org/wiki/Apollo_11">Wikipedia.org</a></small></p>
</div>

<h2>Divarea sample</h2>

<textarea id="editor3" cols="10" rows="10">
<h1>Apollo 11</h1>

<figure class="caption" style="float: right">
<img alt="Saturn V" src="assets/image1.jpg" width="200" />
<figcaption>Roll out of Saturn V on launch pad</figcaption>
</figure>

<p><strong>Apollo 11</strong> 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>

<p>Apollo 11 effectively ended the <a href="http://en.wikipedia.org/wiki/Space_Race" title="Space Race">Space Race</a> and fulfilled a national goal proposed in 1961 by the late U.S. President <a href="http://en.wikipedia.org/wiki/John_F._Kennedy" title="John F. Kennedy">John F. Kennedy</a> in a speech before the United States Congress:</p>

<blockquote>
<p>[...] before this decade is out, of landing a man on the Moon and returning him safely to the Earth.</p>
</blockquote>

<figure class="caption" style="float: right">
<img alt="The Eagle" src="assets/image2.jpg" style="width: 200px" />
<figcaption>The Eagle in lunar orbit</figcaption>
</figure>

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

<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>

<p style="text-align:center">
<img alt="Saturn V" src="assets/image1.jpg" width="200" />
</p>

<hr />
<p style="text-align:right"><small>Source: <a href="http://en.wikipedia.org/wiki/Apollo_11">Wikipedia.org</a></small></p>
</textarea>

<script>

CKEDITOR.disableAutoInline = true;
Expand All @@ -207,10 +260,17 @@ <h2>Technical details <a id="tech-details" name="tech-details"></a></h2>
extraPlugins: 'image2,sourcedialog'
} );

CKEDITOR.replace( 'editor3', {
extraPlugins: 'image2,divarea',
height: 600
} );

CKCONSOLE.create( 'widget', { editor: 'editor1' } );
CKCONSOLE.create( 'focus', { editor: 'editor1' } );
CKCONSOLE.create( 'widget', { editor: 'editor2', folded: true } );
CKCONSOLE.create( 'focus', { editor: 'editor2', folded: true } );
CKCONSOLE.create( 'widget', { editor: 'editor3' } );
CKCONSOLE.create( 'focus', { editor: 'editor3' } );

</script>

Expand Down
36 changes: 36 additions & 0 deletions plugins/mathjax/dev/mathjax.html
View file
Expand Up @@ -8,6 +8,9 @@
<title>Widgets: MathJax &mdash; CKEditor Sample</title>
<meta charset="utf-8">
<script src="../../../ckeditor.js"></script>
<script src="../../../dev/console/console.js"></script>
<script src="../../../dev/console/focusconsole.js"></script>
<script src="../../widget/dev/console.js"></script>
<link href="../../../samples/sample.css" rel="stylesheet">
<meta name="ckeditor-sample-name" content="Mathematics">
<meta name="ckeditor-sample-group" content="Plugins">
Expand All @@ -23,6 +26,8 @@ <h1 class="samples">
<a href="../../../samples/index.html">CKEditor Samples</a> &raquo; Widgets: MathJax
</h1>

<h2>Framed sample</h2>

<textarea id="editor1" cols="10" rows="10">
<h1>Apollo 11</h1>

Expand All @@ -35,6 +40,8 @@ <h1>Apollo 11</h1>
<p>Launched by a&nbsp;Saturn V&nbsp;rocket from&nbsp;Kennedy Space Center&nbsp;in&nbsp;Merritt Island, Florida&nbsp;on July 16, Apollo 11 was the fifth manned mission of <a href="http://en.wikipedia.org/wiki/NASA">NASA</a>&#39;s&nbsp;Apollo program. The Apollo&nbsp;spacecraft&nbsp;had three parts: aCommand Module&nbsp;with a cabin for the three astronauts which was the only part which landed back on Earth; a&nbsp;Service Module&nbsp;which supported the Command Module with propulsion, electrical power, oxygen and water; and a&nbsp;Lunar Module&nbsp;for landing on the Moon. 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&nbsp;Sea of Tranquility. 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&nbsp;Pacific Ocean&nbsp;.</p>
</textarea>

<h2>Inline sample</h2>

<div id="editor2" contenteditable="true" cols="10" rows="10">
<h1>Apollo 11</h1>

Expand All @@ -47,6 +54,20 @@ <h1>Apollo 11</h1>
<p>Launched by a&nbsp;Saturn V&nbsp;rocket from&nbsp;Kennedy Space Center&nbsp;in&nbsp;Merritt Island, Florida&nbsp;on July 16, Apollo 11 was the fifth manned mission of <a href="http://en.wikipedia.org/wiki/NASA">NASA</a>&#39;s&nbsp;Apollo program. The Apollo&nbsp;spacecraft&nbsp;had three parts: aCommand Module&nbsp;with a cabin for the three astronauts which was the only part which landed back on Earth; a&nbsp;Service Module&nbsp;which supported the Command Module with propulsion, electrical power, oxygen and water; and a&nbsp;Lunar Module&nbsp;for landing on the Moon. 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&nbsp;Sea of Tranquility. 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&nbsp;Pacific Ocean&nbsp;.</p>
</div>

<h2>Divarea sample</h2>

<textarea id="editor3" cols="10" rows="10">
<h1>Apollo 11</h1>

<div style="background:red;color:blue">
<p><strong>Apollo 11</strong>&nbsp;was the&nbsp;spaceflight&nbsp;that landed the first humans, Americans <a href="http://en.wikipedia.org/wiki/Neil_Armstrong">Neil Armstrong</a>&nbsp;and&nbsp;<a href="http://en.wikipedia.org/wiki/Buzz_Aldrin">Buzz Aldrin</a> <span class="math-tex">\(x = {-b \pm \sqrt{b^2-4ac} \over 2a}\)</span>. Armstrong became the first to step onto the lunar surface 6 hours later. Armstrong spent about 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,&nbsp;Michael Collins, piloted the&nbsp;command spacecraft&nbsp;alone in lunar orbit until Armstrong and Aldrin returned to it for the trip back to Earth.</p>
</div>

<p>Foo foo <span class="userclass mjx">\(J_\alpha(x) = \sum\limits_{m=0}^\infty \frac{(-1)^m}{m! \, \Gamma(m + \alpha + 1)}{\left({\frac{x}{2}}\right)}^{2 m + \alpha}\)</span> bar bar.</p>

<p>Launched by a&nbsp;Saturn V&nbsp;rocket from&nbsp;Kennedy Space Center&nbsp;in&nbsp;Merritt Island, Florida&nbsp;on July 16, Apollo 11 was the fifth manned mission of <a href="http://en.wikipedia.org/wiki/NASA">NASA</a>&#39;s&nbsp;Apollo program. The Apollo&nbsp;spacecraft&nbsp;had three parts: aCommand Module&nbsp;with a cabin for the three astronauts which was the only part which landed back on Earth; a&nbsp;Service Module&nbsp;which supported the Command Module with propulsion, electrical power, oxygen and water; and a&nbsp;Lunar Module&nbsp;for landing on the Moon. 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&nbsp;Sea of Tranquility. 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&nbsp;Pacific Ocean&nbsp;.</p>
</textarea>

<script>

CKEDITOR.stylesSet.add('my_custom_style', [
Expand All @@ -69,6 +90,21 @@ <h1>Apollo 11</h1>
mathJaxClass: 'mjx'
} );

CKEDITOR.replace( 'editor3', {
extraPlugins: 'mathjax,divarea',
height: 350,
allowedContent: true,
// mathJaxLib: './truncated-mathjax/MathJax.js?config=TeX-AMS_HTML',
mathJaxClass: 'mjx'
} );

CKCONSOLE.create( 'widget', { editor: 'editor1' } );
CKCONSOLE.create( 'focus', { editor: 'editor1' } );
CKCONSOLE.create( 'widget', { editor: 'editor2' } );
CKCONSOLE.create( 'focus', { editor: 'editor2' } );
CKCONSOLE.create( 'widget', { editor: 'editor3' } );
CKCONSOLE.create( 'focus', { editor: 'editor3' } );

</script>

<div id="footer">
Expand Down
61 changes: 61 additions & 0 deletions plugins/placeholder/dev/placeholder.html
View file
@@ -0,0 +1,61 @@
<!DOCTYPE html>
<!--
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
-->
<html>
<head>
<title>Placeholder Plugin &mdash; CKEditor Sample</title>
<meta charset="utf-8">
<script src="../../../ckeditor.js"></script>
<script src="../../../dev/console/console.js"></script>
<script src="../../../dev/console/focusconsole.js"></script>
<script src="../../widget/dev/console.js"></script>
<script src="../../../samples/sample.js"></script>
<link rel="stylesheet" href="../../../samples/sample.css">
</head>
<body>
<h1 class="samples">Placeholder Plugin</h1>

<h2>Framed sample</h2>
<textarea cols="80" id="editor1" name="editor1" rows="10">
&lt;p&gt;This is a [[sample placeholder]]. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;. &lt;/p&gt;
</textarea>

<h2>Inline sample</h2>
<div id="editor2" contenteditable="true" cols="10" rows="10">
<p>This is a [[sample placeholder]]. You are using <a href="http://ckeditor.com/">CKEditor</a>. </p>
</div>

<h2>Divarea sample</h2>
<textarea cols="80" id="editor3" name="editor3" rows="10">
&lt;p&gt;This is a [[sample placeholder]]. You are using &lt;a href="http://ckeditor.com/"&gt;CKEditor&lt;/a&gt;. &lt;/p&gt;
</textarea>

<script>

CKEDITOR.replace( 'editor1', {
extraPlugins: 'placeholder',
height: 100
} );

CKEDITOR.inline( 'editor2', {
extraPlugins: 'placeholder',
height: 100
} );

CKEDITOR.replace( 'editor3', {
extraPlugins: 'placeholder,divarea',
height: 100
} );

CKCONSOLE.create( 'widget', { editor: 'editor1' } );
CKCONSOLE.create( 'focus', { editor: 'editor1' } );
CKCONSOLE.create( 'widget', { editor: 'editor2' } );
CKCONSOLE.create( 'focus', { editor: 'editor2' } );
CKCONSOLE.create( 'widget', { editor: 'editor3' } );
CKCONSOLE.create( 'focus', { editor: 'editor3' } );

</script>
</body>
</html>

0 comments on commit f5676b6

Please sign in to comment.