@Bakual is this broken now?

@dgt41 Yep, looks like you wanted to update your branch with latest staging? But it applied all commits after your own one, which will mess up the branch.
There are two ways to properly update a branch:

• Merge staging into your branch by creating a "merge-commit". This sort of puts all changes from staging into a single commit and applies it to your branch. It's what we do with 3.4-dev to update it with the latest changes from staging.
• You can rebase your branch. This way Git reverts your own commits, then fast-forwards your branch to current staging by applying each single commit and after that it applies your own commits again on top. It makes very nice PRs but is harder to do and you should never do that on a branch where multiple people are working on (because you change the Git history). For PRs this is usually fine to do since most of the time only yourself is working with it.

@Bakual Is this ok now or do I have to fix it?

The commits still look a bit funny, but the resulting diff (https://github.com/joomla/joomla-cms/pull/4843/files) looks about correct. So it will work fine.

@infograf768 JM can you take a look at this one? This actually is a better implementation of #4694 (now everything is done server side so no javascript code is required). It already got one successful test...

This works.
I suggest to change to

<a class="admin-logo <?php echo ($hidden ? 'disabled' : ''); ?>" <?php echo ($hidden ? '' : 'href="' . $this->baseurl . '"'); ?>><span class="icon-joomla"></span></a>

and further down

                        <a class="<?php echo ($hidden ? ' disabled' : 'dropdown-toggle'); ?>" data-toggle="<?php echo ($hidden ? '' : 'dropdown'); ?>"
                            <?php echo ($hidden ? '' : 'href="#"'); ?>><span class="icon-cog"></span>

this to be consistent in the code style.

@infograf768 Thanks! It’s a lot better now

One more test

test
works good for me

Thanks. Merging