changed IDs to avoid name clashes

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

5 files changed, 100 insertions, 100 deletions

diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 950493688..b46987369 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -81,7 +81,7 @@ div.dokuwiki fieldset {
 
 div.dokuwiki textarea.edit {
   font-family:monospace;
-  border: 1px solid __dark__;  
+  border: 1px solid __dark__;
   color: Black;
   background-color: __white__;
   font-size:14px;
@@ -112,23 +112,23 @@ div.dokuwiki input.missing {
 }
 
 /* edit form */
-div.dokuwiki div.toolbar, div.dokuwiki div#wikieditbar {
+div.dokuwiki div.toolbar, div.dokuwiki div#wiki__editbar {
    margin:2px 0;
    text-align: left;
 }
-div.dokuwiki div#sizectl {
+div.dokuwiki div#size__ctl {
    float:right;
    width:40px;
    height:2.7em;
 }
-div.dokuwiki #sizectl img {
+div.dokuwiki #size__ctl img {
    cursor: pointer;
 }
-div.dokuwiki div#wikieditbar div.editButtons {
+div.dokuwiki div#wiki__editbar div.editButtons {
    float: left;
    padding: 0 1.0em 0.7em 0;
 }
-div.dokuwiki div#wikieditbar div.summary {
+div.dokuwiki div#wiki__editbar div.summary {
    float: left;
 }
 div.dokuwiki .nowrap {
@@ -139,7 +139,7 @@ div.dokuwiki .nowrap {
 
 
 div.dokuwiki input.button, div.dokuwiki button.button{
-  border: 1px solid __dark__;  
+  border: 1px solid __dark__;
   color: Black;
   background-color: __white__;
   vertical-align: middle;
@@ -153,7 +153,7 @@ div.dokuwiki input.button, div.dokuwiki button.button{
   /* Mac IE will not see this and continue with inline-block */
   /* \*/
   display: inline;
-  /* */  
+  /* */
 }
 
 * html div.dokuwiki input.button, * html div.dokuwiki button.button{
@@ -178,27 +178,27 @@ div.dokuwiki div.secedit input.button {
 /* ----------- page navigator ------------- */
 
 div.dokuwiki div.pagenav {
-	margin-top:1em;
+    margin-top:1em;
 }
 
 div.dokuwiki div.pagenav-prev {
-	text-align:right;	
-	float:left;
-	width:50%
+    text-align:right;
+    float:left;
+    width:50%
 }
 
 div.dokuwiki div.pagenav-prev input.button {
-	margin-right:5px;
+    margin-right:5px;
 }
 
 div.dokuwiki div.pagenav-next {
-	text-align:left;
-	float:right;
-	width:50%
+    text-align:left;
+    float:right;
+    width:50%
 }
 
 div.dokuwiki div.pagenav-next input.button {
-	margin-left:5px;
+    margin-left:5px;
 }
 
 /* --------------- Links ------------------ */
@@ -236,11 +236,11 @@ div.dokuwiki a.windows{
     padding: 1px 0px 1px 16px;
     color:__extern__;
     text-decoration:none;
-} 
+}
 div.dokuwiki a.windows:visited {
   color:Purple;
 }
-div.dokuwiki a.windows:hover { 
+div.dokuwiki a.windows:hover {
   text-decoration:underline;
 }
 
@@ -333,7 +333,7 @@ div.dokuwiki img.mediaright {
 
 div.dokuwiki img.mediacenter {
   border: 0;
-	display: block;
+    display: block;
   margin-left: auto;
   margin-right: auto;
 }
@@ -382,7 +382,7 @@ div.dokuwiki div.level4 {margin-left: 63px;}
 div.dokuwiki div.level5 {margin-left: 83px;}
 
 /* unordered lists */
-div.dokuwiki ul { 
+div.dokuwiki ul {
   line-height: 1.5em;
   list-style-type: square;
   margin: 0 0 0.5em 1.5em;
@@ -414,12 +414,12 @@ div.dokuwiki ol ol ol ol {list-style-type: lower-greek}
 
 div.dokuwiki li.open {
   list-style-image: url(images/open.gif);
-	/*list-style-type: circle;*/
+    /*list-style-type: circle;*/
 }
 
 div.dokuwiki li.closed {
   list-style-image: url(images/closed.gif);
-	/*list-style-type: disc;*/
+    /*list-style-type: disc;*/
 }
 
 div.dokuwiki blockquote {
@@ -557,7 +557,7 @@ div.dokuwiki a.toc {
 
 div.dokuwiki a.toc:hover {
   color: __black__;
-  text-decoration:underline; 
+  text-decoration:underline;
 }
 
 /* ---------------------------- Diff rendering --------------------------*/
@@ -572,9 +572,9 @@ div.dokuwiki td.diff-addedline {
     font-family: monospace;
     font-size: 100%;
 }
-div.dokuwiki td.diff-deletedline { 
+div.dokuwiki td.diff-deletedline {
     background:#ffffbb;
-    font-family: monospace;    
+    font-family: monospace;
     font-size: 100%;
 }
 div.dokuwiki td.diff-context {
@@ -616,7 +616,7 @@ div.insitu-footnote {
   background: __light__;
   text-align: left;
   padding: 4px;
-  max-width: 40%;    /* IE's width is handled in javascript */  
+  max-width: 40%;    /* IE's width is handled in javascript */
 }
 
 /* overcome IE issue with one line code or file boxes which require h. scrolling */
@@ -729,7 +729,7 @@ div.dokuwiki a.spell_error {
   text-decoration: underline;
 }
 
-div.dokuwiki div#spell_suggest {
+div.dokuwiki div#spell__suggest {
   position: absolute;
   left: 0;
   top: 0;
@@ -741,10 +741,10 @@ div.dokuwiki div#spell_suggest {
   z-index: 2;
 }
 
-div.dokuwiki div#spell_result {
+div.dokuwiki div#spell__result {
   display:none;
   font-family:monospace;
-  border: 1px solid __dark__; 
+  border: 1px solid __dark__;
   color: Black;
   font-size:14px;
   padding: 3px;
@@ -795,13 +795,13 @@ div.dokuwiki div.imagemeta img.thumb{
 
 /* -------------- Media Popup ---------------------- */
 
-div.dokuwiki div.mediaselect-right li, div.dokuwiki div.uploadform { 
+div.dokuwiki div.mediaselect-right li, div.dokuwiki div.uploadform {
   clear: both;
 }
 
 div.dokuwiki div.mediaedit div.data label{
   display: block;
-  text-align: right; 
+  text-align: right;
   width: 20%;
   float: left;
   margin-right: 0.5em;
diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css
index 13fb37404..40e0362a2 100644
--- a/lib/tpl/default/layout.css
+++ b/lib/tpl/default/layout.css
@@ -7,19 +7,19 @@
 
 /* -------------- top row --------------- */
 div.dokuwiki .header {
-	height:35px;
-	padding:3px 0 2px 2px;
+  height:35px;
+  padding:3px 0 2px 2px;
 }
 
 div.dokuwiki .pagename {
-	height:25px;
-	float:left;
-	font-size:200%;
-	font-weight:bolder;
-	color: __medium__;
-	text-align:left;
-	vertical-align:middle;
-	padding:1px 0 0 1px;
+  height:25px;
+  float:left;
+  font-size:200%;
+  font-weight:bolder;
+  color: __medium__;
+  text-align:left;
+  vertical-align:middle;
+  padding:1px 0 0 1px;
 }
 
 div.dokuwiki .pagename a:link, div.dokuwiki .pagename a:visited, div.dokuwiki .pagename a:hover, div.dokuwiki .pagename a:active {
@@ -28,41 +28,41 @@ div.dokuwiki .pagename a:link, div.dokuwiki .pagename a:visited, div.dokuwiki .p
 }
 
 div.dokuwiki .logo {
-	float:right;
-	font-size:220%;
-	font-weight:bolder;
-	text-align:right;
-	vertical-align:middle;
+  float:right;
+  font-size:220%;
+  font-weight:bolder;
+  text-align:right;
+  vertical-align:middle;
 }
 
 div.dokuwiki .logo a:link, div.dokuwiki .logo a:visited, div.dokuwiki .logo a:hover, div.dokuwiki .logo a:active {
-	color: __medium__;
-	text-decoration:none;
-	font-variant:small-caps;
-	letter-spacing:2pt;
+  color: __medium__;
+  text-decoration:none;
+  font-variant:small-caps;
+  letter-spacing:2pt;
 }
 
 /* ---------------  top and bottom bar ---------------- */
 div.dokuwiki .bar {
-	height:2.0em;
-	border-top:1px solid __dark__;
-	border-bottom:1px solid __dark__;
-	background: __medium__;
-	padding:0.15em;
-	margin:0;
+  height:2.0em;
+  border-top:1px solid __dark__;
+  border-bottom:1px solid __dark__;
+  background: __medium__;
+  padding:0.15em;
+  margin:0;
   clear: both;
 }
 
 div.dokuwiki .bar-left {
-	float:left;
+  float:left;
 }
 
 div.dokuwiki .bar-right {
-	float:right;
+  float:right;
   text-align:right;
 }
 
-div.dokuwiki #bar_bottom {
+div.dokuwiki #bar__bottom {
   margin-bottom:3px;
 }
 
@@ -104,26 +104,26 @@ div.dokuwiki .mediaselect-right {
 }
 
 div.dokuwiki div.mediaref_head {
-	margin-left:0.5em;
+  margin-left:0.5em;
 }
 
 div.dokuwiki div.mediaref .search_result {
-	padding-left:1em;
+  padding-left:1em;
 }
 
 div.dokuwiki .mediaref_ref {
-	color: __existing__;
+  color: __existing__;
 }
 
 div.dokuwiki div.mediaref_hidden {
-	margin-top:1em;
-	text-align:center;
-	font-size:1.2em;
-	color: #BB0000;
+  margin-top:1em;
+  text-align:center;
+  font-size:1.2em;
+  color: #BB0000;
 }
 
 div.dokuwiki div.mediaref_footer {
-	margin-top:1em;
-	text-align:center;
+  margin-top:1em;
+  text-align:center;
 }
 
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index 1f4940327..9e1a4681d 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -42,16 +42,16 @@
         <?php tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?>
       </div>
     </div>
-  
+
     <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
 
-    <div class="bar" id="bar_top">
-      <div class="bar-left" id="bar_topleft">
+    <div class="bar" id="bar__top">
+      <div class="bar-left" id="bar__topleft">
         <?php tpl_button('edit')?>
         <?php tpl_button('history')?>
       </div>
-  
-      <div class="bar-right" id="bar_topright">
+
+      <div class="bar-right" id="bar__topright">
         <?php tpl_button('recent')?>
         <?php tpl_searchform()?>&nbsp;
       </div>
@@ -98,15 +98,15 @@
 
    <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
 
-    <div class="bar" id="bar_bottom">
-      <div class="bar-left" id="bar_bottomleft">
+    <div class="bar" id="bar__bottom">
+      <div class="bar-left" id="bar__bottomleft">
         <?php tpl_button('edit')?>
         <?php tpl_button('history')?>
       </div>
-      <div class="bar-right" id="bar_bottomright">
+      <div class="bar-right" id="bar__bottomright">
         <?php tpl_button('subscription')?>
         <?php tpl_button('admin')?>
-		<?php tpl_button('profile')?>
+        <?php tpl_button('profile')?>
         <?php tpl_button('login')?>
         <?php tpl_button('index')?>
         <?php tpl_button('top')?>&nbsp;
diff --git a/lib/tpl/default/mediaedit.php b/lib/tpl/default/mediaedit.php
index 2f0466ab8..66d40ad5e 100644
--- a/lib/tpl/default/mediaedit.php
+++ b/lib/tpl/default/mediaedit.php
@@ -31,49 +31,49 @@
   <h1><?php echo hsc($lang['metaedit'])?> <code><?php echo hsc(noNS($IMG))?></code></h1>
 
   <div class="mediaedit">
-		<?php/* everything in meta array is tried to save and read */?>
+    <?php/* everything in meta array is tried to save and read */?>
 
- 		<div class="data">
-			<form action="<?php echo DOKU_BASE?>lib/exe/media.php" accept-charset="utf-8" method="post">
-				<input type="hidden" name="edit" value="<?php echo hsc($IMG)?>" />
-				<input type="hidden" name="save" value="1" />
+    <div class="data">
+      <form action="<?php echo DOKU_BASE?>lib/exe/media.php" accept-charset="utf-8" method="post">
+        <input type="hidden" name="edit" value="<?php echo hsc($IMG)?>" />
+        <input type="hidden" name="save" value="1" />
 
-				<label class="block" for="title"><?php echo $lang['img_title']?></label>
-				<input type="text" name="meta[Iptc.Headline]" id="title" class="edit"
+        <label class="block" for="img__title"><?php echo $lang['img_title']?></label>
+        <input type="text" name="meta[Iptc.Headline]" id="img__title" class="edit"
          value="<?php echo hsc(tpl_img_getTag('IPTC.Headline'))?>" /><br />
 
-				<label class="block" for="caption"><?php echo $lang['img_caption']?></label>
-				<textarea name="meta[Iptc.Caption]" id="caption" class="edit" rows="5"><?php
+        <label class="block" for="img__caption"><?php echo $lang['img_caption']?></label>
+        <textarea name="meta[Iptc.Caption]" id="img__caption" class="edit" rows="5"><?php
           echo hsc(tpl_img_getTag(array('IPTC.Caption',
                                         'EXIF.UserComment',
                                         'EXIF.TIFFImageDescription',
                                         'EXIF.TIFFUserComment')));
         ?></textarea><br />
 
-				<label class="block" for="artist"><?php echo $lang['img_artist']?></label>
-				<input type="text" name="meta[Iptc.Byline]" id="artist" class="edit"
+        <label class="block" for="img__artist"><?php echo $lang['img_artist']?></label>
+        <input type="text" name="meta[Iptc.Byline]" id="img__artist" class="edit"
          value="<?php echo hsc(tpl_img_getTag(array('Iptc.Byline',
                                                     'Exif.TIFFArtist',
                                                     'Exif.Artist',
                                                     'Iptc.Credit')))?>" /><br />
 
-				<label class="block" for="copy"><?php echo $lang['img_copyr']?></label>
-				<input type="text" name="meta[Iptc.CopyrightNotice]" id="copy" class="edit"
+        <label class="block" for="img__copy"><?php echo $lang['img_copyr']?></label>
+        <input type="text" name="meta[Iptc.CopyrightNotice]" id="img__copy" class="edit"
          value="<?php echo hsc(tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright')))?>" /><br />
 
 
-				<label class="block" for="keywords"><?php echo $lang['img_keywords']?></label>
-        <textarea name="meta[Iptc.Keywords]" id="keywords" class="edit"><?php
+        <label class="block" for="img__keywords"><?php echo $lang['img_keywords']?></label>
+        <textarea name="meta[Iptc.Keywords]" id="img__keywords" class="edit"><?php
           echo hsc(tpl_img_getTag(array('IPTC.Keywords',
                                         'EXIF.Category')));
         ?></textarea><br />
 
 
-				<input type="submit" value="<?php echo $lang['btn_save']?>" title="ALT+S"
+        <input type="submit" value="<?php echo $lang['btn_save']?>" title="ALT+S"
          accesskey="s" class="button" />
 
-			</form>
- 		</div>
+      </form>
+    </div>
 
 
     <div class="footer">
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
index f586e5d6b..296c4353e 100644
--- a/lib/tpl/default/print.css
+++ b/lib/tpl/default/print.css
@@ -18,7 +18,7 @@ img {border:0}
 a {
   color:#000000;
   text-decoration:none;
-	background: none !important;
+  background: none !important;
 }
 
 
@@ -100,8 +100,8 @@ img.medialeft {
   border: 0;
   float: left;
   margin: 0 1.5em 0 0;
-} 
-  
+}
+
 img.mediaright {
   border: 0;
   float: right;
@@ -109,7 +109,7 @@ img.mediaright {
 }
 
 /* unordered lists */
-ul { 
+ul {
     line-height: 1.5em;
     list-style-type: square;
     margin: 0 0 1.0em 1.5em;