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

occurrence for all modes.

diff --git a/lang/en/help/wiki/howtowiki.html b/lang/en/help/wiki/howtowiki.html
index df70d08990dcf78b60d30e3960fddf70d4d0d53c..2dbdd02da7bae16b963b96d83352d2bedd01ece6 100755 (executable)
--- a/lang/en/help/wiki/howtowiki.html
+++ b/lang/en/help/wiki/howtowiki.html
@@ -113,9 +113,18 @@ Please always put an empty line before and after a table, so it stands out from
   <li> alternatively you could use the ImageUploading function</li>\r
   </ul>\r
 \r
-<h4> More markup</h4>\r
+<h4>Further readings</h4>\r
+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.\r
 \r
 <p>\r
-Please see the page about ExtendedWikiMarkup</a>, if you'd like to know a bit\r
-more about available markup.\r
-</p>
\ No newline at end of file
+<a name="camelcase"></a><b>Camel Case</b>:<br />\r
+CamelCase describes what WikiWords look like. Multiple words, joined together without\r
+spaces, separated by changes in case. The uppercase and\r
+lowercase letters show up like the humps of camels.</p>\r
+<p>\r
+This linking scheme is often also called BumpyText.</p>\r
+<p>\r
+While language purists hate Wikis for that naming scheme, it is very common in the \r
+computing world and well known to most programmers.</p>\r
+\r
+\r

diff --git a/mod/wiki/view.php b/mod/wiki/view.php
index e6ea9e3c66996086c7f21dc376330c9cad2f4121..9db4c6551e4c820326094913b3ff58914476a023 100644 (file)
--- a/mod/wiki/view.php
+++ b/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>';
     }