MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1599 from fabrixxm/issue-1574

Browse source 
Issue #1574
This commit is contained in:
fabrixxm 2015-05-27 11:07:30 +02:00
parent 50b3e49b5d 258612d20c
commit b3992e1c65
10 changed files with 623 additions and 386 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/items.php
View file

@ -4745,6 +4745,18 @@ function drop_item($id,$interactive = true) {
// ignore the result // ignore the result
} }
// If item has attachments, drop them
foreach(explode(",",$item['attach']) as $attach){
preg_match("|attach/(\d+)|", $attach, $matches);
q("DELETE FROM `attach` WHERE `id` = %d AND `uid` = %d",
intval($matches[1]),
local_user()
);
// ignore the result
}
// clean up item_id and sign meta-data tables // clean up item_id and sign meta-data tables
/* /*
@ -4821,6 +4833,7 @@ function drop_item($id,$interactive = true) {
// Add a relayable_retraction signature for Diaspora. // Add a relayable_retraction signature for Diaspora.
store_diaspora_retract_sig($item, $a->user, $a->get_baseurl()); store_diaspora_retract_sig($item, $a->user, $a->get_baseurl());
} }
$drop_id = intval($item['id']); $drop_id = intval($item['id']);
// send the notification upstream/downstream as the case may be // send the notification upstream/downstream as the case may be

72
mod/videos.php
View file

@ -92,9 +92,76 @@ function videos_init(&$a) {
function videos_post(&$a) { function videos_post(&$a) {
return; $owner_uid = $a->data['user']['uid'];
if (local_user() != $owner_uid) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
if(($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
// Check if we should do HTML-based delete confirmation
if(!x($_REQUEST,'confirm')) {
if(x($_REQUEST,'canceled')) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
$drop_url = $a->query_string;
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
'$method' => 'post',
'$message' => t('Do you really want to delete this video?'),
'$extra_inputs' => [
['name'=>'id', 'value'=> $_POST['id']],
['name'=>'delete', 'value'=>'x']
],
'$confirm' => t('Delete Video'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
'$cancel' => t('Cancel'),
));
$a->error = 1; // Set $a->error so the other module functions don't execute
return;
}
$video_id = $_POST['id'];
$r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
intval(local_user()),
dbesc($video_id)
);
if(count($r)) {
q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
intval(local_user()),
dbesc($video_id)
);
$i = q("SELECT * FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1",
dbesc($video_id),
intval(local_user())
);
#echo "<pre>"; var_dump($i); killme();
if(count($i)) {
q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($i[0]['uri']),
intval(local_user())
);
create_tags_from_itemuri($i[0]['uri'], local_user());
delete_thread_uri($i[0]['uri'], local_user());
$url = $a->get_baseurl();
$drop_id = intval($i[0]['id']);
if($i[0]['visible'])
proc_run('php',"include/notifier.php","drop","$drop_id");
}
}
goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
return; // NOTREACHED
}
goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']);
// DELETED -- look at mod/photos.php if you want to implement
} }
@ -318,6 +385,7 @@ function videos_content(&$a) {
'$can_post' => $can_post, '$can_post' => $can_post,
'$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'), '$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
'$videos' => $videos, '$videos' => $videos,
'$delete_url' => (($can_post)?$a->get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
)); ));

328
util/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.4.0\n" "Project-Id-Version: 3.4.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-21 10:43+0200\n" "POT-Creation-Date: 2015-05-24 10:38+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,9 +29,9 @@ msgstr ""
#: ../../mod/photos.php:1084 ../../mod/photos.php:1203 #: ../../mod/photos.php:1084 ../../mod/photos.php:1203
#: ../../mod/photos.php:1514 ../../mod/photos.php:1565 #: ../../mod/photos.php:1514 ../../mod/photos.php:1565
#: ../../mod/photos.php:1609 ../../mod/photos.php:1697 #: ../../mod/photos.php:1609 ../../mod/photos.php:1697
#: ../../mod/invite.php:140 ../../mod/events.php:491 ../../mod/mood.php:137 #: ../../mod/invite.php:140 ../../mod/events.php:500 ../../mod/mood.php:137
#: ../../mod/message.php:335 ../../mod/message.php:564 #: ../../mod/message.php:335 ../../mod/message.php:564
#: ../../mod/profiles.php:686 ../../mod/install.php:248 #: ../../mod/profiles.php:682 ../../mod/install.php:248
#: ../../mod/install.php:286 ../../mod/crepair.php:190 #: ../../mod/install.php:286 ../../mod/crepair.php:190
#: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45 #: ../../mod/content.php:710 ../../mod/poke.php:199 ../../mod/localtime.php:45
msgid "Submit" msgid "Submit"
@ -233,7 +233,7 @@ msgid "Your photos"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:127 ../../boot.php:2156 #: ../../view/theme/diabook/theme.php:127 ../../boot.php:2156
#: ../../include/nav.php:80 ../../mod/events.php:382 #: ../../include/nav.php:80 ../../mod/events.php:385
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -260,7 +260,7 @@ msgid "event"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:466 #: ../../view/theme/diabook/theme.php:466
#: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2060 #: ../../view/theme/diabook/theme.php:475 ../../include/diaspora.php:2061
#: ../../include/conversation.php:121 ../../include/conversation.php:130 #: ../../include/conversation.php:121 ../../include/conversation.php:130
#: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../include/conversation.php:248 ../../include/conversation.php:257
#: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87 #: ../../mod/like.php:149 ../../mod/like.php:319 ../../mod/subthread.php:87
@ -268,14 +268,14 @@ msgstr ""
msgid "status" msgid "status"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2060 #: ../../view/theme/diabook/theme.php:471 ../../include/diaspora.php:2061
#: ../../include/conversation.php:126 ../../include/conversation.php:253 #: ../../include/conversation.php:126 ../../include/conversation.php:253
#: ../../include/text.php:1995 ../../mod/like.php:149 #: ../../include/text.php:1995 ../../mod/like.php:149
#: ../../mod/subthread.php:87 ../../mod/tagger.php:62 #: ../../mod/subthread.php:87 ../../mod/tagger.php:62
msgid "photo" msgid "photo"
msgstr "" msgstr ""
#: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2076 #: ../../view/theme/diabook/theme.php:480 ../../include/diaspora.php:2077
#: ../../include/conversation.php:137 ../../mod/like.php:166 #: ../../include/conversation.php:137 ../../mod/like.php:166
#, php-format #, php-format
msgid "%1$s likes %2$s's %3$s" msgid "%1$s likes %2$s's %3$s"
@ -375,7 +375,7 @@ msgstr ""
msgid "Permission denied" msgid "Permission denied"
msgstr "" msgstr ""
#: ../../index.php:382 ../../include/items.php:4838 ../../mod/attach.php:33 #: ../../index.php:382 ../../include/items.php:4851 ../../mod/attach.php:33
#: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33 #: ../../mod/wallmessage.php:9 ../../mod/wallmessage.php:33
#: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103 #: ../../mod/wallmessage.php:79 ../../mod/wallmessage.php:103
#: ../../mod/group.php:19 ../../mod/delegate.php:12 #: ../../mod/group.php:19 ../../mod/delegate.php:12
@ -389,9 +389,9 @@ msgstr ""
#: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134 #: ../../mod/notes.php:20 ../../mod/network.php:4 ../../mod/photos.php:134
#: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/follow.php:39 #: ../../mod/photos.php:1050 ../../mod/follow.php:9 ../../mod/follow.php:39
#: ../../mod/follow.php:78 ../../mod/uimport.php:23 ../../mod/invite.php:15 #: ../../mod/follow.php:78 ../../mod/uimport.php:23 ../../mod/invite.php:15
#: ../../mod/invite.php:101 ../../mod/events.php:152 ../../mod/mood.php:114 #: ../../mod/invite.php:101 ../../mod/events.php:155 ../../mod/mood.php:114
#: ../../mod/message.php:38 ../../mod/message.php:174 #: ../../mod/message.php:38 ../../mod/message.php:174
#: ../../mod/profiles.php:165 ../../mod/profiles.php:618 #: ../../mod/profiles.php:165 ../../mod/profiles.php:614
#: ../../mod/install.php:151 ../../mod/crepair.php:119 ../../mod/poke.php:135 #: ../../mod/install.php:151 ../../mod/crepair.php:119 ../../mod/poke.php:135
#: ../../mod/display.php:501 ../../mod/dfrn_confirm.php:55 #: ../../mod/display.php:501 ../../mod/dfrn_confirm.php:55
#: ../../mod/item.php:169 ../../mod/item.php:185 #: ../../mod/item.php:169 ../../mod/item.php:185
@ -415,8 +415,9 @@ msgstr ""
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: ../../boot.php:751 ../../include/contact_widgets.php:205 #: ../../boot.php:751 ../../include/items.php:4962
#: ../../object/Item.php:393 ../../mod/content.php:606 #: ../../include/contact_widgets.php:205 ../../object/Item.php:393
#: ../../mod/content.php:606
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -515,28 +516,28 @@ msgstr ""
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
#: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:804 #: ../../boot.php:1600 ../../boot.php:1626 ../../mod/profiles.php:800
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../boot.php:1601 ../../mod/profiles.php:805 #: ../../boot.php:1601 ../../mod/profiles.php:801
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../boot.php:1611 ../../mod/profiles.php:816 #: ../../boot.php:1611 ../../mod/profiles.php:812
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../boot.php:1614 ../../mod/profiles.php:818 #: ../../boot.php:1614 ../../mod/profiles.php:814
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../boot.php:1615 ../../mod/profiles.php:819 #: ../../boot.php:1615 ../../mod/profiles.php:815
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
#: ../../boot.php:1637 ../../include/event.php:42 #: ../../boot.php:1637 ../../include/event.php:42
#: ../../include/bb2diaspora.php:155 ../../mod/events.php:483 #: ../../include/bb2diaspora.php:155 ../../mod/events.php:492
#: ../../mod/directory.php:136 #: ../../mod/directory.php:136
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -803,12 +804,12 @@ msgstr ""
msgid "Ability to mute notifications for a thread" msgid "Ability to mute notifications for a thread"
msgstr "" msgstr ""
#: ../../include/items.php:2330 ../../include/datetime.php:477 #: ../../include/items.php:2330 ../../include/datetime.php:457
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "" msgstr ""
#: ../../include/items.php:2331 ../../include/datetime.php:478 #: ../../include/items.php:2331 ../../include/datetime.php:458
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
@ -839,21 +840,22 @@ msgstr ""
#: ../../mod/contacts.php:411 ../../mod/register.php:233 #: ../../mod/contacts.php:411 ../../mod/register.php:233
#: ../../mod/dfrn_request.php:845 ../../mod/api.php:105 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:105
#: ../../mod/suggest.php:29 ../../mod/follow.php:54 ../../mod/message.php:209 #: ../../mod/suggest.php:29 ../../mod/follow.php:54 ../../mod/message.php:209
#: ../../mod/profiles.php:661 ../../mod/profiles.php:664 #: ../../mod/profiles.php:657 ../../mod/profiles.php:660
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../../include/items.php:4686 ../../include/conversation.php:1128 #: ../../include/items.php:4686 ../../include/conversation.php:1128
#: ../../mod/settings.php:622 ../../mod/settings.php:648 #: ../../mod/settings.php:622 ../../mod/settings.php:648
#: ../../mod/contacts.php:414 ../../mod/editpost.php:148 #: ../../mod/contacts.php:414 ../../mod/videos.php:116
#: ../../mod/dfrn_request.php:859 ../../mod/fbrowser.php:81 #: ../../mod/editpost.php:148 ../../mod/dfrn_request.php:859
#: ../../mod/fbrowser.php:116 ../../mod/suggest.php:32 #: ../../mod/fbrowser.php:81 ../../mod/fbrowser.php:116
#: ../../mod/photos.php:203 ../../mod/photos.php:292 ../../mod/follow.php:65 #: ../../mod/suggest.php:32 ../../mod/photos.php:203 ../../mod/photos.php:292
#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/message.php:212 #: ../../mod/follow.php:65 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
#: ../../mod/message.php:212
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: ../../include/items.php:4904 #: ../../include/items.php:4956
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -1349,11 +1351,11 @@ msgstr ""
msgid "for %1$d %2$s" msgid "for %1$d %2$s"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:46 ../../mod/profiles.php:714 #: ../../include/profile_advanced.php:46 ../../mod/profiles.php:710
msgid "Sexual Preference:" msgid "Sexual Preference:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:50 ../../mod/profiles.php:716 #: ../../include/profile_advanced.php:50 ../../mod/profiles.php:712
msgid "Hometown:" msgid "Hometown:"
msgstr "" msgstr ""
@ -1361,7 +1363,7 @@ msgstr ""
msgid "Tags:" msgid "Tags:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:54 ../../mod/profiles.php:717 #: ../../include/profile_advanced.php:54 ../../mod/profiles.php:713
msgid "Political Views:" msgid "Political Views:"
msgstr "" msgstr ""
@ -1373,11 +1375,11 @@ msgstr ""
msgid "Hobbies/Interests:" msgid "Hobbies/Interests:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:62 ../../mod/profiles.php:721 #: ../../include/profile_advanced.php:62 ../../mod/profiles.php:717
msgid "Likes:" msgid "Likes:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:64 ../../mod/profiles.php:722 #: ../../include/profile_advanced.php:64 ../../mod/profiles.php:718
msgid "Dislikes:" msgid "Dislikes:"
msgstr "" msgstr ""
@ -1783,71 +1785,75 @@ msgstr ""
msgid "Miscellaneous" msgid "Miscellaneous"
msgstr "" msgstr ""
#: ../../include/datetime.php:153 ../../include/datetime.php:290 #: ../../include/datetime.php:141
msgid "year" msgid "YYYY-MM-DD or MM-DD"
msgstr "" msgstr ""
#: ../../include/datetime.php:158 ../../include/datetime.php:291 #: ../../include/datetime.php:256
msgid "month"
msgstr ""
#: ../../include/datetime.php:163 ../../include/datetime.php:293
msgid "day"
msgstr ""
#: ../../include/datetime.php:276
msgid "never" msgid "never"
msgstr "" msgstr ""
#: ../../include/datetime.php:282 #: ../../include/datetime.php:262
msgid "less than a second ago" msgid "less than a second ago"
msgstr "" msgstr ""
#: ../../include/datetime.php:290 #: ../../include/datetime.php:270
msgid "year"
msgstr ""
#: ../../include/datetime.php:270
msgid "years" msgid "years"
msgstr "" msgstr ""
#: ../../include/datetime.php:291 #: ../../include/datetime.php:271
msgid "month"
msgstr ""
#: ../../include/datetime.php:271
msgid "months" msgid "months"
msgstr "" msgstr ""
#: ../../include/datetime.php:292 #: ../../include/datetime.php:272
msgid "week" msgid "week"
msgstr "" msgstr ""
#: ../../include/datetime.php:292 #: ../../include/datetime.php:272
msgid "weeks" msgid "weeks"
msgstr "" msgstr ""
#: ../../include/datetime.php:293 #: ../../include/datetime.php:273
msgid "day"
msgstr ""
#: ../../include/datetime.php:273
msgid "days" msgid "days"
msgstr "" msgstr ""
#: ../../include/datetime.php:294 #: ../../include/datetime.php:274
msgid "hour" msgid "hour"
msgstr "" msgstr ""
#: ../../include/datetime.php:294 #: ../../include/datetime.php:274
msgid "hours" msgid "hours"
msgstr "" msgstr ""
#: ../../include/datetime.php:295 #: ../../include/datetime.php:275
msgid "minute" msgid "minute"
msgstr "" msgstr ""
#: ../../include/datetime.php:295 #: ../../include/datetime.php:275
msgid "minutes" msgid "minutes"
msgstr "" msgstr ""
#: ../../include/datetime.php:296 #: ../../include/datetime.php:276
msgid "second" msgid "second"
msgstr "" msgstr ""
#: ../../include/datetime.php:296 #: ../../include/datetime.php:276
msgid "seconds" msgid "seconds"
msgstr "" msgstr ""
#: ../../include/datetime.php:305 #: ../../include/datetime.php:285
#, php-format #, php-format
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
@ -1986,7 +1992,7 @@ msgstr ""
msgid "Sharing notification from Diaspora network" msgid "Sharing notification from Diaspora network"
msgstr "" msgstr ""
#: ../../include/diaspora.php:2493 #: ../../include/diaspora.php:2494
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""
@ -2261,7 +2267,7 @@ msgstr ""
#: ../../include/conversation.php:1125 ../../object/Item.php:690 #: ../../include/conversation.php:1125 ../../object/Item.php:690
#: ../../mod/editpost.php:145 ../../mod/photos.php:1566 #: ../../mod/editpost.php:145 ../../mod/photos.php:1566
#: ../../mod/photos.php:1610 ../../mod/photos.php:1698 #: ../../mod/photos.php:1610 ../../mod/photos.php:1698
#: ../../mod/events.php:489 ../../mod/content.php:719 #: ../../mod/events.php:498 ../../mod/content.php:719
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
@ -2533,7 +2539,7 @@ msgstr ""
msgid "December" msgid "December"
msgstr "" msgstr ""
#: ../../include/text.php:1424 ../../mod/videos.php:301 #: ../../include/text.php:1424 ../../mod/videos.php:368
msgid "View Video" msgid "View Video"
msgstr "" msgstr ""
@ -2546,7 +2552,7 @@ msgid "Click to open/close"
msgstr "" msgstr ""
#: ../../include/text.php:1674 ../../include/text.php:1684 #: ../../include/text.php:1674 ../../include/text.php:1684
#: ../../mod/events.php:347 #: ../../mod/events.php:350
msgid "link to source" msgid "link to source"
msgstr "" msgstr ""
@ -3868,8 +3874,8 @@ msgstr ""
#: ../../mod/settings.php:1108 ../../mod/settings.php:1109 #: ../../mod/settings.php:1108 ../../mod/settings.php:1109
#: ../../mod/settings.php:1110 ../../mod/register.php:234 #: ../../mod/settings.php:1110 ../../mod/register.php:234
#: ../../mod/dfrn_request.php:845 ../../mod/api.php:106 #: ../../mod/dfrn_request.php:845 ../../mod/api.php:106
#: ../../mod/follow.php:54 ../../mod/profiles.php:661 #: ../../mod/follow.php:54 ../../mod/profiles.php:657
#: ../../mod/profiles.php:665 #: ../../mod/profiles.php:661
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -4643,30 +4649,38 @@ msgstr ""
msgid "Tips for New Members" msgid "Tips for New Members"
msgstr "" msgstr ""
#: ../../mod/videos.php:115 ../../mod/dfrn_request.php:777 #: ../../mod/videos.php:108
msgid "Do you really want to delete this video?"
msgstr ""
#: ../../mod/videos.php:113
msgid "Delete Video"
msgstr ""
#: ../../mod/videos.php:182 ../../mod/dfrn_request.php:777
#: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920 #: ../../mod/viewcontacts.php:19 ../../mod/photos.php:920
#: ../../mod/search.php:89 ../../mod/community.php:18 #: ../../mod/search.php:89 ../../mod/community.php:18
#: ../../mod/display.php:214 ../../mod/directory.php:33 #: ../../mod/display.php:214 ../../mod/directory.php:33
msgid "Public access denied." msgid "Public access denied."
msgstr "" msgstr ""
#: ../../mod/videos.php:125 #: ../../mod/videos.php:192
msgid "No videos selected" msgid "No videos selected"
msgstr "" msgstr ""
#: ../../mod/videos.php:226 ../../mod/photos.php:1031 #: ../../mod/videos.php:293 ../../mod/photos.php:1031
msgid "Access to this item is restricted." msgid "Access to this item is restricted."
msgstr "" msgstr ""
#: ../../mod/videos.php:308 ../../mod/photos.php:1808 #: ../../mod/videos.php:375 ../../mod/photos.php:1808
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/videos.php:317 #: ../../mod/videos.php:384
msgid "Recent Videos" msgid "Recent Videos"
msgstr "" msgstr ""
#: ../../mod/videos.php:319 #: ../../mod/videos.php:386
msgid "Upload New Videos" msgid "Upload New Videos"
msgstr "" msgstr ""
@ -6642,72 +6656,67 @@ msgstr ""
msgid "is interested in:" msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/events.php:68 ../../mod/events.php:70 #: ../../mod/events.php:71 ../../mod/events.php:73
msgid "Event title and start time are required." msgid "Event title and start time are required."
msgstr "" msgstr ""
#: ../../mod/events.php:303 #: ../../mod/events.php:306
msgid "l, F j" msgid "l, F j"
msgstr "" msgstr ""
#: ../../mod/events.php:325 #: ../../mod/events.php:328
msgid "Edit event" msgid "Edit event"
msgstr "" msgstr ""
#: ../../mod/events.php:383 #: ../../mod/events.php:386
msgid "Create New Event" msgid "Create New Event"
msgstr "" msgstr ""
#: ../../mod/events.php:384 #: ../../mod/events.php:387
msgid "Previous" msgid "Previous"
msgstr "" msgstr ""
#: ../../mod/events.php:385 ../../mod/install.php:207 #: ../../mod/events.php:388 ../../mod/install.php:207
msgid "Next" msgid "Next"
msgstr "" msgstr ""
#: ../../mod/events.php:458 #: ../../mod/events.php:480
msgid "hour:minute"
msgstr ""
#: ../../mod/events.php:468
msgid "Event details" msgid "Event details"
msgstr "" msgstr ""
#: ../../mod/events.php:469 #: ../../mod/events.php:481
#, php-format msgid "Starting date and Title are required."
msgid "Format is %s %s. Starting date and Title are required."
msgstr "" msgstr ""
#: ../../mod/events.php:471 #: ../../mod/events.php:482
msgid "Event Starts:" msgid "Event Starts:"
msgstr "" msgstr ""
#: ../../mod/events.php:471 ../../mod/events.php:485 #: ../../mod/events.php:482 ../../mod/events.php:494
msgid "Required" msgid "Required"
msgstr "" msgstr ""
#: ../../mod/events.php:474 #: ../../mod/events.php:484
msgid "Finish date/time is not known or not relevant" msgid "Finish date/time is not known or not relevant"
msgstr "" msgstr ""
#: ../../mod/events.php:476 #: ../../mod/events.php:486
msgid "Event Finishes:" msgid "Event Finishes:"
msgstr "" msgstr ""
#: ../../mod/events.php:479 #: ../../mod/events.php:488
msgid "Adjust for viewer timezone" msgid "Adjust for viewer timezone"
msgstr "" msgstr ""
#: ../../mod/events.php:481 #: ../../mod/events.php:490
msgid "Description:" msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:485 #: ../../mod/events.php:494
msgid "Title:" msgid "Title:"
msgstr "" msgstr ""
#: ../../mod/events.php:487 #: ../../mod/events.php:496
msgid "Share this event" msgid "Share this event"
msgstr "" msgstr ""
@ -6842,7 +6851,7 @@ msgid "Not available."
msgstr "" msgstr ""
#: ../../mod/profiles.php:18 ../../mod/profiles.php:133 #: ../../mod/profiles.php:18 ../../mod/profiles.php:133
#: ../../mod/profiles.php:179 ../../mod/profiles.php:630 #: ../../mod/profiles.php:179 ../../mod/profiles.php:626
#: ../../mod/dfrn_confirm.php:64 #: ../../mod/dfrn_confirm.php:64
msgid "Profile not found." msgid "Profile not found."
msgstr "" msgstr ""
@ -6867,278 +6876,277 @@ msgstr ""
msgid "Profile Name is required." msgid "Profile Name is required."
msgstr "" msgstr ""
#: ../../mod/profiles.php:340 #: ../../mod/profiles.php:336
msgid "Marital Status" msgid "Marital Status"
msgstr "" msgstr ""
#: ../../mod/profiles.php:344 #: ../../mod/profiles.php:340
msgid "Romantic Partner" msgid "Romantic Partner"
msgstr "" msgstr ""
#: ../../mod/profiles.php:348 #: ../../mod/profiles.php:344
msgid "Likes" msgid "Likes"
msgstr "" msgstr ""
#: ../../mod/profiles.php:352 #: ../../mod/profiles.php:348
msgid "Dislikes" msgid "Dislikes"
msgstr "" msgstr ""
#: ../../mod/profiles.php:356 #: ../../mod/profiles.php:352
msgid "Work/Employment" msgid "Work/Employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:359 #: ../../mod/profiles.php:355
msgid "Religion" msgid "Religion"
msgstr "" msgstr ""
#: ../../mod/profiles.php:363 #: ../../mod/profiles.php:359
msgid "Political Views" msgid "Political Views"
msgstr "" msgstr ""
#: ../../mod/profiles.php:367 #: ../../mod/profiles.php:363
msgid "Gender" msgid "Gender"
msgstr "" msgstr ""
#: ../../mod/profiles.php:371 #: ../../mod/profiles.php:367
msgid "Sexual Preference" msgid "Sexual Preference"
msgstr "" msgstr ""
#: ../../mod/profiles.php:375 #: ../../mod/profiles.php:371
msgid "Homepage" msgid "Homepage"
msgstr "" msgstr ""
#: ../../mod/profiles.php:379 ../../mod/profiles.php:698 #: ../../mod/profiles.php:375 ../../mod/profiles.php:694
msgid "Interests" msgid "Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:383 #: ../../mod/profiles.php:379
msgid "Address" msgid "Address"
msgstr "" msgstr ""
#: ../../mod/profiles.php:390 ../../mod/profiles.php:694 #: ../../mod/profiles.php:386 ../../mod/profiles.php:690
msgid "Location" msgid "Location"
msgstr "" msgstr ""
#: ../../mod/profiles.php:473 #: ../../mod/profiles.php:469
msgid "Profile updated." msgid "Profile updated."
msgstr "" msgstr ""
#: ../../mod/profiles.php:568 #: ../../mod/profiles.php:564
msgid " and " msgid " and "
msgstr "" msgstr ""
#: ../../mod/profiles.php:576 #: ../../mod/profiles.php:572
msgid "public profile" msgid "public profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:579 #: ../../mod/profiles.php:575
#, php-format #, php-format
msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;" msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
msgstr "" msgstr ""
#: ../../mod/profiles.php:580 #: ../../mod/profiles.php:576
#, php-format #, php-format
msgid " - Visit %1$s's %2$s" msgid " - Visit %1$s's %2$s"
msgstr "" msgstr ""
#: ../../mod/profiles.php:583 #: ../../mod/profiles.php:579
#, php-format #, php-format
msgid "%1$s has an updated %2$s, changing %3$s." msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "" msgstr ""
#: ../../mod/profiles.php:658 #: ../../mod/profiles.php:654
msgid "Hide contacts and friends:" msgid "Hide contacts and friends:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:663 #: ../../mod/profiles.php:659
msgid "Hide your contact/friend list from viewers of this profile?" msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "" msgstr ""
#: ../../mod/profiles.php:685 #: ../../mod/profiles.php:681
msgid "Edit Profile Details" msgid "Edit Profile Details"
msgstr "" msgstr ""
#: ../../mod/profiles.php:687 #: ../../mod/profiles.php:683
msgid "Change Profile Photo" msgid "Change Profile Photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:688 #: ../../mod/profiles.php:684
msgid "View this profile" msgid "View this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:689 #: ../../mod/profiles.php:685
msgid "Create a new profile using these settings" msgid "Create a new profile using these settings"
msgstr "" msgstr ""
#: ../../mod/profiles.php:690 #: ../../mod/profiles.php:686
msgid "Clone this profile" msgid "Clone this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:691 #: ../../mod/profiles.php:687
msgid "Delete this profile" msgid "Delete this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:692 #: ../../mod/profiles.php:688
msgid "Basic information" msgid "Basic information"
msgstr "" msgstr ""
#: ../../mod/profiles.php:693 #: ../../mod/profiles.php:689
msgid "Profile picture" msgid "Profile picture"
msgstr "" msgstr ""
#: ../../mod/profiles.php:695 #: ../../mod/profiles.php:691
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
#: ../../mod/profiles.php:696 #: ../../mod/profiles.php:692
msgid "Status information" msgid "Status information"
msgstr "" msgstr ""
#: ../../mod/profiles.php:697 #: ../../mod/profiles.php:693
msgid "Additional information" msgid "Additional information"
msgstr "" msgstr ""
#: ../../mod/profiles.php:699 ../../mod/newmember.php:36 #: ../../mod/profiles.php:695 ../../mod/newmember.php:36
#: ../../mod/profile_photo.php:244 #: ../../mod/profile_photo.php:244
msgid "Upload Profile Photo" msgid "Upload Profile Photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:700 #: ../../mod/profiles.php:696
msgid "Profile Name:" msgid "Profile Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:701 #: ../../mod/profiles.php:697
msgid "Your Full Name:" msgid "Your Full Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:702 #: ../../mod/profiles.php:698
msgid "Title/Description:" msgid "Title/Description:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:703 #: ../../mod/profiles.php:699
msgid "Your Gender:" msgid "Your Gender:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:704 #: ../../mod/profiles.php:700
#, php-format msgid "Birthday :"
msgid "Birthday (%s):"
msgstr "" msgstr ""
#: ../../mod/profiles.php:705 #: ../../mod/profiles.php:701
msgid "Street Address:" msgid "Street Address:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:706 #: ../../mod/profiles.php:702
msgid "Locality/City:" msgid "Locality/City:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:707 #: ../../mod/profiles.php:703
msgid "Postal/Zip Code:" msgid "Postal/Zip Code:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:708 #: ../../mod/profiles.php:704
msgid "Country:" msgid "Country:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:709 #: ../../mod/profiles.php:705
msgid "Region/State:" msgid "Region/State:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:710 #: ../../mod/profiles.php:706
msgid "<span class=\"heart\">&hearts;</span> Marital Status:" msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:711 #: ../../mod/profiles.php:707
msgid "Who: (if applicable)" msgid "Who: (if applicable)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:712 #: ../../mod/profiles.php:708
msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "" msgstr ""
#: ../../mod/profiles.php:713 #: ../../mod/profiles.php:709
msgid "Since [date]:" msgid "Since [date]:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:715 #: ../../mod/profiles.php:711
msgid "Homepage URL:" msgid "Homepage URL:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:718 #: ../../mod/profiles.php:714
msgid "Religious Views:" msgid "Religious Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:719 #: ../../mod/profiles.php:715
msgid "Public Keywords:" msgid "Public Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:720 #: ../../mod/profiles.php:716
msgid "Private Keywords:" msgid "Private Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:723 #: ../../mod/profiles.php:719
msgid "Example: fishing photography software" msgid "Example: fishing photography software"
msgstr "" msgstr ""
#: ../../mod/profiles.php:724 #: ../../mod/profiles.php:720
msgid "(Used for suggesting potential friends, can be seen by others)" msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:725 #: ../../mod/profiles.php:721
msgid "(Used for searching profiles, never shown to others)" msgid "(Used for searching profiles, never shown to others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:726 #: ../../mod/profiles.php:722
msgid "Tell us about yourself..." msgid "Tell us about yourself..."
msgstr "" msgstr ""
#: ../../mod/profiles.php:727 #: ../../mod/profiles.php:723
msgid "Hobbies/Interests" msgid "Hobbies/Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:728 #: ../../mod/profiles.php:724
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: ../../mod/profiles.php:729 #: ../../mod/profiles.php:725
msgid "Musical interests" msgid "Musical interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:730 #: ../../mod/profiles.php:726
msgid "Books, literature" msgid "Books, literature"
msgstr "" msgstr ""
#: ../../mod/profiles.php:731 #: ../../mod/profiles.php:727
msgid "Television" msgid "Television"
msgstr "" msgstr ""
#: ../../mod/profiles.php:732 #: ../../mod/profiles.php:728
msgid "Film/dance/culture/entertainment" msgid "Film/dance/culture/entertainment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:733 #: ../../mod/profiles.php:729
msgid "Love/romance" msgid "Love/romance"
msgstr "" msgstr ""
#: ../../mod/profiles.php:734 #: ../../mod/profiles.php:730
msgid "Work/employment" msgid "Work/employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:735 #: ../../mod/profiles.php:731
msgid "School/education" msgid "School/education"
msgstr "" msgstr ""
#: ../../mod/profiles.php:740 #: ../../mod/profiles.php:736
msgid "" msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:750 ../../mod/directory.php:113 #: ../../mod/profiles.php:746 ../../mod/directory.php:113
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:803 #: ../../mod/profiles.php:799
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""

6
view/templates/video_top.tpl
View file

@ -9,5 +9,11 @@
</video> </video>
{{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}} {{*<div class="video-top-album-name"><a href="{{$video.album.link}}" class="video-top-album-link" title="{{$video.album.alt}}" >{{$video.album.name}}</a></div>*}}
{{if $delete_url }}
<form method="post" action="{{$delete_url}}">
<input type="submit" name="delete" value="X" class="video-delete"></input>
<input type="hidden" name="id" value="{{$video.id}}"></input>
</form>
{{/if}}
</div> </div>

22
view/theme/duepuntozero/style.css
View file

@ -3446,3 +3446,25 @@ ul.menu-popup {
ul.menu-popup { left: 0px; top 20px; } ul.menu-popup { left: 0px; top 20px; }
} }
/* videos page */
.videos .video-top-wrapper {
width: 300px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 300px!important;
height: 232px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}

