Merge branch 'master' of github.com:ansible/ansible-commander

This commit is contained in:
Chris Houseknecht 2014-07-22 12:37:48 -04:00
commit 49b10765b8

View File

@ -182,7 +182,7 @@
<a href="" id="main_view_user" ng-click="viewCurrentUser()">Account Settings</a></li>
<a href="" id="main_view_license" ng-click="viewLicense()">View License</a></li>
<a href="https://ansibleworks.zendesk.com/anonymous_requests/new" id="main_contact_support" target="_blank">Contact Support</a></li>
<a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<a id="main_munin" target="_blank" ng-show="user_is_superuser" href="/munin">Monitor Tower</a></li>
<a href="#/logout" id="main_logout">Logout</a>
</nav>
@ -218,7 +218,7 @@
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="/munin">Monitor Tower</a></li>
<li class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li>
</ul>
@ -233,7 +233,7 @@
<li><a id="main_view_user" href="" ng-click="viewCurrentUser()">Account Settings</a></li>
<li><a id="main_view_license" href="" ng-click="viewLicense()">View License</a></li>
<li><a id="main_contact_support" target="_blank" href="https://ansibleworks.zendesk.com/anonymous_requests/new">Contact Support</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="http://munin-monitoring.org/">Monitor Tower</a></li>
<li><a id="main_munin" target="_blank" ng-show="user_is_superuser" href="/munin">Monitor Tower</a></li>
<li class="divider"></li>
<li><a id="main_logout" href="#/logout">Logout</a></li>
</ul>