diff options
| author | Anika Henke <anika@selfthinker.org> | 2011-09-18 19:58:05 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2011-09-18 19:58:05 +0100 |
| commit | 2f082fa95205868e228810e3e726af8b6457ceab (patch) | |
| tree | 8bc386856d21d9f6102057c8949e7a45b4e5b98f /inc/media.php | |
| parent | c57314fe779ba40a0d3d15fb315b7d6d9acfe730 (diff) | |
| parent | eaac63bb6c71253d7c2d4817c7ffc40cf4f13aeb (diff) | |
| download | rpg-2f082fa95205868e228810e3e726af8b6457ceab.tar.gz rpg-2f082fa95205868e228810e3e726af8b6457ceab.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Conflicts:
lib/tpl/default/mediamanager.css
Diffstat (limited to 'inc/media.php')
| -rw-r--r-- | inc/media.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/inc/media.php b/inc/media.php index bcc5e4400..b6ee3cb03 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1099,8 +1099,9 @@ function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){ $difftype = $_REQUEST['difftype']; if (!$fromajax) { - $form = new Doku_Form(array('action'=>media_managerURL(array(), '&'), 'method' => 'get' - )); + $form = new Doku_Form(array('action' => media_managerURL(array(), '&'), + 'method' => 'get', + 'id' => 'mediamanager__form_diffview')); $form->addHidden('sectok', null); $form->addElement('<input type="hidden" name="rev2[]" value="'.$l_rev.'" ></input>'); $form->addElement('<input type="hidden" name="rev2[]" value="'.$r_rev.'" ></input>'); @@ -1219,10 +1220,10 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) { $r_src = ml($image, $r_more); // slider - echo '<div id="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>'; + echo '<div class="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>'; // two images in divs - echo '<div id="diff_' . $type . '">'; + echo '<div class="diff_' . $type . '">'; echo '<div class="image1" style="max-width: '.$l_size[0].'px;">'; echo '<img src="'.$l_src.'" alt="" />'; echo '</div>'; |