nodebb-plugin-poll 2.0.5 → 3.0.0

package/public/js/poll/view.js

@@ -229,7 +229,7 @@
 			var el = this.dom.resultsPanel.find('[data-poll-option-id=' + option.id + ']');
 			el.find('.poll-result-votecount span').text(option.voteCount);
 			el.find('.poll-result-progressbar').css('width', option.percentage + '%')
-				.find('span').text(option.percentage);
+				.find('span.percent').text(option.percentage);
 		}, this);
 	};
 

package/public/{less/style.less → scss/style.scss}

@@ -8,7 +8,7 @@
     margin-top: 0;
   }
 
-  .panel-title {
+  .card-title {
     display: inline-block;
   }
 
@@ -24,14 +24,6 @@
   min-width: 2em;
 }
 
-.poll-result-avatar {
-  width: 50px;
-  height: 50px;
-  font-size: 3rem;
-  vertical-align: middle;
-  margin-bottom: 3px;
-}
-
 .poll-result-details:hover {
   text-decoration: none;
 }

package/templates/admin/plugins/poll.tpl

@@ -1,59 +1,58 @@
-<div class="row">
-    <div class="col-lg-9">
-        <form class="form poll-settings">
-            <div class="panel panel-default">
-                <div class="panel-heading">[[poll:poll]]</div>
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-lg-6">
-                            <strong>[[poll:toggles]]</strong>
-                            <div class="form-group">
-                                <div class="checkbox">
-                                    <label>
-                                        <input type="checkbox" data-key="toggles.allowAnon" data-trim="false"> [[poll:allow_guests]]
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-lg-6">
-                            <strong>[[poll:limits]]</strong>
-                            <div class="form-group">
-                                <label for="maxPollOptions">[[poll:max_options]]</label>
-                                <input type="number" class="form-control" id="maxPollOptions" placeholder="10" min="1" max="100" data-key="limits.maxOptions">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel panel-default">
-                <div class="panel-heading">[[poll:defaults]]</div>
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-lg-6">
-                            <div class="form-group">
-                                <label for="defaultsTitle">[[poll:default_title]]</label>
-                                <input type="text" class="form-control" id="defaultsTitle" placeholder="Poll" data-key="defaults.title">
-                            </div>
-                            <div class="form-group">
-                                <label for="defaultsMaxVotes">[[poll:max_votes]]</label>
-                                <input type="number" class="form-control" id="defaultsMaxVotes" placeholder="1" min="1" max="100" data-key="defaults.maxvotes">
-                                <p class="help-block">[[poll:info_choices]]</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-
-    <div class="col-lg-3">
-        <div class="panel panel-default">
-            <div class="panel-heading">[[poll:settings]]</div>
-            <div class="panel-body">
-                <button id="save" class="btn btn-primary btn-block">[[poll:save]]</button>
-                <button id="reset" class="btn btn-warning btn-block">[[poll:reset]]</button>
-            </div>
-        </div>
-    </div>
+<div class="row">
+    <div class="col-lg-9">
+        <form class="form poll-settings">
+            <div class="card">
+                <div class="card-header">[[poll:poll]]</div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-lg-6">
+                            <h6>[[poll:toggles]]</h6>
+                            <div class="mb-3">
+                                <div class="form-check">
+                                    <label class="form-check-label">[[poll:allow_guests]]</label>
+                                    <input class="form-check-input" type="checkbox" data-key="toggles.allowAnon" data-trim="false">
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-6">
+                            <h6>[[poll:limits]]</h6>
+                            <div>
+                                <label class="form-label" for="maxPollOptions">[[poll:max_options]]</label>
+                                <input type="number" class="form-control" id="maxPollOptions" placeholder="10" min="1" max="100" data-key="limits.maxOptions">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="card">
+                <div class="card-header">[[poll:defaults]]</div>
+                <div class="card-body">
+                    <div class="row">
+                        <div class="col-lg-6">
+                            <div class="mb-3">
+                                <label class="form-label" for="defaultsTitle">[[poll:default_title]]</label>
+                                <input type="text" class="form-control" id="defaultsTitle" placeholder="Poll" data-key="defaults.title">
+                            </div>
+                            <div>
+                                <label class="form-label" for="defaultsMaxVotes">[[poll:max_votes]]</label>
+                                <input type="number" class="form-control" id="defaultsMaxVotes" placeholder="1" min="1" max="100" data-key="defaults.maxvotes">
+                                <p class="form-text">[[poll:info_choices]]</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </form>
+    </div>
+
+    <div class="col-lg-3">
+        <div class="card">
+            <div class="card-header">[[poll:settings]]</div>
+            <div class="card-body">
+                <button id="save" class="btn btn-primary btn-block">[[poll:save]]</button>
+                <button id="reset" class="btn btn-warning btn-block">[[poll:reset]]</button>
+            </div>
+        </div>
+    </div>
 </div>

