Skip to content

Commit

Permalink
Adjusted layout for auto-login button in demo mode
Browse files Browse the repository at this point in the history 
Adjusted layout for auto-login button in demo mode
  • Loading branch information
@silvae86
silvae86 committed Jun 1, 2017
1 parent f24fbfc commit 0ac86d1
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 26 deletions.
26 changes: 20 additions & 6 deletions src/views/auth/login.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@
}
</style>

<%- include ../layout/demo_notice.ejs %>

<div class="container well well-main">
<div class="row-fluid">
<div class="row">
<form action="/login" method="POST">
<div class="col-xs-12">
<div class="form-group text-center">
<h1>Login</h1>
<div class="text-center">
<button onclick="prefillBoxes()" class="btn btn-sm btn-success"><i class="fa fa-paste"></i>Login as demonstration user</button>
</div>
</div>

<div class="form-group">
Expand Down Expand Up @@ -49,6 +54,21 @@
</div>
</div>

<br/>
<br/>

<script type="application/javascript">
function prefillBoxes (){
if($("#username").length && $("#password").length)
{
$("#username").val("<%=Config.demo_mode.users[0].username%>");
$("#password").val("<%=Config.demo_mode.users[0].password%>");
}
}
</script>



<br/>
<br/>
<div class="text-center">
Expand Down Expand Up @@ -78,10 +98,4 @@
<% } %>
</div>
</div>

<br/>
<br/>
<br/>
<%- include ../layout/demo_notice.ejs %>

<%- include ../layout/footer.ejs %>
13 changes: 1 addition & 12 deletions src/views/layout/demo_notice.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<%if (Config.demo_mode.active) {%>
<div class="panel panel-info">
<div class="panel panel-success">
<div class="panel-heading">
<h3 class="panel-title">This Dendro is in Demo Mode!</h3>
</div>
Expand All @@ -12,17 +12,6 @@
<b>Password</b> : <%=Config.demo_mode.users[0].password%>
<br/>
<br/>
<script type="application/javascript">
function prefillBoxes (){
$("#username").val("<%=Config.demo_mode.users[0].username%>");
$("#password").val("<%=Config.demo_mode.users[0].password%>");
}
</script>
<button onclick="prefillBoxes()" class="btn btn-sm btn-default"><i class="fa fa-paste"></i>Fill in the login boxes for me please!</button>
<br/>
<br/>
<br/>
Expand Down
8 changes: 4 additions & 4 deletions src/views/layout/header.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<% if(locals.session != null && locals.session.user != null)
<% if(locals.session != null && locals.session.user != null && locals.session.user)
{
%>
<li class="dropdown">
Expand Down Expand Up @@ -88,7 +88,7 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Plugins<b class="caret"></b></a>
<ul class="dropdown-menu">
<% if(locals.session != null && locals.session.user != null && locals.session.isAdmin)
<% if(locals.session != null && locals.session.user != null && locals.session.user && locals.session.isAdmin)
{
%>
<li role="presentation" class="dropdown-header">Dendro Recommender</li>
Expand All @@ -111,7 +111,7 @@
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<% if(locals.session != null && locals.session.user != null)
<% if(locals.session != null && locals.session.user != null && locals.session.user)
{
%>
<li class="dropdown">
Expand Down Expand Up @@ -147,7 +147,7 @@
}
%>
<%if(locals.session.user != null) { %>
<%if(locals.session.user != null && locals.session.user) { %>
<li ng-controller="notificationCtrl" ng-init="init();getAlerts()" class="dropdown">
<a class="notifications-icon" href="#" ng-alerts-popover popover-placement="bottom-right" style="
Expand Down
6 changes: 3 additions & 3 deletions src/views/projects/my.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
{
var project = locals.projects[i];
%>
<%if(!project.ddr.deleted == 1 || (locals.session != null && locals.session.user != null && locals.session.user.uri == project.dcterms.creator)) { %>
<%if(!project.ddr.deleted == 1 || (locals.session != null && locals.session.user != null && locals.session.user && locals.session.user.uri == project.dcterms.creator)) { %>
<tr
<%if(project.ddr.deleted == 1) {%>
class="warning"
Expand Down Expand Up @@ -64,7 +64,7 @@
<%
}
%>
<%if(locals.session != null && locals.session.user != null && locals.session.user.uri == project.dcterms.creator) {%>
<%if(locals.session != null && locals.session.user != null && locals.session.user && locals.session.user.uri == project.dcterms.creator) {%>
<span class="label label-success">Creator</span>
<%}%>
<%if(project.ddr.deleted == 1) {%>
Expand Down Expand Up @@ -99,7 +99,7 @@
</b>
</td>
<%
if(locals.session != null && locals.session.user != null && locals.session.user.uri == project.dcterms.creator)
if(locals.session != null && locals.session.user != null && locals.session.user && locals.session.user.uri == project.dcterms.creator)
{
%>
<td class="col-md-2 col-xs-4">
Expand Down
2 changes: 1 addition & 1 deletion src/views/projects/show.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</div>

<%
if(locals.session != null && locals.session.user != null)
if(locals.session != null && locals.session.user != null && locals.session.user)
{
%>
<div class="col-lg-3 col-md-3 col-sm-5 col-xs-6">
Expand Down

0 comments on commit 0ac86d1

Please sign in to comment.