diff options
| author | Anika Henke <anika@selfthinker.org> | 2011-09-25 11:47:53 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2011-09-25 11:47:53 +0100 |
| commit | 9a71fb5c963f2943a45bc4d0c77a84dd788e17b3 (patch) | |
| tree | 2346a36e15461a8ccf667d5a98aaf2904bbf9702 /inc | |
| parent | b680ea06a64290b3e28a7b7d2d8d33373a3e6709 (diff) | |
| download | rpg-9a71fb5c963f2943a45bc4d0c77a84dd788e17b3.tar.gz rpg-9a71fb5c963f2943a45bc4d0c77a84dd788e17b3.tar.bz2 | |
media manager: fixed and improved diff views
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/media.php | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/inc/media.php b/inc/media.php index 4ca4c509c..f5099c1d5 100644 --- a/inc/media.php +++ b/inc/media.php @@ -1077,9 +1077,12 @@ 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', - 'id' => 'mediamanager__form_diffview')); + $form = new Doku_Form(array( + 'action' => media_managerURL(array(), '&'), + 'method' => 'get', + 'id' => 'mediamanager__form_diffview', + 'class' => '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>'); @@ -1189,8 +1192,6 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) { } } - echo '<div class="mediamanager-preview">'; - $l_more = array('rev' => $l_rev, 'h' => $l_size[1], 'w' => $l_size[0]); $r_more = array('rev' => $r_rev, 'h' => $l_size[1], 'w' => $l_size[0]); @@ -1198,19 +1199,17 @@ function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) { $r_src = ml($image, $r_more); // slider - echo '<div class="diff_slider" style="max-width: '.($l_size[0]-20).'px;" ></div>'; + echo '<div class="slider" style="max-width: '.($l_size[0]-20).'px;" ></div>'.NL; // two images in divs - echo '<div class="diff_' . $type . '">'; + echo '<div class="imageDiff ' . $type . '">'.NL; echo '<div class="image1" style="max-width: '.$l_size[0].'px;">'; echo '<img src="'.$l_src.'" alt="" />'; - echo '</div>'; + echo '</div>'.NL; echo '<div class="image2" style="max-width: '.$l_size[0].'px;">'; echo '<img src="'.$r_src.'" alt="" />'; - echo '</div>'; - echo '</div>'; - - echo '</div>'; + echo '</div>'.NL; + echo '</div>'.NL; } /** |