From a113ee9e9fd07ab10472746ae8fdfeb61c3d7aeb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 24 Jun 2012 00:42:16 +0200
Subject: add x-webkit-speech to searchbox

---
 core/templates/layout.user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d6911fd1e18..7e98fdedc2d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -47,7 +47,7 @@
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img class="svg" src="<?php echo image_path('', 'logo-wide.svg'); ?>" alt="ownCloud" /></a>
 			<a class="header-right header-action" id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" title="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
-				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" />
+				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
 			</form>
 		</div></header>
 
-- 
cgit v1.2.3


From f374dae233b3a4c970562d096514ba20e6d40bcc Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Mon, 25 Jun 2012 18:01:17 +0100
Subject: 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(+)

(limited to 'core')

diff --git a/core/css/styles.css b/core/css/styles.css
index 44fd1e084fe..338518e5b2f 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 80e96df5e66..d5634eec81f 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 ea3fe777ffe..c042f2664e2 100644
--- 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 96515a90ce4..026a30a750c 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();
 
 ?>
-- 
cgit v1.2.3


From 18d542074499445731c1754d697fc8b51665bbff Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 10:35:19 +0200
Subject: typo in js statement fixed

---
 core/js/multiselect.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

diff --git a/core/js/multiselect.js b/core/js/multiselect.js
index 5f339006d26..db5afa637c9 100644
--- a/core/js/multiselect.js
+++ b/core/js/multiselect.js
@@ -136,7 +136,7 @@
 							var option=$('<option selected="selected"/>');
 							option.attr('value',$(this).val());
 							option.text($(this).val());
-							select.append(optione);
+							select.append(options);
 							li.prev().children('input').trigger('click');
 							button.parent().data('preventHide',false);
 							if(settings.createCallback){
-- 
cgit v1.2.3