aboutsummaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
authorJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-04 17:08:34 +0300
committerJan-Christoph Borchardt <hey@jancborchardt.net>2013-10-04 17:08:34 +0300
commit041837de2c85d79a05d29933d87e9077dd31530c (patch)
treeb8e2f469f7ff22996928dea4c147dc162ad07230 /settings
parent3c13afee9837db9ba11f98ec8688f8a1163b81f1 (diff)
parent7337b341106b6ae093b8d56c4d885b497db6e5aa (diff)
downloadnextcloud-server-041837de2c85d79a05d29933d87e9077dd31530c.tar.gz
nextcloud-server-041837de2c85d79a05d29933d87e9077dd31530c.zip
merge master into input-simplify
Diffstat (limited to 'settings')
-rwxr-xr-xsettings/admin.php5
-rw-r--r--settings/css/settings.css27
-rw-r--r--settings/js/personal.js12
-rw-r--r--settings/templates/admin.php18
4 files changed, 47 insertions, 15 deletions
diff --git a/settings/admin.php b/settings/admin.php
index dd36790907d..120f15bec19 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -33,16 +33,17 @@ $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enable
// Check if connected using HTTPS
if (OC_Request::serverProtocol() === 'https') {
- $connectedHTTPS = true;
+ $connectedHTTPS = true;
} else {
$connectedHTTPS = false;
-}
+}
$tmpl->assign('isConnectedViaHTTPS', $connectedHTTPS);
$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
+$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'yes'));
$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
$tmpl->assign('forms', array());
foreach($forms as $form) {
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5f3e9c97dd5..40106072f89 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -55,18 +55,37 @@ tr:hover>td.remove>a { float:right; }
li.selected { background-color:#ddd; }
table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; }
-div.quota { float:right; display:block; position:absolute; right:25em; top:-1px; }
+div.quota {
+ float: right;
+ display: block;
+ position: absolute;
+ right: 216px;
+ top: 0;
+}
div.quota-select-wrapper { position: relative; }
div.recoveryPassword { left:50em; display:block; position:absolute; top:-1px; }
input#recoveryPassword {width:15em;}
select.quota { position:absolute; left:0; top:0; width:10em; }
select.quota-user { position:relative; left:0; top:0; width:10em; }
-div.quota>span { position:absolute; right:0; white-space:nowrap; top:.7em; color:#888; text-shadow:0 1px 0 #fff; }
+div.quota>span {
+ position: absolute;
+ right: 0;
+ white-space: nowrap;
+ top: 12px;
+ color: #888;
+ text-shadow: 0 1px 0 #fff;
+}
select.quota.active { background: #fff; }
/* positioning fixes */
-#newuser { position:relative; top:-3px; }
-#newuser .multiselect { top:1px; }
+#newuser .multiselect {
+ min-width: 150px !important;
+}
+#newuser .multiselect,
+#newusergroups + input[type='submit'] {
+ position: relative;
+ top: 1px;
+}
#headerGroups, #headerSubAdmins, #headerQuota { padding-left:18px; }
.ie8 table.hascontrols{border-collapse:collapse;width: 100%;}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index a923b475731..3fdc2907c46 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -45,12 +45,16 @@ function changeDisplayName(){
}
}
-function updateAvatar () {
+function updateAvatar (hidedefault) {
$headerdiv = $('#header .avatardiv');
$displaydiv = $('#displayavatar .avatardiv');
- $headerdiv.css({'background-color': ''});
- $headerdiv.avatar(OC.currentUser, 32, true);
+ if(hidedefault) {
+ $headerdiv.hide();
+ } else {
+ $headerdiv.css({'background-color': ''});
+ $headerdiv.avatar(OC.currentUser, 32, true);
+ }
$displaydiv.css({'background-color': ''});
$displaydiv.avatar(OC.currentUser, 128, true);
}
@@ -232,7 +236,7 @@ $(document).ready(function(){
type: 'DELETE',
url: OC.Router.generate('core_avatar_delete'),
success: function(msg) {
- updateAvatar();
+ updateAvatar(true);
}
});
});
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index e54586b80df..72e93e78dac 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -128,7 +128,7 @@ if (!$_['internetconnectionworking']) {
</td>
</tr>
<tr>
- <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
+ <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
<input type="checkbox" name="shareapi_allow_links" id="allowLinks"
value="1" <?php if ($_['allowLinks'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowLinks"><?php p($l->t('Allow links'));?></label><br/>
@@ -137,7 +137,7 @@ if (!$_['internetconnectionworking']) {
</tr>
<?php if (!\OCP\App::isEnabled('files_encryption')) { ?>
<tr>
- <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('style="display:none"');?>>
+ <td <?php if ($_['shareAPIEnabled'] == 'no') print_unescaped('class="hidden"');?>>
<input type="checkbox" name="shareapi_allow_public_upload" id="allowPublicUpload"
value="1" <?php if ($_['allowPublicUpload'] == 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowPublicUpload"><?php p($l->t('Allow public uploads'));?></label><br/>
@@ -146,7 +146,7 @@ if (!$_['internetconnectionworking']) {
</tr>
<?php } ?>
<tr>
- <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
+ <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing"
value="1" <?php if ($_['allowResharing'] === 'yes') print_unescaped('checked="checked"'); ?> />
<label for="allowResharing"><?php p($l->t('Allow resharing'));?></label><br/>
@@ -154,7 +154,7 @@ if (!$_['internetconnectionworking']) {
</td>
</tr>
<tr>
- <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('style="display:none"');?>>
+ <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal"
value="global" <?php if ($_['sharePolicy'] === 'global') print_unescaped('checked="checked"'); ?> />
<label for="sharePolicyGlobal"><?php p($l->t('Allow users to share with anyone')); ?></label><br/>
@@ -163,6 +163,14 @@ if (!$_['internetconnectionworking']) {
<label for="sharePolicyGroupsOnly"><?php p($l->t('Allow users to only share with users in their groups'));?></label><br/>
</td>
</tr>
+ <tr>
+ <td <?php if ($_['shareAPIEnabled'] === 'no') print_unescaped('class="hidden"');?>>
+ <input type="checkbox" name="shareapi_allow_mail_notification" id="allowMailNotification"
+ value="1" <?php if ($_['allowMailNotification'] === 'yes') print_unescaped('checked="checked"'); ?> />
+ <label for="allowMailNotification"><?php p($l->t('Allow mail notification'));?></label><br/>
+ <em><?php p($l->t('Allow user to send mail notification for shared files')); ?></em>
+ </td>
+ </tr>
</table>
</fieldset>
@@ -223,7 +231,7 @@ endfor;?>
</td>
<td>
<?php if(is_int($entry->time)){
- p(OC_Util::formatDate($entry->time));
+ p(OC_Util::formatDate($entry->time));
} else {
p($entry->time);
}?>