Skip to content

Commit d17b3e9

Browse files
committed
Merged branch 'documentation'. Fixes issue #17.
2 parents 487df7b + 4e518d3 commit d17b3e9

14 files changed

+51
-36
lines changed
6.5 KB
Binary file not shown.
70 Bytes
Binary file not shown.
237 Bytes
Binary file not shown.
849 Bytes
Binary file not shown.

docs/_build/_sources/advanced_options.rst.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ Advanced configuration options
88
Caching
99
-------
1010

11-
**Use global** means that this module's content will be cached according to your Joomla's global cache setings.
11+
**Use global** means that this module's content will be cached according to your Joomla's global cache settings.
1212

1313
**No caching** means that no content from this module will be cached.
1414

15+
This option is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.
16+
1517
.. index:: Form Instance
1618

1719
Form Instance
@@ -91,13 +93,13 @@ Captcha Use
9193
With the **JForm** type:
9294

9395
To be able to use Captcha, you can follow the procedure on the `Joomla Website
94-
<https://docs.joomla.org/How_do_you_use_Recaptcha_in_Joomla%3F>`_
96+
<https://docs.joomla.org/How_do_you_use_Recaptcha_in_Joomla%3F>`_.
9597

9698
This will produce a captcha looking like this:
9799

98100
.. image:: /images/advanced_options01.png
99101

100-
.. note:: If you don't have a Google account and don't want to create one, you can use a Captcha extension available in the `Joomla Extenstions Directory <https://extensions.joomla.org/tags/captcha>`_.
102+
.. note:: If you don't have a Google account and don't want to create one, you can use a Captcha extension available in the `Joomla Extensions Directory <https://extensions.joomla.org/tags/captcha>`_.
101103

102104
With the **Classic** form type:
103105

@@ -201,6 +203,8 @@ Name of Anchor Tag
201203
After submitting the form, the user is redirected to the anchor tag mentioned here.
202204
By default, this tag is placed at the beginning of the form.
203205

206+
The name of the tag must start with #. Example : #tag
207+
204208
.. index:: Number of Upload Fields
205209

206210
Number of Upload Fields
@@ -298,32 +302,32 @@ modify the module's display.
298302
Module Tag
299303
----------
300304

301-
The html tag used for the module.
305+
The html tag used for the module. This option is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.
302306

303307
.. index:: Bootstrap Size
304308

305309
Bootstrap Size
306310
--------------
307311

308-
The number of columns used in the module.
312+
The number of columns used in the module. This option is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.
309313

310314
.. index:: Header Tag
311315

312316
Header Tag
313317
----------
314318

315-
The HTML tag used for module headers and titles.
319+
The HTML tag used for module headers and titles. This option is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.
316320

317321
.. index:: Header Class
318322

319323
Header Class
320324
------------
321325

322-
The CSS class used for module headers and titles.
326+
The CSS class used for module headers and titles. This option is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.
323327

324328
.. index:: Module Style
325329

326330
Module Style
327331
------------
328332

329-
This option is used to override the template style.
333+
The option used to override the template style. It is provided by `Joomla <https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced>`_.

docs/_build/_sources/basic_options.rst.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ Form type
1414

1515
First, the form type must be chosen.
1616

17+
**JForm** is the most recent version that integrates new Joomla requirements.
18+
1719
**Classic** shows the form as it used to be.
1820
This option is deprecated and won't be available in version 3.0 of the module.
1921

20-
**JForm** is the most recent version that integrates new Joomla requirements.
21-
2222
.. image:: /images/basic_options02.png
2323

2424
.. index:: Language
@@ -29,11 +29,11 @@ You can then set the language used in the form.
2929
Language files can be found and edited at
3030
``/path/to/joomla/modules/mod_simpleemailform/language_files``.
3131

32-
You can choose from 30 different languages.
32+
Thirty languages are available.
3333

3434
.. image:: /images/basic_options03.png
3535

36-
.. note:: The module is now integrated with Joomla native language support.
36+
.. note:: The module is now integrated with Joomla native language support, so this field has no effect on the JForm type.
3737

