app/common/directives/app-header.html

<header id="header">
<<<<<<< HEAD:src/header.html
    <div class="logo__wrapper"></div>
    <span class="app__version">openBMC V.0.0.1</span>
    <div id="app-user" class="float-right">
        <span class="app-user__indicator inline"></span>
        <span class="app-user__name inline">SysAdmin</span>
=======
    <span class="app__version float-left">{{dataService.app_version}}</span>
    <a href="" class="header__logout" ng-click="logout()">Log out</a>
</header>
<div class="header__functions-wrapper" role="heading">
    <div class="logo__wrapper"><img src="assets/images/logo.svg" id="header__logo"  alt="company logo"/></div>
    <button id="header__server-name">{{dataService.server_id}}</button>
    <div class="header__functions">
        <a href="" id="header__server-health">Server health<span class="status-light__error">{{dataService.server_health}}</span></a>
        <a href="#/overview/power-operations" class="header__server-power" role="button">Server power<span ng-class="{'status-light__error': dataService.server_state == 'Off', 'status-light__disabled': dataService.server_state == 'Unreachable', 'status-light__good': dataService.server_state == 'Running', 'status-light__warn': dataService.server_state == 'Quiesced'}">{{dataService.server_state}}</span></a>
        <p class="header__refresh">Page last refreshed <span>{{dataService.last_updated |date:'h:mm:ss MMM dd yyyy'}}</span></p>
        <button class="header__page-refresh" ng-click="refresh()"><img src="assets/images/icon-refresh-white.svg" alt="refresh page" role="button"/></button>
>>>>>>> 4c1a3dd... Major update to code structure:app/common/directives/app-header.html
    </div>
</header>
<div class="header__functions-wrapper">
    header functions here
</div>