diff --git a/e107_core/url/user/rewrite_url.php b/e107_core/url/user/rewrite_url.php index 9f1bacafe..f0e31a309 100644 --- a/e107_core/url/user/rewrite_url.php +++ b/e107_core/url/user/rewrite_url.php @@ -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(); diff --git a/e107_plugins/_blank/css/blank.css b/e107_plugins/_blank/css/blank.css index 5832b22e0..1c45f2bc7 100644 --- a/e107_plugins/_blank/css/blank.css +++ b/e107_plugins/_blank/css/blank.css @@ -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 @@ + diff --git a/e107_themes/bootstrap3/theme_shortcodes.php b/e107_themes/bootstrap3/theme_shortcodes.php index a79efbfce..d256ac0c6 100644 --- a/e107_themes/bootstrap3/theme_shortcodes.php +++ b/e107_themes/bootstrap3/theme_shortcodes.php @@ -190,12 +190,14 @@ class theme_shortcodes extends e_shortcode // Logged in. //TODO Generic LANS. (not theme LANs) - + + $userNameLabel = !empty($parm['username']) ? USERNAME : ''; + $text = '