mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Merge pull request #390 from jbwebware/bug/frontend/issue_331

Browse Source 
Fixes #331 and the link in the navbar message 'Logged in as USERNAME'
This commit is contained in:
Cameron
2013-06-12 02:35:15 -07:00
parent ce1192ac40 dd7202e642
commit b5ec194ae6
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
e107_themes/bootstrap/style.css
View File

@@ -5,7 +5,12 @@ body { padding-bottom: 40px; }
body { padding-top: 75px; }
}
}
.navbar-inverse .brand, .navbar-inverse .nav > li > a.no-block {
display: inline;
padding: 10px 0px;
}
.well { padding:10px; }
footer { padding:60px }

6
e107_themes/bootstrap/theme.php
View File

@@ -154,10 +154,10 @@ $HEADER['default'] = '
</a>
<a class="brand" href="'.SITEURL.'">{SITENAME}</a>
<div class="nav-collapse collapse">
<p class="navbar-text pull-right">
'.(!USERID ? '<a class="navbar-link" href="'.e_LOGIN.'">Sign in</a>': 'Logged in as <a href="#" class="navbar-link">'.USERNAME.'</a>').'
</p>
{NAVIGATION=main}
<ul class="nav nav-pills pull-right">
<li class="dropdown">'.(!USERID ? '<a class="dropdown-toggle" role="button" href="'.e_LOGIN.'">Sign in</a>': '<span class="navbar-text">Logged in as</span> <a class="dropdown-toggle no-block" role="button" href="user.php?id.'.USERID.'">'.USERNAME.'</a>').'</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</div>