From b59a104b14171fa215d7a0d5abc5763049e2334b Mon Sep 17 00:00:00 2001
From: ruiminggu <ruimingg@andrew.cmu.edu>
Date: Wed, 11 Oct 2023 11:30:57 -0400
Subject: [PATCH 1/4] Change the UI for topic list

---
 .../less/topics_list.less                     |  17 ++-
 .../templates/partials/topics_list.tpl        | 129 +++++++++++++++++-
 2 files changed, 143 insertions(+), 3 deletions(-)

diff --git a/themes/nodebb-theme-persona/less/topics_list.less b/themes/nodebb-theme-persona/less/topics_list.less
index 1121c46..c3ff226 100644
--- a/themes/nodebb-theme-persona/less/topics_list.less
+++ b/themes/nodebb-theme-persona/less/topics_list.less
@@ -13,4 +13,19 @@
     margin-bottom: 10px;
     border-top: 1px solid @post-border-color;
     border-bottom: 1px solid @post-border-color;
-}
\ No newline at end of file
+}
+
+.resolved-status {
+    font-weight: bold;
+    color: green; 
+    font-size: 8px; 
+    border: 2px solid green; 
+    padding: 3px;
+}
+
+
+/* Style for the unsolved post section with a light red background */
+li.unsolved-post {
+    background-color: rgb(239, 210, 210); /* Change to your desired light red color */
+    /* Add any other styles you want here */
+}
diff --git a/themes/nodebb-theme-persona/templates/partials/topics_list.tpl b/themes/nodebb-theme-persona/templates/partials/topics_list.tpl
index db10750..78aad30 100644
--- a/themes/nodebb-theme-persona/templates/partials/topics_list.tpl
+++ b/themes/nodebb-theme-persona/templates/partials/topics_list.tpl
@@ -1,5 +1,6 @@
 <ul component="category" class="topic-list" itemscope itemtype="http://www.schema.org/ItemList" data-nextstart="{nextStart}" data-set="{set}">
     {{{each topics}}}
+    <!-- IF topics.resolved -->
     <li component="category/topic" class="row clearfix category-item {function.generateTopicClass}" <!-- IMPORT partials/data/category.tpl -->>
         <link itemprop="url" content="{config.relative_path}/topic/{../slug}" />
         <meta itemprop="name" content="{function.stripTags, ../title}" />
@@ -46,7 +47,7 @@
                 <!-- ENDIF !topics.noAnchor -->
 
                 <!-- IF topics.resolved -->
-                <span>Resolved</span><br />
+                <span class="resolved-status">Resolved</span><br />
                 <!-- ENDIF topics.resolved -->
 
                 <!-- IF !template.category -->
@@ -119,5 +120,129 @@
             </div>
         </div>
     </li>
