Move 'More Topics' on new dashboard into left column (#9658)

Update dashboard.html.erb
publiclab · Jun 3, 2021 · 0b739d1 · 0b739d1
1 parent 6ad3102
commit 0b739d1
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/app/views/dashboard_v2/dashboard.html.erb b/app/views/dashboard_v2/dashboard.html.erb
@@ -5,6 +5,32 @@
       <%= render partial: "dashboard_v2/blog"%>
       <%= render partial: "dashboard_v2/alerts"%>
       <%= render partial: "dashboard_v2/topicCard"%>
+      <%# Additional Topics %>
+      <div class="other-topics">
+        <h4>
+          <i class="form-grey"><%= translation('dashboard_v2.sidebar.interest_topics', :url => '/subscriptions')%></i>
+        </h4>
+        <%# Featured topics %>
+        <small><a href="/tags" class="form-grey"><%= translation('dashboard_v2.sidebar.featured_topics') %>:</a></small>
+        <span>
+          <%= feature('feature-tags') %>
+          <small class="text-format form-grey" style="text-decoration: underline"><%= translation('dashboard_v2.sidebar.more_topics',:url => '/wiki/topics') %> </small>
+        </span>
+        <br/>
+        <%# Trending topics %>
+        <small><a href="/tags" class="form-grey"><%= translation('dashboard_v2.sidebar.trending_topics') %>:</a></small>
+        <span>
+         <% cache('trending-tags', expires_in: 24.hours, skip_digest: true) do %>
+              <% @trending_tags.each do |i| %>
+                  <a href="/tag/<%= i.name %>" class="badge badge-primary"><%= i.name %></a>
+              <% end %>
+            <% end %>
+          <small class="text-format form-grey" style="text-decoration: underline"><%= translation('dashboard_v2.sidebar.more_topics',:url => '/wiki/topics') %> </small>
+        </span>
+      </div>
+      <div class="dashboard-topics-footer">
+        <%= feature('dashboard-topics-footer') %>
+      </div>
     </div>
     <%# Sidebar %>
     <div class="col-lg-4">
@@ -13,32 +39,6 @@
       <%= render partial: "dashboard_v2/sidebar"%>
     </div>
   </div>
-  <%# Additional Topics %>
-  <div class="other-topics">
-    <h4>
-      <i class="form-grey"><%= translation('dashboard_v2.sidebar.interest_topics', :url => '/subscriptions')%></i>
-    </h4>
-    <%# Featured topics %>
-    <small><a href="/tags" class="form-grey"><%= translation('dashboard_v2.sidebar.featured_topics') %>:</a></small>
-    <span>
-      <%= feature('feature-tags') %>
-      <small class="text-format form-grey" style="text-decoration: underline"><%= translation('dashboard_v2.sidebar.more_topics',:url => '/wiki/topics') %> </small>
-    </span>
-    <br/>
-    <%# Trending topics %>
-    <small><a href="/tags" class="form-grey"><%= translation('dashboard_v2.sidebar.trending_topics') %>:</a></small>
-    <span>
-      <% cache('trending-tags', expires_in: 24.hours, skip_digest: true) do %>
-          <% @trending_tags.each do |i| %>
-              <a href="/tag/<%= i.name %>" class="badge badge-primary"><%= i.name %></a>
-          <% end %>
-        <% end %>
-      <small class="text-format form-grey" style="text-decoration: underline"><%= translation('dashboard_v2.sidebar.more_topics',:url => '/wiki/topics') %> </small>
-    </span>
-  </div>
-  <div class="dashboard-topics-footer">
-    <%= feature('dashboard-topics-footer') %>
-  </div>
 </div>
 
 <style>