From d0d1684588150b24fe2bbe63eddabe5f4621e061 Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@owncloud.com>
Date: Thu, 9 Jun 2016 10:49:51 +0200
Subject: add overflow ellipsis to session and device tokens list

---
 settings/css/settings.css | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'settings')

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 5fc96343502..04538558cae 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -120,6 +120,10 @@ table.nostyle td { padding: 0.2em 0; }
 #sessions .token-list td,
 #devices .token-list td {
 	border-top: 1px solid #DDD;
+	text-overflow: ellipsis;
+	max-width: 200px;
+	white-space: nowrap;
+	overflow: hidden;
 }
 #sessions .token-list td a.icon-delete,
 #devices .token-list td a.icon-delete {
-- 
cgit v1.2.3


From a9ea908413aa51c48739ea3e01811e36e819560c Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@owncloud.com>
Date: Fri, 10 Jun 2016 14:49:56 +0200
Subject: add tooltip to token names

---
 settings/js/authtoken_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'settings')

diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 664dfd28148..47e6667925a 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -27,7 +27,7 @@
 
 	var TEMPLATE_TOKEN =
 		'<tr data-id="{{id}}">'
-		+ '<td>{{name}}</td>'
+		+ '<td><span class="token-name"    title="{{name}}">{{name}}</span></td>'
 		+ '<td><span class="last-activity" title="{{lastActivityTime}}">{{lastActivity}}</span></td>'
 		+ '<td><a class="icon-delete" title="' + t('core', 'Disconnect') + '"></a></td>'
 		+ '<tr>';
@@ -80,6 +80,7 @@
 				viewData.lastActivityTime = OC.Util.formatDate(ts, 'LLL');
 				var html = _this.template(viewData);
 				var $html = $(html);
+				$html.find('.token-name').tooltip();
 				$html.find('.last-activity').tooltip();
 				$html.find('.icon-delete').tooltip();
 				list.append($html);
-- 
cgit v1.2.3


From 663459ca26d371731e0bc6409f746ebd7bac11ef Mon Sep 17 00:00:00 2001
From: Christoph Wurst <christoph@owncloud.com>
Date: Fri, 10 Jun 2016 14:58:30 +0200
Subject: rearrange personal settings sections

---
 settings/templates/personal.php | 56 ++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'settings')

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ced76fc3bf6..942944ffab7 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -139,6 +139,34 @@ if($_['passwordChangeSupported']) {
 }
 ?>
 
+<form id="language" class="section">
+	<h2>
+		<label for="languageinput"><?php p($l->t('Language'));?></label>
+	</h2>
+	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
+		<option value="<?php p($_['activelanguage']['code']);?>">
+			<?php p($_['activelanguage']['name']);?>
+		</option>
+		<?php foreach($_['commonlanguages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
+			</option>
+		<?php endforeach;?>
+		<optgroup label="––––––––––"></optgroup>
+		<?php foreach($_['languages'] as $language):?>
+			<option value="<?php p($language['code']);?>">
+				<?php p($language['name']);?>
+			</option>
+		<?php endforeach;?>
+	</select>
+	<?php if (OC_Util::getEditionString() === ''): ?>
+	<a href="https://www.transifex.com/projects/p/owncloud/"
+		target="_blank" rel="noreferrer">
+		<em><?php p($l->t('Help translate'));?></em>
+	</a>
+	<?php endif; ?>
+</form>
+
 <div id="sessions" class="section">
 	<h2><?php p($l->t('Sessions'));?></h2>
 	<span class="hidden-when-empty"><?php p($l->t('These are the web, desktop and mobile clients currently logged in to your ownCloud.'));?></span>
@@ -180,34 +208,6 @@ if($_['passwordChangeSupported']) {
 	</div>
 </div>
 
-<form id="language" class="section">
-	<h2>
-		<label for="languageinput"><?php p($l->t('Language'));?></label>
-	</h2>
-	<select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>">
-		<option value="<?php p($_['activelanguage']['code']);?>">
-			<?php p($_['activelanguage']['name']);?>
-		</option>
-		<?php foreach($_['commonlanguages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
-			</option>
-		<?php endforeach;?>
-		<optgroup label="––––––––––"></optgroup>
-		<?php foreach($_['languages'] as $language):?>
-			<option value="<?php p($language['code']);?>">
-				<?php p($language['name']);?>
-			</option>
-		<?php endforeach;?>
-	</select>
-	<?php if (OC_Util::getEditionString() === ''): ?>
-	<a href="https://www.transifex.com/projects/p/owncloud/"
-		target="_blank" rel="noreferrer">
-		<em><?php p($l->t('Help translate'));?></em>
-	</a>
-	<?php endif; ?>
-</form>
-
 <div id="clientsbox" class="section clientsbox">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank">
-- 
cgit v1.2.3


From a5a66f38f1cae2b623d95c739e8f8f6087c41af2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 17 Jun 2016 15:11:31 +0200
Subject: Fix tooltip position in token list

---
 settings/js/authtoken_view.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'settings')

diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js
index 47e6667925a..b1906f0b338 100644
--- a/settings/js/authtoken_view.js
+++ b/settings/js/authtoken_view.js
@@ -27,9 +27,9 @@
 
 	var TEMPLATE_TOKEN =
 		'<tr data-id="{{id}}">'
-		+ '<td><span class="token-name"    title="{{name}}">{{name}}</span></td>'
-		+ '<td><span class="last-activity" title="{{lastActivityTime}}">{{lastActivity}}</span></td>'
-		+ '<td><a class="icon-delete" title="' + t('core', 'Disconnect') + '"></a></td>'
+		+ '<td class="has-tooltip" title="{{name}}"><span class="token-name">{{name}}</span></td>'
+		+ '<td><span class="last-activity has-tooltip" title="{{lastActivityTime}}">{{lastActivity}}</span></td>'
+		+ '<td><a class="icon-delete has-tooltip" title="' + t('core', 'Disconnect') + '"></a></td>'
 		+ '<tr>';
 
 	var SubView = Backbone.View.extend({
@@ -80,9 +80,7 @@
 				viewData.lastActivityTime = OC.Util.formatDate(ts, 'LLL');
 				var html = _this.template(viewData);
 				var $html = $(html);
-				$html.find('.token-name').tooltip();
-				$html.find('.last-activity').tooltip();
-				$html.find('.icon-delete').tooltip();
+				$html.find('.has-tooltip').tooltip({container: 'body'});
 				list.append($html);
 			});
 		},
-- 
cgit v1.2.3