+    <!-- ENDIF topics.resolved -->
+
+
+    <!-- IF !topics.resolved -->
+    <li component="category/topic" class="row clearfix category-item {function.generateTopicClass} unsolved-post" <!-- IMPORT partials/data/category.tpl -->>
+        <link itemprop="url" content="{config.relative_path}/topic/{../slug}" />
+        <meta itemprop="name" content="{function.stripTags, ../title}" />
+        <meta itemprop="itemListOrder" content="descending" />
+        <meta itemprop="position" content="{../index}" />
+        <a id="{../index}" data-index="{../index}" component="topic/anchor"></a>
+
+        <div class="col-md-6 col-sm-9 col-xs-10 content">
+            <div class="avatar pull-left">
+                <!-- IF showSelect -->
+                <div class="select" component="topic/select">
+                    {{{ if ./thumbs.length }}}
+                    <img src="{./thumbs.0.url}" class="user-img not-responsive" />
+                    {{{ else }}}
+                    {buildAvatar(../user, "46", true, "not-responsive")}
+                    {{{ end }}}
+                    <i class="fa fa-check"></i>
+                </div>
+                <!-- ENDIF showSelect -->
+
+                <!-- IF !showSelect -->
+                <a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->" class="pull-left">
+                    {{{ if ./thumbs.length }}}
+                    <img src="{./thumbs.0.url}" class="user-img not-responsive" />
+                    {{{ else }}}
+                    {buildAvatar(../user, "46", true, "not-responsive")}
+                    {{{ end }}}
+                </a>
+                <!-- ENDIF !showSelect -->
+            </div>
+
+            <h2 component="topic/header" class="title">
+                <i component="topic/scheduled" class="fa fa-clock-o <!-- IF !topics.scheduled -->hide<!-- ENDIF !topics.scheduled -->" title="[[topic:scheduled]]"></i>
+                <i component="topic/pinned" class="fa fa-thumb-tack <!-- IF (topics.scheduled || !topics.pinned) -->hide<!-- ENDIF (topics.scheduled || !topics.pinned) -->" title="{{{ if !../pinExpiry }}}[[topic:pinned]]{{{ else }}}[[topic:pinned-with-expiry, {../pinExpiryISO}]]{{{ end }}}"></i>
+                <i component="topic/locked" class="fa fa-lock <!-- IF !topics.locked -->hide<!-- ENDIF !topics.locked -->" title="[[topic:locked]]"></i>
+                <i component="topic/moved" class="fa fa-arrow-circle-right <!-- IF !topics.oldCid -->hide<!-- ENDIF !topics.oldCid -->" title="[[topic:moved]]"></i>
+                {{{each topics.icons}}}{@value}{{{end}}}
+
+
+                <!-- IF !topics.noAnchor -->
+                <a href="{config.relative_path}/topic/{topics.slug}<!-- IF topics.bookmark -->/{topics.bookmark}<!-- ENDIF topics.bookmark -->">{topics.title}</a><br />
+                <!-- ELSE -->
+                <span>{topics.title}</span><br />
+                <!-- ENDIF !topics.noAnchor -->
+
+                <!-- IF topics.resolved -->
+                <span class="resolved-status">Resolved</span><br />
+                <!-- ENDIF topics.resolved -->
+
+                <!-- IF !template.category -->
+                <small>
+                    <a href="{config.relative_path}/category/{topics.category.slug}"><span class="fa-stack fa-lg" style="{function.generateCategoryBackground, topics.category}"><i style="color:{topics.category.color};" class="fa {topics.category.icon} fa-stack-1x"></i></span> {topics.category.name}</a> &bull;
+                </small>
+                <!-- ENDIF !template.category -->
+
+                {{{ if topics.tags.length }}}
+                <span class="tag-list hidden-xs">
+                    {{{each topics.tags}}}
+                    <a href="{config.relative_path}/tags/{topics.tags.valueEncoded}"><span class="tag tag-item tag-class-{topics.tags.class}">{topics.tags.valueEscaped}</span></a>
+                    {{{end}}}
+                    <small>&bull;</small>
+                </span>
+                {{{ end }}}
+
+                <small class="hidden-xs"><span class="timeago" title="{topics.timestampISO}"></span> &bull; <a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->">{topics.user.displayname}</a></small>
+                <small class="visible-xs-inline">
+                    <!-- IF topics.teaser.timestamp -->
+                    <span class="timeago" title="{topics.teaser.timestampISO}"></span>
+                    <!-- ELSE -->
+                    <span class="timeago" title="{topics.timestampISO}"></span>
+                    <!-- ENDIF topics.teaser.timestamp -->
+                </small>
+            </h2>
+        </div>
+
+        <div class="mobile-stat col-xs-2 visible-xs text-right">
+            <span class="human-readable-number">{topics.postcount}</span> <a href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"><i class="fa fa-arrow-circle-right"></i></a>
+        </div>
+
+        <div class="col-md-1 hidden-sm hidden-xs stats stats-votes">
+            <!-- IF !reputation:disabled -->
+            <span class="human-readable-number" title="{topics.votes}">{topics.votes}</span><br />
+            <small>[[global:votes]]</small>
+            <!-- END -->
+        </div>
+
+        <div class="col-md-1 hidden-sm hidden-xs stats stats-postcount">
+            <span class="human-readable-number" title="{topics.postcount}">{topics.postcount}</span><br />
+            <small>[[global:posts]]</small>
+        </div>
+
+        <div class="col-md-1 hidden-sm hidden-xs stats stats-viewcount">
+            <span class="human-readable-number" title="{topics.viewcount}">{topics.viewcount}</span><br />
+            <small>[[global:views]]</small>
+        </div>
+
+        <div class="col-md-3 col-sm-3 teaser hidden-xs" component="topic/teaser">
+            <div class="card background-link-container" style="border-color: {topics.category.bgColor}">
+                <a class="background-link" href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}"></a>
+                <!-- IF topics.unreplied -->
+                <p>
+                    [[category:no_replies]]
+                </p>
+                <!-- ELSE -->
+                <!-- IF topics.teaser.pid -->
+                <p>
+                    <a href="{config.relative_path}/user/{topics.teaser.user.userslug}">{buildAvatar(topics.teaser.user, "24", true, "not-responsive")}</a>
+                    <a class="permalink" href="{config.relative_path}/topic/{topics.slug}/{topics.teaser.index}">
+                        <span class="timeago" title="{topics.teaser.timestampISO}"></span>
+                    </a>
+                </p>
+                <div class="post-content">
+                    {topics.teaser.content}
+                </div>
+                <!-- ENDIF topics.teaser.pid -->
+                <!-- ENDIF topics.unreplied -->
+            </div>
+        </div>
+    </li>
+    <!-- ENDIF !topics.resolved -->
     {{{end}}}
