improves html markup on communities and topics views

consuldemocracy · Sep 21, 2017 · c887cb7 · c887cb7
1 parent 7fa21af
commit c887cb7
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 72 deletions.
diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb
@@ -3,20 +3,21 @@
   <div class="jumbo light">
     <div class="row">
       <div class="small-12 column">
-        <%= back_link_to community_back_link_path(@community) %>
-        <h2><%= community_text(@community) %></h2>
-        <p class="lead"> <%= community_title(@community) %> </p>
-        <p><%= community_description(@community) %> </p>
+        <span class="uppercase"><%= community_text(@community) %></span>
+        <h2><%= link_to community_title(@community), community_back_link_path(@community) %></h2>
+      </div>
+
+      <div class="small-12 medium-9 column end">
+        <p><%= community_description(@community) %></p>
       </div>
     </div>
   </div>
 
   <div class="row">
-
-    <aside class="show-for-small-only small-12 column">
+    <aside class="small-12 column show-for-small-only">
       <div class="sidebar-divider"></div>
       <h2><%= t("community.show.sidebar.participate") %></h2>
-      <%= link_to t("community.show.sidebar.new_topic"), new_community_topic_path(@community.id), class: "button expanded #{disabled_create_topic}" %>
+      <%= link_to t("community.show.sidebar.new_topic"), new_community_topic_path(@community.id), class: "button expanded" %>
     </aside>
 
     <div class="small-12 medium-9 column">
@@ -26,14 +27,12 @@
       <%= paginate @topics %>
     </div>
 
-    <aside class="small-12 medium-3 hide-for-small-only column">
+    <aside class="small-12 medium-3 column hide-for-small-only">
       <div class="sidebar-divider"></div>
       <h2><%= t("community.show.sidebar.participate") %></h2>
-      <%= link_to t("community.show.sidebar.new_topic"), new_community_topic_path(@community.id), class: "button expanded #{disabled_create_topic}", title: "#{disabled_info_title}" %>
+      <%= link_to t("community.show.sidebar.new_topic"), new_community_topic_path(@community.id), class: "button expanded" %>
     </aside>
-
   </div>
-
 </div>
 
 <%= render 'participants' %>
diff --git a/app/views/topics/_comments.html.erb b/app/views/topics/_comments.html.erb
@@ -13,12 +13,12 @@
       <% if user_signed_in? %>
         <%= render 'comments/form', {commentable: @topic, parent_id: nil, toggeable: false} %>
       <% else %>
-      <br>
+
       <div data-alert class="callout primary">
         <%= t("topics.show.login_to_comment",
             signin: link_to(t("votes.signin"), new_user_session_path),
             signup: link_to(t("votes.signup"), new_user_registration_path)).html_safe %>
-        </div>
+      </div>
       <% end %>
 
     </div>

diff --git a/app/views/topics/_form.html.erb b/app/views/topics/_form.html.erb
@@ -3,19 +3,15 @@
   <%= render 'shared/errors', resource: @topic %>
 
   <div class="row">
-
     <div class="small-12 column">
       <%= f.label :title, t("community.topic.form.topic_title") %>
       <%= f.text_field :title, label: false %>
-    </div>
-    <div class="small-12 column">
+
       <%= f.label :description, t("community.topic.form.topic_description") %>
-      <%= f.text_area :description, label: false %>
-    </div>
-    <div class="actions small-12 column">
+      <%= f.text_area :description, label: false, rows: "5" %>
+
       <%= f.submit(class: "button", value: t("community.topic.form.#{action_name}.submit_button")) %>
     </div>
-
   </div>
 
 <% end %>
diff --git a/app/views/topics/_informative_text.html.erb b/app/views/topics/_informative_text.html.erb
@@ -1,11 +1,13 @@
-<h3><%= t("community.show.create_first_community_topic.first_theme") %></h3>
+<p class="lead"><%= t("community.show.create_first_community_topic.first_theme") %></p>
 
 <% if user_signed_in? %>
-  <%= t("community.show.create_first_community_topic.first_theme_not_logged_in") %>
+  <div class="callout primary">
+    <%= t("community.show.create_first_community_topic.first_theme_not_logged_in") %>
+  </div>
 <% else %>
   <div class="callout primary">
     <%= t("community.show.create_first_community_topic.sub_first_theme",
-          link: link_to(t("community.show.create_first_community_topic.sign_link",
-          org_name: setting['org_name']), new_user_session_path)).html_safe %>
+          sign_in: link_to(t("community.show.create_first_community_topic.sign_in"), new_user_session_path),
+          sign_up: link_to(t("community.show.create_first_community_topic.sign_up"), new_user_registration_path)).html_safe %>
   </div>
 <% end %>
diff --git a/app/views/topics/_recommendations.html.erb b/app/views/topics/_recommendations.html.erb
@@ -1,13 +1,7 @@
-<div class="small-12 medium-3 column">
+<h2><%= t("community.topic.sidebar.recommendations_title") %></h2>
 