21
view/theme/quattro/dark/style.css
View file

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

21
view/theme/quattro/green/style.css
View file

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

21
view/theme/quattro/lilac/style.css
View file

@ -1965,6 +1965,27 @@ ul.tabs li .active {
width: 50px; width: 50px;
float: left; float: left;
} }
/* videos page */
.videos .video-top-wrapper {
width: 200px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 200px!important;
height: 132px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}
/* photo albums */ /* photo albums */
#photo-edit-link-wrap { #photo-edit-link-wrap {
margin-bottom: 10px; margin-bottom: 10px;

38
view/theme/quattro/quattro.less
View file

@ -86,7 +86,9 @@ code {
} }
/* tool */ /* tool */
.tool { .tool {
height: auto; overflow: auto; height: auto; overflow: auto;
.label { float: left;} .label { float: left;}
@ -95,6 +97,8 @@ code {
} }
/* popup notifications */ /* popup notifications */
#jGrowl.top-right { #jGrowl.top-right {
top: 30px; top: 30px;
@ -140,7 +144,6 @@ header {
#logo-text { font-size: 22px } #logo-text { font-size: 22px }
} }
} }
/* nav */ /* nav */
nav { nav {
width: 100%; height: 32px; width: 100%; height: 32px;
@ -299,6 +302,8 @@ ul.menu-popup {
} }
/* aside 230px*/ /* aside 230px*/
aside { aside {
display: table-cell; display: table-cell;
@ -1031,6 +1036,7 @@ span[id^="showmore-wrap"] {
} }
#acl-wrapper { #acl-wrapper {
width: 690px; width: 690px;
float:left; float:left;
@ -1172,6 +1178,7 @@ ul.tabs {
overflow: auto; overflow: auto;
width: 100%; width: 100%;
label { label {
float: left; float: left;
width: 200px; width: 200px;
@ -1193,6 +1200,7 @@ ul.tabs {
} }
.onoff { .onoff {
float: left; float: left;
width: 80px; width: 80px;
@ -1310,6 +1318,32 @@ ul.tabs {
width: 50px; float: left; width: 50px; float: left;
} }
/* videos page */
.videos {
.video-top-wrapper {
width: 200px; float: left;
margin: 0px 10px 10px 0px;
position: relative;
.video-js {
width: 200px!important;
height: 132px!important;
}
.video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
&:hover .video-delete {
opacity: 1;
}
}
}
/* photo albums */ /* photo albums */
@photosize: 150px; @photosize: 150px;
@ -1577,6 +1611,7 @@ footer { height: 100px; display: table-row; }
} }
/* edit buttons for comments */ /* edit buttons for comments */
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); } .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
.comment-edit-bb { .comment-edit-bb {
list-style: none; list-style: none;
@ -1660,3 +1695,4 @@ footer { height: 100px; display: table-row; }
border: 0px; border: 0px;
color: @FieldHelpColor; color: @FieldHelpColor;
} }

21
view/theme/vier/style.css
View file

@ -2828,3 +2828,24 @@ a.mail-list-link {
.profile-view-actions{ .profile-view-actions{
float:right; float:right;
} }
/* videos page */
.videos .video-top-wrapper {
width: 300px;
float: left;
margin: 0px 10px 10px 0px;
position: relative;
}
.videos .video-top-wrapper .video-js {
width: 300px!important;
height: 232px!important;
}
.videos .video-top-wrapper .video-delete {
position: absolute;
opacity: 0;
right: 0px;
top: 0px;
transition: opacity 0.5s;
}
.videos .video-top-wrapper:hover .video-delete {
opacity: 1;
}