Skip to content

Commit 8e782ba

Browse files
stygiansabyssstygiansabyss
committed
Redoing the board view page
1 parent 3f36237 commit 8e782ba

File tree

2 files changed

+12
-148
lines changed

2 files changed

+12
-148
lines changed

‎src/views/forum/board/view.blade.php

Lines changed: 11 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,14 @@
11
<div class="row">
22
<div class="col-md-10">
3-
<small>
4-
<ul class="breadcrumb">
5-
<li>{{ HTML::link('forum', 'Forums') }}</li>
6-
<li>{{ HTML::link('forum/category/view/'. $board->category->id, $board->category->name) }}</li>
7-
@if ($board->parent != null)
8-
<li>{{ HTML::link('forum/board/view/'. $board->parent->id, $board->parent->name) }}</li>
9-
@endif
10-
<li class="active">
11-
{{ $board->name }}
12-
@if (count($posts) == 30 || isset($_GET['page']))
13-
<?php
14-
if (isset($_GET['page'])) {
15-
$page = $_GET['page'];
16-
} else {
17-
$page = 1;
18-
}
19-
?>
20-
: Page {{ $page }}
21-
@endif
22-
</li>
23-
<li class="pull-right">
24-
{{ HTML::link('/forum/post/add/'. $board->id, 'Add Post') }}
25-
</li>
26-
</ul>
27-
</small>
3+
@include('forum.board.components.breadcrumbs')
284
@if (count($board->children) > 0)
29-
<div class="well">
30-
<div class="well-title">Child Boards</div>
31-
@foreach ($board->children as $child)
32-
<table style="width: 100%;">
33-
<tbody>
34-
<tr>
35-
<td class="middle" style="width: 65px;" rowpsan="3">
36-
@if (Auth::user()->checkUnreadBoard($child->id))
37-
{{ HTML::image('img/forum/on.png', null, array('style' => 'width: 30px')) }}
38-
@else
39-
{{ HTML::image('img/forum/off.png', null, array('style' => 'width: 30px')) }}
40-
@endif
41-
</td>
42-
<td class="boardLink" rowpsan="3">
43-
<table>
44-
<tbody>
45-
<tr>
46-
<td>{{ HTML::link('forum/board/view/'. $child->id, $child->name) }}</td>
47-
</tr>
48-
</tbody>
49-
</table>
50-
</td>
51-
<td class="middle" style="width: 100px;">
52-
<table class="main no_border">
53-
<tbody>
54-
<tr>
55-
<td>{{ $child->postsCount .' '. Str::plural('Post', $child->postsCount) }}</td>
56-
</tr>
57-
<tr>
58-
<td>{{ $child->repliesCount .' '. Str::plural('Reply', $child->repliesCount) }}</td>
59-
</tr>
60-
</tbody>
61-
</table>
62-
</td>
63-
<td style="width: 200px;">
64-
@if ($child->lastUpdate !== false)
65-
<?php
66-
$lastUpdateType = $child->lastUpdate->type->keyName;
67-
$lastUpdateUser = ($child->lastUpdate->morph_id == null || $lastUpdateType == 'application'
68-
? $child->lastUpdate->author : $child->lastUpdate->morph);
69-
$lastUpdateName = ($lastUpdateUser instanceof User ? $lastUpdateUser->username : $lastUpdateUser->name);
70-
?>
71-
<small>
72-
<table>
73-
<tbody>
74-
<tr>
75-
<td>Last Post by {{ HTML::link('/user/view/'. $child->lastUpdate->author->id, $lastUpdateName) }}</td>
76-
</tr>
77-
<tr>
78-
<td>in {{ HTML::link('forum/post/view/'. $child->lastPost->uniqueId .'#reply:'. $child->lastUpdate->id, $child->lastUpdate->name) }}</td>
79-
</tr>
80-
<tr>
81-
<td>on {{ $child->lastUpdate->created_at }}</td>
82-
</tr>
83-
</tbody>
84-
</table>
85-
</small>
86-
@else
87-
<small>
88-
No posts.
89-
</small>
90-
@endif
91-
</td>
92-
</tr>
93-
</tbody>
94-
</table>
95-
<hr />
96-
@endforeach
5+
<div class="panel panel-default">
6+
<div class="panel-heading">Child Boards</div>
7+
<ul class="forum">
8+
@foreach ($board->children as $child)
9+
@include('forum.category.components.board', array('board' => $child))
10+
@endforeach
11+
</ul>
9712
</div>
9813
@endif
9914
<div class="panel panel-default">
@@ -111,42 +26,12 @@
11126
<ul class="forum">
11227
@if (count($announcements) > 0)
11328
@foreach ($announcements as $announcement)
114-
<li class="{{ $announcement->classes }}">
115-
<div class="post">
116-
<div class="subject">
117-
{{ $announcement->link }}
118-
<br />
119-
{{ $announcement->startedBy }}
120-
</div>
121-
<div class="replies">
122-
{{ $announcement->repliesBlock }}
123-
</div>
124-
<div class="lastPost">
125-
{{ $announcement->lastPostBlock }}
126-
</div>
127-
<div class="clearfix"></div>
128-
</div>
129-
</li>
29+
@include('forum.board.components.post', array('post' => $announcement))
13030
@endforeach
13131
@endif
13232
@if (count($posts) > 0)
13333
@foreach ($posts as $post)
134-
<li class="{{ $post->classes }}">
135-
<div class="post">
136-
<div class="subject">
137-
{{ $post->link }}
138-
<br />
139-
{{ $post->startedBy }}
140-
</div>
141-
<div class="replies">
142-
{{ $post->repliesBlock }}
143-
</div>
144-
<div class="lastPost">
145-
{{ $post->lastPostBlock }}
146-
</div>
147-
<div class="clearfix"></div>
148-
</div>
149-
</li>
34+
@include('forum.board.components.post', array('post' => $post))
15035
@endforeach
15136
@endif
15237
</ul>
@@ -156,28 +41,7 @@
15641
@endif
15742
</div>
15843
</div>
159-
<small>
160-
<ul class="breadcrumb">
161-
<li>{{ HTML::link('forum', 'Forums') }}</li>
162-
<li>{{ HTML::link('forum/category/view/'. $board->category->id, $board->category->name) }}</li>
163-
<li class="active">
164-
{{ $board->name }}
165-
@if (count($posts) == 30 || isset($_GET['page']))
166-
<?php
167-
if (isset($_GET['page'])) {
168-
$page = $_GET['page'];
169-
} else {
170-
$page = 1;
171-
}
172-
?>
173-
: Page {{ $page }}
174-
@endif
175-
</li>
176-
<li class="pull-right">
177-
{{ HTML::link('/forum/post/add/'. $board->id, 'Add Post') }}
178-
</li>
179-
</ul>
180-
</small>
44+
@include('forum.board.components.breadcrumbs')
18145
</div>
18246
<div class="col-md-2">
18347
<div class="well">

‎src/views/forum/category/view.blade.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{ $category->name }}
77
<div class="panel-btn">
88
<div class="panel-btn-divider"></div>
9-
{{ HTML::linkIcon('forum/category/view/'. $category->uniqueId, 'fa fa-share-square-o', null, array('style' => 'color: #000;')) }}
9+
{{ HTML::linkIcon('forum/category/view/'. $category->id, 'fa fa-share-square-o', null, array('style' => 'color: #000;')) }}
1010
@if ($category->type->keyName == 'technical-support')
1111
<div class="panel-btn-divider"></div>
1212
<a href="javascript: void(0);"><i class="fa fa-cogs"></i></a>

0 commit comments

Comments
 (0)