changed IDs to avoid name clashes

darcs-hash:20060226172332-7ad00-f073117ba2f027935f87cf23106bf6a4316a5790.gz

3 files changed, 17 insertions, 17 deletions

diff --git a/inc/html.php b/inc/html.php
index 10a599c84..2fc6bfe37 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -1000,7 +1000,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
   <div style="width:99%;">
   <form id="dw__editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>"><div class="no">
      <div class="toolbar">
-        <div id="toolbar"></div>
+        <div id="tool__bar"></div>
         <input type="hidden" name="id"   value="<?php echo $ID?>" />
         <input type="hidden" name="rev"  value="<?php echo $REV?>" />
         <input type="hidden" name="date" value="<?php echo $DATE?>" />
@@ -1012,27 +1012,27 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
           <?php /* sets changed to true when previewed */?>
           textChanged = <?php ($pr) ? print 'true' : print 'false' ?>;
         </script>
-        <span id="spell_action"></span>
+        <span id="spell__action"></span>
         <?php } ?>
-        <div id="spell_suggest"></div>
+        <div id="spell__suggest"></div>
     </div>
-    <div id="spell_result"></div>
+    <div id="spell__result"></div>
 
-    <textarea name="wikitext" id="wikitext" <?php echo $ro?> cols="80" rows="10" class="edit" tabindex="1"><?php echo "\n".formText($text)?></textarea>
+    <textarea name="wikitext" id="wiki__text" <?php echo $ro?> cols="80" rows="10" class="edit" tabindex="1"><?php echo "\n".formText($text)?></textarea>
 
-    <div id="wikieditbar">
-      <div id="sizectl"></div>
+    <div id="wiki__editbar">
+      <div id="size__ctl"></div>
       <?php if($wr){?>
          <div class="editButtons">
-            <input class="button" id="edbtn_save" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="[ALT+S]" tabindex="4" />
-            <input class="button" id="edbtn_preview" type="submit" name="do" value="<?php echo $lang['btn_preview']?>" accesskey="p" title="[ALT+P]" tabindex="5" />
+            <input class="button" id="edbtn__save" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="[ALT+S]" tabindex="4" />
+            <input class="button" id="edbtn__preview" type="submit" name="do" value="<?php echo $lang['btn_preview']?>" accesskey="p" title="[ALT+P]" tabindex="5" />
             <input class="button" type="submit" name="do" value="<?php echo $lang['btn_cancel']?>" tabindex="5" />
          </div>
       <?php } ?>
       <?php if($wr){ ?>
         <div class="summary">
-           <label for="summary" class="nowrap"><?php echo $lang['summary']?>:</label>
-           <input type="text" class="edit" name="summary" id="summary" size="50" value="<?php echo formText($SUM)?>" tabindex="2" />
+           <label for="edit__summary" class="nowrap"><?php echo $lang['summary']?>:</label>
+           <input type="text" class="edit" name="summary" id="edit__summary" size="50" value="<?php echo formText($SUM)?>" tabindex="2" />
            <?php html_minoredit()?>
         </div>
       <?php }?>
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 2d241589f..50f011b5f 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -66,7 +66,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
 
                     // open the footnote and set the anchor and backlink
                     $this->doc .= '<div class="fn">';
-                    $this->doc .= '<a href="#fnt'.$id.'" id="fn'.$id.'" name="fn'.$id.'" class="fn_bot">';
+                    $this->doc .= '<a href="#fnt__'.$id.'" id="fn__'.$id.'" name="fn__'.$id.'" class="fn_bot">';
                     $this->doc .= $id.')</a> '.DOKU_LF;
 
                     // get any other footnotes that use the same markup
@@ -75,7 +75,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
                     if (count($alt)) {
                       foreach ($alt as $ref) {
                         // set anchor and backlink for the other footnotes
-                        $this->doc .= ', <a href="#fnt'.($ref+1).'" id="fn'.($ref+1).'" name="fn'.($ref+1).'" class="fn_bot">';
+                        $this->doc .= ', <a href="#fnt__'.($ref+1).'" id="fn__'.($ref+1).'" name="fn__'.($ref+1).'" class="fn_bot">';
                         $this->doc .= ($ref+1).')</a> '.DOKU_LF;
                       }
                     }
@@ -278,7 +278,7 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
         }
 
         // output the footnote reference and link, incl. onmouseover for insitu footnote popup
-        $this->doc .= '<a href="#fn'.$id.'" name="fnt'.$id.'" id="fnt'.$id.'" class="fn_top" onmouseover="fnt(\''.$id.'\', this, event);">'.$id.')</a>';
+        $this->doc .= '<a href="#fn__'.$id.'" name="fnt__'.$id.'" id="fnt__'.$id.'" class="fn_top" onmouseover="fnt(\''.$id.'\', this, event);">'.$id.')</a>';
     }
 
     function listu_open() {
diff --git a/inc/template.php b/inc/template.php
index 5d085605d..db039e3db 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -496,9 +496,9 @@ function tpl_searchform($ajax=true,$autocomplete=true){
   print '<input type="text" ';
   if($ACT == 'search') print 'value="'.htmlspecialchars($_REQUEST['id']).'" ';
   if(!$autocomplete) print 'autocomplete="off" ';
-  print 'id="qsearch_in" accesskey="f" name="id" class="edit" />';
+  print 'id="qsearch__in" accesskey="f" name="id" class="edit" />';
   print '<input type="submit" value="'.$lang['btn_search'].'" class="button" />';
-  if($ajax) print '<div id="qsearch_out" class="ajax_qsearch JSpopup"></div>';
+  if($ajax) print '<div id="qsearch__out" class="ajax_qsearch JSpopup"></div>';
   print '</div></form>';
 }
 
@@ -821,7 +821,7 @@ function tpl_mediauploadform(){
   ptln('<input type="text" name="id" class="edit" />',4);
   ptln('<input type="submit" class="button" value="'.$lang['btn_upload'].'" accesskey="s" />',4);
   if($AUTH >= AUTH_DELETE){
-    ptln('<label for="ow"><input type="checkbox" name="ow" value="1" id="ow" />'.$lang['txt_overwrt'].'</label>',4);
+    ptln('<label for="dw__ow"><input type="checkbox" name="ow" value="1" id="dw__ow" />'.$lang['txt_overwrt'].'</label>',4);
   }
   ptln('</form>',2);
 }