diff options
| -rw-r--r-- | inc/media.php | 25 | ||||
| -rw-r--r-- | lib/tpl/default/media.css | 33 |
2 files changed, 45 insertions, 13 deletions
diff --git a/inc/media.php b/inc/media.php index 384ecb580..ac9ea6a6e 100644 --- a/inc/media.php +++ b/inc/media.php @@ -421,22 +421,27 @@ function media_uploadform($ns, $auth){ <div class="upload"><?php echo $lang['mediaupload']?></div> <form action="<?php echo DOKU_BASE?>lib/exe/mediamanager.php" method="post" enctype="multipart/form-data" class="upload"> + <fieldset> <input type="hidden" name="ns" value="<?php echo hsc($ns)?>" /> + <p> + <label for="upload__file"><?php echo $lang['txt_upload']?>:</label> + <input type="file" name="upload" class="edit" id="upload__file" /> + </p> - <?php echo $lang['txt_upload']?>: - <input type="file" name="upload" class="edit" id="upload__file" /><br /> - - <?php echo $lang['txt_filename']?>: - <input type="text" name="id" class="edit" id="upload__name" /> - <input type="submit" class="button" value="<?php echo $lang['btn_upload']?>" accesskey="s" /> + <p> + <label for="upload__name"><?php echo $lang['txt_filename']?>:</label> + <input type="text" name="id" class="edit" id="upload__name" /> + <input type="submit" class="button" value="<?php echo $lang['btn_upload']?>" accesskey="s" /> + </p> <?php if($auth >= AUTH_DELETE){?> - <br /> - <label for="dw__ow"> - <input type="checkbox" name="ow" value="1" id="dw__ow" /><?php echo $lang['txt_overwrt']?> - </label> + <p> + <input type="checkbox" name="ow" value="1" id="dw__ow" class="check" /> + <label for="dw__ow" class="check"><?php echo $lang['txt_overwrt']?></label> + </p> <?php }?> + </fieldset> </form> <?php } diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css index 10a5780c3..c36c48452 100644 --- a/lib/tpl/default/media.css +++ b/lib/tpl/default/media.css @@ -130,14 +130,41 @@ it's dirty, so any "real" fixes are welcome */ /* --- upload form --- */ #media__content div.upload { - font-size: 80%; - padding: 0.5em 0 0.5em 0.5em; + font-size: 90%; + padding: 0 0.5em 0.5em 0.5em; } #media__content form.upload { display: block; border-bottom: solid 1px __dark__; - padding: 0 0 1em 2em; + padding: 0 0.5em 1em 0.5em; +} +#media__content form.upload fieldset { + padding: 0; + margin: 0; + border: none; + width: auto; +} +#media__content form.upload p { + clear: left; + text-align: left; + padding: 0.25em 0; + margin: 0; + line-height: 1.0em; +} +#media__content form.upload label { + float: left; + width: 12.0em; + margin-right: .5em; +} +#media__content form.upload input { +} +#media__content form.upload label.check { + float: none; + width: auto; +} +#media__content form.upload input.check { + margin-left: 12.0em; } /* --- meta edit form --- */ |