Added text ACS warning to admin's user settings page, and corresponding CSS styles

diff --git a/core/css/styles.css b/core/css/styles.css
index 44fd1e084fed26280511957bc47049c01b46111b..338518e5b2f13d99c8484aaedeba52be7dde7b31 100644 (file)
--- 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 80e96df5e66d57b70e2ce820e1df46c47dc3111f..d5634eec81fecafdfbb373d63888800c09a83002 100644 (file)
--- 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 ea3fe777ffee05634f14d2cb63b61998b6d6409d..c042f2664e2955cf26facb546b19b21b071ecbd9 100644 (file)
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -112,3 +112,8 @@ foreach($_["groups"] as $group) {
                <?php endforeach; ?>
        </tbody>
 </table>
+
+<!-- use a standard notification class / system for this message -->
+<?php if( $_["share_notice"] ):?>
+<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
+<?php endif;?> 
\ No newline at end of file

diff --git a/settings/users.php b/settings/users.php
index 96515a90ce456ed4c213316f2affaa04351de4b1..026a30a750c96eb605823e02106af832d4519484 100644 (file)
--- 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();
 
 ?>