From f374dae233b3a4c970562d096514ba20e6d40bcc Mon Sep 17 00:00:00 2001 From: Sam Tuke Date: Mon, 25 Jun 2012 18:01:17 +0100 Subject: [PATCH] Added text ACS warning to admin's user settings page, and corresponding CSS styles --- core/css/styles.css | 1 + settings/css/settings.css | 2 ++ settings/templates/users.php | 5 +++++ settings/users.php | 9 +++++++++ 4 files changed, 17 insertions(+) diff --git a/core/css/styles.css b/core/css/styles.css index 44fd1e084f..338518e5b2 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -106,6 +106,7 @@ label.infield { cursor: text !important; } /* VARIOUS REUSABLE SELECTORS */ .hidden { display:none; } .bold { font-weight: bold; } +.center { text-align: center; } #notification { z-index:101; cursor:pointer; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position:fixed; left:50%; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } diff --git a/settings/css/settings.css b/settings/css/settings.css index 80e96df5e6..d5634eec81 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -53,3 +53,5 @@ span.version { margin-left:3em; color:#ddd; } /* ADMIN */ span.securitywarning {color:#C33; font-weight:bold; } +h3.settingsNotice { font-size: 1.2em; } +.settingsNotice { font-weight:bold; padding: 0.5em 0; } diff --git a/settings/templates/users.php b/settings/templates/users.php index ea3fe777ff..c042f2664e 100644 --- a/settings/templates/users.php +++ b/settings/templates/users.php @@ -112,3 +112,8 @@ foreach($_["groups"] as $group) { + + + +

+ \ No newline at end of file diff --git a/settings/users.php b/settings/users.php index 96515a90ce..026a30a750 100644 --- a/settings/users.php +++ b/settings/users.php @@ -33,11 +33,20 @@ foreach($quotaPreset as &$preset){ $defaultQuota=OC_Appconfig::getValue('files','default_quota','none'); +$shareNotice = ''; + +if (\OC_App::isEnabled( "files_sharing" ) ) { + + $shareNotice = 'Note: users may only share to groups that they belong to, and their members'; + +} + $tmpl = new OC_Template( "settings", "users", "user" ); $tmpl->assign( "users", $users ); $tmpl->assign( "groups", $groups ); $tmpl->assign( 'quota_preset', $quotaPreset); $tmpl->assign( 'default_quota', $defaultQuota); +$tmpl->assign( 'share_notice', $shareNotice); $tmpl->printPage(); ?>