diff options
| author | modus75 <modus75@users.noreply.github.com> | 2015-10-15 22:05:20 +0200 |
|---|---|---|
| committer | modus75 <modus75@users.noreply.github.com> | 2015-10-15 22:05:20 +0200 |
| commit | d7fef70c4c3707fd7650896c5a62f0a7c5cc81f0 (patch) | |
| tree | 539c0807d513c250242f13e5eebc3e89031b3519 /admin | |
| parent | 11ccdff58523d10ccc970b879c5de01e7ec40ee2 (diff) | |
fix #361 - Watermark Y repeat
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/configuration.php | 3 | ||||
| -rw-r--r-- | admin/include/configuration_watermark_process.inc.php | 2 | ||||
| -rw-r--r-- | admin/themes/default/template/configuration_watermark.tpl | 7 |
3 files changed, 11 insertions, 1 deletions
diff --git a/admin/configuration.php b/admin/configuration.php index e7e6033c8..f363021f8 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -578,7 +578,7 @@ switch ($page['section']) $position = 'bottomright'; } - if ($wm->xrepeat != 0) + if ($wm->xrepeat != 0 || $wm->yrepeat != 0) { $position = 'custom'; } @@ -592,6 +592,7 @@ switch ($page['section']) 'xpos' => $wm->xpos, 'ypos' => $wm->ypos, 'xrepeat' => $wm->xrepeat, + 'yrepeat' => $wm->yrepeat, 'opacity' => $wm->opacity, 'position' => $position, ) diff --git a/admin/include/configuration_watermark_process.inc.php b/admin/include/configuration_watermark_process.inc.php index ad23d92a2..2eeb381af 100644 --- a/admin/include/configuration_watermark_process.inc.php +++ b/admin/include/configuration_watermark_process.inc.php @@ -126,6 +126,7 @@ if (count($errors) == 0) $watermark->xpos = intval($pwatermark['xpos']); $watermark->ypos = intval($pwatermark['ypos']); $watermark->xrepeat = intval($pwatermark['xrepeat']); + $watermark->yrepeat = intval($pwatermark['yrepeat']); $watermark->opacity = intval($pwatermark['opacity']); $watermark->min_size = array(intval($pwatermark['minw']),intval($pwatermark['minh'])); @@ -135,6 +136,7 @@ if (count($errors) == 0) || $watermark->xpos != $old_watermark->xpos || $watermark->ypos != $old_watermark->ypos || $watermark->xrepeat != $old_watermark->xrepeat + || $watermark->yrepeat != $old_watermark->yrepeat || $watermark->opacity != $old_watermark->opacity; // save the new watermark configuration diff --git a/admin/themes/default/template/configuration_watermark.tpl b/admin/themes/default/template/configuration_watermark.tpl index 11343057d..24e2a346e 100644 --- a/admin/themes/default/template/configuration_watermark.tpl +++ b/admin/themes/default/template/configuration_watermark.tpl @@ -111,6 +111,13 @@ <input size="3" maxlength="3" type="text" name="w[xrepeat]" value="{$watermark.xrepeat}"{if isset($ferrors.watermark.xrepeat)} class="dError"{/if}> {if isset($ferrors.watermark.xrepeat)}<span class="dErrorDesc" title="{$ferrors.watermark.xrepeat}">!</span>{/if} </label> + + <br> + <label>{'Y Repeat'|translate} + <input size="3" maxlength="3" type="text" name="w[yrepeat]" value="{$watermark.yrepeat}"{if isset($ferrors.watermark.yrepeat)} class="dError"{/if}> + {if isset($ferrors.watermark.yrepeat)}<span class="dErrorDesc" title="{$ferrors.watermark.yrepeat}">!</span>{/if} + </label> + </div> </li> |