Merge branch 'master' into clean-settings-layout

13 files changed, 158 insertions, 28 deletions

diff --git a/settings/templates/settings.development.notice.php b/settings/templates/settings.development.notice.php
index 770f868eda5..2b08d341f1e 100644
--- a/settings/templates/settings.development.notice.php
+++ b/settings/templates/settings.development.notice.php
@@ -48,11 +48,11 @@
 				'<a target="_blank" rel="noreferrer noopener" href="https://nextcloud.com/news/">',
 				'<a target="_blank" rel="noreferrer noopener" href="https://newsletter.nextcloud.com/?p=subscribe&amp;id=1">',
 				'</a>',
-				$l->t('Follow us on Google+!'),
-				$l->t('Like our facebook page!'),
-				$l->t('Follow us on Twitter!'),
-				$l->t('Check out our blog!'),
-				$l->t('Subscribe to our newsletter!'),
+				$l->t('Follow us on Google+'),
+				$l->t('Like our Facebook page'),
+				$l->t('Follow us on Twitter'),
+				$l->t('Check out our blog'),
+				$l->t('Subscribe to our newsletter'),
 
 			],
 '{googleopen}<img width="50" src="{googleimage}" title="{googletext}" alt="{googletext}">{linkclose}
diff --git a/settings/templates/admin/additional.php b/settings/templates/settings/additional.php
index 2ad2c5af4e5..2ad2c5af4e5 100644
--- a/settings/templates/admin/additional.php
+++ b/settings/templates/settings/additional.php
diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/settings/admin/additional-mail.php
index bce7e5adeee..bce7e5adeee 100644
--- a/settings/templates/admin/additional-mail.php
+++ b/settings/templates/settings/admin/additional-mail.php
diff --git a/settings/templates/admin/encryption.php b/settings/templates/settings/admin/encryption.php
index 1d956a8f7c1..8fc4e9ae13b 100644
--- a/settings/templates/admin/encryption.php
+++ b/settings/templates/settings/admin/encryption.php
@@ -63,7 +63,7 @@
 				<h3><?php p($l->t('Select default encryption module:')) ?></h3>
 				<fieldset id='encryptionModules'>
 					<?php foreach ($_['encryptionModules'] as $id => $module): ?>