3838
.. index:: Send Results To
3939
.. index:: Email address

docs/_build/_sources/installation.rst.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Installation
88
Here is the installation procedure for Joomla 3.x. The procedure is very
99
similar for Joomla 2.5, but the screens look slightly different.
1010

11+
Download the module on the `Simple Email Form page <http://joomla.unlikelysource.org/>`_.
12+
1113
Login as the Joomla administrator
1214

1315
.. image:: /images/installation01.png

docs/_build/advanced_options.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,9 @@ <h3>Navigation</h3>
5555
<span id="advancedoptionsanchor"></span><h1>Advanced configuration options<a class="headerlink" href="#advanced-configuration-options" title="Permalink to this headline"></a></h1>
5656
<div class="section" id="caching">
5757
<span id="index-0"></span><h2>Caching<a class="headerlink" href="#caching" title="Permalink to this headline"></a></h2>
58-
<p><strong>Use global</strong> means that this module&#8217;s content will be cached according to your Joomla&#8217;s global cache setings.</p>
58+
<p><strong>Use global</strong> means that this module&#8217;s content will be cached according to your Joomla&#8217;s global cache settings.</p>
5959
<p><strong>No caching</strong> means that no content from this module will be cached.</p>
60+
<p>This option is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
6061
</div>
6162
<div class="section" id="form-instance">
6263
<span id="index-1"></span><h2>Form Instance<a class="headerlink" href="#form-instance" title="Permalink to this headline"></a></h2>
@@ -105,12 +106,12 @@ <h3>Navigation</h3>
105106
<div class="section" id="captcha-use">
106107
<span id="index-10"></span><h2>Captcha Use<a class="headerlink" href="#captcha-use" title="Permalink to this headline"></a></h2>
107108
<p>With the <strong>JForm</strong> type:</p>
108-
<p>To be able to use Captcha, you can follow the procedure on the <a class="reference external" href="https://docs.joomla.org/How_do_you_use_Recaptcha_in_Joomla%3F">Joomla Website</a></p>
109+
<p>To be able to use Captcha, you can follow the procedure on the <a class="reference external" href="https://docs.joomla.org/How_do_you_use_Recaptcha_in_Joomla%3F">Joomla Website</a>.</p>
109110
<p>This will produce a captcha looking like this:</p>
110111
<img alt="_images/advanced_options01.png" src="_images/advanced_options01.png" />
111112
<div class="admonition note">
112113
<p class="first admonition-title">Note</p>
113-
<p class="last">If you don&#8217;t have a Google account and don&#8217;t want to create one, you can use a Captcha extension available in the <a class="reference external" href="https://extensions.joomla.org/tags/captcha">Joomla Extenstions Directory</a>.</p>
114+
<p class="last">If you don&#8217;t have a Google account and don&#8217;t want to create one, you can use a Captcha extension available in the <a class="reference external" href="https://extensions.joomla.org/tags/captcha">Joomla Extensions Directory</a>.</p>
114115
</div>
115116
<p>With the <strong>Classic</strong> form type:</p>
116117
<p>Set to <strong>No Captcha</strong> if you don&#8217;t want any Captcha protection.</p>
@@ -170,6 +171,7 @@ <h3>Navigation</h3>
170171
<span id="index-22"></span><h2>Name of Anchor Tag<a class="headerlink" href="#name-of-anchor-tag" title="Permalink to this headline"></a></h2>
171172
<p>After submitting the form, the user is redirected to the anchor tag mentioned here.
172173
By default, this tag is placed at the beginning of the form.</p>
174+
<p>The name of the tag must start with #. Example : #tag</p>
173175
</div>
174176
<div class="section" id="number-of-upload-fields">
175177
<span id="index-23"></span><h2>Number of Upload Fields<a class="headerlink" href="#number-of-upload-fields" title="Permalink to this headline"></a></h2>
@@ -233,23 +235,23 @@ <h3>Navigation</h3>
233235
</div>
234236
<div class="section" id="module-tag">
235237
<span id="index-35"></span><h2>Module Tag<a class="headerlink" href="#module-tag" title="Permalink to this headline"></a></h2>
236-
<p>The html tag used for the module.</p>
238+
<p>The html tag used for the module. This option is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
237239
</div>
238240
<div class="section" id="bootstrap-size">
239241
<span id="index-36"></span><h2>Bootstrap Size<a class="headerlink" href="#bootstrap-size" title="Permalink to this headline"></a></h2>
240-
<p>The number of columns used in the module.</p>
242+
<p>The number of columns used in the module. This option is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
241243
</div>
242244
<div class="section" id="header-tag">
243245
<span id="index-37"></span><h2>Header Tag<a class="headerlink" href="#header-tag" title="Permalink to this headline"></a></h2>
244-
<p>The HTML tag used for module headers and titles.</p>
246+
<p>The HTML tag used for module headers and titles. This option is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
245247
</div>
246248
<div class="section" id="header-class">
247249
<span id="index-38"></span><h2>Header Class<a class="headerlink" href="#header-class" title="Permalink to this headline"></a></h2>
248-
<p>The CSS class used for module headers and titles.</p>
250+
<p>The CSS class used for module headers and titles. This option is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
249251
</div>
250252
<div class="section" id="module-style">
251253
<span id="index-39"></span><h2>Module Style<a class="headerlink" href="#module-style" title="Permalink to this headline"></a></h2>
252-
<p>This option is used to override the template style.</p>
254+
<p>The option used to override the template style. It is provided by <a class="reference external" href="https://docs.joomla.org/Help36:Extensions_Module_Manager_Tags_Popular#Advanced">Joomla</a>.</p>
253255
</div>
254256
</div>
255257

