diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-05-13 19:13:31 +0200 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-05-13 19:13:31 +0200 |
| commit | a5f0ac811fe1c156cf6b6ce5d97c21e77f3f5871 (patch) | |
| tree | 13149e2d6bf3ac28e740ee520d4fc389557520c8 /core/templates | |
| parent | 6b9072de581cf574f129bc1371355dbf91b818d8 (diff) | |
| parent | 3926e2d4f3d786be64230350db982a695d329d97 (diff) | |
| download | nextcloud-server-a5f0ac811fe1c156cf6b6ce5d97c21e77f3f5871.tar.gz nextcloud-server-a5f0ac811fe1c156cf6b6ce5d97c21e77f3f5871.zip | |
Merge branch 'master' into oc_error
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/layout.guest.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 5 | ||||
| -rw-r--r-- | core/templates/login.php | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 2bd2e20df70..7ba7abdbf12 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php echo $jsfile; ?>"></script> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 61eb0de9f42..b832ac2636f 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -1,7 +1,7 @@ <!DOCTYPE html> <html> <head> - <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud</title> + <title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" /> <?php foreach($_['cssfiles'] as $cssfile): ?> @@ -9,6 +9,7 @@ <?php endforeach; ?> <script type="text/javascript"> var oc_webroot = '<?php echo OC::$WEBROOT; ?>'; + var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>'; var oc_current_user = '<?php echo OC_User::getUser() ?>'; </script> <?php foreach($_['jsfiles'] as $jsfile): ?> @@ -43,7 +44,7 @@ </ul> <ul id="settings" class="svg"> - <img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" /> + <img role=button tabindex=0 id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" /> <span><?php echo $l->t('Settings');?></span> <div id="expanddiv" <?php if($_['bodyid'] == 'body-user') echo 'style="display:none;"'; ?>> <?php foreach($_['settingsnavigation'] as $entry):?> diff --git a/core/templates/login.php b/core/templates/login.php index 4ba92221a7d..4035dfe8a5a 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -12,6 +12,7 @@ <p class="infield"> <label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label> <input type="password" name="password" id="password" value="" required <?php echo !empty($_POST['user'])?'autofocus':''; ?> /> + <input type="hidden" name="sectoken" id="sectoken" value="<?php echo($_['sectoken']); ?>" /> </p> <input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label> <input type="submit" id="submit" class="login" value="<?php echo $l->t( 'Log in' ); ?>" /> |