package/templates/poll/creator.tpl

@@ -1,51 +1,50 @@
 <form class="form" id="pollCreator">
     <div id="pollErrorBox" class="alert alert-danger hidden"></div>
 
-    <div class="form-group">
-        <label for="pollInputTitle">[[poll:poll_title]]</label>
+    <div class="mb-3">
+        <label class="form-label" for="pollInputTitle">[[poll:poll_title]]</label>
         <input type="text" name="settings.title" id="pollInputTitle" value="{poll.settings.title}" placeholder="[[poll:poll_title_placeholder]]" class="form-control">
     </div>
 
-    <div class="form-group">
-        <label for="pollInputOptions">[[poll:options_title]]</label>
+    <div class="mb-3">
+        <label class="form-label" for="pollInputOptions">[[poll:options_title]]</label>
         <!-- IF poll.options.length -->
         <!-- BEGIN poll.options -->
-        <input type="text" name="options" id="pollInputOptions" value="{@value}" class="form-control"/>
+        <input type="text" name="options" id="pollInputOptions" value="{@value}" class="form-control mb-2"/>
         <!-- END poll.options -->
         <!-- ELSE -->
-        <input type="text" name="options" id="pollInputOptions" class="form-control"/>
+        <input type="text" name="options" id="pollInputOptions" class="form-control mb-2"/>
         <!-- ENDIF poll.options.length -->
         <button type="button" id="pollAddOption" class="btn btn-primary btn-sm btn-block">[[poll:options_add]]</button>
     </div>
 
     <hr>
 
-    <div class="form-group">
-        <label for="pollInputAmount">[[poll:max_votes]]</label>
+    <div class="mb-3">
+        <label class="form-label" for="pollInputAmount">[[poll:max_votes]]</label>
         <input type="number" name="settings.maxvotes" id="pollInputAmount" value="{poll.settings.maxvotes}"
                min="1" max="10" step="1" placeholder="[[poll:max_votes_placeholder]]" class="form-control">
     </div>
 
-    <div class="form-group">
-        <label for="pollDisallowVoteUpdate">
-            <input type="checkbox" name="settings.disallowVoteUpdate" id="pollDisallowVoteUpdate" {{{if poll.settings.disallowVoteUpdate}}}checked{{{end}}}>
-            [[poll:disallow_vote_update]]
-        </label>
+    <div class="mb-3">
+        <div class="form-check">
+            <label class="form-check-label" for="pollDisallowVoteUpdate">[[poll:disallow_vote_update]]</label>
+            <input class="form-check-input" type="checkbox" name="settings.disallowVoteUpdate" id="pollDisallowVoteUpdate" {{{if poll.settings.disallowVoteUpdate}}}checked{{{end}}}>
+        </div>
     </div>
 
-    <div class="form-group">
-        <label for="pollInputEnd">[[poll:auto_end_title]]</label>
-
+    <div class="mb-3">
+        <label class="form-label" for="pollInputEnd">[[poll:auto_end_title]]</label>
         <div class="input-group date flatpickr">
             <input id="pollInputEnd" placeholder="[[poll:auto_end_placeholder]]" name="settings.end" class="form-control" value="{poll.settings.end}" data-input>
-            <a class="input-group-addon" data-toggle><i class="fa fa-calendar"></i></a>
+            <a class="input-group-text" data-toggle><i class="fa fa-calendar"></i></a>
         </div>
-        <p class="help-block">[[poll:auto_end_help]]</p>
+        <p class="form-text">[[poll:auto_end_help]]</p>
     </div>
 
