From a8618196ea5d111944e65c8ec3ed07321a2d0552 Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 8 Apr 2015 16:45:59 -0300
Subject: [PATCH] Organize questions visualization

---
 public/style.css                                  |  7 ++++---
 views/blocks/questions_group_menu.html.erb        | 61 ++++++++++++++++++++++++++++++++++++++++---------------------
 views/content_viewer/_pairwise_skip_vote.html.erb |  8 ++++++++
 views/content_viewer/_prompt_body.html.erb        |  9 +--------
 4 files changed, 53 insertions(+), 32 deletions(-)
 create mode 100644 views/content_viewer/_pairwise_skip_vote.html.erb

diff --git a/public/style.css b/public/style.css
index 41b102f..dde517f 100644
--- a/public/style.css
+++ b/public/style.css
@@ -461,11 +461,12 @@ div.pairwise_group_menu_container .questions-menu .menu {
   width: 96%;
   z-index: 999;
   padding: 10px;
-  top: 45px;
+  top: 17px;
   box-shadow: -5px 7px 10px #888888;
 }
-div.pairwise_group_menu_container .questions-menu .menu .item a {
-  text-decoration: none;
+div.pairwise_group_menu_container .questions-menu .menu .item {
+  cursor: pointer;
+  color: rgb(107, 107, 107);
 }
 div.pairwise_group_menu_container .questions-menu .menu .label {
   color: rgb(175, 175, 175);
diff --git a/views/blocks/questions_group_menu.html.erb b/views/blocks/questions_group_menu.html.erb
index c2d0ed9..f4af79b 100644
--- a/views/blocks/questions_group_menu.html.erb
+++ b/views/blocks/questions_group_menu.html.erb
@@ -1,14 +1,7 @@
 <% extend PairwisePlugin::Helpers::ViewerHelper %>
 <% questions = block.questions_for_view || [] %>
 
-<%= block_title(block.title) %>
-
 <div id='pairwise_group_list_block_<%= block.id %>' class="pairwise_group_menu_container" data-open-prompt="0">
-  <div class="description">
-    <%= block.group_description %>
-  </div>
-
-
   <div class="questions-menu clearfix">
     <span class="menu-icon">
       <span class="icon-bar"></span>
@@ -16,25 +9,51 @@
       <span class="icon-bar"></span>
     </span>
     <span class="icon-label"><%= _('Select theme') %></span>
-    <div class="menu" style="display: none">
-      <div class="label">
-        <%= _('Select a theme:') %>
-      </div>
-      <div class="items">
-        <% questions.each_with_index do |pairwise_content, index| %>
-          <div class="item <%= pairwise_group_row_classes(index) %>">
-            <a href="#"><%= pairwise_content.name %></a>
-          </div>
-        <% end %>
+    <% if questions.count > 1 %>
+      <div class="menu" style="display: none">
+        <div class="label">
+          <%= _('Select a specific theme below to vote on proposals:') %>
+        </div>
+        <div class="items">
+          <% questions.each_with_index do |pairwise_content, index| %>
+            <div class="item <%= pairwise_group_row_classes(index) %>">
+              <%= pairwise_content.name %>
+            </div>
+          <% end %>
+        </div>
       </div>
-    </div>
+    <% end %>
   </div>
 	<div class="question container">
-    <% if block.questions.nil?  || block.questions.empty? %>
+    <% if block.questions.blank? %>
       <span><%= _("Empty") %></span>
     <% else %>
       <% questions.each_with_index do |pairwise_content, index| %>
-        <%= pairwise_group_content_body(index, pairwise_content) %>
+        <%#= pairwise_group_content_body(index, pairwise_content) %>
+        <div class="pairwise_inner_body" id="pairwise_inner_body_<%= pairwise_content.id %>" style="<%= index!=0 ? 'display:none' : '' %>" >
+          <div id="pairwise_<%= pairwise_content.id %>">
+          <div id="pairwise_main" class="pairwise_main">
+            <% embeded = params[:embeded] %>
+            <% question = nil %>
+
+            <%= render :partial => 'content_viewer/menu', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :active_tab => :prompt} %>
+
+            <div class="pairwise_content">
+              <div class="pairwise_body"><%= block.title %></div>
+              <div class="description">
+                <%= block.group_description %>
+              </div>
+              <div class=""><%= pairwise_content.title %></div>
+              <%= render :partial => 'content_viewer/pairwise_prompts', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
+              <% if embeded %>
+                <div class="footer"><%= _('Powered by') + ' ' + pairwise_content.environment.name%></div>
+              <% end %>
+            </div>
+
+            <%= render :partial => 'content_viewer/pairwise_skip_vote', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
+          </div>
+          </div>
+        </div>
       <% end %>
     <% end %>
 	</div>
@@ -43,7 +62,7 @@
 <script type="text/javascript">
   jQuery(document).ready(function($){
     $('.pairwise_group_menu_container .questions-menu .menu-icon').click(function() {
-      $(this).siblings('.menu').toggle('fast');
+      $(this).siblings('.menu').toggle();
     });
     $('.pairwise_group_menu_container .questions-menu .items .row').click(function() {
       $('.pairwise_group_menu_container .questions-menu .menu').hide('fast');
diff --git a/views/content_viewer/_pairwise_skip_vote.html.erb b/views/content_viewer/_pairwise_skip_vote.html.erb
new file mode 100644
index 0000000..01494e7
--- /dev/null
+++ b/views/content_viewer/_pairwise_skip_vote.html.erb
@@ -0,0 +1,8 @@
+<div class="skip_vote">
+  <%= skip_vote_open_function(pairwise_content) %>
+</div>
+<div id="skip_vote_reasons_<%= pairwise_content.id %>" class="skip_vote_reasons">
+  <% if question %>
+    <%= render :partial => 'content_viewer/pairwise_skips', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
+  <% end %>
+</div>
diff --git a/views/content_viewer/_prompt_body.html.erb b/views/content_viewer/_prompt_body.html.erb
index 9f59cc0..2b7f350 100644
--- a/views/content_viewer/_prompt_body.html.erb
+++ b/views/content_viewer/_prompt_body.html.erb
@@ -9,14 +9,7 @@
        	<div class="footer"><%= _('Powered by') + ' ' + pairwise_content.environment.name%></div>
       <% end %>
   </div>
-	<div class="skip_vote">
-			<%= skip_vote_open_function(pairwise_content) %>
-	</div>
-  <div id="skip_vote_reasons_<%= pairwise_content.id %>" class="skip_vote_reasons">
-  <% if question %>
-    <%= render :partial => 'content_viewer/pairwise_skips', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
-  <% end %>
-  </div>
+  <%= render :partial => 'content_viewer/pairwise_skip_vote', :locals => {:embeded => embeded, :pairwise_content => pairwise_content, :question => question, :source => (defined?(source) ? source : '') } %>
 
 	<% if pairwise_content.allow_new_ideas? %>
     <% if user %>
--
libgit2 0.21.2