-</ul>
+</ul>
\ No newline at end of file

From 46336a1c09229d9e2d9fbd198b9b2fa069455ff0 Mon Sep 17 00:00:00 2001
From: zhijinwuu <zhijinw@andrew.cmu.edu>
Date: Wed, 11 Oct 2023 23:11:50 -0400
Subject: [PATCH 2/4] flip button when unresolved

---
 .../nodebb-theme-persona/templates/partials/post_bar.tpl   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
index dd8a7d8..be81ed5 100644
--- a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
+++ b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
@@ -4,9 +4,16 @@
     </span>
 
     <!-- IF loggedIn -->
+    <!-- IF hasResolution -->
     <button component="topic/toggle-resolve" class="btn btn-sm btn-default"]">
         <i class="fa fa-fw fa-check"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
     </button>
+    <!-- ENDIF hasResolution -->
+    <!-- IF !hasResolution -->
+    <button component="topic/toggle-resolve" class="btn btn-sm btn-default"]">
+        <i class="fa fa-fw fa-square-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
+    </button>
+    <!-- ENDIF !hasResolution -->
     <button component="topic/mark-unread" class="btn btn-sm btn-default" title="[[topic:mark_unread]]">
         <i class="fa fa-fw fa-inbox"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
     </button>

From 3a74d00d11f656ccaa76ecd089fd65760541fbd6 Mon Sep 17 00:00:00 2001
From: zhijinwuu <zhijinw@andrew.cmu.edu>
Date: Wed, 11 Oct 2023 23:12:26 -0400
Subject: [PATCH 3/4] change button to square checkbox

---
 themes/nodebb-theme-persona/templates/partials/post_bar.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
index be81ed5..c7c67be 100644
--- a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
+++ b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
@@ -6,7 +6,7 @@
     <!-- IF loggedIn -->
     <!-- IF hasResolution -->
     <button component="topic/toggle-resolve" class="btn btn-sm btn-default"]">
-        <i class="fa fa-fw fa-check"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
+        <i class="fa fa-fw fa-check-square-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
     </button>
     <!-- ENDIF hasResolution -->
     <!-- IF !hasResolution -->

From 2e276a9e5ef26a8ec2cf3b6573b02ec895b186b3 Mon Sep 17 00:00:00 2001
From: zhijinwuu <zhijinw@andrew.cmu.edu>
Date: Wed, 11 Oct 2023 23:13:31 -0400
Subject: [PATCH 4/4] change button to circle checkbox

---
 themes/nodebb-theme-persona/templates/partials/post_bar.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
index c7c67be..94bca8b 100644
--- a/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
+++ b/themes/nodebb-theme-persona/templates/partials/post_bar.tpl
@@ -6,12 +6,12 @@
     <!-- IF loggedIn -->
     <!-- IF hasResolution -->
     <button component="topic/toggle-resolve" class="btn btn-sm btn-default"]">
-        <i class="fa fa-fw fa-check-square-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
+        <i class="fa fa-fw fa-check-circle-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
     </button>
     <!-- ENDIF hasResolution -->
     <!-- IF !hasResolution -->
     <button component="topic/toggle-resolve" class="btn btn-sm btn-default"]">
-        <i class="fa fa-fw fa-square-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
+        <i class="fa fa-fw fa-circle-o"></i><span class="visible-sm-inline visible-md-inline visible-lg-inline"></span>
     </button>
     <!-- ENDIF !hasResolution -->
     <button component="topic/mark-unread" class="btn btn-sm btn-default" title="[[topic:mark_unread]]">