-    <!-- IF isRedactor -->
+    {{{ if isRedactor }}}
     <div class="alert alert-warning" role="alert">
         [[poll:warning.redactor]]
     </div>
-    <!-- ENDIF isRedactor -->
+    {{{ end }}}
 </form>

package/templates/poll/view/details.tpl

@@ -1,10 +1,6 @@
-<h2>{voteCount} [[poll:vote_count]]</h2>
-<!-- BEGIN votes -->
-<a href="{config.relative_path}/user/{votes.userslug}" class="poll-result-details">
-    <!-- IF votes.picture -->
-    <img class="poll-result-avatar" title="{votes.username}" src="{votes.picture}">
-    <!-- ELSE -->
-    <div class="poll-result-avatar user-icon" title="{votes.username}" style="background-color: {votes.icon:bgColor};">{votes.icon:text}</div>
-    <!-- ENDIF votes.picture -->
-</a>
-<!-- END votes -->
+<h2>{voteCount} [[poll:vote_count]]</h2>
+<!-- BEGIN votes -->
+<a href="{config.relative_path}/user/{votes.userslug}" class="poll-result-details">
+    {buildAvatar(votes, "24px", true)}
+</a>
+<!-- END votes -->

package/templates/poll/view/messages.tpl

@@ -1,3 +1,3 @@
-<h3>{title}</h3>
-<p>{content}</p>
+<h3>{title}</h3>
+<p>{content}</p>
 <hr>

package/templates/poll/view/results.tpl

@@ -1,15 +1,15 @@
-<!-- BEGIN poll.options -->
-<div class="poll-result" data-poll-option-id="{poll.options.id}">
-    <strong>{poll.options.title}</strong>
-    <small class="pull-right">
-        <a class="poll-result-votecount" href="#">
-            <span>{poll.options.voteCount}</span> [[poll:votes]]
-        </a>
-    </small>
-    <div class="progress">
-        <div class="progress-bar poll-result-progressbar" role="progressbar" aria-valuenow="{poll.options.percentage}" aria-valuemin="0" aria-valuemax="100" style="width: {poll.options.percentage}%;">
-            <span>{poll.options.percentage}</span>%
-        </div>
-    </div>
-</div>
+<!-- BEGIN poll.options -->
+<div class="poll-result" data-poll-option-id="{poll.options.id}">
+    <strong>{poll.options.title}</strong>
+    <small class="pull-right">
+        <a class="poll-result-votecount" href="#">
+            <span>{poll.options.voteCount}</span> [[poll:votes]]
+        </a>
+    </small>
+    <div class="progress">
+        <div class="progress-bar poll-result-progressbar" role="progressbar" aria-valuenow="{poll.options.percentage}" aria-valuemin="0" aria-valuemax="100" style="width: {poll.options.percentage}%;">
+            <span><span class="percent">{poll.options.percentage}</span>%</span>
+        </div>
+    </div>
+</div>
 <!-- END poll.options -->

package/templates/poll/view/voting.tpl

@@ -1,16 +1,16 @@
-<form role="form" class="poll-voting-form">
-    <!-- BEGIN poll.options -->
-    <div class="poll-view-option {poll.optionType}" data-poll-option-id="{poll.options.id}">
-        <label>
-            <input type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}">
-            {poll.options.title}
-        </label>
-    </div>
-    <!-- END poll.options -->
-</form>
-
-<!-- IF poll.settings.disallowVoteUpdate -->
-<div class="alert alert-warning" role="alert">
-    [[poll:vote_is_final]]
-</div>
-<!-- ENDIF poll.settings.disallowVoteUpdate -->
+<form role="form" class="poll-voting-form">
+    <!-- BEGIN poll.options -->
+    <div class="poll-view-option {poll.optionType}" data-poll-option-id="{poll.options.id}">
+        <label>
+            <input type="{poll.optionType}" name="pollVoteSelection" value="{poll.options.id}">
+            {poll.options.title}
+        </label>
+    </div>
+    <!-- END poll.options -->
+</form>
+
+<!-- IF poll.settings.disallowVoteUpdate -->
+<div class="alert alert-warning" role="alert">
+    [[poll:vote_is_final]]
+</div>
+<!-- ENDIF poll.settings.disallowVoteUpdate -->

package/templates/poll/view.tpl

