Skip to content

Commit 9af2f25

Browse files
marc1706marc1706
authored
Merge pull request #79 from VSEphpbb/vse-patch
Make ideas page a little easier to understand
2 parents bea785e + e1be351 commit 9af2f25

4 files changed

Lines changed: 44 additions & 20 deletions

File tree

‎controller/index_controller.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,21 +31,21 @@ public function index()
3131
}
3232

3333
// Generate latest ideas
34-
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, 'date', 'DESC');
34+
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, ideas::SORT_DATE, 'DESC');
3535
$this->assign_template_block_vars('latest_ideas', $ideas);
3636

3737
// Generate top ideas
38-
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, 'top', 'DESC');
38+
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, ideas::SORT_TOP, 'DESC');
3939
$this->assign_template_block_vars('top_ideas', $ideas);
4040

4141
// Generate recently implemented
42-
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, 'date', 'DESC', ideas::$statuses['IMPLEMENTED']);
42+
$ideas = $this->ideas->get_ideas(self::NUM_IDEAS, ideas::SORT_DATE, 'DESC', ideas::$statuses['IMPLEMENTED']);
4343
$this->assign_template_block_vars('implemented_ideas', $ideas);
4444

4545
$this->template->assign_vars(array(
46-
'U_VIEW_TOP' => $this->link_helper->get_list_link('top'),
47-
'U_VIEW_LATEST' => $this->link_helper->get_list_link('new'),
48-
'U_VIEW_IMPLEMENTED'=> $this->link_helper->get_list_link('implemented'),
46+
'U_VIEW_TOP' => $this->link_helper->get_list_link(ideas::SORT_TOP),
47+
'U_VIEW_LATEST' => $this->link_helper->get_list_link(ideas::SORT_NEW),
48+
'U_VIEW_IMPLEMENTED'=> $this->link_helper->get_list_link(ideas::SORT_IMPLEMENTED),
4949
'U_POST_ACTION' => $this->helper->route('phpbb_ideas_post_controller'),
5050
));
5151

‎language/en/common.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292

9393
'UPDATED_VOTE' => 'Successfully updated vote!',
9494

95-
'VIEW_ALL' => 'View All',
9695
'VIEW_IDEA' => 'View Idea',
9796
'VIEW_IMPLEMENTED' => 'View all implemented ideas',
9897
'VIEW_LATEST' => 'View all open ideas',

‎styles/prosilver/template/index_body.html‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
66

77
{% include 'action_bar_top.html' %}
88

9+
{# TOP IDEAS #}
10+
<h2 class="push-left">{{ lang('TOP_IDEAS') }}</h2>
11+
{% if top_ideas %}
12+
<a class="button view-all" href="{{ U_VIEW_TOP }}"><i class="fa fa-fw fa-fire"></i> <span>{{ lang('VIEW_TOP') }}</span></a>
13+
{% endif %}
914
<div class="forumbg">
1015
<div class="inner">
1116
<ul class="topiclist">
1217
<li class="header">
1318
<dl class="row-item">
14-
<dt><div class="list-inner">{{ lang('TOP_IDEAS') }}</div></dt>
19+
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
1520
<dd class="posts">{{ lang('RATING') }}</dd>
1621
</dl>
1722
</li>
@@ -20,16 +25,18 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
2025
{% include 'index_list.html' %}
2126
</div>
2227
</div>
23-
{% if top_ideas %}
24-
<a class="button view-all" href="{{ U_VIEW_TOP }}" title="{{ lang('VIEW_TOP') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
25-
{% endif %}
2628

29+
{# LATEST IDEAS #}
30+
<h2 class="push-left">{{ lang('LATEST_IDEAS') }}</h2>
31+
{% if latest_ideas %}
32+
<a class="button view-all" href="{{ U_VIEW_LATEST }}"><i class="fa fa-fw fa-lightbulb-o"></i> <span>{{ lang('VIEW_LATEST') }}</span></a>
33+
{% endif %}
2734
<div class="forumbg" style="margin-top: 10px">
2835
<div class="inner">
2936
<ul class="topiclist">
3037
<li class="header">
3138
<dl class="row-item">
32-
<dt><div class="list-inner">{{ lang('LATEST_IDEAS') }}</div></dt>
39+
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
3340
<dd class="posts">{{ lang('RATING') }}</dd>
3441
</dl>
3542
</li>
@@ -38,16 +45,18 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
3845
{% include 'index_list.html' %}
3946
</div>
4047
</div>
41-
{% if latest_ideas %}
42-
<a class="button view-all" href="{{ U_VIEW_LATEST }}" title="{{ lang('VIEW_LATEST') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
43-
{% endif %}
4448

49+
{# IMPLEMENTED IDEAS #}
50+
<h2 class="push-left">{{ lang('IMPLEMENTED_IDEAS') }}</h2>
51+
{% if implemented_ideas %}
52+
<a class="button view-all" href="{{ U_VIEW_IMPLEMENTED }}"><i class="fa fa-fw fa-check-circle-o"></i> <span>{{ lang('VIEW_IMPLEMENTED') }}</span></a>
53+
{% endif %}
4554
<div class="forumbg" style="margin-top: 10px">
4655
<div class="inner">
4756
<ul class="topiclist">
4857
<li class="header">
4958
<dl class="row-item">
50-
<dt><div class="list-inner">{{ lang('IMPLEMENTED_IDEAS') }}</div></dt>
59+
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
5160
<dd class="posts">{{ lang('RATING') }}</dd>
5261
</dl>
5362
</li>
@@ -56,9 +65,6 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
5665
{% include 'index_list.html' %}
5766
</div>
5867
</div>
59-
{% if implemented_ideas %}
60-
<a class="button view-all" href="{{ U_VIEW_IMPLEMENTED }}" title="{{ lang('VIEW_IMPLEMENTED') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
61-
{% endif %}
6268

6369
<br /><br />
6470

‎styles/prosilver/theme/ideas.css‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,30 @@ dd.topics {
6767
}
6868

6969
/* Ideas Lists Styles */
70-
.view-all,
70+
.view-all {
71+
color: #536482;
72+
float: right;
73+
margin: 0.8em 0 0.2em;
74+
}
75+
7176
.view-all:hover {
7277
color: #536482;
7378
}
7479

80+
.push-left {
81+
float: left;
82+
}
83+
84+
@media (min-width: 701px) and (max-width: 950px) {
85+
ul.topiclist dt {
86+
margin-right: -250px;
87+
}
88+
89+
ul.topiclist dt .list-inner {
90+
margin-right: 250px;
91+
}
92+
}
93+
7594
/* Idea Body Styles */
7695
.votes,
7796
.successvoted {

0 commit comments

Comments
 (0)