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

Theme list fixes and navigation avatar-size increase.

Browse Source
This commit is contained in:
Cameron
2016-12-08 12:04:16 -08:00
parent f7c6c3e542
commit 57f703c379
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/url/user/rewrite_url.php
View File

@@ -92,7 +92,7 @@ class core_user_rewrite_url extends eUrlConfig
$sql = e107::getDb('url');
$name = e107::getParser()->toDB($name);
if($sql->select('user', 'user_id', "user_name='{$name}' OR REPLACE(user_name, ' ', '-') ='{$name}' " )) // XXX - new user_sef field? Discuss.
{
$name = $sql->fetch();

12
e107_plugins/_blank/css/blank.css
View File

@@ -10,14 +10,15 @@
width: 100%;
}
.nav-list { border-bottom: 0 solid #eee; }
.nav-list > li {
.-blank-megamenu .nav-list { border-bottom: 0 solid #eee; }
.-blank-megamenu .nav-list > li {
padding: 20px 15px 15px;
}
.nav-list > li:last-child { border-right: 0 solid #eee; }
.nav-list > li > a:hover { text-decoration: none; }
.nav-list > li > a > span {
.-blank-megamenu .nav-list > li:last-child { border-right: 0 solid #eee; }
.-blank-megamenu .nav-list > li > a:hover { text-decoration: none; }
.-blank-megamenu .nav-list > li > a > span {
display: block;
font-weight: bold;
text-transform: uppercase;
@@ -25,3 +26,4 @@

6
e107_themes/bootstrap3/theme_shortcodes.php
View File

@@ -190,12 +190,14 @@ class theme_shortcodes extends e_shortcode
// Logged in.
//TODO Generic LANS. (not theme LANs)
$userNameLabel = !empty($parm['username']) ? USERNAME : '';
$text = '
<ul class="nav navbar-nav navbar-right'.$direction.'">
<li class="dropdown">{PM_NAV}</li>
<li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{SETIMAGE: w=20} {USER_AVATAR: shape=circle} '. USERNAME.' <b class="caret"></b></a>
<li class="dropdown dropdown-avatar"><a href="#" class="dropdown-toggle" data-toggle="dropdown">{SETIMAGE: w=30} {USER_AVATAR: shape=circle} '. $userNameLabel.' <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a href="{LM_USERSETTINGS_HREF}"><span class="glyphicon glyphicon-cog"></span> '.LAN_SETTINGS.'</a>

6
e107_themes/voux/style.css
View File

@@ -529,6 +529,12 @@ img.news-image-1 { margin-bottom:15px }
.othernews2-block a.btn { display: none; }
.othernews2-block img { width:72px; }
.menu span.badge { float:right}
.menu ul { padding-left:15px; margin-left:15px }
.menu ul li { padding-bottom:8px }
.menu ul.list-unstyled { padding-left:0}
/* Extra small devices Phones (<768px) .col-xs */