@@ -1,29 +1,29 @@
-<div class="poll-view" data-poll-id="{poll.info.pollId}">
-    <div class="panel panel-default">
-        <div class="panel-heading">
-            <h3 class="panel-title">{poll.settings.title}</h3>
-            <div class="btn-group pull-right hidden">
-                <a href="#" class="poll-button-edit">
-                    <span class="fa fa-pencil"></span>
-                </a>
-            </div>
-        </div>
-        <div class="panel-body">
-            <div class="poll-view-messages hidden"></div>
-            <div class="poll-view-voting <!-- IF poll.hasVoted -->hidden<!-- ENDIF poll.hasVoted -->">
-                <!-- IMPORT poll/view/voting.tpl -->
-            </div>
-            <div class="poll-view-results <!-- IF !poll.hasVoted -->hidden<!-- ENDIF !poll.hasVoted -->">
-                <!-- IMPORT poll/view/results.tpl -->
-            </div>
-
-            <div class="poll-view-buttons">
-                <button type="button" class="btn btn-primary poll-button-vote hidden">[[poll:vote]]</button>
-                <button type="button" class="btn btn-primary poll-button-update-vote hidden">[[poll:update_vote]]</button>
-                <button type="button" class="btn btn-danger poll-button-remove-vote hidden">[[poll:remove_vote]]</button>
-                <button type="button" class="btn btn-link poll-button-results hidden">[[poll:to_results]]</button>
-                <button type="button" class="btn btn-link poll-button-voting hidden">[[poll:to_voting]]</button>
-            </div>
-        </div>
-    </div>
+<div class="poll-view" data-poll-id="{poll.info.pollId}">
+    <div class="card">
+        <div class="card-header">
+            <h3 class="card-title">{poll.settings.title}</h3>
+            <div class="btn-group float-end hidden">
+                <a href="#" class="poll-button-edit">
+                    <span class="fa fa-pencil"></span>
+                </a>
+            </div>
+        </div>
+        <div class="card-body">
+            <div class="poll-view-messages hidden"></div>
+            <div class="poll-view-voting <!-- IF poll.hasVoted -->hidden<!-- ENDIF poll.hasVoted -->">
+                <!-- IMPORT poll/view/voting.tpl -->
+            </div>
+            <div class="poll-view-results <!-- IF !poll.hasVoted -->hidden<!-- ENDIF !poll.hasVoted -->">
+                <!-- IMPORT poll/view/results.tpl -->
+            </div>
+
+            <div class="poll-view-buttons">
+                <button type="button" class="btn btn-primary poll-button-vote hidden">[[poll:vote]]</button>
+                <button type="button" class="btn btn-primary poll-button-update-vote hidden">[[poll:update_vote]]</button>
+                <button type="button" class="btn btn-danger poll-button-remove-vote hidden">[[poll:remove_vote]]</button>
+                <button type="button" class="btn btn-link poll-button-results hidden">[[poll:to_results]]</button>
+                <button type="button" class="btn btn-link poll-button-voting hidden">[[poll:to_voting]]</button>
+            </div>
+        </div>
+    </div>
 </div>

package/upgrades/fix_incorrect_poll_privilege.js

@@ -1,15 +1,15 @@
-'use strict';
-
-const db = require.main.require('./src/database');
-const privileges = require.main.require('./src/privileges');
-
-module.exports = {
-	name: 'Fix incorrectly given poll privilege',
-	timestamp: Date.UTC(2020, 9, 29),
-	method: async () => {
-		const cids = await db.getSortedSetRange('categories:cid', 0, -1);
-		await Promise.all(cids.map(async (cid) => {
-			await privileges.categories.rescind(['poll:create'], cid, ['registered-users']);
-		}));
-	},
-};
+'use strict';
+
+const db = require.main.require('./src/database');
+const privileges = require.main.require('./src/privileges');
+
+module.exports = {
+	name: 'Fix incorrectly given poll privilege',
+	timestamp: Date.UTC(2020, 9, 29),
+	method: async () => {
+		const cids = await db.getSortedSetRange('categories:cid', 0, -1);
+		await Promise.all(cids.map(async (cid) => {
+			await privileges.categories.rescind(['poll:create'], cid, ['registered-users']);
+		}));
+	},
+};