This commit is contained in:
Jeff Bryner 2014-07-03 14:55:58 -07:00
Родитель c7975a3fbd
Коммит 4bbaea9efa
4 изменённых файлов: 83 добавлений и 62 удалений

Просмотреть файл

@ -11,9 +11,9 @@ Anthony Verez averez@mozilla.com
<template name="alert"> <template name="alert">
<div class="container"> <div class="container">
<div class="row"> <div class="center">
<div id="alert" > <div id="alert" >
<table class="table table-bordered table-hover table-condensed" id="alert-table"> <table class="table table-reactive table-hover table-condensed" id="alert-table">
<thead><tr> <thead><tr>
<td class="upperwhite">Timestamp</td> <td class="upperwhite">Timestamp</td>
<td class="upperwhite">ID</td> <td class="upperwhite">ID</td>
@ -27,4 +27,5 @@ Anthony Verez averez@mozilla.com
</div> </div>
</div> </div>
</div> </div>
</template> </template>

Просмотреть файл

@ -10,55 +10,56 @@ Anthony Verez averez@mozilla.com
--> -->
<template name="menu"> <template name="menu">
<div id="header" class="row"> <div class="container">
<div class="span2 offset2"> <div id="header" class="row center">
<h2><a class="mozdef" href="/" title="MOZDEF">MOZDEF</a></h2> <div >
</div> <h2><a class="mozdef" href="/" title="MOZDEF">MOZDEF</a></h2>
<div id="nav-main" class="span6"> </div>
<ul> <div id="nav-main">
<li class="first"><a href="#">Kibana dashboards</a> <ul>
<ul> <li class="first"><a href="#">Kibana dashboards</a>
{{#each kibanadashboards as item}} <ul>
{{>kibanaDashboardItem}} {{#each kibanadashboards as item}}
{{/each}} {{>kibanaDashboardItem}}
</ul> {{/each}}
</ul>
</li>
<li class="first"><a href="/events/">Events</a> </li>
<ul> <li class="first"><a href="/events/">Events</a>
<li class="first"><a href="/logincounts/">logincounts</a></li> <ul>
</ul> <li class="first"><a href="/logincounts/">logincounts</a></li>
</li> </ul>
<li><a href="/alerts/">Alerts</a> </li>
<ul> <li><a href="/alerts/">Alerts</a>
<li class="last"><a href="/alerts/setup">setup</a></li> <ul>
</ul> <li class="last"><a href="/alerts/setup">setup</a></li>
</li> </ul>
<li><a href="/Incidents">Incidents</a> </li>
<ul> <li><a href="/Incidents">Incidents</a>
<li class="first"><a href="/incidents/new/">new incident</a></li> <ul>
<li class="last"><a href="/incidents/attackers">attackers</a></li> <li class="first"><a href="/incidents/new/">new incident</a></li>
</ul> <li class="last"><a href="/incidents/attackers">attackers</a></li>
</li> </ul>
<li><a href="/about">About</a></li> </li>
</ul> <li><a href="/about">About</a></li>
</div> </ul>
<div class="span1">
<a class="mozilla" href="http://mozilla.org"><img src="/images/mozilla-tab.png"></a>
</div>
<div class="span2">
{{#if loggingIn}} <a class="mozilla" href="http://mozilla.org"><img src="/images/mozilla-tab.png"></a>
Logging In <label>
{{else}}
{{#if currentUser}}
Logout: {{currentUser.profile.email}} {{#if loggingIn}}
{{/if}} Logging In
{{/if}} {{else}}
{{> loginButtons align="right"}} {{#if currentUser}}
Logout: {{currentUser.profile.email}}
{{/if}}
{{/if}}
{{> loginButtons align="right"}}
</label>
</div>
</div> </div>
</div> </div>
</template> </template>

Просмотреть файл

@ -44,7 +44,7 @@ Anthony Verez averez@mozilla.com
{{#if currentUser}} {{#if currentUser}}
{{>yield}} {{>yield}}
{{else}} {{else}}
<div class="span5 offset4"> <div class="span5 center">
<div class="alert alert-info alert-dismissible" role="alert"> <div class="alert alert-info alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button> <button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<strong>Please login</strong> <strong>Please login</strong>
@ -57,8 +57,10 @@ Anthony Verez averez@mozilla.com
<!--a nice greeting--> <!--a nice greeting-->
<template name="hello"> <template name="hello">
<div class="span12"> <div class="container">
<p class="welcome">{{greeting}}<br>welcome</p> <div class="center">
<p class="welcome">{{greeting}}<br>welcome</p>
</div>
</div> </div>

Просмотреть файл

@ -30,8 +30,8 @@ body{
/*font-family: monospace;*/ /*font-family: monospace;*/
/*font-family: sans-serif;*/ /*font-family: sans-serif;*/
font-size: 12px; font-size: 12px;
margin: 0; /*margin: 0;*/
min-width: 990px; /*min-width: 990px;*/
padding: 0; padding: 0;
color: #000; color: #000;
line-height: normal; line-height: normal;
@ -99,7 +99,17 @@ body{
} }
/*bootstrap overrides*/ /*bootstrap overrides*/
.centerspan [class*="span"]{
margin: 0 auto;
float: none;
}
.center {
margin: 0 auto;
float: none;
}
.table-striped tbody > tr:nth-child(odd) > td, .table-striped tbody > tr:nth-child(odd) > td,
.table-striped tbody > tr:nth-child(odd) > th { .table-striped tbody > tr:nth-child(odd) > th {
background-color: rgba(211, 202, 193,.2); background-color: rgba(211, 202, 193,.2);
@ -184,8 +194,7 @@ circle:hover{
float: left; float: left;
font: normal 30px; font: normal 30px;
margin: 0; margin: 0;
padding: 2px 0px; padding: 2px 10px;
color: red;
text-align: left; text-align: left;
text-indent: 50px; text-indent: 50px;
text-shadow: #000 5px 3px 3px; text-shadow: #000 5px 3px 3px;
@ -195,6 +204,12 @@ circle:hover{
color:white; color:white;
} }
#header label{
display: inherit;
cursor: auto;
margin:.5em;
}
/*menu styling*/ /*menu styling*/
#nav-main { #nav-main {
text-align: left; text-align: left;
@ -202,6 +217,8 @@ circle:hover{
text-transform: uppercase; text-transform: uppercase;
display: inline-block; display: inline-block;
height: 45px; height: 45px;
margin:.5em;
line-height: normal;
} }
#nav-main ul { #nav-main ul {
@ -228,8 +245,8 @@ circle:hover{
#nav-main li span { #nav-main li span {
border-color: #3a3c46; border-color: #3a3c46;
color: #fff; color: #fff;
padding: 15px 30px 10px 10px; padding: 8px 30px 10px 10px;
height: 18px; height: 10px;
display: block; display: block;
border-style: solid; border-style: solid;
-moz-border-top-colors: none; -moz-border-top-colors: none;
@ -274,11 +291,11 @@ circle:hover{
background: #000; background: #000;
background: rgba(0,0,0,0); background: rgba(0,0,0,0);
transition-duration: 0.2s; transition-duration: 0.1s;
transition-timing-function: linear; transition-timing-function: linear;
transition-delay: 0s; transition-delay: 0s;
transition-property: #6363CE, box-shadow, border-right; transition-property: #6363CE, box-shadow, border-right;
padding-bottom: 15px; padding-bottom: 30px;
outline: 0px none; outline: 0px none;
} }
@ -434,7 +451,7 @@ circle:hover{
#main-content { #main-content {
color: #fff; color: #fff;
margin: 0 auto; /*margin: 0 auto;*/
/*padding: 0 20px;*/ /*padding: 0 20px;*/
text-align: left; text-align: left;
text-shadow: #000 1px 1px 1px; text-shadow: #000 1px 1px 1px;