-						<input type="radio" id="<?php p($id) ?>"
+						<input type="radio" id="<?php p($id) ?>" class="radio"
 							   name="default_encryption_module"
 							   value="<?php p($id) ?>"
 							<?php if ($module['default']) {
diff --git a/settings/templates/admin/server.development.notice.php b/settings/templates/settings/admin/server.development.notice.php
index f58258fc0ae..f58258fc0ae 100644
--- a/settings/templates/admin/server.development.notice.php
+++ b/settings/templates/settings/admin/server.development.notice.php
diff --git a/settings/templates/admin/server.php b/settings/templates/settings/admin/server.php
index 8d00d37fe80..b32514c8b24 100644
--- a/settings/templates/admin/server.php
+++ b/settings/templates/settings/admin/server.php
@@ -35,8 +35,8 @@
 		if ($_['getenvServerNotWorking']) {
 			?>
 			<li>
-				<?php p($l->t('php does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
-				<?php print_unescaped($l->t('Please check the <a target="_blank" rel="noreferrer" href="%s">installation documentation ↗</a> for php configuration notes and the php configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
+				<?php p($l->t('PHP does not seem to be setup properly to query system environment variables. The test with getenv("PATH") only returns an empty response.')); ?><br>
+				<?php print_unescaped($l->t('Please check the <a target="_blank" rel="noreferrer" href="%s">installation documentation ↗</a> for PHP configuration notes and the PHP configuration of your server, especially when using php-fpm.', link_to_docs('admin-php-fpm'))); ?>
 			</li>
 			<?php
 		}
@@ -54,7 +54,7 @@
 		if (!$_['isAnnotationsWorking']) {
 			?>
 			<li>
-				<?php p($l->t('PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
+				<?php p($l->t('PHP is apparently set up to strip inline doc blocks. This will make several core apps inaccessible.')); ?><br>
 				<?php p($l->t('This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator.')); ?>
 			</li>
 			<?php
@@ -73,7 +73,7 @@
 		foreach ($_['OutdatedCacheWarning'] as $php_module => $data) {
 			?>
 			<li>
-				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons we recommend updating to a newer %1$s version.', $data)); ?>
+				<?php p($l->t('%1$s below version %2$s is installed, for stability and performance reasons it is recommended to update to a newer %1$s version.', $data)); ?>
 			</li>
 			<?php
 		}
@@ -82,7 +82,7 @@
 		if (!$_['has_fileinfo']) {
 			?>
 			<li>
-				<?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with MIME type detection.')); ?>
+				<?php p($l->t('The PHP module \'fileinfo\' is missing. It is strongly recommended to enable this module to get the best results with MIME type detection.')); ?>
 			</li>
 			<?php
 		}
@@ -106,11 +106,11 @@
 				?>
 				<br>
 				<?php
-				p($l->t('This means that there might be problems with certain characters in file names.'));
+				p($l->t('This means that there might be problems with certain characters in filenames.'));
 				?>
 				<br>
 				<?php
-				p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', [$locales]));
+				p($l->t('It is strongly proposed to install the required packages on your system to support one of the following locales: %s.', [$locales]));
 				?>
 			</li>
 			<?php
@@ -119,7 +119,7 @@
 		if ($_['suggestedOverwriteCliUrl']) {
 			?>
 			<li>
-				<?php p($l->t('If your installation is not installed in the root of the domain and uses system cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
+				<?php p($l->t('If your installation is not installed at the root of the domain and uses system Cron, there can be issues with the URL generation. To avoid these problems, please set the "overwrite.cli.url" option in your config.php file to the webroot path of your installation (Suggested: "%s")', $_['suggestedOverwriteCliUrl'])); ?>
 			</li>
 			<?php
 		}
@@ -127,7 +127,7 @@
 		if ($_['cronErrors']) {
 			?>
 			<li>
-				<?php p($l->t('It was not possible to execute the cronjob via CLI. The following technical errors have appeared:')); ?>
+				<?php p($l->t('It was not possible to execute the cron job via CLI. The following technical errors have appeared:')); ?>
 				<br>
 				<ol>
 					<?php foreach(json_decode($_['cronErrors']) as $error) { if(isset($error->error)) {?>
@@ -197,7 +197,7 @@
 			print_unescaped('checked="checked"');
 		} ?>>
 		<label for="backgroundjobs_webcron">Webcron</label><br/>
-		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over http.")); ?></em>
+		<em><?php p($l->t("cron.php is registered at a webcron service to call cron.php every 15 minutes over HTTP.")); ?></em>
 	</p>
 	<p>
 		<input type="radio" name="mode" value="cron" class="radio"
@@ -215,7 +215,7 @@
 				print_unescaped(str_replace(
 					['{linkstart}', '{linkend}'],
 					['<a href="http://php.net/manual/en/book.posix.php">', ' ↗</a>'],
-					$l->t('To run this you need the PHP posix extension. See {linkstart}PHP documentation{linkend} for more details.')
+					$l->t('To run this you need the PHP POSIX extension. See {linkstart}PHP documentation{linkend} for more details.')
 				));
 		} ?></em>
 
diff --git a/settings/templates/admin/sharing.php b/settings/templates/settings/admin/sharing.php
index 38071a4bee9..38071a4bee9 100644
--- a/settings/templates/admin/sharing.php
+++ b/settings/templates/settings/admin/sharing.php
diff --git a/settings/templates/admin/tipstricks.php b/settings/templates/settings/admin/tipstricks.php
index c18c7f25f39..c18c7f25f39 100644
--- a/settings/templates/admin/tipstricks.php
+++ b/settings/templates/settings/admin/tipstricks.php
diff --git a/settings/templates/settings/empty.php b/settings/templates/settings/empty.php
new file mode 100644
index 00000000000..0ed8a873d3c
--- /dev/null
+++ b/settings/templates/settings/empty.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+	# used for Personal/Additional settings as fallback for legacy settings
+?>
diff --git a/settings/templates/admin/frame.php b/settings/templates/settings/frame.php
index 2b234f4cd9b..80737bc6f91 100644
--- a/settings/templates/admin/frame.php
+++ b/settings/templates/settings/frame.php
@@ -30,9 +30,39 @@ script('files', 'jquery.fileupload');
 
 <div id="app-navigation">
 	<ul>
+		<li class="settings-caption">Personal</li>
 		<?php
-		foreach($_['forms'] as $form) {
+		foreach($_['forms']['personal'] as $form) {
 			if (isset($form['anchor'])) {
+				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);
+				$class = 'nav-icon-' . $form['anchor'];
+				$sectionName = $form['section-name'];
+				$active = $form['active'] ? ' class="active"' : '';
+				?>
+				<li <?php print_unescaped($form['active'] ? ' class="active"' : ''); ?>>
+					<a href="<?php p($anchor); ?>">
+						<?php if (!empty($form['icon'])) { ?>
+							<img alt="" src="<?php print_unescaped($form['icon']); ?>">
+							<span><?php p($form['section-name']); ?></span>
+						<?php } else { ?>
+							<span class="no-icon"><?php p($form['section-name']); ?></span>
+						<?php } ?>
+					</a>
+				</li>
+				<?php
+			}
+		}
+		?>
+
+		<?php
+		if(!empty($_['forms']['admin'])) {
+			?>
+			<li class="settings-caption">Administration</li>
+			<?php
+		}
+		foreach($_['forms']['admin'] as $form) {
+			if (isset($form['anchor'])) {
+
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.AdminSettings.index', ['section' => $form['anchor']]);
 				$class = 'nav-icon-' . $form['anchor'];
 				$sectionName = $form['section-name'];
diff --git a/settings/templates/settings/personal/personal.info.php b/settings/templates/settings/personal/personal.info.php
index d22e9f8ea99..ee831f8f4f6 100644
--- a/settings/templates/settings/personal/personal.info.php
+++ b/settings/templates/settings/personal/personal.info.php
@@ -94,12 +94,15 @@ vendor_style('jcrop/css/jquery.Jcrop');
 					<span class="icon-federation-menu icon-password">&#9662;<span/>
 				</h2>
 				<input type="text" id="displayname" name="displayname"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
-					value="<?php p($_['displayName']) ?>"
-					autocomplete="on" autocapitalize="none" autocorrect="off" />
+					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					   value="<?php p($_['displayName']) ?>"
+					   autocomplete="on" autocapitalize="none" autocorrect="off" />
+				<?php if(!$_['displayNameChangeSupported']) { ?>
+					<span><?php if(isset($_['displayName']) && !empty($_['displayName'])) { p($_['displayName']); } else { p($l->t('No display name set')); } ?></span>
+				<?php } ?>
 				<span class="icon-checkmark hidden"/>
 				<?php if($_['lookupServerUploadEnabled']) { ?>
-				<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
+					<input type="hidden" id="displaynamescope" value="<?php p($_['displayNameScope']) ?>">
 				<?php } ?>
 			</form>
 		</div>
@@ -111,7 +114,7 @@ vendor_style('jcrop/css/jquery.Jcrop');
 				</h2>
 				<div class="verify <?php if ($_['email'] === ''  || $_['emailScope'] !== 'public') p('hidden'); ?>">
 					<img id="verify-email" title="<?php p($_['emailMessage']); ?>" data-status="<?php p($_['emailVerification']) ?>" src="
-					<?php
+				<?php
 					switch($_['emailVerification']) {
 						case \OC\Accounts\AccountManager::VERIFICATION_IN_PROGRESS:
 							p(image_path('core', 'actions/verifying.svg'));
@@ -124,10 +127,13 @@ vendor_style('jcrop/css/jquery.Jcrop');
 					}
 					?>">
 				</div>
-				<input type="email" name="email" id="email" value="<?php if(!$_['displayNameChangeSupported'] && empty($_['email'])) p($l->t('No email address set')); else p($_['email']); ?>"
-					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('disabled="1"'); } ?>
-					placeholder="<?php p($l->t('Your email address')) ?>"
-					autocomplete="on" autocapitalize="none" autocorrect="off" />
+				<input type="email" name="email" id="email" value="<?php p($_['email']); ?>"
+					<?php if(!$_['displayNameChangeSupported']) { print_unescaped('class="hidden"'); } ?>
+					   placeholder="<?php p($l->t('Your email address')); ?>"
+					   autocomplete="on" autocapitalize="none" autocorrect="off" />
+				<?php if(!$_['displayNameChangeSupported']) { ?>
+					<span><?php if(isset($_['email']) && !empty($_['email'])) { p($_['email']); } else { p($l->t('No email address set')); }?></span>
+				<?php } ?>
 				<?php if($_['displayNameChangeSupported']) { ?>
 					<br />
 					<em><?php p($l->t('For password reset and notifications')); ?></em>
@@ -344,4 +350,4 @@ vendor_style('jcrop/css/jquery.Jcrop');
 	</div>
 </div>
 
-<div class="clear"></div>
\ No newline at end of file
+<div class="clear"></div>
diff --git a/settings/templates/settings/personal/security.php b/settings/templates/settings/personal/security.php
new file mode 100644
index 00000000000..3a324bf8d21
--- /dev/null
+++ b/settings/templates/settings/personal/security.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @copyright Copyright (c) 2017 Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @author Arthur Schiwon <blizzz@arthur-schiwon.de>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+script('settings', [
+	'authtoken',
+	'authtoken_collection',
+	'authtoken_view',
+	'settings/authtoken-init'
+]);
+
+?>
+
+
+<div id="security" class="section">
+	<h2><?php p($l->t('Security'));?></h2>
+	<p class="settings-hint hidden-when-empty"><?php p($l->t('Web, desktop and mobile clients currently logged in to your account.'));?></p>
+	<table class="icon-loading">
+		<thead class="token-list-header">
+			<tr>
+				<th><?php p($l->t('Device'));?></th>
+				<th><?php p($l->t('Last activity'));?></th>
+				<th></th>
+			</tr>
+		</thead>
+		<tbody class="token-list">
+		</tbody>
+	</table>
+	<div id="app-password-form">
+		<input id="app-password-name" type="text" placeholder="<?php p($l->t('App name')); ?>">
+		<button id="add-app-password" class="button"><?php p($l->t('Create new app password')); ?></button>
+	</div>
+	<div id="app-password-result" class="hidden">
+		<span>
+			<?php p($l->t('Use the credentials below to configure your app or device.')); ?>
+			<?php p($l->t('For security reasons this password will only be shown once.')); ?>
+		</span>
+		<div class="app-password-row">
+			<span class="app-password-label"><?php p($l->t('Username')); ?></span>
+			<input id="new-app-login-name" type="text" readonly="readonly"/>
+		</div>
+		<div class="app-password-row">
+			<span class="app-password-label"><?php p($l->t('Password')); ?></span>
+			<input id="new-app-password" type="text" readonly="readonly"/>
+			<a class="clipboardButton icon icon-clippy" data-clipboard-target="#new-app-password"></a>
+			<button id="app-password-hide" class="button"><?php p($l->t('Done')); ?></button>
+		</div>
+	</div>
+</div>
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index b908109ad2d..5ceda71fc00 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -43,6 +43,7 @@
 			</td>
 		<?php endif;?>
 			<td class="quota">
+				<div class="quota_progress_container"><div class="quota_progress"></div></div>
 				<select class="quota-user" data-inputtitle="<?php p($l->t('Please enter storage quota (ex: "512 MB" or "12 GB")')) ?>">
 					<option	value='default'>
 						<?php p($l->t('Default'));?>