diff options
| author | astaf <astaf@proxy.ccwn.org.ccwn.org> | 2013-06-25 15:50:08 +0200 |
|---|---|---|
| committer | astaf <astaf@proxy.ccwn.org.ccwn.org> | 2013-06-25 15:50:08 +0200 |
| commit | bc541bf09fb9afcc7810dcbe510b1783c79016ea (patch) | |
| tree | 51e65a48a0b5994eba779a1118c4964d6f63f97c | |
| parent | 95434b8b6973b13cc7409913d36c6829c4f2aac5 (diff) | |
| parent | 0eb5ddf9beede4062eaa32972e7e1a7fa1694346 (diff) | |
Merge branch 'master' of ssh://proxy:9044/home/ccwn/git-repos/admin.astaf.de
| -rw-r--r-- | .settings/org.eclipse.core.resources.prefs | 2 | ||||
| -rw-r--r-- | protected/extensions/SimpleImage/SimpleImage.php | 7 | ||||
| -rw-r--r-- | protected/views/verein/_form.php | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs index f79c35c..43df975 100644 --- a/.settings/org.eclipse.core.resources.prefs +++ b/.settings/org.eclipse.core.resources.prefs @@ -1,3 +1,3 @@ -#Fri Apr 13 11:27:54 CEST 2012 eclipse.preferences.version=1
+encoding//protected/views/verein/_form.php=UTF-8
encoding//protected/views/verein/view.php=UTF-8
diff --git a/protected/extensions/SimpleImage/SimpleImage.php b/protected/extensions/SimpleImage/SimpleImage.php index 54c4ef8..9f97a57 100644 --- a/protected/extensions/SimpleImage/SimpleImage.php +++ b/protected/extensions/SimpleImage/SimpleImage.php @@ -149,11 +149,16 @@ class SimpleImage { }
function blend($width, $height) {
+ if($width < $this->getWidth()) {
$this->resizeToWidth($width);
+ }
+ if($height > $this->getHeight()) {
+ $height = $this->getHeight();
+ }
$new_image = imagecreatetruecolor($width, $height);
imagecopyresampled($new_image, $this->image, 0, 0, 0, 0, $width, $height, $width, $height);
imagealphablending($new_image,true);
- imagefilledrectangle($new_image, 0, 0, $width, $height, imagecolorallocatealpha($new_image, 255, 255, 255, 30));
+ imagefilledrectangle($new_image, 0, 0, $width, $height, imagecolorallocatealpha($new_image, 255, 255, 255, 25));
$this->image = $new_image;
}
diff --git a/protected/views/verein/_form.php b/protected/views/verein/_form.php index 6de5d5c..c51b922 100644 --- a/protected/views/verein/_form.php +++ b/protected/views/verein/_form.php @@ -105,6 +105,10 @@ <?php echo $form->error($model,'standort_id'); ?> </div> <div class="row"> + <p>Dieses Bild wird auf der Vereinsübersicht und in der Suche als Hintergrund genutzt. + Dabei sollte es länglich sein und eine Breite von 850 Pixeln haben. + Das Bild wird von oben her genutzt und mit einem halbtransparenten Weißton überlagert. + </p> <?php echo $form->labelEx($model,'hintergrund'); ?> <?php echo CHtml::image($model->hintergrund,'height="80"'); ?><br/> <?php echo $form->fileField($model,'uploadedHintergrund', array('size'=>60)); ?> |