Adds author name and level on lists

consuldemocracy · Sep 16, 2015 · 56a72b9 · 56a72b9
1 parent 17af8f4
commit 56a72b9
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 9 deletions.
diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
@@ -184,11 +184,12 @@
       min-height: rem-calc(353);
     }
 
-    .label {
+    .label-debate {
       background: none;
       clear: both;
       color: $debates;
       display: block;
+      font-size: rem-calc(12);
       font-weight: bold;
       text-transform: uppercase;
       padding-left: 0;
@@ -314,7 +315,7 @@
       padding-bottom: rem-calc(12);
     }
 
-    .label {
+    .label-debate {
       line-height: $line-height;
       padding-bottom: 0;
     }

diff --git a/app/assets/stylesheets/proposals.scss b/app/assets/stylesheets/proposals.scss
@@ -160,11 +160,12 @@
       min-height: rem-calc(353);
     }
 
-    .label {
+    .label-proposal {
       background: none;
       clear: both;
       color: $proposals;
       display: block;
+      font-size: rem-calc(12);
       font-weight: bold;
       text-transform: uppercase;
       padding-left: 0;
@@ -290,7 +291,7 @@
       padding-bottom: rem-calc(12);
     }
 
-    .label {
+    .label-proposal {
       line-height: $line-height;
       padding-bottom: 0;
     }

diff --git a/app/views/debates/_debate.html.erb b/app/views/debates/_debate.html.erb
@@ -5,14 +5,38 @@
 
         <div class="small-12 medium-9 column">
           <div class="debate-content">
-            <span class="label left"><%= t("debates.debate.debate") %></span>
+            <span class="label-debate left"><%= t("debates.debate.debate") %></span>
             <i class="icon-debates"></i>
             <h3><%= link_to debate.title, debate %></h3>
             <p class="debate-info">
               <i class="icon-comments"></i>&nbsp;
               <%= link_to t("debates.debate.comments", count: debate.comments_count), debate_path(debate, anchor: "comments") %>
               <span class="bullet">&nbsp;&bull;&nbsp;</span>
               <%= l debate.created_at.to_date %>
+              <% if debate.author.hidden? %>
+                <span class="bullet">&nbsp;&bull;&nbsp;</span>
+                <span class="author">
+                  <%= t("debates.show.author_deleted") %>
+                </span>
+              <% else %>
+                <span class="bullet">&nbsp;&bull;&nbsp;</span>
+                <span class="author">
+                  <%= debate.author.name %>
+                </span>
+                <% if debate.author.official? %>
+                  <span class="bullet">&nbsp;&bull;&nbsp;</span>
+                  <span class="label round level-<%= debate.author.official_level %>">
+                    <%= debate.author.official_position %>
+                  </span>
+                <% end %>
+              <% end %>
+
+              <% if debate.author.verified_organization? %>
+                <span class="bullet">&nbsp;&bull;&nbsp;</span>
+                <span class="label round is-association">
+                  <%= t("shared.collective") %>
+                </span>
+              <% end %>
             </p>
             <div class="debate-description">
               <%= link_to debate.description, debate %>

diff --git a/app/views/proposals/_proposal.html.erb b/app/views/proposals/_proposal.html.erb
@@ -4,14 +4,39 @@
 
       <div class="small-12 medium-9 column">
         <div class="proposal-content">
-          <span class="label left"><%= t("proposals.proposal.proposal") %></span>
+          <span class="label-proposal left"><%= t("proposals.proposal.proposal") %></span>
           <i class="icon-proposals"></i>
           <h3><%= link_to proposal.title, proposal %></h3>
           <p class="proposal-info">
             <i class="icon-comments"></i>&nbsp;
             <%= link_to t("proposals.proposal.comments", count: proposal.comments_count), proposal_path(proposal, anchor: "comments") %>
             <span class="bullet">&nbsp;&bull;&nbsp;</span>
             <%= l proposal.created_at.to_date %>
+
+            <% if proposal.author.hidden? %>
+              <span class="bullet">&nbsp;&bull;&nbsp;</span>
+              <span class="author">
+                <%= t("proposals.show.author_deleted") %>
+              </span>
+            <% else %>
+              <span class="bullet">&nbsp;&bull;&nbsp;</span>
+              <span class="author">
+                <%= proposal.author.name %>
+              </span>
+              <% if proposal.author.official? %>
+                <span class="bullet">&nbsp;&bull;&nbsp;</span>
+                <span class="label round level-<%= proposal.author.official_level %>">
+                  <%= proposal.author.official_position %>
+                </span>
+              <% end %>
+            <% end %>
+
+            <% if proposal.author.verified_organization? %>
+              <span class="bullet">&nbsp;&bull;&nbsp;</span>
+              <span class="label round is-association">
+                <%= t("shared.collective") %>
+              </span>
+            <% end %>
           </p>
           <div class="proposal-description">
             <%= link_to proposal.summary, proposal %>

diff --git a/app/views/proposals/show.html.erb b/app/views/proposals/show.html.erb
@@ -52,12 +52,12 @@
           <i class="icon-comments"></i>&nbsp;
           <%= link_to t("proposals.show.comments", count: @proposal.comments_count), "#comments" %>
           <span class="bullet">&nbsp;&bull;&nbsp;</span>
-          <%= link_to t("proposals.show.code") %>
-          <%= @proposal.code %>
-          <span class="bullet">&nbsp;&bull;&nbsp;</span>
           <span class="js-flag-actions">
             <%= render 'proposals/flag_actions', proposal: @proposal %>
           </span>
+          <br>
+            <%= t("proposals.show.code") %>
+            <%= @proposal.code %>
         </div>
 
         <blockquote><%= @proposal.summary %></blockquote>