Skip to content

Make ideas page a little easier to understand #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marc1706 merged 2 commits into from
Sep 20, 2017
Merged

Make ideas page a little easier to understand #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03ff4ba
Replace strings with constants
iMattPro Sep 10, 2017
e1be351
Redesign main ideas page
iMattPro Sep 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions controller/index_controller.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@ public function index()
}

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

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

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

$this->template->assign_vars(array(
'U_VIEW_TOP' => $this->link_helper->get_list_link('top'),
'U_VIEW_LATEST' => $this->link_helper->get_list_link('new'),
'U_VIEW_IMPLEMENTED'=> $this->link_helper->get_list_link('implemented'),
'U_VIEW_TOP' => $this->link_helper->get_list_link(ideas::SORT_TOP),
'U_VIEW_LATEST' => $this->link_helper->get_list_link(ideas::SORT_NEW),
'U_VIEW_IMPLEMENTED'=> $this->link_helper->get_list_link(ideas::SORT_IMPLEMENTED),
'U_POST_ACTION' => $this->helper->route('phpbb_ideas_post_controller'),
));

Expand Down
1 change: 0 additions & 1 deletion language/en/common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@

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

'VIEW_ALL' => 'View All',
'VIEW_IDEA' => 'View Idea',
'VIEW_IMPLEMENTED' => 'View all implemented ideas',
'VIEW_LATEST' => 'View all open ideas',
Expand Down
30 changes: 18 additions & 12 deletions styles/prosilver/template/index_body.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>

{% include 'action_bar_top.html' %}

{# TOP IDEAS #}
<h2 class="push-left">{{ lang('TOP_IDEAS') }}</h2>
{% if top_ideas %}
<a class="button view-all" href="{{ U_VIEW_TOP }}"><i class="fa fa-fw fa-fire"></i> <span>{{ lang('VIEW_TOP') }}</span></a>
{% endif %}
<div class="forumbg">
<div class="inner">
<ul class="topiclist">
<li class="header">
<dl class="row-item">
<dt><div class="list-inner">{{ lang('TOP_IDEAS') }}</div></dt>
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
<dd class="posts">{{ lang('RATING') }}</dd>
</dl>
</li>
Expand All @@ -20,16 +25,18 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
{% include 'index_list.html' %}
</div>
</div>
{% if top_ideas %}
<a class="button view-all" href="{{ U_VIEW_TOP }}" title="{{ lang('VIEW_TOP') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
{% endif %}

{# LATEST IDEAS #}
<h2 class="push-left">{{ lang('LATEST_IDEAS') }}</h2>
{% if latest_ideas %}
<a class="button view-all" href="{{ U_VIEW_LATEST }}"><i class="fa fa-fw fa-lightbulb-o"></i> <span>{{ lang('VIEW_LATEST') }}</span></a>
{% endif %}
<div class="forumbg" style="margin-top: 10px">
<div class="inner">
<ul class="topiclist">
<li class="header">
<dl class="row-item">
<dt><div class="list-inner">{{ lang('LATEST_IDEAS') }}</div></dt>
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
<dd class="posts">{{ lang('RATING') }}</dd>
</dl>
</li>
Expand All @@ -38,16 +45,18 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
{% include 'index_list.html' %}
</div>
</div>
{% if latest_ideas %}
<a class="button view-all" href="{{ U_VIEW_LATEST }}" title="{{ lang('VIEW_LATEST') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
{% endif %}

{# IMPLEMENTED IDEAS #}
<h2 class="push-left">{{ lang('IMPLEMENTED_IDEAS') }}</h2>
{% if implemented_ideas %}
<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>
{% endif %}
<div class="forumbg" style="margin-top: 10px">
<div class="inner">
<ul class="topiclist">
<li class="header">
<dl class="row-item">
<dt><div class="list-inner">{{ lang('IMPLEMENTED_IDEAS') }}</div></dt>
<dt><div class="list-inner">{{ lang('IDEAS') }}</div></dt>
<dd class="posts">{{ lang('RATING') }}</dd>
</dl>
</li>
Expand All @@ -56,9 +65,6 @@ <h2>{{ lang('IDEAS_TITLE') }}</h2>
{% include 'index_list.html' %}
</div>
</div>
{% if implemented_ideas %}
<a class="button view-all" href="{{ U_VIEW_IMPLEMENTED }}" title="{{ lang('VIEW_IMPLEMENTED') }}">{{ lang('VIEW_ALL') }}&hellip;</a>
{% endif %}

<br /><br />

Expand Down
21 changes: 20 additions & 1 deletion styles/prosilver/theme/ideas.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,30 @@ dd.topics {
}

/* Ideas Lists Styles */
.view-all,
.view-all {
color: #536482;
float: right;
margin: 0.8em 0 0.2em;
}

.view-all:hover {
color: #536482;
}

.push-left {
float: left;
}

@media (min-width: 701px) and (max-width: 950px) {
ul.topiclist dt {
margin-right: -250px;
}

ul.topiclist dt .list-inner {
margin-right: 250px;
}
}

/* Idea Body Styles */
.votes,
.successvoted {
Expand Down