diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-18 11:39:04 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-18 11:39:04 +0100 |
| commit | 2675290325dc6a67f6719febe5ed0a546bd7a32a (patch) | |
| tree | 4bb9a7f1b3de7960e98a4a51e76672eca7c62ca3 /core/templates | |
| parent | 4b80466880b4e2daf25e38d621a0ebac608d335d (diff) | |
| parent | 3b9796bfcce38e6e4138ffc68f5a2ff6e34492a0 (diff) | |
| download | nextcloud-server-2675290325dc6a67f6719febe5ed0a546bd7a32a.tar.gz nextcloud-server-2675290325dc6a67f6719febe5ed0a546bd7a32a.zip | |
Merge branch 'master' into master-sqlserver
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/installation.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index cb38d8a3fed..a57506ef237 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -50,7 +50,7 @@ </fieldset> <fieldset id="datadirField"> - <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> ▾</a></legend> + <legend><a id="showAdvanced"><?php echo $l->t( 'Advanced' ); ?> <img class="svg" src="<?php echo image_path('', 'actions/triangle-s.svg'); ?>" /></a></legend> <div id="datadirContent"> <label for="directory"><?php echo $l->t( 'Data folder' ); ?></label> <input type="text" name="directory" id="directory" value="<?php print OC_Helper::init_var('directory', $_['directory']); ?>" /> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 38aa31be32b..2d00bdb5c8e 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -31,7 +31,7 @@ <ul id="settings" class="svg"> <span id="expand"> - <?php echo OCP\User::getDisplayName($user=null)?OC_Util::sanitizeHTML(OCP\User::getDisplayName($user=null)):(OC_User::getUser()?OC_User::getUser():'') ?> + <?php echo $_['displayname'] ?> <img class="svg" src="<?php echo image_path('', 'actions/caret.svg'); ?>" /> </span> <div id="expanddiv"> @@ -61,7 +61,7 @@ <?php foreach($_['navigation'] as $entry): ?> <li data-id="<?php echo $entry['id']; ?>"> <a href="<?php echo $entry['href']; ?>" title="" <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>> - <img class="icon" src="<?php echo $entry['icon']; ?>"/> + <img class="icon svg" src="<?php echo $entry['icon']; ?>"/> <?php echo $entry['name']; ?> </a> </li> |