[smarcet] - Refs #4586, #4581 - updated trusted sites manager and updated login UI

This commit is contained in:
smarcet
2013-11-06 13:36:15 -03:00
parent 130e6cbdc8
commit 5df5c7cc3c
13 changed files with 287 additions and 345 deletions

View File

@@ -3,8 +3,15 @@
<title>Welcome to openstackId - Sign in </title>
@stop
@section('content')
<h4>Welcome to OpenstackId!!!</h4>
@if(isset($identity_select) && !$identity_select)
<legend>
Sign in to <b>{{$realm}}</b> using <b>{{$identity}}</b>
</legend>
@endif
<div class="span4" id="sidebar">
<h4>Welcome to OpenstackId!!!</h4>
<div class="well">
{{ Form::open(array('url' => URL::action('UserController@postLogin'), 'method' => 'post', "autocomplete" => "off")) }}
<fieldset>

View File

@@ -73,6 +73,7 @@
<table class="table table-hover table-condensed">
<thead>
<tr>
<th>From Realm</th>
<th>Action</th>
<th>From IP</th>
<th><i class="icon-info-sign accordion-toggle" title="Time is on UTC"></i>&nbsp;When</th>
@@ -81,6 +82,11 @@
<tbody>
@foreach ($actions as $action)
<tr>
@if(is_null($action->realm))
<td>Site</td>
@else
<td>{{ $action->realm }}</td>
@endif
<td>{{ $action->user_action }}</td>
<td>{{ $action->from_ip }}</td>
<td>{{ $action->created_at }}</td>