Merge branch 'master' into fixing-3934-master
Conflicts: core/js/share.js
This commit is contained in:
commit
59b700a550
|
@ -163,10 +163,10 @@ OC.Share={
|
||||||
|
|
||||||
var allowPublicUploadStatus = false;
|
var allowPublicUploadStatus = false;
|
||||||
$.each(data.shares, function(key, value) {
|
$.each(data.shares, function(key, value) {
|
||||||
if (allowPublicUploadStatus) {
|
if (allowPublicUploadStatus) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
|
allowPublicUploadStatus = (value.permissions & OC.PERMISSION_CREATE) ? true : false;
|
||||||
});
|
});
|
||||||
|
|
||||||
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
|
html += '<input id="shareWith" type="text" placeholder="'+t('core', 'Share with')+'" />';
|
||||||
|
@ -181,7 +181,7 @@ OC.Share={
|
||||||
html += '<div id="linkPass">';
|
html += '<div id="linkPass">';
|
||||||
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
|
html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
|
||||||
html += '</div>';
|
html += '</div>';
|
||||||
if (itemType == 'folder') {
|
if (itemType == 'folder' && (possiblePermissions & OC.PERMISSION_CREATE)) {
|
||||||
html += '<div id="allowPublicUploadWrapper" style="display:none;">';
|
html += '<div id="allowPublicUploadWrapper" style="display:none;">';
|
||||||
html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
|
html += '<input type="checkbox" value="1" name="allowPublicUpload" id="sharingDialogAllowPublicUpload"' + ((allowPublicUploadStatus) ? 'checked="checked"' : '') + ' />';
|
||||||
html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
|
html += '<label for="sharingDialogAllowPublicUpload">' + t('core', 'Allow Public Upload') + '</label>';
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
<?php
|
<?php
|
||||||
|
$defaults = new OC_Defaults();
|
||||||
|
|
||||||
print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
|
print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link'])));
|
||||||
?>
|
?>
|
||||||
|
|
||||||
--
|
--
|
||||||
ownCloud - <?php
|
<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?>
|
||||||
print_unescaped($l->t("web services under your control"));
|
<?php print_unescaped("\n".$defaults->getBaseUrl());
|
||||||
?>
|
|
||||||
http://ownCloud.org
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
<?php $defaults = new OC_Defaults() // initialize themable default strings and urls ?>
|
||||||
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
<table cellspacing="0" cellpadding="0" border="0" width="100%">
|
||||||
<tr><td>
|
<tr><td>
|
||||||
<table cellspacing="0" cellpadding="0" border="0" width="600px">
|
<table cellspacing="0" cellpadding="0" border="0" width="600px">
|
||||||
|
@ -20,10 +21,9 @@ print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared »
|
||||||
<tr>
|
<tr>
|
||||||
<td bgcolor="#f8f8f8" width="20px"> </td>
|
<td bgcolor="#f8f8f8" width="20px"> </td>
|
||||||
<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
|
<td bgcolor="#f8f8f8" style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
|
||||||
ownCloud - <?php
|
<?php p($defaults->getName()); ?> -
|
||||||
print_unescaped($l->t('web services under your control'));
|
<?php p($defaults->getSlogan()); ?>
|
||||||
?>
|
<br><a href="<?php print_unescaped($defaults->getBaseUrl()); ?>"><?php print_unescaped($defaults->getBaseUrl());?></a></td>
|
||||||
<br><a href="http://owncloud.org">http://ownCloud.org</a></td>
|
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td bgcolor="#f8f8f8" colspan="2"> </td>
|
<td bgcolor="#f8f8f8" colspan="2"> </td>
|
||||||
|
|
Loading…
Reference in New Issue