docs/_build/basic_options.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ <h3>Navigation</h3>
6161
<div class="section" id="form-type">
6262
<span id="index-0"></span><h2>Form type<a class="headerlink" href="#form-type" title="Permalink to this headline"></a></h2>
6363
<p>First, the form type must be chosen.</p>
64+
<p><strong>JForm</strong> is the most recent version that integrates new Joomla requirements.</p>
6465
<p><strong>Classic</strong> shows the form as it used to be.
6566
This option is deprecated and won&#8217;t be available in version 3.0 of the module.</p>
66-
<p><strong>JForm</strong> is the most recent version that integrates new Joomla requirements.</p>
6767
<img alt="_images/basic_options02.png" src="_images/basic_options02.png" />
6868
</div>
6969
<div class="section" id="language">
7070
<span id="index-1"></span><h2>Language<a class="headerlink" href="#language" title="Permalink to this headline"></a></h2>
7171
<p>You can then set the language used in the form.
7272
Language files can be found and edited at
7373
<code class="docutils literal"><span class="pre">/path/to/joomla/modules/mod_simpleemailform/language_files</span></code>.</p>
74-
<p>You can choose from 30 different languages.</p>
74+
<p>Thirty languages are available.</p>
7575
<img alt="_images/basic_options03.png" src="_images/basic_options03.png" />
7676
<div class="admonition note">
7777
<p class="first admonition-title">Note</p>
78-
<p class="last">The module is now integrated with Joomla native language support.</p>
78+
<p class="last">The module is now integrated with Joomla native language support, so this field has no effect on the JForm type.</p>
7979
</div>
8080
<span class="target" id="index-2"></span></div>
8181
<div class="section" id="email-address">

docs/_build/installation.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ <h3>Navigation</h3>
5555
<span id="installationanchor"></span><h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline"></a></h1>
5656
<p id="index-0">Here is the installation procedure for Joomla 3.x. The procedure is very
5757
similar for Joomla 2.5, but the screens look slightly different.</p>
58+
<p>Download the module on the <a class="reference external" href="http://joomla.unlikelysource.org/">Simple Email Form page</a>.</p>
5859
<p>Login as the Joomla administrator</p>
5960
<img alt="_images/installation01.png" src="_images/installation01.png" />
6061
<p>Select <code class="docutils literal"><span class="pre">Extensions</span></code> - <code class="docutils literal"><span class="pre">Manage</span></code> - <code class="docutils literal"><span class="pre">Install</span></code></p>

0 commit comments

Comments
 (0)