mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Forum notice fixes and bootstrap3 poll styling.

Browse Source
This commit is contained in:
Cameron
2016-03-23 20:13:26 -07:00
parent 12beda569d
commit cd57f1aef8
4 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
e107_plugins/forum/forum.css
View File

@@ -17,6 +17,7 @@
ul.newforumposts-menu { padding-left: 10px; } ul.newforumposts-menu { padding-left: 10px; }
ul.newforumposts-menu li { margin-bottom: 15px; } ul.newforumposts-menu li { margin-bottom: 15px; }
div.forum-poll-results { padding-left:0 }
@media all and (min-height: 800px) { @media all and (min-height: 800px) {
#forum, #forum-stats, #forum-rules { min-height: 500px; } #forum, #forum-stats, #forum-rules { min-height: 500px; }

6
e107_plugins/forum/forum_class.php
View File

@@ -1337,13 +1337,15 @@ class e107forum
$sql->select('user', 'user_id, user_name','user_admin = 1 ORDER BY user_name ASC'); $sql->select('user', 'user_id, user_name','user_admin = 1 ORDER BY user_name ASC');
while($row = $sql->fetch()) while($row = $sql->fetch())
{ {
$this->modArray[$row['user_id']] = $row['user_name']; $this->modArray[$row['user_id']] = $row;
} }
} }
else else
{ {
$this->modArray = $this->e107->user_class->get_users_in_class($uclass, 'user_name', true); $this->modArray = e107::getUserClass()->get_users_in_class($uclass, 'user_name', true);
} }
return $this->modArray; return $this->modArray;
} }

2
e107_plugins/forum/forum_viewtopic.php
View File

@@ -532,7 +532,7 @@ require_once (HEADERF);
if ($forum->prefs->get('enclose')) if ($forum->prefs->get('enclose'))
{ {
$forumTitle = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME); $forumTitle = e107::pref('forum','title', LAN_PLUGIN_FORUM_NAME);
$ns->tablerender($forumTitle, $forumstring, $mes->render(). array('forum_viewtopic', 'main')); $ns->tablerender($forumTitle, $mes->render().$forumstring, array('forum_viewtopic', 'main'));
} }
else else
{ {

12
e107_plugins/forum/templates/forum_poll_template.php
View File

@@ -17,7 +17,7 @@ $FORUM_POLL_TEMPLATE = array();
$FORUM_POLL_TEMPLATE['form']['start'] = " $FORUM_POLL_TEMPLATE['form']['start'] = "
<div class='clearfix'> <div class='clearfix'>
<div class='well col-md-8 span6'> <div class='well col-md-8 span6 forum-poll-form'>
<div class='form-group control-group'> <div class='form-group control-group'>
Poll: {QUESTION} Poll: {QUESTION}
@@ -44,8 +44,10 @@ $FORUM_POLL_TEMPLATE['form']['end'] = "
$FORUM_POLL_TEMPLATE['results']['start'] = " $FORUM_POLL_TEMPLATE['results']['start'] = "
<div class='clearfix'> <div class='clearfix'>
<div class='well span6'> <div class='col-md-10 forum-poll-results'>
<h5>Poll: {QUESTION}</h5> <div class='panel panel-primary'>
<div class='panel-heading'>Poll: {QUESTION}</div>
<div class='panel-body'>
"; ";
$FORUM_POLL_TEMPLATE['results']['item'] = " $FORUM_POLL_TEMPLATE['results']['item'] = "
@@ -54,7 +56,9 @@ $FORUM_POLL_TEMPLATE['results']['item'] = "
"; ";
$FORUM_POLL_TEMPLATE['results']['end'] = " $FORUM_POLL_TEMPLATE['results']['end'] = "
<div class='text-center'><small>{VOTE_TOTAL}</small></div> <div class='text-center'><small>{VOTE_TOTAL}</small></div>
</div>
</div>
</div> </div>
</div> </div>
"; ";