GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Matt's demands (ticket #217)

Browse Source
This commit is contained in:
Max Shinn 2010-12-28 19:45:25 -06:00
parent e525e9ab9b
commit e9e5fdb139
5 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/GNUsocialPhotos/actions/editphoto.php
View File

@ -172,12 +172,16 @@ class EditphotoAction extends Action
$this->showForm(_('Error: The photo data is not valid.')); $this->showForm(_('Error: The photo data is not valid.'));
return; return;
} }
common_redirect('/photo/' . $this->photo->id, '303');
$this->showForm(_('Success!')); $this->showForm(_('Success!'));
} }
function deletePhoto() function deletePhoto()
{ {
//For redirection
$oldalbum = $this->album_id;
$this->photo->title = ""; $this->photo->title = "";
$this->photo->photo_description = ""; $this->photo->photo_description = "";
$this->photo->profile_id = 0; $this->photo->profile_id = 0;
@ -192,6 +196,7 @@ class EditphotoAction extends Action
return; return;
} }
$this->showForm(_('Success!')); $this->showForm(_('Success!'));
common_redirect('/' . $this->user->nickname . '/photos/' . $oldalbum, '303');
return; return;
} }

2
plugins/GNUsocialPhotos/actions/photo.php
View File

@ -99,7 +99,7 @@ class PhotoAction extends Action
$this->elementEnd('div'); $this->elementEnd('div');
} }
$this->element('p', array(), $this->photo->photo_description); $this->element('p', array('class' => 'photodescription'), $this->photo->photo_description);
//This is a hack to hide the top-level comment //This is a hack to hide the top-level comment
$this->element('style', array(), "#notice-{$this->photo->notice_id} div { display: none } #notice-{$this->photo->notice_id} ol li div { display: inline }"); $this->element('style', array(), "#notice-{$this->photo->notice_id} div { display: none } #notice-{$this->photo->notice_id} ol li div { display: inline }");
$this->conversation->show(); $this->conversation->show();

39
plugins/GNUsocialPhotos/actions/photos.php
View File

@ -74,6 +74,16 @@ class PhotosAction extends Action
$nav->show(); $nav->show();
} }
function showResizeImagesBox()
{
$this->elementStart('select', array('onchange' => 'return scalePhotosToSize(this.value)'));
$this->element('option', array('value' => ''), "");
$this->element('option', array('value' => '60'), _("Thumbnail"));
$this->element('option', array('value' => '120'), _("Medium"));
$this->element('option', array('value' => '400'), _("Normal"));
$this->elementEnd('select');
}
function showAlbums() function showAlbums()
{ {
$album = new GNUsocialPhotoAlbum(); $album = new GNUsocialPhotoAlbum();
@ -85,13 +95,17 @@ class PhotosAction extends Action
} }
$this->elementStart('div', array('class' => 'galleryheader')); $this->elementStart('div', array('class' => 'galleryheader'));
$this->element('a', array('href' => '#', //$this->element('a', array('href' => '#',
'onclick' => 'return increasePhotoSize()'), '+'); // 'onclick' => 'return increasePhotoSize()'), '+');
$this->raw(' | '); //$this->raw(' | ');
$this->element('a', array('href' => '#', //$this->element('a', array('href' => '#',
'onclick' => 'return decreasePhotoSize()'), '-'); // 'onclick' => 'return decreasePhotoSize()'), '-');
$this->showResizeImagesBox();
$this->elementEnd('div'); $this->elementEnd('div');
while ($album->fetch()) { while ($album->fetch()) {
$this->elementStart('div', array('class' => 'photocontainer')); $this->elementStart('div', array('class' => 'photocontainer'));
$this->elementStart('a', array('href' => $album->getPageLink())); $this->elementStart('a', array('href' => $album->getPageLink()));
@ -126,13 +140,16 @@ class PhotosAction extends Action
$this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page+1) ), 'Next page'); $this->element('a', array('href' => $album->getPageLink() . '?pageid=' . ($page+1) ), 'Next page');
$this->raw(' | '); $this->raw(' | ');
} }
$this->element('a', array('href' => '#',
'onclick' => 'return increasePhotoSize()'), '+');
$this->raw(' | ');
$this->element('a', array('href' => '#',
'onclick' => 'return decreasePhotoSize()'), '-');
$this->elementEnd('div');
//$this->element('a', array('href' => '#',
// 'onclick' => 'return increasePhotoSize()'), '+');
//$this->raw(' | ');
//$this->element('a', array('href' => '#',
// 'onclick' => 'return decreasePhotoSize()'), '-');
//$this->raw(' | ');
$this->showResizeImagesBox();
$this->elementEnd('div');
foreach ($photos as $photo) { foreach ($photos as $photo) {
$this->elementStart('a', array('href' => $photo->getPageLink())); $this->elementStart('a', array('href' => $photo->getPageLink()));

14
plugins/GNUsocialPhotos/res/gnusocialphotos.js
View File

@ -13,3 +13,17 @@ function decreasePhotoSize() {
}); });
return false; return false;
} }
function scalePhotosToSize(size) {
$('.photoingallery, .albumingallery').each(function(index) {
if(this.height > this.width) {
this.width = this.width*size/this.height;
this.height = size;
}
else {
this.height = this.height*size/this.width;
this.width = size;
}
});
return false;
}

6
plugins/GNUsocialPhotos/res/style.css
View File

@ -6,3 +6,9 @@
margin: 15px; margin: 15px;
} }
.photodescription {
display: block;
background-color: #dddddd;
padding: 20px;
margin: 15px;
}