Merge branch 'master' into fixing-1354-master

Conflicts:
	settings/admin.php
	settings/templates/admin.php

4 files changed, 39 insertions, 7 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 481443a19bd..268040525bf 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -119,18 +119,26 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #select_all{ margin-top:.4em !important;}
 
 /* CONTENT ------------------------------------------------------------------ */
-#controls { padding:0 0.5em; width:100%; top:3.5em; height:2.8em; margin:0; background:#f7f7f7; border-bottom:1px solid #eee; position:fixed; z-index:50; -moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000; }
+#controls {
+	position:fixed;
+	height:2.8em; width:100%;
+	padding:0 70px 0 0.5em; margin:0;
+	-moz-box-sizing:border-box; box-sizing:border-box;
+	-moz-box-shadow:0 -3px 7px #000; -webkit-box-shadow:0 -3px 7px #000; box-shadow:0 -3px 7px #000;
+	background:#f7f7f7; border-bottom:1px solid #eee;  z-index:50;
+}
 #controls .button { display:inline-block; }
 
 #content { position:relative; height:100%; width:100%; }
+#content .hascontrols { position: relative; top: 2.9em; }
 #content-wrapper {
 	position:absolute; height:100%; width:100%; padding-top:3.5em; padding-left:64px;
 	-moz-box-sizing:border-box; box-sizing:border-box;
 }
 #leftcontent, .leftcontent {
-	position:fixed; overflow:auto; top:0; width:20em; height:100%;
+	position:relative; overflow:auto; width:20em; height:100%;
 	background:#f8f8f8; border-right:1px solid #ddd;
-	-moz-box-sizing:border-box; box-sizing:border-box; padding-top:6.4em;
+	-moz-box-sizing:border-box; box-sizing:border-box;
 }
 #leftcontent li, .leftcontent li { background:#f8f8f8; padding:.5em .8em; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; -webkit-transition:background-color 200ms; -moz-transition:background-color 200ms; -o-transition:background-color 200ms; transition:background-color 200ms; }
 #leftcontent li:hover, #leftcontent li:active, #leftcontent li.active, .leftcontent li:hover, .leftcontent li:active, .leftcontent li.active { background:#eee; }
@@ -191,7 +199,7 @@ input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; }
 /* NEEDED FOR INFIELD LABELS */
 p.infield { position:relative; }
 label.infield { cursor:text !important; top:1.05em; left:.85em; }
-#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; padding-left:1.2em; }
+#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; padding-left:1.4em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 
@@ -211,6 +219,10 @@ fieldset.warning {
 }
 fieldset.warning legend { color:#b94a48 !important; }
 
+/* Alternative Logins */
+#alternative-logins legend { margin-bottom:10px; }
+#alternative-logins li { height:40px; display:inline-block; white-space:nowrap; }
+
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation {
@@ -234,7 +246,10 @@ fieldset.warning legend { color:#b94a48 !important; }
 #expand:hover, #expand:focus, #expand:active { color:#fff; }
 #expand img { opacity:.7; margin-bottom:-2px; }
 #expand:hover img, #expand:focus img, #expand:active img { opacity:1; }
-#expanddiv { position:absolute; right:0; top:45px; background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68); z-index:76; }
+#expanddiv {
+	position:absolute; right:0; top:45px; z-index:76; display:none;
+	background-color:#444; border-bottom-left-radius:7px; box-shadow: 0 0 20px rgb(29,45,68);
+}
 	#expanddiv a { display:block; color:#fff; text-shadow:0 -1px 0 #000; padding:0 8px; opacity:.7; }
 	#expanddiv a img { margin-bottom:-3px; }
 	#expanddiv a:hover, #expanddiv a:focus, #expanddiv a:active { opacity:1; }
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 7b11ea43a4b..2aebf734981 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -54,6 +54,7 @@
 "The app name is not specified." => "Имя приложения не указано",
 "The required file {file} is not installed!" => "Необходимый файл {file} не установлен!",
 "Share" => "Открыть доступ",
+"Shared" => "Общие",
 "Error while sharing" => "Ошибка при открытии доступа",
 "Error while unsharing" => "Ошибка при закрытии доступа",
 "Error while changing permissions" => "Ошибка при смене разрешений",
@@ -83,6 +84,8 @@
 "Error setting expiration date" => "Ошибка при установке срока доступа",
 "Sending ..." => "Отправляется ...",
 "Email sent" => "Письмо отправлено",
+"The update was unsuccessful. Please report this issue to the <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud community</a>." => "При обновлении произошла ошибка. Пожалуйста сообщите об этом в <a href=\"https://github.com/owncloud/core/issues\" target=\"_blank\">ownCloud сообщество</a>.",
+"The update was successful. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index de505486f75..2547278547f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -35,7 +35,7 @@
 					<?php echo OCP\User::getDisplayName($user=null)?OCP\User::getDisplayName($user=null):(OC_User::getUser()?OC_User::getUser():'') ?>
 					<img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" />
 				</span>
-				<div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>>
+				<div id="expanddiv">
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li>
 						<a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
diff --git a/core/templates/login.php b/core/templates/login.php
index 59b685eabff..e66d27f6d69 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -43,5 +43,19 @@
 		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
 	</fieldset>
 </form>
-<?php OCP\Util::addscript('core', 'visitortimezone'); ?>
+<?php if (!empty($_['alt_login'])) { ?>
+<form id="alternative-logins">
+	<fieldset>
+		<legend><?php echo $l->t('Alternative Logins') ?></legend>
+		<ul>
+			<?php foreach($_['alt_login'] as $login): ?>
+				<li><a class="button" href="<?php echo $login['href']; ?>" ><?php echo $login['name']; ?></a></li>
+			<?php endforeach; ?>
+		</ul>
+	</fieldset>
+</form>
+<?php } ?>
+
+<?php
+OCP\Util::addscript('core', 'visitortimezone');