-  <span class="icon-proposals float-right"></span>
-
-  <h2><%= t("community.topic.sidebar.recommendations_title") %></h2>
-
-  <ul class="recommendations">
-    <li><%= t("community.topic.sidebar.recommendation_one") %></li>
-    <li><%= t("community.topic.sidebar.recommendation_two") %></li>
-    <li><%= t("community.topic.sidebar.recommendation_three") %></li>
-  </ul>
-
-</div>
+<ul class="recommendations">
+  <li><%= t("community.topic.sidebar.recommendation_one") %></li>
+  <li><%= t("community.topic.sidebar.recommendation_two") %></li>
+  <li><%= t("community.topic.sidebar.recommendation_three") %></li>
+</ul>
diff --git a/app/views/topics/_topic.html.erb b/app/views/topics/_topic.html.erb
@@ -1,6 +1,6 @@
 <div id="<%= dom_id(topic) %>" class="panel column">
-  
-  <div class="small-8 column">
+
+  <div class="small-12 medium-9 column">
 
     <h3><%= link_to topic.title, community_topic_path(@community, topic) %></h3>
 
@@ -14,12 +14,4 @@
     </p>
 
   </div>
-
-  <div class="small-4 column text-right">
-    <% if topic.author == current_user %>
-      <%= link_to t("community.show.topic.edit_button"), edit_community_topic_path(@community.id, topic), class: 'button small hollow' %>
-      <%= link_to t("community.show.topic.destroy_button"), community_topic_path(@community.id, topic), method: :delete, class: 'button hollow alert small' %>
-    <% end %>
-  </div>
-
 </div>
diff --git a/app/views/topics/edit.html.erb b/app/views/topics/edit.html.erb
@@ -1,11 +1,12 @@
-<div class="topic-form row">
+<div class="row">
 
   <div class="small-12 medium-9 column">
     <%= back_link_to community_path(@community) %>
     <h1><%= t("community.topic.edit") %></h1>
     <%= render "form" %>
   </div>
 
-  <%= render "recommendations" %>
-
+  <div class="small-12 medium-3 column">
+    <%= render "recommendations" %>
+  </div>
 </div>
diff --git a/app/views/topics/new.html.erb b/app/views/topics/new.html.erb
@@ -1,11 +1,12 @@
-<div class="topic-new row">
-  
+<div class="row">
+
   <div class="small-12 medium-9 column">
     <%= back_link_to community_path(@community) %>
     <h1><%= t("community.topic.create") %></h1>
     <%= render 'form' %>
   </div>
 
-  <%= render "recommendations" %>
-
+  <div class="small-12 medium-3 column">
+    <%= render "recommendations" %>
+  </div>
 </div>
diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb
@@ -1,27 +1,47 @@
-<div class="row topic-show">
-  <div class="small-12 medium-12 column">
+<div class="topic-show">
+  <div class="row margin-bottom">
+    <div class="small-12 medium-9 column">
 
-    <%= back_link_to community_path(@community) %>
-    <br>
+      <%= back_link_to community_path(@community), t("community.show.back",
+                       community: community_text(@community),
+                       proposal: community_title(@community)) %>
 
-    <p><%= community_text(@community) %> <strong><%= community_title(@community) %></strong></p>
-    <h1><%= @topic.title %></h1>
-    <div class="topic-info">
-      <p><%= @topic.description %></p>
-      <%= render '/shared/author_info', resource: @topic %>
+      <h1><%= @topic.title %></h1>
 
-      <span class="bullet">&nbsp;&bull;&nbsp;</span>
-      <%= l @topic.created_at.to_date %>
-      <span class="bullet">&nbsp;&bull;&nbsp;</span>
-      <span class="icon-comments"></span>&nbsp;
-    </div>
+      <div class="topic-info margin-bottom">
+        <%= render '/shared/author_info', resource: @topic %>
 
-    <div class="tabs-content" data-tabs-content="topics-tabs" role="tablist">
-      <%= render "topics/filter_subnav" %>
-      <div class="tabs-panel is-active" id="tab-comments">
-        <%= render "topics/comments" %>
+        <span class="bullet">&nbsp;&bull;&nbsp;</span>
+        <%= l @topic.created_at.to_date %>
+        <span class="bullet">&nbsp;&bull;&nbsp;</span>
+        <span class="icon-comments"></span>&nbsp;
+        <%= link_to t("community.show.topic.comments", count: @topic.comments_count),
+                    community_topic_path(@community, @topic, anchor: "comments") %>
       </div>
+      <br>
+      <p><%= @topic.description %></p>
+    </div>
+
+    <% if @topic.author == current_user %>
+      <aside class="small-12 medium-3 column">
+        <div class="sidebar-divider"></div>
+        <h2><%= t("community.show.author") %></h2>
+        <%= link_to t("community.show.topic.edit"),
+                    edit_community_topic_path(@community.id, @topic),
+                    class: 'button hollow expanded' %>
+
+        <%= link_to t("community.show.topic.destroy"),
+                    community_topic_path(@community.id, @topic), method: :delete,
+                    class: 'button hollow expanded alert' %>
+      </aside>
+    <% end %>
+  </div>
+
+
+  <div class="tabs-content" data-tabs-content="topics-tabs" role="tablist">
+    <%= render "topics/filter_subnav" %>
+    <div class="tabs-panel is-active" id="tab-comments">
+      <%= render "topics/comments" %>
     </div>
-
   </div>
 </div>