Merge branch 'master' into fixing-998-master

Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js

6 files changed, 52 insertions, 69 deletions

diff --git a/core/templates/exception.php b/core/templates/exception.php
index 4b951fca51b..47792225557 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -5,7 +5,7 @@
 		<p class="exception">
 		<?php
 		if($_['showsysinfo'] == true) {
-			echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="http://bugs.owncloud.org">Bugtracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
+			echo 'If you would like to support ownCloud\'s developers and report this error in our <a href="https://github.com/owncloud/core">bug tracker</a>, please copy the following informations into the description. <br><br><textarea readonly>';
 			echo 'Message: '  . $_['message'] . "\n";
 			echo 'Error Code: '  . $_['code'] . "\n";
 			echo 'File: '  . $_['file'] . "\n";
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 3128c4f2e70..03c580c9b0b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,7 +1,7 @@
-<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
-<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
-<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
-<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
+<input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'>
+<input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'>
+<input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'>
+<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true" />
 	<?php if(count($_['errors']) > 0): ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b50dc6a2073..1a77b2afdf1 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -70,8 +70,10 @@
 			</ul>
 		</div></nav>
 
-		<div id="content">
-			<?php echo $_['content']; ?>
+		<div id="content-wrapper">
+			<div id="content">
+				<?php echo $_['content']; ?>
+			</div>
 		</div>
 	</body>
 </html>
diff --git a/core/templates/login.php b/core/templates/login.php
index 10093baabf7..43e45997803 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,50 +1,50 @@
 <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
 <form method="post">
-    <fieldset>
-        <?php if (!empty($_['redirect_url'])) {
-        echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
-    } ?>
-        <ul>
-            <?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
-            <li class="errors">
-                <?php echo $l->t('Automatic logon rejected!'); ?><br>
-                <small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
-                <br>
-                <small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
-            </li>
-            <?php endif; ?>
-            <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
-            <a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
-                <li class="errors">
-                    <?php echo $l->t('Lost your password?'); ?>
-                </li>
-            </a>
-            <?php endif; ?>
-        </ul>
-        <p class="infield grouptop">
-            <input type="text" name="user" id="user"
-                   value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
-                   autocomplete="on" required/>
-            <label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
-            <img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
-        </p>
+	<fieldset>
+	<?php if (!empty($_['redirect_url'])) {
+		echo '<input type="hidden" name="redirect_url" value="' . $_['redirect_url'] . '" />';
+	} ?>
+		<ul>
+			<?php if (isset($_['invalidcookie']) && ($_['invalidcookie'])): ?>
+			<li class="errors">
+				<?php echo $l->t('Automatic logon rejected!'); ?><br>
+				<small><?php echo $l->t('If you did not change your password recently, your account may be compromised!'); ?></small>
+				<br>
+				<small><?php echo $l->t('Please change your password to secure your account again.'); ?></small>
+			</li>
+			<?php endif; ?>
+			<?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?>
+			<a href="<?php echo OC_Helper::linkToRoute('core_lostpassword_index') ?>">
+				<li class="errors">
+					<?php echo $l->t('Lost your password?'); ?>
+				</li>
+			</a>
+			<?php endif; ?>
+		</ul>
+		<p class="infield grouptop">
+			<input type="text" name="user" id="user"
+				   value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus'] ? ' autofocus' : ''; ?>
+				   autocomplete="on" required/>
+			<label for="user" class="infield"><?php echo $l->t('Username'); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt=""/>
+		</p>
 
-        <p class="infield groupbottom">
-            <input type="password" name="password" id="password" value=""
-                   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
-            <label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
-            <img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
-        </p>
-        <input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
-            for="remember_login"><?php echo $l->t('remember'); ?></label>
-        <input type="hidden" name="timezone-offset" id="timezone-offset"/>
-        <input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
-    </fieldset>
+		<p class="infield groupbottom">
+			<input type="password" name="password" id="password" value=""
+				   required<?php echo $_['user_autofocus'] ? '' : ' autofocus'; ?> />
+			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt=""/>
+		</p>
+		<input type="checkbox" name="remember_login" value="1" id="remember_login"/><label
+			for="remember_login"><?php echo $l->t('remember'); ?></label>
+		<input type="hidden" name="timezone-offset" id="timezone-offset"/>
+		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t('Log in'); ?>"/>
+	</fieldset>
 </form>
 <script>
-    $(document).ready(function () {
-        var visitortimezone = (-new Date().getTimezoneOffset() / 60);
-        $('#timezone-offset').val(visitortimezone);
-    });
+	$(document).ready(function () {
+		var visitortimezone = (-new Date().getTimezoneOffset() / 60);
+		$('#timezone-offset').val(visitortimezone);
+	});
 
 </script>
diff --git a/core/templates/logout.php b/core/templates/logout.php
deleted file mode 100644
index 2247ed8e70f..00000000000
--- a/core/templates/logout.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $l->t( 'You are logged out.' );
diff --git a/core/templates/verify.php b/core/templates/verify.php
deleted file mode 100644
index 600eaca05b7..00000000000
--- a/core/templates/verify.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<form method="post">
-	<fieldset>
-		<ul>
-			<li class="errors">
-				<?php echo $l->t('Security Warning!'); ?><br>
-				<small><?php echo $l->t("Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again."); ?></small>
-			</li>
-		</ul>
-		<p class="infield">
-			<input type="text"  value="<?php echo $_['username']; ?>" disabled="disabled" />
-		</p>
-		<p class="infield">
-			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
-			<input type="password" name="password" id="password" value="" required />
-		</p>
-		<input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Verify' ); ?>" />
-	</fieldset>
-</form>