Skip to content

Commit

Permalink
#145 Update skin of login page, migration page
Browse files Browse the repository at this point in the history
  • Loading branch information
@nadouani
nadouani committed Mar 16, 2017
1 parent 4d34417 commit 5b3842c
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 215 deletions.
14 changes: 11 additions & 3 deletions ui/app/styles/main.css
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
body {
background-color: #ecf0f5;
}
a, body {
/*height: 99%;*/
overflow: hidden;
/*font-family: 'Roboto', sans-serif;*/
/*font-weight: 300;*/
}
a.noline {
text-decoration: none !important;
Expand Down Expand Up @@ -451,6 +451,14 @@ table tr.tr-warning>td {
border-top-color: #001f3f;
}

.tags-list {
font-size: 12px !important;
}
.tags-list .label {
font-size: inherit !important;
font-weight: normal;
}

tags-input .tags {
border-radius: 0;
}
Expand Down
163 changes: 0 additions & 163 deletions ui/app/views/app.html
View file
Original file line number Diff line number Diff line change
@@ -1,164 +1 @@
<!--
<nav class="navbar navbar-inverse navbar-fixed-top main-navbar" ng-if="!hideStatusBar" ng-show="currentUser.id" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
<button aria-expanded="false" class="navbar-toggle collapsed" data-target="#th-navbar-collapse" data-toggle="collapse" type="button">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" ui-sref="app.cases()">
<img alt="The Hive" src="images/logo.white.png"></a>
</div>
<div class="collapse navbar-collapse" id="th-navbar-collapse">
<ul class="nav navbar-nav" ng-show="currentUser.id">
<li class="dropdown" uib-dropdown>
<a class="dropdown-toggle" uib-dropdown-toggle href>
<i class="text-default fa fa-plus"></i>
<span class="hpad5">New Case</span>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li>
<a href ng-click="createNewCase()">Empty Case</a>
</li>
<li class="divider" ng-if="templates && templates.length > 0"></li>
<li ng-repeat="template in templates">
<a href ng-click="createNewCase(template)">From
{{template.name | uppercase}}
template</a>
</li>
</ul>
</li>
<li ui-sref-active="active">
<a ui-sref="app.main({viewId: 'mytasks'})">My tasks
<span class="badge alert-danger">{{myCurrentTasks.count}}</span>
</a>
</li>
<li ui-sref-active="active">
<a ui-sref="app.main({viewId: 'waitingtasks'})">Waiting tasks
<span class="badge alert-danger">{{waitingTasks.count}}</span>
</a>
</li>
<li ng-show="mispEnabled === true" ui-sref-active="active">
<a href ui-sref="app.misp-list">
MISP
<span class="badge alert-danger">{{(mispEvents.New.count || 0) + (mispEvents.Update.count || 0)}}</span>
</a>
</li>
<li class="hdivider hidden-xs"></li>
<li ui-sref-active="active">
<a ui-sref="app.statistics">
<i class="fa fa-bar-chart"></i> Statistics
</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li ng-if="async > 0" class="hidden-xs">
<a>{{async}}
<i class="fa fa-circle-o-notch fa-spin"></i>
</a>
</li>
<li>
<form ng-submit="search(querystring)" style="margin-top : 10px">
<div class="input-group" style="width: 220px">
<span class="input-group-addon">
<i class="glyphicon glyphicon-search"></i>
</span>
<input class="input-sm form-control" ng-model="querystring" placeholder="Case, user, URL, hash, IP, domain ..." style="width : 200px" tooltype="Enter your query string" type="text"></input>
<div class="input-group-btn">
<div class="btn-group dropdown" uib-dropdown>
<a class="btn btn-sm btn-default dropdown-toggle" uib-dropdown-toggle href>
<span class="caret"></span>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li class="dropdown-header" role="presentation">Custom search</li>
<li>
<a ng-click="querystring = 'status:Resolved' ; search(querystring);">Closed cases</a>
</li>
<li>
<a ng-click="querystring = 'caseId:'">By case number</a>
</li>
<li>
<a ng-click="querystring = '_type:case_artifact '">Observables</a>
</li>
<li class="divider"></li>
<li>
<a ng-click="querystring = '_type:case AND (_missing_:endDate) AND (startDate:{* TO now-1M})' ; search(querystring);">Cold cases</a>
</li>
</ul>
</div>
</div>
</div>
</form>
</li>
<li class="dropdown" uib-dropdown ng-if="isAdmin(currentUser)">
<a class="dropdown-toggle" uib-dropdown-toggle href>
<i class="fa fa-cog"></i>
<span class="hpad5">Admin</span>
<b class="caret"></b>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li>
<a ui-sref="app.administration.users">
<i class="fa fa-users"></i>
<span class="hpad5">Users</span>
</a>
</li>
<li class="divider"></li>
<li>
<a ui-sref="app.administration.case-templates">
<i class="fa fa-file-text"></i>
<span class="hpad5">Case templates</span>
</a>
</li>
<li>
<a ui-sref="app.administration.report-templates">
<i class="fa fa-file-text"></i>
<span class="hpad5">Report templates</span>
</a>
</li>
<li>
<a ui-sref="app.administration.metrics">
<i class="fa fa-tachometer"></i>
<span class="hpad5">Case metrics</span>
</a>
</li>
<li class="divider"></li>
<li>
<a ui-sref="app.administration.observables">
<i class="glyphicon glyphicon-pushpin"></i>
<span class="hpad5">Observables</span>
</a>
</li>
</ul>
</li>
<li class="dropdown" uib-dropdown>
<a class="profile dropdown-toggle" uib-dropdown-toggle href>
<user user-id="currentUser.id"></user>
</a>
<ul class="dropdown-menu" uib-dropdown-menu>
<li>
<a ui-sref="app.settings">Personal settings</a>
</li>
<li class="divider"></li>
<li>
<a href="/docs" target="_blank">Help</a>
</li>
<li>
<a href ng-click="aboutTheHive()">About The Hive</a>
</li>
<li class="divider"></li>
<li>
<a href ng-click="logout()">Logout</a>
</li>
</ul>
</li>
</ul>
</div>
</div>
</nav>
-->
<app-container class="wrapper"></app-container>
2 changes: 1 addition & 1 deletion ui/app/views/directives/tag-list.html
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<div class="flexwrap">
<div class="tags-list flexwrap">
<span ng-repeat="tag in data" class="label label-primary mb-xxxs mr-xxxs">{{tag}}</span>
</div>
31 changes: 16 additions & 15 deletions ui/app/views/login.html
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
<div class="container-fluid">
<div class="login-box">
<div class="login-logo">
<img src="images/logo.png" height="70"/>
</div>
<div class="login-box-body">
<p class="login-box-msg">Sign in to start your session</p>

<div class="login-form well well-sm" style="margin-bottom: 0px">
<h1 align="center"><img src="images/logo.png" height="50"/></h1>
<br />
<alert ng-repeat="alert in alerts" type="{{alert.type}}" close="closeAlert($index)">{{alert.message}}</alert>
<form ng-submit="login()">
<form name="loginForm" ng-submit="login()">
<div class="form-group has-feedback has-feedback-left">
<input type="text" class="form-control" placeholder="Login" ng-model="params.username" autocomplete="off">
<i style="top:0px;" class="form-control-feedback glyphicon glyphicon-user"></i>
<input type="text" class="form-control" placeholder="Login" ng-model="params.username" autocomplete="off" required>
<i class="form-control-feedback glyphicon glyphicon-user"></i>
</div>
<br />
<div class="form-group has-feedback has-feedback-left">
<input type="password" class="input form-control" placeholder="Password" ng-model="params.password" autocomplete="off">
<i style="top:0px;" class="form-control-feedback glyphicon glyphicon-lock "></i>
<input type="password" class="input form-control" placeholder="Password" ng-model="params.password" autocomplete="off" required>
<i class="form-control-feedback glyphicon glyphicon-lock "></i>
</div>
<br /> <br />
<div class="text-center">
<input type="submit" class="btn btn-primary btn-lg" value="Sign In" />

<div class="row">
<div class="col-xs-offset-8 col-xs-4">
<button type="submit" class="btn btn-primary btn-sm btn-block btn-flat" ng-disabled="loginForm.$invalid">Sign In</div>
</div>
</div>
</form>
</div>

</div>
72 changes: 40 additions & 32 deletions ui/app/views/maintenance.html
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
<div class="container-fluid">
<!--
<br>
<br>
<div style="position:absolute; margin:auto; top:0px; left:0px; right:0px; z-index:100; width:50%;">
<alert close="closeAlert($index)" ng-repeat="alert in alerts" type="{{alert.type}}">{{alert.message}}</alert>
</div> -->

<div class="row mt-m">
<div class="col-md-8 col-md-offset-2">
<alert close="closeAlert($index)" ng-repeat="alert in alerts" type="{{alert.type}}">{{alert.message}}</alert>
</div>
</div>

<!-- Update Database -->
Expand All @@ -14,7 +21,7 @@
<p class="text-center">The Hive needs to update its database</p>
<br>
<div class="text-center">
<div class="btn btn-warning" ng-click="migrate()" ng-hide="migrating">Update Database</div>
<button type="button" class="btn btn-sm btn-default" ng-click="migrate()" ng-hide="migrating">Update Database</button>
</div>
</div>
</div>
Expand All @@ -25,46 +32,47 @@
<div class="col-md-8 col-md-offset-2">
<div ng-hide="showUserForm" ng-repeat="status in migrationStatus">
{{status.tableName}} ({{status.current}} / {{status.total}})
<progress>
<bar type="success" value="status.current * 100 / status.total">{{status.current}}</bar>
</progress>
<uib-progress>
<uib-bar type="info" value="status.current * 100 / status.total">{{status.current}}</uib-bar>
</uib-progress>
</div>
</div>
</div>

<!-- Add Administrator account -->
<div class="row" ng-show="showUserForm">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading"><h4>Create administrator account</h4></div>
<div class="panel-body">
<form class="form-horizontal" ng-submit="createInitialUser()">
<div class="form-group">
<label class="col-sm-2 control-label" for="inputLogin">Login</label>
<div class="col-sm-10">
<input class="form-control" id="inputLogin" ng-model="newUser.login" placeholder="Login" type="text">
<!-- Add Administrator account -->
<div class="row" ng-show="showUserForm">
<div class="col-md-8 col-md-offset-2">
<div class="panel panel-default">
<div class="panel-heading"><h4>Create administrator account</h4></div>
<div class="panel-body">
<form class="form-horizontal" ng-submit="createInitialUser()">
<div class="form-group">
<label class="col-sm-2 control-label">Login</label>
<div class="col-sm-10">
<input class="form-control" ng-model="newUser.login" placeholder="Login" type="text" autocomplete="off">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="inputName">Name</label>
<div class="col-sm-10">
<input class="form-control" id="inputName" ng-model="newUser.name" placeholder="Name" type="text">
<div class="form-group">
<label class="col-sm-2 control-label">Name</label>
<div class="col-sm-10">
<input class="form-control" ng-model="newUser.name" placeholder="Name" type="text" autocomplete="off">
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-2 control-label" for="inputPassword">Password</label>
<div class="col-sm-10">
<input class="form-control" id="inputPassword" ng-model="newUser.password" placeholder="Password" type="password">
<div class="form-group">
<label class="col-sm-2 control-label">Password</label>
<div class="col-sm-10">
<input class="form-control" ng-model="newUser.password" placeholder="Password" type="password" autocomplete="off">
</div>
</div>
</div>
<div class="form-group">
<div class="text-center">
<div class="col-sm-offset-2 col-sm-10">
<button class="btn btn-primary" type="submit">Create</button>
<div class="form-group">
<div class="text-center">
<div class="col-sm-offset-2 col-sm-10">
<button class="btn btn-primary" type="submit">Create</button>
</div>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ui/app/views/partials/misp/event.dialog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h4 class="vpad10 text-primary">
<dl class="dl-horizontal clear">
<dt>Tags</dt>
<dd>
<tag-list data="dialog.event.tags"></tag-list>
<tag-list data="dialog.event.tags"></tag-list>
</dd>
</dl>

Expand Down

0 comments on commit 5b3842c

Please sign in to comment.