github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed user button on top bar to drop down, tweaked login page, closes #635

pull/653/head
Justin Richer 2014-07-17 00:11:27 -04:00
parent 9666404d54
commit 38b6ab7a1b
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openid-connect-server-webapp/src/main/webapp/WEB-INF/tags/topbar.tag
View File

@ -80,21 +80,23 @@
</security:authorize>
<div class="nav pull-right">
<ul class="nav pull-right">
<security:authorize access="hasRole('ROLE_USER')">
<div class="btn-group">
<a class="btn btn-primary btn-small dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
<li class="dropdown">
<a id="userButton" class="dropdown-toggle" data-toggle="dropdown" href=""><i class="icon-user icon-white"></i> ${ shortName } <span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><a href="manage/#user/profile" data-toggle="collapse" data-target=".nav-collapse">${ longName }</a></li>
<li class="divider"></li>
<li><a href="logout" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-remove"></i> Log out</a></li>
</ul>
</div>
</li>
</security:authorize>
<security:authorize access="!hasRole('ROLE_USER')">
<a class="btn btn-primary btn-small" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-user icon-white"></i> Log in</a>
<li>
<a id="userButton" href="login" data-toggle="collapse" data-target=".nav-collapse"><i class="icon-lock icon-white"></i> Log in</a>
</li>
</security:authorize>
</div>
</ul>
</div><!--/.nav-collapse -->
</c:if>

2
openid-connect-server-webapp/src/main/webapp/WEB-INF/views/login.jsp
View File

@ -38,7 +38,7 @@ $(document).ready(function() {
<input type="password" placeholder="Password" autocorrect="off" autocapitalize="off" autocomplete="off" spellcheck="false" id="j_password" name="j_password">
</div>
</div>
<div class="form-actions">
<div>
<input type="submit" class="btn" value="Login" name="submit">
</div>
</form>

34
openid-connect-server-webapp/src/main/webapp/resources/css/mitreid-connect.css
View File

@ -25,6 +25,40 @@ h1,label {
left: -6px;
}
/* login button */
.navbar #userButton {
background-color: #006dcc;
background-image: linear-gradient(to bottom, #0088cc, #0044cc);
background-repeat: repeat-x;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
color: #ffffff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
box-shadow: 0 3px 8px rgba(255, 255, 255, 0.125) inset;
font-size: 0.9em;
}
.navbar #userButton:focus, .navbar #userButton:hover {
background-color: #0044cc;
color: #ffffff;
background-position: 0 -15px;
text-decoration: none;
transition: background-position 0.1s linear 0s;
}
.navbar #userButton:active {
background-color: #0044cc;
color: #ffffff;
background-image: none;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.15) inset, 0 1px 2px rgba(0, 0, 0, 0.05);
outline: 0 none;
}
.navbar #userButton .caret {
border-bottom-color: #ffffff;
border-top-color: #ffffff;
}
/* Wrapper for page content to push down footer */
#wrap {
min-height: 100%;