From 5ec86aef6c967cde943e9542abd785119fddcaff Mon Sep 17 00:00:00 2001
From: Alexandre Arias <apa13@inf.ufpr.br>
Date: Fri, 16 Oct 2015 11:02:55 -0300
Subject: [PATCH] fix form layout

Signed-off-by: Alexandre Arias <apa13@inf.ufpr.br>
---
 app/assets/stylesheets/application.scss       | 36 +++++++++++++++----
 app/controllers/complaints_controller.rb      |  2 +-
 .../orient_db/complaint_repository.rb         |  2 +-
 app/views/complaints/_form.html.erb           | 11 +++---
 4 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index e2249060..f92deb82 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -65,13 +65,6 @@ a, a:focus, a:hover {
   top: 45%;
 }
 
-.popover {
-  display: none;
-  z-index: 999;
-  max-width: 600px;
-  width: auto;
-}
-
 .radio {
   margin-left: 20px;
 }
@@ -265,6 +258,35 @@ header {
   }
 }
 
+//form complaint
+.submit_button {
+  color: #FFFFFF;
+  background: #2178F5;
+  border-radius : 5px 5px 20px 20px ;
+  moz-border-radius : 5px 5px 20px 20px ;
+
+}
+
+.close_button {
+  color: #FFFFFF;
+  background: #2178F5;
+  border-radius : 5px 5px 20px 20px ;
+  moz-border-radius : 5px 5px 20px 20px ;
+}
+
+
+.popover {
+  display: none;
+  z-index: 999;
+  max-width: 600px;
+  width: auto;
+}
+
+.popover-title{
+    background: #2178F5;
+    color: #FFFFFF;
+}
+
 //// FOOTER
 footer {
   width: 100%;
diff --git a/app/controllers/complaints_controller.rb b/app/controllers/complaints_controller.rb
index bb1bc86b..8653ddbc 100644
--- a/app/controllers/complaints_controller.rb
+++ b/app/controllers/complaints_controller.rb
@@ -10,7 +10,7 @@ class ComplaintsController < ApplicationController
 
     respond_to do |format|
       if complaint_repository.report @complaint
-        format.html { redirect_to @complaint, notice: 'complaint was successfully created.' }
+          format.html { redirect_to :back, notice: 'complaint was successfully created.' }
       else
         format.html { render :new }
       end
diff --git a/app/repositories/orient_db/complaint_repository.rb b/app/repositories/orient_db/complaint_repository.rb
index 416b6462..d609d9d2 100644
--- a/app/repositories/orient_db/complaint_repository.rb
+++ b/app/repositories/orient_db/complaint_repository.rb
@@ -7,7 +7,7 @@ module OrientDb
         if edge_exists?(odb_class, complaint.user.rid, complaint.object)
           raise "The object has already been reported by you."
         end
-        connection.command "CREATE EDGE Complaint FROM #{complaint.user.rid} TO #{complaint.object} SET message = #{complaint.message}, description = #{complaint.description}"
+        connection.command "CREATE EDGE Complaint FROM #{complaint.user.rid} TO #{complaint.object} SET message = '#{complaint.message}', description = '#{complaint.description}'"
       end
 
       def destroy(object)
diff --git a/app/views/complaints/_form.html.erb b/app/views/complaints/_form.html.erb
index aef72f5b..0d62529c 100644
--- a/app/views/complaints/_form.html.erb
+++ b/app/views/complaints/_form.html.erb
@@ -4,8 +4,6 @@
 
   <div class="ls-label " >
 
-    <h4 class="ls-title-4"><p><b>Escolha a razão da denúncia:</b></p></h4>
-    <br><br>
 
     <%= f.collection_radio_buttons :message, @messages, :message, :message do |m| %>
     <div class="radio" >
@@ -24,9 +22,12 @@
   <%= f.hidden_field :object_rid, value: @learning_object.id %>
   </fieldset>
 
-  <div align="center" class="ls-btn-primary">
-    <%= f.submit "Salvar" %>
-    <%= link_to "Fechar", class:"btn-success" %>
+
+
+  <div align="center" >
+    <%= f.submit "Salvar", class:"submit_button" %>
+    <%#= link_to "Fechar",{}, class:"close_button" %>
+    <!--<button id="btn-fechar" class="btn btn-danger" data-dismiss="clickover">Fechar</button>-->
 
   </div>
   <%end%>
-- 
GitLab