Merge https://github.com/friendica/red into pending_merge
This commit is contained in:
friendica
commit
3d47285414
@ -855,16 +855,14 @@ function photos_content(&$a) {
|
||||
$tools = array(
|
||||
'profile'=>array($a->get_baseurl() . '/profile_photo/use/'.$ph[0]['resource_id'], t('Use as profile photo')),
|
||||
);
|
||||
}
|
||||
|
||||
// lock
|
||||
$lock = ( ( ($ph[0]['uid'] == local_user()) && (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
|
||||
$lock = ( ( (strlen($ph[0]['allow_cid']) || strlen($ph[0]['allow_gid'])
|
||||
|| strlen($ph[0]['deny_cid']) || strlen($ph[0]['deny_gid'])) )
|
||||
? t('Private Message')
|
||||
? t('Private Photo')
|
||||
: Null);
|
||||
|
||||
|
||||
}
|
||||
|
||||
$a->page['htmlhead'] .= '<script>$(document).keydown(function(event) {' . "\n";
|
||||
if($prevlink)
|
||||
$a->page['htmlhead'] .= 'if(event.ctrlKey && event.keyCode == 37) { event.preventDefault(); window.location.href = \'' . $prevlink . '\'; }' . "\n";
|
||||
@ -873,7 +871,7 @@ function photos_content(&$a) {
|
||||
$a->page['htmlhead'] .= '});</script>';
|
||||
|
||||
if($prevlink)
|
||||
$prevlink = array($prevlink, '<i class="icon-backward photo-icons""></i>') ;
|
||||
$prevlink = array($prevlink, t('Previous'));
|
||||
|
||||
$photo = array(
|
||||
'href' => $a->get_baseurl() . '/photo/' . $hires['resource_id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']],
|
||||
@ -882,7 +880,7 @@ function photos_content(&$a) {
|
||||
);
|
||||
|
||||
if($nextlink)
|
||||
$nextlink = array($nextlink, '<i class="icon-forward photo-icons"></i>');
|
||||
$nextlink = array($nextlink, t('Next'));
|
||||
|
||||
|
||||
// Do we have an item for this photo?
|
||||
@ -1122,6 +1120,8 @@ function photos_content(&$a) {
|
||||
'$prevlink' => $prevlink,
|
||||
'$nextlink' => $nextlink,
|
||||
'$desc' => $ph[0]['description'],
|
||||
'$filename' => $ph[0]['filename'],
|
||||
'$unknown' => t('Unknown'),
|
||||
'$tag_hdr' => t('In This Photo:'),
|
||||
'$tags' => $tags,
|
||||
'$edit' => $edit,
|
||||
|
||||
@ -3,19 +3,14 @@
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
#photo-view-wrapper {
|
||||
float:left;
|
||||
min-width: 500px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#photo-prev-link, #photo-next-link {
|
||||
padding: 10px;
|
||||
float: left;
|
||||
.photo-item-tools-left,
|
||||
.photo-item-tools-right {
|
||||
padding: 7px 10px;
|
||||
}
|
||||
|
||||
#photo-photo {
|
||||
float: left;
|
||||
display: table;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
#photo-photo-end {
|
||||
@ -82,9 +77,6 @@
|
||||
#photo-edit-link-wrap {
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
#photo-like-div {
|
||||
margin-bottom: 25px;
|
||||
}
|
||||
|
||||
#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end {
|
||||
clear: both;
|
||||
@ -94,18 +86,10 @@
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#photo-edit-delete-button {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#photo-edit-edit-wrapper {
|
||||
margin-top: 10px;
|
||||
margin-bottom: 30px;
|
||||
}
|
||||
|
||||
#photo-photo-delete-button {
|
||||
float: right;
|
||||
margin-top: -64px;
|
||||
#photo-edit-edit {
|
||||
padding: 7px 10px;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
|
||||
#photo-edit-end {
|
||||
@ -116,16 +100,6 @@
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
|
||||
#in-this-photo-text {
|
||||
margin-left: 30px;
|
||||
}
|
||||
|
||||
#in-this-photo {
|
||||
margin-left: 60px;
|
||||
margin-top: 10px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
#photo-album-edit-submit, #photo-album-edit-drop {
|
||||
margin-top: 15px;
|
||||
margin-bottom: 15px;
|
||||
|
||||
@ -648,7 +648,7 @@ footer {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
|
||||
.profile-match-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo {
|
||||
border-radius: $radiuspx;
|
||||
-moz-border-radius: $radiuspx;
|
||||
box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
|
||||
@ -704,16 +704,11 @@ footer {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#photo-caption {
|
||||
font-size: 110%;
|
||||
font-weight: bold;
|
||||
#photo-view-wrapper,
|
||||
#photo-edit-edit {
|
||||
background-color: $item_colour;
|
||||
}
|
||||
|
||||
#in-this-photo-text {
|
||||
color: #0080FF;
|
||||
}
|
||||
|
||||
|
||||
#side-follow-wrapper {
|
||||
margin-top: 20px;
|
||||
}
|
||||
@ -2327,8 +2322,9 @@ aside .nav-pills > li > a {
|
||||
.section-title-wrapper {
|
||||
padding: 7px 10px;
|
||||
background-color: $item_colour;
|
||||
border-radius: $radiuspx;
|
||||
margin-bottom: 10px;
|
||||
border-top-left-radius: $radiuspx;
|
||||
border-top-right-radius: $radiuspx;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
|
||||
.section-title-wrapper h2 {
|
||||
|
||||
@ -1,46 +1,41 @@
|
||||
<div id="live-photos"></div>
|
||||
<div class="generic-content-wrapper-styled">
|
||||
<h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
|
||||
<div class="generic-content-wrapper">
|
||||
|
||||
<div id="photo-edit-link-wrap">
|
||||
<div class="section-title-wrapper">
|
||||
|
||||
{{if $lock}}
|
||||
<div class="wall-item-lock dropdown">
|
||||
<i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs pull-right">
|
||||
{{if $prevlink}}
|
||||
<a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $nextlink}}
|
||||
<a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="btn-group btn-group-xs pull-right dropdown">
|
||||
{{if $tools}}
|
||||
<div>
|
||||
<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}}
|
||||
<div id="photo-view-wrapper">
|
||||
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="max-width: 100%;" src="{{$photo.src}}"></a></div>
|
||||
<div id="photo-photo-end"></div>
|
||||
<div id="photo-caption">{{$desc}}</div>
|
||||
{{if $tags}}
|
||||
<div id="in-this-photo-text">{{$tag_hdr}}</div>
|
||||
{{foreach $tags as $t}}
|
||||
<div id="in-this-photo">{{$t.0}}</div>
|
||||
{{if $edit}}<div id="tag-remove"><a href="{{$t.1}}">{{$t.2}}</a></div>{{/if}}
|
||||
{{/foreach}}
|
||||
<a class="btn btn-default" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
|
||||
{{/if}}
|
||||
|
||||
{{if $edit}}
|
||||
<div id="photo-edit-edit-wrapper" class="btn btn-default fakelink" onclick="openClose('photo-edit-edit'); closeOpen('photo-photo-delete-button')">{{$edit.edit}}</div>
|
||||
<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit-edit');"></i>
|
||||
{{/if}}
|
||||
|
||||
{{if $lock}}
|
||||
<i class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
|
||||
<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
</div>
|
||||
<div id="photo-edit-edit" style="display: none;">
|
||||
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
|
||||
|
||||
<input type="hidden" name="item_id" value="{{$edit.item_id}}">
|
||||
|
||||
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
|
||||
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" list="dl-albums">
|
||||
<input id="photo-edit-albumname" type="text" name="albname" value="{{$edit.album}}" list="dl-albums">
|
||||
{{if $edit.albums}}
|
||||
<datalist id="dl-albums">
|
||||
{{foreach $edit.albums as $al}}
|
||||
@ -51,15 +46,11 @@
|
||||
</datalist>
|
||||
{{/if}}
|
||||
<div id="photo-edit-albumname-end"></div>
|
||||
|
||||
<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
|
||||
<input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}">
|
||||
|
||||
<input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}">
|
||||
<div id="photo-edit-caption-end"></div>
|
||||
|
||||
<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
|
||||
<input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text">
|
||||
|
||||
<input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text">
|
||||
<div id="photo-edit-tags-end"></div>
|
||||
<div id="photo-edit-rotate-wrapper">
|
||||
<div id="photo-edit-rotate-label">
|
||||
@ -70,7 +61,6 @@
|
||||
<input type="radio" name="rotate" value="2">
|
||||
</div>
|
||||
<div id="photo-edit-rotate-end"></div>
|
||||
|
||||
<div id="settings-default-perms" class="settings-default-perms">
|
||||
<span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
|
||||
<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
|
||||
@ -79,36 +69,54 @@
|
||||
</div>
|
||||
<br/>
|
||||
<div id="settings-default-perms-end"></div>
|
||||
|
||||
<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
|
||||
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
|
||||
|
||||
<div id="photo-edit-end"></div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post">
|
||||
<input id="photo-photo-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
|
||||
</form>
|
||||
<div id="photo-view-wrapper">
|
||||
|
||||
|
||||
<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
|
||||
<div id="photo-photo-end"></div>
|
||||
|
||||
<div class="photo-item-tools">
|
||||
{{if $tags}}
|
||||
<div class="photo-item-tools-left pull-left">
|
||||
<div id="in-this-photo">
|
||||
<span id="in-this-photo-text">{{$tag_hdr}}</span>
|
||||
{{foreach $tags as $t}}
|
||||
{{$t.0}}{{if $edit}}<span id="tag-remove"> <a href="{{$t.1}}"><i class="icon-remove"></i></a> </span>{{/if}}
|
||||
{{/foreach}}
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $likebuttons}}
|
||||
<div id="photo-like-div">
|
||||
{{$likebuttons}}
|
||||
<div class="photo-item-tools-right btn-group pull-right">
|
||||
<i class="icon-thumbs-up-alt item-tool btn btn-default btn-sm" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
|
||||
<i class="icon-thumbs-down-alt item-tool btn btn-default btn-sm" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
|
||||
{{$like}}
|
||||
{{$dislike}}
|
||||
</div>
|
||||
<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
|
||||
{{/if}}
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
{{$comments}}
|
||||
|
||||
{{if $commentbox}}
|
||||
<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
|
||||
{{$commentbox}}
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
</div>
|
||||
|
||||
{{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}"><i class="icon-forward photo-icons"></i></a></div>{{/if}}
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user