summaryrefslogtreecommitdiffstats
path: root/core/templates
diff options
context:
space:
mode:
Diffstat (limited to 'core/templates')
-rw-r--r--core/templates/404.php7
-rw-r--r--core/templates/login.php2
2 files changed, 7 insertions, 2 deletions
diff --git a/core/templates/404.php b/core/templates/404.php
index bf1e03e6bc9..90912844ef9 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,4 +1,6 @@
<?php
+/** @var $_ array */
+/** @var $l OC_L10N */
if(!isset($_)) {//also provide standalone error page
require_once '../../lib/base.php';
@@ -12,8 +14,9 @@ if(!isset($_)) {//also provide standalone error page
<?php else: ?>
<ul>
<li class="error">
- <?php p($l->t( 'Cloud not found' )); ?><br/>
- <p class='hint'><?php if(isset($_['file'])) p($_['file'])?></p>
+ <?php p($l->t('File not found')); ?><br/>
+ <p class="hint"><?php p($l->t('The specified document has not been found on the server.')); ?></p>
+ <p class="hint"><a href="<?php p(OC_Helper::linkTo('', 'index.php')) ?>"><?php p($l->t('You can click here to return to %s.', array($theme->getName()))); ?></a></p>
</li>
</ul>
<?php endif; ?>
diff --git a/core/templates/login.php b/core/templates/login.php
index 819010c5485..ad9db14bac1 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,4 +1,5 @@
<?php /** @var $l OC_L10N */ ?>
+<?php script('core', 'jstz') ?>
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->
<form method="post" name="login">
@@ -47,6 +48,7 @@
<label for="remember_login"><?php p($l->t('remember')); ?></label>
<?php endif; ?>
<input type="hidden" name="timezone-offset" id="timezone-offset"/>
+ <input type="hidden" name="timezone" id="timezone"/>
<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
<input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/>
</fieldset>