Merge branch '3.0' of github.com:wazuh/wazuh-kibana-app-dev into formatting-os-name-92

Conflicts:
	public/templates/agents-overview.html
This commit is contained in:
malbarral 2017-08-10 16:37:20 +02:00
commit 15fe4a8f70
3 changed files with 17 additions and 4 deletions

View File

@ -3,6 +3,16 @@ body{
width:100%; width:100%;
} }
md-card.text-centered {
position: relative;
}
md-card.text-centered md-card-content {
position: absolute;
top: 50%; left: 50%;
transform: translate(-50%,-50%);
}
@-webkit-keyframes uil-ring-anim { @-webkit-keyframes uil-ring-anim {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);

View File

@ -96,7 +96,9 @@
</span> </span>
<span flex="5" ng-click="setSort('id')">ID <span flex="5" ng-click="setSort('id')">ID
<i class="fa" ng-class="_sort === 'id' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span> <i class="fa" ng-class="_sort === 'id' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span>
<span flex="25" ng-click="setSort('name')">Name <span flex="10" ng-click="setSort('version')">Version
<i class="fa" ng-class="_sort === 'version' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span>
<span flex="15" ng-click="setSort('name')">Name
<i class="fa" ng-class="_sort === 'name' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span> <i class="fa" ng-class="_sort === 'name' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span>
<span flex="20" ng-click="setSort('ip')">IP <span flex="20" ng-click="setSort('ip')">IP
<i class="fa" ng-class="_sort === 'ip' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span> <i class="fa" ng-class="_sort === 'ip' ? (_sortOrder ? 'fa-sort-asc' : 'fa-sort-desc') : 'fa-sort'" aria-hidden="true"></i></span>
@ -116,7 +118,8 @@
<input class="agent-checkbox" ng-model="agent.selected" value="{{agent.id}}" type="checkbox"/> <input class="agent-checkbox" ng-model="agent.selected" value="{{agent.id}}" type="checkbox"/>
</span> </span>
<span flex="5" ng-click="applyAgent(agent)">{{agent.id}}</span> <span flex="5" ng-click="applyAgent(agent)">{{agent.id}}</span>
<span flex="25" ng-click="applyAgent(agent)">{{agent.name}}</span> <span flex="10" ng-click="applyAgent(agent)">{{agent.version}}</span>
<span flex="15" ng-click="applyAgent(agent)">{{agent.name}}</span>
<span flex="20" ng-click="applyAgent(agent)">{{agent.ip}}</span> <span flex="20" ng-click="applyAgent(agent)">{{agent.ip}}</span>
<span flex="10" ng-click="applyAgent(agent)">{{agent.status}}</span> <span flex="10" ng-click="applyAgent(agent)">{{agent.status}}</span>
<span flex="10" ng-click="applyAgent(agent)"> <span ng-class="getAgentStatusClass(agent.status)" class="round status"></span></span> <span flex="10" ng-click="applyAgent(agent)"> <span ng-class="getAgentStatusClass(agent.status)" class="round status"></span></span>

View File

@ -71,8 +71,8 @@
<md-nav-item md-nav-click="switchTab('overview')" name="overview">Overview</md-nav-item> <md-nav-item md-nav-click="switchTab('overview')" name="overview">Overview</md-nav-item>
<md-nav-item md-nav-click="switchTab('fim');" name="fim">File Integrity</md-nav-item> <md-nav-item md-nav-click="switchTab('fim');" name="fim">File Integrity</md-nav-item>
<md-nav-item md-nav-click="switchTab('policy_monitoring');" name="policy_monitoring">Policy Monitoring</md-nav-item> <md-nav-item md-nav-click="switchTab('policy_monitoring');" name="policy_monitoring">Policy Monitoring</md-nav-item>
<md-nav-item md-nav-click="switchTab('oscap');" name="oscap" ng-show="extensions.oscap">SCAP</md-nav-item> <md-nav-item ng-hide="_agent.os.platform=='windows'" md-nav-click="switchTab('oscap');" name="oscap" ng-show="extensions.oscap">SCAP</md-nav-item>
<md-nav-item md-nav-click="switchTab('audit');" name="audit" ng-show="extensions.audit">Audit</md-nav-item> <md-nav-item ng-hide="_agent.os.platform=='windows'" md-nav-click="switchTab('audit');" name="audit" ng-show="extensions.audit">Audit</md-nav-item>
<md-nav-item md-nav-click="switchTab('pci');" name="pci" ng-show="extensions.pci">PCI DSS</md-nav-item> <md-nav-item md-nav-click="switchTab('pci');" name="pci" ng-show="extensions.pci">PCI DSS</md-nav-item>
</md-nav-bar> </md-nav-bar>
</md-content> </md-content>