openinfra
/
openstackid
Code Issues Proposed changes

[smarcet] - fix on login UI

This commit is contained in:
smarcet 2013-11-06 13:55:45 -03:00
parent 7f513d4d9b
commit bd9a399dba
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.idea/workspace.xml
View File

@ -2,6 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cdc3929b-040d-4e45-bbd9-fa8f8bc87073" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/UserController.php" afterPath="$PROJECT_DIR$/app/controllers/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/login.blade.php" afterPath="$PROJECT_DIR$/app/views/login.blade.php" />
</list>
<ignored path="openidIdp.iws" />
@ -39,7 +40,7 @@
<file leaf-file-name="login.blade.php" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/views/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="3" selection-start="214" selection-end="214" vertical-scroll-proportion="0.5" vertical-offset="0" max-vertical-offset="990">
<state line="16" column="4" selection-start="418" selection-end="418" vertical-scroll-proportion="0.8888889" vertical-offset="0" max-vertical-offset="1020">
<folding />
</state>
</provider>
@ -48,7 +49,7 @@
<file leaf-file-name="UserController.php" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/controllers/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="119" column="0" selection-start="5100" selection-end="5100" vertical-scroll-proportion="-42.75" vertical-offset="759" max-vertical-offset="4275">
<state line="56" column="0" selection-start="2423" selection-end="2423" vertical-scroll-proportion="-5.25" vertical-offset="714" max-vertical-offset="4290">
<folding>
<element signature="e#7#59#0" expanded="true" />
</folding>
@ -107,8 +108,8 @@
<option value="$PROJECT_DIR$/app/views/profile.blade.php" />
<option value="$PROJECT_DIR$/app/libs/openid/helpers/OpenIdErrorMessages.php" />
<option value="$PROJECT_DIR$/app/libs/openid/handlers/OpenIdAuthenticationRequestHandler.php" />
<option value="$PROJECT_DIR$/app/controllers/UserController.php" />
<option value="$PROJECT_DIR$/app/libs/auth/CustomAuthProvider.php" />
<option value="$PROJECT_DIR$/app/controllers/UserController.php" />
<option value="$PROJECT_DIR$/app/views/login.blade.php" />
</list>
</option>
@ -649,7 +650,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/controllers/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state line="119" column="0" selection-start="5100" selection-end="5100" vertical-scroll-proportion="-42.75" vertical-offset="759" max-vertical-offset="4275">
<state line="56" column="0" selection-start="2423" selection-end="2423" vertical-scroll-proportion="-5.25" vertical-offset="714" max-vertical-offset="4290">
<folding>
<element signature="e#7#59#0" expanded="true" />
</folding>
@ -658,7 +659,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/app/views/login.blade.php">
<provider selected="true" editor-type-id="text-editor">
<state line="9" column="3" selection-start="214" selection-end="214" vertical-scroll-proportion="0.5" vertical-offset="0" max-vertical-offset="990">
<state line="16" column="4" selection-start="418" selection-end="418" vertical-scroll-proportion="0.8888889" vertical-offset="0" max-vertical-offset="1020">
<folding />
</state>
</provider>

1
app/controllers/UserController.php
View File

@ -54,6 +54,7 @@ class UserController extends BaseController
else{
$auth_request = new OpenIdAuthenticationRequest($msg);
$params = array('realm'=>$auth_request->getRealm());
if(!$auth_request->isIdentitySelectByOP()){
$params['claimed_id'] = $auth_request->getClaimedId();
$params['identity'] = $auth_request->getIdentity();

18
app/views/login.blade.php
View File

@ -5,14 +5,16 @@
@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>
@else
<legend>
Sign in to <b>{{$realm}}</b> using your openstackid
</legend>
@if(isset($identity_select))
@if(!$identity_select)
<legend>
Sign in to <b>{{$realm}}</b> using <b>{{$identity}}</b>
</legend>
@else
<legend>
Sign in to <b>{{$realm}}</b> using your openstackid
</legend>
@endif
@endif
<div class="span4" id="sidebar">