Skip to content

Commit

Permalink
Merge pull request #8 from matthewdorman/1.x-1.x
Browse files Browse the repository at this point in the history
1.x 1.x
  • Loading branch information
matthewdorman committed Sep 17, 2015
2 parents e401bea + 99378a6 commit 528ccc1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 175 deletions.
69 changes: 0 additions & 69 deletions templates/wpmenu-left.html.twig

This file was deleted.

106 changes: 0 additions & 106 deletions templates/wpmenu-top.html.twig

This file was deleted.

7 changes: 7 additions & 0 deletions templates/wpmenu-top.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@
</li>
</ul>
<ul id="wp-admin-bar-top-secondary" class="ab-top-secondary ab-top-menu">

<li id="wp-admin-bar-search" class="admin-bar-search ">
<div class="ab-item ab-empty-item" tabindex="-1">
<?php print $form; ?>
</div>
</li>

<li id="wp-admin-bar-my-account" class="menupop with-avatar">
<a class="ab-item" aria-haspopup="true" href="<?php print url('user/' . $uid); ?>">Howdy, <?php print $username; ?><img alt='' src='https://1.gravatar.com/avatar/d348f0224b906215c12d0e7e0d8f086c?s=26&#038;d=mm&#038;r=g' srcset='https://1.gravatar.com/avatar/d348f0224b906215c12d0e7e0d8f086c?s=52&amp;d=mm&amp;r=g 2x' class='avatar avatar-26 photo' height='26' width='26' /></a>
<div class="ab-sub-wrapper">
Expand Down
8 changes: 8 additions & 0 deletions wpmenu.module
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ function template_preprocess_wpmenu_top(&$variables) {
$types = node_type_get_types();
$content_types = array_keys($types);

// Adds core search form with correct styling
$search_form = backdrop_get_form('search_block_form');
$search_form['#attributes']['id'][] = 'adminbarsearch';
$search_form['search_block_form']['#attributes']['class'][] = 'adminbar-input';
unset($search_form['actions']['submit']);
$variables['form'] = backdrop_render($search_form);
// End search form

$variables['is_admin'] = $is_admin;
$variables['site_name'] = config_get('system.core', 'site_name');
$variables['base_path'] = $base_path;
Expand Down

0 comments on commit 528ccc1

Please sign in to comment.