forks/baikal
1
0
Fork 0
Code Releases Activity

Merge branch 'mongoose' of github.com:jeromeschneider/Baikal into mongoose

Browse source
This commit is contained in:
Jérôme Schneider 2012-05-10 09:00:27 +02:00
commit 520a02030f
2 changed files with 1 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
CoreVersions/0.2.0/Frameworks/BaikalAdmin/Controller/Navigation/Topbar.php
View file

@ -64,31 +64,6 @@ class Topbar extends \Flake\Core\Controller {
$sActiveSettingsSystem = "active";
}
<<<<<<< HEAD
$sHtml =<<<HTML
<div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="{$sHomeLink}"><img style="vertical-align: text-top; line-height: 20px;" src="res/core/BaikalAdmin/Templates/Page/baikal-text-20.png" /> Web Admin</a>
<div class="nav-collapse">
<ul class="nav">
<li class="{$sActiveHome}"> <a href="{$sHomeLink}">Dashboard</a></li>
<li class="{$sActiveUsers}"> <a href="{$sUsersLink}">Users and resources</a></li>
<li class="{$sActiveSettingsStandard}"> <a href="{$sSettingsStandardLink}">Settings</a></li>
<li class="{$sActiveSettingsSystem}"> <a href="{$sSettingsSystemLink}">System settings</a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>
</div>
HTML;
return $sHtml;
=======
$oView->setData("activehome", $sActiveHome);
$oView->setData("activeusers", $sActiveUsers);
$oView->setData("activesettingsstandard", $sActiveSettingsStandard);
@ -100,6 +75,5 @@ HTML;
$oView->setData("logoutlink", $sLogoutLink);
return $oView->render();
>>>>>>> 140b415248d6a98d9f3aa37815964b3a4456cfd6
}
}

2
CoreVersions/0.2.0/Frameworks/BaikalAdmin/Resources/Templates/Navigation/Topbar.html
View file

@ -6,7 +6,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<a class="brand" href="<?= $homelink ?>">Baïkal Web Admin</a>
<a class="brand" href="{$sHomeLink}"><img style="vertical-align: text-top; line-height: 20px;" src="res/core/BaikalAdmin/Templates/Page/baikal-text-20.png" /> Web Admin</a>
<div class="nav-collapse">
<ul class="nav">
<li class="<?= $activehome ?>"> <a href="<?= $homelink ?>">Dashboard</a></li>