Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed multiple occurrences of help icon in non-HTML modes, to one

occurrence for all modes.
  • Loading branch information...
commit 089a198517ab2aa3e85764eea1be6e700bb68c8e 1 parent a380c2e
mchurch authored
Showing with 17 additions and 11 deletions.
  1. +13 −4 lang/en/help/wiki/howtowiki.html
  2. +4 −7 mod/wiki/view.php
View
17 lang/en/help/wiki/howtowiki.html
@@ -113,9 +113,18 @@
<li> alternatively you could use the ImageUploading function</li>
</ul>
-<h4> More markup</h4>
+<h4>Further readings</h4>
+There are more possibilities for Wiki mark-up. Please consult the <a href="http://erfurtwiki.sourceforge.net" target=_new>Erfurt Wiki Homepage</a> for more information.
<p>
-Please see the page about ExtendedWikiMarkup</a>, if you'd like to know a bit
-more about available markup.
-</p>
+<a name="camelcase"></a><b>Camel Case</b>:<br />
+CamelCase describes what WikiWords look like. Multiple words, joined together without
+spaces, separated by changes in case. The uppercase and
+lowercase letters show up like the humps of camels.</p>
+<p>
+This linking scheme is often also called BumpyText.</p>
+<p>
+While language purists hate Wikis for that naming scheme, it is very common in the
+computing world and well known to most programmers.</p>
+
+
View
11 mod/wiki/view.php
@@ -265,7 +265,6 @@
echo '<tr>';
echo '<td>';
- helpbutton('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
if ($canedit) {
$iconstr="";
$editicon= '<img hspace=1 alt="'.get_string("editthispage","wiki").'" height=16 width=16 border=0 src="'.$CFG->pixpath.'/t/edit.gif">';
@@ -309,12 +308,10 @@
}
/// Formatting Rules
- if($wiki->htmlmode!=2) {
- echo '<td align="center">';
- helpbutton('wikiusage', get_string('wikiusage', 'wiki'), 'wiki');
- echo get_string("wikiusage","wiki");
- echo '</td>';
- }
+ echo '<td align="center">';
+ helpbutton('howtowiki', get_string('howtowiki', 'wiki'), 'wiki');
+ echo get_string('howtowiki','wiki');
+ echo '</td>';
echo '</tr></table>';
}
Please sign in to comment.
Something went wrong with that request. Please try again.