harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica 2014-10-27 16:20:59 -07:00
commit 1b53d1c1d3
12 changed files with 7040 additions and 6851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Privacy.md
View File

@ -64,7 +64,7 @@ A decentralized identity has a lot of advantages and gives you al lot of interes
The RedMatrix is a global network which is inclusive of all religions and cultures. This does not imply that every member of the network feels the same way you do on contentious issues, and some people may be STRONGLY opposed to the content you post. In general, if you wish to post something that you know may nor be universally acceptable, the best approach is to restrict the audience using privacy controls to a small circle of friends.
The RedMatrix as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the RedMatrix as a network cannot block it from being posted.
The RedMatrix as a network provider is unable to censor content. However, hub administrators MAY censor any content which appears on their hub to comply with local laws or even personal judgement. Their decision is final. If you have issues with any hub administrator, you may move your account and postings to another site which is more in line with your expectations. Please check (periodically) the [Terms of Service](help/TermsOfService) of your hub to learn about any rules or guidelines. If your content consists of material which is illegal or may cause issues, you are STRONGLY encouraged to host your own (become a hub administrator). You may still find that your content is blocked on some hubs, but the RedMatrix as a network cannot block it from being posted.
The RedMatrix RECOMMENDS that hub administrators provide a grace period of 1-2 days between warning an account holder of content that needs to be removed and physically removing or disabling the account. This will give the content owner an opportunity to export their channel meta-data and import it to another site. In rare cases the content may be of such a nature to justify the immediate termination of the account. This is a hub decision, not a RedMatrix decision.

6
doc/main.bb
View File

@ -75,5 +75,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri
[url=https://zothub.com/channel/one]Development Channel[/url]
[url=[baseurl]/help/credits]RedMatrix Credits[/url]
[size=large][b]About This Red Matrix Site[/b][/size]
[zrl=[baseurl]/siteinfo] [baseurl]/siteinfo[/zrl]
[size=large][b]About This RedMatrix Hub[/b][/size]
[zrl=[baseurl]/help/TermsOfService]Terms of Service For This Hub[/zrl]
[zrl=[baseurl]/siteinfo]Hub Information (/siteinfo)[/zrl]

2
doc/registration.bb
View File

@ -12,7 +12,7 @@ Enter a password of your choice, and repeat it in the second box to ensure it wa
[b]Terms Of Service[/b]
Click the link to read the site's terms of service. Once you've read them, tick the box in the register form to confirm.
Click the link to read the site's [zrl=[baseurl]/help/TermsOfService]Terms of Service[/zrl]. Once you've read them, tick the box in the register form to confirm.
[b]Register[/b]

18
mod/photos.php
View File

@ -661,7 +661,8 @@ function photos_content(&$a) {
intval($a->pager['itemspage'])
);
if($cmd === 'edit') {
//edit album name
$album_edit = null;
if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
if($a->get_template_engine() === 'internal') {
@ -670,9 +671,8 @@ function photos_content(&$a) {
else {
$album_e = $album;
}
$edit_tpl = get_markup_template('album_edit.tpl');
$o .= replace_macros($edit_tpl,array(
$album_edit = replace_macros($edit_tpl,array(
'$nametext' => t('New album name: '),
'$nickname' => $a->data['channel']['channel_address'],
'$album' => $album_e,
@ -682,14 +682,6 @@ function photos_content(&$a) {
));
}
}
}
else {
if(($album !== t('Profile Photos')) && ($album !== 'Profile Photos') && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) {
$edit = array(t('Edit Album'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album) . '/edit');
}
}
}
if($_GET['order'] === 'posted')
$order = array(t('Show Newest First'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/album/' . bin2hex($album));
@ -727,6 +719,7 @@ function photos_content(&$a) {
'desc'=> $desc_e,
'ext' => $ext,
'hash'=> $rr['resource_id'],
'unknown' => t('Unknown')
);
}
}
@ -749,10 +742,11 @@ function photos_content(&$a) {
$o .= replace_macros($tpl, array(
'$photos' => $photos,
'$album' => $album,
'$album_edit' => array(t('Edit Album'), $album_edit),
'$can_post' => $can_post,
'$upload' => array(t('Upload'), $a->get_baseurl() . '/photos/' . $a->data['channel']['channel_address'] . '/upload/' . bin2hex($album)),
'$order' => $order,
'$edit' => $edit
));
}

16
view/css/mod_photos.css
View File

@ -87,28 +87,18 @@
}
#photo-edit-edit {
#photo-edit-edit,
#photo-album-edit-wrapper {
display: none;
padding: 7px 10px;
margin-bottom: 3px;
}
#photo-edit-end {
margin-bottom: 35px;
}
#photo-caption {
margin-top: 15px;
margin-bottom: 15px;
}
#photo-album-edit-submit, #photo-album-edit-drop {
margin-top: 15px;
margin-bottom: 15px;
}
#photo-album-edit-drop {
margin-left: 200px;
}
#photos-usage-message {
line-height: 22px;
}

11138
view/nl/messages.po
View File

File diff suppressed because it is too large Load Diff

2625
view/nl/strings.php
View File

File diff suppressed because it is too large Load Diff

1
view/theme/redbasic/css/style.css
View File

@ -704,6 +704,7 @@ footer {
cursor: pointer;
}
#photo-album-edit-wrapper,
#photo-view-wrapper,
#photo-edit-edit {
background-color: $item_colour;

2
view/tpl/album_edit.tpl
View File

@ -3,7 +3,7 @@
<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
<input type="text" size="64" name="albumname" value="{{$album}}" >
<input type="text" name="albumname" value="{{$album}}" >
<div id="photo-album-edit-name-end"></div>

5
view/tpl/photo_album.tpl
View File

@ -1,7 +1,7 @@
<div class="section-title-wrapper">
<div class="btn-group btn-group-xs pull-right">
{{if $edit}}
<a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a>
{{if $album_edit.1}}
<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i>
{{/if}}
<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
{{if $can_post}}
@ -12,6 +12,7 @@
<div class="clear"></div>
</div>
{{$album_edit.1}}
<div id="photo-album-contents" class="generic-content-wrapper">
{{foreach $photos as $photo}}
{{include file="photo_top.tpl"}}

2
view/tpl/photo_top.tpl
View File

@ -1,4 +1,4 @@
<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
</a>

6
view/tpl/photo_view.tpl
View File

@ -31,7 +31,7 @@
<div class="clear"></div>
</div>
<div id="photo-edit-edit" style="display: none;">
<div id="photo-edit-edit">
<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>
@ -155,7 +155,6 @@
</div>
{{/if}}
{{if $likebuttons}}
<div class="photo-item-tools-right btn-group pull-right">
<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
@ -167,11 +166,10 @@
</div>
<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
{{/if}}
<div class="clear"></div>
</div>
</div>
{{$comments}}