forked from GNUsocial/gnu-social
Pictures/albums in floating divs
This commit is contained in:
parent
330ac5dd12
commit
46b2151f09
@ -50,7 +50,7 @@ class PhotoAction extends Action
|
|||||||
|
|
||||||
$this->user = Profile::staticGet('id', $this->notice->profile_id);
|
$this->user = Profile::staticGet('id', $this->notice->profile_id);
|
||||||
|
|
||||||
$notices = Notice::conversationStream((int)$this->notice->conversation, null, null); //Why do I have to do -1?
|
$notices = Notice::conversationStream((int)$this->notice->conversation, null, null);
|
||||||
$this->conversation = new ConversationTree($notices, $this);
|
$this->conversation = new ConversationTree($notices, $this);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
|
@ -83,16 +83,15 @@ class PhotosAction extends Action
|
|||||||
if (!$album->find()) {
|
if (!$album->find()) {
|
||||||
GNUsocialPhotoAlbum::newAlbum($cur->id, 'Default');
|
GNUsocialPhotoAlbum::newAlbum($cur->id, 'Default');
|
||||||
}
|
}
|
||||||
$this->elementStart('ul', array('class' => 'photothumbs'));
|
|
||||||
while ($album->fetch()) {
|
while ($album->fetch()) {
|
||||||
$this->elementStart('li');
|
$this->element('style', array(), '.albumcontainer { display: block; background-color: green; float: left; padding: 30px; margin: 20px; }');
|
||||||
$this->element('h3', array(), $album->title);
|
$this->elementStart('div', array('class' => 'photocontainer'));
|
||||||
$this->elementStart('a', array('href' => $album->getPageLink()));
|
$this->elementStart('a', array('href' => $album->getPageLink()));
|
||||||
$this->element('img', array('src' => $album->getThumbUri()));
|
$this->element('img', array('src' => $album->getThumbUri()));
|
||||||
$this->elementEnd('a');
|
$this->elementEnd('a');
|
||||||
$this->elementEnd('li');
|
$this->element('h3', array(), $album->album_name);
|
||||||
|
$this->elementEnd('div');
|
||||||
}
|
}
|
||||||
$this->elementEnd('ul');
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,15 +115,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->elementStart('ul', array('class' => 'photothumbs'));
|
$this->element('style', array(), '.photocontainer { display: block; background-color: yellow; float: left; padding: 30px; margin: 20px; }');
|
||||||
foreach ($photos as $photo) {
|
foreach ($photos as $photo) {
|
||||||
$this->elementStart('li');
|
|
||||||
$this->elementStart('a', array('href' => $photo->getPageLink()));
|
$this->elementStart('a', array('href' => $photo->getPageLink()));
|
||||||
|
$this->elementStart('div', array('class' => 'photocontainer'));
|
||||||
$this->element('img', array('src' => $photo->thumb_uri));
|
$this->element('img', array('src' => $photo->thumb_uri));
|
||||||
|
$this->element('div', array('class' => 'phototitle'), $photo->title);
|
||||||
|
$this->elementEnd('div');
|
||||||
$this->elementEnd('a');
|
$this->elementEnd('a');
|
||||||
$this->elementEnd('li');
|
|
||||||
}
|
}
|
||||||
$this->elementEnd('ul');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user