Commit afb8735c authored by Liing Pang Ryan's avatar Liing Pang Ryan
Browse files

Fixed some display bugs

parent f8f2d18a
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<div class="choices" id="choices${paragraph.id}">
<c:if test="${empty choiceList}">
<div class="no_choices">There are no choices yet for this story</div>
</c:if>
<c:forEach items="${choiceList}" var="choice">
<c:if test="${choice['idParagrapheSuite']==0}" var="new" scope="request">
<span class="choice ${choice['published']?'':'edit'}" id ="choice${choice['id']}" style ="${choice['published']?'':'display:none;'}" onclick="${'newParagraphe'}(${choice['idParagraphe']},${choice['id']},${storyid})">
......@@ -20,8 +17,16 @@
</span>
</c:if>
</c:forEach>
<!--Check if there are choices for this story !-->
<c:if test="${empty choiceList}">
<!--TODO: Check if it's a conclusion. THen we display another text to say end of story !-->
<div class="no_choices">There are no choices yet for this story</div>
</c:if>
</div>
<div class="add_choice">
<div class="add_choice edit">
<div class="add_choice_btn" onclick="addChoice(${paragraph.id},${storyid})" id="add_choice${paragraph.id}">
Add choice
</div>
......
......@@ -42,8 +42,8 @@
</div>
</c:if>
</c:if>
<c:if test="${!owner}">
<div class="edit_authorized">You are not authorized or invited to edit this story</div>
<c:if test="${!owner && !edit}">
<div class="${empty sessionScope.username?"edit_unauthorized_block":"edit_unauthorized"}">You are not authorized or invited to edit this story</div>
</c:if>
</div>
<div class=" column liste_de_paragraphes">
......
......@@ -138,9 +138,8 @@
/*I dont know what this is for so Ill just leave it*/
.edit{
display: none;
display:none;
}
/*Login button*/
.login_logout_btn{
......@@ -292,7 +291,7 @@
outline:none;
}
.edit_authorized{
.edit_unauthorized{
font-family: 'Roboto Slab', cursive;
margin-top: 70%;
color:white;
......@@ -300,6 +299,10 @@
font-weight:bold;
text-align: center;
}
.edit_unauthorized_block{
display:none;
}
/**For authors**/
/**Invite an author**/
......@@ -470,7 +473,7 @@
margin-left:auto;
margin-right:auto;
margin-top:40px;
margin-bottom: 10px;
background-color: #6572df;
border-radius: 10px;
padding: 5px;
......@@ -485,7 +488,7 @@
text-align: center;
font-size:large;
margin: 10px;
cursor: pointer;
}
.add_choice_btn{
width:15%;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment