Skip to content
Snippets Groups Projects
Commit 897ab17e authored by Aditya Pratama's avatar Aditya Pratama
Browse files

Merge branch 'login_member' of... 

Merge branch 'login_member' of http://gitlab.informatika.org/IF3250-2018-K01-I-4/WebAlumniSTEI into login_member
parents 6e333023 24edd0cb
No related merge requests found
Hide whitespace changes
Inline Side-by-side
resources/views/article.blade.php
+ 2
− 1
View file @ 897ab17e
......@@ -70,7 +70,8 @@
<div class="row">
<div class="col-8 post-card">
<h3><a href="/posts/{{$post->id}}">{{$post->title}}</a></h3>
<i>Written on {{$post->created_at}} by Admin </i>
<div style="word-wrap: break-word;"> {!!substr($post->body, 0, 200)!!}... </div>
<small style="font-weight: bolder;">Written on {{$post->created_at}} by <span style="color: red">Admin</span></small>
</div>
<div class="col-4 img-card">
<img style="width:100%" src="/storage/cover_images/{{$post->cover_image}}">
......
resources/views/showarticle.blade.php
+ 1
− 1
View file @ 897ab17e
......@@ -23,7 +23,7 @@
Post
</h5>
<hr>
<div >{!!$post->body!!}</div>
<div style="word-wrap: break-word;">{!!$post->body!!}</div>
<!-- FOOTER -->
<div class="footer-article">
<hr>
......
resources/views/users/qna/showeachanswer.blade.php
+ 2
− 2
View file @ 897ab17e
......@@ -20,10 +20,10 @@
<tbody>
<tr>
<td>Topic</td>
<td>:&nbsp;{{$answer->question->topic}}</td>
<td style="word-wrap: break-word;">:&nbsp;{{$answer->question->topic}}</td>
</tr>
<td>Question's Body</td>
<td>:&nbsp;{{$answer->question->body}}</td>
<td style="word-wrap: break-word;">:&nbsp;{{$answer->question->body}}</td>
</tr>
<tr>
<td>Answer's Body</td>
......
resources/views/users/qna/showeachquestion.blade.php
+ 3
− 3
View file @ 897ab17e
......@@ -7,8 +7,8 @@
<div class="col-2"></div>
<div class="well question-container col-8" style="margin-top: 40px">
<div class="qna-content" style="margin-left: 20px">
<h1 >{{$question->topic}}</h1>
<div class="body-article" style="font-size:1.5em;">{{$question->body}}</div>
<h1 style="word-wrap: break-word;">{{$question->topic}}</h1>
<div class="body-article" style="font-size:1.5em; word-wrap: break-word;">{{$question->body}}</div>
<div class="footer-article"><hr>
<small>Written on {{$question->created_at}}</small><br>
<small>Last Editted on {{$question->updated_at}}</small><br>
......@@ -78,7 +78,7 @@
</div>
<div class="col-12">
<p>{{$answer->body}}</p>
<p style="word-wrap: break-word;">{{$answer->body}}</p>
<a href="/answers/{{$answer->id}}">
<small>
Written on {{$answer->created_at}} by <a href="/members/{{$answer->member->id}}">{{$answer->member->name}}</a> <span>@if($answer->is_admin == 1)<span>as <span style="color:blue;">admin</span></span>@endif</span>
......
resources/views/users/qna/showquestion.blade.php
+ 35
− 25
View file @ 897ab17e
......@@ -71,33 +71,40 @@
<div class="row">
@foreach ($questions as $question)
<div class="col-2"></div>
<div class="well question-container col-8">
<div class="row">
<div class="col-12 post-card">
<h3><a href="/questions/{{$question->id}}">{{$question->topic}}</a></h3>
<p style="font-size: 1.3em">{{$question->body}}</p>
<small>
<i>
Written on {{$question->created_at}}
@if ($question->is_anon == 1)
by Anonymous
@else
by <a href="/members/{{$question->member->id}}">{{$question->member->name}}</a>
@endif
</i>
</small>
<br>
@if ($question->created_at != $question->updated_at)
<small style="color:green;">(edited)</small>
@endif
<!-- <input type="submit" id="btn-{{$question->id}}" class="hidden-button show-answer btn btn-primary" value="Show Answers"></input> -->
<div class="col-8">
<div class="well question-container" style="margin-bottom: 0px !important">
<div class="row">
<div class="col-12 post-card">
<h3><a href="/questions/{{$question->id}}" style="word-wrap: break-word;">{{$question->topic}}</a></h3>
<p style="font-size: 1.3em; word-wrap: break-word;">{{$question->body}}</p>
<small>
<i>
Written on {{$question->created_at}}
@if ($question->is_anon == 1)
by Anonymous
@else
by <a href="/members/{{$question->member->id}}">{{$question->member->name}}</a>
@endif
</i>
</small>
@if ($question->created_at != $question->updated_at)
<small style="color:green;">(edited)</small>
@endif
<!-- <input type="submit" id="btn-{{$question->id}}" class="hidden-button show-answer btn btn-primary" value="Show Answers"></input> -->
</div>
</div>
</div>
<div id="answers-{{$question->id}}" class="row">
@if (count($question->answers) > 0)
<div id="answers-{{$question->id}}" class="row" style="font-size: 0.8em; background-color: #efefef">
@foreach ($question->answers->sortByDesc('rating')->sortByDesc('is_pinned')->take(3) as $answer)
<div class="col-12 post-card">
<hr>
<p>{{$answer->body}}</p>
<div class="col-12 post-card" style="border: 1px solid #d8d8d8; border-top: 0px !important; padding: 5px 0px">
<div class="row">
<div class="col-2" style="max-width: 40px !important; padding: 0px !important; margin-left: 40px">
<span class="sum-rating">{{$answer->rating}}</span>
<small style="font-size:1.1em;">vote<span>@if($answer->rating > 1)<span>s</span>@endif</span></small>
</div>
<div class="col-10" style="padding: 0px !important; margin-left: 40px">
<span style="word-wrap: break-word;">{{$answer->body}}</span><br>
<a href="/answers/{{$answer->id}}">
<small>
Written on {{$answer->created_at}}
......@@ -105,13 +112,16 @@
</a>
by <a href="/members/{{$question->member->id}}">{{$question->member->name}}</a>
<span>@if($answer->is_admin == 1)<span>as <span style="color:blue;">admin</span></span>@endif</span>
<br>
@if ($answer->created_at != $answer->updated_at)
<small style="color:green;">(edited)</small>
@endif
</div>
</div>
</div>
@endforeach
</div>
@endif
<br>
</div>
<div class="col-2"></div>
@endforeach
......
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